diff --git a/manifest.json b/manifest.json index 3ea7aac..d602711 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "齐采药", - "appid" : "__UNI__9009737", + "appid" : "__UNI__9C80A8A", "description" : "", "versionName" : "1.000.188", "versionCode" : 10001234, diff --git a/page_goods/orderDetail/orderDetail.vue b/page_goods/orderDetail/orderDetail.vue index e62360b..78407ee 100644 --- a/page_goods/orderDetail/orderDetail.vue +++ b/page_goods/orderDetail/orderDetail.vue @@ -434,7 +434,7 @@ {{ $lang('common.currencySymbol') }} - {{ (orderData && orderData.pay) ? orderData.pay.received_money : '' }} + {{payInfo.received_money}} @@ -444,7 +444,7 @@ {{ $lang('common.currencySymbol') }} - {{ (orderData && orderData.pay) ? orderData.pay.pay_money : '0.00' }} + {{payInfo.pay_money}} @@ -559,7 +559,7 @@ 总计金额: {{ $lang('common.currencySymbol') }} - {{ (orderData && orderData.pay) ? orderData.pay.total_money : '0.00' }} + {{ payInfo.total_money }} @@ -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 = []