Commit 0670ca36 authored by huangyuanyuan's avatar huangyuanyuan

修改过滤器

parent e3ec2a0f
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<p>出发日期:最早{{item.startDate}}出发</p> <p>出发日期:最早{{item.startDate}}出发</p>
</el-col> </el-col>
<el-col :span="4" style="color:#FF680B;font-size:16px;"> <el-col :span="4" style="color:#FF680B;font-size:16px;">
<span style="font-weight:700">{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}</span><span style="font-size:12px"></span> <span style="font-weight:700">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span><span style="font-size:12px"></span>
</el-col> </el-col>
<el-col :span="3" style="text-align:right"> <el-col :span="3" style="text-align:right">
<el-button @click="goUrl('detail',item.id,item.tcid)" size="small" style="border:1px solid #FF6633;color:#FF6633;">立即预定</el-button> <el-button @click="goUrl('detail',item.id,item.tcid)" size="small" style="border:1px solid #FF6633;color:#FF6633;">立即预定</el-button>
......
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money"> <div :class="SeasonBtn==0 ? 'Season_moneyActive' :''" class="Season_money">
<p style="font-size:12px;padding-top:10px">RMB</p> <p style="font-size:12px;padding-top:10px">RMB</p>
<p style="font-size:14px;font-weight:600"> <p style="font-size:14px;font-weight:600">
{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}} {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
<span style="font-size:12px;font-weight:10"></span> <span style="font-size:12px;font-weight:10"></span>
</p> </p>
</div> </div>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
<div class="zyx_pay"> <div class="zyx_pay">
<span style="color:#FF6633;font-size:12px"> <span style="color:#FF6633;font-size:12px">
<span></span> <span></span>
<span style="font-size:20px;font-weight:700">{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}</span> <span style="font-size:20px;font-weight:700">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>
<span></span> <span></span>
</span> </span>
<span style="color:#EE4454;margin-left:20px"> <span style="color:#EE4454;margin-left:20px">
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<div class="zyx_pay"> <div class="zyx_pay">
<span style="color:#FF6633;font-size:12px"> <span style="color:#FF6633;font-size:12px">
<span></span> <span></span>
<span style="font-size:20px;font-weight:700">{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}</span> <span style="font-size:20px;font-weight:700">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>
<span></span> <span></span>
</span> </span>
<span style="color:#EE4454;margin-left:20px"> <span style="color:#EE4454;margin-left:20px">
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
<div class="zyx_pay"> <div class="zyx_pay">
<span style="color:#FF6633;font-size:12px"> <span style="color:#FF6633;font-size:12px">
<span></span> <span></span>
<span style="font-size:20px;font-weight:700">{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}</span> <span style="font-size:20px;font-weight:700">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>
<span></span> <span></span>
</span> </span>
<span style="color:#EE4454;margin-left:20px"> <span style="color:#EE4454;margin-left:20px">
......
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
<p style="margin-top:35px" class="cztm_title">{{item.dayNum}}{{item.nightNum}}</p> <p style="margin-top:35px" class="cztm_title">{{item.dayNum}}{{item.nightNum}}</p>
<!-- <p><span class="discount">7.2折</span></p> --> <!-- <p><span class="discount">7.2折</span></p> -->
<p style="color:#FF6600"><span style="font-size:18px;font-weight:bold"> <p style="color:#FF6600"><span style="font-size:18px;font-weight:bold">
{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}} {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
</span> </span>
</p> </p>
<!-- <p><span class="bg">5</span><span class="bg">14</span><span class="bg">18</span></p> --> <!-- <p><span class="bg">5</span><span class="bg">14</span><span class="bg">18</span></p> -->
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
<p style="font-size:12px;padding:6px 0 2px 10px">日期:{{item.flightDate}}</p> <p style="font-size:12px;padding:6px 0 2px 10px">日期:{{item.flightDate}}</p>
<p style="font-size:12px;padding:2px 0 2px 10px"> <p style="font-size:12px;padding:2px 0 2px 10px">
<span style="color:#FF6600;font-size:16px;font-weight:700"> <span style="color:#FF6600;font-size:16px;font-weight:700">
{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}} {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
</span></p> </span></p>
</div> </div>
</div> </div>
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
</div> </div>
<div> <div>
<span style="color:#FF6600"><span style="font-size:18px;font-weight:bold"> <span style="color:#FF6600"><span style="font-size:18px;font-weight:bold">
{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}} {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
</span></span> </span></span>
<span style="color:#666666;float:right;margin-top:6px">席位充足</span> <span style="color:#666666;float:right;margin-top:6px">席位充足</span>
</div> </div>
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
<div class="Remarks"> <div class="Remarks">
<p class="text2">{{item.title}}</p> <p class="text2">{{item.title}}</p>
<p style="text-align:right"><span style="color:#FF6600"><span style="font-size:18px;font-weight:bold"> <p style="text-align:right"><span style="color:#FF6600"><span style="font-size:18px;font-weight:bold">
{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}} {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
</span></span></p> </span></span></p>
</div> </div>
</div> </div>
...@@ -413,7 +413,7 @@ ...@@ -413,7 +413,7 @@
<div class="Remarks"> <div class="Remarks">
<p class="text2">{{item.title}}</p> <p class="text2">{{item.title}}</p>
<p style="text-align:right"><span style="color:#FF6600"><span style="font-size:18px;font-weight:bold"> <p style="text-align:right"><span style="color:#FF6600"><span style="font-size:18px;font-weight:bold">
{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}} {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
</span></span></p> </span></span></p>
</div> </div>
</div> </div>
...@@ -424,7 +424,7 @@ ...@@ -424,7 +424,7 @@
<div class="Remarks"> <div class="Remarks">
<p class="text2">{{item.title}}</p> <p class="text2">{{item.title}}</p>
<p style="text-align:right"><span style="color:#FF6600"><span style="font-size:18px;font-weight:bold"> <p style="text-align:right"><span style="color:#FF6600"><span style="font-size:18px;font-weight:bold">
{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}} {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
</span></span></p> </span></span></p>
</div> </div>
</div> </div>
...@@ -634,7 +634,7 @@ ...@@ -634,7 +634,7 @@
</p> </p>
<p>{{item.flightDate}}</p> <p>{{item.flightDate}}</p>
<p style="color:#FF6600"><span style="font-size:18px;font-weight:bold"> <p style="color:#FF6600"><span style="font-size:18px;font-weight:bold">
{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}} {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
</span> </span>
<span @click="Purchase(item)" class="qg">抢购</span> <span @click="Purchase(item)" class="qg">抢购</span>
</p> </p>
...@@ -678,7 +678,7 @@ ...@@ -678,7 +678,7 @@
</div> </div>
<div class="price"> <div class="price">
<p class="f12" style="color:#fff;"><span style="font-size:18px;font-weight:bold;color:#FF6600"> <p class="f12" style="color:#fff;"><span style="font-size:18px;font-weight:bold;color:#FF6600">
{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}} {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}
</span></p> </span></p>
</div> </div>
</div> </div>
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<div @click="goOneDayDetail(item)" v-if="index<2" v-for="(item,index) in abroadList" :key="index+300"> <div @click="goOneDayDetail(item)" v-if="index<2" v-for="(item,index) in abroadList" :key="index+300">
<img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt=""> <img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt="">
<span class="daydes">{{item.title}}</span> <span class="daydes">{{item.title}}</span>
<span class="price"><span class="pfR font18">{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}</span></span> <span class="price"><span class="pfR font18">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span></span>
</div> </div>
</div> </div>
<div class="dayConDiv2"> <div class="dayConDiv2">
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt=""> <img v-if="index==0" :key="img.url" v-for="(img,index) in item.imgCover" :src='compressImg(img.url, "filt", 245, "")' alt="">
<span class="country">{{item.lineShortName}}</span> <span class="country">{{item.lineShortName}}</span>
<p class="price"> <p class="price">
<span><span class="font18 pfR">{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}</span></span> <span><span class="font18 pfR">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span></span>
</p> </p>
</div> </div>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<div class="hotcontent"> <div class="hotcontent">
<span class="textHidden font12">{{item.title}}</span> <span class="textHidden font12">{{item.title}}</span>
<p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px"><span class="pfR font14"> <p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px"><span class="pfR font14">
{{isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum}}</span></p> {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span></p>
</div> </div>
</li> </li>
</ul> </ul>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</p> </p>
</div> </div>
<div class="threeDiv"> <div class="threeDiv">
<p><span style="color:#FDAC11;font-size:22px">{{isLogin!==1 ? item.b2CPrice : item.b2BPrice}}</span></p> <p><span style="color:#FDAC11;font-size:22px">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span></p>
<p style="margin-top:80px"><span class="ckxq">查看详情</span></p> <p style="margin-top:80px"><span class="ckxq">查看详情</span></p>
</div> </div>
</li> </li>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<div class="hotcontent"> <div class="hotcontent">
<span class="textHidden font12">{{item.title}}</span> <span class="textHidden font12">{{item.title}}</span>
<p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px"><span class="pfR font14"> <p class="font12" style="color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px"><span class="pfR font14">
{{isLogin!==1 ? item.b2CPrice : item.b2BPrice}}</span> {{(isLogin!=1 ? item.b2CPrice : item.b2BPrice) | NoDesnum}}</span>
</p> </p>
</div> </div>
</li> </li>
......
...@@ -868,13 +868,14 @@ export default { ...@@ -868,13 +868,14 @@ export default {
}, },
creatCalendar(list){ // 创建日历 creatCalendar(list){ // 创建日历
let dateList = []; let dateList = [];
// isLogin!=1 ? (item.b2CPrice | NoDesnum) : item.b2BPrice | NoDesnum
if(list && list.length>0){ if(list && list.length>0){
list.forEach((x,index)=>{ list.forEach((x,index)=>{
if(x.tcState==3){ if(x.tcState==3){
let msg = { let msg = {
dateStr:x.startDate, dateStr:x.startDate,
cDate:x.startDate.replace('-','年').replace('-','月'), cDate:x.startDate.replace('-','年').replace('-','月'),
price:x.b2CPrice, price:this.isLogin!=1 ? x.b2CPrice : x.b2BPrice,
b2BMemberPrice:x.b2BMemberPrice, b2BMemberPrice:x.b2BMemberPrice,
b2BPrice:x.b2BPrice, b2BPrice:x.b2BPrice,
b2CMemberPrice:x.b2CMemberPrice, b2CMemberPrice:x.b2CMemberPrice,
......
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
DomainUrl: domainUrl, DomainUrl: domainUrl,
//常用提交数据URL //常用提交数据URL
PostUrl: domainUrl + "/api/common/post", PostUrl: domainUrl + "/api/common/post",
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.106:9000", javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130', ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120", UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi", LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment