diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java
index 9ae5bbeb4..b3ade7aa1 100644
--- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java
+++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java
@@ -436,7 +436,7 @@ public class CcbRentController {
OutputStream os = null;
try {
os = response.getOutputStream();
- ITextRenderer renderer = new ITextRenderer(35, 20);
+ ITextRenderer renderer = new ITextRenderer(35, 21);
ITextFontResolver fontResolver = renderer.getFontResolver();
String fontUrl = ActionContext.getContext().getServletContext().getRealPath("/") + "fonts" + File.separator + "simsun.ttc";
fontResolver.addFont(fontUrl, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl
index 2a539183c..52901d9d1 100644
--- a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl
+++ b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl
@@ -29,11 +29,13 @@
color: #1E90FF;
}
.title1 {
- font-size: 14px;
+ font-size: 15px;
color: #1E90FF;
+ margin-top: 2px;
+ margin-bottom: 2px;
}
.p {
- font-size: 12px;
+ font-size: 13px;
}
.table {
width: 100%;
@@ -319,9 +321,9 @@
' + d.city + ' | \
' + d.region + ' | \
' + d.districtName + ' | \
- ' + d.totalPrice + ' | \
- ' + d.area + ' | \
- ' + d.room + ' | \
+ ' + (d.totalPrice != undefined ? d.totalPrice : '') + ' | \
+ ' + (d.area != undefined ? d.area : '') + ' | \
+ ' + (d.room != undefined ? d.room : '') + ' | \
' + hall + ' | \
' + fitment + ' | \
' + formatDate(d.tradeDate) + ' | \
@@ -340,10 +342,10 @@
' + d.city + ' | \
' + d.region + ' | \
' + d.districtName + ' | \
- ' + d.totalPrice + ' | \
- ' + d.area + ' | \
- ' + d.room + ' | \
- ' + d.hall + ' | \
+ ' + (d.totalPrice != undefined ? d.totalPrice : '') + ' | \
+ ' + (d.area != undefined ? d.area : '') + ' | \
+ ' + (d.room != undefined ? d.room : '') + ' | \
+ ' + (d.hall != undefined ? d.hall : '')+ ' | \
' + fitment + ' | \
' + date + ' | \
');
@@ -359,9 +361,9 @@
$('#sameDistricts').append(' \
| ' + d.city + ' | \
' + d.region + ' | \
- ' + d.districtName + ' | \
- ' + d.roomPrice + ' | \
- ' + d.room + ' | \
+ ' + (d.districtName != undefined ? d.districtName:'' ) + ' | \
+ ' + (d.roomPrice != undefined ? d.roomPrice:'') + ' | \
+ ' + (d.room != undefined ? d.room:'') + ' | \
1 | \
');
})
diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl
index 615fef4c5..f48fa7d91 100644
--- a/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl
+++ b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl
@@ -31,16 +31,18 @@
color: #1E90FF;
}
.title1 {
- font-size: 14px;
+ font-size: 15px;
color: #1E90FF;
+ margin-top: 2px;
+ margin-bottom: 2px;
}
.p {
- font-size: 12px;
+ font-size: 13px;
}
.table {
width: 100%;
overflow-y: hidden;
- overflow-x: scroll
+ overflow-x: scroll;
}
.inline {
width: 550px;
@@ -122,7 +124,7 @@
6 已租房源
-
+
| 城市 |
@@ -161,13 +163,13 @@
7 样本参考
-
+
| 城市 |
区域 |
小区名 |
- 租金 |
+ 租 金 |
面积 |
室 |
厅 |
@@ -200,7 +202,7 @@
8 周边同类小区租金
-
+
| 城市 |
@@ -220,7 +222,7 @@
<#if bo.districtName??>${bo.districtName}#if> |
<#if bo.totalPrice??>${bo.totalPrice}#if> |
<#if bo.room??>${bo.room}#if> |
- <#if bo.hall??>${bo.hall}#if> |
+ <#if bo.hall??>${bo.hall}<#else>1#if> |
#list>
<#else>