Merge branch '2024鹅状元' of https://gogs.mtavip.com/wangguoyu/uniProject into 2024鹅状元

pages/my/index.vue

@@ -59,6 +59,19 @@
 	import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
 	import telDialog from './telDialog.vue'
 	import {MESSAGE_VISITER_TO_LOGIN} from "@/utils/constant.js"
+	import {
+		onShow
+	} from '@dcloudio/uni-app';
+	onShow(() => {
+		if(!cacheManager.get('auth')){
+			youkeFun();
+		}else{
+			// 非游客
+			noYoukeFun();
+		}
+	})
+	
+	
 	const zhangId = ref(null);
 	const nianji = ref(null);
 	const cardId = ref(null);
@@ -267,10 +280,7 @@
 		if(!cacheManager.get('auth')){
 			// 游客
 			routerOpt = options;
-			youkeFun();
 		}else{
-			// 非游客
-			noYoukeFun();
 		}
 	})
 

pages/study/product/yingyu.vue

@@ -25,7 +25,7 @@
 						<!-- 锁 -->
 						<view v-if="item.firstFlag !='1'" class="brand-lock"></view>
 						<!-- 动物类型 -->
-						<view v-if="item.daeFlag  &&  animalNum == index isVip != 'Visitor'" :class="currentGrowth()"></view>
+						<view v-if="item.daeFlag  &&  animalNum == index && isVip != 'Visitor'" :class="currentGrowth()"></view>
 						<view class="icon-content-box">
 							<!-- 序号 -->
 							<view class="brand-icon">{{ item.number }}</view>