|
|
|
@ -434,7 +434,7 @@ |
|
|
|
<view class="box align-right"> |
|
|
|
<text class="color-title price-font"> |
|
|
|
<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text> |
|
|
|
<text>{{ (orderData && orderData.pay) ? orderData.pay.received_money : '' }}</text> |
|
|
|
<text>{{payInfo.received_money}}</text> |
|
|
|
</text> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
@ -444,7 +444,7 @@ |
|
|
|
<view class="box align-right"> |
|
|
|
<text class="color-title price-font"> |
|
|
|
<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text> |
|
|
|
{{ (orderData && orderData.pay) ? orderData.pay.pay_money : '0.00' }} |
|
|
|
{{payInfo.pay_money}} |
|
|
|
</text> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
@ -559,7 +559,7 @@ |
|
|
|
<text>总计金额:</text> |
|
|
|
<text class="color-base-text price-font"> |
|
|
|
<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text> |
|
|
|
<text class="font-size-base">{{ (orderData && orderData.pay) ? orderData.pay.total_money : '0.00' }}</text> |
|
|
|
<text class="font-size-base">{{ payInfo.total_money }}</text> |
|
|
|
<!-- <text class="font-size-base" v-if="!Number(orderData.sales_money)">{{ orderData.order_money }}</text>--> |
|
|
|
<!-- <text class="font-size-base" v-else-if="Number(orderData.sales_money)">{{ orderData.sales_money }}</text>--> |
|
|
|
</text> |
|
|
|
@ -620,6 +620,7 @@ |
|
|
|
isOrderPayShow:false,//是否展示支付按钮|如果订单详情里存在支付按钮,这里就=false,否则判断order.pay是不是未支付/部分支付,是则isOrderPayShow=true |
|
|
|
orderId: 0, |
|
|
|
order: 0, |
|
|
|
payInfo:{}, |
|
|
|
orderData: { |
|
|
|
action: [] |
|
|
|
}, |
|
|
|
@ -648,9 +649,6 @@ |
|
|
|
if (option.order) this.order = option.order |
|
|
|
|
|
|
|
if (option.order_id) this.orderId = option.order_id; |
|
|
|
if (this.orderId){ |
|
|
|
this.getOrderData(); |
|
|
|
} |
|
|
|
}, |
|
|
|
onShow() { |
|
|
|
this.isIphoneX = this.$util.uniappIsIPhoneX(); |
|
|
|
@ -698,8 +696,8 @@ |
|
|
|
let num = 0; |
|
|
|
|
|
|
|
this.orderData = res.data; |
|
|
|
this.orderData.pay = res.data.pay; |
|
|
|
console.log('11xxx',this.orderData.action) |
|
|
|
this.payInfo = res.data.pay; |
|
|
|
console.log('11xxx',this.payInfo) |
|
|
|
|
|
|
|
|
|
|
|
let _actionArr = [] |
|
|
|
|