Merge branch 'master' of http://47.114.134.244:3000/chenkainan/yandu_WeChat

pages/index/index.vue

@@ -44,7 +44,7 @@
 		<image src="https://static.ticket.sz-trip.com/yandu/images/index/iconBg.png" mode="" class="iconBg"></image>
 		
 		<!-- 景点推荐 -->
-		<view class="scenic-box" :style="{backgroundImage: 'url('+showImg(homeUi.jdtj)+')',backgroundSize: 'cover'}" v-if="scenic">
+		<view class="scenic-box" :style="{backgroundImage: 'url('+showImg(homeUi.jdtj)+')',backgroundSize: 'cover'}" v-if="scenic" @click="gotoScenic(item)">
 			<view class="scenic-title">{{scenic.title}}</view>
 			<view class="scenic-subtitle flex-between">
 				<view class="text-overflow" style="width: 320rpx;display: flex;align-items: center;">
@@ -102,7 +102,7 @@
 				<view @click="gotoPath('/subPackages/food/foodList')">更多 ></view>
 			</view>
 			<view class="food-box box">
-				<view v-for="(item,index) in foodList" :key="index" class="food-item" :style="{backgroundImage: 'url('+showImg(item.goods.image)+')',backgroundSize: 'cover'}">
+				<view v-for="(item,index) in foodList" :key="index" class="food-item" :style="{backgroundImage: 'url('+showImg(item.goods.image)+')',backgroundSize: 'cover'}" @click="gotoFood(item)">
 					<view class="recommend" v-if="item.goods.image_tag">{{item.goods.image_tag}}</view>
 					<view class="food-content">
 						<view class="food-price">{{item.goods.low_money / 100}}</view>
@@ -279,6 +279,24 @@
 						break;
 				}
 			},
+			// 景点详情
+			gotoScenic(item) {
+				this.goOtherDetail(item)
+				if(!item.link_type) {
+					uni.navigateTo({
+						url:'/subPackages/ticketBooking/detail?id='+item.id
+					})
+				}
+			},
+			// 美食详情
+			gotoFood(item) {
+				this.goOtherDetail(item)
+				if(!item.link_type) {
+					uni.navigateTo({
+						url: '/subPackages/food/foodDetail?id=' + item.id
+					});
+				}
+			},
 			// 游记攻略、线路详情
 			goCalendarDetail(item,type) {
 				this.goOtherDetail(item)

subPackages/order/detail.vue

@@ -171,7 +171,7 @@
 							</view>
 							<view
 								@click="openLocation(info.order_child[0].extract.lat,info.order_child[0].extract.lon)">
-								<image src="https://static.ticket.sz-trip.com/yandu/images/order/navigation.png"
+								<image src="https://static.ticket.sz-trip.com/yandu/images/order/navigations.png"
 									mode=""></image>
 								导航
 							</view>
@@ -184,7 +184,7 @@
 			<view v-if="info.order_child[0].goods_genre == 'food'">
 				<view class="pgoods-detail">
 					购买信息
-					<view class="pgoods-product">
+					<view class="pgoods-product" style="border-bottom: none;">
 						<image :src="showImg(foodInfo.image)" mode="aspectFill" class="product-img"></image>
 						<view class="product-content flex-column">
 							<view class="product-title">{{foodInfo.title}}</view>
@@ -197,6 +197,10 @@
 							</view>
 						</view>
 					</view>
+					<view class="food-name flex-between">
+						{{info.order_child[0].contact_name}}
+						<span>{{info.order_child[0].phone}}</span>
+					</view>
 
 					<!-- 商品价格 -->
 					<view class="public-price">
@@ -272,14 +276,14 @@
 					</view>
 					
 					<view class="flex-between" style="margin-top: 30rpx;">
-						<view class="hotel-address flex-between" @click.stop="goMap(info.order_child[0])">
+						<view class="hotel-address flex-between">
-							<view class="address text-overflowRows">{{info.order_child[0].goods_data.address}}</view>
+							<view class="address text-overflowRows">{{info.order_child[0].scenic_data.address}}</view>
-							<view class="address-image">
+							<view class="address-image" @click="openLocation(info.order_child[0].scenic_data.lat,info.order_child[0].scenic_data.lon)">
 								<image src="https://static.ticket.sz-trip.com/yandu/images/order/navigation.png"></image>
 								<view>地图</view>
 							</view>
 						</view>
-						<view class="hotel-phone flex-center" @click.stop="callPhone(info.order_child[0].goods_data.tel)">
+						<view class="hotel-phone flex-center" @click="clickPhone(info.order_child[0].scenic_data.tel)">
 							<image src="https://static.ticket.sz-trip.com/yandu/images/order/hotelPhone.png"></image>
 							<view>电话</view>
 						</view>
@@ -604,33 +608,6 @@
 					}
 				});
 			},
-			
-			callPhone (tel) {
-				let _this = this
-				uni.showActionSheet({
-					itemList: [tel,'呼叫'],
-					success: function (res) {
-						_this.clickPhone(tel)
-					}
-				});
-			},
-			
-			goMap (info) {
-				let param = {
-					latitude: Number(info.goods_data.lat),
-					longitude: Number(info.goods_data.lon),
-					name: info.goods_title,
-					address: info.goods_data.address,
-				}
-				
-				uni.openLocation({
-					...param,
-					success: function () {
-						console.log('success');
-					}
-				});
-			},
-			
 		}
 	}
 </script>
@@ -1037,6 +1014,13 @@
 	}
 
 	// 美食
+	.food-name {
+		font-weight: bold;
+		font-size: 31rpx;
+		color: #000000;
+		margin-bottom: 40rpx;
+	}
+	
 	.shop-detail {
 		width: 697rpx;
 		height: auto;

subPackages/user/travelerList.vue

@@ -136,7 +136,7 @@
 										title: res.msg
 									})
 								}
-								that.getList()
+								that.init()
 							})
 						} else if (res.cancel) {
 							console.log('用户点击取消');