Browse Source

Merge branch 'develop_szhj07' of jianguan-web/qpls-md-html into pre-release

李磊 2 years ago
parent
commit
44735dbb4e
2 changed files with 3 additions and 3 deletions
  1. 1 1
      public/version.json
  2. 2 2
      src/libs/versionUpdate.js

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1670378265844
+  "version": 1670379327865
 }
 }

+ 2 - 2
src/libs/versionUpdate.js

@@ -7,14 +7,14 @@ const isNewVersion = () => {
       const vueVersion = res.data.version
       const vueVersion = res.data.version
       const message = res.data.message
       const message = res.data.message
       const localVueVersion = localStorage.getItem('vueVersion-iscm')
       const localVueVersion = localStorage.getItem('vueVersion-iscm')
-      // 生产环境不比对版本号
+      // 开发环境不比对版本
       const production = process.env.NODE_ENV === 'production'
       const production = process.env.NODE_ENV === 'production'
       if (localVueVersion && localVueVersion != vueVersion && production) {
       if (localVueVersion && localVueVersion != vueVersion && production) {
-        localStorage.setItem('vueVersion-iscm', vueVersion)
         modal.info({
         modal.info({
           title: '提示',
           title: '提示',
           content: message,
           content: message,
           onOk () {
           onOk () {
+            localStorage.setItem('vueVersion-iscm', vueVersion)
             window.location.reload()
             window.location.reload()
           }
           }
         })
         })