Merge branch 'main' of http://git.njrzwl.cn:3000/liudan/manghe

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();

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>