From 922ba1b054c5f46c174db602dfab2432837689c7 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 27 Sep 2023 10:48:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E7=BA=B3=E4=BF=9D=E8=AF=81=E9=87=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/margin/margin.vue               | 31 ++++++++++++---------------
 pages/product/list/index.vue          |  2 ++
 pages/supply_chains/supply_chains.vue |  3 +++
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index 7b16f86..356de23 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -9,7 +9,7 @@
 					<text>{{merchant_Data.paid_margin}}</text>
 				</view>
 				<view class="item">
-					<text>未缴纳保证金</text>
+					<text>剩余缴纳保证金</text>
 					<text>{{merchant_Data.unpaid_margin}}</text>
 				</view>
 				<view class="item">
@@ -34,12 +34,13 @@
 		<view class="content-order" v-for="(item,i ) in productList">
 			<view class="">订单编号：{{item.order_sn}}</view>
 			<view class="">支付金额：{{item.total_price}}</view>
-			<view class="">支付状态：{{item.pay_type==1?'已支付':'待支付'}}</view>
+			<view class="">支付状态：{{item.paid==1?'已支付':'待支付'}}</view>
 			<view class="">支付时间：{{item.pay_time}}</view>
 		</view>
 		<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
 			<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 		</view>
+		
 	</view>
 </template>
 
@@ -97,7 +98,7 @@
 						that.$set(that, 'productList', productList);
 					}, 500)
 
-					// console.log(that.productList)
+				
 					that.$set(that.where, 'page', that.where.page + 1);
 					if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
 				}).catch(err => {
@@ -125,32 +126,28 @@
 					uni.showModal({
 						title: '提示',
 						content: '商户' + this.merchant_Data.mer_name + '是否同意缴纳保证金',
-						success: function(res) {
+						success: (res) => {
 							if (res.confirm) {
-								
+
 								// console.log('用户点击确定');
 								paymerchant().then((res) => {
-									
+
 									uni.requestPayment({
 										provider: 'wxpay',
 										orderInfo: res.data
 											.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
-										success: function(res) {
-											that.$util.Tips({
+										success: (res) => {
+											this.$util.Tips({
 												title: '支付成功'
 											});
-										
-											setTimeout(() => {
-												that.decimal()
-												that.list(true)
-											}, 1000)
-											
+											this.decimal()
+											this.list(true)
 										},
-										fail: function(err) {
-											
-											that.$util.Tips({
+										fail: (err) => {
+											this.$util.Tips({
 												title: '支付失败'
 											});
+
 											console.log('fail:' + JSON.stringify(err));
 										}
 									});
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index c837b64..882ce83 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -556,6 +556,7 @@
 									title: '下架成功',
 									icon: 'none'
 								})
+								that.getList(this.mer_id,false)
 							} else if (res.cancel) {
 								// console.log('用户点击取消');
 							}
@@ -576,6 +577,7 @@
 						icon: 'success'
 					}, () => {
 						that.$set(item, 'is_show', item.is_show == 0 ? 1 : 0);
+						that.getList(this.mer_id,false)
 					});
 				}).catch(err => {
 					return that.$util.Tips({
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 42bc922..2e12f8a 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -268,6 +268,9 @@
 			})
 
 		},
+		onShow(){
+			this.list(true,this.street_id);
+		},
 		onReachBottom() {
 			if (this.productList.length > 0) {
 				setTimeout(() => {