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

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

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

@@ -1,12 +1,12 @@
 // pagesPublic/pages/tdcr/details/detail.js
-const {IMG_PATH} = require('../../../../utils/path')
+const {imgUrl} = require('../../api/request')
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    imgPath: IMG_PATH,
+    imgPath: imgUrl + 'tdcr/',
     headerStyle: {},
     title: '廖家山地块',
     tabs: [{
@@ -18,7 +18,7 @@ Page({
     }, {
       label: '其他地块',
     }],
-    tabActive: 0,
+    tabActive: 1,
   },
 
   /**

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

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

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

@@ -0,0 +1,8 @@
+<view class="info-content">
+  <view class="i-title">廖家山地块</view>
+  <view class="i-introduce">基本介绍</view>
+  <view class="i-introduce-content">廖家山地块位于南岸区海棠溪街道，根据 2024年供地计划，由区土储中心作为项目业主负责该地块出让工作，该地块拟于2024年3月底前出让，计划供应面积约26亩，规划用地性质为居住用地，容积率 2.5，总计容建筑面积约4.2万平方米。</view>
+  <view class="i-hr"></view>
+  <view class="i-introduce">核心卖点</view>
+  <view class="i-introduce-content">项目周边城市功能丰富、设施配套完善。</view>
+</view>

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

@@ -0,0 +1,33 @@
+.info-content {
+  height: 100%;
+  width: 90%;
+  margin: 0 auto;
+}
+.info-content .i-title {
+  font-family: PingFang SC;
+  font-weight: 800;
+  font-size: 42rpx;
+  color: #FFFFFF;
+  margin-top: 1vh;
+}
+.info-content .i-introduce {
+  font-family: PingFang SC;
+  font-weight: 800;
+  font-size: 34rpx;
+  color: #00FFFF;
+  margin: 1vh 0;
+}
+.info-content .i-introduce-content {
+  text-indent: 2ch;
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  font-size: 30rpx;
+  color: #FFFFFF;
+}
+.info-content .i-hr {
+  height: 1rpx;
+  width: 100%;
+  background: #30A1DB;
+  opacity: 0.5;
+  margin: 2vh 0;
+}

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

@@ -8,7 +8,7 @@
       <view class="s-item-f">供应面积</view>
     </view>
     <view class="s-item">
-      <view class="s-item-t"><text class="s-item-num">26</text>㎡</view>
+      <view class="s-item-t"><text class="s-item-num">26万</text>㎡</view>
       <view  class="s-item-f">建筑面积</view>
     </view>
     <view class="s-item">
@@ -18,6 +18,21 @@
   </view>
   <view class="s-use">计划供地用途<text>居住用地</text></view>
   <view class="s-hr"></view>
-  <view>
+  <view class="s-footer">
+    <view class="s-f-item">
+      <image src="{{imgPath}}/details/icon-order.png"/>
+      <text>征地拆迁整治情况：</text>
+      <text class="s-f-i-txt">区已完成征收，公交首末站未搬迁</text>
+    </view>
+    <view class="s-f-item">
+      <image src="{{imgPath}}/details/icon-time.png"/>
+      <text>计划供地情况：</text>
+      <text class="s-f-i-txt">2024年3月</text>
+    </view>
+    <view class="s-f-item">
+      <image src="{{imgPath}}/details/icon-h.png"/>
+      <text>责任单位：</text>
+      <text class="s-f-i-txt">区土储中心</text>
+    </view>
   </view>
 </view>

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

@@ -43,6 +43,8 @@
 }
 .s-list .s-item .s-item-t .s-item-num {
   font-size: 42rpx;
+  color: rgba(0, 255, 255, 1);
+  font-weight: bold;
 }
 .survey-content .s-use {
   font-family: Microsoft YaHei;
@@ -66,4 +68,23 @@
   background: #30A1DB;
   opacity: 0.5;
   margin-top: 3vh;
+}
+.survey-content .s-footer {
+  margin-top: 3vh;
+  padding-bottom: 3vh;
+}
+.s-footer .s-f-item {
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  font-size: 28rpx;
+  color: #FFFFFF;
+  margin-bottom: 1vh;
+}
+.s-footer .s-f-item image {
+  width: 30rpx;
+  height: 30rpx;
+  margin-right: 10rpx;
+}
+.s-footer .s-f-item .s-f-i-txt {
+  color: #00FFFF;
 }

nnzwminiapp/pagesPublic/pages/tdcr/index.js

@@ -1,12 +1,12 @@
 // pagesPublic/pages/tdcr/index.js
-const {IMG_PATH} = require('../../../utils/path')
+const {imgUrl} = require('../api/request')
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    imgPath: IMG_PATH,
+    imgPath: imgUrl + 'tdcr/',
     cursorGuys: [{
       left: 48,
       top: 1.5

nnzwminiapp/utils/path.js

@@ -1,6 +0,0 @@
-
-const IMG_PATH = 'http://192.168.0.23/images'
-
-module.exports = {
-  IMG_PATH
-}