Browse Source

Merge commit '77b833e1b822cfc944645ab64c09d16a3624ffd5' into HEAD

gitadmin 2 years ago
parent
commit
9f0351c3c6

+ 1 - 1
public/version.json

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

+ 6 - 1
src/App.vue

@@ -30,7 +30,12 @@ export default {
     window.addEventListener('beforeunload', () => {
       sessionStorage.setItem('store', JSON.stringify(this.$store.state))
     })
-
+    // 按F5 刷新页面
+    window.addEventListener('keydown', (e) => {
+      if (e.keyCode == '116') {
+        window.location.reload()
+      }
+    })
     this.$message.config({
       top: `100px`,
       duration: 3,

+ 2 - 2
src/libs/versionUpdate.js

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

+ 5 - 3
src/utils/request.js

@@ -105,9 +105,11 @@ service.interceptors.response.use((response) => {
       content: response.data.message,
       onOk () {
         sessionStorage.setItem('errorTips', 0)
-        store.dispatch('Logout').then(() => {
-          window.location.reload()
-        })
+        if(response.data.status == '1099'){
+          store.dispatch('Logout').then(() => {
+            window.location.reload()
+          })
+        }
       }
     })
   } else if (response.data.status != 200 && response.data.status && response.data.errCode != 'VALIDATE_STOCK_LACK') {

+ 0 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -112,7 +112,6 @@
         <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)">新增(零售)</a-button>
         <a-button type="primary" class="button-warning" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(1)">新增(铺货)</a-button>
       </div>
-      <!-- alert -->
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? totalData.totalAmount : '--' }}</strong>元;