diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java index 5a2c986c7..52b453015 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/UserController.java @@ -247,25 +247,7 @@ public class UserController { } System.out.println("[sid]С³ÌÐò΢ÐÅOPEN_ID£º" + weiXinId); } -// -// if(StringUtils.isBlank(weiXinId) && StringUtils.isNotBlank(model.getCode())){ -// System.out.println("С³ÌÐòcode:"+model.getCode()); -// System.out.println("С³ÌÐòAppId:"+model.getAppId()); -// System.out.println("С³ÌÐòAppSecret:"+model.getAppSecret()); -// WeChatAuthServiceImpl.WeChatWebToken token = weChatAuthService.getWeChatWebToken(model.getCode(), model.getAppId(), model.getAppSecret()); -// if(token != null) { -// weiXinId = token.getOpenid(); -// } else { -// weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); -// } -// if(weiXinId == null) { -// weiXinId = CookieUtils.getCookieValue(request,"we_chat_open_id"); -// } -// if(weiXinId != null && !weiXinId.equals("")){ -// CookieUtils.setCookie("we_chat_open_id", weiXinId, "/", 60 * 60 * 24 *7, response); -// } -// System.out.println("С³ÌÐò΢ÐÅOPEN_ID£º" + weiXinId); -// } + //²âÊÔʱ¿ÉÒÔÏÈȥµô if (StringUtils.isBlank(username) || StringUtils.isBlank(pass) || StringUtils.isBlank(weiXinId)){ resultModel.setMsg(Message.PARAM_NOT_NULL); diff --git a/projects/fangjia-open/src/main/webapp/report/downloadList.ftl b/projects/fangjia-open/src/main/webapp/report/downloadList.ftl index f86fe3a5b..3116f2dab 100644 --- a/projects/fangjia-open/src/main/webapp/report/downloadList.ftl +++ b/projects/fangjia-open/src/main/webapp/report/downloadList.ftl @@ -94,6 +94,34 @@ } else { html += ("" + this.zsj + " 万元

" + (this.bgsf!=null?this.bgsf+" 元":'-') + "

"); } + }else if(data.role==17) { + html += "

" + this.xzrq + + "

" + address + "

" + this.zdr + "

" + this.mj; + if (this.mj == "-") { + html += "

" + this.zj; + } else { + if (this.zsj == "-") { + html += " 平米

" + this.zj + ""; + } else { + html += " 平米

" + this.zj; + } + } + if (this.zj == "-") { + html += "

" + this.ckj; + } else { + html += " 万元

" + this.ckj; + } + if (this.ckj == "-") { + html += "

"; + } else { + html += " 万元

"; + } + if (this.zsj == "-") { + html += ("-

"); + + } else { + html += ("" + this.zsj + " 万元

"); + } } else { html += "

" + this.xzrq + "

" + address + "

"; @@ -111,6 +139,13 @@ }); $('.infinite-scroll-bottom .list-container').append(html); + + if(data['result'].length

" + this.pgrq + "

" + "

" + this.tjrq + "

" + address + "

" + this.wylx + "

" + this.mj; @@ -110,6 +117,13 @@ }); $('.infinite-scroll-bottom .list-container').append(html); + + if(data['result'].length