Ver Fonte

Merge branch 'develop' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop

chenrui há 3 anos atrás
pai
commit
3ef1f807c1
3 ficheiros alterados com 10 adições e 4 exclusões
  1. 1 1
      public/version.json
  2. 8 2
      src/libs/versionUpdate.js
  3. 1 1
      src/permission.js

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "1.0.2"
+    "version": "1.0.4"
 }

+ 8 - 2
src/libs/versionUpdate.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
- 
+import modal from 'ant-design-vue/es/modal'
 const isNewVersion = () => {
   let url = `//${window.location.host}/version.json?t=${new Date().getTime()}`;
   axios.get(url).then(res => {
@@ -8,7 +8,13 @@ const isNewVersion = () => {
       let localVueVersion = localStorage.getItem('vueVersion');
       if (localVueVersion && localVueVersion != vueVersion) {
         localStorage.setItem('vueVersion', vueVersion);
-        window.location.reload();
+        modal.info({
+          title: '提示',
+          content: '发现有新版本发布,将会强制刷新页面!',
+          onOk () {
+            window.location.reload()
+          }
+        })
         return;
       } else {
         localStorage.setItem('vueVersion', vueVersion);

+ 1 - 1
src/permission.js

@@ -15,7 +15,7 @@ const defaultRoutePath = '/home'
 
 router.beforeEach((to, from, next) => {
   //判断当前代码版本是否与服务器中代码版本一致,如不一致则刷新页面获取最新
-  versionTood.isNewVersion()
+  // versionTood.isNewVersion()
 	store.commit('TOGGLE_NOW_ROUTER',to.fullPath)
   NProgress.start() // start progress bar
   to.meta && (typeof to.meta.title !== 'undefined' && setDocumentTitle(`${to.meta.title} - ${domTitle}`))