Commit 8e007732 authored by 罗超's avatar 罗超

Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

parents 60c0f1cd e9727a0b
......@@ -107,7 +107,7 @@
<view style="font-size: 12px; padding-bottom: 3px" v-if="priceStauts.length > 0">
<view v-if="priceStauts[line][index] > 0" style="color:#FF3166">
{{ priceStauts[line][index] }}</view>
<view v-if="priceStauts[line][index] == -1">售罄</view>
<view v-if="priceStauts[line][index] == -1">售罄</view>
<view v-if="priceStauts[line][index] == -2">候补</view>
</view>
</view>
......@@ -313,8 +313,16 @@
const price = this.priceList.find(p => p.startDate == ds)
if (price) {
isexsit = true
if (price.remainNum > 0)
days.push(this.$utils.getretailer() ? price.b2BPrice : price.b2CPrice)
if (price.remainNum > 0){
let priceNum = 0
// #ifdef MP-DI
priceNum = price.b2CPrice
/// #endif
// #ifdef MP-AG
priceNum = price.b2BPrice
/// #endif
days.push(priceNum)
}
else if (price.isSubstitution == 1)
days.push(-2)
else
......@@ -334,7 +342,14 @@
// if (x.startDate == `${year}-${m}-${d}`) {
// isexsit = true;
// if (x.remainNum > 0) {
// days.push(this.$utils.getretailer() ? x.b2BPrice : x.b2CPrice);
// let priceNum = 0
// // #ifdef MP-DI
// priceNum = x.b2CPrice
// // #endif
// // #ifdef MP-AG
// priceNum = x.b2BPrice
// // #endif
// days.push(priceNum);
// //days.push(x.b2CPrice);
// } else {
// days.push(-1);
......
......@@ -498,7 +498,14 @@
</view>
<view class="price" style="text-align: unset;">
<text></text>
<text class="money">{{parseFloat($utils.getretailer()?item.b2BPrice:item.b2CPrice).toFixed(2)}}</text>
<text class="money">
<!-- #ifdef MP-DI -->
{{parseFloat(item.b2CPrice).toFixed(2)}}
<!-- #endif -->
<!-- #ifdef MP-AG -->
{{parseFloat(item.b2BPrice).toFixed(2)}}
<!-- #endif -->
</text>
</view>
</view>
</view>
......
This diff is collapsed.
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