From b01a431ede8440ef71988260b480aab5afb4fde3 Mon Sep 17 00:00:00 2001
From: zouyanyan <254651820@qq.com>
Date: Mon, 14 Sep 2026 17:58:33 +0800
Subject: [PATCH] upbug

---
 manifest.json               |  4 ++--
 pages/cart/cart.vue         |  5 ++++-
 pages/category/category.vue |  6 ++++--
 pages/chatbox/chat.vue      |  4 +++-
 pages/index/index.vue       |  7 +++++--
 pages/product/cdetail.vue   |  2 +-
 pages/product/detail.vue    |  2 +-
 pages/product/list.vue      |  8 ++++++--
 pages/user/user.vue         |  7 +++++--
 utils/utils.js              | 18 ++++++++++++++++--
 10 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/manifest.json b/manifest.json
index 381dfe0..0468b3b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "瑜伽汇",
     "appid" : "__UNI__B6E0086",
     "description" : "瑜伽汇",
-    "versionName" : "1.0.4",
-    "versionCode" : 104,
+    "versionName" : "1.0.24",
+    "versionCode" : 1024,
     "transformPx" : false,
     "app-plus" : {
         "flexible" : true,
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 6de44ed..ef14cc6 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -141,7 +141,7 @@
 </template>
 
 <script>
-	import { myCache,getcartNum,getmessageNum,getcartLoseNum,getRemoteFile } from '../../utils/utils.js';
+	import { myCache,logindo,getcartNum,getmessageNum,getcartLoseNum,getRemoteFile } from '../../utils/utils.js';
 	import openlogin from "../components/openlogin.vue";
 	export default {
 		components: {
@@ -205,6 +205,9 @@
 			}
 		},
 	    onShow() {
+			//判断登录，跳转去登录
+			logindo();
+			
 			console.log('onShow');
 			this.openId = myCache('openId');
 			var user = myCache('user');
diff --git a/pages/category/category.vue b/pages/category/category.vue
index 52217f8..b8be3db 100644
--- a/pages/category/category.vue
+++ b/pages/category/category.vue
@@ -154,7 +154,7 @@
 </template>
 
 <script>
-	import { myCache,getcartNum,getmessageNum,getRemoteFile } from '../../utils/utils.js';
+	import { myCache,logindo,getcartNum,getmessageNum,getRemoteFile } from '../../utils/utils.js';
 	import openlogin from "../components/openlogin.vue";
 	import selShop from "../components/selShop.vue";
 	export default {
@@ -309,7 +309,9 @@
 			this.getSort();
 		},
 		onShow(){
-
+			//判断登录，跳转去登录
+			logindo();
+			
 			this.openId = myCache('openId');
 			var user = myCache('user');
 			this.userid = user.userid? user.userid:'';
diff --git a/pages/chatbox/chat.vue b/pages/chatbox/chat.vue
index 4ca233f..1992736 100644
--- a/pages/chatbox/chat.vue
+++ b/pages/chatbox/chat.vue
@@ -56,7 +56,7 @@
 <script>
 import { mapState, mapActions, mapGetters } from 'vuex'
 import dateTime from '@/common/dateTime.js'
-import {myCache,clearBadgeNumber} from "../../utils/utils";
+import {myCache,logindo,clearBadgeNumber} from "../../utils/utils";
 
 export default {
   data() {
@@ -99,6 +99,8 @@ export default {
     }
   },
   onShow() {
+	  //判断登录，跳转去登录
+	  logindo();
     console.log("this.chats列表.......",this.chats)
     this.loadStatus = 'nomore'
     this.setBadge(this.unreadCount)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 138c45f..5720398 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -76,7 +76,7 @@
 		<top ref="topId"></top>
 		
 		<!-- service 客服-->
-		<service ref="serviceId" @goservice="goservice"></service>
+		<!-- <service ref="serviceId" @goservice="goservice"></service> -->
 		
 		<u-toast ref="uToast" />
 
@@ -85,7 +85,7 @@
 
 <script>
 	import checkupdate from "@/uni_modules/uni-upgrade-center-app/utils/check-update.js"
-	import { myCache,getcartNum,getmessageNum,getRemoteFile,ifnonet } from '../../utils/utils.js';
+	import { myCache,logindo,getcartNum,getmessageNum,getRemoteFile,ifnonet } from '../../utils/utils.js';
 	import openlogin from "../components/openlogin.vue";
 	import top from "../components/top.vue";
 	import service from "../components/service.vue";
@@ -223,6 +223,8 @@
 			// },2000);
 		},
 		onShow() {
+			//判断登录，跳转去登录
+			logindo();
 			
 			this.shopid = myCache('myshopid')?myCache('myshopid'):null;
 			this.shop = myCache('myshop')?myCache('myshop'):'';
@@ -316,6 +318,7 @@
 			this.$refs.topId.topData(e.scrollTop);
 		},
 		methods: {
+			
 			getCurrentActivity() {
 			    // 获取当前Activity（仅App端有效）
 			    const mainActivity = plus.android.runtimeMainActivity();
diff --git a/pages/product/cdetail.vue b/pages/product/cdetail.vue
index 4faf6e9..8655614 100644
--- a/pages/product/cdetail.vue
+++ b/pages/product/cdetail.vue
@@ -153,7 +153,7 @@
 		<openlogin ref="loginId" @getPhoneNumber="getPhoneNumber"></openlogin>
 
 		<!-- service 客服-->
-		<service ref="serviceId" @goservice="goservice"></service>
+		<!-- <service ref="serviceId" @goservice="goservice"></service> -->
 
 		<!-- top 返回顶部-->
 		<top ref="topId"></top>
diff --git a/pages/product/detail.vue b/pages/product/detail.vue
index bbf00c2..a4954bf 100644
--- a/pages/product/detail.vue
+++ b/pages/product/detail.vue
@@ -165,7 +165,7 @@
 		<openlogin ref="loginId" @getPhoneNumber="getPhoneNumber"></openlogin>
 
 		<!-- service 客服-->
-		<service ref="serviceId" @goservice="goservice"></service>
+		<!-- <service ref="serviceId" @goservice="goservice"></service> -->
 
 		<!-- top 返回顶部-->
 		<top ref="topId"></top>
diff --git a/pages/product/list.vue b/pages/product/list.vue
index a1c1a85..76acd55 100644
--- a/pages/product/list.vue
+++ b/pages/product/list.vue
@@ -83,7 +83,7 @@
 		<openlogin ref="loginId" @getPhoneNumber="getPhoneNumber"></openlogin>
 
 		<!-- service 客服-->
-		<service ref="serviceId" @goservice="goservice"></service>
+		<!-- <service ref="serviceId" @goservice="goservice"></service> -->
 
 		<!-- top 返回顶部-->
 		<top ref="topId"></top>
@@ -98,7 +98,7 @@
 </template>
 
 <script>
-	import { myCache,getcartNum,getRemoteFile } from '../../utils/utils.js';
+	import { myCache,logindo,getcartNum,getRemoteFile } from '../../utils/utils.js';
 	import openlogin from "../components/openlogin.vue";
 	import top from "../components/top.vue";
 	import service from "../components/service.vue";
@@ -193,6 +193,10 @@
 			}
 		},
 		onShow() {
+			
+			//判断登录，跳转去登录
+			logindo();
+			
 			this.openId = myCache('openId');
 			var user = myCache('user');
 			this.userid = user.userid? user.userid:'';
diff --git a/pages/user/user.vue b/pages/user/user.vue
index e4198be..93f0d2d 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -179,13 +179,13 @@
 		<openlogin ref="loginId" @getPhoneNumber="getPhoneNumber"></openlogin>
 
 		<!-- service 客服-->
-		<service ref="serviceId" @goservice="goservice"></service>
+		<!-- <service ref="serviceId" @goservice="goservice"></service> -->
 
 	</view>
 </template>
 
 <script>
-	import { myCache,getcartNum,getmessageNum,getRemoteFile,clearBadgeNumber } from '../../utils/utils.js';
+	import { myCache,logindo,getcartNum,getmessageNum,getRemoteFile,clearBadgeNumber } from '../../utils/utils.js';
 	import openlogin from "../components/openlogin.vue";
 
 	import top from "../components/top.vue";
@@ -324,6 +324,9 @@
 			this.getmember();
 		},
 		onShow() {
+			//判断登录，跳转去登录
+			logindo();
+			
 			if(myCache("ifuserEdit"))
 			{
 				myCache("ifuserEdit",false)
diff --git a/utils/utils.js b/utils/utils.js
index 76ae581..c40065d 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -160,8 +160,21 @@ function clearBadgeNumber() {
 	} else {
 	  console.log('其他平台：', platform)
 	}
-
 };
+function logindo(){
+	// console.log("logindologindologindologindologindologindologindo")
+	var token = uni.getStorageSync("token")
+	if(!token){
+		// 跳转登录
+		uni.navigateTo({
+			url: `/pages/login/login`
+		});
+	}
+	else{
+		// 已经登录
+	}
+};
+
 export {
 	myCache,
 	getRemoteFile,
@@ -172,6 +185,7 @@ export {
 	getcartNum,
 	getcartLoseNum,
 	getmessageNum,
-	clearBadgeNumber
+	clearBadgeNumber,
+	logindo
 };