diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 0666237..b75d3ca 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -777,6 +777,15 @@ input::-webkit-input-placeholder{ .topic .topicContent .topicContent_center.home div .icon.icon-home03{background:url(../images/icon-home03.png) no-repeat center center;background-size:100%;} .topic .topicContent .topicContent_center.home div .icon.icon-home04{background:url(../images/icon-home04.png) no-repeat center center;background-size:100%;} +.topic .topicContent .topicContent_center.home div .icon.icon-personal01{background:url(../images/icon-personal01.png) no-repeat center center;background-size:100%;} +.topic .topicContent .topicContent_center.home div .icon.icon-personal02{background:url(../images/icon-personal02.png) no-repeat center center;background-size:100%;} +.topic .topicContent .topicContent_center.home div .icon.icon-personal03{background:url(../images/icon-personal03.png) no-repeat center center;background-size:100%;} +.topic .topicContent .topicContent_center.home div .icon.icon-personal04{background:url(../images/icon-personal04.png) no-repeat center center;background-size:100%;} + +.topic .topicContent .topicContent_center.home div .icon.icon-evaluation01{background:url(../images/icon-evaluation01.png) no-repeat center center;background-size:100%;} +.topic .topicContent .topicContent_center.home div .icon.icon-evaluation02{background:url(../images/icon-evaluation02.png) no-repeat center center;background-size:100%;} +.topic .topicContent .topicContent_center.home div .icon.icon-evaluation03{background:url(../images/icon-evaluation03.png) no-repeat center center;background-size:100%;} + .topic .topicContent .topicContent_center01 div{width:29.333333333333332%;background:#fbfbfb;border:solid 1px #eee;border-radius:0.2rem;padding:0.3rem 0;} .topic .topicContent .topicContent_center01 div:first-child{border-left:solid 1px #eee;} .topic .topicContent .topicContent_center01 div em{display:block;color:#EB5F34;font-size:0.75rem;} @@ -1003,7 +1012,7 @@ input::-webkit-input-placeholder{ .icon-house01{width:50px;height:80px;background:url(../images/icon-house01.png) no-repeat center center;background-size:100%;position:absolute;left:58%;bottom:50%;z-index:10500;} /* 我的 */ -.iconBox{width:100%;overflow:hidden;padding:0.5rem 0;} +/*.iconBox{width:100%;overflow:hidden;padding:0.5rem 0;} .iconBox a{float:right;margin-right:0.75rem;} .icon-message{width:20px;height:20px;background:url(../images/icon-message.png) no-repeat center center;background-size:100%;position:relative;} .icon-message-new{width:7px;height:7px;background:url(../images/icon-message-new.png) no-repeat center center;background-size:100%;position:absolute;top:1px;right:-3px;} @@ -1019,7 +1028,25 @@ input::-webkit-input-placeholder{ .topBg01 a{color:#fff;text-decoration:underline;} .topBg01 img{float:left;width:20%;margin-right:0.5rem;} .topBg01 p{float:left;margin:0;margin-top:0.2rem;} -.topBg01 .icon-right{position:absolute;right:0.6rem;top:2.1rem;} +.topBg01 .icon-right{position:absolute;right:0.6rem;top:2.1rem;}*/ + +/* 我的 */ +.icon-message{width:20px;height:20px;background:url(../images/icon-message.png) no-repeat center center;background-size:100%;position:relative;} +.icon-message-new{width:7px;height:7px;background:url(../images/icon-message-new.png) no-repeat center center;background-size:100%;position:absolute;top:1px;right:-3px;} +.icon-set{width:20px;height:20px;background:url(../images/icon-set.png) no-repeat center center;background-size:100%;} +.icon-message01{width:24px;height:24px;background:url(../images/icon-message01.png) no-repeat center center;background-size:85%;margin-top:-2.2rem;} +.message01-new .icon-message01{width:24px;height:16px;background:url(../images/icon-message01-new.png) no-repeat center center;background-size:100%;margin-top:-2.5rem;} +.list-block .message01 .item-title{white-space:normal;text-overflow:-o-ellipsis-lastline;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;color:#666;} +.list-block .message01-new .item-title{color:#333;font-weight:bold;} +.list-block .message01 .item-subtitle{margin-top:0.5rem;} +.contentText{background:#fff;} + +.topBg01{width:100%;background:url(../images/topBg.png) no-repeat center top;background-size:100%;border-bottom:solid 1px #e7e7e7;padding:1.2rem 0.75rem;padding-bottom:0;color:#fff;overflow:hidden;position:relative;} +.topBg01 img{width:3rem;height:3rem;margin:0 auto;margin-top:0.6rem;} +.topBg01 p{font-size:0.7rem;color:#333;text-align:center;margin-top:0.6rem;} +.topBg01 p .button{width:4rem;margin:0 auto;} + +.tabs .noData img{width:30%;margin:0 auto;margin-top:3rem;} /* 出错页面 */ .contentError{padding-top:30%;background:none;} diff --git a/fangija-zsyf/images/exchange-step01.png b/fangija-zsyf/images/exchange-step01.png index 8bec048..d095219 100644 Binary files a/fangija-zsyf/images/exchange-step01.png and b/fangija-zsyf/images/exchange-step01.png differ diff --git a/fangija-zsyf/images/exchange-step02.png b/fangija-zsyf/images/exchange-step02.png index 629cd73..c2c9885 100644 Binary files a/fangija-zsyf/images/exchange-step02.png and b/fangija-zsyf/images/exchange-step02.png differ diff --git a/fangija-zsyf/images/headPortrait.png b/fangija-zsyf/images/headPortrait.png index f1ce268..dc1ea89 100644 Binary files a/fangija-zsyf/images/headPortrait.png and b/fangija-zsyf/images/headPortrait.png differ diff --git a/fangija-zsyf/images/icon-houseLevel.png b/fangija-zsyf/images/icon-houseLevel.png new file mode 100644 index 0000000..8d3b802 Binary files /dev/null and b/fangija-zsyf/images/icon-houseLevel.png differ diff --git a/fangija-zsyf/images/icon-personal01.png b/fangija-zsyf/images/icon-personal01.png new file mode 100644 index 0000000..6f44a0a Binary files /dev/null and b/fangija-zsyf/images/icon-personal01.png differ diff --git a/fangija-zsyf/images/icon-personal02.png b/fangija-zsyf/images/icon-personal02.png new file mode 100644 index 0000000..cb048e4 Binary files /dev/null and b/fangija-zsyf/images/icon-personal02.png differ diff --git a/fangija-zsyf/images/icon-personal03.png b/fangija-zsyf/images/icon-personal03.png new file mode 100644 index 0000000..7d12a9c Binary files /dev/null and b/fangija-zsyf/images/icon-personal03.png differ diff --git a/fangija-zsyf/images/icon-personal04.png b/fangija-zsyf/images/icon-personal04.png new file mode 100644 index 0000000..7527eac Binary files /dev/null and b/fangija-zsyf/images/icon-personal04.png differ diff --git a/fangija-zsyf/images/icon-set.png b/fangija-zsyf/images/icon-set.png index 4e1d0c0..990a27a 100644 Binary files a/fangija-zsyf/images/icon-set.png and b/fangija-zsyf/images/icon-set.png differ diff --git a/fangija-zsyf/images/rankingImg01.png b/fangija-zsyf/images/rankingImg01.png new file mode 100644 index 0000000..c2e766b Binary files /dev/null and b/fangija-zsyf/images/rankingImg01.png differ diff --git a/fangija-zsyf/images/rankingImg02.png b/fangija-zsyf/images/rankingImg02.png new file mode 100644 index 0000000..f54f39f Binary files /dev/null and b/fangija-zsyf/images/rankingImg02.png differ diff --git a/fangija-zsyf/images/rankingImg03.png b/fangija-zsyf/images/rankingImg03.png new file mode 100644 index 0000000..c1eb6f7 Binary files /dev/null and b/fangija-zsyf/images/rankingImg03.png differ diff --git a/fangija-zsyf/images/topBg.png b/fangija-zsyf/images/topBg.png index d561d06..c5a8a99 100644 Binary files a/fangija-zsyf/images/topBg.png and b/fangija-zsyf/images/topBg.png differ diff --git a/fangija-zsyf/js/login/codeSms.js b/fangija-zsyf/js/login/codeSms.js index 7fccf62..a658db0 100644 --- a/fangija-zsyf/js/login/codeSms.js +++ b/fangija-zsyf/js/login/codeSms.js @@ -75,10 +75,18 @@ $("#login_btn").on("click", function () { var resData = response.data; if (resData.status) { // 用户登录成功的TOKEN - var token = resData.data; - localStorage.setItem("user_token", token); + var data = resData.data; + localStorage.setItem("user_token", data.token); $.toast(resData.message); - back(); + if (data.firstLogin) { + // 显示设置密码页面 + clicked('../user/updatePass.html',true,false,{},{},function(){ + back(); + }) + } else { + back(); + } + } else { $.toast(resData.message); } diff --git a/fangija-zsyf/js/login/thirdLogin.js b/fangija-zsyf/js/login/thirdLogin.js index 9f94671..689d42b 100644 --- a/fangija-zsyf/js/login/thirdLogin.js +++ b/fangija-zsyf/js/login/thirdLogin.js @@ -48,74 +48,48 @@ function userinfo(a){ var accessToken = a.authResult.access_token; var unionid = a.userInfo.unionid; var headImg = a.userInfo.headimgurl; - wxLogin(openid,unionid,accessToken,nickname,headImg,"weixin") + login(openid, unionid, accessToken, nickname, headImg, "weixin", "/rest/user/wxLogin") }else if(a.id=='qq'){ - var nickname=a.userInfo.nickname; + var nickname= a.userInfo.nickname; var openid = a.authResult.openid; var accessToken = a.authResult.access_token; var headImg = a.userInfo.headimgurl; - qqLogin(openid,accessToken,nickname,headImg,"qq") + var unionid = ""; + login(openid, unionid, accessToken, nickname, headImg, "qq", "/rest/user/qqLogin") }else{ //微博信息获取 - var nickname=a.userInfo.name||a.userInfo.screen_name; - var openid = a.authResult.openid; + var nickname = a.userInfo.name||a.userInfo.screen_name; + var openid = a.authResult.uid; var accessToken = a.authResult.access_token; - var headImg = a.userInfo.profile_image_url; - var uid = a.authResult.uid - weiboLogin(openid,accessToken,nickname,headImg,"sinaweibo") + var headImg = a.userInfo.headimgurl; + var uid = a.authResult.uid; + var unionid = ""; + login(openid, unionid, accessToken, nickname, headImg, "sinaweibo", "/rest/user/sinaweiboLogin") } },function(e){ - $.toast("获取微信用户信息失败:["+e.code+"]:"+e.message); + $.toast("获取用户信息失败:["+e.code+"]:"+e.message); }); } -function wxLogin(openid, unionid, accessToken, nickname, headImg,loginFrom) { - axios.post("/rest/user/wxLogin", {loginFrom:loginFrom,openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg}) +function login(openid, unionid, accessToken, nickname, headImg, loginFrom, uri) { + axios.post(uri, {loginFrom:loginFrom,openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg}) .then(function (response) { $.hidePreloader(); - if(response.data.status){ - if("no"==response.data.message){ + var resData = response.data; + if(resData.status){ + if(resData.data == ""){ //跳转绑定手机号码页面 - console.log(response.data.message) + clicked('../user/bindingMobile.html',true,false,{},{loginFrom:loginFrom,openid:openid, unionid:unionid, accessToken: accessToken, nickname:nickname,headImg:headImg},function(){ + back(); + }) }else{ - + localStorage.setItem("user_token", resData.data); + back(); } }else{ //登录失败 - $.toast(response.data.data) - } - }) -} -function qqLogin(openid, accessToken, nickname, headImg,loginFrom) { - axios.post("/rest/user/qqLogin", {loginFrom:loginFrom,openid:openid, accessToken: accessToken, nickname:nickname,headImg:headImg}) - .then(function (response) { - $.hidePreloader(); - if(response.data.status){ - if("no"==response.data.message){ - //跳转绑定手机号码页面 - }else{ - - } - }else{ - //登录失败 - $.toast(response.data.data) - } - }) -} -function weiboLogin(openid, accessToken, nickname, headImg,loginFrom) { - axios.post("/rest/user/sinaweiboLogin", {loginFrom:loginFrom,openid:openid, accessToken: accessToken, nickname:nickname,headImg:headImg}) - .then(function (response) { - $.hidePreloader(); - if(response.data.status){ - if("no"==response.data.message){ - //跳转绑定手机号码页面 - }else{ - - } - }else{ - //登录失败 - $.toast(response.data.data) + $.toast(resData.message) } }) } diff --git a/fangija-zsyf/js/user/myFocus.js b/fangija-zsyf/js/user/myFocus.js new file mode 100644 index 0000000..4a3e9ed --- /dev/null +++ b/fangija-zsyf/js/user/myFocus.js @@ -0,0 +1,133 @@ +var tab = new Vue({ + el:"#tab", + data:{ + mf_num:"0" + } +}) + +$("#mf_ul").empty(); +$.init() +//加载flag +var mf_loading = false; +//最多可加载的条目 +var mf_maxItems = 100; +//上次加载的序号小区 +var mf_lastIndex = 0; +//每次加载添加多少条目 +var mf_itemsPerLoad = 8; +var mf_curpage = 1; +var mf_totalCount = 0; +function addEstate(number, lastIndex) { + mf_curpage = mf_lastIndex/mf_itemsPerLoad + 1; + axios.get("/myCollection/loadCollections",{params:{pageSize:mf_itemsPerLoad,page:mf_curpage}}).then(function(response){ + data = response.data; + //data = eval( '(' + data + ')' ); + if(data['results']==null || data['results'].length==0) { + $('#loadTip1').remove(); + $('.infinite-scroll-bottom #tab1').html("

您还没有关注小区

"); + return; + } + mf_totalCount = data.totalCount; + tab.mf_num = mf_totalCount; + // 生成新条目的HTML + var html = ''; + $.each(data['results'], function(i){ + var tag = this.tag; + var tagStr = ""; + if(tag){ + var tags = tag.split("_") + for(var j=0;j'+tag+''; + } + } + } + var starStr = '' + var index = this.index; + if(index==0){ + var starStr = '暂无' + }else{ + var totalHalfStar = Math.round(Math.round(index/5)/2) //总半星 + var starNum = Math.floor(totalHalfStar/2) + var halfStarNum = totalHalfStar%2 + var noneStarNum = 5-starNum-halfStarNum + for(i=0;i'+ + '
'+ + '
'+ + '
'+this.name+'
'+ + '
¥'+(this.avgPrice?this.avgPrice+ '元/㎡':'暂无')+'
'+ + '
'+ + '
'+ + '
'+(this.address?(this.city+this.region+this.address):'')+'
'+ + '
'+(this.distance?"距您"+this.distance+"m":"暂无")+'
'+ + '
'+ + '
'+ + '
潜力指数: '+starStr+'
'+ + '
近30天涨跌幅: '+(this.oneMonthUpDownRange?(this.oneMonthUpDownRange>0?(this.oneMonthUpDownRange+'%'):(this.oneMonthUpDownRange<0?(-this.oneMonthUpDownRange+'%'):this.oneMonthUpDownRange+"%")):"暂无")+'
'+ + '
'+ + '
'+tagStr+'
'+ + '
'+ + ''+ + ''; + }); + // 添加新条目 + $('#mf_ul').append(html); + if(mf_totalCount<=mf_itemsPerLoad){ + // 加载完毕,则注销无限加载事件,以防不必要的加载 + // $.detachInfiniteScroll($('.infinite-scroll')); + // 删除加载提示符 + $('#loadTip1').remove(); + } + }).catch(function(error){ + console.log(error) + }); + console.log(1) +} + +//预先加载8条 +addEstate(mf_itemsPerLoad, 0); + + + +//注册'infinite'事件处理函数 +$(document).on('infinite', '.infinite-scroll',function() { + console.log(1) + if($("#tabList2").hasClass("active")) + { + // 如果正在加载,则退出 + if (mf_loading) return; + // 设置flag + mf_loading = true; + // 模拟1s的加载过程 + setTimeout(function() { + // 重置加载flag + mf_loading = false; + // 更新最后加载的序号 + mf_lastIndex = $('#mf_ul').find('li').length; + if (mf_lastIndex >= mf_totalCount) { + // 加载完毕,则注销无限加载事件,以防不必要的加载 +// $.detachInfiniteScroll($('.infinite-scroll')); + // 删除加载提示符 + $('#loadTip1').remove(); + return; + } + // 添加新条目 + addEstate(mf_itemsPerLoad, $('#mf_ul').find('li').length); + //容器发生改变,如果是js滚动,需要刷新滚动 + // $.refreshScroller(); + }, 1000); + } +}); \ No newline at end of file diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 0b3f569..7706ab5 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -18,12 +18,18 @@ 首页 + 行情 - + + + 评估 + + + 我的 @@ -34,10 +40,10 @@ + + + + diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 5b4492c..032fd64 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -96,7 +96,7 @@
加入"我的房产",随时掌握房产价值变化
- +
@@ -141,6 +141,8 @@ $.config = {router: false} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/myfocus/myFocus.html b/fangija-zsyf/views/myfocus/myFocus.html deleted file mode 100644 index 8d4c530..0000000 --- a/fangija-zsyf/views/myfocus/myFocus.html +++ /dev/null @@ -1,288 +0,0 @@ - - - - - -我的关注 - - - - - - - - - - - - - -
-
-
- - -

我的关注

-
-
-
- 小区 - 城市 -
-
-
-
-
-
-
-
    -
-
- -
-
-
-
-
-
-
-
-
    -
-
- -
-
-
-
-
-
-
-
- <#include "/customMenu.html" /> -
- - - - - - - - - - - - -<#include "/monitor/monitor.html"> - - - \ No newline at end of file diff --git a/fangija-zsyf/views/news/newsCollectList.html b/fangija-zsyf/views/news/newsCollectList.html index 770fecd..553feb1 100644 --- a/fangija-zsyf/views/news/newsCollectList.html +++ b/fangija-zsyf/views/news/newsCollectList.html @@ -10,7 +10,6 @@ - + + + + +
+
+
+ + +
+ +
+
+ + + + + + + + + + + + + + + + + + + \ No newline at end of file