Forráskód Böngészése

更新版本升级

wangxy 1 hónapja
szülő
commit
70245023d0

+ 13 - 1
components/dialog/tipMiddleDialog.vue

@@ -6,9 +6,10 @@
 		<view class="tip-content-box">
 			<view class="tip-title">{{title}}</view>
 			<view class="tip-content">{{content}}</view>
-			<view class="tip-btn-box">
+			<view class="tip-btn-box" style="position: relative">
 				<view v-if="closeFlag" class="not-confirm-btn" @click="handleClose"></view>
 				<view class="confirm-btn" @click="confirmBtn"></view>
+        <view v-if="showTip" @click="handleShowImage" style="position: absolute;right: 0;top: 22px"><uni-icons type="info" size="30"></uni-icons></view>
 			</view>
 		</view>
 	 </view>
@@ -34,6 +35,10 @@
     notClose: {
       type: Boolean,
       default: false
+    },
+    showTip: {
+      type: Boolean,
+      default: false
     }
 	});
 	const tipMiddlePopup = ref(null); // 索引
@@ -53,6 +58,13 @@
       tipMiddlePopup.value.close();
     }
 	}
+
+  function handleShowImage() {
+    uni.previewImage({
+      urls: ['/static/images/login/ggg.gif'],
+    });
+  }
+
 	defineExpose({
 			handleShow,
 			handleClose

+ 5 - 4
pages/login/index.vue

@@ -37,7 +37,7 @@
 		<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"
+		<tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn" :showTip="true"
 			:notClose="true" :content="tipContentAndroid">
 		</tipMiddleDialog>
 	</view>
@@ -149,13 +149,14 @@
 			const appStoreUrl = 'itms-apps://itunes.apple.com/app/6741551741'
 			plus.runtime.openURL(appStoreUrl)
 		} else {
+			initDownload(updateUrl.value)
 			// 处理 Android/HarmonyOS 设备
-			const {
+	/*		const {
 				brand
 			} = systemInfo;
 			const androidPackage = 'com.llisoft.ezy'; // 安卓包名
 			let storeScheme = '';
-			let storeWebUrl = '';
+			let storeWebUrl = '';
 			toast(brand.toLowerCase())
 			switch (brand.toLowerCase()) {
 				case 'huawei':
@@ -195,7 +196,7 @@
 					// });
 				});
 			});
-
+*/
 		}
 	}
 

+ 4 - 4
pages/study/index.vue

@@ -38,7 +38,7 @@
 			@dao-tip-close="daoTipClose"></dao-tip-dialog>
 		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' @confirm-btn="BanbenConfirmBtn" :title="tipTitle" :notClose="true"
 			:content="tipContentVersion"></tipMiddleDialog>
-		<tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn" :notClose="true"
+		<tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn" :notClose="true" :showTip="true"
 			:content="tipContentVersionAndroid"></tipMiddleDialog>
 	</view>
 </template>
@@ -159,8 +159,9 @@
 			const appStoreUrl = 'itms-apps://itunes.apple.com/app/6741551741'
 			plus.runtime.openURL(appStoreUrl)
 		} else {
+      initDownload(updateUrl.value)
 			// 处理 Android/HarmonyOS 设备
-			const {
+			/*const {
 				brand
 			} = systemInfo;
 			const androidPackage = 'com.llisoft.ezy'; // 安卓包名
@@ -203,8 +204,7 @@
 					//   });
 					// });
 				});
-			});
-
+			});*/
 		}
 	}
 

BIN
static/images/login/ggg.gif


+ 1 - 1
utils/versionUpdate.js

@@ -66,7 +66,7 @@ export function useVersionUpdate() {
 						const tempFilePath = downloadResult.tempFilePath;
 
 						// 安装APK
-						plus.runtime.install(tempFilePath, { force: false }, () => {
+						plus.runtime.install(tempFilePath, { force: true }, () => {
 							uni.showToast({ title: '安装成功', icon: 'success' });
 							setTimeout(() => {
 								plus.runtime.restart(); // 重启应用