Преглед изворни кода

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

tanxue пре 4 месеци
родитељ
комит
52c0615df1
2 измењених фајлова са 18 додато и 10 уклоњено
  1. 16 8
      components/custom-tabbar/custom-tabbar.vue
  2. 2 2
      pages/study/product/shuxue.vue

+ 16 - 8
components/custom-tabbar/custom-tabbar.vue

@@ -6,9 +6,12 @@
 			</view>
 		</view>
 	</view>
+	<tip-middle-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :content="MESSAGE_VISITER_TO_LOGIN"></tip-middle-dialog>
 </template>
 
 <script>
+	import {MESSAGE_VISITER_TO_LOGIN} from "@/utils/constant.js"
+	import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
 	import {
 		useTabBarHistory
 	} from '@/utils/emitEvents.js';
@@ -18,7 +21,9 @@
 		getUserIdentity
 	} from "@/utils/common";
 	export default {
-
+		components: {
+			tipMiddleDialog
+		},
 		data() {
 			return {
 				tabList: [{
@@ -37,8 +42,8 @@
 						path: `/pages/my/index`
 					},
 				],
-				currentTab: 0
-
+				currentTab: 0,
+				MESSAGE_VISITER_TO_LOGIN
 			};
 		},
 		props: {
@@ -54,15 +59,18 @@
 
 		},
 		methods: {
-
+			// 游客弹窗---确定
+			ykConfirm(){
+				uni.redirectTo({
+					url: '/pages/login/index'
+				});
+			},
+	
 			switchTab(path, index) {
 				this.currentTab = index;
 				if (getUserIdentity() == 'Visitor') {
 					if (path === '/pages/game/index') {
-						// 游戏需要返回功能
-						uni.navigateTo({
-						  url: path
-						});
+						this.$refs.youkeDialogRef.handleShow();
 						return ;
 					}
 					uni.redirectTo({

+ 2 - 2
pages/study/product/shuxue.vue

@@ -23,8 +23,8 @@
 					</view>
 					<view v-if="isVip !== 'VIP'">
 						<!-- 序号或锁 -->
-						<view v-if="item.firstFlag ==1" class="brand-icon">{{ item.number }}</view>
-						<view v-if="item.firstFlag !=1" class="brand-lock"></view>
+						<view v-if="options.number ==1" class="brand-icon">{{ item.number }}</view>
+						<view v-if="options.number !=1" class="brand-lock"></view>
 						<!-- 动物类型 -->
 						<view v-if="item.daeFlag && growthType ==0" class="animal-img dan-img"></view>
 						<view v-if="item.daeFlag && growthType ==1" class="animal-img xiao-e-img"></view>