Parcourir la source

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

chenrui il y a 3 ans
Parent
commit
9042bee2f0
3 fichiers modifiés avec 5 ajouts et 3 suppressions
  1. 2 1
      public/version.json
  2. 2 1
      src/libs/versionUpdate.js
  3. 1 1
      src/views/common/print.vue

+ 2 - 1
public/version.json

@@ -1,3 +1,4 @@
 {
-    "version": "1.0.0"
+    "version": "1.0.0",
+    "message": "发现有新版本发布,确定更新系统?"
 }

+ 2 - 1
src/libs/versionUpdate.js

@@ -5,12 +5,13 @@ const isNewVersion = () => {
   axios.get(url).then(res => {
     if (res.status === 200) {
       let vueVersion = res.data.version;
+      let message = res.data.message;
       let localVueVersion = localStorage.getItem('vueVersion');
       if (localVueVersion && localVueVersion != vueVersion) {
         localStorage.setItem('vueVersion', vueVersion);
         modal.info({
           title: '提示',
-          content: '发现有新版本发布,将会强制刷新页面!',
+          content: message,
           onOk () {
             window.location.reload()
           }

+ 1 - 1
src/views/common/print.vue

@@ -39,7 +39,7 @@ export default {
   },
   methods: {
     handlePrint (type) {
-      this.$emit('handlePrint', type, type == 'preview' ? 'INK' : this.printerType)
+      this.$emit('handlePrint', type, this.printerType)
     }
   }
 }