diff --git a/store/modules/config.js b/store/modules/config.js index b87762c..600977b 100644 --- a/store/modules/config.js +++ b/store/modules/config.js @@ -46,14 +46,17 @@ const actions = { async initConfig({ state, commit }, data = false) { let res = await getConfig(); commit('SET_CONFIG', res.data); - console.log(compareVersions(res.data.version, '1.0.0')==1&&compareVersions(res.data.version, Cache.get('wgt_version'))==1); - // #ifdef APP-PLUS + // console.log(compareVersions(res.data.version, '1.0.0')==1&&compareVersions(res.data.version, Cache.get('wgt_version'))==1); let os = uni.getSystemInfoSync(); + // uni.showModal({ + // title: `当前:${os.appVersion},WGT:${Cache.get('wgt_version')},返回:${res.data.version}` + // }) + // #ifdef APP-PLUS if(data) uni.showLoading({ title: '检查更新中' }) // 版本更新 - if(compareVersions(res.data.version, os.appVersion)==1&&compareVersions(res.data.version, Cache.get('wgt_version')||'1.0.0')==1){ + if(compareVersions(res.data.version, os.appVersion||Cache.get('wgt_version')||'1.0.0')==1&&compareVersions(res.data.version, Cache.get('wgt_version')||'1.0.0')==1){ try{ let info = res.data.version_info||{}; let version = { @@ -65,11 +68,7 @@ const actions = { quiet: info.quiet==1?true:false // 是否静默更新 } Updater.update(version); - let suffix = ".wgt"; - if(info.dow_url.substring(info.dow_url.length - suffix.length, info.dow_url.length)==suffix){ - console.log('wgt update'); - Cache.set('wgt_version', info.version); - } + Cache.set('wgt_version', info.version); }catch(e){ console.log(e); } diff --git a/subpkg/shareCapital/shareCapital.vue b/subpkg/shareCapital/shareCapital.vue index d65269d..26935b9 100644 --- a/subpkg/shareCapital/shareCapital.vue +++ b/subpkg/shareCapital/shareCapital.vue @@ -4,7 +4,8 @@ 账户入股金额 {{shareholder.shareholder_money}} - + 暂无村公司 + @@ -107,9 +108,9 @@ --> 退股 - 上交 + 上交 - +