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

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
         ) {

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/components/discountProtocol.vue

@@ -370,6 +370,7 @@
           res => {
             this.SaveLoading = false;
             if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
               this.addMsg.ProtocolId = res.data.data;
               this.msg.ProtocolId = res.data.data;
               this.GetData();