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

pages.json

@@ -591,6 +591,8 @@
 			"root": "pages/jiuzhai",
 			"pages": [{
 				"path":"jz_Line" //九寨-线路
+			},{
+				"path":"jz_LineDetail" //九寨-线路详情
 			}]
 		},
 		//相亲分包

pages/guidecar/index.vue

@@ -280,10 +280,11 @@
 				}
 			}
 			let carDate = new Date();
-			this.carMsg.Q_Date = carDate.getFullYear() +'-'+(carDate.getMonth() + 1)+'-'+carDate.getDate();
+			let carMonth = (carDate.getMonth() + 1)<10?'0'+(carDate.getMonth() + 1):(carDate.getMonth() + 1);
+			this.carMsg.Q_Date = carDate.getFullYear() +'-'+carMonth+'-'+carDate.getDate();
 			let carday = carDate.getDay();
-			this.startDate = carDate.getFullYear() +'-'+(carDate.getMonth() + 1)+'-'+carDate.getDate();//从啥时候开始
-			this.showcardate = (carDate.getMonth() + 1)+'-'+carDate.getDate();
+			this.startDate = carDate.getFullYear() +'-'+carMonth+'-'+carDate.getDate();//从啥时候开始
+			this.showcardate = carMonth+'-'+carDate.getDate();
 			this.showweek = this.getweek(carday) //得到定制专车的周几
 			
 		},

pages/index/index.vue

@@ -1220,21 +1220,21 @@
 			},
 			
 			yj(){
-				let obj ={ArriveCityId: 7,
-					ArriveCityName: "九寨沟",
-					ArriveCityType: 2,
-					Q_Date: "2021-5-25",
-					StartCityId: 262,
-					StartCityName: "成都",
-					StartCityType: 1}
-					obj = encodeURIComponent(JSON.stringify(obj))
-					uni.navigateTo({
-						url: '/pages/guidecar/bookaCarList?carMsg='+obj
-					})
-				// uni.navigateTo({
-				// 	url: '/pages/guidecar/index'
-				// 	// url: '/pages/blindDate/personal/IDidentification' 
-				// })
+				// let obj ={ArriveCityId: 7,
+				// 	ArriveCityName: "九寨沟",
+				// 	ArriveCityType: 2,
+				// 	Q_Date: "2021-5-25",
+				// 	StartCityId: 262,
+				// 	StartCityName: "成都",
+				// 	StartCityType: 1}
+				// 	obj = encodeURIComponent(JSON.stringify(obj))
+				// 	uni.navigateTo({
+				// 		url: '/pages/guidecar/bookaCarList?carMsg='+obj
+				// 	})
+				uni.navigateTo({
+					url: '/pages/jiuzhai/jz_Line',
+					// url: '/pages/blindDate/personal/IDidentification' 
+				})
 				
 			}
 		},

pages/jiuzhai/jz_Line.vue

@@ -11,9 +11,9 @@
 	}
 
 	.jz_TuDiv {
-		width: 280rpx;
-		height: 220rpx;
-		border-radius: 6px;
+		width: 220rpx;
+		height: 280rpx;
+		border-radius: 12px;
 		overflow: hidden;
 		position: relative;
 	}
@@ -24,9 +24,10 @@
 	}
 
 	.jz_Right {
-		width: 380rpx;
+		width: 432rpx;
 		margin-top: 5px;
 		font-size: 14px;
+		position: relative;
 	}
 
 	.jz_LineName {
@@ -61,14 +62,7 @@
 		align-items: center;
 		justify-content: center;
 	}
-
-	.jz_Remark {
-		width: 100%;
-		font-size: 13px;
-		background-color: #f1f0f0;
-		padding: 10px;
-	}
-
+	
 	.op_remark {
 		overflow: hidden;
 		white-space: nowrap;
@@ -77,7 +71,7 @@
 
 	.jz_ListMain {
 		padding-bottom: 10px;
-		border-bottom: 1px solid #d1d1d1;
+		border-bottom: 1px solid #E2E2E2;
 		margin-bottom: 10px;
 	}
 
@@ -97,9 +91,6 @@
 
 	.jz_Sort {
 		width: 100%;
-		/* 		justify-content: space-between;
-		display: flex;
- */
 		margin: 20px 0;
 	}
 
@@ -142,6 +133,16 @@
 		top: 130px;
 		z-index: 999;
 	}
+	.jz_Recommend{
+		color:#999999;
+		font-size:24rpx;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+		margin-top:10px;
+		line-height: 20px;
+	}
 </style>
 <template>
 	<div class="jz_Line" >
@@ -169,10 +170,10 @@
 			<template v-else>
 				<view style="height: calc(100vh - 120px);overflow: hidden;">
 					<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
-						<view class="jz_ListMain" v-for="(item,index) in dataList" :key="index">
+						<view class="jz_ListMain" v-for="(item,index) in dataList" :key="index" @click="goJzDetail(item.tcid,item.configId)">
 							<view class="jz_List">
 								<view class="jz_TuDiv">
-									<img class="jz_TuBigImg" src="http://imgfile.oytour.com/Upload/DMC/20200603030333648.jpg?x-oss-process=image/resize,l_140"
+									<img class="jz_TuBigImg" aspectFill src="http://imgfile.oytour.com/Upload/DMC/20200603030333648.jpg"
 									 alt="" />
 									<view class="jz_TuDivBotm">
 										<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/address.png" />成都出发
@@ -181,21 +182,21 @@
 								</view>
 								<view class="jz_Right">
 									<view class="jz_LineName">{{item.title}}</view>
+									<view class="jz_Recommend">
+										{{item.productRecommend}}
+									</view>
 									<view style="margin:10px 0">
 										<img class="jz_calederImg" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/canlder.png" />{{item.startDate}}<text
 										 class="jz_Canhoubu">不可候补</text>
 									</view>
 									<view style="margin-bottom:10px">航班:<text>无</text>(余位:10)</view>
-									<view>
-										同业价:<text class="jz_redType">{{item.b2BPrice}}</text>
-										<text style="margin-left:10px;">统一售价:<text class="jz_redType">{{item.b2CPrice}}</text></text>
+									<view style="color:#FF3166;position: absolute;right:0;bottom:0">
+										<text style="font-size:20rpx;">¥</text>
+										<text style="font-size:36rpx;">{{item.b2BPrice}}</text>
+										<text style="font-size:20rpx;">起</text>
 									</view>
 								</view>
 							</view>
-							<view class="jz_Remark">
-								<view class="op_remark" style="margin-bottom:10px;">OP备注：1不占床小孩收费1不占床小孩收费1不占床小孩收费1不占床小孩收费</view>
-								<view class="op_remark">本团卖点：1不占床小孩收费1不占床小孩收费1不占床小孩收费1不占床小孩收费</view>
-							</view>
 						</view>
 					</scroll-view>
 				</view>
@@ -229,9 +230,6 @@
 				searchKey: '', //搜索数据
 				value1: 1,
 				isShowDate: false,
-				delMsg: {
-					tcid: 10964
-				},
 				lineList: [{
 						label: '出境日本线',
 						value: 1,
@@ -253,7 +251,6 @@
 		},
 		created() {
 			this.getList();
-			this.getDetails();
 		},
 		methods: {
 			//获取数据
@@ -273,22 +270,6 @@
 					null
 				);
 			},
-			//获取详情
-			getDetails() {
-				this.apipost(
-					"b2b_get_GetB2BTravelInfoNoDes",
-					this.delMsg,
-					res => {
-						console.log(res, '详情');
-						if (res.data.resultCode == 1) {
-
-						} else {
-
-						}
-					},
-					null
-				);
-			},
 			//获取日期
 			getStratDate(val) {
 				console.log(val, 'val');
@@ -302,6 +283,12 @@
 				this.status = "nomore";
 			  }
 			},
+			//跳转至详情
+			goJzDetail(tcid,configId){
+				uni.navigateTo({
+					url: "/pages/jiuzhai/jz_LineDetail?tcid=" + tcid +'&configId='+configId
+				});
+			}
 		},
 	};
 </script>