Skip to content

A
Athena
Commit 846e567e authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

parents 056b7f89 365987ac
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 19 deletions
src/assets/trip/block/index.css
View file @ 846e567e
......@@ -59,6 +59,7 @@
box-shadow: 0 0 12px rgba(0,0,0,0.1) inset;
}
.trip-block .block-item .item h3{
margin: 18px 0;
font-size: 18px;
font-family: 'PingFangR';
font-weight: 400;
......
src/components/Hotel/HotelDetail.vue
View file @ 846e567e
......@@ -665,7 +665,10 @@
</li>
<li class="HD_Lingprice">
<div><i>¥</i>
<span>{{getPrice(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)}}</span>
<span>{{getPrice2(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)}}
<span style="font-size:12px;color:#888888">/人均</span>
</span>
<!-- <span>{{getPrice(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)}}</span> -->
</div>
</li>
<li>
......@@ -1304,6 +1307,12 @@ export default {
this.auditNum += x.numberOfAdults;
this.childNum += x.numberOfChildren;
});
if(this.auditNum==null||this.auditNum==undefined){
this.auditNum=1
}
if(this.childNum==null||this.childNum==undefined){
this.childNum=1
}
},
//获取餐
getMealType(meals) {
......@@ -1329,6 +1338,9 @@ export default {
//天数
return Math.ceil(price / this.JapanIncrease)*(this.auditNum+this.childNum)*this.DateDiff(this.SimilarMsg.arrivalDate,this.SimilarMsg.departureDate);
},
getPrice2(price){
return Math.ceil(price / this.JapanIncrease)
},
//获取相差天数
DateDiff(sDate1, sDate2) { //sDate1和sDate2是2017-09-25格式
var aDate, oDate1, oDate2, iDays;
......
src/components/Hotel/HotelList.vue
View file @ 846e567e
......@@ -611,7 +611,7 @@
地址：{{item.address}}
</div>
<div class="HL_ListPrice">
<span><label>¥</label>{{getPrice(item.lowrateTotalBySetCurrency)}}</span>起
<span><label>¥</label>{{getPrice(item.lowrateBySetCurrency)}}</span>起
</div>
<input type="button" class="HL_ListBtn" @click="goHotelDetail(item,'HotelDetail')" value="查看详情"/>
</div>
......@@ -968,6 +968,12 @@ export default {
this.auditNum += x.numberOfAdults;
this.childNum += x.numberOfChildren;
})
if(this.auditNum==null||this.auditNum==undefined){
this.auditNum=1
}
if(this.childNum==null||this.childNum==undefined){
this.childNum=1
}
},
//点击展开关闭
setOpenMore(){
......@@ -1098,7 +1104,7 @@ export default {
this.PassMsg.arrivalDate=this.msg.arrivalDate;
this.PassMsg.departureDate = this.msg.departureDate;
this.PassMsg.searchroomGroup = this.msg.searchroomGroup;
this.PassMsg.lowrateBySetCurrency = this.getPrice(item.lowrateTotalBySetCurrency);
this.PassMsg.lowrateBySetCurrency = this.getPrice(item.lowrateBySetCurrency);
this.PassMsg.room = this.room
this.PassMsg.auditNum = this.auditNum;
......
src/components/Hotel/HotelSure.vue
View file @ 846e567e
......@@ -658,7 +658,7 @@
<div class="sureMsgTotalMon"><span>日元：</span>{{sureMsg.totalPriceJapanese}}</div>
<div class="sureMsgTotalMon"><span>人民币：</span>{{sureMsg.totalChargeableRateInfo}}</div>
<div class="sureMsgTotalMon"><span>优惠：</span>{{sureMsg.DiscountMoney}}</div>
<div class="sureMsgTotalMon"><span>实付款：</span>{{sureMsg.CustomerPayMoney}}</div>
<div class="sureMsgTotalMon"><span>实付款：</span>{{SettlementPrice}}</div>
</div>
<!-- <span class="HS_RitTop_Left">订单总额</span>
......@@ -965,7 +965,6 @@ export default {
this.sureMsg.DiscountMoney = (this.price - this.SettlementPrice).toFixed(2);
this.CouponIds=this.CouponIds.substring(0,this.CouponIds.length-1)
this.sureMsg.CouponAllotIds=this.CouponIds;
this.sureMsg.CustomerPayMoney=this.SettlementPrice;
},
......@@ -1116,7 +1115,7 @@ export default {
AdultJapanCount+=AdultJapanPrice*x.roomAdultCount;
childJapanCount+=ChildJapanPrice*x.roomChildCount;
this.SettlementPrice=this.sureMsg.totalChargeableRateInfo;
this.sureMsg.CustomerPayMoney=this.sureMsg.totalChargeableRateInfo;
this.SettlementPrice=this.sureMsg.totalChargeableRateInfo;
this.price=this.sureMsg.totalChargeableRateInfo;
// AdultJapanCount+=AdultJapanPrice;
......@@ -1268,7 +1267,7 @@ export default {
costType:res.data.data.costType,
orderId:res.data.data.orderId,
bookingNumber:res.data.data.parmResult.bookingNumber,
bookMoney:this.sureMsg.CustomerPayMoney,
bookMoney:this.SettlementPrice,
CancelTime:res.data.data.CancelTime,
hotelName:res.data.data.parmResult.hotelName,
totalPnumber:num
......
src/components/Ticket/FillItinerary.vue
View file @ 846e567e
......@@ -267,7 +267,7 @@
</p>
<p>
<span>实付款</span>
<span style="font-size:20px;font-weight:400;color:rgba(255,255,255,1);margin:0 15px;">￥{{personNum.CustomerPayMoney}}</span>
<span style="font-size:20px;font-weight:400;color:rgba(255,255,255,1);margin:0 15px;">￥{{SettlementPrice}}</span>
</p>
<p class="total" style="margin-top:12px">
<span :loading="submitLoad" @click="submitForm('personNum')" style="cursor: pointer;;height:32px;background:rgba(238,68,84,1);border-radius:4px;color:#fff;padding:4px 15px">
......@@ -426,7 +426,6 @@ export default {
this.personNum.DiscountMoney = (this.price - this.SettlementPrice).toFixed(2);
this.CouponIds=this.CouponIds.substring(0,this.CouponIds.length-1)
this.personNum.CouponAllotIds=this.CouponIds;
this.personNum.CustomerPayMoney=this.SettlementPrice;
},
......@@ -540,7 +539,6 @@ export default {
this.personNum.seatNum=this.personNum.ManNum+this.personNum.ChirdNum+this.personNum.OldPeopleNum;
this.personNum.PreferPrice=this.personNum.seatNum*this.getlistSigel.scatterB2BPrice;
this.SettlementPrice=this.personNum.PreferPrice;
this.personNum.CustomerPayMoney=this.personNum.PreferPrice;
this.price=this.personNum.PreferPrice;
this.filterCoupon();
......
src/components/Ticket/Pay.vue
View file @ 846e567e
......@@ -172,9 +172,9 @@ export default {
let Visainfo=JSON.parse(sessionStorage.Visainfo);
this.Commoditydetails=Visainfo;
this.Commoditydetails.airOrderId=Visainfo.AirOrderId;
this.Commoditydetails.customerPayMoney = Visainfo.preferPrice;
this.Commoditydetails.customerPayMoney = Visainfo.customerPayMoney;
this.code.OrderSource=Visainfo.orderResourceId;
this.code.total_fee=Visainfo.preferPrice+'';
this.code.total_fee=Visainfo.customerPayMoney+'';
this.code.body=Visainfo.description;
this.code.attach=`${Visainfo.costType}|${Visainfo.customerName}|${Visainfo.AirOrderId}|${Visainfo.customerId}|${Visainfo.outBranchId}`
}else{
......@@ -195,8 +195,9 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.Commoditydetails = res.data.data;
console.log("this.Commoditydetails",this.Commoditydetails)
this.code.OrderSource=this.Commoditydetails.orderResourceId;
this.code.total_fee=this.Commoditydetails.preferPrice+'';
this.code.total_fee=this.Commoditydetails.customerPayMoney+'';
this.code.body=this.Commoditydetails.description;
this.code.attach=`${this.Commoditydetails.costType}|${this.Commoditydetails.customerName}|${this.AirOrderId}|${this.Commoditydetails.customerId}|${this.Commoditydetails.outBranchId}`
// this.Time15();
......
src/components/mall/search.vue
View file @ 846e567e
......@@ -305,8 +305,8 @@ export default {
startDate=`${y}-${m>9?m:'0'+m}-01`
endDate=`${y}-${m>9?m:'0'+m}-${new Date(y,m,0).getDate()}`
} else if(this.searchItem[5]!='' && this.searchItem[5]!='0') {
startDate=`20${multData[0]}`
endDate=`20${multData[1]}`
startDate=`20${this.multData[0]}`
endDate=`20${this.multData[1]}`
}
if(this.minPrice!=''){
minPrice=parseFloat(this.minPrice)
......
src/components/visa/SchedProduct.vue
View file @ 846e567e
......@@ -293,7 +293,7 @@
</p>
<p>
<span class="Spanwidth pfR">实付款：</span>
<span style="color:#FF680B;font-size:18px;">￥{{formInline.CustomerPayMoney}}</span>起
<span style="color:#FF680B;font-size:18px;">￥{{SettlementPrice}}</span>起
</p>
</div>
......@@ -326,7 +326,7 @@
</li>
<li style="color:#FF680B;font-weight:600">
<span>实付款</span>
<span>￥<span style="font-size:18px;">{{formInline.CustomerPayMoney}}</span></span>
<span>￥<span style="font-size:18px;">{{SettlementPrice}}</span></span>
</li>
</ul>
</el-col>
......@@ -494,7 +494,6 @@ export default {
this.formInline.DiscountMoney = (this.price - this.SettlementPrice).toFixed(2);
this.CouponIds=this.CouponIds.substring(0,this.CouponIds.length-1)
this.formInline.CouponAllotIds=this.CouponIds;
this.formInline.CustomerPayMoney=this.SettlementPrice;
},
......@@ -601,7 +600,6 @@ export default {
let num=this.formInline.AdultPeopleNum+this.formInline.ChildPeopleNum;
this.formInline.TotalPrice= num * this.price;
this.SettlementPrice=this.formInline.TotalPrice;
this.formInline.CustomerPayMoney=this.formInline.TotalPrice;
this.price=this.formInline.TotalPrice;
} else {
......
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