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

src/components/TravelContractDetail.vue

@@ -367,19 +367,21 @@
     margin-bottom: 10px;
   }
 
-  .Travel_DetailQuan{
-      display: inline-block;
-      width:23px;
-      height:23px;
-      border:1px solid #d1d1d1;
-      border-radius: 5px;
-      text-align: center;
-      line-height: 20px;
-    }
-    .Travel_DetailQuan i {
-      font-size:12px;
-      color:gray;
-    }
+  .Travel_DetailQuan {
+    display: inline-block;
+    width: 23px;
+    height: 23px;
+    border: 1px solid #d1d1d1;
+    border-radius: 5px;
+    text-align: center;
+    line-height: 20px;
+  }
+
+  .Travel_DetailQuan i {
+    font-size: 12px;
+    color: gray;
+  }
+
 </style>
 
 <template>
@@ -1042,13 +1044,18 @@
       };
     },
     methods: {
-
       // 生成二维码
       GetQrCode: function () {
         let urlObj = this.domainManager();
+        var guestId=0;
+        if(this.$route.query.guestId)
+        {
+          guestId=this.$route.query.guestId;
+        }
         let msg = {
           TCID: this.$route.query.TCID,
           orderID: this.$route.query.orderID,
+          guestId: guestId,
           pUrl: "clientConfirm",
         };
         this.$http({