合并代码

pages/login/login.vue

@@ -173,7 +173,7 @@
 		return form.password && isLength11(form.username)
 	})
 
-	const showPopup = ref(false)
+	const showPopup = ref(true)
 	function closebottom() {
 		openbottom.value = false;
 		isTarget.value = true;
@@ -183,6 +183,19 @@
 	function closePopup() {
 		showPopup.value = false;
 		uni.setStorageSync("appWgtVersion", uni.getSystemInfoSync().appWgtVersion)
+		if (uni.getStorageSync('appWgtVersion') != uni.getSystemInfoSync().appWgtVersion) {
+			showPopup.value = true;
+		}
+		if (uni.getStorageSync('token') && uni.getStorageSync('token') !== 1) {
+			if (loading.value === 2) {
+				setTimeout(() => {
+					gotoindex()
+				}, 500)
+			} else {
+				loading.value++
+			}
+		}
+		init();
 	}
 	function closeapp() {
 		plus.runtime.quit()
@@ -348,26 +361,14 @@
 			}
 		})
 	}
-	// 生命周期钩子
-	onLoad(() => {
-		if (uni.getStorageSync('appWgtVersion') != uni.getSystemInfoSync().appWgtVersion) {
-			showPopup.value = true;
-		}
-		if (uni.getStorageSync('token') && uni.getStorageSync('token') !== 1) {
-			if (loading.value === 2) {
-				setTimeout(() => {
-					gotoindex()
-				}, 500)
-			} else {
-				loading.value++
-			}
-		}
-		init()
-	});
-	// 生命周期钩子
-	onShow(() => {
-		zyupgrade.value?.check_update();
-	});
+	// // 生命周期钩子
+	// onLoad(() => {
+		
+	// });
+	// // 生命周期钩子
+	// onShow(() => {
+		
+	// });
 
 	function init() {
 		var monitorModule = uni.requireNativePlugin("MonitorModule")