From 3d494ecd5f966b8c52a72aa8186712709c3aea7f Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Sat, 30 Nov 2024 03:47:34 +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,=E6=9C=AA=E4=BB=98=E6=AC=BE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=B1=95=E7=A4=BA=E6=94=AF=E4=BB=98=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_goods/orderDetail/orderDetail.vue | 67 +++++++++++++++++++++++---
 1 file changed, 60 insertions(+), 7 deletions(-)

diff --git a/page_goods/orderDetail/orderDetail.vue b/page_goods/orderDetail/orderDetail.vue
index c41d2f5..e62360b 100644
--- a/page_goods/orderDetail/orderDetail.vue
+++ b/page_goods/orderDetail/orderDetail.vue
@@ -428,6 +428,27 @@
 					</text>
 				</view>
 			</view>
+
+      <view class="order-cell">
+        <text class="tit">已付金额</text>
+        <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>
+        </view>
+      </view>
+
+      <view class="order-cell">
+        <text class="tit">未付金额</text>
+        <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' }}
+          </text>
+        </view>
+      </view>
+
 			<view v-if="!Number(orderData.sales_money)">
 				<view class="order-cell" v-if="orderData.order_type != 4">
 					<text class="tit">运费</text>
@@ -535,18 +556,17 @@
 			</view>
 			<view class="order-cell">
 				<view class="box align-right">
-					<text>实付金额：</text>
+					<text>总计金额：</text>
 					<text class="color-base-text price-font">
 						<text class="font-size-goods-tag">{{ $lang('common.currencySymbol') }}</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 class="font-size-base">{{ (orderData && orderData.pay) ? orderData.pay.total_money : '0.00' }}</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>
 				</view>
 			</view>
 
-			<view class="order-action fixed-bottom bottom-safe-area" v-if="orderData.action.length > 0">
+			<view class="order-action fixed-bottom bottom-safe-area" v-if="orderData.action.length > 0 || isOrderPayShow">
 				<view class="order-box-btn white"
 					v-if="evaluateConfig.evaluate_status == 1 && orderData.is_evaluate == 1"
 					@click="operation('memberOrderEvaluation')">
@@ -559,6 +579,12 @@
 					@click="operation(operationItem.action)">
 					{{ operationItem.title }}
 				</view>
+        <!--是否展示自定义支付按钮-->
+        <view v-if="isOrderPayShow"
+              class="order-box-btn color-base-border color-base-text"
+              @click="operation('orderPay')">
+          支付
+        </view>
 			</view>
 
 			<view class="order-action fixed-bottom bottom-safe-area"
@@ -591,6 +617,7 @@
 		data() {
 			return {
 				isIphoneX: false,
+        isOrderPayShow:false,//是否展示支付按钮|如果订单详情里存在支付按钮,这里就=false,否则判断order.pay是不是未支付/部分支付,是则isOrderPayShow=true
 				orderId: 0,
 				order: 0,
 				orderData: {
@@ -621,7 +648,10 @@
 			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();
 
@@ -668,6 +698,29 @@
 							let num = 0;
 
 							this.orderData = res.data;
+              this.orderData.pay = res.data.pay;
+              console.log('11xxx',this.orderData.action)
+
+
+              let _actionArr = []
+              this.orderData.action.forEach((v) => {
+                _actionArr.push(v.action)
+              })
+
+              this.isOrderPayShow = false;
+              //判断"orderPay"在不在_actionArr中
+              if (!_actionArr.includes('orderPay') && res.data.pay.pay_status == 0) {
+                this.isOrderPayShow = true
+              }
+
+
+
+
+              // this.isOrderPayShow = false;
+              // this.orderData.action.foreach((v)=>{
+              //   console.log('vvv',v.action)
+              // })
+
 
 							let refund_order_goods_ids = [];
 							this.orderData.order_goods.forEach(v => {