Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/App.vue

@@ -165,6 +165,7 @@
         !this.getLocalStorage() &&
         document.URL.indexOf("SupplierLogin") == -1 &&
         document.URL.indexOf("clientConfirm") == -1 &&
+        document.URL.indexOf("clientConfirmWT") == -1 &&
         document.URL.indexOf("clientProtocol") == -1 &&
         document.URL.indexOf("clientDisclaimerProtocol") == -1 &&
         document.URL.indexOf("TravelContractConfirm") == -1 &&
@@ -179,6 +180,7 @@
       } else {
         if (
           document.URL.indexOf("clientConfirm") != -1 ||
+          document.URL.indexOf("clientConfirmWT") != -1 ||
           document.URL.indexOf("clientProtocol") != -1 ||
           document.URL.indexOf("clientDisclaimerProtocol") != -1 ||
           document.URL.indexOf("TravelContractConfirm") != -1 ||

src/components/clientConfirmWT.vue

@@ -596,7 +596,7 @@
             <p>甲方需要仔细核对旅客的姓名与证件号，乙方将按照以下信息为甲方预订，若因信息有误造成甲方损失，所产生损失由甲方自行承担（名单可附页，需要旅行社和旅游者代表签字/盖章确认）。</p>
             <h3><p>第二条 委托代订项目</p></h3>
             <p>甲方委托乙方代为预订以下一项或几项服务：代订机票、酒店；代办个人旅游签证；代办目的地地面资源（例如用车、门票、当地观光游览等）；抵离接送机等。具体产品见附件。</p>
-            <p>所有代订业务如有不退、不改、不可转让规则的，乙方有义务告知甲方此信息，甲方知晓后签约即表示接受此内容要求。如机票为往返套票，请按照顺序使用机票，若去程未使用将导致回程机票无法使用。【所有代订项目为资源名称+费用包含。】</p>
+            <p>所有代订业务如有不退、不改、不可转让规则的，乙方有义务告知甲方此信息，甲方知晓后签约即表示接受此内容要求。如机票为往返套票，请按照顺序使用机票，若去程未使用将导致回程机票无法使用。</p>
             <h3><p>第三条 费用计算</p></h3>
             <p>1、代订项目费用及支付（以“人民币”为计算单位</p>
             <p>价格：<font>{{dataList.adultPrice}}</font>元/份；</p>

src/plug/index.js

@@ -290,7 +290,7 @@ 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 &&
+        if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 && this.$route.name.indexOf('clientConfirmWT') === -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 &&
@@ -335,7 +335,21 @@ export default {
               Id: Id
             }
           })
-        } else if (this.$route.path == "/clientProtocol") {
+        } else if (this.$route.path == "/clientConfirmWT") {
+          let TCID = this.$route.query.TCID;
+          let orderID = this.$route.query.orderID;
+          let guestId = this.$route.query.guestId;
+          let Id = this.$route.query.Id;
+          this.$router.push({
+            name: "clientConfirmWT",
+            query: {
+              TCID: TCID,
+              orderID: orderID,
+              guestId: guestId,
+              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;
@@ -489,7 +503,7 @@ export default {
       },
       // 自动登录HTTP提交数据
       Vue.prototype.apipostLogin = function (cmd, msg, successCall, faildCall, isOnline) {
-        if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
+        if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 && this.$route.name.indexOf('clientConfirmWT') === -1 &&
           this.$route.name.indexOf('confirmationsOrderDownLoad') === -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
@@ -528,6 +542,18 @@ export default {
               guestId: guestId
             }
           })
+        }else if (this.$route.path == "/clientConfirmWT") {
+          let TCID = this.$route.query.TCID;
+          let orderID = this.$route.query.orderID;
+          let guestId = this.$route.query.guestId;
+          this.$router.push({
+            name: "clientConfirmWT",
+            query: {
+              TCID: TCID,
+              orderID: orderID,
+              guestId: guestId
+            }
+          })
         } else if (this.$route.path == "/TravelContractConfirm") {
           let ContractId = this.$route.query.ContractId;
           this.$router.push({