From bb7347c28905ccb0e49de96d60fb0cf91ac6a0b4 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Tue, 10 Apr 2018 13:02:28 +0800 Subject: [PATCH 01/18] aa --- fangija-zsyf/views/evaluate/evaluateList.html | 7 ++- .../views/evaluate/evaluateReport.html | 2 +- .../views/intelligentHouse/aroundDetail.html | 34 ++++++++-- .../views/intelligentHouse/mapDetail.html | 63 +++++++++++++++---- fangija-zsyf/yfindex.html | 15 +++-- 5 files changed, 98 insertions(+), 23 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index 1fb4c7c..84286cf 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -56,7 +56,7 @@ @@ -232,6 +232,11 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap $(document).ready(function () { selectEvaluateList(); }); + +function openaddWindow(){ + clicked('/views/house/add.html',true,false,{},{}) +} + diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 032fd64..be9d94f 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -28,7 +28,7 @@
-

评估报告

diff --git a/fangija-zsyf/views/intelligentHouse/aroundDetail.html b/fangija-zsyf/views/intelligentHouse/aroundDetail.html index 62b269c..41d1d0f 100644 --- a/fangija-zsyf/views/intelligentHouse/aroundDetail.html +++ b/fangija-zsyf/views/intelligentHouse/aroundDetail.html @@ -144,7 +144,7 @@ $.config = {router: false} + + + + + + + + + + + + + + + + + +var myFocus = new Vue({ + el:"#myFocus" +}) + + \ No newline at end of file diff --git a/fangija-zsyf/views/house/new_file.js b/fangija-zsyf/views/house/new_file.js new file mode 100644 index 0000000..e322e09 --- /dev/null +++ b/fangija-zsyf/views/house/new_file.js @@ -0,0 +1,80 @@ +var myFocusDatas = {myFocusList: []}; +Vue.component('my_focus',{ + template: + '' + , + data:function(){ + return myFocusDatas; + }, + methods:{ + loadMyFocus:function(){ + axios.get("/rest/quotations/userCollectCityInfo", { + params: { + } + }).then(function(response){ + myFocusDatas.myFocusList = response.data.data.results + }).catch(function(error){ + console.log(error) + }) + } + },mounted:function(){ + this.loadMyFocus(); + } + +}) + +//我的关注 +var myFocus = new Vue({ + el:"#myFocus", + data:{ + myfocusList:[{num:1,city:"test1",avgPrice:"123",percent:"",ranking:"1"}, + {num:2,city:"test2",avgPrice:"321",percent:"6.6",ranking:"2"} + ] + } +}) + +//涨幅榜 +var tabCityRanking1 = new Vue({ + el:"tabCityRanking1" +}) + +//潜力绑 +var tabCityRanking2 = new Vue({ + el:"tabCityRanking2" +}) From 141956e0eec7f5ac3cfef1e3044e56ea11624f34 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Tue, 10 Apr 2018 13:37:27 +0800 Subject: [PATCH 06/18] YOUFANG1.1 --- fangija-zsyf/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index c0df150..4b545fd 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -14,7 +14,7 @@ "icons": { "144": "icon.png" }, - "launch_path": "/views/house/houseDetail.html",/*应用的入口页面,默认为根目录下的index.html;支持网络地址,必须以http://或https://开头*/ + "launch_path": "main.html",/*应用的入口页面,默认为根目录下的index.html;支持网络地址,必须以http://或https://开头*/ "developer": { "name": "",/*开发者名称*/ "email": "",/*开发者邮箱地址*/ From 09feba8a75f1990a26aaa58c0e5bda4b5e7857eb Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Tue, 10 Apr 2018 13:54:38 +0800 Subject: [PATCH 07/18] aa --- fangija-zsyf/main.html | 14 +++++++++++--- fangija-zsyf/views/evaluate/evaluateList.html | 4 ++-- fangija-zsyf/views/house/add_noData.html | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index d87198f..3ea3402 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -24,7 +24,7 @@ 行情 - + 评估 @@ -48,12 +48,20 @@ localStorage.removeItem("user_token"); localStorage.removeItem("user_token_add_time"); } - + var evaluateMenu="" + if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { + //没有登录 + evaluateMenu = 'views/house/add_noData.html'; + }else{ + //登录成功 + evaluateMenu = 'views/evaluate/evaluateList.html'; + } + document.getElementById("evaluate").setAttribute("href", evaluateMenu); document.getElementById("quotations").setAttribute("href", BASE_PATH + '/quotations/index'); //document.getElementById("selfInfo").setAttribute("href", BASE_PATH + '/selfInfo/index'); //mui初始化 mui.init(); - var subpages = ['yfindex.html', BASE_PATH + '/quotations/index', 'views/evaluate/evaluateList.html', 'views/user/userInfo.html']; + var subpages = ['yfindex.html', BASE_PATH + '/quotations/index', evaluateMenu, 'views/user/userInfo.html']; var subpage_style = { top: '0', bottom: '50px', diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index 84286cf..7c86037 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -36,9 +36,9 @@
-
diff --git a/fangija-zsyf/views/house/add_noData.html b/fangija-zsyf/views/house/add_noData.html index 4bdcc9b..c5b62fe 100644 --- a/fangija-zsyf/views/house/add_noData.html +++ b/fangija-zsyf/views/house/add_noData.html @@ -20,9 +20,9 @@
-
From e6b94fe98b45eac0f0ed7130ac4624570830df37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Tue, 10 Apr 2018 14:10:23 +0800 Subject: [PATCH 08/18] add --- fangija-zsyf/views/house/houseDetail.html | 16 ++++++++------- fangija-zsyf/views/house/new_file.js | 24 +++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 40fe97a..9908f9e 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -1882,7 +1882,12 @@ $.config = {router: false} - + + - -var myFocus = new Vue({ - el:"#myFocus" -}) + \ No newline at end of file diff --git a/fangija-zsyf/views/house/new_file.js b/fangija-zsyf/views/house/new_file.js index e322e09..7468f95 100644 --- a/fangija-zsyf/views/house/new_file.js +++ b/fangija-zsyf/views/house/new_file.js @@ -44,12 +44,10 @@ Vue.component('my_focus',{ }, methods:{ loadMyFocus:function(){ - axios.get("/rest/quotations/userCollectCityInfo", { - params: { - } - }).then(function(response){ - myFocusDatas.myFocusList = response.data.data.results + axios.get("/rest/quotations/userCollectCityInfo").then(function(response){ + myFocusDatas.myFocusList = response.data.data }).catch(function(error){ + alert(error); console.log(error) }) } @@ -60,14 +58,14 @@ Vue.component('my_focus',{ }) //我的关注 -var myFocus = new Vue({ - el:"#myFocus", - data:{ - myfocusList:[{num:1,city:"test1",avgPrice:"123",percent:"",ranking:"1"}, - {num:2,city:"test2",avgPrice:"321",percent:"6.6",ranking:"2"} - ] - } -}) +//var myFocus = new Vue({ +// el:"#myFocus", +// data:{ +// myfocusList:[{num:1,city:"test1",avgPrice:"123",percent:"",ranking:"1"}, +// {num:2,city:"test2",avgPrice:"321",percent:"6.6",ranking:"2"} +// ] +// } +//}) //涨幅榜 var tabCityRanking1 = new Vue({ From 472516c76b7dcf59c2a3248e1d8764eff02c666d Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Tue, 10 Apr 2018 15:04:07 +0800 Subject: [PATCH 09/18] aa --- fangija-zsyf/main.html | 13 +- fangija-zsyf/views/evaluate/evaluateList.html | 4 +- fangija-zsyf/views/house/add.html | 55 +--- fangija-zsyf/views/house/houseManageList.html | 272 ++++++++++++++++++ fangija-zsyf/yfindex.html | 9 +- 5 files changed, 296 insertions(+), 57 deletions(-) create mode 100644 fangija-zsyf/views/house/houseManageList.html diff --git a/fangija-zsyf/main.html b/fangija-zsyf/main.html index 3ea3402..8ce27a1 100644 --- a/fangija-zsyf/main.html +++ b/fangija-zsyf/main.html @@ -24,7 +24,7 @@ 行情 - + 评估 @@ -48,20 +48,11 @@ localStorage.removeItem("user_token"); localStorage.removeItem("user_token_add_time"); } - var evaluateMenu="" - if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { - //没有登录 - evaluateMenu = 'views/house/add_noData.html'; - }else{ - //登录成功 - evaluateMenu = 'views/evaluate/evaluateList.html'; - } - document.getElementById("evaluate").setAttribute("href", evaluateMenu); document.getElementById("quotations").setAttribute("href", BASE_PATH + '/quotations/index'); //document.getElementById("selfInfo").setAttribute("href", BASE_PATH + '/selfInfo/index'); //mui初始化 mui.init(); - var subpages = ['yfindex.html', BASE_PATH + '/quotations/index', evaluateMenu, 'views/user/userInfo.html']; + var subpages = ['yfindex.html', BASE_PATH + '/quotations/index', 'views/house/houseManageList.html', 'views/user/userInfo.html']; var subpage_style = { top: '0', bottom: '50px', diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index 7c86037..84286cf 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -36,9 +36,9 @@
- +

房产评估

diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 6a4162f..11884c6 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1553,7 +1553,8 @@ $("#evaluation_btn").on("click", function () { $("input[name='name']").val(district.name) $("input[name='region']").val(district.region) $("#input_city").val(district.city) - addEvaluation(); + + }else{ // $("#nextBtn").attr("disabled", false) console.log("error"); @@ -1565,6 +1566,17 @@ $("#evaluation_btn").on("click", function () { }); }); +//判断是否登录 +//var loginFlag=false; +function checkIsLogin(){ + if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ + clicked('/views/user/passLogin.html',true,false,{},{},function(){ + //checkIsLogin(); + }) + }else{ + addEvaluation(); + } +} function addEvaluation(){ axios.get("/rest/index/checkEvalPrice", { @@ -1582,13 +1594,7 @@ function addEvaluation(){ .then(function (response) { if(response.data.data!=null && response.data.data.success){ var id = response.data.data.id; - mui.openWindow({ - url: 'detail.html', - id:'detail.html', - extras:{ - id:id - } - }); + clicked('detail.html',true,false,{},{id:id}) }else{ $.toast(response.data.message); } @@ -1596,39 +1602,6 @@ function addEvaluation(){ .catch(function (error) { console.log(error); }); - - - /*$.ajax({ - url:"${basePath}/fsh/checkEvalPrice", - dataType:'json', - data:$("form").serialize(), - success:function (data) { - console.log() - var str = "/house/add?city="+$("#input_city").val()+"®ion="+$("input[name=region]").val()+"&name="+$("#input_address").val()+"&address="+$("input[name=address]").val()+"&estateType="+$("#input_houseType").val()+"&building="+$("#input_building").val()+"&floors="+$("#input_floor").val()+"&area="+$("#input_area").val(); - if(data.success){ - $.showIndicator(); - window.location.href="${basePath}/house/doEvaluation?id="+data.id+"&backUrl=${backUrl!}"; - }else{ - if (data.data == 0){ - $.toast(data.message); - var sstr = "${basePath}/user/smsLogin"; - console.log(sstr); - //window.location.href = sstr; - clicked(sstr,true); - } - if(data.message!=undefined && data.message!=""){ - $.hidePreloader(); - $.toast(data.message); - }else{ - $.hidePreloader(); - $.toast("该地址不支持估价!"); - } - } - }, - error:function () { - $.toast("估价失败请重试!") - } - })*/ } /* 信息输入弹窗 */ diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html new file mode 100644 index 0000000..357d42a --- /dev/null +++ b/fangija-zsyf/views/house/houseManageList.html @@ -0,0 +1,272 @@ + + + + + +房产评估 + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/yfindex.html b/fangija-zsyf/yfindex.html index 177df31..746dfa2 100644 --- a/fangija-zsyf/yfindex.html +++ b/fangija-zsyf/yfindex.html @@ -93,15 +93,15 @@
-
+
房产管理
-
+
我的房产
-
+
智能选房
@@ -2609,6 +2609,9 @@ function openNewsView(newId) { $("#visitCount_"+newId).text(count+'人'); } } +function openNewView(viewHtml) { + clicked(viewHtml,true,false,{},{}) +} function openIntelligentHouseView() { clicked('views/intelligentHouse/index.html',true,false,{},{}) } From 826c116d0d889e05f52133fd330d8f6434ee752d Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Tue, 10 Apr 2018 16:34:55 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=88=BF=E4=BA=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseList.html | 44 ++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index 61a9b49..31750c7 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -24,12 +24,31 @@ .list-block .item-title em{font-size:0.8rem;color:#EB5F34;} .list-block .item-title .tag small{font-size:80%;color:#F5A100;} - -
+ + +
-
-
-
-
- -
-
- 2018年1月全国366个城市房价 -
-
-
- - 37% - - - - 63% - - +
+
+
+
+
+
-
- -
-
-
-
-
-
城市涨幅排行
-
①上海
-
-
8.98%
+
+ 2018年1月全国366个城市房价 +
+
+
+ + 37% + + + + 63% + +
-
-
-
城市潜力排行
-
①上海
-
-
潜力指数
-
- -
-
-
城市均价排行
-
①北京
-
-
2.89%
-
- -
-
-
-
-
房产热点城市
-
-
- -

青岛

-
-
- -

三亚

-
-
- -

昆明

-
-
-
-
楼市资讯
-
-
-
-
    -
  • -
    -
    -
    市场上有不同种类的房源待售,经济适用房作为保障性住房的一种,政府对此非常重视。
    -
    -
    - 2022人1245条 -
    -
    -
    - -
    -
  • -
-
-
-
-
-
-
-
    -
  • -
    -
    -
    市场上有不同种类的房源待售,经济适用房作为保障性住房的一种,政府对此非常重视。
    -
    -
    - 2022人1245条 -
    -
    -
    - -
    -
  • -
-
-
-
-
-
-
-
- - 关注 - 取消 -
-
- 当前参考均价 -
-
-
65079元/㎡
-
- -
-
- -
-
-
2018年1月楼市行情区县涨跌详情
-
-
- -
+
-
-
-
城市均价分析
-
-
-
- 均价 - 租金 -
-
-
-
-
-
- 半年 - 一年 - 三年 -
-
-
-
-
-
-
- 半年 - 一年 -
-
-
-
-
-
-
-
-
城市报告
-
- -
-
-
-
    -
  • -
    -
    总人口:2418.33万(2017年常住人口)
    -
    -
  • -
  • -
    -
    面积:6340k㎡
    -
    -
  • -
  • -
    -
    发展指数:0.852(极高,2014年)
    -
    -
  • -
  • -
    -
    行政区级别:直辖市
    -
    -
  • -
-
-
-
-
-
    -
  • -
    -
    生产总值:30133.86亿元(2017年)
    -
    -
  • -
  • -
    -
    人均生产总值:124536元(2017年)
    -
    -
  • -
  • -
    -
    人均支配收入:58988元(2017年)
    -
    -
  • -
-
-
-
-
-
    -
  • -
    -
    著名景点:外滩、豫园、南京路、人民广场、静安寺、新天地、迪士尼乐园等
    -
    -
  • -
  • -
    -
    著名高校:复旦、交大、同济、华东师大等
    -
    -
  • -
-
-
-
-
-
    -
  • -
    -
    气候条件:亚热带季风气候
    -
    -
  • -
  • -
    -
    地理位置:长江入海口南岸,东海之滨
    -
    -
  • -
-
-
-
-
-
    -
  • -
    -
    机场:上海虹桥国际机场、上海浦东国际机场
    -
    -
  • -
  • -
    -
    火车站:上海站、上海虹桥站、上海南站
    -
    -
  • -
-
-
-
-
-
- -
-
热门小区
-
-
-
-
-
定远小区
-
-
68777元/㎡
+
+
+
+ + 关注 + 取消 +
+
+ 当前参考均价 +
+
+
65079元/㎡
+
+ +
+
+ +
+
+
2018年1月楼市行情区县涨跌详情
+
+
+ +
+ + 2.13% +
+ +
+ + 1.41% +
+
+
+
+
+
城市均价分析
+
+
+
+ 均价 + 租金 +
+
+
+
+
+
+ 半年 + 一年 + 三年 +
+
-
-
定远小区
-
-
68777元/㎡
+
+
+
+ 半年 + 一年 +
+
-
-
定远小区
-
-
68777元/㎡
+
+
+
+
+
城市报告
+
+ +
+
+
+
    +
  • +
    +
    总人口:2418.33万(2017年常住人口)
    +
    +
  • +
  • +
    +
    面积:6340k㎡
    +
    +
  • +
  • +
    +
    发展指数:0.852(极高,2014年)
    +
    +
  • +
  • +
    +
    行政区级别:直辖市
    +
    +
  • +
+
+
+
+
+
    +
  • +
    +
    生产总值:30133.86亿元(2017年)
    +
    +
  • +
  • +
    +
    人均生产总值:124536元(2017年)
    +
    +
  • +
  • +
    +
    人均支配收入:58988元(2017年)
    +
    +
  • +
+
+
+
+
+
    +
  • +
    +
    著名景点:外滩、豫园、南京路、人民广场、静安寺、新天地、迪士尼乐园等
    +
    +
  • +
  • +
    +
    著名高校:复旦、交大、同济、华东师大等
    +
    +
  • +
+
+
+
+
+
    +
  • +
    +
    气候条件:亚热带季风气候
    +
    +
  • +
  • +
    +
    地理位置:长江入海口南岸,东海之滨
    +
    +
  • +
+
+
+
+
+
    +
  • +
    +
    机场:上海虹桥国际机场、上海浦东国际机场
    +
    +
  • +
  • +
    +
    火车站:上海站、上海虹桥站、上海南站
    +
    +
  • +
+
+
+
+
+
+ +
+
热门小区
+
+
+
+
+
定远小区
+
+
68777元/㎡
+
+
+
+
定远小区
+
+
68777元/㎡
+
+
+
+
定远小区
+
+
68777元/㎡
+
-
-
+
@@ -555,437 +557,22 @@
-
-
-
-
-
    -
  • -
  • -
  • -
-
-
+
+
+
@@ -1877,38 +1464,32 @@ $.config = {router: false} - + - + + + - - - - - - - - \ No newline at end of file diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 0a2ef42..dd2aa79 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -13,7 +13,6 @@ - @@ -187,28 +191,30 @@
-
-
+
+
-
+
-
- 半年 - 一年 +
+ 半年 + 一年 +
+
+
-
@@ -234,22 +240,22 @@
- + + + + + + - - - - diff --git a/fangija-zsyf/views/user/passLogin.html b/fangija-zsyf/views/user/passLogin.html index 1f3f3a4..d866694 100644 --- a/fangija-zsyf/views/user/passLogin.html +++ b/fangija-zsyf/views/user/passLogin.html @@ -159,6 +159,18 @@ new Vue({ } } }); + +var originalHeight=document.documentElement.clientHeight || document.body.clientHeight; +window.onresize=function(){ + //软键盘弹起与隐藏 都会引起窗口的高度发生变化 + var resizeHeight=document.documentElement.clientHeight || document.body.clientHeight; + if(resizeHeight*1 From 8871cf501c914cae86506b0640f27101c3d4d3d6 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Wed, 11 Apr 2018 11:50:59 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseList.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseList.html b/fangija-zsyf/views/house/houseList.html index 31750c7..e6616b0 100644 --- a/fangija-zsyf/views/house/houseList.html +++ b/fangija-zsyf/views/house/houseList.html @@ -230,7 +230,7 @@ function checkIsLogin(){ } function gotoAddHouse(){ - clicked('/views/house/add.html',true,false,{},{typeValue:"addHouse"},function(){}); + clicked('/views/house/add.html',true,false,{},{type:0},function(){}); } //界面加载 From cb63302baaccf0a4dfcec31eee4ced3dca5f5fce Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Wed, 11 Apr 2018 12:06:50 +0800 Subject: [PATCH 15/18] aa --- fangija-zsyf/views/house/houseManageList.html | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index 357d42a..874a8b7 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -108,9 +108,8 @@ function checkIsLogin(){ $('#dataList').hide(); $('#noData').show(); }else{ - //控制显示 - $('#noData').hide(); - $('#dataList').show(); + selectEvaluateList(); + } } checkIsLogin(); @@ -184,16 +183,24 @@ function selectEvaluateList(){ }).then(function (response) { var resultsMap = response.data.data; var results = resultsMap.houseInfoList; - var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap; - var cityAvgPriceMap = resultsMap.cityAvgPriceMap; - //构造数据列表 - htmlContent = constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap, htmlContent); + if(resultsMap.houseInfoList.length=0){ + $('#dataList').hide(); + $('#noData').show(); + }else{ + $('#dataList').show(); + $('#noData').hide(); + var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap; + var cityAvgPriceMap = resultsMap.cityAvgPriceMap; + //构造数据列表 + htmlContent = constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap, htmlContent); + + //动态追加内容 + $('.list-block ul').html(htmlContent); + //添加loading等待效果 + $(".loadingBg").hide(); + $(".content-block").show(); + } - //动态追加内容 - $('.list-block ul').html(htmlContent); - //添加loading等待效果 - $(".loadingBg").hide(); - $(".content-block").show(); }).catch(function (error) { console.log(error); }); From a8471489c82fb8175a0210a6b9990def25c6f082 Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Wed, 11 Apr 2018 12:31:33 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/evaluate/evaluateList.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateList.html b/fangija-zsyf/views/evaluate/evaluateList.html index 84286cf..ee9f42f 100644 --- a/fangija-zsyf/views/evaluate/evaluateList.html +++ b/fangija-zsyf/views/evaluate/evaluateList.html @@ -149,9 +149,7 @@ function selectEvaluateList(){ var htmlContent = ''; axios.get(BASE_PATH + "/rest/evaluate/houseinfolist", { - params: { - uid: uid - } + params: {} }).then(function (response) { var resultsMap = response.data.data; var results = resultsMap.houseInfoList; From 24f6195417d99c7a05f4170ba0ffcb7800b338cb Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Wed, 11 Apr 2018 12:32:46 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseManageList.html | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index 874a8b7..980d483 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -101,7 +101,9 @@ $.config = {router: false}