调试找园区接口

main.js

@@ -18,4 +18,19 @@ export function createApp() {
     app
   }
 }
-// #endif
+// #endif
+
+Vue.filter('globalTime',function (value) {
+  if (value) {
+    const time = new Date(value * 1000);
+    const y = time.getFullYear();
+    const m = (time.getMonth() + 1) < 10 ? '0' + (time.getMonth() + 1) : (time.getMonth() + 1);
+    const d = time.getDate() < 10 ? '0' + time.getDate(): time.getDate();
+    // const h = time.getHours()
+    // const mm = time.getMinutes();
+    // const s = time.getSeconds();
+    return y + '-' + m + '-' + d
+  } else {
+    return ''
+  }
+});

pages/index/index.vue

@@ -45,35 +45,35 @@
 		<view class="notice-box" style="margin-top: 40rpx;">
 			<view class="notice-title-box">
 				<view class="notice-font">推荐园区</view>
-				<view class="notice-more-font">
+				<navigator class="notice-more-font" url="../park/index" open-type="navigate">
 					<view style="margin-right: 8rpx;font-size: 22rpx;">更多</view>
 					<image src="/static/right-arrow-blue.png" mode="aspectFill" style="width: 12rpx;height: 16rpx;"></image>
-				</view>
+				</navigator>
 			</view>
 			<view class="display-flex-start" style=" overflow:scroll;position:relative">
-				<view class="park-box" v-for="(item , index) in parkList" :key="index">
-					 <image :src="item.url" mode="aspectFill" style="width:452rpx;height:250rpx;border-radius:32rpx 32rpx 0 0;"></image>
+				<view class="park-box" v-for="(item , index) in parkList" :key="item.id" @click="goParkDetailFn(item.id)">
+					 <image :src="item.park_pics[0].pic_path" mode="aspectFill" style="width:452rpx;height:250rpx;border-radius:32rpx 32rpx 0 0;"></image>
 					 <view class="park-content-box">
-						 <view class="park-title">{{item.title}}</view>
+						 <view class="park-title">{{item.name}}</view>
 						 <view class="park-address display-flex-start">
-							 <view class="display-flex-start" style="margin-right: 10rpx;"><image src="/static/park/park-time.png" mode="aspectFill" class="park-title-img"></image>{{item.time}}建成</view>
-							 <view class="display-flex-start"><image src="/static/park/park-name.png" mode="aspectFill" class="park-title-img"></image>{{item.title}}</view>
+							 <view class="display-flex-start" style="margin-right: 10rpx;"><image src="/static/park/park-time.png" mode="aspectFill" class="park-title-img"></image>{{item.addtime | globalTime}}建成</view>
+							 <view class="display-flex-start"><image src="/static/park/park-name.png" mode="aspectFill" class="park-title-img"></image>{{item.manager}}</view>
 						 </view>
 						 <view class="park-footer-box display-between">
 							  <view class="display-between-column width-30">
-								  <view class="display-flex-start"><image src="/static/park/park-num.png" mode="aspectFill" class="park-footer-img"></image>{{item.num}}</view>
+								  <view class="display-flex-start"><image src="/static/park/park-num.png" mode="aspectFill" class="park-footer-img"></image>{{item.company_count}}</view>
 								  <view class="park-footer-font">企业数量</view>
 							  </view>
 							  <view class="display-between-column width-30">
 								  <view class="display-flex-start">
 									  <image src="/static/park/park-area.png" mode="aspectFill" class="park-footer-img"></image>
-									  {{item.area1}}<text style="font-size: 12rpx;">万㎡</text></view>
+									  {{item.cover_area}}<text style="font-size: 12rpx;">万㎡</text></view>
 								  <view class="park-footer-font">占地面积</view>
 							  </view>
 							  <view class="display-between-column width-30">
 								  <view class="display-flex-start">
 									  <image src="/static/park/park-area2.png" mode="aspectFill" class="park-footer-img"></image>
-									  {{item.area2}}<text style="font-size: 12rpx;">万㎡</text></view>
+									  {{item.building_area}}<text style="font-size: 12rpx;">万㎡</text></view>
 								  <view class="park-footer-font">建设面积</view>
 							  </view>
 						 </view>
@@ -194,37 +194,37 @@
 						time:'2021-08-04'
 					},
 					{
-						url:'/static/navList/policy-icon.png',
-						title:'政策速览 | 2022年首批次重点新材料扶...',
+						url:'/static/navList/notice-icon.png',
+						title:'通知公告 | 2022年首批次重点新材料扶...',
 						time:'2021-08-03'
 					},
 				],
 				parkList:[
-					{
-						url:'/static/park/1.png',
-						title:'华潮科技产业园',
-						time:'2015-10-25',
-						num:484,
-						area1:1.72,
-						area2:1.01
+					// {
+					// 	url:'/static/park/1.png',
+					// 	title:'华潮科技产业园',
+					// 	time:'2015-10-25',
+					// 	num:484,
+					// 	area1:1.72,
+					// 	area2:1.01
 						
-					},
-					{
-						url:'/static/park/1.png',
-						title:'华潮科技产业园',
-						time:'2015-10-25',
-						num:484,
-						area1:1.72,
-						area2:1.01
-					},
-					{
-						url:'/static/park/1.png',
-						title:'华潮科技产业园',
-						time:'2015-10-25',
-						num:484,
-						area1:1.72,
-						area2:1.01
-					},
+					// },
+					// {
+					// 	url:'/static/park/1.png',
+					// 	title:'华潮科技产业园',
+					// 	time:'2015-10-25',
+					// 	num:484,
+					// 	area1:1.72,
+					// 	area2:1.01
+					// },
+					// {
+					// 	url:'/static/park/1.png',
+					// 	title:'华潮科技产业园',
+					// 	time:'2015-10-25',
+					// 	num:484,
+					// 	area1:1.72,
+					// 	area2:1.01
+					// },
 				],
 			    attractList:[
 			    	{
@@ -263,7 +263,8 @@
 			}
 		},
 		onLoad() {
-           this.getSwiperList()
+           this.getSwiperList();
+		   this.getPark();
 		},
 		methods: {
 			swiperChange(e){
@@ -279,9 +280,10 @@
 						'content-type': 'application/x-www-form-urlencoded'
 					},
 					data: {
-						size:5,
+						order_by:"weight desc",
+						s_status:1,
 						page:1,
-						s_status:1
+						page_size:7
 					},
 					success: (res) => {
 						console.log(res)
@@ -295,7 +297,39 @@
 						console.log("连接失败");
 					}
 				});
-			}
+			},
+			getPark(){
+				let md5Sign = md5("method="+'park'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
+				let url = getApp().globalData.shareUrl+'api/api.php'+'?method=park&source=park&action=list&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
+				uni.request({
+					url:url,
+					method: 'POST',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded'
+					},
+					data: {
+						order_by:"weight desc",
+						s_show:1,
+						// page:1,
+						// page_size:7
+					},
+					success: (res) => {
+						console.log(res)
+						if(res.data.code === 200){
+							res.data.data.list.forEach((item)=>{item.park_pics[0].pic_path = getApp().globalData.shareUrl + item.park_pics[0].pic_path});
+							this.parkList = res.data.data.list;
+						}
+					},
+					fail: () => {
+						console.log("连接失败");
+					}
+				});
+			},
+			goParkDetailFn(id){
+				uni.navigateTo({
+					url:'/pages/park/park_deatil?id='+id
+				})
+			},
 		}
 	}
 </script>

pages/park/index.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		
 		<view class="display-flex-start map-header-box">
-			<uni-easyinput prefixIcon="search" v-model="value" placeholder="请输入园区名称搜索" @iconClick="onClick" class="map-search-box"></uni-easyinput>
+			<uni-easyinput prefixIcon="search" v-model="headerVal" placeholder="请输入园区名称搜索" @iconClick="headerSerach()" class="map-search-box"></uni-easyinput>
 			<navigator url="/pages/park/map_search"><button type="default" class="map-search-btn">地图查找</button></navigator>
 		</view>
 		
@@ -14,7 +14,7 @@
 			
 			<view class="park-filter-box" v-show="filterBoxFlag">
 				<view class="filter-content display-wrap" style="justify-content: space-around;">
-					<view class="content-font" :class="item.isSelected ? 'filter-selected' : ''" v-for="(item,index) in filterList" :key="index" @click="filterPark(index)">{{item.name}}</view>
+					<view class="content-font" :class="item.isSelected ? 'filter-selected' : ''" v-for="(item,index) in filterList" :key="index" @click="filterPark(index,item.typeId)">{{item.name}}</view>
 				</view>
 				<view class="display-around" style="margin-top: 50rpx;">
 					<button class="filter-left-btn" @click="restartBtn()">重置</button>
@@ -25,29 +25,29 @@
 		</view>
 		
 		<view class="" style="position:relative;width: 90%;margin-top: 20rpx;">
-			<view class="park-box" v-for="(item , index) in parkList" :key="index" @click="goParkDetailFn(index)">
-				 <image :src="item.url" mode="aspectFill" style="width:100%;height:400rpx;border-radius:32rpx 32rpx 0 0;"></image>
+			<view class="park-box" v-for="(item , index) in parkList" :key="item.id" @click="goParkDetailFn(item.id)">
+				 <image :src="item.park_pics[0].pic_path || '/static/park/1.png'" mode="aspectFill" style="width:100%;height:400rpx;border-radius:32rpx 32rpx 0 0;"></image>
 				 <view class="park-content-box">
-					 <view class="park-title">{{item.title}}</view>
+					 <view class="park-title">{{item.name || '-'}}</view>
 					 <view class="park-address display-flex-start">
-						 <view class="display-flex-start" style="margin-right: 10rpx;"><image src="/static/park/park-time.png" mode="aspectFill" class="park-title-img"></image>{{item.time}}建成</view>
-						 <view class="display-flex-start"><image src="/static/park/park-name.png" mode="aspectFill" class="park-title-img"></image>{{item.title}}</view>
+						 <view class="display-flex-start" style="margin-right: 10rpx;"><image src="/static/park/park-time.png" mode="aspectFill" class="park-title-img"></image>{{item.addtime | globalTime}}建成</view>
+						 <view class="display-flex-start"><image src="/static/park/park-name.png" mode="aspectFill" class="park-title-img"></image>{{item.manager || '-'}}</view>
 					 </view>
 					 <view class="park-footer-box display-between">
 						  <view class="display-between-column width-30">
-							  <view class="display-flex-start"><image src="/static/park/park-num.png" mode="aspectFill" class="park-footer-img"></image>{{item.num}}</view>
+							  <view class="display-flex-start"><image src="/static/park/park-num.png" mode="aspectFill" class="park-footer-img"></image>{{item.company_count  || '-'}}</view>
 							  <view class="park-footer-font">企业数量</view>
 						  </view>
 						  <view class="display-between-column width-30">
 							  <view class="display-flex-start">
 								  <image src="/static/park/park-area.png" mode="aspectFill" class="park-footer-img"></image>
-								  {{item.area1}}<text style="font-size: 12rpx;">万㎡</text></view>
+								  {{item.cover_area  || '-'}}<text style="font-size: 12rpx;">万㎡</text></view>
 							  <view class="park-footer-font">占地面积</view>
 						  </view>
 						  <view class="display-between-column width-30">
 							  <view class="display-flex-start">
 								  <image src="/static/park/park-area2.png" mode="aspectFill" class="park-footer-img"></image>
-								  {{item.area2}}<text style="font-size: 12rpx;">万㎡</text></view>
+								  {{item.building_area  || '-'}}<text style="font-size: 12rpx;">万㎡</text></view>
 							  <view class="park-footer-font">建设面积</view>
 						  </view>
 					 </view>
@@ -58,77 +58,128 @@
 </template>
 
 <script>
+	import md5 from '@/common/md5.js';
 	export default {
 		data() {
 			return {
 				message:'找园区',
 				filterBoxFlag:false,
+				headerVal:'',
 				parkList:[
-					{
-						url:'/static/park/1.png',
-						title:'华潮科技产业园',
-						time:'2015-10-25',
-						num:484,
-						area1:1.72,
-						area2:1.01
+					// {
+					// 	url:'/static/park/1.png',
+					// 	title:'华潮科技产业园',
+					// 	time:'2015-10-25',
+					// 	num:484,
+					// 	area1:1.72,
+					// 	area2:1.01
 						
-					},
-					{
-						url:'/static/park/1.png',
-						title:'华潮科技产业园',
-						time:'2015-10-25',
-						num:484,
-						area1:1.72,
-						area2:1.01
-					},
-					{
-						url:'/static/park/1.png',
-						title:'华潮科技产业园',
-						time:'2015-10-25',
-						num:484,
-						area1:1.72,
-						area2:1.01
-					},
+					// },
+					// {
+					// 	url:'/static/park/1.png',
+					// 	title:'华潮科技产业园',
+					// 	time:'2015-10-25',
+					// 	num:484,
+					// 	area1:1.72,
+					// 	area2:1.01
+					// },
+					// {
+					// 	url:'/static/park/1.png',
+					// 	title:'华潮科技产业园',
+					// 	time:'2015-10-25',
+					// 	num:484,
+					// 	area1:1.72,
+					// 	area2:1.01
+					// },
 				],
 				filterList:[
 					{
 						name:'工业厂房',
 						isSelected:false,
+						typeId:'1'
 					},
 					{
 						name:'写字楼',
 						isSelected:false,
+						typeId:'2'
 					},
 					{
 						name:'商务综合体',
 						isSelected:false,
+						typeId:'3'
 					},
 				],
 				filterIndex:0
 			}
 		},
 		onLoad() {
-
+          this.getPark()
 		},
 		methods: {
-			filterPark(index){
+			filterPark(index,id){
 				this.filterList[index].isSelected = !this.filterList[index].isSelected;
 			},
 			restartBtn(){
 				this.filterList.forEach((item)=>{item.isSelected = false});
 			},
 			submitBtn(){
-				console.log(this.filterList);
+				let typeStr = []
+				let typeList = this.filterList.filter((item)=>{return item.isSelected})
+				typeList.forEach((item)=>{typeStr.push(item.typeId)})
+				typeStr = typeStr.join(',')
+				console.log(typeStr)
+				//this.getPark(typeStr)
 				this.filterBoxFlag = false;
 			},
 			showFilterBox(){
 				this.filterBoxFlag = !this.filterBoxFlag;
 			},
-			goParkDetailFn(index){
+			goParkDetailFn(id){
 				uni.navigateTo({
-					url:'/pages/park/park_deatil?id='+index
+					url:'/pages/park/park_deatil?id='+id
 				})
-			} 
+			},
+			getPark(searchVal,typeList){
+				let md5Sign = md5("method="+'park'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
+				let url = getApp().globalData.shareUrl+'api/api.php'+'?method=park&source=park&action=list&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
+				let postData = {
+					order_by:"weight desc",
+				}
+				if(searchVal){
+					postData = {
+						order_by:"weight desc",
+						ss_name:searchVal
+					}
+				}
+				if(typeList){
+					postData = {
+						order_by:"weight desc",
+						ss_name:searchVal || '',
+						park_type:typeList
+					}
+				}
+				uni.request({
+					url:url,
+					method: 'POST',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded'
+					},
+					data:postData,
+					success: (res) => {
+						console.log(res)
+						if(res.data.code === 200){
+							res.data.data.list.forEach((item)=>{if(item.park_pics.length){item.park_pics[0].pic_path = getApp().globalData.shareUrl + item.park_pics[0].pic_path}});
+							this.parkList = res.data.data.list;
+						}
+					},
+					fail: () => {
+						console.log("连接失败");
+					}
+				});
+			},
+			headerSerach(){
+				this.getPark(this.headerVal)
+			}
        }
 	}
 </script>
@@ -230,7 +281,7 @@
 	
 	.park-select-box {
 		width: 98%;
-		height: 100rpx;
+		height: 90rpx;
 		border-radius: 10rpx;
 		box-shadow: 0px 2px 16px rgba(0, 0, 0, 0.1);
 		position: relative;
@@ -241,8 +292,8 @@
 		background-color: #d7d7d7;
 		width: 20%;
 		text-align: center;
-		height: 50rpx;
-		line-height: 50rpx;
+		height: 40rpx;
+		line-height: 40rpx;
 		border-radius: 10rpx;
 		display: flex;
 	    align-items: center;

pages/park/map_search.vue

@@ -1,15 +1,15 @@
 <template>
     <view style="height: 100%;">
-		<map style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude" :markers="covers" @markertap="markertap($event)">
+		<map style="width: 100%;height: 100%;" :latitude="latitude" :longitude="longitude" :markers="covers" @markertap="markertap">
 		</map>
 		<cover-view class="map-pop-box" v-show="isShowPop" @click="goParkDetail()">
 			<cover-view class="display-between">
-				<cover-view class="pop-title">{{popInfo.title}}</cover-view>
+				<cover-view class="pop-title">{{popInfo.name}}</cover-view>
 				<cover-image src="/static/park/location2.png" style='width:50rpx;height:50rpx;'></cover-image>
 			</cover-view>
 			<cover-view class="display-flex-start" style="margin-bottom: 10rpx;">
 				<cover-view class="pop-subtitle">入驻企业:</cover-view>
-				<cover-view class="pop-value">{{popInfo.enterprise}}</cover-view>
+				<cover-view class="pop-value">{{popInfo.company_count}}</cover-view>
 			</cover-view>
 			<cover-view class="display-flex-start">
 				<cover-view class="pop-subtitle">园区地址:</cover-view>
@@ -19,33 +19,38 @@
     </view>
 </template>
 <script>
+	import md5 from '@/common/md5.js';
 	export default {
 	    data() {
 	        return {
 				id:0, // 使用 marker点击事件 需要填写id
 	            title: 'map',
-	            latitude: 39.909,
-	            longitude: 116.39742,
+	            latitude: 34.438387,
+	            longitude: 108.762834,
 				isShowPop:false,
+				startList:[],
+				nowId:'',
 				popInfo:{
-					title:"新鸿辉工业园测试数据",
-					enterprise:'484',
-					address:'渭城区底张镇88号',
-					id:1
+					// title:"新鸿辉工业园测试数据",
+					// enterprise:'484',
+					// address:'渭城区底张镇88号',
+					// id:1
 				},
-	            covers: [{
-					id:1,
-	                latitude: 39.909,
-	                longitude: 116.39742,
-					name:'天安门',
-	                iconPath: '/static/park/location.svg',
-	            }, {
-					id:2,
-					name:'XX12221',
-	                latitude: 39.90,
-	                longitude: 116.39,
-	                iconPath: '/static/park/location.svg'
-	            }]
+	            covers: [
+					// {
+					// id:1,
+	    //             latitude: 39.909,
+	    //             longitude: 116.39742,
+					// name:'天安门',
+	    //             iconPath: '/static/park/location.svg',
+	    //         }, {
+					// id:2,
+					// name:'XX12221',
+	    //             latitude: 39.90,
+	    //             longitude: 116.39,
+	    //             iconPath: '/static/park/location.svg'
+	    //         },
+				]
 	        }
 	    },
 		onLoad() {
@@ -53,18 +58,17 @@
 		},
 	    methods: {
 			 init(){
-				 let that = this;
-				 that.mapRender(that,that.covers)
+				 this.getPark();
 			 },
-	         mapRender(that,data){
+	         mapRender(data){
 				let arrayData = [];
 				for (var i = 0; i < data.length; i++) {
 					arrayData.push({
-						id: data[i].id, //marker点击事件回调会返回此id。建议为每个marker设置上Number类型id，保证更新marker时有更好的性能。
+						id: Number(data[i].id), //marker点击事件回调会返回此id。建议为每个marker设置上Number类型id，保证更新marker时有更好的性能。
 						latitude: data[i].latitude, //纬度
 						longitude: data[i].longitude, //经度
 						title: data[i].name, //点击时显示，callout存在时将被忽略
-						iconPath:data[i].iconPath, //项目目录下的图片路径，支持相对路径写法，以'/'开头则表示相对小程序根目录；也支持临时路径
+						iconPath: '/static/park/location.svg', //项目目录下的图片路径，支持相对路径写法，以'/'开头则表示相对小程序根目录；也支持临时路径
 						width: 20,
 						height: 30,
 						callout: {
@@ -80,27 +84,60 @@
 						},
 					});
 				}
-				console.log(arrayData);
-			    that.covers = arrayData;
+			   // this.covers = arrayData;
+				this.covers = arrayData.slice(0,1);
+				console.log(this.covers);
 			 },
 	//地图点击事件
 			markertap(e) {
-				console.log("你点击的标记点ID是:" + e.detail.markerId)
-				this.isShowPop = true;
-				//console.log(e)
-			 //  this.covers.forEach((item)=>{
-				// 	if(item.id === e.detail.markerId){
-				// 		item.label.color = '#000'
-				// 	}else {
-				// 		item.label.color = '#999'
-				// 	}
-				// })
+				     this.nowId = e.detail.markerId;
+					 this.startList.forEach((item)=>{
+						if(item.id == e.detail.markerId){
+							this.popInfo = item;
+						}
+					})
+					this.isShowPop = true;
 				},
 				goParkDetail(){
 					uni.navigateTo({
-						url:'park_deatil?id=1'
+						url:'park_deatil?id=' + this.nowId
 					})
-				}
+				},
+				getPark(){
+					let md5Sign = md5("method="+'park'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
+					let url = getApp().globalData.shareUrl+'api/api.php'+'?method=park&source=park&action=list&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
+					let postData = {
+						order_by:"weight desc",
+					}
+					uni.request({
+						url:url,
+						method: 'POST',
+						header: {
+							'content-type': 'application/x-www-form-urlencoded'
+						},
+						data:postData,
+						success: (res) => {
+							console.log(res)
+							if(res.data.code === 200){
+								this.startList =res.data.data.list; 
+								res.data.data.list.forEach((item)=>{
+									item.location = item.location.split(',')
+									let coverObj = {
+										id:item.id,
+										latitude: item.location[0],
+										longitude: item.location[1],
+										name:item.name,
+									}
+									this.covers.push(coverObj)
+								})
+								this.mapRender(this.covers)
+							}
+						},
+						fail: () => {
+							console.log("连接失败");
+						}
+					});
+				},
 			},
 			
 	}

pages/park/park_deatil.vue

@@ -7,7 +7,7 @@
 		 		 duration="500"	
 				 style="height:300rpx">
 		 		<swiper-item v-for="(item , index) in swiperList" :key="index">
-		 			<image :src="item.img" mode="aspectFill" style="width: 100%;height: 100%;"></image>
+		 			<image :src="item.pic_path" mode="aspectFill" style="width: 100%;height: 100%;"></image>
 		 		</swiper-item>
 		 	</swiper>
 		 </view>
@@ -15,39 +15,39 @@
 	    <view class="header-detail-box">
 			
 			<view class="header-title">
-				{{detailObj.parkName}}
+				{{detailObj.name || '-'}}
 			</view>
 			
 			<view class="header-content-box display-around display-wrap">
 				<view class="display-between-column items-center width-30 margin-bottom-20">
-					  <view class="display-flex-start"><image src="/static/park/detail/enterprise.png" mode="aspectFill" class="park-footer-img"></image>{{detailObj.nums}}</view>
+					  <view class="display-flex-start"><image src="/static/park/detail/enterprise.png" mode="aspectFill" class="park-footer-img"></image>{{detailObj.company_count || '-'}}</view>
 					  <view class="park-footer-font">入驻企业</view>
 				</view>
 				<view class="display-between-column items-center width-30 margin-bottom-20">
 					  <view class="display-flex-start">
 						  <image src="/static/park/detail/mu.png" mode="aspectFill" class="park-footer-img"></image>
-						  {{detailObj.area1}}<text style="font-size: 12rpx;">万亩</text>
+						  {{detailObj.cover_area || '-'}}<text style="font-size: 12rpx;">万亩</text>
 					  </view>
 					  <view class="park-footer-font">占地亩数</view>
 				</view>
 				<view class="display-between-column items-center width-30 margin-bottom-20">
 					  <view class="display-flex-start">
 						  <image src="/static/park/detail/rent.png" mode="aspectFill" class="park-footer-img"></image>
-						  {{detailObj.price}}<text style="font-size: 12rpx;">元/㎡/月</text>
+						  {{detailObj.price || '-'}}<text style="font-size: 12rpx;">元/㎡/月</text>
 					  </view>
 					  <view class="park-footer-font">租赁价格</view>
 				</view>
 				<view class="display-between-column items-center width-30 margin-bottom-20">
 					  <view class="display-flex-start">
 						  <image src="/static/park/detail/area.png" mode="aspectFill" class="park-footer-img"></image>
-						  {{detailObj.area2}}<text style="font-size: 12rpx;">万㎡</text>
+						  {{detailObj.building_area || '-'}}<text style="font-size: 12rpx;">万㎡</text>
 					  </view>
 					  <view class="park-footer-font">建设面积</view>
 				</view>
 				<view class="display-between-column items-center width-30 margin-bottom-20">
 					  <view class="display-flex-start">
 						  <image src="/static/park/detail/area1.png" mode="aspectFill" class="park-footer-img"></image>
-						  {{detailObj.area3}}<text style="font-size: 12rpx;">万㎡</text>
+						  {{detailObj.area_left_industry || '-'}}<text style="font-size: 12rpx;">万㎡</text>
 					  </view>
 					  <view class="park-footer-font">出租面积</view>
 				</view>
@@ -69,43 +69,43 @@
 			<view class="display-around-column content-font">
 				<view class="display-flex-start items-center margin-bottom-20">
 					<view class="width-30 margin-left-60 color-cf">运营机构</view>
-					<view>{{detailObj.parkName}}</view>
+					<view>{{detailObj.manager || '-'}}</view>
 				</view>
 				<view class="display-flex-start items-center margin-bottom-20">
 					<view class="width-30 margin-left-60 color-cf">产业定位</view>
-					<view>{{detailObj.direction}}</view>
+					<view>{{detailObj.target || '-'}}</view>
 				</view>
 				<view class="display-flex-start items-center margin-bottom-20">
 					<view class="width-30 margin-left-60 color-cf">园区类型</view>
-					<view>{{detailObj.type}}</view>
+					<view>{{detailObj.building_types || '-'}}</view>
 				</view>
 				<view class="display-flex-start items-center margin-bottom-20">
 					<view class="width-30 margin-left-60 color-cf">物业费</view>
-					<view>{{detailObj.property}}<text style="font-size: 16rpx;">元/㎡/月</text></view>
+					<view>{{detailObj.service_price || '-'}}<text style="font-size: 16rpx;">元/㎡/月</text></view>
 				</view>
 				<view class="display-flex-start items-center margin-bottom-20">
 					<view class="width-30 margin-left-60 color-cf">电费</view>
-					<view>{{detailObj.elePrice}}<text style="font-size: 16rpx;">KW·h</text></view>
+					<view>{{detailObj.power_price || '-'}}<text style="font-size: 16rpx;">KW·h</text></view>
 				</view>
 				<view class="display-flex-start items-center margin-bottom-20">
 					<view class="width-30 margin-left-60 color-cf">水费</view>
-					<view>{{detailObj.waterPrice}}<text style="font-size: 16rpx;">m³</text></view>
+					<view>{{detailObj.water_price || '-'}}<text style="font-size: 16rpx;">m³</text></view>
 				</view>
 				<view class="display-flex-start items-center margin-bottom-20">
 					<view class="width-30 margin-left-60 color-cf">一层楼高</view>
-					<view>{{detailObj.oneHeight}}<text style="font-size: 16rpx;">m</text></view>
+					<view>{{detailObj.max_height || '-'}}<text style="font-size: 16rpx;">m</text></view>
 				</view>
 				<view  class="display-flex-start items-center margin-bottom-20">
 					<view class="width-30 margin-left-60 color-cf">最大承重</view>
-					<view>{{detailObj.bearing}}<text style="font-size: 16rpx;">kg</text></view>
+					<view>{{detailObj.max_weight || '-'}}<text style="font-size: 16rpx;">kg</text></view>
 				</view>
 				<view class="display-flex-start items-center margin-bottom-20">
 					<view class="width-30 margin-left-60 color-cf">联系电话</view>
-					<view @click="makeCall(detailObj.tel)" style="color: #007AFF;">{{detailObj.tel}}</view>
+					<view @click="makeCall(detailObj.tel)" style="color: #007AFF;">{{detailObj.phone}}</view>
 				</view>
 				<view class="display-flex-start items-center">
 					<view class="width-30 margin-left-60 color-cf">详细地址</view>
-					<view>{{detailObj.address}}</view>
+					<view>{{detailObj.address || '-'}}</view>
 				</view>
 			</view>
 	    	
@@ -118,20 +118,21 @@
 		   <v-tabs v-model="current" :tabs="tabs" @change="changeTab"></v-tabs>
 		   <view class="tabs-box">
 			  <view v-if="current == 0" class="margin-bottom-20 content-font">
-				{{detailObj.introduce}}
+				{{detailObj.desc || '-'}}
 			  </view>
 			  <view v-if="current == 1" class="margin-bottom-20 content-font">
-			  	{{detailObj.facilities}}
+			  	{{detailObj.facilities || '-'}}
 			  </view>
 			</view>
 		</view>
 	   
-		<footer-share style="width: 100%;" :isCollection="true" @collectionPages="collectionPage" @sharePages="sharePage"></footer-share>
+		<footer-share style="width: 100%;" :isCollection="false" @collectionPages="collectionPage" @sharePages="sharePage"></footer-share>
 	</view> 
 	</view>
 </template>
 
 <script>
+	import md5 from '@/common/md5.js';
 	export default {
 		data() {
 			return {
@@ -143,6 +144,29 @@
 						img:'/static/swiper/swiper2.jpg'
 					},
 				],
+				nowId:'',
+				levelList:{
+					'1':'国家级',
+					'2':'省级',
+					'3':'市级',
+					'4':'区级'
+				},
+				parkType:{
+					'1':'工业厂房',
+					'2':'写字楼',
+					'3':'商业综合体',
+					'1,2':'工业厂房,写字楼',
+					'1,3':'工业厂房,商业综合体',
+					'2,3':'写字楼,商业综合体',
+				},
+				trafficList:{
+					 '1':'班车',
+					 '2':'地铁',
+					 '3':'公交',
+					 '1,2':'班车,地铁',
+					 '1,3':'班车,公交',
+					 '2,3':'地铁,公交',
+				},
 				detailObj:{
 					parkName:'新鸿辉工业园',
 					nums:484,
@@ -163,18 +187,17 @@
 					introduce:'新鸿辉工业园坐落于陕西省西安市西咸新区空港新城底张镇，占地面积一万平方米，内有大小企业共484家。',
 					facilities:'食堂、停车场、公寓、咖啡厅、便利店' //设施
 				},
-				 latitude: 39.909,
-				 longitude: 116.39742,
-				 covers: [{
-					 latitude: 39.909,
-					 longitude: 116.39742,
-				 }],
-				current: 0,
-				tabs: ['园区介绍', '配套设施']
+				 latitude:'', //纬度
+				 longitude:'', //经度
+				 covers: [],
+				 current: 0,
+				 tabs: ['园区介绍', '配套设施']
 			}
 		},
 		onLoad(option) {
            console.log(option)
+		 //  this.nowId = option.id;
+		   this.getDetailInfo(option.id)
 		},
 		methods: {
 			makeCall(tel){
@@ -183,11 +206,12 @@
 				})
 			},
 			goTxMap(la,lo){
+				let that = this;
 				uni.openLocation({
-					latitude:la,
-					longitude:lo,
-					name:'新鸿辉工业园',
-					address:'新鸿辉工业园'
+					latitude:Number(la),
+					longitude:Number(lo),
+					name:that.detailObj.name,
+					address:that.detailObj.address
 				})
 			},
 			changeTab(index) {
@@ -199,12 +223,56 @@
 			sharePage(){
 				console.log('分享')
 				uni.showShareMenu({
-					title: '园区XXX',
-					path:'pages/park/park_detail',
+					title: this.detailObj.name,
+					path:'pages/park/park_detail?id='+this.detailObj.id,
 					success(res) {
 						console.log(res)
 					}
 				})
+			},
+			getDetailInfo(parkId){
+				let md5Sign = md5("method="+'park'+"&timestamp="+getApp().globalData.globalTimestamp+"&secret="+getApp().globalData.secret)
+				let url = getApp().globalData.shareUrl+'api/api.php'+'?method=park&source=park&action=info_by_id&timestamp='+getApp().globalData.globalTimestamp +'&sign='+md5Sign
+				let postData = {
+					order_by:"weight desc",
+					id:parkId
+					// s_show:1,
+					// page:1,
+					// page_size:7 
+				}
+				uni.request({
+					url:url,
+					method: 'POST',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded'
+					},
+					data:postData,
+					success: (res) => {
+						if(res.data.code === 200){
+							res.data.data.park_pics.forEach((item)=>{item.pic_path = getApp().globalData.shareUrl + item.pic_path})
+							this.swiperList = res.data.data.park_pics;
+							this.detailObj = res.data.data;
+							this.detailObj.location = this.detailObj.location.split(',');
+							this.latitude = this.detailObj.location[0];
+							this.longitude = this.detailObj.location[1];
+							this.covers = [{'latitude': this.latitude,'longitude': this.longitude,}]
+							this.detailObj.level = this.levelList[this.detailObj.level];
+							this.detailObj.building_types = this.parkType[this.detailObj.building_types];
+							let room = this.detailObj.room == '1' ? '宿舍':'';
+							let restaurant = this.detailObj.restaurant == '1' ? '餐厅':'';
+							let traffic = this.trafficList[this.detailObj.traffic];
+							this.detailObj.facilities = room + ',' + restaurant + ',' + traffic;
+						}else {
+							uni.showToast({
+								 title:res.data.msg,
+								 duration:2000
+							})
+						}
+					},
+					fail: () => {
+						console.log("连接失败");
+					}
+				});
 			}
 		}
 	}