Merge branch 'master' of http://116.63.33.55/git/nazw

# Conflicts:
#	nnzwminiapp/pagesPublic/pages/tdcr/details/detail.js

nnzwminiapp/pagesPublic/pages/tdcr/details/detail.js

@@ -103,6 +103,39 @@ Page({
         }
       ]
     }]
+	tabActive: 1,
+	map: {
+		longitude: 106.644341,
+		latitude: 29.501202
+	  },
+	peripherytabs:[{
+		label:'交通'
+	},
+	{
+		label:'医疗'
+	},
+	{
+		label:'生话'
+	},
+	{
+		label:'购物'
+	},
+	{
+		label:'美食'
+	},
+	{
+		label:'娱乐'
+	}],
+	peripherytabsindex:0,
+	peripherylist:[{name:"武警交通",distanc:0.5},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7}],
+	peripherylistdata:[
+		[{name:"武警交通",distanc:0.5},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7}],
+		[{name:"武警医疗",distanc:0.5},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7}],
+		[{name:"武警生活",distanc:0.5},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7}],
+		[{name:"武警购物",distanc:0.5},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7}],
+		[{name:"武警美食",distanc:0.5},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7}],
+		[{name:"武警娱乐",distanc:0.5},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7},{name:"武警医院",distanc:0.7}]
+	]
   },
 
   /**
@@ -175,6 +208,14 @@ Page({
       tabActive: e.target.dataset.index,
     })
   },
+  peripherytabEvent(e){
+	let a =  e.target.dataset.index
+	console.log(this.data.peripherylistdata[a]);
+	this.setData({
+		peripherytabsindex: a,
+		peripherylist: this.data.peripherylistdata[a]
+	})
+  },
   goBack() {
     wx.navigateBack()
   },

nnzwminiapp/pagesPublic/pages/tdcr/details/wxml/ohter.wxss

@@ -1,4 +1,47 @@
-.ohter_bg{
+.ohter_bg {
 	width: 100%;
 	height: 100%;
+}
+
+.ohter_sc {
+	width: 95%;
+	margin: 0 auto;
+}
+
+.ohter_item_bg {
+	margin-top: 15rpx;
+	width: 100%;
+	height: 200rpx;
+	display: flex;
+	background-repeat: no-repeat; background-size: 100% 100%;
+}
+
+.ohter_item_imge_bg {
+	width: 35%;
+	height: 200rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.ohter_item_imge {
+	display: block;
+	width: 200rpx;
+	height: 160rpx;
+	border-radius: 10rpx;
+}
+.ohter-left{
+	width: 65%; padding-left: 10rpx; height: 100%; 
+}
+.ohter-left-top{
+	height: 50%; font-size: 28rpx;font-weight: bold; color: #fff;    line-height: 60rpx;
+}
+.ohter-left-bottom{
+	height: 50%; font-size: 20rpx; 
+}
+.ohter_gymj_h{
+	height: 50%;  display: flex;
+}
+.ohter_jhgdyt_h{
+	height: 50%; line-height: 30rpx; display: flex;
 }

nnzwminiapp/pagesPublic/pages/tdcr/details/wxml/other.wxml

@@ -1,17 +1,22 @@
 <view class="ohter_bg">
-	<scroll-view style="width: 95%; margin: 0 auto;">
-		<view style="width: 100%; height: 200rpx;  display: flex; background-image: url({{imgPath}}/details/content-bg.png); background-repeat: no-repeat; background-size: 100% 100%;">
-			<view style="width: 35%; ">
+	<scroll-view class="ohter_sc">
+		<view wx:for="i in 20" class="ohter_item_bg" style="background-image: url('{{imgPath}}/other/ohter1.png'); ">
+			<view class="ohter_item_imge_bg" >
+				<image class="ohter_item_imge"  src="{{imgPath}}other/tp1.jpg"></image>
 			</view>
-			<view style="width: 65%; padding-left: 30rpx; height: 100%; ">
-				<view style="height: 50%; font-size: 30rpx;font-weight: bold; color: #fff;    line-height: 60rpx;">上分杀死你</view>
-				<view style="height: 50%; font-size: 20rpx; ">
-					<view style="height: 50%; line-height: 40rpx; display: flex;">
-						<view></view>
+			<view class="ohter-left">
+				<view class="ohter-left-top">双峰山1号地块</view>
+				<view class="ohter-left-bottom">
+					<view class="ohter_gymj_h">
+						<view style="width: 40rpx; height: 25rpx;">
+							<image style="display: block; width: 25rpx; height: 25rpx;" src="{{imgPath}}/other/ohter2.png"></image>
+						</view>
 						<view style="color: #fff; font-size: 25rpx; font-weight: bold;">供应面积/26亩</view>
 					</view>
-					<view style="height: 50%; line-height: 30rpx; display: flex;">
-						<view></view>
+					<view class="ohter_jhgdyt_h" >
+						<view style="width: 40rpx; height: 25rpx;">
+							<image style="display: block; width: 25rpx; height: 25rpx;" src="{{imgPath}}/other/ohter3.png"></image>
+						</view>
 						<view style="color: #fff; font-size: 25rpx; font-weight: bold;">计划供地用途</view>
 						<view style="margin-left: 10rpx; height: 30rpx; border:solid 1rpx #00FFFF; color: #00FFFF; border-radius: 10rpx;">居住用地</view>
 					</view>

nnzwminiapp/pagesPublic/pages/tdcr/details/wxml/periphery.wxml

@@ -1,17 +1,14 @@
 <view class="ppy-bg">
-	<view class="ppy_top" >
-		<view class="ppy_item" >交通</view>
-		<view class="ppy_item" >医疗</view>
-		<view class="ppy_item" >生话</view>
-		<view class="ppy_item" >购物</view>
-		<view class="ppy_item" >美食</view>
-		<view class="ppy_item" >娱乐</view>
+	<view class="ppy_top">
+		<view wx:for="{{peripherytabs}}"  data-index="{{index}}" style="{{peripherytabsindex == index ? 'background-color: #00A4FF;' : ''}}" bindtap="peripherytabEvent" class="ppy_item">{{item.label}}</view>
 	</view>
 	<view class="ppy-body">
-		<view wx:for="i in 20" class="ppy-body-item">
-			<view style="width: 50rpx;height: 50rpx;"></view>
-			<view style="width: 55%; text-align: left;">武警重庆总队医院</view>
-			<view style="width: 35%; text-align: right;">直线0.5km</view>
+		<view wx:for="{{peripherylist}}"  class="ppy-body-item">
+			<view style="width: 50rpx;height: 50rpx; display: flex; align-items: center;justify-content: center;">
+				<image style="display: block; width: 30rpx; height: 30rpx;" src="{{imgPath}}/other/ohter3.png"></image>
+			</view>
+			<view style="width: 55%; text-align: left;">{{item.name}}</view>
+			<view style="width: 35%; text-align: right;">直线{{item.distanc}}km</view>
 		</view>
 	</view>
 </view>

nnzwminiapp/pagesPublic/pages/tdcr/details/wxml/periphery.wxss

@@ -4,7 +4,7 @@
 }
 .ppy_top {
 	width: 90%;
-	margin:0 auto 0;
+	margin:20rpx auto 0;
 	display: grid;
 	grid-template-columns: repeat(6, 17%);
 	height: 50rpx;
@@ -19,7 +19,8 @@
 	font-size: 28rpx;
 	/* background: #000; */
 	border-radius: 30rpx;
-	border: 1rpx solid #3E97F8;
+	
+	border: 1rpx solid #00A4FF;
 }
 .ppy-body{
 	width: 95%;