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

pages.json

@@ -750,6 +750,8 @@
 				  "style": {
 				      "navigationStyle": "custom"
 				  }
+				},{
+				  "path": "imgList"
 				}
 			]
 		}

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
-					})
+				// 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/index'
-				// 	// url: '/pages/blindDate/personal/IDidentification' 
+				// 		url: '/pages/guidecar/bookaCarList?carMsg='+obj
 				// 	})
+				uni.navigateTo({
+					url: '/pages/jiuzhai/jz_Line',
+					// url: '/pages/blindDate/personal/IDidentification' 
+				})
 				
 			}
 		},

pages/jiuzhai/jz_Line.vue

@@ -133,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" >
@@ -160,11 +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" @click="goJzDetail(item.tcid)">
+						<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" aspectFill src="http://imgfile.oytour.com/Upload/DMC/20200603030333648.jpg"
-									 alt="" />
+									<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}} 天
@@ -172,14 +181,19 @@
 								</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>
+										<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>
 									</view>
-									<view style="margin-bottom:10px">航班:<text>无</text>(余位:10)</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:36rpx;">{{item.b2BPrice}}</text>
+										<text style="font-size:40rpx;">{{item.b2BPrice}}</text>
 										<text style="font-size:20rpx;">起</text>
 									</view>
 								</view>
@@ -243,7 +257,7 @@
 			//获取数据
 			getList() {
 				this.apipost(
-					"b2b_get_GetB2BHomeLineTravelPageList",
+					"b2b_get_GetB2BTravelPageList",
 					this.msg,
 					res => {
 						if (res.resultCode == 1) {
@@ -271,10 +285,17 @@
 			  }
 			},
 			//跳转至详情
-			goJzDetail(tcid){
+			goJzDetail(tcid,configId){
 				uni.navigateTo({
-					url: "/pages/jiuzhai/jz_LineDetail?tcid=" + tcid
+					url: "/pages/jiuzhai/jz_LineDetail?tcid=" + tcid +'&configId='+configId
 				});
+			},
+			//获取第一张图
+			getImgs(imgObj){
+				let imgArr = JSON.parse(imgObj);
+				if(imgArr&&imgArr.length>0){
+					return imgArr[0].Url
+				}
 			}
 		},
 	};

pages/ticketCoupons/detail.vue

@@ -3,12 +3,12 @@
 		<scroll-view scroll-y="true" style="width: 100%;height: 100%;" @scroll="scroll">
 			<view style="height: 700rpx;position: relative;z-index: 1;" :style="{'opacity':(100-boxOption)+'%'}">
 							<view @click="goback" :style="[titleStyle,{opacity:'100% !important'}]"
-								style="position: fixed;top: 0;left: 0;padding-left: 6rpx;">
+								style="position: fixed;top: 0;left: 0;z-index: 9; padding-left: 6rpx;">
 								<u-icon name="arrow-left" size="44" color="#000" style="margin-top: 22rpx;"></u-icon>
 							</view> 
-							<image :src="imgBaseUrl+details.AllPicList[0].TagPicList[0].Path" mode="aspectFit" style="width: 100%,height:100%;"></image>
+							<image class="banner-img" :src="imgBaseUrl+details.AllPicList[0].TagPicList[0].Path" mode="aspectFit" @click="goUrl"></image>
 						</view>
-			<view class="ticket-title" :style="[titleStyle]">
+			<view class="ticket-title" :style="[titleStyleFix]">
 				<view @click="goback">
 					<u-icon name="arrow-left" size="44"></u-icon>
 				</view>
@@ -29,7 +29,7 @@
 							</view>
 						</view>
 						<view class="info2">
-							{{details.ID}}条点评
+							0条点评
 							<u-icon name="arrow-down" color="#6E6E6E" size="20rpx" class="icon"></u-icon>
 						</view>
 						<view class="info3">
@@ -169,6 +169,7 @@
 				boxOption: 0,
 				navsOption: 0,
 				titleStyle: {},
+				titleStyleFix:{},
 				active: 0,
 				mainColor: '',
 				controls: false, //显示默认控件
@@ -186,7 +187,7 @@
 				this.ID = options.id
 				this.getDetail()
 			}
-			this.imgBaseUrl=this.host2
+			this.imgBaseUrl="http://192.168.20.214:8130"
 			uni.getSystemInfo({
 				success(res) {
 					that.titleStyle = {
@@ -194,34 +195,25 @@
 						paddingTop: `${res.statusBarHeight}px`,
 						opacity: "0%"
 					};
+					that.titleStyleFix={
+						height: "45px",
+						position:'fixed',
+						top:'0',
+						left:'0',
+						paddingTop: `${res.statusBarHeight}px`,
+						'background-color':'#f6f6f6',
+						opacity: "0%"
+					}
 				},
 			});
 			this.mainColor = this.$uiConfig.mainColor;
 		},
 		methods: {
-			// showTips(id, text, showis) {
-			// 	clearInterval(timer);
-			// 	if (this.eleId == id && this.tooltipShow == true) {
-			// 		this.tooltipShow = false
-			// 	} else {
-			// 		console.log(text, showis)
-			// 		if (text != undefined && text != null && text != '' && showis == 1) {
-			// 			this.eleId = id;
-			// 			this.tooltipBtns = [text]
-			// 			this.tooltipShow = true;
-			// 			timer = setTimeout(() => {
-			// 				this.tooltipShow = false;
-			// 			}, 3000)
-			// 		} else {
-			// 			this.tooltipShow = false;
-			// 		}
-
-			// 	}
-
-			// },
-			// clickDescription(e) {
-			// 	console.log(e);
-			// },
+			goUrl(){
+				uni.navigateTo({
+					url: "/pages/ticketCoupons/imgList?id="+ this.ID,
+				})
+			},
 			//获取详情
 			getDetail() {
 				this.request2({
@@ -272,6 +264,9 @@
 				this.titleStyle.opacity = ((e.detail.scrollTop - 100) < 0 ? 0 : Math.floor(e.detail.scrollTop - 100)) +
 				"%";
 				this.tooltipShow = false
+				
+				this.titleStyleFix.opacity = ((e.detail.scrollTop - 100) < 0 ? 0 : Math.floor(e.detail.scrollTop - 100)) +
+				"%";
 				this.$forceUpdate()
 			},
 			goback() {
@@ -295,23 +290,7 @@
 					this.controls = true
 				}
 			},
-			getlove() {
-				// this.request2(
-				// 	{
-				// 		url: '/api/AppletTrade/GetCollect',
-				// 		data: {Type:2,SourceId:this.ID,Id:this.details.CollectId}
-				// 	},
-				// 	res => {
-				// 		if(res.resultCode==1){
-				// 			uni.showToast({
-				// 			  title: res.message,
-				// 			  icon:'none'
-				// 			});
-				// 			this.getDetail()
-				// 		}
-				// 	}
-				// );
-			},
+			
 			goMap(name, lon, lat) {
 				console.log(name, lon, lat)
 				let newLat=parseFloat(lat)
@@ -339,6 +318,11 @@
 </script>
 
 <style lang="scss" scoped>
+	.banner-img{
+		width: 750rpx;
+		height: 700rpx;
+		// background-color: #ff0;
+	}
 	.ticket-title {
 		line-height: 45px !important;
 		font-size: 16px;
@@ -729,7 +713,7 @@
 			}
 		}
 		.last-item{
-			border:none;
+			border-bottom:none !important;
 			margin-bottom: 0rpx !important;
 		}
 		

pages/ticketCoupons/imgList.vue

+<template>
+	<view class="img-list">
+		<view class="img-navs">
+			<view v-for="(item,index) in navList" :key="index" class="nav-btn" :class="{'check-nav':index==curNavIndex}">
+				{{item.key}}
+			</view>
+		</view>
+		  <view class="img-list">
+			<view v-for="(item,index) in imgList" :key="item.ID" class="img-list-item" @click="">
+				<view class="">
+					<image src="" mode=""></image>
+				</view>	
+			</view>
+		  </view>
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		data() {
+			return {
+				ID:0,
+				navList:[],
+				curNavIndex:0,
+			    imgList:[]
+	
+			}
+		},
+		components: {
+
+		},
+		watch:{
+			curNavIndex(val){
+				
+			}
+		},
+		created() {
+			uni.setNavigationBarTitle({
+				title: "风景图片",
+			});
+		
+		},
+		onLoad(option) {
+			if (options && options.id) {
+				this.ID = options.id
+				this.getDetail()
+			}
+		},
+		methods: {
+			//获取详情
+			getDetail(index) {
+				this.request2({
+						url: '/api/AppletDining/GetTicketCouponsDetails',
+						data: {
+							ID: this.ID
+						}
+					},
+					res => {
+						if (res.resultCode == 1) {
+							this.navList = res.data.AllPicList;
+							this.imgList=res.data.AllPicList[index].TagPicList
+							console.log(this.imgList)
+							
+						}
+					}
+				);
+		    },
+	    }
+	}
+</script>
+
+<style lang="scss" scoped>
+	.img-list{
+		.img-navs{
+			display: flex;
+			.nav-btn{
+				width: 230rpx;
+				height: 60rpx;
+				background-color: #FFFFFF;
+				border: 1rpx solid #111111;
+				border-radius: 20rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				text-align: center;
+				vertical-align: middle;
+			}
+			.check-nav{
+				background-color: #111111;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>