页面修改

src/components/Supplier/HotelTotalStock.vue

@@ -371,10 +371,10 @@
           <div class="block date">
             <label class="demonstration">日付</label>
             <el-date-picker v-model="msg.sDate" type="date" :placeholder="$t('admin.admin_choDate')"
-              value-format="yyyy-MM-dd" :picker-options="pickerOptions1">
+              value-format="yyyy-MM-dd" ><!--:picker-options="pickerOptions1"-->
             </el-date-picker>
             <el-date-picker v-model="msg.eDate" type="date" :placeholder="$t('admin.admin_choDate')"
-              value-format="yyyy-MM-dd" :picker-options="pickerOptions2">
+              value-format="yyyy-MM-dd" ><!--:picker-options="pickerOptions2"-->
             </el-date-picker>
           </div>
         </li>

src/plug/index.js

@@ -115,12 +115,12 @@ export default {
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
         let mallUrl = ""; //商城API
-        let lxymallUrl = '';//国内游api
+        let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
-      domainUrl ="http://192.168.10.36:8083";
+        domainUrl = "http://192.168.10.46";
         let crmLocalFileStreamDownLoadUrl = "";
-        crmLocalFileStreamDownLoadUrl =  locationName.indexOf('oytour') !== -1? "http://crm.oytour.com" : "http://testcrm.oytour.com";
+        crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";
         javaUrldo = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000";
         //商城API
@@ -170,7 +170,7 @@ export default {
           //Java接口本站文件流下载地址
           JavaLocalFileStreamDownLoadUrl: javaUrldo,
           mallUrl: mallUrl,
-          lxymallUrl:lxymallUrl,
+          lxymallUrl: lxymallUrl,
           crmUrl: crmUrl,
           crmRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8081/#/",
         };
@@ -302,9 +302,7 @@ export default {
           })
         } else {
           if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
-            this.$router.push({
-              path: '/login'
-            })
+            this.goToLogin(1);
           }
         }
         var token = "";
@@ -339,10 +337,8 @@ export default {
           })
           .then(res => {
             if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
-              if (this.getLocalStorage()){
-                this.$router.push({
-                  path: '/login'
-                });
+              if (this.getLocalStorage()) {
+                this.goToLogin(2);
               }
             } else if (res.resultCode == 10005) {
               this.$router.go(-1);
@@ -633,7 +629,6 @@ export default {
       //请求Java接口
       Vue.prototype.apiJavaPost = function (cmd, msg, successCall, faildCall) {
         if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('confirmationOrderDownLoad') === -1 && this.$route.name.indexOf('PrintPage') === -1 && this.$route.name.indexOf('clientConfirm') === -1) {
-
           let previousPathInfo = {
             path: this.$route.name,
             query: this.$route.query
@@ -676,9 +671,7 @@ export default {
           })
           .then(res => {
             if (res.resultCode == 10000 || res.resultCode == 10001) {
-              this.$router.push({
-                path: '/login'
-              })
+              this.goToLogin(3);
             } else if (res.resultCode == 10005) {
               this.$router.go(-1)
             } else if (res.data.data && res.data.data.isJumpTwoCode == 1) {
@@ -736,9 +729,7 @@ export default {
           })
           .then(res => {
             if (res.resultCode == 10000 || res.resultCode == 10001) {
-              this.$router.push({
-                path: '/login'
-              })
+              this.goToLogin(4);
             } else if (res.resultCode == 10005) {
               this.$router.go(-1)
             } else if (res.data.data && res.data.data.isJumpTwoCode == 1) {
@@ -756,9 +747,7 @@ export default {
         var apiurl = this.domainManager().LocalFileStreamDownLoadUrl;
         var timestamp = (new Date()).valueOf();
         if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
-          this.$router.push({
-            path: '/login'
-          })
+          this.goToLogin(5);
         }
         var token = "";
         var key = "";
@@ -791,7 +780,7 @@ export default {
         }).catch(function (res) {});
       },
       //crm下载文件
-      Vue.prototype.crmGetLocalFile = function(cmd, msg, fileName, callBack) {
+      Vue.prototype.crmGetLocalFile = function (cmd, msg, fileName, callBack) {
         if (msg == null || msg == "") {
           msg = {}
         }
@@ -831,7 +820,7 @@ export default {
             };
             callBack(result);
           }
-        }).catch(function(res) {
+        }).catch(function (res) {
 
         });
       }
@@ -839,9 +828,7 @@ export default {
         var apiurl = this.domainManager().JavaLocalFileStreamDownLoadUrl + cmd;
         var timestamp = (new Date()).valueOf();
         if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
-          this.$router.push({
-            path: '/login'
-          })
+          this.goToLogin(6);
         }
         var token = "";
         var key = "";
@@ -877,6 +864,12 @@ export default {
           successCall(res);
         }).catch(function (res) {});
       },
+      //跳转到登录页面
+      Vue.prototype.goToLogin = function (type) {
+        this.$router.push({
+          path: '/login'
+        })
+      },
       //ERP本地缓存
       Vue.prototype.getLocalStorage = function () {
         var localStorageData = window.localStorage["userInfo"];
@@ -1100,8 +1093,8 @@ export default {
       } else if (type === 'h') {
         poise = 'm_h'
       }
-      var newpath= path.replace('http://192.168.10.214:8130', '').replace('https://imgfile.oytour.com', '').replace('https://imgfile.oytour.com', '').split('?')[0];
-      return url + '/image/index?filePath=' +newpath + '&process=resize,' + poise + ',w_' + w + ',h_' + h;
+      var newpath = path.replace('http://192.168.10.214:8130', '').replace('https://imgfile.oytour.com', '').replace('https://imgfile.oytour.com', '').split('?')[0];
+      return url + '/image/index?filePath=' + newpath + '&process=resize,' + poise + ',w_' + w + ',h_' + h;
     }
     Vue.prototype.uploadSelfBlob = function (path, files, successCall) {
         let that = this;