From d30bc0c3024b84fd8691bde9b3bddcbb16ca0cfc Mon Sep 17 00:00:00 2001
From: "yangsai@163.com" <2624183217@qq.com>
Date: Thu, 18 Jul 2024 23:17:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?YS:=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/order_list/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/goods/order_list/index.vue b/pages/goods/order_list/index.vue
index 01c3690..3eb17a7 100644
--- a/pages/goods/order_list/index.vue
+++ b/pages/goods/order_list/index.vue
@@ -116,7 +116,7 @@
 							<!-- {{$t(`共`)}}{{ item.total_num || 0 }}{{$t(`件商品，总金额`)}}
 							<text class="money">{{$t(`￥`)}}{{ item.pay_price }}</text> -->
 						</view>
-						<view class="totalPrice" v-if="item.wei_status==1">
+						<view class="totalPrice" v-if="item.wei_status==1||item.wei_status==2">
 							<text style="font-size: 24rpx;color: #999999;">已付定金：<text style="color: #333333;">¥{{item.pay_money_dingjin}}</text></text>
 							<text style="font-size: 24rpx;color: #999999;margin:0 30rpx;">本次尾款支付：<text style="color: #E4884E;">¥{{item.pay_money_wei}}</text></text>
 							

From ab88b526d05fbacf65e466d3e8c5da9d254826e1 Mon Sep 17 00:00:00 2001
From: "yangsai@163.com" <2624183217@qq.com>
Date: Thu, 18 Jul 2024 23:24:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?YS:0=E5=85=83=E4=BB=98=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/cashier/index.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pages/goods/cashier/index.vue b/pages/goods/cashier/index.vue
index 617870b..e43d2d5 100644
--- a/pages/goods/cashier/index.vue
+++ b/pages/goods/cashier/index.vue
@@ -1,18 +1,18 @@
 <template>
-	<view class="page" v-if="payPriceShow">
+	<view class="page" >
 		<view class="pay-price">
 			<view class="price">
 				<text class="unit">{{$t(`￥`)}}</text>
 				<numberScroll :num='payPriceShow' color="#E4884E" width='36' height='70' fontSize='60'></numberScroll>
 			</view>
-			<view class="count-down">
+			<view class="count-down" v-if="!wei_status">
 				{{$t(`支付剩余时间`)}}：
 				<countDown :is-day="false" :tip-text="' '" :day-text="' '" :hour-text="' : '" :minute-text="' : '"
 					:second-text="' '" :datatime="invalidTime"></countDown>
 			</view>
 		</view>
 		<view class="payment">
-			<!-- <view class="title">
+			<!-- <view class="title"> 
 				{{$t(`支付方式`)}}
 			</view> -->
 			<view class="item acea-row row-between-wrapper" v-for="(item,index) in cartArr" :key="index"
@@ -109,7 +109,8 @@
 					msg: ''
 				},
 				formContent: '',
-				oid: 0
+				oid: 0,
+				wei_status:0
 			}
 		},
 		watch: {
@@ -216,6 +217,7 @@
 					this.cartArr[2].number = res.data.now_money;
 					this.number = Number(res.data.now_money) || 0;
 					this.oid = res.data.oid
+					this.wei_status = res.data.wei_status;
 					uni.hideLoading();
 				}).catch(err => {
 					uni.hideLoading();