+1
-19
@@ -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);
|
||||
|
||||
@@ -94,6 +94,34 @@
|
||||
} else {
|
||||
html += ("<em>" + this.zsj + "</em> 万元</span></p><p><label>报告收费:</label><span>" + (this.bgsf!=null?this.bgsf+" 元":'-') + "</span></p></div></div></div>");
|
||||
}
|
||||
}else if(data.role==17) {
|
||||
html += "<div class='topic topic01' onclick='showDetail("+this.eid+", this)'><div class='topicContent topicContent01'><div class='left'><p><label>下载日期:</label><span>" + this.xzrq +
|
||||
"</span></p><p><label>地址:</label><span>" + address + "</span></p><p><label>主贷人:</label><span>" + this.zdr + "</span></p><p><label>面积:</label><span>" + this.mj;
|
||||
if (this.mj == "-") {
|
||||
html += "</span></p></div><div class='right'><p><label>总价:</label><span>" + this.zj;
|
||||
} else {
|
||||
if (this.zsj == "-") {
|
||||
html += " 平米</span></p></div><div class='right'><p><label>总价:</label><span><em>" + this.zj + "</em>";
|
||||
} else {
|
||||
html += " 平米</span></p></div><div class='right'><p><label>总价:</label><span>" + this.zj;
|
||||
}
|
||||
}
|
||||
if (this.zj == "-") {
|
||||
html += "</span></p><p><label>参考价:</label><span>" + this.ckj;
|
||||
} else {
|
||||
html += " 万元</span></p><p><label>参考价:</label><span>" + this.ckj;
|
||||
}
|
||||
if (this.ckj == "-") {
|
||||
html += "</span></p><p><label>终审价:</label><span>";
|
||||
} else {
|
||||
html += " 万元</span></p><p><label>终审价:</label><span>";
|
||||
}
|
||||
if (this.zsj == "-") {
|
||||
html += ("-</span></p></div></div></div>");
|
||||
|
||||
} else {
|
||||
html += ("<em>" + this.zsj + "</em> 万元</span></p></div></div></div>");
|
||||
}
|
||||
} else {
|
||||
html += "<div class='topic topic01'><div class='topicContent topicContent01'><div class='left'><p><label>下载日期:</label><span>" + this.xzrq +
|
||||
"</span></p><p><label>地址:</label><span>" + address + "</span></p></div><div class='right'><p><label>总价:</label><span>";
|
||||
@@ -111,6 +139,13 @@
|
||||
});
|
||||
|
||||
$('.infinite-scroll-bottom .list-container').append(html);
|
||||
|
||||
if(data['result'].length<itemsPerLoad){
|
||||
// 加载完毕,则注销无限加载事件,以防不必要的加载
|
||||
$.detachInfiniteScroll($('.infinite-scroll'));
|
||||
// 删除加载提示符
|
||||
$('.infinite-scroll-preloader').remove();
|
||||
}
|
||||
}, "json");
|
||||
// 添加新条目
|
||||
}
|
||||
|
||||
@@ -48,10 +48,17 @@
|
||||
function addItems(number, lastIndex) {
|
||||
var page = lastIndex / 10 + 1;
|
||||
$.post(url, "page="+page, function(data){
|
||||
//返回为空,代表加载完毕
|
||||
if(data['result']==null || data['result'].length==0) {
|
||||
// 加载完毕,则注销无限加载事件,以防不必要的加载
|
||||
$.detachInfiniteScroll($('.infinite-scroll'));
|
||||
// 删除加载提示符
|
||||
$('.infinite-scroll-preloader').remove();
|
||||
return;
|
||||
}
|
||||
// 生成新条目的HTML
|
||||
var html = '';
|
||||
$.each(data['result'], function(i){
|
||||
|
||||
var address = this.dz;
|
||||
var fontColor = "";
|
||||
if(this.hn){
|
||||
@@ -64,7 +71,7 @@
|
||||
fontColor = "background-color:#F3F3F3;"
|
||||
}
|
||||
|
||||
if(data.role == 12) {
|
||||
if(data.role == 12 || data.role == 17) {
|
||||
html += "<div class='topic topic01' onclick='showDetail("+this.eid+", this)'><div class='topicContent topicContent01' style='"+fontColor+"'><div class='left'><p><label>评估日期:</label><span>" + this.pgrq + "</span></p>" +
|
||||
"<p><label>核价日期:</label><span>" + this.tjrq + "</span></p><p><label>地址:</label><span>" + address + "</span></p><p><label>物业类型:</label><span>" + this.wylx +
|
||||
"</span></p><p><label>面积:</label><span>" + this.mj;
|
||||
@@ -110,6 +117,13 @@
|
||||
});
|
||||
|
||||
$('.infinite-scroll-bottom .list-container').append(html);
|
||||
|
||||
if(data['result'].length<itemsPerLoad){
|
||||
// 加载完毕,则注销无限加载事件,以防不必要的加载
|
||||
$.detachInfiniteScroll($('.infinite-scroll'));
|
||||
// 删除加载提示符
|
||||
$('.infinite-scroll-preloader').remove();
|
||||
}
|
||||
}, "json");
|
||||
// 添加新条目
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user