1

pages/login/index.vue

@@ -35,11 +35,11 @@
 		<agree-dialog ref="agreeYkDialog" @confirm-btn="ykConfirmBtn"></agree-dialog>
 		<agree-dialog ref="agreeWxDialog" @confirm-btn="wxConfirmBtn"></agree-dialog>
 		<tel-dialog ref="telDialogRef" @telClose="telClose" @bindBtn="bindBtn" v-if="telDialogFlag"></tel-dialog>
-		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn" :notClose="true"
-			:content="tipContent"></tipMiddleDialog>
-    <tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn" :notClose="true"
-                :content="tipContentAndroid">
-			</tipMiddleDialog>
+		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
+			:notClose="true" :content="tipContent"></tipMiddleDialog>
+		<tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
+			:notClose="true" :content="tipContentAndroid">
+		</tipMiddleDialog>
 	</view>
 </template>
 
@@ -48,7 +48,7 @@
 		ref,
 		nextTick,
 		reactive,
-    computed
+		computed
 	} from "vue"
 	import {
 		onLoad,
@@ -80,11 +80,15 @@
 	import {
 		error
 	} from "uview-plus";
-  import TipDialog from "@/components/dialog/tipDialog";
-  import {useVersionUpdate} from "@/utils/versionUpdate.js"
-  
-	const {showUpdateDialog} = useVersionUpdate();
-  
+	import TipDialog from "@/components/dialog/tipDialog";
+	import {
+		useVersionUpdate
+	} from "@/utils/versionUpdate.js"
+
+	const {
+		showUpdateDialog
+	} = useVersionUpdate();
+
 	let indexData = reactive({
 		phoneNumber: null,
 		clearTelIcon: false,
@@ -105,10 +109,10 @@
 	const version = config.appInfo.version;
 	const tipDialogRef = ref(null);
 	const tipTitle = '升级提醒';
-  const tipContentAndroid = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！'
-  const tipContent =  '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！'
-  const tipDialogRef2 = ref(null)
-  const updateUrl = ref(null)
+	const tipContentAndroid = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！'
+	const tipContent = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！'
+	const tipDialogRef2 = ref(null)
+	const updateUrl = ref(null)
 
 
 	const store = useIsCanBack();
@@ -146,54 +150,71 @@
 			const appStoreUrl = 'itms-apps://itunes.apple.com/app/6741551741'
 			plus.runtime.openURL(appStoreUrl)
 		} else {
-			// plus.runtime.openURL(updateUrl.value)
-			
-			    const { brand } = systemInfo;
-			      // 处理 Android/HarmonyOS 设备
-			      let storeUrl = '';
-			      let androidPackage = 'com.llisoft.ezy'; // 安卓包名
-			      switch (brand.toLowerCase()) {
-			        case 'huawei':
-			          storeUrl = `https://appstore.huawei.com/app/113217527`; // 华为/鸿蒙
-			          break;
-			        case 'xiaomi':
-			          storeUrl = `https://app.mi.com/details?id=${androidPackage}`; // 小米
-			          break;
-			        case 'oppo':
-			          storeUrl = `https://store.oppomobile.com/product?packagename=${androidPackage}`; // OPPO
-			          break;
-			        case 'vivo':
-			          storeUrl = `https://appstore.vivo.com.cn/app/${androidPackage}`; // vivo
-			          break;
-			        case 'honor':
-			          storeUrl = `market://details?id=${androidPackage}`; // 荣耀
-			          break;
-			        default:
-			          storeUrl = `market://details?id=${androidPackage}`; // 其他安卓品牌
-			      }
-			      plus.runtime.openURL(storeUrl);
-			
+			// 处理 Android/HarmonyOS 设备
+			const {
+				brand
+			} = systemInfo;
+			const androidPackage = 'com.llisoft.ezy'; // 安卓包名
+			let storeScheme = '';
+			let storeWebUrl = '';
+			switch (brand.toLowerCase()) {
+				case 'huawei':
+					storeScheme = `appmarket://details?id=${androidPackage}`;
+					storeWebUrl = `https://appgallery.huawei.com/app/C113217527`;
+					break;
+				case 'xiaomi':
+					storeScheme = `mimarket://details?id=${androidPackage}`;
+					storeWebUrl = `https://app.mi.com/details?id=${androidPackage}`;
+					break;
+				case 'oppo':
+					storeScheme = `oppomarket://details?packagename=${androidPackage}`;
+					storeWebUrl = `https://store.oppomobile.com/product?packagename=${androidPackage}`;
+					break;
+				case 'vivo':
+					storeScheme = `vivomarket://details?id=${androidPackage}`;
+					storeWebUrl = `https://appstore.vivo.com.cn/app/${androidPackage}`;
+					break;
+				case 'honor':
+					// 荣耀使用华为应用市场
+					storeScheme = `appmarket://details?id=${androidPackage}`;
+					storeWebUrl = `https://appgallery.huawei.com/app/C113217527`;
+					break;
+				default:
+			}
+			plus.runtime.openURL(storeScheme, (error) => {
+				console.log('调起应用商店失败，尝试网页链接', error);
+				plus.runtime.openURL(storeWebUrl, (webError) => {
+					console.error('网页链接失败', webError);
+					plus.runtime.openURL(updateUrl.value, (webError) => {
+						uni.showToast({
+							title: '跳转失败，请手动打开应用商店搜索更新',
+							icon: 'none'
+						});
+					});
+				});
+			});
+
 		}
 	}
 
 	function getLoginInit() {
-		
 
-		
-		
+
+
+
 		getVersion({}).then(res => {
 			if (version != res.data.version) {
-		updateUrl.value = res.data.updateUrl	
-        const systemInfo = uni.getSystemInfoSync();
-        if (systemInfo.platform == 'ios') {
-          tipDialogRef.value.handleShow();
-        } else {
-          tipDialogRef2.value.handleShow();
-		  // showUpdateDialog({
-			 //  description: '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！',
-			 //  url: res.data.updateUrl
-		  // })
-        }
+				updateUrl.value = res.data.updateUrl
+				const systemInfo = uni.getSystemInfoSync();
+				if (systemInfo.platform == 'ios') {
+					tipDialogRef.value.handleShow();
+				} else {
+					tipDialogRef2.value.handleShow();
+					// showUpdateDialog({
+					//  description: '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！',
+					//  url: res.data.updateUrl
+					// })
+				}
 			}
 		})
 	}