From 472516c76b7dcf59c2a3248e1d8764eff02c666d Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Tue, 10 Apr 2018 15:04:07 +0800 Subject: [PATCH 1/2] 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 2/2] =?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;} - -
+ + +