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

uni_applet/pages.json

@@ -4,19 +4,19 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/accommodation/accommodation",
-			"style": {
-				"navigationBarTitleText": "住宿",
-				"enablePullDownRefresh": false
-			}
-
-		},{
 			"path": "pages/food/food",
 			"style": {
 				"navigationBarTitleText": "美食",
 				"enablePullDownRefresh": false,
 				"navigationStyle":"custom"
 			}
+		
+		},{
+			"path": "pages/accommodation/accommodation",
+			"style": {
+				"navigationBarTitleText": "住宿",
+				"enablePullDownRefresh": false
+			}
 
 		},
 		

uni_applet/pages/find/find.vue

@@ -2,16 +2,17 @@
 	<view>
 		<view class="flex content1">
 			<view @click='placeSelect' class='address flex'>
-			<view class='detailedAddress'>{{detailedAddress1}}</view>
-			<view class='iconfont applet-xiala'></view>
+				<view class='detailedAddress'>{{detailedAddress1}}</view>
+				<view class='iconfont applet-xiala'></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>
+						<image class="dSLComVueTopLeftImg" style="width: 30rpx;height: 30rpx;flex: none;"
+							src="@/static/image/card/search.png"></image>
 						<view class="search-val"> {{searchVal?searchVal:'搜索店铺或服务 '}}</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>
@@ -19,54 +20,48 @@
 				</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>
+			<mescroll-uni :up="upOption" :down="downOption" ref="mescrollRef" @init="mescrollInit" @up="upCallback"
+				@down="downCallback" :top="108">
+				<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>
-					</u-swiper>
-				</view>
+					</view>
+				</u-swiper>
 				<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>
+								<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 class="main-body">
+									{{item.mainBody=="商铺"?'商铺':'个人'}}
+								</view>
+								<!-- <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="收起" />
+								<mote-lines-divide :dt="item.serviceDescription" :line="3" expandText="展开"
+									foldHint="收起" />
 							</view>
 						</view>
 					</view>
 					<view class='address flex justify-space-between'>
 						<view class='flex'>
 							<view class='iconfont applet-dizhi'></view>
-							<view>{{item.detailedAddress}}</view>
+							<view @click.stop="toShopDetail(item)">{{item.detailedAddress}}</view>
 						</view>
 						<view>{{item.distance1>1000?item.distance:item.distance1}}
-						<text style='font-weight:600;'>{{item.distance1>1000?'km':'m'}}</text></view>
+							<text style='font-weight:600;'>{{item.distance1>1000?'km':'m'}}</text>
+						</view>
 					</view>
 				</view>
 			</mescroll-uni>
@@ -74,7 +69,7 @@
 		</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>
+			<u--image :showLoading="true" src="/static/image/find/add.png" width="60px" height="60px"></u--image>
 		</view>
 	</view>
 </template>
@@ -96,20 +91,20 @@
 		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:'',
+				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: '',
 				downOption: {
 					auto: false,
 					textColor: '#bbb'
@@ -128,16 +123,16 @@
 		onLoad() {
 			that = this
 			this.getList()
-		// this.mescroll.resetUpScroll();
+			// this.mescroll.resetUpScroll();
 		},
-		onShow(){
-			if(uni.getStorageSync("search_val")){
+		onShow() {
+			if (uni.getStorageSync("search_val")) {
 				this.searchVal = uni.getStorageSync("search_val")
 				this.mescroll.resetUpScroll()
 			}
-			this.height = uni.getSystemInfoSync().windowWidth/2.35;
+			this.height = uni.getSystemInfoSync().windowWidth / 2.35;
 			this.width = uni.getSystemInfoSync().windowWidth;
-			if(this.detailedAddress=='正在定位...'){
+			if (this.detailedAddress == '正在定位...') {
 				this.isdingwei()
 			}
 		},
@@ -146,28 +141,35 @@
 			let path = `/pages/find/find?id=${this.searchVal}`
 			if (res.from === 'button') {
 				return {
-					title: "本地生活一键搜索",
+					title: `为您找到${this.totalPage}条“${this.searchVal}”服务 `,
 					path: path,
 				};
 			}
 			if (res.from === 'menu') {
 				return {
-					title: "本地生活一键搜索",
+					title: `为您找到${this.totalPage}条“${this.searchVal}”服务 `,
 					path: path,
 				};
 			}
 		},
 		methods: {
-			delSearchVal(){
+			toShopDetail(val){
+				console.log(val)
+				uni.navigateTo({
+					url: "/pageA/food/detailMap?val="+JSON.stringify(val)
+				})
+				
+			},
+			delSearchVal() {
 				this.searchVal = ''
 				uni.removeStorageSync("search_val")
 				that.mescroll.resetUpScroll()
 			},
 			search() {
 				// if (this.userInfo.phone) {
-					uni.navigateTo({
-						url: "/pageA/find/search"
-					})
+				uni.navigateTo({
+					url: "/pageA/find/search"
+				})
 				// } else {
 				// 	this.showAuthorizePhone = true
 				// }
@@ -178,17 +180,18 @@
 						console.log(res);
 						that.latitude = res.latitude
 						that.longitude = res.longitude
-						uni.setStorageSync("findlatitude",res.latitude)
-						uni.setStorageSync("findlongitude",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.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
+							num: 1,
+							size: 10
 						})
 					}
 				});
@@ -210,7 +213,7 @@
 								longitude: 122.08338497727
 							}
 						}
-			
+
 					} else {
 						_obj = {
 							latitude: res.latitude,
@@ -219,23 +222,24 @@
 					}
 					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
+							console.log(that.detailedAddress, that.detailedAddress1)
+							that.mescroll.resetUpScroll()
+							//成功回调
+						},
+						fail: function(info) {
+							//失败回调
+							console.log(info)
+						}
+					})
 				})
 			},
 			mescrollInit(mescroll) {
@@ -243,135 +247,135 @@
 			},
 			downCallback() {
 				// 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
-							}
-						}
+				// 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.hideLoading()
+				that.$nextTick(() => {
+					that.mescroll.endBySize(that.curPageLen, that.totalPage)
+				});
+
+				// }
+			},
+			add() {
+				if (!uni.getStorageSync("userInfo").phone) {
+					this.$refs.loginpopup.open()
+				} else {
+					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()
-						that.$nextTick(() => {
-							that.mescroll.endBySize(that.curPageLen, that.totalPage)
-						});	
-			
-					// }
+					}).then(res => {
+						resolve(res)
+					})
+				})
+
 			},
-		 add(){
-			if(!uni.getStorageSync("userInfo").phone){
-				this.$refs.loginpopup.open()
-			}else{
-				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)
-		 		})
-		 	})
-		 	
-		 },
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
 	.content1 {
 		position: fixed;
-		top:0;
-		left:0;
+		top: 0;
+		left: 0;
 		padding: 20rpx;
 		background-color: #fff;
-		z-index:99;
-		width:100vw;
+		z-index: 99;
+		width: 100vw;
+
 		.search {
 			// color: #9199af;
 			// background: #f9d27d;
@@ -383,6 +387,7 @@
 
 		.left {
 			width: 80%;
+
 			view {
 				height: 40rpx;
 				line-height: 40rpx;
@@ -390,7 +395,7 @@
 				overflow: scroll;
 				position: relative;
 				margin-left: 20rpx;
-				color:#9199af;
+				color: #9199af;
 			}
 		}
 
@@ -399,66 +404,88 @@
 			margin-right: 20rpx
 		}
 	}
-	.search-wrap{
-		width:76%;
+
+	.search-wrap {
+		width: 76%;
 		background: #f9f9f9;
 		// border: 1px solid #f9d27d;
 		border-radius: 50rpx;
 	}
-	.address{
-		width:24%;
-		margin-right:20rpx;
+
+	.address {
+		width: 24%;
+		margin-right: 20rpx;
 	}
-	.findItem{
-		background:#fff;
-		margin:10rpx;
-		border-radius:20rpx;
-		padding:20rpx;
-		font-size:32rpx;
-		.left{
-			margin-right:20rpx;
-			.cover{
+
+	.findItem {
+		background: #fff;
+		margin: 10rpx;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		font-size: 32rpx;
+
+		.main-body {
+			color: #E95700;
+			background: #FDF2E5;
+			font-size: 12px;
+			padding: 6rpx 14rpx;
+			box-sizing: border-box;
+			border-radius: 10rpx;
+		}
+
+		.left {
+			margin-right: 20rpx;
+
+			.cover {
 				border-radius: 8rpx;
 			}
 		}
-		.name{
-			font-size:36rpx;
-			color:#333;
-			margin-left:10rpx;
+
+		.name {
+			font-size: 30rpx;
+			color: #333;
+			margin-left: 10rpx;
 			overflow-x: scroll;
 			white-space: nowrap;
-			width:60.9vw;
-			font-weight:600;
-			letter-spacing:3rpx;
+			width: 55vw;
+			font-weight: 600;
+			letter-spacing: 3rpx;
 		}
-		.description{
-			color:#666;
-			margin-top:10rpx;
-			width:67vw;
+
+		.description {
+			color: #333;
+			margin-top: 10rpx;
+			width: 67vw;
+			font-size: 28rpx;
 		}
-		.address{
-			margin-top:20rpx;
-			width:100%;
-			font-size:28rpx;
-			color:#999;
+
+		.address {
+			margin-top: 20rpx;
+			width: 100%;
+			font-size: 28rpx;
+			color: #999;
 		}
 	}
-	.applet-dianpu1{
-		font-size:44rpx;
-		color:#eaad1a;
+
+	.applet-dianpu1 {
+		font-size: 44rpx;
+		color: #eaad1a;
 	}
 
-	.applet-dizhi{
-		font-size:38rpx;
-		color:#393733;
+	.applet-dizhi {
+		font-size: 38rpx;
+		color: #393733;
 	}
-	.add{
+
+	.add {
 		// background:#fff;
-		border-radius:50%;
+		border-radius: 50%;
 		position: fixed;
-		right:0;bottom:10px;
+		right: 0;
+		bottom: 10px;
 	}
-	.applet-colors-tianjia2{
-		font-size:100px;
+
+	.applet-colors-tianjia2 {
+		font-size: 100px;
 	}
-</style>
+</style>

uni_applet/pages/food/food.vue

@@ -37,7 +37,11 @@
 					<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 class='flex row2'>
+						<view class='name'>{{item.shopNames}}</view>
+					</view>
 					<view style='align-items: flex-start;' class='flex' >
 						<view style='width:100vw;' class="left flex">
 							<!-- @click.stop='previewImg(item1)' -->
@@ -48,12 +52,6 @@
 
 						</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>
@@ -66,7 +64,7 @@
 							<!-- <view>{{item.province}}{{item.city}}{{item.area}}</view> -->
 
 						</view>
-						<view style="color: #999;width:40vw;text-align:right;">
+						<view style="color: #999;width:40vw;text-align:right;font-size: 28rpx;">
 							距离{{item.distance1>1000?item.distance:item.distance1}} {{item.distance1>1000?'km':'m'}}
 						</view>
 					</view>
@@ -475,7 +473,7 @@
 	}
 
 	.address {
-		width: 30%;
+		width: 27%;
 	}
 
 	.findItem {
@@ -486,7 +484,7 @@
 		font-size: 32rpx;
 
 		.row2 {
-			margin: 20rpx 0;
+			margin:0 0 20rpx 0;
 		}
 
 		.left {
@@ -495,9 +493,9 @@
 
 		.name {
 			color: #333;
-			margin-left: 10rpx;
+			// margin-left: 10rpx;
 			font-weight: 700;
-			font-size: 36rpx;
+			font-size: 32rpx;
 		}
 
 		.description {
@@ -506,7 +504,7 @@
 		}
 
 		.address {
-			margin-top: 30rpx;
+			// margin-top: 30rpx;
 			width: 100%;
 			color: #393733;
 		}
@@ -520,7 +518,8 @@
 			white-space: nowrap;
 			color:#999 ;
 			line-height: 40rpx;
-			text-align: left
+			text-align: left;
+			font-size: 28rpx;
 		}
 	}
 
@@ -531,10 +530,10 @@
 	}
 
 	.applet-dizhi {
-		color: #393733;
-		font-size: 40rpx;
+		color: #999;
+		font-size: 38rpx;
 		position: relative;
-		top: -2rpx;
+		// top: -2rpx;
 	}
 
 	.group {
@@ -580,6 +579,7 @@
 	}
 
 	.tag-type {
+		margin: 20rpx 0;
 		.text {
 			border-radius: 4px;
 			background-color: #FDF2E5;
@@ -587,6 +587,7 @@
 			margin-right: 30rpx;
 			padding: 10rpx 26rpx;
 			font-size: 24rpx;
+			margin-right: 20rpx;
 		}
 
 	}