From 2219d23dacb105ac264fb43a2204558022a92c94 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Thu, 12 Apr 2018 09:41:10 +0800 Subject: [PATCH 1/5] YOUFANG1.1 --- .../component/cityIncreaseRankingComponent.js | 12 +- .../cityPotentialRankingComponent.js | 15 +- .../views/component/myFocusComponent.js | 15 +- fangija-zsyf/views/house/houseDetail.html | 193 +++++++++--------- 4 files changed, 124 insertions(+), 111 deletions(-) diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index 8eb91d9..be7f94d 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -27,8 +27,8 @@ Vue.component('city_increase_ranking',{ '{{!ci.oneMonthUpDownRange||ci.oneMonthUpDownRange==""?"暂无":Math.abs(100*ci.oneMonthUpDownRange).toFixed(2)+"%"}}'+ ''+ '
'+ - '关注'+ - '取消'+ + '关注'+ + '取消'+ '
'+ ''+ ''+ @@ -47,14 +47,18 @@ Vue.component('city_increase_ranking',{ console.log(error) }) }, - follow:function(city){ + follow:function(city,event){ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); }).catch(function(error){ console.log(error) }) }, - abolish:function(city){ + abolish:function(city,event){ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); }).catch(function(error){ console.log(error) }) diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index 377b2c3..0ffe245 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -33,8 +33,8 @@ Vue.component('city_potential_ranking',{ ''+ ''+ '
'+ - '关注'+ - '取消'+ + '关注'+ + '取消'+ '
'+ ''+ ''+ @@ -48,7 +48,6 @@ Vue.component('city_potential_ranking',{ methods:{ loadCityPotentialRanking:function(){ axios.get("/rest/quotations/potentialUpTopInfos").then(function(response){ -// alert(1) list = response.data.data; $(list).each(function(i){ var index = this.index; @@ -66,14 +65,20 @@ Vue.component('city_potential_ranking',{ console.log(error) }) }, - follow:function(city){ + follow:function(city,event){ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + loadCityPotentialRanking() }).catch(function(error){ console.log(error) }) }, - abolish:function(city){ + abolish:function(city,event){ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ + $(event.target).parent().children().removeClass("dn"); + $(event.target).addClass("dn"); + loadCityPotentialRanking() }).catch(function(error){ console.log(error) }) diff --git a/fangija-zsyf/views/component/myFocusComponent.js b/fangija-zsyf/views/component/myFocusComponent.js index cbf3222..1ecb73f 100644 --- a/fangija-zsyf/views/component/myFocusComponent.js +++ b/fangija-zsyf/views/component/myFocusComponent.js @@ -26,7 +26,7 @@ Vue.component('my_focus',{ '
{{mf.city}}
'+ '
{{!mf.cityTopMonthAvgPrice||mf.cityTopMonthAvgPrice==""?"暂无":""+mf.cityTopMonthAvgPrice+"元/㎡"}}
'+ '
'+ - '{{!mf.oneMonthUpDownRange||mf.oneMonthUpDownRange==""?"暂无":Math.abs(mf.oneMonthUpDownRange*100).toFixed(2)+"%"}}'+ + '{{!mf.oneMonthUpDownRange||mf.oneMonthUpDownRange==""?"暂无":Math.abs(mf.oneMonthUpDownRange*100).toFixed(2)+"%"}}'+ '
'+ '
'+ '{{mf.rangeLevel}}'+ @@ -44,22 +44,21 @@ Vue.component('my_focus',{ }, methods:{ loadMyFocus:function(){ - if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ - $("#myFocusFirstPage").hide() - $("#myFocus").hide(); - }else{ +// if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ +// $("#myFocusFirstPage").hide() +// $("#myFocus").hide(); +// }else{ axios.get("/rest/quotations/userCollectCityInfo").then(function(response){ if(response.data.data.length==0){ - alert("aa"); $("#myFocusFirstPage").hide(); $("#myFocus").hide(); }else{ myFocusDatas.myFocusList = response.data.data; } }).catch(function(error){ - console.log(error) + console.log(error) }) - } +// } } },mounted:function(){ this.loadMyFocus(); diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 7b52252..a55ccdb 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -483,22 +483,89 @@ $.config = {router: false} From 9f5c75d53b10b46d338333afc3928bc009fd8d21 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Thu, 12 Apr 2018 10:01:29 +0800 Subject: [PATCH 2/5] aa --- .../views/evaluate/evaluateReport.html | 6 +++++- fangija-zsyf/views/house/add.html | 20 ++++++------------- fangija-zsyf/views/house/houseManageList.html | 4 +--- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 130164f..fcaf420 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -47,7 +47,7 @@
- 再估一套 + 再估一套 @@ -475,6 +475,10 @@ function showChat(categories, series) { } }) } +function openaddWindow(){ + clicked('/views/house/add.html',true,false,{},{type:1},function(){ + }) +} diff --git a/fangija-zsyf/views/house/add.html b/fangija-zsyf/views/house/add.html index 5d2191f..4817c7f 100644 --- a/fangija-zsyf/views/house/add.html +++ b/fangija-zsyf/views/house/add.html @@ -1248,8 +1248,8 @@ $.config = {router: false} + + + + + + +<#include "/monitor/monitor.html"> + + \ No newline at end of file diff --git a/fangija-zsyf/views/setting/setting.html b/fangija-zsyf/views/setting/setting.html new file mode 100644 index 0000000..37377ad --- /dev/null +++ b/fangija-zsyf/views/setting/setting.html @@ -0,0 +1,101 @@ + + + + + +管理设置 + + + + + + + + + + + + + + +
+
+
+ +

管理设置1

+
+
+ +
+

微信交流群

+ +

扫码加入

+

商务合作QQ:275525147

+

退出登录

+
+
+
+
+ + + + + + + + + + + + + + \ No newline at end of file diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index 2840d4d..f66dc9a 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -41,7 +41,7 @@ - @@ -110,7 +110,7 @@ - From 6595ce0055fdc2ffa682bb2379ebd349329a50d4 Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Thu, 12 Apr 2018 10:53:15 +0800 Subject: [PATCH 5/5] aa --- .../views/evaluate/evaluateReport.html | 4 +++ fangija-zsyf/views/house/houseDetail.html | 1 - fangija-zsyf/views/house/houseManageList.html | 32 +++++++------------ 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index fcaf420..8d3cea7 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -276,6 +276,9 @@ function addManagement(id, houseStatus, liveStatus){ if(status){ $.toast(response.data.data); window.location.reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('views/house/houseList.html').reload(); }else{ $.toast(response.data.message); } @@ -301,6 +304,7 @@ $(".content-block .button").on("click", function () { /* 房产用途 */ $(document).on('click','.open-vertical-modal', function () { + var houseStatus = 0; $.modal({ title: '房产用途', verticalButtons: true, diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index a55ccdb..65cdb6a 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -601,7 +601,6 @@ $.config = {router: false} } }) .then(function (response) { - console.log(response.data.data) //0:涨幅排行 1:潜力排行 2:均价排行 new Vue({ el: '#countryRank', diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index c6dad89..4f192d4 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -104,16 +104,6 @@ $.config = {router: false} //调用mui.init方法 $.init() -//判断是否登录 -function checkIsLogin(){ - if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ - $('#dataList').hide(); - $('#noData').show(); - }else{ - selectEvaluateList(); - } -} - /* 房产用途 */ $(document).on('click','.open-vertical-modal', function () { //获取对应
  • 栏目存储的houseinfo id @@ -167,7 +157,6 @@ function addManagement(id, houseStatus, liveStatus){ console.log(error); }); } - //查询房产评估列表AJAX请求 function selectEvaluateList(){ //先清空列表 @@ -178,18 +167,17 @@ function selectEvaluateList(){ params: {} }).then(function (response) { var resultsMap = response.data.data; - var results = resultsMap.houseInfoList; - if(resultsMap.houseInfoList.length==0){ + if(response.data.data==null || resultsMap.houseInfoList==null || resultsMap.houseInfoList.length==0){ $('#dataList').hide(); $('#noData').show(); }else{ $('#dataList').show(); $('#noData').hide(); + var results = resultsMap.houseInfoList; var xqOneMonthUpDownRangeMap = resultsMap.xqOneMonthUpDownRangeMap; var cityAvgPriceMap = resultsMap.cityAvgPriceMap; //构造数据列表 htmlContent = constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap, htmlContent); - //动态追加内容 $('.list-block ul').html(htmlContent); //添加loading等待效果 @@ -260,16 +248,20 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap return htmlContent; } -//界面加载 -$(document).ready(function () { - checkIsLogin(); -}); - function openaddWindow(){ clicked('/views/house/add.html',true,false,{},{type:1},function(){ }) } - +//判断是否登录 +function checkIsLogin(){ + if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ + $('#dataList').hide(); + $('#noData').show(); + }else{ + selectEvaluateList(); + } +} +checkIsLogin()