Browse Source

修改bug

wangxy 4 days ago
parent
commit
9b7a5cca80
2 changed files with 39 additions and 19 deletions
  1. 36 16
      pages/Login/clientIndex.vue
  2. 3 3
      pages/Login/test.vue

+ 36 - 16
pages/Login/clientIndex.vue

@@ -7,14 +7,29 @@
 			</view>
 			<view v-if="fromAppShare" class="wechat-auth-box">
 				<view class="auth-tips">欢迎使用小程序</view>
-				<button class="wechat-auth-btn" open-type="getPhoneNumber" @getphonenumber="onWechatAuth">
+				
+				
+				<!-- 协议勾选框和按钮 -->
+				<view class="agreement-checkbox-box">
+					<checkbox-group @change="handleChange">
+						<checkbox class="agreement-checkbox-input" color="#3fd2a1" value="agree" :checked="isAgreed"
+							style="transform:scale(0.7)" />
+					</checkbox-group>
+					<view class="agreement-text-box">
+						在使用当前小程序服务之前,请仔细阅读<view class="agreement-text" @click="agreeBtn('yhxy')">《诚祥学用户协议》</view>和<view
+							@click="agreeBtn('ystk')" class="agreement-text">《诚祥学隐私政策》</view>,如您同意,请勾选后开始使用
+					</view>
+				</view>
+				
+				<button v-if="!isAgreed">微信一键登录</button>
+				<button v-else class="wechat-auth-btn" open-type="getPhoneNumber" @getphonenumber="onWechatAuth">
 					微信一键登录
 				</button>
 
-        <button @click="handleChangeFangshi">
-          切换微信一键登录
-        </button>
-
+				<button @click="handleChangeFangshi">
+				  切换微信一键登录
+				</button>
+		
 			</view>
 		<!-- 	<view @click="ceshi" class="auth-tips">欢迎使用小程序12312312312312</view> -->
 		</view>
@@ -91,17 +106,22 @@
 		getAllImg();
 	})
 
-	// function ceshi() {
-	// 	httpApi.loginApplet({
-	// 		code: '123',
-	// 	}).then(result => {
-	// 		console.log('result', result);
-	// 		openId.value = result.data.openId
-	// 		cacheManager.set('auth', result.data.loginVo)
-	// 		store.setIsCanBack(false)
-	// 		gotoPage();
-	// 	})
-	// }
+	// 你原有的所有方法都不变
+	function handleChange() {
+		isAgreed.value = !isAgreed.value
+	}
+
+	function agreeBtn(code) {
+		if (code === 'yhxy') {
+			uni.navigateTo({
+				url: "/pages/client/my/xieyi"
+			})
+		} else {
+			uni.navigateTo({
+				url: "/pages/client/my/zhengce"
+			})
+		}
+	}
 	// 微信授权登录
 	function onWechatAuth(e) {
 		if (e.detail.errMsg.includes('fail')) {

+ 3 - 3
pages/Login/test.vue

@@ -38,9 +38,9 @@
 				<button type="default" @click="handleLogin" :disabled="!isAgreed"
 					class="phone-green-btn login-btn">登录</button>
 
-        <button @click="handleChangeYijiandenglu">
-          切换微信一键登录
-        </button>
+				<button @click="handleChangeYijiandenglu">
+				  切换微信一键登录
+				</button>
 			</view>
 		</view>
 	</view>