diff --git a/deliverables/k8s/fangjia-bkoff.yaml b/deliverables/k8s/fangjia-bkoff.yaml index a6e01a7ab..768fd80cd 100644 --- a/deliverables/k8s/fangjia-bkoff.yaml +++ b/deliverables/k8s/fangjia-bkoff.yaml @@ -39,13 +39,15 @@ spec: name: web protocol: TCP readinessProbe: - tcpSocket: - port: 8080 + httpGet: + path: /k8s/readiness + port: web initialDelaySeconds: 5 periodSeconds: 10 livenessProbe: - tcpSocket: - port: 8080 + httpGet: + path: /k8s/liveness + port: web initialDelaySeconds: 10 periodSeconds: 5 volumeMounts: diff --git a/deliverables/k8s/fangjia-static.yaml b/deliverables/k8s/fangjia-static.yaml index da58e88a9..fa7f9b842 100644 --- a/deliverables/k8s/fangjia-static.yaml +++ b/deliverables/k8s/fangjia-static.yaml @@ -98,4 +98,4 @@ spec: ports: - port: 8080 targetPort: 8080 - nodePort: 30005 \ No newline at end of file + nodePort: 30013 \ No newline at end of file diff --git a/deliverables/k8s/fangjia-youda-manager.yaml b/deliverables/k8s/fangjia-youda-manager.yaml new file mode 100644 index 000000000..2fa388c75 --- /dev/null +++ b/deliverables/k8s/fangjia-youda-manager.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: fangjia-youda-manager + namespace: fangjia +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + revisionHistoryLimit: 5 + selector: + matchLabels: + project: fangjia-youda-manager + app: fangjia + template: + metadata: + labels: + project: fangjia-youda-manager + app: fangjia + spec: + imagePullSecrets: + - name: nexus-registry-secret + nodeSelector: + app: fangjia + containers: + - name: fangjia-youda-manager + image: 192.168.0.19:9012/fangjia-youda-manager:1.1 + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: web + protocol: TCP + readinessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 10 + periodSeconds: 5 + volumeMounts: + - name: host-time + mountPath: /etc/localtime + volumes: + - name: host-time + hostPath: + path: /etc/localtime +--- +apiVersion: v1 +kind: Service +metadata: + name: fangjia-youda-manager + namespace: fangjia + labels: + project: fangjia-youda-manager + app: fangjia +spec: + type: NodePort + selector: + project: fangjia-youda-manager + app: fangjia + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30006 \ No newline at end of file diff --git a/deliverables/k8s/fangjia-youda-web-business.yaml b/deliverables/k8s/fangjia-youda-web-business.yaml new file mode 100644 index 000000000..ee19e4c63 --- /dev/null +++ b/deliverables/k8s/fangjia-youda-web-business.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: fangjia-youda-web-business + namespace: fangjia +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + revisionHistoryLimit: 5 + selector: + matchLabels: + project: fangjia-youda-web-business + app: fangjia + template: + metadata: + labels: + project: fangjia-youda-web-business + app: fangjia + spec: + imagePullSecrets: + - name: nexus-registry-secret + nodeSelector: + app: fangjia + containers: + - name: fangjia-youda-web-business + image: 192.168.0.19:9012/fangjia-youda-web-business:1.1 + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: web + protocol: TCP + readinessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 10 + periodSeconds: 5 + volumeMounts: + - name: host-time + mountPath: /etc/localtime + volumes: + - name: host-time + hostPath: + path: /etc/localtime +--- +apiVersion: v1 +kind: Service +metadata: + name: fangjia-youda-web-business + namespace: fangjia + labels: + project: fangjia-youda-web-business + app: fangjia +spec: + type: NodePort + selector: + project: fangjia-youda-web-business + app: fangjia + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30012 \ No newline at end of file diff --git a/deliverables/k8s/fangjia-youda-web-customer.yaml b/deliverables/k8s/fangjia-youda-web-customer.yaml new file mode 100644 index 000000000..d8374216b --- /dev/null +++ b/deliverables/k8s/fangjia-youda-web-customer.yaml @@ -0,0 +1,72 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: fangjia-youda-web-customer + namespace: fangjia +spec: + replicas: 1 + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + revisionHistoryLimit: 5 + selector: + matchLabels: + project: fangjia-youda-web-customer + app: fangjia + template: + metadata: + labels: + project: fangjia-youda-web-customer + app: fangjia + spec: + imagePullSecrets: + - name: nexus-registry-secret + nodeSelector: + app: fangjia + containers: + - name: fangjia-youda-web-customer + image: 192.168.0.19:9012/fangjia-youda-web-customer:1.1 + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: web + protocol: TCP + readinessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 5 + periodSeconds: 10 + livenessProbe: + httpGet: + path: /login + port: web + initialDelaySeconds: 10 + periodSeconds: 5 + volumeMounts: + - name: host-time + mountPath: /etc/localtime + volumes: + - name: host-time + hostPath: + path: /etc/localtime +--- +apiVersion: v1 +kind: Service +metadata: + name: fangjia-youda-web-customer + namespace: fangjia + labels: + project: fangjia-youda-web-customer + app: fangjia +spec: + type: NodePort + selector: + project: fangjia-youda-web-customer + app: fangjia + ports: + - port: 8080 + targetPort: 8080 + nodePort: 30011 \ No newline at end of file diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index 4c6a22236..dd04da3dd 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -1265,6 +1265,7 @@ public class DistrictController { district.setAddrAlias(new ArrayList(addrAlias)); } district.setStatus(0); + district.setNameCat(0); district.setCategory("district"); district.setPublisherType(11); district.setCreationDate(new Date()); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/K8sController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/K8sController.java new file mode 100644 index 000000000..11a80b8a2 --- /dev/null +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/K8sController.java @@ -0,0 +1,28 @@ +package com.fangjia.bkoff.controllers; + +/** + * 房价网后台存活监控 + * + * @author shenjian + * @since 2021/6/7 + */ +public class K8sController { + + /** + * 存活检查 + * + * @return + */ + public Object livenessAction() { + return "liveness"; + } + + /** + * 就绪检查 + * + * @return + */ + public Object readinessAction() { + return "readiness"; + } +} diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/AuthInterceptor.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/AuthInterceptor.java index 192767d85..111b3c515 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/AuthInterceptor.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/interceptor/AuthInterceptor.java @@ -40,7 +40,8 @@ public class AuthInterceptor implements Interceptor { request.setAttribute("__resources", request.getSession().getAttribute(userId + "_resources")); if (invocation.getAction().getController().getName().equals("login") - || invocation.getAction().getController().getName().equals("")) { + || invocation.getAction().getController().getName().equals("") + || invocation.getAction().getController().getName().equals("k8s")) { return invocation.invoke(); } diff --git a/projects/fangjia-bkoff/src/main/webapp/fjt/add.ftl b/projects/fangjia-bkoff/src/main/webapp/fjt/add.ftl index f08cc8a63..4a70b7978 100644 --- a/projects/fangjia-bkoff/src/main/webapp/fjt/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/fjt/add.ftl @@ -176,7 +176,7 @@ table{text-align: left;} } }) - if(role==12){ + if(role==12||role==17){ if(userStr.length>0){ console.log(userStr); $("input[name=roleUsers]").val(userStr); @@ -306,7 +306,7 @@ $("input[name=email]").blur(function(){ $("#role").change(function() { var role = $(this).val(); //鍙鍐滆鐢熸晥 - if (role == 12) { + if (role == 12 || role == 17) { $("#show_chk_all").removeAttr("style"); jQuery.ajax({ type: 'POST', @@ -340,12 +340,12 @@ $("input[name=email]").blur(function(){ } return false; } - <#if user?? && user.role == 12> + <#if user?? && (user.role == 12 || user.role == 17)> $("#show_chk_all").removeAttr("style"); jQuery.ajax({ type: 'POST', url: '../fjt/getUsersByRole', - data: {role:12}, + data: {role:${user.role}}, dataType: 'json', timeout: 100000, success: function(model) { diff --git a/projects/fangjia-bkoff/src/main/webapp/yugudan/editEval.ftl b/projects/fangjia-bkoff/src/main/webapp/yugudan/editEval.ftl index eab869c86..53fd8f659 100644 --- a/projects/fangjia-bkoff/src/main/webapp/yugudan/editEval.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/yugudan/editEval.ftl @@ -1339,7 +1339,7 @@ 瀹ゅ彿 <#if evaluation.buildType!=3 && evaluation.buildType!=8 && evaluation.buildType!=0> - <#if evaluation.floorDesc!=""> + <#if evaluation.floorDesc?? && evaluation.floorDesc!=""> ${evaluation.floorDesc!} diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java b/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java index 72d9cc886..d8b75d0c5 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/RegionData.java @@ -167,9 +167,9 @@ public class RegionData implements PriorityOrdered { ret = format(cityRegionMap, region); } - if (null == ret) { - return region; - } +// if (null == ret) { +// return region; +// } return ret; } diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java index e075fbd32..4f59fe761 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/BaiDuApiUtils.java @@ -258,8 +258,9 @@ public class BaiDuApiUtils { params.put("coords", lng.toString() + "," + lat.toString()); params.put("from", String.valueOf(from)); HttpRequest request = new HttpRequest(); + String result = null; try{ - String result = request.get("http://api.map.baidu.com/geoconv/v1/",params,"UTF-8"); + result = request.get("http://api.map.baidu.com/geoconv/v1/",params,"UTF-8"); JSONObject json = JSONObject.fromObject(result); while(!(json == null || json.containsKey("result") || json.getJSONArray("result").size() == 0)){ changeAK(); @@ -273,6 +274,7 @@ public class BaiDuApiUtils { } return json.getJSONArray("result").getJSONObject(0); }catch (Exception e){ + System.out.println("错误:"+result); e.printStackTrace(); } return null; diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdviceLeadsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdviceLeadsController.java new file mode 100644 index 000000000..46f2fbf1a --- /dev/null +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/AdviceLeadsController.java @@ -0,0 +1,51 @@ +package com.fangjia.coresite.controllers; + +import com.fangjia.coresite.model.AdviceLeadsModel; +import com.fangjia.coresite.model.user.Message; +import com.fangjia.coresite.model.user.UserRegJsonModel; +import com.fangjia.coresite.util.CoresiteCookieContext; +import com.fangjia.coresite.util.LoginUtil; +import com.fangjia.dal.mongo.fangjia.model.AdviceLeads; +import com.fangjia.service.common.CookieName; +import com.fangjia.service.fangjia.AdviceLeadsService; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; + +public class AdviceLeadsController { + + private AdviceLeadsService adviceLeadsService; + + private static final CoresiteCookieContext COOKIE_CONTEXT = CoresiteCookieContext + .getInstance(); + + public Object doAddAction(AdviceLeadsModel model, HttpServletRequest req) { + UserRegJsonModel result = new UserRegJsonModel(); + model.setViewType("redirect"); + + String tempId = COOKIE_CONTEXT.getCookieValue(req, CookieName.UID); + AdviceLeads adviceLeads = new AdviceLeads(); + adviceLeads.setName(model.getName()); + adviceLeads.setMobile(model.getMobile()); + adviceLeads.setEmail(model.getEmail()); + adviceLeads.setCompany(model.getCompany()); + adviceLeads.setDepartment(model.getDepartment()); + adviceLeads.setPosition(model.getPosition()); + adviceLeads.setCreateDate(new Date()); + adviceLeads.setModifyDate(new Date()); + adviceLeads.setUserId(LoginUtil.getUserId(req)); + adviceLeads.setTempId(tempId); + adviceLeadsService.save(adviceLeads); + result.setResult(Message.RESULT_SUCCESS); + return result; + } + + public AdviceLeadsService getAdviceLeadsService() { + return adviceLeadsService; + } + + public void setAdviceLeadsService(AdviceLeadsService adviceLeadsService) { + this.adviceLeadsService = adviceLeadsService; + } + + +} diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java index a3832b3bd..f40b4700a 100644 --- a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/TermsController.java @@ -37,5 +37,9 @@ public class TermsController { public Object ydinfoAction(ResourceModel model){ return model; } + + public Object ydintrAction(ResourceModel model){ + return model; + } } diff --git a/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AdviceLeadsModel.java b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AdviceLeadsModel.java new file mode 100644 index 000000000..4564000f0 --- /dev/null +++ b/projects/fangjia-coresite/src/main/java/com/fangjia/coresite/model/AdviceLeadsModel.java @@ -0,0 +1,88 @@ +package com.fangjia.coresite.model; + +public class AdviceLeadsModel extends BaseModel{ + + private static final long serialVersionUID = -5664116886759283515L; + + /** + * 姓名 + */ + private String name; + + + /** + * 手机 + */ + private String mobile; + + + /** + * 邮箱 + */ + private String email; + + /** + * 公司 + */ + private String company; + + + + /** + * 部门 + */ + private String department; + + /** + * 职位 + */ + private String position; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getCompany() { + return company; + } + + public void setCompany(String company) { + this.company = company; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } +} diff --git a/projects/fangjia-coresite/src/main/webapp/about/contact.ftl b/projects/fangjia-coresite/src/main/webapp/about/contact.ftl index 72fecc686..da753c519 100644 --- a/projects/fangjia-coresite/src/main/webapp/about/contact.ftl +++ b/projects/fangjia-coresite/src/main/webapp/about/contact.ftl @@ -34,7 +34,7 @@

涓婃捣鎬婚儴

鐢�  璇�锛� 4001883787锛堝懆涓�鑷冲懆浜� 09:00-18:00锛�
- 閭�  绠�锛� service@fangjia.com
+ 閭�  绠�锛� gujia@fangjia.com
鍦�  鍧�锛� 涓婃捣甯傞暱瀹佸尯鍗忓拰璺�1033鍙锋枃娲嬪ぇ鍘搴�10妤�
閭�  缂�锛� 200335

diff --git a/projects/fangjia-coresite/src/main/webapp/ad/cpdb.ftl b/projects/fangjia-coresite/src/main/webapp/ad/cpdb.ftl index 3e1653ae8..39b88a6c6 100644 --- a/projects/fangjia-coresite/src/main/webapp/ad/cpdb.ftl +++ b/projects/fangjia-coresite/src/main/webapp/ad/cpdb.ftl @@ -158,7 +158,7 @@
diff --git a/projects/fangjia-coresite/src/main/webapp/app/index.ftl b/projects/fangjia-coresite/src/main/webapp/app/index.ftl index 9d9cd6b9e..3d46edff9 100644 --- a/projects/fangjia-coresite/src/main/webapp/app/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/app/index.ftl @@ -262,9 +262,9 @@
  • - +
    - service@fangjia.com + gujia@fangjia.com
  • diff --git a/projects/fangjia-coresite/src/main/webapp/company/about.ftl b/projects/fangjia-coresite/src/main/webapp/company/about.ftl index b1af2a8cc..778557075 100644 --- a/projects/fangjia-coresite/src/main/webapp/company/about.ftl +++ b/projects/fangjia-coresite/src/main/webapp/company/about.ftl @@ -54,7 +54,6 @@

    鎴夸环缃戞垚绔嬩簬2006骞达紝闅跺睘浜庝笂娴蜂及瀹剁綉缁滅鎶�鏈夐檺鍏徃锛岃嚧鍔涗簬寤虹珛涓浗棰嗗厛鐨勬埧浜уぇ鏁版嵁搴揅PDB鍙婃帹鍔ㄥ熀浜庡湴鐞嗕綅缃殑浜哄伐鏅鸿兘鐨勫彂灞曞拰搴旂敤銆傚叕鍙镐互鈥滃彂鐜板湴鍧�浠峰�尖�濅负浣垮懡锛屽缁堢鎵垮瑙備弗璋ㄧ殑鎬佸害涓烘斂搴溿�侀摱琛屻�侀噾铻嶆満鏋勭瓑瀹㈡埛鎻愪緵澶ф暟鎹�佸缓妯°�佸挩璇㈢瓑鏈嶅姟銆傜洰鍓嶏紝鎵�绉疮鐨勬埧浜ф暟鎹凡瑕嗙洊鍏ㄥ浗367涓煄甯傚強鍦板尯锛屾妧鏈姏閲忓己澶э紝瀹㈡埛鏌ヨ閲忚涓氶鍏堛��

    鍏徃鍦ㄨ捶鍓嶄及鍊笺�佸唴璇勭郴缁熴�佽捶鍚庢壒閲忓浼般�佷俊璐锋巿淇°�佸湴鍧�鍙嶆璇堛�佹暟鎹不鐞嗐�佺簿鍑嗚惀閿�绛夐鍩熼兘鏈夌潃涓板瘜鐨勭粡楠岋紝鎷ユ湁澶氶」涓撳埄锛岃璇勪负楂樻柊鎶�鏈紒涓氾紝璧㈠緱浜嗗浗瀹剁粺璁″眬銆佸缓璁鹃摱琛屻�佸啘涓氶摱琛屻�佸钩瀹夐泦鍥€�佸井浼楅摱琛岀瓑浼楀瀹㈡埛鐨勪俊璧栥��

    -

    2020骞达紝鍗椾含涓夋偊缃戠粶绉戞妧鏈夐檺鍏徃涓庢垜鍙歌揪鎴愬叏闈㈡垬鐣ュ悎浣滐紝骞舵帴鍙楁垜鍙稿鎵橈紝鍏ㄦ潈璐熻矗鎴戝徃浜у搧鎵嬫満鐗堚�滄埧浠风綉鈥濆叕浼楀彿鍜岀數鑴戠増鐨勨�滄埧浠烽�氣�濈殑甯傚満鎺ㄥ箍銆佸鎴峰紑鍙戜笌鍞悗鏈嶅姟锛涙湁鏉冪洿鎺ヤ笌瀹㈡埛绛捐涓婅堪浜у搧鐨勯攢鍞悎鍚岋紱鎴戝徃瀵瑰叾鎵�鏈夌敤鎴峰叏闈㈡彁渚涗骇鍝佸崌绾с�佹暟鎹洿鏂板強绾夸笂鍞悗绛夋湇鍔°��

    鏁版嵁涓哄ぇ浼楁湇鍔�
    @@ -77,15 +76,17 @@

    涓婃捣

    鐢� 璇濓細 4001883787锛堝懆涓�鑷冲懆浜� 09:00-18:00锛�
    - 閭� 绠憋細 service@fangjia.com
    + 閭� 绠憋細 gujia@fangjia.com 鍦� 鍧�锛氫笂娴峰競榛勬郸鍖洪粍闄傚寳璺�227鍙蜂腑鍖哄箍鍦�1207瀹�
    閭� 缂栵細 200003
    +

    +
    -
    +
    +
    +

    + 鍏虫敞浼板绉戞妧瀹㈡湇寰俊鍙�
    +   Follow us on WeChat
    +
    +
    +

    + 鍏虫敞瀹樻柟寰俊鍏紬鍙�
    + Follow us on WeChat
    +
    + <#--
    +
    +   鍏虫敞瀹樻柟寰俊鍏紬鍙�
    +   Follow us on WeChat +
    --> + +
    @@ -111,13 +129,27 @@

    涓婃捣

    鐢� 璇濓細 4001883787锛堝懆涓�鑷冲懆浜� 09:00-18:00锛�
    - 閭� 绠憋細 service@fangjia.com
    + 閭� 绠憋細 gujia@fangjia.com
    鍦� 鍧�锛� 涓婃捣甯傞粍娴﹀尯榛勯檪鍖楄矾227鍙蜂腑鍖哄箍鍦�1207瀹�
    閭� 缂栵細 200003

    -
    -
    +
    +
    +
    + 鍏虫敞浼板绉戞妧瀹㈡湇寰俊鍙�
    +   Follow us on WeChat +
    +
    +
    +   鍏虫敞瀹樻柟寰俊鍏紬鍙�
    +   Follow us on WeChat +
    +
    +
    +<#--
    --> +
    +
    浠栦滑閮藉湪鍜屾垜浠悎浣�
    diff --git a/projects/fangjia-coresite/src/main/webapp/diaoyudao/index.ftl b/projects/fangjia-coresite/src/main/webapp/diaoyudao/index.ftl index cf9fd3a35..44575521d 100644 --- a/projects/fangjia-coresite/src/main/webapp/diaoyudao/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/diaoyudao/index.ftl @@ -85,7 +85,7 @@

    diff --git a/projects/fangjia-coresite/src/main/webapp/footer/footer.ftl b/projects/fangjia-coresite/src/main/webapp/footer/footer.ftl index ca1fc58b2..bae05243e 100644 --- a/projects/fangjia-coresite/src/main/webapp/footer/footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/footer/footer.ftl @@ -70,7 +70,7 @@

    diff --git a/projects/fangjia-coresite/src/main/webapp/footer/simpleFooterNew.ftl b/projects/fangjia-coresite/src/main/webapp/footer/simpleFooterNew.ftl index a0b0f9efd..9d2ffbb46 100644 --- a/projects/fangjia-coresite/src/main/webapp/footer/simpleFooterNew.ftl +++ b/projects/fangjia-coresite/src/main/webapp/footer/simpleFooterNew.ftl @@ -21,7 +21,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/header/v2/_footer.ftl b/projects/fangjia-coresite/src/main/webapp/header/v2/_footer.ftl index 9c9a66cda..4c231568a 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v2/_footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v2/_footer.ftl @@ -198,7 +198,7 @@

    -

    瀹㈡湇鐑嚎锛�4001883787 鐢靛瓙閭锛歴ervice@fangjia.com
    +

    瀹㈡湇鐑嚎锛�4001883787 鐢靛瓙閭锛歡ujia@fangjia.com
    ©2006-${now?string("yyyy")} 鎴夸环缃� 鐗堟潈鎵�鏈� 娌狪CP澶�10203734鍙�-1
    "><#if (!serverAreaMap?exists && actionName == 'index')>${cityName}鎵炬埧瀛�锛�">浼版埧浠�锛岀櫨搴� 鎴夸环缃�

    diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl index 24bfec1fe..323aeb051 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/_footer.ftl @@ -78,7 +78,7 @@ | LinkedIn | - 瀹㈡湇閭 + 瀹㈡湇閭
  • - +
    - market@fangjia.com + gujia@fangjia.com
  • diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/index.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/index.ftl index f30cceb89..ca9611b59 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/index.ftl @@ -1476,9 +1476,9 @@
  • - +
    - market@fangjia.com + gujia@fangjia.com
  • diff --git a/projects/fangjia-coresite/src/main/webapp/header/v5/noBoxApp_footer.ftl b/projects/fangjia-coresite/src/main/webapp/header/v5/noBoxApp_footer.ftl index f773512aa..ae44d77fb 100644 --- a/projects/fangjia-coresite/src/main/webapp/header/v5/noBoxApp_footer.ftl +++ b/projects/fangjia-coresite/src/main/webapp/header/v5/noBoxApp_footer.ftl @@ -78,7 +78,7 @@ | LinkedIn | - 瀹㈡湇閭 + 瀹㈡湇閭
    - +

    鎴夸环缃戝悎浣滀紮浼�-涓婃捣鍙嬭揪鍦熷湴鎴垮湴浜ц瘎浼版湁闄愬叕鍙哥畝浠�

    @@ -220,11 +220,21 @@

    涓婃捣鎴夸骇闂ㄦ埛    

    + + +
    +

    涓婃捣鍙嬭揪鍦熷湴鎴垮湴浜ц瘎浼版湁闄愬叕鍙�-浼佷笟鍐呴儴鍩硅

    +

    2021骞�8鏈�9鏃ワ紝涓婃捣鍙嬭揪鍦熷湴鎴垮湴浜ц瘎浼版湁闄愬叕鍙稿氨鎴垮湴浜у緛鏀朵笟鍔′腑閬囧埌鐨勮澶氶棶棰樺紑灞曚簡浼佷笟鍐呴儴鍩硅銆傛湰娆″煿璁殑瀹楁棬鏄负浜嗚繘涓�姝ユ彁楂樺憳宸ユ妧鏈按骞冲拰宸ヤ綔鏁堢巼锛屽己鍖栧洟闃熷悎浣滄剰璇嗭紝涓哄叕鍙哥殑鍙寔缁�у彂灞曞瀹氳壇濂藉熀纭�銆�

    +

    涓婃捣鎴夸骇闂ㄦ埛    

    +
    +
    + +

    diff --git a/projects/fangjia-coresite/src/main/webapp/personalcenter/index.ftl b/projects/fangjia-coresite/src/main/webapp/personalcenter/index.ftl index 3b45c3279..5da00eab8 100644 --- a/projects/fangjia-coresite/src/main/webapp/personalcenter/index.ftl +++ b/projects/fangjia-coresite/src/main/webapp/personalcenter/index.ftl @@ -102,7 +102,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/personalcenter/rechargeHistory.ftl b/projects/fangjia-coresite/src/main/webapp/personalcenter/rechargeHistory.ftl index 4bc3a251c..657c75d84 100644 --- a/projects/fangjia-coresite/src/main/webapp/personalcenter/rechargeHistory.ftl +++ b/projects/fangjia-coresite/src/main/webapp/personalcenter/rechargeHistory.ftl @@ -97,7 +97,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/recharge/buyList.ftl b/projects/fangjia-coresite/src/main/webapp/recharge/buyList.ftl index 7821c908f..9c5a4b1e2 100644 --- a/projects/fangjia-coresite/src/main/webapp/recharge/buyList.ftl +++ b/projects/fangjia-coresite/src/main/webapp/recharge/buyList.ftl @@ -111,7 +111,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/recharge/prechargePay.ftl b/projects/fangjia-coresite/src/main/webapp/recharge/prechargePay.ftl index 1909cdfde..ece8f3440 100644 --- a/projects/fangjia-coresite/src/main/webapp/recharge/prechargePay.ftl +++ b/projects/fangjia-coresite/src/main/webapp/recharge/prechargePay.ftl @@ -117,7 +117,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/recharge/rechargeList.ftl b/projects/fangjia-coresite/src/main/webapp/recharge/rechargeList.ftl index ec464666f..24c1f5fbd 100644 --- a/projects/fangjia-coresite/src/main/webapp/recharge/rechargeList.ftl +++ b/projects/fangjia-coresite/src/main/webapp/recharge/rechargeList.ftl @@ -101,7 +101,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/recharge/setPassword.ftl b/projects/fangjia-coresite/src/main/webapp/recharge/setPassword.ftl index b28f2e5cf..f065c51ef 100644 --- a/projects/fangjia-coresite/src/main/webapp/recharge/setPassword.ftl +++ b/projects/fangjia-coresite/src/main/webapp/recharge/setPassword.ftl @@ -83,7 +83,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/recharge/statement.ftl b/projects/fangjia-coresite/src/main/webapp/recharge/statement.ftl index 5b5231c24..418614df9 100644 --- a/projects/fangjia-coresite/src/main/webapp/recharge/statement.ftl +++ b/projects/fangjia-coresite/src/main/webapp/recharge/statement.ftl @@ -84,7 +84,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl b/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl index dc913c853..c8c45e7cc 100644 --- a/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl +++ b/projects/fangjia-coresite/src/main/webapp/saleLeads/apply.ftl @@ -243,14 +243,14 @@
    - +
    - +
    @@ -259,7 +259,7 @@
    鎵�鍦ㄥ煄甯備笉鑳戒负绌�
    - +
    - + @@ -311,7 +311,7 @@
    宸ヤ綔鑱岃兘涓嶈兘涓虹┖
    - + @@ -337,7 +337,7 @@
    宸ヤ綔鑱岃兘涓嶈兘涓虹┖
    - + @@ -366,7 +366,7 @@
    宸ヤ綔鑱岃兘涓嶈兘涓虹┖
    - + @@ -391,7 +391,7 @@
    宸ヤ綔鑱岃兘涓嶈兘涓虹┖
    - +
    - +
    - +
    - +

    瑙e喅鏂规

    @@ -445,7 +445,7 @@
    - +
    鍏朵粬涓氬姟闇�姹備笉鑳戒负绌�
    @@ -556,7 +556,7 @@ $(".user_btn").click(function(){ return false; } - if(!checkEmail()){ + /*if(!checkEmail()){ scrollBy(0,-300); return false; } @@ -575,7 +575,7 @@ $(".user_btn").click(function(){ scrollBy(0,-100); return false; } - } + } */ var cls = $(".agreement i").attr("class"); if(cls.indexOf("checked")>-1){ diff --git a/projects/fangjia-coresite/src/main/webapp/solution/standardization.ftl b/projects/fangjia-coresite/src/main/webapp/solution/standardization.ftl index a0317c8a0..8fd43fe3f 100644 --- a/projects/fangjia-coresite/src/main/webapp/solution/standardization.ftl +++ b/projects/fangjia-coresite/src/main/webapp/solution/standardization.ftl @@ -32,7 +32,7 @@

    鏃犺鍦ㄩ鎺с�佸緛淇¤繕鏄惀閿�棰嗗煙锛屼换浣曟壒閲忓湴鍧�鏁版嵁鐨勫鐞嗛兘绂讳笉寮�鍦板潃鏍囧噯鍖栥��
    鎴夸环缃戝熀浜庡己澶х殑CPDB鏁版嵁搴撳拰浜烘満鎶�鏈紝涓哄悇琛屼笟鎻愪緵楂樻晥鏅鸿兘鐨勫湴鍧�鏍囧噯鍖栨湇鍔°��

    @@ -41,7 +41,7 @@

    鍦板潃鏍囧噯鍖栬В鍐虫柟妗�

    @@ -110,7 +110,7 @@

    鎮ㄥ彲閫氳繃鍦ㄧ嚎鏂瑰紡鑱旂郴涓撲笟椤鹃棶锛屼粬浠皢闈炲父涔愭剰涓烘偍鎻愪緵鏇村鏈嶅姟銆�

    - 绔嬪嵆鍜ㄨ + 绔嬪嵆鍜ㄨ
    @@ -128,9 +128,134 @@ +
    + <#--
    鐢宠璐锋
    --> +
    +
    +
    +
    +
    + + +
    +
    +
    + + +
    +
    +
    + + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + <#--鎻愪氦 + 杩斿洖--> + + 鎻愪氦 + 杩斿洖 +
    +
    +
    +
    +
    + <#include "/header/v5/_footer.ftl"/> + diff --git a/projects/fangjia-coresite/src/main/webapp/terms/ydintr.ftl b/projects/fangjia-coresite/src/main/webapp/terms/ydintr.ftl new file mode 100644 index 000000000..7d4af9d84 --- /dev/null +++ b/projects/fangjia-coresite/src/main/webapp/terms/ydintr.ftl @@ -0,0 +1,61 @@ + + + + + 鍚堜綔浼欎即 - 鎴夸环缃� fangjia.com + + + <#include "../jsconstants.ftl" /> + + + + + + + + + + + + + + + + +<#include "/header/v5/_header.ftl"/> + +
    +
    涓婃捣鍙嬭揪鍦熷湴鎴垮湴浜ц瘎浼版湁闄愬叕鍙�
    +
    浼佷笟鍐呴儴鍩硅
    +
    +

    2021骞�8鏈�9鏃ワ紝涓婃捣鍙嬭揪鍦熷湴鎴垮湴浜ц瘎浼版湁闄愬叕鍙稿氨鎴垮湴浜у緛鏀朵笟鍔′腑閬囧埌鐨勮澶氶棶棰樺紑灞曚簡浼佷笟鍐呴儴鍩硅銆傛湰娆″煿璁殑瀹楁棬鏄负浜嗚繘涓�姝ユ彁楂樺憳宸ユ妧鏈按骞冲拰宸ヤ綔鏁堢巼锛屽己鍖栧洟闃熷悎浣滄剰璇嗭紝涓哄叕鍙哥殑鍙寔缁�у彂灞曞瀹氳壇濂藉熀纭�銆傛暣涓煿璁垎涓轰簩澶у唴瀹癸紝棣栧厛鐢卞叕鍙告�讳及浠峰笀涓哄ぇ瀹惰繘琛屼笓涓氳瑙e緛鏀惰瘎浼颁笟鍔′腑鐨勬妧鏈毦鐐瑰強澶勭悊鏂规硶锛涗簩鏄紑灞曞憳宸ヨ嚜鐢变氦娴侊紝鍏徃棰嗗灞傚惉鍙栧悇閮ㄩ棬寤鸿锛屽仛鍒伴泦鎬濆箍鐩婏紝鏈夋晥娌熼�氥�傞�氳繃鏈鍩硅娲诲姩锛屽叕鍙稿憳宸ョ殑涓撲笟鎶�鏈按骞冲緱鍒颁簡寰堝ぇ鎻愰珮锛屽悓鏃朵績杩涗簡鍚勯儴闂ㄤ箣闂寸殑鍗忚皟鍚堜綔鑳藉姏锛屽渾婊¤揪鎴愪簡棰勬湡鐩殑銆�

    + +
    +
    +

    + 闈掓槬鍥犳ⅵ鎯宠�屽讥瓒崇弽璐碉紝浜虹敓鍥犳嫾鎼忔墠鎰堟樉鐪熷疄銆傚叕鍙镐笂涓嬫弧鎬�宸ヤ綔鐑儏锛屾棤鎯у洶闅撅紝绔嬪織涓哄弸杈剧殑鍙戝睍璐$尞鑷繁鐨勫姏閲忋�傛効鍙嬭揪姣忎綅鍛樺伐鐨勪汉鐢熷洜韪忓叆杩欎釜闆嗕綋鑰岀簿褰╃悍鍛�! +

    +
    +
    +
    + 涓婃捣鍙嬭揪鍦熷湴鎴垮湴浜ц瘎浼版湁闄愬叕鍙�
    +

    2021骞�8鏈�10鏃�

    +
    + +
    +
    + +<#include "/header/v5/_footer.ftl"/> + + + + + diff --git a/projects/fangjia-coresite/src/main/webapp/user/reqUserLoginPage.ftl b/projects/fangjia-coresite/src/main/webapp/user/reqUserLoginPage.ftl index 80157b50d..b44337846 100644 --- a/projects/fangjia-coresite/src/main/webapp/user/reqUserLoginPage.ftl +++ b/projects/fangjia-coresite/src/main/webapp/user/reqUserLoginPage.ftl @@ -179,7 +179,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/user/reqUserRegPage.ftl b/projects/fangjia-coresite/src/main/webapp/user/reqUserRegPage.ftl index 724123a34..7450cdfc4 100644 --- a/projects/fangjia-coresite/src/main/webapp/user/reqUserRegPage.ftl +++ b/projects/fangjia-coresite/src/main/webapp/user/reqUserRegPage.ftl @@ -106,7 +106,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/user/reqUserResetPassPage.ftl b/projects/fangjia-coresite/src/main/webapp/user/reqUserResetPassPage.ftl index 27278ce2a..1f6145775 100644 --- a/projects/fangjia-coresite/src/main/webapp/user/reqUserResetPassPage.ftl +++ b/projects/fangjia-coresite/src/main/webapp/user/reqUserResetPassPage.ftl @@ -75,7 +75,7 @@ 鍓嶅彴鎬绘満锛�021-62393138
    瀹㈡湇鐑嚎锛�4001883787
    涓婃捣鎵炬埧瀛�锛�浼版埧浠�锛岀櫨搴� 鎴夸环缃�
    - 鐢靛瓙閭锛歴ervice@fangjia.com + 鐢靛瓙閭锛歡ujia@fangjia.com
    diff --git a/projects/fangjia-coresite/src/main/webapp/xingshang/regist.ftl b/projects/fangjia-coresite/src/main/webapp/xingshang/regist.ftl index 6b9a97c2f..a2c4ee406 100644 --- a/projects/fangjia-coresite/src/main/webapp/xingshang/regist.ftl +++ b/projects/fangjia-coresite/src/main/webapp/xingshang/regist.ftl @@ -123,7 +123,7 @@ 鐑棬鍝佺墝

    - - + + diff --git a/projects/fangjia-open/src/main/webapp/news/index.ftl b/projects/fangjia-open/src/main/webapp/news/index.ftl index bdf1d0eef..cc402fa34 100644 --- a/projects/fangjia-open/src/main/webapp/news/index.ftl +++ b/projects/fangjia-open/src/main/webapp/news/index.ftl @@ -59,8 +59,8 @@ - - + + - + + diff --git a/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl b/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl new file mode 100644 index 000000000..11b6bd390 --- /dev/null +++ b/projects/fangjia-open/src/main/webapp/user/bhydLoginPage.ftl @@ -0,0 +1,252 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + + +鎴挎姷浜戜及 + + + + + + + + + + + + + +
    +
    + +
    +
    + + + + + + + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/user/productAndService.ftl b/projects/fangjia-open/src/main/webapp/user/productAndService.ftl index 8b925e447..70463a027 100644 --- a/projects/fangjia-open/src/main/webapp/user/productAndService.ftl +++ b/projects/fangjia-open/src/main/webapp/user/productAndService.ftl @@ -13,7 +13,7 @@ - + @@ -189,8 +189,8 @@ - - + + diff --git a/projects/fangjia-open/src/main/webapp/user/reqBindMobilePage.ftl b/projects/fangjia-open/src/main/webapp/user/reqBindMobilePage.ftl index 9b364067b..fc647543a 100644 --- a/projects/fangjia-open/src/main/webapp/user/reqBindMobilePage.ftl +++ b/projects/fangjia-open/src/main/webapp/user/reqBindMobilePage.ftl @@ -11,7 +11,7 @@ - + @@ -54,8 +54,8 @@ - - + + - + + + + + + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/user/showData.ftl b/projects/fangjia-open/src/main/webapp/user/showData.ftl index 681a2f8cf..8df8ec10d 100644 --- a/projects/fangjia-open/src/main/webapp/user/showData.ftl +++ b/projects/fangjia-open/src/main/webapp/user/showData.ftl @@ -13,7 +13,7 @@ - + diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl new file mode 100644 index 000000000..0604782cd --- /dev/null +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl @@ -0,0 +1,269 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + + 鎴夸骇璇勪及 + + + + + + + + + + + + +
    +
    +
    +
    +
    + + + + + +<#-- --> +<#-- --> +<#-- --> +<#-- --> + + +
      +
    • +
      +
      +
      灏忓尯锛�${district.name}
      +
      +
      +
    • + +
    • +
      + +
      +
      +
      鍦板潃锛�
      + +

      璇烽�夋嫨鍦板潃

      +
      +
      +
      锛堝繀濉」锛�
      +
      +
    • + +
    • +
      +
      +
      骞㈠彿锛�
      +
      + +
      +
      鍙�
      +
      +
      锛堝繀濉」锛�
      +
      +
    • + +
    • +
      +
      +
      瀹ゅ彿鎴栭儴浣嶏細
      +
      + +
      +
      瀹�
      +
      +
      锛堝繀濉」锛�
      +
      +
    • + +
    • +
      + +
      +
      +
      鎴垮眿绫诲瀷锛�
      + +

      璇烽�夋嫨寤虹瓚绫诲瀷

      +
      +
      +
      锛堝繀濉」锛�
      +
      +
    • + +
    • +
      +
      +
      鎵�鍦ㄦゼ灞傦細
      +
      + + +
      +
      +
      锛堝繀濉」锛�
      +
      +
    • +
    • +
      +
      +
      鎬绘ゼ灞傦細
      +
      + +
      +
      +
      锛堝繀濉」锛�
      +
      +
    • +
    • +
      +
      +
      浜ц瘉寤虹瓚闈㈢Н锛�
      +
      + +
      +
      +
      锛堝繀濉」锛�
      +
      +
    • + +
    • +
      +
      +
      鍦颁笅寤虹瓚闈㈢Н锛�
      +
      + +
      +
      +
      +
    • +
    • +
      +
      +
      绔e伐鏃ユ湡锛�
      +
      + +
      +
      +
      锛堝繀濉」锛�
      +
      +
    • + +
    • +
      +
      +
      鎴垮眿鐢ㄩ�旓細
      +
      + +
      +
      +
      +
    • + +
    + +
    +
    +

    璇勪及

    +
    + +
    +
    + <#include '/layout/footer.ftl'/> + + + + + + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhhistory.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhhistory.ftl new file mode 100644 index 000000000..f8284dd3c --- /dev/null +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhhistory.ftl @@ -0,0 +1,177 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + + 浼颁环璁板綍 + + + + + + + + + + + +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    +
    +
    +<#include '/layout/footer.ftl'/> + + + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl new file mode 100644 index 000000000..cebefe884 --- /dev/null +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl @@ -0,0 +1,582 @@ +<#ftl attributes={"content_type":"text/html; charset=UTF-8"}> +<#compress> + + + + + +璇勪及缁撴灉 + + + + + + + + + + + + +
    +
    +
    + +
    +
    +

    ${fjtEvaluation.districtName!}

    +

    ${fjtEvaluation.address!} <#if fjtEvaluation.houseNum?? && fjtEvaluation.houseNum?contains("鍙�")>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}鍙�${fjtEvaluation.roomNum!}瀹� 閲嶆柊璇勪及 >

    +

    *璇风‘璁や笌浜ц瘉鍦板潃涓�鑷�

    + + <#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.auditStatus!=0> +

    璇勪及鎬讳环锛�<#if fjtEvaluation??> + ${(bohaiEvaluationAudit.inquirePrice/10000)?int} 涓囧厓

    +

    璇勪及鍗曚环锛�<#if bohaiEvaluationAudit.inquirePrice gt 0>${(bohaiEvaluationAudit.inquirePrice/fjtEvaluation.houseArea)?int} 鍏�/骞崇背

    + <#if role?? && role==17 && loanInfoMap??> +

    鎵�灞炲垎绫伙細${loanInfoMap.type!}绫�

    +

    鍙捶鎴愭暟锛�${loanInfoMap.loan_ratio!}鎴�

    +

    鍙捶閲戦锛�${(fjtEvaluation.totalPrice*loanInfoMap.loan_ratio*0.1/10000)?string('0.##')}涓囧厓

    +

    璐锋鍒╃巼锛�4.5%

    + + <#else> +

    璇ヨ瘎浼扮粨鏋滈渶浜哄伐瀹℃牳锛岃鑰愬績绛夊緟锛�30鍒嗛挓鍚庡彲鍦ㄤ及浠疯褰曚腑鏌ョ湅浜哄伐瀹℃牳缁撴灉锛�

    + +
    + +
    + + + + <#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.auditStatus!=0> + <#if role?? && (role==12 || role==16 || role==17)> + + <#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.inquireRemark?? && bohaiEvaluationAudit.inquireRemark?length gt 0> +
    +
    + 璇勪及璇存槑锛�${bohaiEvaluationAudit.inquireRemark!} +
    +
    + + + <#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.lastPrice??> +
    +
    + 瀹℃牳浠凤細${(bohaiEvaluationAudit.lastPrice!/10000)?int} 涓囧厓
    + 鏈熸湜浠凤細${(bohaiEvaluationAudit.hopePrice!/10000)?int} 涓囧厓 +
    +
    + <#else> + <#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.hopePrice??> +
    +
    + 鏈熸湜浠凤細${(bohaiEvaluationAudit.hopePrice!/10000)?int} 涓囧厓 + 鍒锋柊 +
    +
    + <#else> +
    +
    + 鏈熸湜浠凤細 +  涓囧厓 + 鎻愪氦 + 鍒锋柊 +
    +
    + + +
    +
    + 瀹℃牳浠凤細 涓囧厓
    + +
    +
    + + + + +
    +
    + 涓昏捶浜猴細 + <#if fjtEvaluation.lender??>${fjtEvaluation.lender!} + + + <#if fjtEvaluation.lender??>淇敼<#else>鎻愪氦 +
    +
    + 娉細濡傞渶涓嬭浇璇勪及鎶ュ憡锛屼富璐蜂汉涓哄繀濉」 +
    +
    + + +
    +
    + 澶�    娉細 + <#if bohaiEvaluationAudit.remark??>${bohaiEvaluationAudit.remark!} + + <#if bohaiEvaluationAudit.remark??>淇敼<#else>鎻愪氦 +
    +
    + 娉細濡傛埧灞嬫湁鐗规畩鎯呭喌锛岃濉啓澶囨敞淇℃伅 +
    +
    + + +
    + + +
    + <#if reportFileMap??> +
    + 宸蹭笂浼犳枃浠讹細 + <#if reportFileMap["1"]??>璇环鍗�(${reportFileMap["1"]?size}) + <#if reportFileMap["2"]??> + <#if reportFileMap["3"]??> + <#if reportFileMap["4"]??> +
    + + + +
    + 鏂囦欢绫诲瀷锛� + +

    璇烽�夋嫨绫诲瀷

    +
    +
    + 涓婁紶鏂囦欢锛� + 涓婁紶 + +
    +
    + 娉細濡傞渶涓嬭浇璇勪及鎶ュ憡锛屼骇璇佷负蹇呭~椤� + 鎴垮眿鐓х墖涓婁紶瑕佹眰锛氬皬鍖哄叆鍙�1寮狅紝灏忓尯鐜1寮狅紝闂ㄧ墝鍙�1寮狅紝澶栫珛闈�1寮狅紝瀹ゅ唴鐓х墖2寮� +
    +
    +
    + + +
    +
    鎴夸骇鍩烘湰淇℃伅
    +
    +
    +

    <#if fjtEvaluation.houseNum??>${fjtEvaluation.houseNum!}<#else>-鍙�<#if fjtEvaluation.unitNum?? && fjtEvaluation.unitNum?length gt 0>${fjtEvaluation.unitNum!}鍗曞厓<#if fjtEvaluation.roomNum??>${fjtEvaluation.roomNum!}<#else>-瀹�

    +

    <#if fjtEvaluation.houseRoom??>${fjtEvaluation.houseRoom!}<#else>-瀹�<#if fjtEvaluation.houseHall??>${fjtEvaluation.houseHall!}<#else>-鍘�

    +

    + + + <#if fjtEvaluation.buildType?? && fjtEvaluation.buildType gte 4 && fjtEvaluation.buildType lte 7 > + ${fjtEvaluation.floorDesc!} + <#else> + <#if fjtEvaluation.houseFloor??>${fjtEvaluation.houseFloor!}<#else>- + + +

    +

    + <#if fjtEvaluation.direction! == 3> + 鍗� + <#elseif fjtEvaluation.direction! == 10> + 鍗楀寳 + <#elseif fjtEvaluation.direction! == 2> + 涓滃崡 + <#elseif fjtEvaluation.direction! == 1> + 瑗垮崡 + <#elseif fjtEvaluation.direction! == 4> + 瑗垮寳 + <#elseif fjtEvaluation.direction! == 5> + 涓滃寳 + <#elseif fjtEvaluation.direction! == 6> + 涓� + <#elseif fjtEvaluation.direction! == 7> + 瑗� + <#elseif fjtEvaluation.direction! == 8> + 鍖� + <#elseif fjtEvaluation.direction! == 9> + 涓滆タ + <#else> + - + +

    +

    <#if fjtEvaluation.carSiteNum??>${fjtEvaluation.carSiteNum!}<#else>-

    + <#if fjtEvaluation.city! == "涓婃捣"> +

    ${fjtEvaluation.loopLine!}

    + + + <#if role?? && role==16> +

    + + + <#if fjtEvaluation.buyYear! == 1> + 鏄� + <#elseif fjtEvaluation.buyYear! == 2> + 鍚� + <#else> + - + + +

    + +

    + + + ${fjtEvaluation.registerPrice!?string('0.##')} 鍏� + +

    + +
    +
    +

    ${fjtEvaluation.houseArea!?string('0.##')} 骞崇背

    +

    + + <#if evaluation?? && (fjtEvaluation.buildType)! == 3> + 浣忓畢 + <#elseif fjtEvaluation.buildType! == 8> + 鍏瘬 + <#elseif fjtEvaluation.buildType! == 4> + 鐙珛鍒 + <#elseif fjtEvaluation.buildType! == 5> + 鍙屾嫾鍒 + <#elseif fjtEvaluation.buildType! == 6> + 鑱旀帓鍒 + <#elseif fjtEvaluation.buildType! == 7> + 鍙犲姞鍒 + <#else> + - + +

    +

    <#if fjtEvaluation.houseHight??>${fjtEvaluation.houseHight!}<#else>-

    +

    + <#if fjtEvaluation.fitment! == 1> + 姣涘澂 + <#elseif fjtEvaluation.fitment! == 2> + 鏅�氳淇� + <#elseif fjtEvaluation.fitment! == 4> + 绮捐淇� + <#elseif fjtEvaluation.fitment! == 5> + 璞崕瑁呬慨 + <#elseif fjtEvaluation.fitment! == 0> + 寮�鍙戝晢瑁呬慨 + <#else> + - + +

    +

    -

    + <#if role?? && role==16> +

    + + + <#if fjtEvaluation.onlyOne! == 1> + 鏄� + <#elseif fjtEvaluation.onlyOne! == 2> + 鍚� + <#else> + - + + +

    + +
    +
    +

    + + <#if fjtEvaluation.insidepos! == 1> + 绂诲皬鍖哄嚭鍙h繎 + <#elseif fjtEvaluation.insidepos! == 2> + 绂诲皬鍖哄嚭鍙h繙 + <#elseif fjtEvaluation.insidepos! == 3> + 绂诲皬鍖哄嚭鍙i�備腑 + <#else> + - + + +

    + +

    + + + <#if fjtEvaluation.lightingVentilation! == 1> + 鏃犳殫鎴�/鍗楀寳閫氶 + <#elseif fjtEvaluation.lightingVentilation! == 2> + 鍗楀寳閫氶 + <#elseif fjtEvaluation.lightingVentilation! == 3> + 涓�鑸� + <#elseif fjtEvaluation.lightingVentilation! == 4> + 宸� + <#else> + - + + +

    + +

    + + + <#if fjtEvaluation.sideset! == 1> + 闈炶竟濂� + <#elseif fjtEvaluation.sideset! == 2> + 杈瑰涓嶅甫绐� + <#elseif fjtEvaluation.sideset! == 3> + 杈瑰甯︾獥 + <#else> + - + + +

    +

    <#if fjtEvaluation.gardenArea??>${fjtEvaluation.gardenArea!?string('0.##')}骞崇背<#else>-

    +

    <#if fjtEvaluation.outerArea??>${fjtEvaluation.outerArea!?string('0.##')}骞崇背<#else>-

    +

    <#if fjtEvaluation.carSiteArea??>${fjtEvaluation.carSiteArea!?string('0.##')}骞崇背<#else>-

    + <#if fjtEvaluation.city! == "涓婃捣"> +

    ${fjtEvaluation.loopLine!}

    + +
    +
    +

    + + + <#if fjtEvaluation.sight! == 1> + 鏅鎴� + <#elseif fjtEvaluation.sight! == 2> + 渚ф櫙瑙傛埧 + <#elseif fjtEvaluation.sight! == 3> + 涓�鑸� + <#elseif fjtEvaluation.sight! == 4> + 宸� + <#else> + - + + +

    +

    + + + <#if fjtEvaluation.noise! == 1> + 鏃犲櫔闊� + <#elseif fjtEvaluation.noise! == 2> + 鍣煶杈冨皬 + <#elseif fjtEvaluation.noise! == 3> + 鍣煶杈冨ぇ + <#else> + - + + +

    + +

    + + + <#if fjtEvaluation.worryFacility! == 1> + 寰堣繎 + <#elseif fjtEvaluation.worryFacility! == 2> + 杈冭繎 + <#elseif fjtEvaluation.worryFacility! == 3> + 杈冭繙 + <#else> + - + + +

    +

    <#if fjtEvaluation.basementArea??&&(fjtEvaluation.basementArea!>0)>${fjtEvaluation.basementArea!?string('0.##')}骞崇背<#else>-

    +

    <#if fjtEvaluation.basementArea??&&(fjtEvaluation.atticArea!>0)>${fjtEvaluation.atticArea!?string('0.##')}骞崇背<#else>-

    +

    + + + <#if fjtEvaluation.carport! == 1> + 宸茬 + <#elseif fjtEvaluation.carport! == 3> + 宸茶喘 + <#elseif fjtEvaluation.carport! == 2> + 鏆傛棤 + <#else> + - + + +

    +
    +
    +
    鍏ㄩ儴淇℃伅
    +
    绮剧畝淇℃伅
    +
    +<#--
    --> +<#--
    鍧囦环瀵规瘮
    --> +<#--
    --> +<#--
    --> +<#--
    --> +<#--
    --> + <#--
    +
    鎴愪氦鍙傝�冩暟鎹�
    +
    +

     鍏�/骞崇背

    +

     鍏�/骞崇背

    +
    +
    --> +
    +
    鍚岀被鍨嬫埧婧愭寕鐗屼环鏍煎弬鑰�
    +
    +
    + +
    +
    +
    + + <#if bohaiEvaluationAudit?? && fjtEvaluation.lender?? && bohaiEvaluationAudit.auditStatus!=0 && reportFileMap?? && reportFileMap["2"]??> + + + +
    +

    +
    +
    +
    +
    + + +<#include '/layout/footer.ftl'/> + + + + + + + + + \ No newline at end of file diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/collects.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/collects.ftl index 21af3c0cf..37c1f9bd6 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/collects.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/collects.ftl @@ -11,7 +11,7 @@ - + diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/form.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/form.ftl index dd55bcd41..1f48d1dc5 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/form.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/form.ftl @@ -11,7 +11,7 @@ - +