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/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-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/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�文洋大厦B座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..39fee4100 100644
--- a/projects/fangjia-coresite/src/main/webapp/company/about.ftl
+++ b/projects/fangjia-coresite/src/main/webapp/company/about.ftl
@@ -77,15 +77,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 +130,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
上海找房å�,估房价,百度 房价网
- 电å�邮箱:service@fangjia.com
+ 电å�邮箱:gujia@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 电å�邮箱:service@fangjia.com
+
客æœ�çƒçº¿ï¼š4001883787 电å�邮箱:gujia@fangjia.com
©2006-${now?string("yyyy")} 房价网 版æ�ƒæ‰€æœ‰ 沪ICP备10203734å�·-1
"><#if (!serverAreaMap?exists && actionName == 'index')>${cityName}#if>找房å�,">估房价,百度 房价网
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
|
- 客�邮箱
+ 客�邮箱
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
上海找房å�,估房价,百度 房价网
- 电å�邮箱:service@fangjia.com
+ 电å�邮箱:gujia@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
上海找房å�,估房价,百度 房价网
- 电å�邮箱:service@fangjia.com
+ 电å�邮箱:gujia@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
上海找房å�,估房价,百度 房价网
- 电å�邮箱:service@fangjia.com
+ 电å�邮箱:gujia@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
上海找房å�,估房价,百度 房价网
- 电å�邮箱:service@fangjia.com
+ 电å�邮箱:gujia@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
上海找房å�,估房价,百度 房价网
- 电å�邮箱:service@fangjia.com
+ 电å�邮箱:gujia@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
上海找房å�,估房价,百度 房价网
- 电å�邮箱:service@fangjia.com
+ 电å�邮箱:gujia@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 @@
@@ -110,7 +110,7 @@
您�通过在线方��系专业顾问,他们将�常��为您�供更多�务。
-
立�咨询
+
立�咨询
@@ -128,9 +128,134 @@
+
+ <#--
申请贷款
-->
+
+
+
<#include "/header/v5/_footer.ftl"/>
+