Merge branch '线上版本' of http://121.40.253.172:3000/longyong/jsh_erp_app into 线上版本

common/store/modules/update.js

@@ -5,7 +5,7 @@ import Vue from 'vue';
 
 import { selectVersion } from '@/common/request/apis/index'
 // import { getappdownload } from '@/common/request/apis/h5'
-// import { checkUpdate } from '@/common/utils/app-update-check';
+import { compareVersion } from '@/common/utils/app-update-check';
 
 export default {
 	namespaced: true,
@@ -69,15 +69,16 @@ export default {
 			
 			// #ifdef APP-PLUS
 			const system_info = uni.getSystemInfoSync();
-			console.log(system_info,'system')
-			console.log(system_info.appVersion,'appVersion')
+			console.log('system=================',system_info)
+			console.log('appVersion================',system_info.appVersion)
 			let params = {
 				os: system_info.platform //本机设备操作系统  （android || ios）
 			};
 			if (params.os != 'ios' && params.os != 'android') false; //如果不是安卓或ios 返回false
 			selectVersion()
-			.then(res=>{
-				if(system_info.appVersion != res.data.version) {
+			.then(async res=>{
+				let need_update = await compareVersion(system_info.appVersion, res.data.version); // 检查是否需要升级（对比版本号）
+				if(need_update) {
 					commit('setUpdate',true)
 					commit('setDownloadApkParams',res.data)
 					// console.log(state.update,'res')

common/utils/app-update-check.js

@@ -54,7 +54,7 @@ export function checkUpdate(update_info, type = 0) {
 }
 
 //对比版本号
-function compareVersion(ov, nv) {
+export function compareVersion(ov, nv) {
 	return new Promise((reolve, reject) => {
 		if (!ov || !nv || ov == "" || nv == "") {
 			return reolve(false);