From dccf1d0bdeebe29ef3025138d3dedf569660e014 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Mon, 14 Oct 2024 18:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E5=8F=8A?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages-home/home/active.vue            | 32 +++------------------------
 pages-order/my/evaluate.vue           |  2 +-
 pages-shop/shopDetail/shopDetail.vue  |  1 +
 pages/my/cardRoll.vue                 |  6 +++++
 pages/my/my.vue                       | 20 +----------------
 pages/myCar/myCar.vue                 |  1 -
 pages/myReservation/myReservation.vue |  8 +------
 7 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/pages-home/home/active.vue b/pages-home/home/active.vue
index 9ccf2d4..a33ac92 100644
--- a/pages-home/home/active.vue
+++ b/pages-home/home/active.vue
@@ -34,8 +34,7 @@
 <script>
 import VNavigationBar from '@/components/VNavigationBar.vue'
 import request from "@/utils/request";
-import {getUserInfoRequest} from "@/utils/common.js";
-import {getToken,setUserInfo,getUserInfo} from '@/utils/auth.js'
+import {getToken,getUserInfo} from '@/utils/auth'
 export default {
   components: {
     VNavigationBar,
@@ -75,14 +74,8 @@ export default {
         url: '/pages/login/login'
       })
     }else{
-      console.log("已登录")
-      if(!getUserInfo()){
-        console.log("没有用户信息")
-        this.getUserInfos()
-      }else{
-        this.customInfo = JSON.parse(getUserInfo())
-        this.getActive()
-      }
+      //直接取缓存中的用户信息
+      this.customInfo = JSON.parse(getUserInfo())
     }
   },
   onLoad(data) {
@@ -118,24 +111,6 @@ export default {
       console.log("index",this.index)
       this.joinKkylAct()
     },
-    //获取当前登录用户信息
-    async getUserInfos() {
-      request({
-        url: "/userClient/customer/getUserCustomer",
-        method: 'get',
-        params:{}
-      }).then(res=>{
-        if(!res.data){
-          uni.reLaunch({
-            url: '/pages/my/register'
-          })
-        }else{
-          setUserInfo(JSON.stringify(res.data))
-          this.customInfo = res.data
-          this.getActive()
-        }
-      })
-    },
     //查询营销活动列表
     async getActive() {
       this.activeList=[]
@@ -239,7 +214,6 @@ export default {
               uni.showToast({
                 title:'支付成功'
               })
-              this.getUserInfos()
             }
             // 支付成功后的回调函数， res.errMsg = 'requestPayment:ok'
           },
diff --git a/pages-order/my/evaluate.vue b/pages-order/my/evaluate.vue
index 4f458ed..b26a1f4 100644
--- a/pages-order/my/evaluate.vue
+++ b/pages-order/my/evaluate.vue
@@ -6,7 +6,7 @@
 				<view class="date">{{ item.commentTime }}</view>
 				<view class="message">
 <!--					这家修理厂的喷漆工艺非常不错，特别均匀，师傅也很细心。如果您需要做喷漆或者维修服务，不要错过这里！-->
-          {{item.commentDesc}}
+          {{item.commentDesc || "未输入评价内容"}}
 				</view>
 				<view class="rate">
 					<!-- 设置尺寸大小 -->
diff --git a/pages-shop/shopDetail/shopDetail.vue b/pages-shop/shopDetail/shopDetail.vue
index f580bab..5cd489e 100644
--- a/pages-shop/shopDetail/shopDetail.vue
+++ b/pages-shop/shopDetail/shopDetail.vue
@@ -124,6 +124,7 @@
       }
 		},
 		onShow() {
+		  this.cancelReservation()
 			this.getServer()
 		},
 		methods: {
diff --git a/pages/my/cardRoll.vue b/pages/my/cardRoll.vue
index c758a03..3f96b0b 100644
--- a/pages/my/cardRoll.vue
+++ b/pages/my/cardRoll.vue
@@ -36,6 +36,9 @@
             <view class="cardLabel">余额</view>
           </view>
 				</view>
+        <view class="no-data" v-if="customInfo.couponList.length==0">
+          <image class=""  src="@/static/images/nothing.png" ></image>
+        </view>
 <!--				<view class="cardItemBottom">-->
 <!--					<view class="useSm">使用说明</view>-->
 <!--					<view class="useBtn">去使用</view>-->
@@ -239,5 +242,8 @@
 			bottom: 2rpx;
 			transform: translate(-50%, 0);
 		}
+    .no-data{
+      text-align: center;
+    }
 	}
 </style>
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 0db359f..aba5287 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -67,8 +67,7 @@
 	import tabBarVue from '@/components/tabBar/tabBar.vue'
 	import request from "@/utils/request";
   import config from '@/config'
-	import {getUserInfoRequest} from "@/utils/common.js";
-	import {getToken,setUserInfo,getUserInfo} from '@/utils/auth'
+	import {getToken,getUserInfo} from '@/utils/auth'
 	export default {
 		components: {
 			tabBarVue,
@@ -113,23 +112,6 @@
 					url: '/pages/my/myEquity'
 				})
 			},
-			//获取当前登录用户信息
-		async getServer() {
-			request({
-			  url: "/userClient/customer/getUserCustomer",
-			  method: 'get',
-			  params:{}
-			}).then(res=>{
-			  if(!res.data){
-				uni.reLaunch({
-				  url: '/pages/my/register'
-				})
-			  }else{
-				setUserInfo(JSON.stringify(res.data))
-				this.customInfo = res.data
-			  }
-			})
-		  }
 		}
 	}
 </script>
diff --git a/pages/myCar/myCar.vue b/pages/myCar/myCar.vue
index 74cbdae..2326f8d 100644
--- a/pages/myCar/myCar.vue
+++ b/pages/myCar/myCar.vue
@@ -29,7 +29,6 @@
 import VNavigationBar from '@/components/VNavigationBar.vue';
 import request from "../../utils/request";
 import config from "config";
-import {getUserInfoRequest} from "@/utils/common";
 import {getToken,setJSONData} from '@/utils/auth'
 
 export default {
diff --git a/pages/myReservation/myReservation.vue b/pages/myReservation/myReservation.vue
index c792766..abf0866 100644
--- a/pages/myReservation/myReservation.vue
+++ b/pages/myReservation/myReservation.vue
@@ -21,8 +21,7 @@
 	import tabBarVue from '@/components/tabBar/tabBar.vue'
 	import reservationOrderVue from '../../components/reservationOrder/reservationOrder.vue'
   import request from "@/utils/request";
-  import {getUserInfoRequest} from "@/utils/common.js";
-  import {getToken,setUserInfo} from '@/utils/auth.js'
+  import {getToken} from '@/utils/auth.js'
 
 	export default {
 		components: {
@@ -57,15 +56,10 @@
         })
       }else{
         console.log("已登录")
-        this.getUserInfos()
       }
       this.getBookingPage()
     },
 		methods: {
-      //获取当前登录用户信息
-      async getUserInfos() {
-        getUserInfoRequest()
-      },
       async getBookingPage(){
         const res = await request({
           url: "/userClient/repair/booking/page",