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

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__CB9D85D",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : 2,
+    "versionCode" : 4,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/login/index.vue

@@ -24,11 +24,11 @@
 				</view>
 				<view class="login-btn" @click="getYzmBtn" :class="indexData.telStatus"></view>
 			</view>
-			<view class="bottom-btn-box">
+		<!-- 	<view class="bottom-btn-box">
 				<view class="apple-btn" v-if="showAppleLogin" @click="appleLoginClick"></view>
-				<!-- 				<view class="wx-btn" @click="wxLoginClick"></view> -->
+				<view class="wx-btn" @click="wxLoginClick"></view>
 				<view class="yk-btn" @click="ykBtn"></view>
-			</view>
+			</view> -->
 		</view>
 		<agree-content-dialog ref="agreeContentDialogRef" :agreeType="agreeType"></agree-content-dialog>
 		<agree-dialog ref="agreeDialogRef" @confirm-btn="confirmBtn"></agree-dialog>

pages/study/index.vue

@@ -65,7 +65,7 @@
 	const eggDialogRef = ref(null);
 	const current = ref(0);
 	const currentDuration = ref(500)
-	const YouKeContent = '您当前是游客身份，登录后才能浏览内容，现在去登录？';
+	const YouKeContent = '您当前的身份是游客，想要体验完整内容需注册成用户!';
 	const zhangId = ref(null); //游客使用
 	const nianji = ref(null); //游客使用
 	const cardId = ref(null); //游客使用
@@ -378,7 +378,6 @@
 			url: '/pages/login/index'
 		});
 	}
-
 	function eggBtn() {
 		console.log('点击：开启提分之旅');
 		getProjectImg();