Merge branch 'master' of http://git.qmth.com.cn/paper-library/paper-library-client

src/modules/client/components/ScanTaskProcessDialog.vue

@@ -205,6 +205,10 @@ export default {
         this.$message.error("当前没有需要保存的数据！");
         return;
       }
+      if (this.realScanCount !== this.modalForm.preScanCount) {
+        this.$message.error("实扫张数与预扫张数不一致！");
+        return;
+      }
       logger.info(`04-1开始保存数据`);
       await this.saveScanImage();
       logger.info(`04-2保存数据结束`);

src/plugins/axios.js

@@ -43,12 +43,6 @@ axios.interceptors.request.use(
 
     queue.push(1);
 
-    // 为请求地址添加全局domain
-    let domain = Vue.ls.get("domain", "");
-    if (config.url.indexOf("http://") < 0) {
-      config.url = domain + config.url;
-    }
-
     // 为请求头添加鉴权信息
     let token = Vue.ls.get("token");
     if (token) {
@@ -78,6 +72,11 @@ axios.interceptors.request.use(
       config.headers["Authorization"] = Authorization;
       config.headers["time"] = timestamp;
     }
+    // 为请求地址添加全局domain
+    let domain = Vue.ls.get("domain", "");
+    if (config.url.indexOf("http://") < 0) {
+      config.url = domain + config.url;
+    }
     config.headers["deviceId"] = DEVICE_ID;
     config.headers["platform"] = PLATFORM;
     config.headers["domain"] = domain;