From 4a2421b1bd820e3bdbe7039679de72e3bff564de Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Tue, 24 Sep 2024 22:33:21 +0800
Subject: [PATCH 1/3] 1

---
 pages/orderList/orderList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/orderList/orderList.vue b/pages/orderList/orderList.vue
index 2429be5..7f0a7b5 100644
--- a/pages/orderList/orderList.vue
+++ b/pages/orderList/orderList.vue
@@ -37,9 +37,9 @@
             <text>{{ formatTimestamp(item.createTime) }}</text>
           </view>
           <view class="line3">
-            <view @click="goPay(item)" class="showOrder">支付</view>
-            <view @click="gotoDetail(item)" class="showOrder">查看订单</view>
-            <view @click="gotoEvaluate(item)" class="evaluate" v-if="item.orderStatus === '1' && !item.commentDesc">评价订单</view>
+            <view v-if="item.orderStatus == '0'" @click="goPay(item)" class="showOrder">支付</view>
+            <view v-if="item.goodsType == '2'" @click="gotoDetail(item)" class="showOrder">查看订单</view>
+            <view @click="gotoEvaluate(item)" class="evaluate" v-if="item.goodsType == '2' && item.orderStatus === '1' && !item.commentDesc">评价订单</view>
           </view>
         </view>
 
@@ -176,7 +176,7 @@ export default {
     async goPay(data) {
       let that = this
       await request({
-        url: '/pay/toPay',
+        url: '/userClient/pay/toPay',
         method: 'get',
         params: {orderId: data.id}
       }).then((res) => {

From a49d953ccc512d93791bf69ab77a7a631decf359 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Tue, 24 Sep 2024 22:36:59 +0800
Subject: [PATCH 2/3] 1

---
 pages/my/my.vue | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pages/my/my.vue b/pages/my/my.vue
index 191108d..8e46126 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -70,8 +70,7 @@
 			tabBarVue,
 			VNavigationBar
 		},
-
-		onLoad(data) {
+		onShow(data) {
 			this.getServer()
 		},
 		data() {
@@ -109,13 +108,8 @@
 					params:{}
 				})
 				this.customInfo = res.data
-        uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo))
-        // JSON.parse(JSON.stringify(files))
-        // const a = uni.getStorageSync('customerInfo')
-        // console.log(JSON.parse(a),115)
-
-
-      }
+                uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo))
+					  }
 		}
 	}
 </script>

From 257cf7df40a06608e8e81cbce72a9b4056a52537 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Tue, 24 Sep 2024 22:37:42 +0800
Subject: [PATCH 3/3] 1

---
 pages/my/myEquity.vue | 2 +-
 pages/my/myInfo.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/my/myEquity.vue b/pages/my/myEquity.vue
index ff2a87d..9a96832 100644
--- a/pages/my/myEquity.vue
+++ b/pages/my/myEquity.vue
@@ -80,7 +80,7 @@
 				levelEquityList: []
 			};
 		},
-    onLoad(data) {
+    onShow(data) {
 		  //当前登录用户信息
       this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
       this.getMemberList()
diff --git a/pages/my/myInfo.vue b/pages/my/myInfo.vue
index 614921e..26791d5 100644
--- a/pages/my/myInfo.vue
+++ b/pages/my/myInfo.vue
@@ -37,7 +37,7 @@
         customInfo:{}
 			};
 		},
-    onLoad(data) {
+    onShow(data) {
       //当前登录用户信息
       this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
     },