小程序修改

components/detail-announcement/detail-announcement.wxml

@@ -2,6 +2,8 @@
 <view class="list">
   <view class="list-title">土地指标</view>
   <view class="list-info">
+    <view class="list-info-item">土地用途：{{info.landUsage}}</view>
+    <view class="list-info-item">拍卖日期：{{info.auctionDate}}</view>
     <view class="list-info-item">占地面积：{{info.landTransferSquare}}㎡({{info.landTransferMu}}亩)</view>
     <view class="list-info-item">容积率：{{info.plotRatio}}</view>
     <view class="list-info-item">计容面积：{{info.totalConsArea}}m</view>
@@ -19,12 +21,12 @@
   <view class="list-title">规划条件</view>
   <view class="list-info">
     <view class="list-info-item">商业面积：{{info.bizSpace}}㎡</view>
-    <view class="list-info-item">商业占比：{{info.commercialSelfRatio}}%</view>
+    <view class="list-info-item">商业占比：{{info.bizSpaceRatio}}%</view>
     <view class="list-info-item">商务面积：{{info.commerceSpace}}㎡</view>
-    <view class="list-info-item">商务占比：{{info.bizCommerceRate}}%</view>
-    <view class="list-info-item">配建-计容面积：不大于{{info.allocationCapacity}}米</view>
-    <view class="list-info-item">配建占比：{{info.auctionDate}}%</view>
-    <view class="list-info-item">配建-不计容面积：缺少字段</view>
+    <view class="list-info-item">商务占比：{{info.commerceSpaceRatio}}%</view>
+    <view class="list-info-item">配建-计容面积：{{info.plan}}㎡</view>
+    <view class="list-info-item">配建占比：{{info.planRatio}}%</view>
+    <view class="list-info-item">配建-不计容面积：{{info.unplan}}㎡</view>
   </view>
 </view>
 <view class="list">

components/detail-clinch/detail-clinch.wxml

@@ -52,10 +52,18 @@
     </view>
     <view class="table-item">
       <view class="table-lable">
-        自持
+        商业自持
       </view>
       <view class="table-info">
-        {{info.commercialSelfRatio?info.commercialSelfRatio:'暂无数据'}}
+        {{info.commercialSelfRatio?info.commercialSelfRatio:'0'}}%，{{info.commercialSelfYear?info.commercialSelfYear:'0'}}年
+      </view>
+    </view>
+    <view class="table-item">
+      <view class="table-lable">
+        住宅自持
+      </view>
+      <view class="table-info">
+        {{info.homeSelfRatio?info.homeSelfRatio:'0'}}%，{{info.homeSelfYear?info.homeSelfYear:'0'}}年
       </view>
     </view>
     <view class="table-item">

components/detail-present/detail-present.wxml

@@ -26,12 +26,12 @@
         {{info.projectCompany?info.projectCompany:'暂无数据'}}
       </view>
     </view>
-    <view class="table-item">
+    <view class="table-item" wx:for="{{info.enterprise}}">
       <view class="table-lable">
         经营企业
       </view>
       <view class="table-info">
-        {{info.conductEnterprise?info.conductEnterprise:'暂无数据'}}
+        {{item.enterpriseName}}-{{item.shareRatio}}%
       </view>
     </view>
     <view class="table-item">

components/ui-calendar/ui-calendar.wxss

@@ -83,7 +83,7 @@
 
 /* 有拍卖数量日期 */
 .active-back-three .item_view {
-  background: linear-gradient(to left, #FFCC00 0%, #FFCC00 50%, #ffffff 50%, #ffffff 100%);
+  background: linear-gradient(to right, #FFCC00 0%, #FFCC00 50%, #ffffff 50%, #ffffff 100%);
 }
 
 /* 两个数量都有 */

pages/look-detail/look-detail.js

@@ -135,11 +135,47 @@ Page({
                     res.data[key] = ''
                 }
             }
-
+            if(res.data.totalConsArea&&res.data.totalConsArea!=''&&res.data.totalConsArea!=0){
+                res.data.bizSpaceRatio=((res.data.bizSpace/res.data.totalConsArea)*100).toFixed(2);
+                res.data.commerceSpaceRatio=((res.data.commerceSpace/res.data.totalConsArea)*100).toFixed(2);
+            }else{
+                res.data.bizSpaceRatio=0;
+                res.data.commerceSpaceRatio=0;
+            }
 
             this.setData({
                 myData: res.data
             })
+            let totalConsArea = res.data.totalConsArea;
+
+            $api.AJAX('GET', 'applets/landlistedconstructionplan/list/' + this.data.landListedId, true).then(res => {
+                let plan = 0;
+                let planRatio = 0;
+                let unplan = 0;
+                
+                for(let i in res.data){
+                    if(res.data[i].constructionType=='1'){
+                        plan+=res.data[i].constructionArea
+                    }else if(res.data[i].constructionType=='2'){
+                        unplan+=res.data[i].constructionArea
+                    }
+                }
+                if (totalConsArea&&totalConsArea!=''&&totalConsArea!=0){
+                    planRatio = (plan/totalConsArea*100).toFixed(2);
+                }
+
+                this.setData({
+                    'myData.plan': plan,
+                    'myData.planRatio': planRatio,
+                    'myData.unplan': unplan,
+                })
+            })
+            $api.AJAX('GET', 'applets/landlistedconductenterprise/list/' + this.data.landListedId, true).then(res => {
+                this.setData({
+                    'myData.enterprise': res.data
+                })
+            })
+            
             $api.getPreSaleDetailList({landListedId: this.data.landListedId}).then(res => {
                 this.setData({
                     'presentInfo.more': res.data

pages/lookStay-detail/lookStay-detail.js

@@ -121,21 +121,40 @@ Page({
                 })
             }
 
+            if(res.data.totalConsArea&&res.data.totalConsArea!=''&&res.data.totalConsArea!=0){
+                res.data.bizSpaceRatio=((res.data.bizSpace/res.data.totalConsArea)*100).toFixed(2);
+                res.data.commerceSpaceRatio=((res.data.commerceSpace/res.data.totalConsArea)*100).toFixed(2);
+            }else{
+                res.data.bizSpaceRatio=0;
+                res.data.commerceSpaceRatio=0;
+            }
+
 
             this.setData({
                 myData: res.data
             })
-            $api.getPreSaleDetailList({ landListedId: this.data.landListedId }).then(res => {
-                this.setData({
-                    'presentInfo.more': res.data
-                })
-            })
-            $api.getPreSaleTotal({ landListedId: this.data.landListedId }).then(res => {
+            $api.AJAX('GET', 'applets/landlistedconstructionplan/list/' + this.data.landListedId, true).then(res => {
+                let plan = 0;
+                let planRatio = 0;
+                let unplan = 0;
+                
+                for(let i in res.data){
+                    if(res.data[i].constructionType=='1'){
+                        plan+=res.data[i].constructionArea
+                    }else if(res.data[i].constructionType=='2'){
+                        unplan+=res.data[i].constructionArea
+                    }
+                }
+                if (totalConsArea&&totalConsArea!=''&&totalConsArea!=0){
+                    planRatio = (plan/totalConsArea*100).toFixed(2);
+                }
+
                 this.setData({
-                    'presentInfo.list': res.data
+                    'myData.plan': plan,
+                    'myData.planRatio': planRatio,
+                    'myData.unplan': unplan,
                 })
             })
-
         })
     },
 

pages/lookStay-detail/lookStay-detail.wxml

@@ -63,7 +63,7 @@
         </view>
         <view class="gener-item">
           <text class="gener-lable">【状态】</text>
-          <text class="gener-text">{{myData.city}}</text>
+          <text class="gener-text">{{myData.supplyStatus}}</text>
         </view>
         <view class="gener-item">
           <text class="gener-lable">【预计挂牌时间】</text>