11

pages/jiuzhai/jz_Line.vue

@@ -490,7 +490,8 @@
 					searchKey: '', //搜索数据
 					priceOrderByField: 2,
 					PlaceIds: '',
-					lineId: 0
+					lineId: 0,
+					teamType: "", //团队类型 1-小包团
 				},
 				time: '',
 				currentLineId: null,
@@ -596,6 +597,9 @@
 			if (option && option.PlaceIds) {
 				this.msg.PlaceIds = option.PlaceIds;
 			}
+			if (option && option.teamType && option.teamType == "1") {
+				this.msg.teamType = option.teamType;
+			}
 			this.getLineQuery();
 		},
 		methods: {
@@ -611,8 +615,8 @@
 				this.allTeams = false;
 				this.currentLineId = item;
 				this.msg.lineId = item.LineID;
-				this.msg.PlaceIds="";
-				this.msg.team=[];
+				this.msg.PlaceIds = "";
+				this.msg.team = [];
 			},
 			//获取查询条件
 			getLineQuery() {

pages/jiuzhai/jz_LineDetail.vue

@@ -1468,6 +1468,7 @@
 				myObj.babyChargePrice = this.currentPrice.babyChargePrice;
 				myObj.b2BMemberPrice = this.currentPrice.b2BMemberPrice;
 				myObj.tcid = this.currentPrice.tcid;
+				myObj.teamType = this.currentPrice.teamType;
 				let imgCover = JSON.parse(this.dataList.imgCover);
 				if (imgCover.length > 0) {
 					myObj.CoverImg = imgCover[0].Url;
@@ -1479,19 +1480,18 @@
 					yeCount: this.yeCount, //婴儿
 					etbCount: this.etbCount, //儿童不占床
 				};
+				let tParams = "&tcid=" +
+					this.delMsg.tcid +
+					"&cityId=" +
+					this.delMsg.cityId +
+					"&lineId=" +
+					this.dataList.lineId;
+				console.log("tParams", tParams);
 				uni.navigateTo({
 					url: "/pages/jiuzhai/jz_Reserve?currentPriceInfo=" +
 						encodeURIComponent(myCurr) +
 						"&seat=" +
-						encodeURIComponent(JSON.stringify(ren)) +
-						"&tcid=" +
-						this.delMsg.tcid +
-						"&cityId=" +
-						this.delMsg.cityId +
-						"&lineId=" +
-						this.dataList.lineId +
-						"&teamType=" +
-						this.currentPrice.teamType,
+						encodeURIComponent(JSON.stringify(ren)) + tParams,
 				});
 			},
 			// #ifdef MP-WEIXIN

pages/jiuzhai/jz_Reserve.vue

@@ -502,7 +502,6 @@
 			};
 		},
 		created() {
-
 			uni.setNavigationBarTitle({
 				title: "订单支付预览",
 			});
@@ -511,11 +510,12 @@
 		},
 		onLoad(option) {
 			this.customer = uni.getStorageSync("b2b_user");
-			console.log("option", option);
-			if (option.seat) {
+			if (option.currentPriceInfo) {
 				this.currentPriceInfo = JSON.parse(
 					decodeURIComponent(option.currentPriceInfo)
 				);
+			}
+			if (option.seat) {
 				let t = JSON.parse(decodeURIComponent(option.seat));
 				this.orderMsg.ManNum = t.crCount;
 				this.orderMsg.ChirdNeedBedNum = t.etCount;
@@ -527,11 +527,10 @@
 			if (option.tcid) {
 				this.getDetails(option.tcid, option.cityId);
 			}
-
 			if (option.lineId) {
 				this.lineId = option.lineId
-				this.getUserCouponList()
 			}
+			this.getUserCouponList();
 		},
 		methods: {
 			showCouponHandler() {
@@ -560,6 +559,7 @@
 					"CustomerType": 0, //客户类型 0-同行，1-直客
 					"TCID": this.currentPriceInfo.tcid,
 				}
+				console.log("this.currentPriceInfo",this.currentPriceInfo);
 				if (this.currentPriceInfo.teamType == "0") {
 					//跟团游
 					couponParams.CouponsUseScope = 2;