From 3fd5156ad3b7da0b99c3ee0f212c1a36e48df32c Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Sat, 30 Nov 2024 05:50:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF-=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                          |  2 +-
 page_goods/orderDetail/orderDetail.vue | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

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 @@
         <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 = []