Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel into master

pages/jiuzhai/jz_LineDetail.vue

@@ -1255,14 +1255,28 @@ export default {
     },
     //立即预定
     goReserce() {
-      let myCurrentInfo = this.currentPrice;
-      myCurrentInfo.startCityName = this.dataList.startCityName;
+	  let myObj={};
+      // let myCurrentInfo = this.currentPrice;
+      // myCurrentInfo.startCityName = this.dataList.startCityName;
+	  myObj.startCityName = this.dataList.startCityName
+	  myObj.startDate = this.currentPrice.startDate;
+	  myObj.dayNum = this.currentPrice.dayNum;
+	  myObj.title = this.currentPrice.title;
+	  myObj.b2BPrice = this.currentPrice.b2BPrice;
+	  myObj.b2CPrice = this.currentPrice.b2CPrice;
+	  myObj.childNeedPrice = this.currentPrice.childNeedPrice;
+	  myObj.childNoNeedPrice = this.currentPrice.childNoNeedPrice;
+	  myObj.babyPrice = this.currentPrice.babyPrice;
+	  myObj.babyChargePrice = this.currentPrice.babyChargePrice;
+	  myObj.b2BMemberPrice = this.currentPrice.b2BMemberPrice;
+	  
       let imgCover = JSON.parse(this.dataList.imgCover);
       if (imgCover.length > 0) {
-        myCurrentInfo.CoverImg = imgCover[0].Url;
+        // myCurrentInfo.CoverImg = imgCover[0].Url;
+		myObj.CoverImg = imgCover[0].Url
       }
-      let myCurr = JSON.stringify(myCurrentInfo);
-      console.log(myCurrentInfo, "myCurrentInfo");
+      let myCurr = JSON.stringify(myObj);
+      
       let ren = {
         crCount: this.crCount,
         etCount: this.etCount,

pages/jiuzhai/jz_Reserve.vue

@@ -506,7 +506,7 @@ export default {
       this.currentPriceInfo = JSON.parse(
         decodeURIComponent(option.currentPriceInfo)
       );
-      let t = JSON.parse(option.seat);
+      let t = JSON.parse(decodeURIComponent(option.seat));
       this.orderMsg.ManNum = t.crCount;
       this.orderMsg.ChirdNeedBedNum = t.etCount;
       this.orderMsg.ChirdNoBedNum = t.etbCount;
@@ -572,9 +572,9 @@ export default {
     calcMoney() {
       var price = 0;
       if (this.$utils.getretailer()) {
-        price = this.currentPriceInfo.b2BMemberPrice;
+        price = this.currentPriceInfo.b2BPrice;
       } else {
-        price = this.currentPriceInfo.b2CMemberPrice;
+        price = this.currentPriceInfo.b2CPrice;
       }
       this.orderMsg.ChirdNum =
         parseInt(this.orderMsg.ChirdNoBedNum) +