页面修改

src/App.vue

@@ -130,6 +130,7 @@
         !this.getLocalStorage() &&
         document.URL.indexOf("SupplierLogin") == -1 &&
         document.URL.indexOf("clientConfirm") == -1 &&
+        document.URL.indexOf("clientProtocol") == -1 &&
         document.URL.indexOf("TravelContractConfirm") == -1 &&
         document.URL.indexOf("ViittoContractConfirm") == -1
       ) {
@@ -139,6 +140,7 @@
       } else {
         if (
           document.URL.indexOf("clientConfirm") != -1 ||
+          document.URL.indexOf("clientProtocol") != -1 ||
           document.URL.indexOf("TravelContractConfirm") != -1 ||
           document.URL.indexOf("ViittoContractConfirm") != -1
         ) {
@@ -188,6 +190,12 @@
       this.MsgBus.$on("changeTheme", t => {
         this.isRed = t == 1;
       });
+    },
+    watch: {
+      '$route': function (old, val) {
+        console.log("old", old);
+        console.log("val", val);
+      }
     }
   };
 
@@ -350,6 +358,7 @@
   .c059FF6 {
     color: #059ff6;
   }
+
   .c9e {
     color: #9e9e9e;
   }

src/components/clientProtocol.vue

@@ -698,11 +698,11 @@
 
     },
     mounted() {
-      this.msg.TCID = this.$route.query.TCID;
-      this.msg.OrderId = this.$route.query.OrderId;
-      this.msg.GuestId = this.$route.query.GuestId;
-      this.msg.ProtocolId = this.$route.query.ProtocolId;
-      this.getList();
+      // this.msg.TCID = this.$route.query.TCID;
+      // this.msg.OrderId = this.$route.query.OrderId;
+      // this.msg.GuestId = this.$route.query.GuestId;
+      // this.msg.ProtocolId = this.$route.query.ProtocolId;
+      // this.getList();
     }
   };
 

src/plug/index.js

@@ -119,7 +119,7 @@ export default {
         let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
-        let isOnline=0;//0-本地测试，1-线上
+        let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.10.68:8888";
         // domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
         //  domainUrl = "http://192.168.10.226"; //春姐
@@ -139,17 +139,17 @@ export default {
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://testcrm.oytour.com";
           ocrUrl = "http://ocr.oytour.com";
-          isOnline=1;
+          isOnline = 1;
         } else if (locationName.indexOf('oytour') !== -1) {
           domainUrl = "http://reborn.oytour.com";
           mallUrl = "https://mallapi.oytour.com";
           lxymallUrl = "https://erpmallapi.oytour.com";
           crmUrl = "http://crm.oytour.com";
           ocrUrl = "http://ocr.oytour.com";
-          isOnline=1;
+          isOnline = 1;
         }
         var obj = {
-          IsOnline:isOnline,//0-本地，1-线上
+          IsOnline: isOnline, //0-本地，1-线上
           //主地址
           DomainUrl: domainUrl,
           ocrUrl: ocrUrl, //行程下载地址
@@ -258,12 +258,12 @@ export default {
 
     //HTTP提交数据
     Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline, isTerminate) {
+ 
         if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
           this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
           this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
-          this.$route.name.indexOf('OrderProfitLossList') === -1&&this.$route.name.indexOf('clientProtocol') === -1
+          this.$route.name.indexOf('OrderProfitLossList') === -1 && this.$route.name.indexOf('clientProtocol') === -1
         ) {
-
           let previousPathInfo = {
             path: this.$route.name,
             query: this.$route.query
@@ -280,6 +280,7 @@ export default {
         }
         var timestamp = (new Date()).valueOf();
         this.apiurl = apiurl;
+
         if (this.$route.path.toLowerCase() == "/signature") {
           this.$router.push({
             path: '/signature'
@@ -301,6 +302,20 @@ export default {
               guestId: guestId,
             }
           })
+        } else if (this.$route.path == "/clientProtocol") {
+          let TCID = this.$route.query.TCID;
+          let OrderId = this.$route.query.OrderId;
+          let GuestId = this.$route.query.GuestId;
+          let ProtocolId = this.$route.query.ProtocolId;
+          this.$router.push({
+            name: "clientProtocol",
+            query: {
+              TCID: TCID,
+              OrderId: OrderId,
+              GuestId: GuestId,
+              ProtocolId: ProtocolId,
+            }
+          })
         } else if (this.$route.path == "/clientConfirmRB") {
           let TCID = this.$route.query.TCID;
           let orderID = this.$route.query.orderID;
@@ -329,21 +344,7 @@ export default {
               Id: Id
             }
           })
-        }
-        else if (this.$route.path == "/clientProtocol") {
-          let TCID = this.$route.query.TCID;
-          let OrderId = this.$route.query.OrderId;
-          let GuestId = this.$route.query.GuestId;
-          this.$router.push({
-            name: "clientProtocol",
-            query: {
-              TCID: TCID,
-              OrderId: OrderId,
-              GuestId: GuestId,
-            }
-          })
-        }  
-        else {
+        } else {
           if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
             this.goToLogin(1);
           }
@@ -407,9 +408,6 @@ export default {
           .then(res => {
             //Token 10000 过期 10001 不合法
             if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
-              // if (this.getLocalStorage()) {
-              //   this.goToLogin(2);
-              // }
               this.goToLogin(2);
             } else if (res.resultCode == 10005) {
               this.$router.go(-1);

src/router/config.js

+// import login from '../components/Login'
 import login from '../components/Login2019'
 import index from '../components/index'
 import clientConfirm from '../components/clientConfirm'
@@ -7,6 +8,9 @@ import SignName from '../components/SignName'
 import supplierLogin from '../components/SupplierLogin'
 import supplierIndex from '../components/SupplierIndex'
 import automaticLogin from '../components/automaticLogin'
+import {
+  fromByteArray
+} from 'ipaddr.js'
 export default {
   routes: [{
       path: '/',
@@ -2751,21 +2755,21 @@ export default {
               },
             },
             {
-              path: '/Returnratio',// 销售=>返佣比例管理
+              path: '/Returnratio', // 销售=>返佣比例管理
               name: 'Returnratio',
               component: resolve => require(['@/components/SalesModule/Returnratio'], resolve),
               meta: {
                 title: '返佣比例管理'
               },
             }, {
-              path: '/demandStatistics',// 销售=> 统计
+              path: '/demandStatistics', // 销售=> 统计
               name: 'demandStatistics',
               component: resolve => require(['@/components/SalesModule/demandStatistics'], resolve),
               meta: {
                 title: '销售统计'
               },
             }, {
-              path: '/quoTation',//团控=>报价单
+              path: '/quoTation', //团控=>报价单
               name: 'quoTation',
               component: resolve => require(['@/components/TravelManager/TravelQuotationCenter/quoTation'], resolve),
               meta: {
@@ -3834,7 +3838,7 @@ export default {
               meta: {
                 title: '平台账户'
               },
-            },{ //财务 审核平台账户
+            }, { //财务 审核平台账户
               path: '/PlatformAccountExamine',
               name: 'PlatformAccountExamine',
               component: resolve => require(['@/components/FinancialModule/PlatformAccountExamine'], resolve),
@@ -5865,21 +5869,10 @@ export default {
       name: 'clientConfirmRB',
       component: clientConfirmRB
     },
-    {
-      path: '/discountProtocol', //价格保密协议
-      name: 'discountProtocol',
-      component: resolve => require(['@/components/discountProtocol'], resolve),
-      meta: {
-        title: '价格保密协议'
-      }
-    },
     {
       path: '/clientProtocol', //价格保密协议签订
       name: 'clientProtocol',
       component: clientProtocol,
-      meta: {
-        title: '价格保密协议签订'
-      }
     },
     {
       path: '/SignName',
@@ -5910,7 +5903,14 @@ export default {
         title: '日本线电子合同'
       }
     },
-
+    {
+      path: '/discountProtocol', //价格保密协议
+      name: 'discountProtocol',
+      component: resolve => require(['@/components/discountProtocol'], resolve),
+      meta: {
+        title: '价格保密协议'
+      }
+    },
     {
       path: '/SingleContract', //单项合同
       name: 'SingleContract',