2 Commits dc383cda0f ... 134589237e

Tác giả SHA1 Thông báo Ngày
  wangxy 134589237e Merge remote-tracking branch 'origin/2025鹅状元dev' into 2025鹅状元dev 2 ngày trước cách đây
  wangxy 4fc54114f0 update 目录调整 2 ngày trước cách đây
2 tập tin đã thay đổi với 32 bổ sung64 xóa
  1. 14 30
      pages/login/index.vue
  2. 18 34
      pages/study/index.vue

+ 14 - 30
pages/login/index.vue

@@ -37,7 +37,8 @@
 		<tel-dialog ref="telDialogRef" @telClose="telClose" @bindBtn="bindBtn" v-if="telDialogFlag"></tel-dialog>
 		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
 			:content="tipContent"></tipMiddleDialog>
-
+    <tip-dialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
+                :content="tipContentAndroid"></tip-dialog>
 	</view>
 </template>
 
@@ -45,7 +46,8 @@
 	import {
 		ref,
 		nextTick,
-		reactive
+		reactive,
+    computed
 	} from "vue"
 	import {
 		onLoad,
@@ -77,6 +79,7 @@
 	import {
 		error
 	} from "uview-plus";
+  import TipDialog from "@/components/dialog/tipDialog";
 	let indexData = reactive({
 		phoneNumber: null,
 		clearTelIcon: false,
@@ -97,8 +100,9 @@
 	const version = config.appInfo.version;
 	const tipDialogRef = ref(null);
 	const tipTitle = '升级提醒';
-	const tipContent = '您的APP不是最新版本,部分功能不能使用,请升级至最新版本!';
-
+  const tipContentAndroid = '您的APP不是最新版本,部分功能不能使用,请到应用商店升级至最新版本!'
+  const tipContent =  '您的APP不是最新版本,部分功能不能使用,请升级至最新版本!'
+  const tipDialogRef2 = ref(null)
 
 
 	const store = useIsCanBack();
@@ -135,38 +139,18 @@
 		if (systemInfo.platform == 'ios') {
 			const appStoreUrl = 'itms-apps://itunes.apple.com/app/6741551741'
 			plus.runtime.openURL(appStoreUrl)
-		} else {
-      const { brand } = systemInfo;
-      // 处理 Android/HarmonyOS 设备
-      let storeUrl = '';
-      let androidPackage = 'com.llisoft.ezy'; // 安卓包名
-      switch (brand.toLowerCase()) {
-        case 'huawei':
-          storeUrl = `appmarket://details?id=${androidPackage}`; // 华为/鸿蒙
-          break;
-        case 'xiaomi':
-          storeUrl = `mimarket://details?id=${androidPackage}`; // 小米
-          break;
-        case 'oppo':
-          storeUrl = `market://details?id=${androidPackage}`; // OPPO
-          break;
-        case 'vivo':
-          storeUrl = `vivomarket://details?id=${androidPackage}`; // vivo
-          break;
-        case 'honor':
-          storeUrl = `market://details?id=${androidPackage}`; // 荣耀
-          break;
-        default:
-          storeUrl = `market://details?id=${androidPackage}`; // 其他安卓品牌
-      }
-      plus.runtime.openURL(storeUrl);
 		}
 	}
 
 	function getLoginInit() {
 		getVersion({}).then(res => {
 			if (version != res.data.version) {
-				tipDialogRef.value.handleShow();
+        const systemInfo = uni.getSystemInfoSync();
+        if (systemInfo.platform == 'ios') {
+          tipDialogRef.value.handleShow();
+        } else {
+          tipDialogRef2.value.handleShow();
+        }
 			}
 		})
 	}

+ 18 - 34
pages/study/index.vue

@@ -38,6 +38,8 @@
 			@dao-tip-close="daoTipClose"></dao-tip-dialog>
 		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' @confirm-btn="BanbenConfirmBtn" :title="tipTitle"
 			:content="tipContentVersion"></tipMiddleDialog>
+    <tip-dialog ref="tipDialogRef2" :closeFlag='false'  :title="tipTitle"
+                     :content="tipContentVersionAndroid"></tip-dialog>
 	</view>
 </template>
 <script setup>
@@ -62,7 +64,8 @@
 		ref,
 		nextTick,
 		getCurrentInstance,
-		onMounted
+		onMounted,
+    computed
 	} from "vue";
 	import {
 		onLoad
@@ -90,6 +93,7 @@
 		getUserIdentity
 	} from "@/utils/common";
 	import cacheManager from "@/utils/cacheManager.js";
+  import TipDialog from "../../components/dialog/tipDialog";
 	const tipContent = '是否前往开通付费?'; //当前产品	
 	const goPayDialogRef = ref(null);
 	const youkeDialogRef = ref(null);
@@ -133,9 +137,10 @@
 
 	const version = config.appInfo.version;
 	const tipDialogRef = ref(null);
+  const tipDialogRef2 = ref(null);
 	const tipTitle = '升级提醒';
-	const tipContentVersion = '您的APP不是最新版本,部分功能不能使用,请升级至最新版本!';
-
+  const tipContentVersion = '您的APP不是最新版本,部分功能不能使用,请升级至最新版本!';
+  const tipContentVersionAndroid = '您的APP不是最新版本,部分功能不能使用,请到应用商店升级至最新版本!'
 
 	onLoad((options) => {
 		init(options);
@@ -159,40 +164,19 @@
 		if (systemInfo.platform == 'ios') {
 			const appStoreUrl = 'itms-apps://itunes.apple.com/app/6741551741'
 			plus.runtime.openURL(appStoreUrl)
-		} else {
-			const {
-				brand
-			} = systemInfo;
-			// 处理 Android/HarmonyOS 设备
-			let storeUrl = '';
-			let androidPackage = 'com.llisoft.ezy'; // 安卓包名
-			switch (brand.toLowerCase()) {
-				case 'huawei':
-					storeUrl = `appmarket://details?id=${androidPackage}`; // 华为/鸿蒙
-					break;
-				case 'xiaomi':
-					storeUrl = `mimarket://details?id=${androidPackage}`; // 小米
-					break;
-				case 'oppo':
-					storeUrl = `market://details?id=${androidPackage}`; // OPPO
-					break;
-				case 'vivo':
-					storeUrl = `vivomarket://details?id=${androidPackage}`; // vivo
-					break;
-				case 'honor':
-					storeUrl = `market://details?id=${androidPackage}`; // 荣耀
-					break;
-				default:
-					storeUrl = `market://details?id=${androidPackage}`; // 其他安卓品牌
-			}
-			plus.runtime.openURL(storeUrl);
 		}
 	}
 
 	function getLoginInit() {
 		getVersion({}).then(res => {
 			if (version != res.data.version) {
-				tipDialogRef.value.handleShow();
+        const systemInfo = uni.getSystemInfoSync();
+        if (systemInfo.platform == 'ios') {
+          tipDialogRef.value.handleShow();
+        } else {
+          tipDialogRef2.value.handleShow();
+
+        }
 			}
 		})
 	}
@@ -583,8 +567,8 @@
 					console.log('data,jieId', data.jieId);
 					wordXuewan({
 						jieId: data.jieId
-					}).then(res => {
-						getZhangInfoNewYingyu()
+					}).then(res => {
+						getZhangInfoNewYingyu()
 						// 更新缓存  备用 现在是 直接调用接口
 						// const result = updateStudyFlag(responseData, data.jieId, 1);
 						// if (result) {
@@ -596,7 +580,7 @@
 				}
 			})
 		}
-	}
+	}
 	// 更新缓存  备用 现在是 直接调用接口
 	const updateStudyFlag = (data, jieIdToUpdate, newValue) => {
 		// 检查data和必要的数据结构是否存在