diff --git a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl
index 33108e5f4..d0962de10 100644
--- a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl
+++ b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl
@@ -80,7 +80,7 @@
-
+
房产数据覆盖全国367个城市地区、80万楼盘、8000万房号库、70万楼盘字段、5000万POI数据。
@@ -362,7 +362,7 @@
let animateFrame; // 清除 requestAnimationFrame 请求动画帧
// 数字动画
function digitalAnimation() {
- startNum += 6658; // 速度的计算可以为小数 。数字越大,滚动越快
+ startNum += 68; // 速度的计算可以为小数 。数字越大,滚动越快
if(maxNum > 0){
if (startNum >= maxNum) {
startNum = maxNum;
diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java
index b1a869b94..d5ecd8573 100644
--- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java
+++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddrSvcController.java
@@ -3,6 +3,7 @@ package com.fangjia.open.controllers;
import com.fangjia.core.util.HttpRequest;
import com.fangjia.dal.mongo.model.VillageIdentify;
import com.fangjia.dal.seaweed.model.District;
+import com.fangjia.open.APIConstant;
import com.fangjia.open.dto.addressGovernance.DistrictDto;
import com.fangjia.open.dto.addressGovernance.DistrictIdentifyDto;
import com.fangjia.open.dto.addressGovernance.MatchedBuildingDto;
@@ -253,6 +254,10 @@ public class AddrSvcController {
json = request.getJsonContent("http://192.168.0.100:32080/FangJiaNlpService/match", params, "UTF-8");
BasicModel basicModel = new BasicModel(200, "ok");
if (json != null && json.size() > 0) {
+ // ·dz¬¼¶Óû§²»·µ»ØÖÃÐŶÈ
+ if (json.containsKey("credit") && !APIConstant.SUPER_USER_TOKEN.equals(model.getToken())) {
+ json.remove("credit");
+ }
basicModel.setResult(CommonDtoUtils.transformV(MatchedBuildingDto.class, json));
}
mav.setModel(basicModel);
diff --git a/projects/fangjia-static/src/main/webapp/style/fangjia/v6/reportNew.css b/projects/fangjia-static/src/main/webapp/style/fangjia/v6/reportNew.css
index 780bb48dc..e7ecf7fb2 100644
--- a/projects/fangjia-static/src/main/webapp/style/fangjia/v6/reportNew.css
+++ b/projects/fangjia-static/src/main/webapp/style/fangjia/v6/reportNew.css
@@ -6,10 +6,10 @@
.main_reportNew{width: 1200px;margin: auto;margin-top: 100px;overflow: hidden;position: relative;}
/*.main_left_reportNew{width: 1200px;}*/
-.evaluationBox{height: 550px;}
+.evaluationBox{height: auto;}
.evaluation_title {height: 50px;font-size: 25px;font-weight: 400;display: inline-flex;line-height: 50px;}
.evaluation_title i { width: 43px;height: 50px;background: url(../../../images/fangjia/v6/4-2-3.png);background-size: 33px 33px;background-repeat: no-repeat;background-position: left;}
-.evaluation_content {height: 500px;background: url(../../../images/fangjia/v6/4-2-12.png);background-size:100% 100%;position: relative;margin-top: 30px;display: block;}
+.evaluation_content {height: 600px;background: url(../../../images/fangjia/v6/4-2-12.png);background-size:100% 100%;position: relative;margin-top: 30px;display: block;}
.evaluation_inputInfo {overflow: hidden;}
.evaluation_inputInfo_table{height: 520px;margin-top: 80px;}
.evaluation_inputInfo_flex{display: flex;height: 40px;margin-top: 50px;}