Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/duanju/new_app into test

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         },
         {

pages/index/index.vue

@@ -94,7 +94,7 @@
 	} from '@/store/common.js'
 	const $common = useCommonStore()
 	onShow(() => {
-		console.log('cash:' + uni.getStorageSync('userInfo').userId + "" + new Date().getTime(), 'debug')
+		// console.log('cash:' + uni.getStorageSync('userInfo').userId + "" + new Date().getTime(), 'debug')
 		// 判断ios是否审核
 		$common.init()
 		let sysInfo = uni.getSystemInfoSync()
@@ -123,6 +123,7 @@
 			content: "",
 			confirmText: "",
 			cancelText: "",
+			downloadLink: ""
 		},
 		setindexdata :"false"
 	})
@@ -157,7 +158,7 @@
 		//获取当前系统版本信息
 		plus.runtime.getProperty(plus.runtime.appid, widgetInfo => {
 			//请求后台接口 解析数据 对比版本
-			selectNewApp().then(res => {
+			selectNewApp().then( async res => {
 				res = res[0];
 				console.log(uni.getSystemInfoSync().platform == 'ios',1101)
 				let version;
@@ -166,14 +167,10 @@
 				}
 				if (uni.getSystemInfoSync().platform == 'ios') {
 					version = res.iosVersion
-					$common.setversion(widgetInfo.version, version)
-				}
-				version = res.version
-				// && uni.getSystemInfoSync().platform == 'android'
-				if (widgetInfo.version < version) {
-					let downloadLink = '';
-					let androidLink = res.androidWgtUrl;
-					let iosLink = res.iosWgtUrl;
+				} 
+				let isVersion = await $common.setversion(widgetInfo.version, version)
+				if ( isVersion == 1 ) {
+					datas.version.downloadLink = res.androidWgtUrl;
 					datas.version.show = true;
 					datas.version.title = "发现新版本";
 					datas.version.content = res.des;
@@ -200,7 +197,7 @@
 		});
 		if (uni.getSystemInfoSync().platform == 'android') {
 			uni.downloadFile({
-				url: androidLink,
+				url: datas.version.downloadLink,
 				success: downloadResult => {
 					console.log(downloadResult)
 					if (downloadResult.statusCode === 200) {
@@ -223,7 +220,7 @@
 			});
 		}
 		if (uni.getSystemInfoSync().platform == 'ios') {
-			plus.runtime.openURL(iosLink, function(res) {});
+			plus.runtime.openURL(datas.version.downloadLink, function(res) {});
 		}
 	}
 

store/common.js

@@ -67,11 +67,11 @@ export const useCommonStore = defineStore("common", {
 			}
 		},
 		setversion(a, b) {
-			// a是當前應用的版本號 b是接口拿的
-			console.log('當前版本-' + a, '接口版本-' + b, '返回-' + this.isIosExamine, '判斷值-' + this
-				.isExamines)
-			// 再審核
-			this.isExamines = this.compare(a, b)
+			return new Promise(async (resolve, reject) => {
+				// console.log('當前版本-' + a, '接口版本-' + b, '判斷值-' + this.isExamines)
+				this.isExamines = await this.compare(a, b)
+				resolve(this.isExamines)
+			})
 		},
 		// 判断版本号
 		compare(version1, version2) {