diff --git a/components/detail-announcement/detail-announcement.wxml b/components/detail-announcement/detail-announcement.wxml
index 3a3f797..22f37fd 100644
--- a/components/detail-announcement/detail-announcement.wxml
+++ b/components/detail-announcement/detail-announcement.wxml
@@ -2,6 +2,8 @@
土地指标
+ 土地用途：{{info.landUsage}}
+ 拍卖日期：{{info.auctionDate}}
占地面积：{{info.landTransferSquare}}㎡({{info.landTransferMu}}亩)
容积率：{{info.plotRatio}}
计容面积：{{info.totalConsArea}}m
@@ -19,12 +21,12 @@
规划条件
商业面积：{{info.bizSpace}}㎡
- 商业占比：{{info.commercialSelfRatio}}%
+ 商业占比：{{info.bizSpaceRatio}}%
商务面积：{{info.commerceSpace}}㎡
- 商务占比：{{info.bizCommerceRate}}%
- 配建-计容面积：不大于{{info.allocationCapacity}}米
- 配建占比：{{info.auctionDate}}%
- 配建-不计容面积：缺少字段
+ 商务占比：{{info.commerceSpaceRatio}}%
+ 配建-计容面积：{{info.plan}}㎡
+ 配建占比：{{info.planRatio}}%
+ 配建-不计容面积：{{info.unplan}}㎡
diff --git a/components/detail-clinch/detail-clinch.wxml b/components/detail-clinch/detail-clinch.wxml
index bf50827..27b2903 100644
--- a/components/detail-clinch/detail-clinch.wxml
+++ b/components/detail-clinch/detail-clinch.wxml
@@ -52,10 +52,18 @@
- 自持
+ 商业自持
- {{info.commercialSelfRatio?info.commercialSelfRatio:'暂无数据'}}
+ {{info.commercialSelfRatio?info.commercialSelfRatio:'0'}}%，{{info.commercialSelfYear?info.commercialSelfYear:'0'}}年
+
+
+
+
+ 住宅自持
+
+
+ {{info.homeSelfRatio?info.homeSelfRatio:'0'}}%，{{info.homeSelfYear?info.homeSelfYear:'0'}}年
diff --git a/components/detail-present/detail-present.wxml b/components/detail-present/detail-present.wxml
index 22e751a..fccbcfd 100644
--- a/components/detail-present/detail-present.wxml
+++ b/components/detail-present/detail-present.wxml
@@ -26,12 +26,12 @@
{{info.projectCompany?info.projectCompany:'暂无数据'}}
-
+
经营企业
- {{info.conductEnterprise?info.conductEnterprise:'暂无数据'}}
+ {{item.enterpriseName}}-{{item.shareRatio}}%
diff --git a/components/ui-calendar/ui-calendar.wxss b/components/ui-calendar/ui-calendar.wxss
index 972d7d3..4744474 100644
--- a/components/ui-calendar/ui-calendar.wxss
+++ b/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%);
}
/* 两个数量都有 */
diff --git a/pages/look-detail/look-detail.js b/pages/look-detail/look-detail.js
index d9142e7..9bb66ac 100644
--- a/pages/look-detail/look-detail.js
+++ b/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
diff --git a/pages/lookStay-detail/lookStay-detail.js b/pages/lookStay-detail/lookStay-detail.js
index 1f48c20..7b4d97a 100644
--- a/pages/lookStay-detail/lookStay-detail.js
+++ b/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,
})
})
-
})
},
diff --git a/pages/lookStay-detail/lookStay-detail.wxml b/pages/lookStay-detail/lookStay-detail.wxml
index c993bae..7bc21ec 100644
--- a/pages/lookStay-detail/lookStay-detail.wxml
+++ b/pages/lookStay-detail/lookStay-detail.wxml
@@ -63,7 +63,7 @@
【状态】
- {{myData.city}}
+ {{myData.supplyStatus}}
【预计挂牌时间】