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

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

@@ -77,4 +77,6 @@
 }
 
 @import './wxml/survey.wxss';
-@import './wxml/info.wxss';
+@import './wxml/info.wxss';
+@import './wxml/periphery.wxss';
+@import './wxml/ohter.wxss';

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

@@ -0,0 +1,4 @@
+.ohter_bg{
+	width: 100%;
+	height: 100%;
+}

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

@@ -0,0 +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%; ">
+			</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 style="color: #fff; font-size: 25rpx; font-weight: bold;">供应面积/26亩</view>
+					</view>
+					<view style="height: 50%; line-height: 30rpx; display: flex;">
+						<view></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>
+				</view>
+			</view>
+		</view>
+	</scroll-view>
+</view>

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

@@ -0,0 +1,17 @@
+<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>
+	<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>
+	</view>
+</view>

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

@@ -0,0 +1,37 @@
+.ppy-bg{
+	/* background: linear-gradient(#1243BC, #001243BC); */
+	height: 100%;
+}
+.ppy_top {
+	width: 90%;
+	margin:0 auto 0;
+	display: grid;
+	grid-template-columns: repeat(6, 17%);
+	height: 50rpx;
+}
+
+.ppy_item {
+	width: 100rpx;
+	text-align: center;
+	height: 50rpx;
+	line-height: 50rpx;
+	color: #fff;
+	font-size: 28rpx;
+	/* background: #000; */
+	border-radius: 30rpx;
+	border: 1rpx solid #3E97F8;
+}
+.ppy-body{
+	width: 95%;
+	height: 100%;
+	margin: 20rpx auto 0;
+}
+.ppy-body-item{
+	width: 100%;
+	height: 60rpx;
+	line-height: 60rpx;
+	font-size: 30rpx;
+	text-align: 30rpx;
+	color: #fff;
+	display: flex;
+}