20241029下班提交 -zzx

my/vipActivation/index.vue

@@ -107,6 +107,13 @@
 
 			// 二次确认
 			confirmActivation() {
+				if(this.vipQuery.activationCode=='') {
+					uni.showToast({
+						title:'请输入激活码',
+						icon:'none'
+					})
+					return
+				}
 				let that = this
 				uni.showModal({
 					title: '提示',

pages/my/index.vue

@@ -86,9 +86,9 @@
 		<!-- 	<u-cell title="研学MBTI测试"  @click="jump('../../study/test')" :border="false" :isLink="true" arrow-direction="right">
 				<image slot="icon" class="cell-icon" src="../../static/icon8.png" mode=""></image>
 			</u-cell> -->
-<!-- 			<u-cell title="会员激活"  @click="jump('../../my/vipActivation/index')" :border="false" :isLink="true" arrow-direction="right">
+			<u-cell title="会员激活"  @click="jump('../../my/vipActivation/index')" :border="false" :isLink="true" arrow-direction="right">
 				<image slot="icon" class="cell-icon" src="../../static/vip-icon.png" mode=""></image>
-			</u-cell> -->
+			</u-cell>
 			<u-cell title="设置"  @click="jump('../../my/edit/edit')" :border="false" :isLink="true" arrow-direction="right">
 				<image slot="icon" class="cell-icon" src="../../static/setting-icon.png" mode=""></image>
 			</u-cell>

special/kaihui.vue

@@ -23,8 +23,7 @@
 		methods: {
 			handleBtn() {
 				if (uni.getStorageSync('token')) {
-					if (JSON.parse(uni.getStorageSync('userInfo')).setMealCode != 0 && JSON.parse(uni.getStorageSync(
-							'userInfo')).setMealCode) {
+					if (JSON.parse(uni.getStorageSync('userInfo')).setMealCode != 0 && JSON.parse(uni.getStorageSync('userInfo')).setMealCode) {
 						uni.navigateToMiniProgram({
 							appId: 'wx57a08b407511613d',
 							path: '//凯辉/首页/YWUe2IrfXEryMkw'