Merge branch 'master' of http://39.101.143.165:8090/hxl13994548489/LocalLivingServicesUniapp

common/service/service.js

@@ -73,8 +73,8 @@ http.interceptor.response(async (response) => { /* 请求之后拦截器 */
       let data = response.data
       const token = uni.getStorageSync(ACCESS_TOKEN)
       console.log("------异常响应------",token)
-      console.log("------异常响应------",data.status)
-      switch (data.status) {
+      console.log("------异常响应------",data.code)
+      switch (data.code) {
         case 403:
           tip.error('拒绝访问');
           break
@@ -82,8 +82,8 @@ http.interceptor.response(async (response) => { /* 请求之后拦截器 */
           if(!token || data.message=="Token失效，请重新登录"){
             let timeout=setTimeout(tip.alert('登录已过期'), 1000);
             store.dispatch('Logout').then(() => {
-				clearTimeout(timeout)
-                window.location.reload()
+				      clearTimeout(timeout)
+              window.location.reload()
             }) 
           }
           break
@@ -93,11 +93,11 @@ http.interceptor.response(async (response) => { /* 请求之后拦截器 */
          break
         case 401:
           if (token) {
-           /* store.dispatch('Logout').then(() => {
+            store.dispatch('Logout').then(() => {
               setTimeout(() => {
-                window.location.reload()
+                uni.reLaunch({ url: '/pages/login/login' });
               }, 1500)
-            }) */
+            })
           }
           break
         default:

pages/groupMeal/goods/list.vue

@@ -62,7 +62,7 @@
 				:scroll-with-animation="true"
 			>
 				<view class="goods-category-section" :id="category.scrollId" v-for="category in filteredGoods" :key="category.id">
-					<view class="category-title">{{ category.name }}</view>
+					<!-- <view class="category-title">{{ category.name }}</view> -->
 					<u-checkbox-group v-model="selectedGoods" placement="column">
 						<view class="goods-box" v-for="goods in category.items" :key="goods.id">
 							<view class="goods-card">
@@ -221,6 +221,7 @@ export default {
 				// 审核状态: 0 审核中, 1 已审核, 2 驳回
 				// reviewStatus: 0,
 				name: this.queryName,
+				category: this.currentCategoryTab + 1,
 			}
 			// 售卖中
 			if (this.currentStatusTab == 0) {
@@ -421,6 +422,10 @@ export default {
 		// 核心功能 1: 点击左侧二级分类，右侧商品列表滚动到对应位置
 		onCategoryTabChange(index) {
 			this.currentCategoryTab = index;
+
+			this.onClearSel();
+			this.getData();
+			return;
 			
 			// 1. 设置标记，在滚动动画期间忽略 onGoodsScroll，防止快速切换闪烁
 			this.isScrolling = true; 

pages/login/mimi.vue

@@ -394,7 +394,7 @@
 	}
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 	page {
 		background: #FFFFFF;
 	}

pages/login/xieyi.vue

@@ -218,7 +218,7 @@
 	}
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 	page {
 		background: #FFFFFF;
 	}