From 899f3724e49bb9b03fc47cebf10dd564da1f3e62 Mon Sep 17 00:00:00 2001 From: zongzhimin Date: Wed, 11 Apr 2018 15:47:00 +0800 Subject: [PATCH 01/20] =?UTF-8?q?YOUFANG=20=E6=88=BF=E4=BA=A7=E8=A1=8C?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/component/cityChooseComponent.js | 3 +- .../component/cityIncreaseRankingComponent.js | 12 +- .../cityPotentialRankingComponent.js | 4 +- .../views/component/myFocusComponent.js | 123 ++++++++++-------- fangija-zsyf/views/house/houseDetail.html | 15 ++- 5 files changed, 91 insertions(+), 66 deletions(-) diff --git a/fangija-zsyf/views/component/cityChooseComponent.js b/fangija-zsyf/views/component/cityChooseComponent.js index adf46a0..ef8b95f 100644 --- a/fangija-zsyf/views/component/cityChooseComponent.js +++ b/fangija-zsyf/views/component/cityChooseComponent.js @@ -3,6 +3,7 @@ //var cityChooseOption = {markFocus:0,clickFocus:0} Vue.component('city_choose',{ + props:['city1'], template: ' - 再估一套 + 再估一套 @@ -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 19/20] 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() From 9d9d6ca8531a511f8fe1ee5e732e80afbc6c524e Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Thu, 12 Apr 2018 11:07:10 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B4=B7=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/js/loan/loanInfo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/js/loan/loanInfo.js b/fangija-zsyf/js/loan/loanInfo.js index 8e502e3..6977a27 100644 --- a/fangija-zsyf/js/loan/loanInfo.js +++ b/fangija-zsyf/js/loan/loanInfo.js @@ -112,8 +112,8 @@ $("#next_btn").on("click", function () { axios.post(BASE_PATH + "/rest/loan/apply", _params).then(function (response) { var status = response.data.status; if(status){ - alert(response.data.data+ '==='); - $.toast(response.data.data); + //页面跳转 + //$.toast(response.data.data); //直接定位到贷款success页面, 调用back()就只用返回一次 window.location.href = "../../views/loan/loanSuccess.html"; }else{