新增站点选择

node_modules/uview-ui/components/u-popup/u-popup.vue

@@ -157,6 +157,7 @@
 						default:
 							;
 					}
+					style.overflow="hidden"
 					// 不加可能圆角无效
 					//style.overflow = 'hidden';
 				}

pages/jiuzhai/components/time/index.vue

@@ -43,7 +43,7 @@
 					<view>六</view>
 				</view>
 			</view>
-			<view class="section">
+			<view class="section"> 
 				<view v-for="(res, line) in resDate" class="item" :key="line">
 					<view class="year">{{ res.year }}年{{ res.month }}月</view>
 					<view class="day">
@@ -161,7 +161,9 @@
 				}
 			});
 			this.setDate();
-			this.nowDay = new Date().getDate();
+			var dateTime=new Date();
+			dateTime=dateTime.setDate(dateTime.getDate()+1);
+			this.nowDay = new Date(dateTime).getDate();
 			/*默认入住离店日期，今日入住明日离店，此处应在setDefaultDate函数内传入vuex里保存的日期进行默认操作
 			 *不推荐使用本地缓存，下边只是使用缓存的示例
 			 */

pages/jiuzhai/jz_Line.vue

@@ -71,8 +71,10 @@
 
 	.jz_ListMain {
 		padding-bottom: 10px;
-		border-bottom: 1px solid #E2E2E2;
+		margin:0 30rpx;
+		border-bottom: 1px solid #f1f1f1;
 		margin-bottom: 10px;
+		
 	}
 
 	.jz_TuDivBotm img {
@@ -232,6 +234,42 @@
 		font-size: 28rpx;
 		font-weight: 600;
 	}
+	.jz_Content  .start-city {
+		display: inline-block;
+		position: relative;
+	}
+	
+	.jz_Content  .start-city text {
+		position: relative;
+		z-index: 2;
+		font-size: 30rpx;
+		line-height: 30rpx;
+		font-weight: 500;
+		color: #111;
+	}
+	
+	.jz_Content  .start-city::after {
+		background-color: #DFBE6E;
+		height: 6px;
+		bottom: 2px;
+		left: 0;
+		right: 0;
+		position: absolute;
+		z-index: 1;
+		display: block;
+		content: ' ';
+	}
+	.jz_Content .price {
+		margin-top: 10rpx;
+		font-weight: 500;
+		color: #111111;
+		font-size: 20rpx;
+		text-align: right;
+	}
+	
+	.jz_Content .price .money {
+		font-size: 36rpx;
+	}
 </style>
 <template>
 	<div class="jz_Line">
@@ -239,9 +277,9 @@
 			<!-- <u-search placeholder="目的地,旅游线路" shape="round" v-model="searchKey" input-align="left" :value="searchKey" text-color="#111"
 			 :show-action="false"></u-search> -->
 			<view class="search-box">
-				<view class="date">
+				<view class="date" @click="showBranch=true">
 					<u-icon name="location" color="#111" size="24"></u-icon>
-					<text style="margin-left: 20rpx;">成都站</text>
+					<text style="margin-left: 20rpx;">{{currentBrachName}}</text>
 				</view>
 				<view style="width: 1px; flex: 1;">
 					<u-search placeholder="目的地名称" v-model="searchKey" input-align="left" :value="searchKey"
@@ -331,7 +369,7 @@
 			<view v-if="screenshow==true" class="Jz_Mask" @click="screenshow=false"></view>
 			<u-empty v-if="dataList.length==0" text="暂无数据" mode="data"></u-empty>
 			<template v-else>
-				<view style="height: calc(100vh - 120px);overflow: hidden;padding: 0 30rpx;">
+				<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"
@@ -339,29 +377,29 @@
 							<view class="jz_List">
 								<view class="jz_TuDiv">
 									<img class="jz_TuBigImg" mode="aspectFill" :src="getImgs(item.imgCover)" alt="" />
-									<view class="jz_TuDivBotm">
-										<img
-											src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/address.png" />成都出发
-										{{item.dayNum}} 天
-									</view>
 								</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"
+									<view style="margin:10px 0;display: flex;align-items: center;">
+										<!-- <img class="jz_calederImg"
 											src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/CustomizedCar/canlder.png" />{{item.startDate}}
 										<text class="jz_Canhoubu">
 											{{item.isSubstitution==0?'不可候补':'可以候补'}}
-										</text>
+										</text> -->
+										<view class="start-city">
+											<text>成都出发</text>
+										</view>
+										<view style="margin-left: 20rpx;">
+											<u-tag mode="plain" border-color="#DFBE6E" color="#DFBE6E" :text="`${item.dayNum}天`" size="mini"></u-tag>
+										</view>
 									</view>
-									<view style="margin-bottom:10px">余位：{{item.surplus}}</view>
-									<view style="color:#FF3166;position: absolute;right:0;bottom:0">
-										<text style="font-size:20rpx;">¥</text>
-										<text style="font-size:40rpx;">{{item.b2BPrice}}</text>
-										<text style="font-size:20rpx;">起</text>
+									<view class="price">
+										<text>￥</text>
+										<text class="money">{{item.b2BPrice}}</text>
+										<text>起</text>
 									</view>
 								</view>
 							</view>
@@ -374,6 +412,7 @@
 		<u-popup v-model="showTimePopup" mode="bottom" border-radius="20" length="90%" :safe-area-inset-bottom="true">
 			<canlendar @finish="chosenDateResult"></canlendar>
 		</u-popup>
+		<u-picker mode="selector" v-model="showBranch" :default-selector="[0]" :range="branchList" @confirm='changeBranch' range-key="BName"></u-picker>
 	</div>
 </template>
 <script>
@@ -394,7 +433,8 @@
 					days:['<100'],
 					startDate:'',
 					endDate:'',
-					startCity:-1
+					startCity:-1,
+					branchId:0
 				},
 				time: '',
 				params: {
@@ -569,6 +609,24 @@
 				screenshow: false,
 				status: "加载中",
 				page_count: 0,
+				branchList:[{
+					BName:'成都站',
+					BId:0
+				},
+				{
+					BName:'武汉站',
+					BId:1
+				},
+				{
+					BName:'西安站',
+					BId:2
+				},
+				{
+					BName:'昆明站',
+					BId:3
+				}],
+				currentBrachName:"",
+				showBranch:false,
 				optionsTitle: [
 					"推荐排序",
 					"线路玩法",
@@ -582,8 +640,14 @@
 			uni.setNavigationBarTitle({
 				title:"精品旅游线路"
 			})
+			this.msg.branchId=this.branchList[0].BId
+			this.currentBrachName=this.branchList[0].BName
 		},
 		methods: {
+			changeBranch(val){
+				this.msg.branchId=this.branchList[val].BId
+				this.currentBrachName=this.branchList[val].BName
+			},
 			setDays(day){
 				if(day=='<100'){
 					this.msg.days=['<100']