Merge branch 'master' of http://git.zthymaoyi.com/zyw/tourism

# Conflicts:
#	uni_applet/pages/food/food.vue

uni_applet/pages/find/find.vue

@@ -1,119 +1,178 @@
 <template>
-	<view>
-		<view class="flex content1">
-			<view @click='placeSelect' class='address flex'>
-			<view class='detailedAddress'>{{detailedAddress1}}</view>
-			<view class='iconfont applet-xiala'></view>
+	<view class="content">
+		<u-navbar title="美食推荐" :safeAreaInsetTop="true" placeholder='true' fixed>
+			<view class="u-nav-slot" slot="left" @click='leftClick'>
+				<view class="iconfont applet-colors-ditu"></view>
 			</view>
-			<view class=" search-wrap">
-				<view class="search flex justify-space-between align-item-center flex-between" @click="search">
-					<view class="left flex  align-item-center">
-						<image class="dSLComVueTopLeftImg" style="width: 30rpx;height: 30rpx;flex: none;" src="@/static/image/card/search.png"></image>
-						<view class="search-val"> {{searchVal?searchVal:'搜索店铺或服务 '}}</view>
+		</u-navbar>
+			<mescroll-uni :up="upOption" :down="downOption" ref="mescrollRef" @init="mescrollInit"
+				@up="upCallback" @down="downCallback" :top="150">
+				
+				<view class="flex content1">
+					<view @click='placeSelect' class='address flex'>
+						<view class='detailedAddress'>{{detailedAddress1}}</view>
+						<view class='iconfont applet-xiala'></view>
 					</view>
-			
-					<view class="right">
-						<image style='width:32rpx;height:32rpx;' v-if="searchVal" @click.stop="delSearchVal"
-							src="@/static/image/card/searchdel.png" mode="widthFix"></image>
+					<view class="search-wrap">
+						<view class="search flex justify-space-between align-item-center flex-between" @click="search">
+							<view class="left flex">
+								<image class="dSLComVueTopLeftImg" style="width: 40rpx;height: 40rpx"
+									src="@/static/image/card/search.png"></image>
+								<text class="search-val"> {{searchVal?searchVal:'搜索美食'}}</text>
+							</view>
+				
+							<view class="right">
+								<image style='width:32rpx;height:32rpx;' v-if="searchVal" @click.stop="delSearchVal"
+									src="@/static/image/card/searchdel.png" mode="widthFix"></image>
+							</view>
+						</view>
 					</view>
 				</view>
-			</view>
-		</view>
-		
-		<view>
-			<mescroll-uni :up="upOption" :down="downOption" ref="mescrollRef" @init="mescrollInit"
-				@up="upCallback" @down="downCallback" height="1400">
-				<view style='margin-top:108rpx;'>
-					<u-swiper :list="fileList"
-					autoplay
-					:height='height'
-					imgMode='aspectFill'
-					radius='0'
-					interval='5000'
-					:circular="true"
-					@change="e => current = e.current" @click="click">
-						<view slot="indicator" class="indicator">
-							<view
-					            class="indicator__dot"
-					            v-for="(item, index) in fileList"
-					            :key="index"
-					            :class="[index === current && 'indicator__dot--active']">
-					        </view>
-						</view>
-					</u-swiper>
+				<view class="tag-type head">
+					<view v-for='item in jobs' @click="change(item)" class="item" :class="item.checked?'item-active':''">
+						{{item.iname}}
+					</view>
 				</view>
-				<view class='findItem' v-for='item in findList'>
-					<view style='align-items: flex-start;' class='flex'>
-						<view class="left">
-							<view class='cover'>
-								<u--image radius='4' :showLoading="true" :src="item.coverImage" width="86px" height="86px" @click="click"></u--image>
-							</view>
-						</view>
-						<view class="right">
-							<view class='flex'>
-								<view v-if='item.mainBody=="商铺"' class='iconfont applet-dianpu1'></view>
-								<u--image v-if='item.mainBody=="个人"' :showLoading="true" src="/static/image/find/geren.png" width="20px" height="20px"></u--image>
-								<view  class='name'>{{item.shopNames}}</view>
-							</view>
-							<view class='description'>
-								<mote-lines-divide :dt="item.serviceDescription" :line="3" expandText="展开" foldHint="收起" />
+				<scroll-view scroll-x="true" scroll-with-animation="true" class='list-type'>
+					<view v-for='item in searchTypes' @click='changetype(item)'
+						:class='searchType==item.value?"Semibold active":"Regular"' class="typeitem">{{item.name}}</view>
+				</scroll-view>
+				<view class='findItem' v-for='item in findList' @click="toShop(item)" v-if="item.foodDishesInfoList&&item.foodDishesInfoList.length!=0">
+					<view style='align-items: flex-start;' class='flex' >
+						<view style='width:100vw;' class="left flex">
+							<!-- @click.stop='previewImg(item1)' -->
+							<view v-for='item1 in item.foodDishesInfoList' class="img">
+								<u--image radius='4' :showLoading="true" :src="item1.dishImage" width="150rpx"
+									height="150rpx" ></u--image>
 							</view>
+
 						</view>
 					</view>
+					<view class='flex row2'>
+						<view v-if='item.mainBody=="商铺"' class='iconfont applet-dianpu1'></view>
+						<u--image v-if='item.mainBody=="个人"' :showLoading="true" src="/static/image/find/geren.png"
+							width="20px" height="20px"></u--image>
+						<view class='name'>{{item.shopNames}}</view>
+					</view>
+					<view class="tag-type flex">
+						<text class="text" v-for='item1 in item.labels'> {{item1}}</text>
+					</view>
 					<view class='address flex justify-space-between'>
-						<view class='flex'>
+						<view style='width:60vw;' class='flex'>
 							<view class='iconfont applet-dizhi'></view>
-							<view>{{item.detailedAddress}}</view>
+							<view class="detailedAddress" @click.stop="toShopDetail(item)">
+								{{item.detailedAddress}}
+							</view>
+							<!-- <view>{{item.province}}{{item.city}}{{item.area}}</view> -->
+
+						</view>
+						<view style="color: #999;width:40vw;text-align:right;">
+							距离{{item.distance1>1000?item.distance:item.distance1}} {{item.distance1>1000?'km':'m'}}
 						</view>
-						<view>{{item.distance1>1000?item.distance:item.distance1}}
-						<text style='font-weight:600;'>{{item.distance1>1000?'km':'m'}}</text></view>
 					</view>
 				</view>
 			</mescroll-uni>
 			<!-- <mescroll-body ref="mescrollRef" :up="upOption" :down="downOption" @init="mescrollInit" @up="upCallback" @down="downCallback"></mescroll-body> -->
-		</view>
-		<login-pop-up ref='loginpopup' :content='"手机登录后才能发布内容哦~"'></login-pop-up>
-		<view class='add' @click='add'>
-			<u--image   :showLoading="true" src="/static/image/find/add.png" width="60px" height="60px"></u--image>
-		</view>
+
+		<!-- <view class='group' @click='group'>
+			<button class="tuan">团</button>
+		</view> -->
 	</view>
 </template>
 
 <script>
 	var that;
 	var GDMapWX = require('@/js_sdk/js-amap/amap-wx.130.js');
+
+	import uniTag from '@/uni_modules/uni-tag/components/uni-tag/uni-tag.vue';
+	import MoteLinesDivide from "@/components/text-over-flow/text-over-flow.vue"
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	import {
 		authorizedLocation
 	} from '@/util/util.js'
-	import MoteLinesDivide from "@/components/text-over-flow/text-over-flow.vue"
-	import loginPopUp from "@/components/loginPopUp/index.vue"
-	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	export default {
 		components: {
 			MoteLinesDivide,
-			loginPopUp
+			uniTag
 		},
 		mixins: [MescrollMixin],
 		data() {
 			return {
-				searchVal:uni.getStorageSync("search_val")?uni.getStorageSync("search_val"):"",
-				current:0,
-				mescroll:null,
-				fileList:[],
-				findList:[],
-				handleList:[],
-				height:'',
-				width:'',
-				longitude:"122.084565",
-				latitude:'40.220547',
-				curPageLen:0,
-				totalPage:0,
-				detailedAddress:'正在定位...',
-				detailedAddress1:'',
+				place: '',
+				searchVal: "",
+				current: 0,
+				mescroll: null,
+				findList: [],
+				inverted: true,
+				handleList: [],
+				labels: [],
+				searchType: '1',
+				label: '',
+				longitude: '',
+				latitude: '',
+				curPageLen: 0,
+				totalPage: 0,
+				detailedAddress: '正在定位...',
+				detailedAddress1: '',
 				downOption: {
 					auto: false,
 					textColor: '#bbb'
 				},
+				searchTypes: [{
+						name: '默认排序',
+						value: '1'
+					}, {
+						name: '距离最近',
+						value: '2'
+					},
+					// {
+					// 	name: '最多点赞',
+					// 	value: '3'
+					// }, {
+					// 	name: '我的收藏',
+					// 	value: '4'
+					// },
+				],
+				jobs: [{
+						id: 1,
+						iname: '海鲜',
+						checked: false
+					},
+					{
+						id: 2,
+						iname: '自助',
+						checked: false
+					}, {
+						id: 3,
+						iname: '烧烤',
+						checked: false
+					},
+					{
+						id: 4,
+						iname: '火锅',
+						checked: false
+					},
+					{
+						id: 5,
+						iname: '家常菜',
+						checked: false
+					},
+					{
+						id: 6,
+						iname: '面食',
+						checked: false
+					},
+					{
+						id: 7,
+						iname: '小龙虾',
+						checked: false
+					},
+					{
+						id: 8,
+						iname: '早餐',
+						checked: false
+					}
+				],
 				upOption: {
 					page: {
 						size: 10 // 每页数据的数量,默认10
@@ -127,71 +186,46 @@
 		},
 		onLoad() {
 			that = this
-			this.getList()
-		// this.mescroll.resetUpScroll();
+			// this.getList()
+			// this.getLocation()
+			// this.mescroll.resetUpScroll();
 		},
-		onShow(){
-			if(uni.getStorageSync("search_val")){
-				this.searchVal = uni.getStorageSync("search_val")
-				this.mescroll.resetUpScroll()
-			}
-			this.height = uni.getSystemInfoSync().windowWidth/2.35;
-			this.width = uni.getSystemInfoSync().windowWidth;
-			if(this.detailedAddress=='正在定位...'){
+		onShow() {
+			//判断是否有定位权限
+			this.searchVal = uni.getStorageSync("search_food_val")
+			if (this.detailedAddress == '正在定位...') {
 				this.isdingwei()
 			}
 		},
-		onShareAppMessage(res) {
-			debugger
-			let path = `/pages/find/find?id=${this.searchVal}`
-			if (res.from === 'button') {
-				return {
-					title: "本地生活一键搜索",
-					path: path,
-				};
-			}
-			if (res.from === 'menu') {
-				return {
-					title: "本地生活一键搜索",
-					path: path,
-				};
-			}
-		},
 		methods: {
-			delSearchVal(){
-				this.searchVal = ''
-				uni.removeStorageSync("search_val")
-				that.mescroll.resetUpScroll()
+			toShopDetail(val){
+				console.log(val)
+				uni.navigateTo({
+					url: "/pageA/food/detailMap?val="+JSON.stringify(val)
+				})
+				
 			},
-			search() {
-				// if (this.userInfo.phone) {
-					uni.navigateTo({
-						url: "/pageA/find/search"
-					})
-				// } else {
-				// 	this.showAuthorizePhone = true
-				// }
+			leftClick() {
+				uni.navigateTo({
+					url: "/pageA/food/fondMap"
+				})
 			},
-			placeSelect() {
-				uni.chooseLocation({
-					success: function(res) {
-						console.log(res);
-						that.latitude = res.latitude
-						that.longitude = res.longitude
-						uni.setStorageSync("findlatitude",res.latitude)
-						uni.setStorageSync("findlongitude",res.longitude)
-						let _address = that.$helper.formatLocation(res.address)
-						that.detailedAddress = res.name?res.name:_address.Village
-						that.detailedAddress1 = that.detailedAddress.length>4 ? that.detailedAddress.slice(0,4)+'...' : that.detailedAddress
-						console.log(that.detailedAddress,that.detailedAddress1)
-						uni.setStorageSync("detailedAddress",that.detailedAddress)
-						that.$forceUpdate()
-						that.upCallback({
-							num:1,
-							size:10
-						})
-					}
-				});
+			previewImg(item) {
+				uni.previewImage({
+					current: 0,
+					urls: [item.dishImage],
+					loop: true,
+				})
+			},
+			toShop(val) {
+				uni.navigateTo({
+					url: "/pageA/food/menu?val=" + JSON.stringify(val)
+				})
+			},
+			delSearchVal() {
+				this.searchVal = ''
+				uni.removetorageSync("search_food_val")
+				that.mescroll.resetUpScroll()
 			},
 			isdingwei() {
 				authorizedLocation().then(res => {
@@ -210,7 +244,7 @@
 								longitude: 122.08338497727
 							}
 						}
-			
+
 					} else {
 						_obj = {
 							latitude: res.latitude,
@@ -219,246 +253,396 @@
 					}
 					this.longitude = _obj.longitude
 					this.latitude = _obj.latitude
-					var amapPluginInstance = new GDMapWX.AMapWX({	
-									key: '6bafe91754a563ff2b7c02542c1ef4e8'
-								});
-							   amapPluginInstance.getRegeo({
-							      success: function(res){
-									  console.log(res)
-									  		that.detailedAddress = res[0].desc
-											that.detailedAddress1 = that.detailedAddress.length>4 ? that.detailedAddress.slice(0,4)+'...' : that.detailedAddress
-											console.log(that.detailedAddress,that.detailedAddress1)
-									  		that.mescroll.resetUpScroll()
-							        //成功回调
-							      },
-							      fail: function(info){
-							        //失败回调
-							        console.log(info)
-							      }
-							    })
+					var amapPluginInstance = new GDMapWX.AMapWX({
+						key: '6bafe91754a563ff2b7c02542c1ef4e8'
+					});
+					amapPluginInstance.getRegeo({
+						success: function(res) {
+							console.log(res)
+							that.detailedAddress = res[0].desc
+							that.detailedAddress1 = that.detailedAddress.length>4 ? that.detailedAddress.slice(0,4)+'...' : that.detailedAddress
+							that.mescroll.resetUpScroll()
+							//成功回调
+						},
+						fail: function(info) {
+							//失败回调
+							console.log(info)
+						}
+					})
+
 				})
 			},
+			search() {
+				uni.navigateTo({
+					url: "/pageA/food/search"
+				})
+			},
+			change(item) {
+				this.searchVal = item.iname
+				this.mescroll.resetUpScroll()
+				// if (this.label == item.iname) {
+				// 	this.label = ''
+				// } else {
+				// 	this.label = item.iname
+
+				// }
+				// this.inverted = !this.inverted;
+				// that.upCallback({
+				// 	num: 1,
+				// 	size: 10
+				// })
+			},
+			changetype(item) {
+				this.searchType = item.value
+				that.upCallback({
+					num: 1,
+					size: 10
+				})
+			},
+			placeSelect() {
+				uni.chooseLocation({
+					success: function(res) {
+						console.log(res);
+						that.latitude = res.latitude
+						that.longitude = res.longitude
+						uni.setStorageSync("findlatitude", res.latitude)
+						uni.setStorageSync("findlongitude", res.longitude)
+						// let _address = that.$helper.formatLocation(res.address)
+						that.detailedAddress = res.name
+						that.detailedAddress1 = that.detailedAddress.length>4 ? that.detailedAddress.slice(0,4)+'...' : that.detailedAddress
+						uni.setStorageSync("detailedAddress", res.name)
+						that.$forceUpdate()
+						that.upCallback({
+							num: 1,
+							size: 10
+						})
+					}
+				});
+			},
 			mescrollInit(mescroll) {
-				// this.$refs.loginpopup.mescroll = mescroll;
+				this.mescroll = mescroll;
 			},
 			downCallback() {
+				this.mescroll.resetUpScroll()
 				// if (uni.getStorageSync("userInfo").phone) {
-					this.mescroll.resetUpScroll()
+				// 	this.mescroll.resetUpScroll()
 				// } else {
 				// 	that.mescroll.endBySize(0, 0)
 				// 	this.showAuthorizePhone = true
 				// }
-			
+
 			},
-			getDistance(latitude,longitude){
-				console.log(latitude,longitude,that.latitude,that.longitude)
+			getDistance(latitude, longitude) {
+				console.log(latitude, longitude, that.latitude, that.longitude)
 				return new Promise((resolve, reject) => {
 					qqmapsdk.direction({
-					                    mode: 'driving', //可选值：'driving'（驾车）  trucking 货车
-					                    //from参数不填默认当前地址
-					                    // latitude纬度    longitude 经度
-					                    from: {
-					                        latitude: that.latitude,
-					                        longitude: that.longitude
-					                    },
-					                    to: {
-					                        latitude: latitude,
-					                        longitude:longitude
-					                    },
-					                    size: 4, // 车型 1: 微型车  2: 轻型车 3: 中型车 4: 重型车
-					                    policy: 'LEAST_TIME', //'9',  //参考实时路况，高速优先，尽量躲避拥堵
-					                    height: 4,
-					                    width: 2.5,
-					                    length: 13,
-					                    weight: 6.8,
-					                    axle_weight: 34,
-					                    axle_count: 6,
-					                    is_trailer: 1,
-					                 success: function(res1, data) {
-										 console.log(res1,data[0].distance,data)
-										 resolve(data[0])
-										 
-									 }
+						mode: 'driving', //可选值：'driving'（驾车）  trucking 货车
+						//from参数不填默认当前地址
+						// latitude纬度    longitude 经度
+						from: {
+							latitude: that.latitude,
+							longitude: that.longitude
+						},
+						to: {
+							latitude: latitude,
+							longitude: longitude
+						},
+						size: 4, // 车型 1: 微型车  2: 轻型车 3: 中型车 4: 重型车
+						policy: 'LEAST_TIME', //'9',  //参考实时路况，高速优先，尽量躲避拥堵
+						height: 4,
+						width: 2.5,
+						length: 13,
+						weight: 6.8,
+						axle_weight: 34,
+						axle_count: 6,
+						is_trailer: 1,
+						success: function(res1, data) {
+							console.log(res1, data[0].distance, data)
+							resolve(data[0])
+
+						}
 					})
 				})
 			},
-			
 			async upCallback(page) {
-					// if (uni.getStorageSync("userInfo").id) {
-						uni.showLoading({
-							title: '数据加载中'
-						})
-						
-						var finddata=await that.getfindList(page)
-						if (page.num == 1) that.findList = [],that.handleList = [];
-						that.curPageLen = finddata.data.items.length;
-						that.handleList = finddata.data.items
-						that.totalPage = finddata.data.total;
-						if(that.handleList.length > 0){
-							for(var i=0;i<that.handleList.length;i++){
-								that.handleList[i].latitude=that.handleList[i].location.split(',')[0]
-								that.handleList[i].longitude=that.handleList[i].location.split(',')[1]
-								that.handleList[i].distance1 = JSON.parse(JSON.stringify(that.handleList[i].distance))
-								that.handleList[i].distance=(that.handleList[i].distance/1000).toFixed(1)
-								console.log(that.handleList)
-								that.findList = that.handleList
-								that.loading = false
-							}
+				uni.showLoading({
+					title: '数据加载中'
+				})
+				await that.$request.baseRequest('admin.tourism.foodInfo', 'foodList', {
+					page: page.num,
+					limit: page.size,
+					searchType: this.searchType,
+					searchKeyWord: this.searchVal,
+					place: this.detailedAddress,
+					userLongitude: this.longitude,
+					userLatitude: this.latitude,
+				}, failres => {
+					uni.showToast({
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
+					});
+
+				}).then(res => {
+					uni.hideLoading()
+					if (page.num == 1) that.findList = [], that.handleList = [];
+					that.curPageLen = res.data.items.length;
+					that.handleList = res.data.items
+					that.totalPage = res.data.total;
+				})
+				if (that.handleList.length > 0) {
+					for (var i = 0; i < that.handleList.length; i++) {
+
+						that.handleList[i].latitude = that.handleList[i].location.split(',')[0]
+						that.handleList[i].longitude = that.handleList[i].location.split(',')[1]
+						// var data = await that.getDistance(that.handleList[i].latitude, that.handleList[i].longitude)
+						that.handleList[i].distance1 = JSON.parse(JSON.stringify(that.handleList[i].distance))
+						that.handleList[i].distance = (that.handleList[i].distance / 1000).toFixed(1)
+						if (that.handleList[i].label) {
+							that.handleList[i].labels = that.handleList[i].label.split(",")
+						}
+						if (that.handleList[i].foodDishesInfoList) {
+							that.handleList[i].foodDishesInfoList = that.handleList[i].foodDishesInfoList.splice(0, 4)
 						}
-						uni.hideLoading()
-						that.$nextTick(() => {
-							that.mescroll.endBySize(that.curPageLen, that.totalPage)
-						});	
-			
-					// }
+					}
+					that.findList = that.handleList
+
+				} else {
+					uni.hideLoading()
+				}
+				that.$nextTick(() => {
+					that.mescroll.endBySize(that.curPageLen, that.totalPage)
+				});
 			},
-		 add(){
-			if(!uni.getStorageSync("userInfo").phone){
-				this.$refs.loginpopup.open()
-			}else{
+			group() {
 				uni.navigateTo({
-					url: '/pageA/find/createLifeService'
-				}) 
-			}
-		 },
-		 getList(){
-			 this.$request.baseRequest('admin.tourism.carouselManagement', 'list', {
-			 	page: 1,
-			 	limit: 9999,
-				classify:'发现'
-			 }, failres => {
-			 	uni.showToast({
-			 		icon: "none",
-			 		title: failres.errmsg,
-			 		duration: 3000
-			 	});	
-			 }).then(res => {
-			 	this.fileList=res.data.items
-			 })
-		 },
-		 getfindList(page){
-		 	return new Promise((resolve, reject) => {
-		 		that.$request.baseRequest('admin.tourism.productManagement', 'list', {
-		 			page: page.num,
-		 			limit: page.size,
-					userLongitude:that.longitude,
-					userLatitude:that.latitude,
-		 			searchKeyWord: this.searchVal,
-		 			// classify: this.typeName
-		 		}, failres => {
-		 			uni.showToast({
-		 				icon: "none",
-		 				title: failres.errmsg,
-		 				duration: 3000
-		 			});
-		 			uni.hideLoading()
-		 		}).then(res => {
-		 			 resolve(res)
-		 		})
-		 	})
-		 	
-		 },
+					url: '/pageA/food/groupBuying'
+				})
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
+	.content {}
+
 	.content1 {
-		position: fixed;
-		top:0;
-		left:0;
 		padding: 20rpx;
 		background-color: #fff;
-		z-index:99;
-		width:100vw;
+
 		.search {
 			// color: #9199af;
 			// background: #f9d27d;
 			border-radius: 50rpx;
-			padding: 10rpx 0 10rpx 30rpx;
+			padding: 15rpx 0 15rpx 30rpx;
 			box-sizing: border-box;
 			margin-right: 20rpx;
+		
 		}
 
 		.left {
 			width: 80%;
-			view {
-				height: 40rpx;
-				line-height: 40rpx;
+
+			text {
 				white-space: nowrap;
 				overflow: scroll;
 				position: relative;
 				margin-left: 20rpx;
-				color:#9199af;
+				color: #BBBBBB;
+				display: flex;
+				    align-items: center;
 			}
 		}
 
 		.right {
 			// width:14%;
-			margin-right: 20rpx
+			// margin-right: 20rpx
+			display: flex;
 		}
 	}
-	.search-wrap{
-		width:76%;
-		background: #f9f9f9;
+
+	.search-wrap {
+		width: 70%;
+		background: rgb(249, 249, 249);
 		// border: 1px solid #f9d27d;
 		border-radius: 50rpx;
+		.left{
+			align-items: center;
+		}
+		.search-val{
+			color:#BBBBBB;
+		}
 	}
-	.address{
-		width:24%;
-		margin-right:20rpx;
+
+	.address {
+		width: 30%;
 	}
-	.findItem{
-		background:#fff;
-		margin:10rpx;
-		border-radius:20rpx;
-		padding:20rpx;
-		font-size:32rpx;
-		.left{
-			margin-right:20rpx;
-			.cover{
-				border-radius: 8rpx;
-			}
+
+	.findItem {
+		background: #fff;
+		margin: 20rpx;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		font-size: 32rpx;
+
+		.row2 {
+			margin: 20rpx 0;
 		}
-		.name{
-			font-size:36rpx;
-			color:#333;
-			margin-left:10rpx;
-			overflow-x: scroll;
-			white-space: nowrap;
-			width:65vw;
-			font-weight:600;
-			letter-spacing:3rpx;
+
+		.left {
+			// background: red;
+		}
+
+		.name {
+			color: #333;
+			margin-left: 10rpx;
+			font-weight: 700;
+			font-size: 36rpx;
 		}
-		.description{
-			color:#666;
-			margin-top:10rpx;
-			width:67vw;
+
+		.description {
+			color: #666;
+			margin-top: 10rpx;
 		}
-		.address{
-			margin-top:20rpx;
-			width:100%;
-			font-size:28rpx;
-			color:#999;
+
+		.address {
+			margin-top: 30rpx;
+			width: 100%;
+			color: #393733;
+		}
+		.img{
+			margin: 10rpx;
+		}
+		.detailedAddress {
+			width: 70vw;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			color:#999 ;
+			line-height: 40rpx;
+			text-align: left
 		}
 	}
-	.applet-dianpu1{
-		font-size:44rpx;
-		color:#eaad1a;
+
+	.applet-dianpu1 {
+		color: #393733;
+		font-size: 50rpx;
+		
 	}
 
-	.applet-dizhi{
-		font-size:38rpx;
-		color:#393733;
+	.applet-dizhi {
+		color: #393733;
+		font-size: 40rpx;
+		position: relative;
+		top: -2rpx;
 	}
-	.add{
-		// background:#fff;
-		border-radius:50%;
+
+	.group {
 		position: fixed;
-		right:0;bottom:10px;
+		// margin-left: 350px;
+		bottom: 40rpx;
+		right: 40rpx;
+		z-index: 999;
+	}
+
+	.tuan {
+		background: #eaad1a;
+		border-radius: 50px;
+		color: #fff;
+	}
+
+	.applet-colors-tianjia2 {}
+
+	// .text {
+	// 	font-size: 26rpx;
+	// 	font-weight: 500;
+	// 	color: #eaad1a;
+	// 	opacity: 0.5;
+	// 	margin-right: 56rpx;
+	// }
+	.head {
+		white-space: nowrap;
+		overflow-x: scroll;
+		padding-left: 20rpx;
+		width: calc(100vw);
+
+		box-sizing: border-box;
+
+		.item {
+			display: inline-block;
+			background: #F0F0F0;
+			color: #999;
+			padding: 10rpx 26rpx;
+			margin-right: 20rpx;
+			border-radius: 50rpx;
+			font-size: 24rpx;
+		}
+	}
+
+	.tag-type {
+		.text {
+			border-radius: 4px;
+			background-color: #FDF2E5;
+			color: #E95700;
+			margin-right: 30rpx;
+			padding: 10rpx 26rpx;
+			font-size: 24rpx;
+		}
+
+	}
+
+	.list-type {
+		background: #fff;
+		width: 100vw;
+		padding-top: 5px;
+		height: 88rpx;
+		overflow-x: scroll;
+		white-space: nowrap;
+	}
+
+	.typeitem {
+		margin: 20rpx 20rpx 0 20rpx;
+		position: relative;
+		display: inline-block;
+		padding-bottom: 10px;
+		font-size: 28rpx;
+		color: #888;
+	}
+
+	.typeitem.active {
+		color: #eaad1a;
+		font-size: 32rpx;
+	}
+
+	.typeitem.active:after {
+		content: '';
+		display: block;
+		position: absolute;
+		height: 3px;
+		bottom: 0;
+		background: #eaad1a;
+		width: 44rpx;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+
+	
+
+	.tag-type {
+		background: #fff;
+
+		uni-tag {
+			margin-left: 20rpx !important;
+		}
+	}
+
+	.applet-colors-ditu {
+		font-size: 40rpx;
+	}
+	/deep/.mescroll-upwarp {
+		padding: 30rpx 0;
 	}
-	.applet-colors-tianjia2{
-		font-size:100px;
+	.applet-xiala{
+		margin: 0 16rpx 0 -4px;
 	}
-</style>
+</style>

uni_applet/pages/food/food.vue

@@ -521,6 +521,15 @@
 		.img{
 			margin: 10rpx;
 		}
+		.detailedAddress {
+			width: 70vw;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			color:#999 ;
+			line-height: 40rpx;
+			text-align: left
+		}
 	}
 
 	.applet-dianpu1 {