From 728f3c0611c8f00de7b314c19a4e36ece431efde Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Tue, 21 May 2024 16:29:01 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=97=A0=E5=BE=AE=E4=BF=A1=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E7=99=BB=E5=BD=95=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/recommend/index.vue   |  2 +-
 pages/users/login/login_copy.vue | 31 +++++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/components/recommend/index.vue b/components/recommend/index.vue
index cc26aa9..467c6d6 100644
--- a/components/recommend/index.vue
+++ b/components/recommend/index.vue
@@ -187,7 +187,7 @@
 		mounted() {
 			this.getArticleList();
 			uni.$on('scroll', res => {
-				if (res.scrollTop > this.tabsTop) {
+				if (res && res.scrollTop > this.tabsTop) {
 					this.isShow = false;
 				} else {
 					this.isShow = true;
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index e8eb10b..d44b97a 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -8,6 +8,7 @@
 						<image src="@/static/images/logo1.png" />
 					</view>
 				</view>
+
 				<view class="" style="margin-top: 10rpx;" v-if='formItem==2'>
 					<view style="text-align: center;font-size: 36rpx;color: #20B128;font-weight: 700;">
 						重置密码
@@ -16,6 +17,7 @@
 						请输入手机号码和验证码找回密码、重置
 					</view>
 				</view>
+
 				<view class="whiteBg" v-if="formItem == 0">
 					<view class="logon" style="display: flex;align-items: center;justify-content: center;"
 						@click="wxLogin">
@@ -31,6 +33,7 @@
 						</checkbox-group>
 					</view>
 				</view>
+
 				<view class="whiteBg" v-else-if="formItem === 1">
 					<view class="title acea-row row-center-wrapper">
 						<view class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList"
@@ -165,7 +168,7 @@
 						</checkbox-group>
 					</view>
 				</view>
-				<view class="footer-btn" v-if="formItem==2">
+				<view class="footer-btn" v-if="formItem==2 && isInstallWx">
 					<view class="login-type-btn" :class="{actLoginType:formItem==0}" style="margin-right: 70rpx;">
 						<text v-if='formItem == 1||formItem==2' @click="formItem = 0">微信快捷登录</text>
 						<text v-else @click="appOneClcik">本机一键登录</text>
@@ -188,7 +191,7 @@
 			</view>
 
 			<!-- #ifdef APP-PLUS -->
-			<view class="footer-btns" v-if="formItem !=2">
+			<view class="footer-btns" v-if="formItem !=2 && isInstallWx">
 				<view class="login-type-btn" :class="{actLoginType:formItem==0}" style="margin-right: 70rpx;">
 					<text v-if='formItem == 1||formItem==2' @click="formItem = 0">微信快捷登录</text>
 					<text v-else @click="appOneClcik">本机一键登录</text>
@@ -240,6 +243,7 @@
 		</form>
 		<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
 			ref="verify"></Verify>
+
 		<!-- tips弹窗 -->
 		<u-overlay :show="showTips">
 			<view class="tips">
@@ -286,8 +290,6 @@
 			</view>
 		</u-overlay>
 		<!-- tips结束 -->
-
-
 	</view>
 </template>
 <script>
@@ -405,7 +407,8 @@
 				keyLock: true,
 				auth_token: '',
 				codeVal: '',
-				copyright: {}
+				copyright: {},
+				isInstallWx: true
 			};
 		},
 		computed: configMap(['login_logo'], mapGetters(['viewColor'])),
@@ -431,9 +434,25 @@
 			});
 			this.getVersion();
 		},
-		mounted: function() {
 
+		onShow() {
+			// #ifdef APP
+			//判断是否安装微信
+			if (plus.runtime.isApplicationExist({
+					pname: 'com.tencent.mm',
+					action: 'weixin://'
+				})) {
+				// 安装微信
+				this.isInstallWx = true;
+				this.formItem = 0;
+			} else {
+				// 未安装
+				this.isInstallWx = false;
+				this.formItem = 1;
+			}
+			// #endif
 		},
+
 		onReady() {
 			let that = this
 			// #ifdef MP