Merge branch 'zzx' into 2.0

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

@@ -2,7 +2,7 @@
 	<view class="kaihuiLink">
 		<view class="imgBox" @click="handleBtn">
 			<image
-				src="http://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/ltefe2iGqNPa7eeb7ab61a1b713835d0587ee595b211.jpg/1.jpg"
+				src="http://zswl-dev.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/hYSp4iUadCmd423d83bffdb8bb80607cfcac5ff64a0c.jpg/1.jpg"
 				mode="widthFix"></image>
 		</view>
 	</view>
@@ -51,7 +51,7 @@
 						success(res) {
 							if (res.confirm) {
 								uni.navigateTo({
-									url: '/login/login/login?redirect=/special/water'
+									url: '/login/login/login?redirect=/special/kaihui'
 								})
 							}
 						}
@@ -72,16 +72,15 @@
 
 <style lang="scss" scoped>
 	.kaihuiLink {
-		margin: 0;
-		padding: 0;
-		overflow-x: hidden;
-
 		.imgBox {
-			height: 100vh;
-			position: relative;
-
 			&>image {
-				width: 100%;
+				width: 100vw;
+				height: 100vh;
+				object-fit: cover;
+				position: fixed;
+				top: 0;
+				left: 0;
+				z-index: -1;
 			}
 		}
 	}