From ffa9851e33c949198a9199baed73efed1434cf3a Mon Sep 17 00:00:00 2001 From: raoyanhui Date: Mon, 16 Apr 2018 10:56:23 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E5=87=A0=E5=AE=A4=E5=87=A0=E5=8E=85=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=88=90=E6=A5=BC=E6=A0=8B=E5=8F=B7=20=E5=AE=A4?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/views/house/houseManageList.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index abe038d..18bce1a 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -208,7 +208,12 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap htmlContent = htmlContent +"
"; htmlContent = htmlContent +"
"+result.city+"-"+result.region+"
"; htmlContent = htmlContent +"
"; - htmlContent = htmlContent +"
"+result.roomCount+"室"+result.hallCount+"厅  "+result.area+"㎡  "+result.floor+"/"+result.height+"层
"; + + //htmlContent = htmlContent +"
"+result.roomCount+"室"+result.hallCount+"厅"; + var houseRoomNum = result.houseRoomNum==""?"暂无":result.houseRoomNum; + htmlContent = htmlContent +"
"+houseRoomNum; + + htmlContent = htmlContent +"  "+result.area+"㎡  "+result.floor+"/"+result.height+"层
" htmlContent = htmlContent +"
"; //对应城市地区小区30天涨跌幅 //动态构建key From 7b019a1b35d06ad48990e8a025ff42efbb684bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 16 Apr 2018 11:11:43 +0800 Subject: [PATCH 02/10] fix bug 4775 --- fangija-zsyf/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index edb2105..fc919d7 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -1060,7 +1060,7 @@ input::-webkit-input-placeholder{ .topBg02 p a{font-size:0.75rem;} .collection{position:absolute;right:0.75rem;top:0.4rem;text-align:center;color:#666;font-size:0.7rem;} -.collection02{border:solid 1px #C3C0BC;color:#999;} + .icon-collection01{width:16px;height:16px;background:url(../images/icon-collection01.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;} .icon-collection02{width:16px;height:16px;background:url(../images/icon-collection02.png) no-repeat center center;background-size:100%;display:block;margin:0 auto;margin-bottom:0.1rem;} From 219337fb949f293f86f8df1e88ebd1ef2914217b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 16 Apr 2018 11:59:41 +0800 Subject: [PATCH 03/10] fix bug --- fangija-zsyf/views/evaluate/evaluateReport.html | 2 +- fangija-zsyf/views/house/detail.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 5425532..4119adb 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -195,7 +195,7 @@ $.config = {router: false} hid:hid, reason:i }).then(function(response){ - alert("感谢您的反馈!") + $.toast("感谢您的反馈!") $("#price_feedback").hide(); }).catch(function(error){console.log(error)}) }, diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 39c725e..66c73e4 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -425,7 +425,7 @@ function init(){ $('.rentBox').show(); if(houseInfo.leaseStartDate){ baseInfo.rentTime = formatTime(houseInfo.leaseStartDate)+"-"+formatTime(houseInfo.leaseEndDate); - baseInfo.rentPrice = houseInfo.rent+"元("+houseInfo.rentCycle+"/"+houseInfo.rentCycleUnit+")"; + baseInfo.rentPrice = houseInfo.rent+"元/"+houseInfo.rentCycleUnit; baseInfo.nextRent = formatTime2(houseInfo.lastRentDate); }else{ baseInfo.rentTime = "-"; From 7d5418de95fb794013e07b7e504a4d58f06d1394 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 13:00:27 +0800 Subject: [PATCH 04/10] update --- fangija-zsyf/js/quotations/cityDetail.js | 2 ++ fangija-zsyf/views/component/nearDist.js | 2 +- fangija-zsyf/views/rent/rentManager.html | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index ae65de7..53867b6 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -517,9 +517,11 @@ function docollectCity(city){ //loadMyCollectCity(); $("a[href='#tabQuotation1']").click(); //plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + reloadMyFocus(); }else if(msg == "关注成功"){ cityInfoVue.$data.collecd = true; plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + reloadMyFocus(); }else{ $.toast(msg); } diff --git a/fangija-zsyf/views/component/nearDist.js b/fangija-zsyf/views/component/nearDist.js index cc18123..5ed4012 100644 --- a/fangija-zsyf/views/component/nearDist.js +++ b/fangija-zsyf/views/component/nearDist.js @@ -12,7 +12,7 @@ Vue.component('near-dist-component', {
{{dist.avgPrice?(dist.avgPrice+"元/㎡"):'暂无'}}
- +
diff --git a/fangija-zsyf/views/rent/rentManager.html b/fangija-zsyf/views/rent/rentManager.html index a8a0725..8e4f89c 100644 --- a/fangija-zsyf/views/rent/rentManager.html +++ b/fangija-zsyf/views/rent/rentManager.html @@ -146,7 +146,7 @@ function onPlusReady() { // }); // }) var houseInfo = response.data.data.houseInfo; - if(houseInfo.liveStatus=="出租"){ + if(houseInfo && houseInfo.liveStatus=="出租"){ edit.liveStatus=houseInfo.liveStatus; edit.leaseStartDate=getNowFormatDate(houseInfo.leaseStartDate); edit.leaseEndDate = getNowFormatDate(houseInfo.leaseEndDate); From 11cd4e9eef7a72239438e3fe1c27d17f5ba1df7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 16 Apr 2018 13:03:14 +0800 Subject: [PATCH 05/10] axios timeout --- fangija-zsyf/js/axiosPlugin.js | 1 + 1 file changed, 1 insertion(+) diff --git a/fangija-zsyf/js/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index 39e6d98..28ffc10 100644 --- a/fangija-zsyf/js/axiosPlugin.js +++ b/fangija-zsyf/js/axiosPlugin.js @@ -1,5 +1,6 @@ axios.defaults.baseURL = BASE_PATH; axios.defaults.headers.post['Content-Type'] = 'application/json'; +axios.defaults.timeout = 10000; // 添加请求拦截器 axios.interceptors.request.use(function (config) { From 32b156e454bd719c778db8e9e5ad650a8ad421be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 16 Apr 2018 13:41:41 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=A1=8C=E6=83=85=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E5=BC=82=E5=B8=B8vue=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/css/main.css | 4 +++- fangija-zsyf/manifest.json | 11 ++++++++++- fangija-zsyf/views/house/houseDetail.html | 8 ++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index fc919d7..06da6da 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -1,6 +1,8 @@ @charset "utf-8"; /* CSS Document */ - +[v-cloak] { + display: none; +} /* 公用 */ *{font-size:16px;font-family:arial,"华文细黑";} ul li{list-style:none;} diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 10a872c..ef93cc1 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1721,6 +1721,15 @@ } }, "unpackage": [ - "js/update.json" + "js/update.json", + "doc/cache.html", + "doc/console.html", + "doc/contacts.html", + "doc/interface-orientation.html", + "doc/key.html", + "doc/splashscreen.html", + "doc/statistic.html", + "plus/webview_pullhead.html", + "plus/webview_pullrefresh.html" ] } \ No newline at end of file diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index f04faaa..3407dfa 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -36,8 +36,8 @@ -->

房产行情

-
-
+
+
全国
{{mycollectcity}} @@ -46,8 +46,8 @@
-
-
+
+
From 89a097a8cb73a39b1155c075e576123837b5055b Mon Sep 17 00:00:00 2001 From: "xuhe@fangjia.com" Date: Mon, 16 Apr 2018 14:04:32 +0800 Subject: [PATCH 07/10] aa --- fangija-zsyf/views/house/detail.html | 31 +++++++++++++++++++--------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 39c725e..c70f2bc 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -64,7 +64,7 @@
{{cityRegion}}
-
  {{area}}m  
+
{{houseRoomNum}}  {{area}}m  {{floor_height}}
@@ -78,7 +78,7 @@ {{estatetype}}
-
{{Math.round(totalPrice/10000)}}万
+
{{totalPrice}}万
diff --git a/fangija-zsyf/views/evaluate/evaluateReport.html b/fangija-zsyf/views/evaluate/evaluateReport.html index 5425532..4119adb 100644 --- a/fangija-zsyf/views/evaluate/evaluateReport.html +++ b/fangija-zsyf/views/evaluate/evaluateReport.html @@ -195,7 +195,7 @@ $.config = {router: false} hid:hid, reason:i }).then(function(response){ - alert("感谢您的反馈!") + $.toast("感谢您的反馈!") $("#price_feedback").hide(); }).catch(function(error){console.log(error)}) }, diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index f04faaa..3407dfa 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -36,8 +36,8 @@ -->

房产行情

-
-
+
+
全国
{{mycollectcity}} @@ -46,8 +46,8 @@
-
-
+
+
diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index abe038d..18bce1a 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -208,7 +208,12 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap htmlContent = htmlContent +"
"; htmlContent = htmlContent +"
"+result.city+"-"+result.region+"
"; htmlContent = htmlContent +"
"; - htmlContent = htmlContent +"
"+result.roomCount+"室"+result.hallCount+"厅  "+result.area+"㎡  "+result.floor+"/"+result.height+"层
"; + + //htmlContent = htmlContent +"
"+result.roomCount+"室"+result.hallCount+"厅"; + var houseRoomNum = result.houseRoomNum==""?"暂无":result.houseRoomNum; + htmlContent = htmlContent +"
"+houseRoomNum; + + htmlContent = htmlContent +"  "+result.area+"㎡  "+result.floor+"/"+result.height+"层
" htmlContent = htmlContent +"
"; //对应城市地区小区30天涨跌幅 //动态构建key diff --git a/fangija-zsyf/views/rent/rentManager.html b/fangija-zsyf/views/rent/rentManager.html index a8a0725..8e4f89c 100644 --- a/fangija-zsyf/views/rent/rentManager.html +++ b/fangija-zsyf/views/rent/rentManager.html @@ -146,7 +146,7 @@ function onPlusReady() { // }); // }) var houseInfo = response.data.data.houseInfo; - if(houseInfo.liveStatus=="出租"){ + if(houseInfo && houseInfo.liveStatus=="出租"){ edit.liveStatus=houseInfo.liveStatus; edit.leaseStartDate=getNowFormatDate(houseInfo.leaseStartDate); edit.leaseEndDate = getNowFormatDate(houseInfo.leaseEndDate); From 5da64f43305c90e72c6c7887c045efb0a3c9cfa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E5=90=89=E6=AC=A2?= Date: Mon, 16 Apr 2018 14:19:05 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E9=99=90=E5=88=B6=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/manifest.json | 12 ++++++++++ fangija-zsyf/views/house/houseDetail.html | 27 +++++++++++++++-------- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index ef93cc1..672f893 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1729,6 +1729,18 @@ "doc/key.html", "doc/splashscreen.html", "doc/statistic.html", + "plus/accelerometer_shake.html", + "plus/accelerometer.html", + "plus/audio.html", + "plus/barcode_scan.html", + "plus/barcode_scan2.html", + "plus/barcode.html", + "plus/camera_image.html", + "plus/camera_video.html", + "plus/camera.html", + "plus/device.html", + "plus/doc.html", + "plus/downloader.html", "plus/webview_pullhead.html", "plus/webview_pullrefresh.html" ] diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 3407dfa..5d792d8 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -80,7 +80,7 @@
-
+
@@ -168,7 +168,7 @@
-
+
@@ -1511,11 +1511,15 @@ function addFocus(city){ }else{ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ - reloadMyFocus() - plus.webview.getWebviewById('views/house/houseDetail.html').reload(); - plus.webview.getWebviewById('views/house/houseManageList.html').reload(); - plus.webview.getWebviewById('views/user/userInfo.html').reload(); - createData(city, myDatasVue.$data.cityDatas.length); + if(response.data.status){ + reloadMyFocus() + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + createData(city, myDatasVue.$data.cityDatas.length); + } else { + $.toast(response.data.message); + } }).catch(function(error){ console.log(error) }) @@ -1523,8 +1527,13 @@ function addFocus(city){ }) }else{ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ - reloadMyFocus() - cityDetaiVue.$data.citys.push(city); + if(response.data.status){ + reloadMyFocus() + cityDetaiVue.$data.citys.push(city); + } else { + $.toast(response.data.message); + } + }).catch(function(error){ console.log(error) }) From 665a443f7316b171b3e19d8958c917357a2e3ef5 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 16 Apr 2018 14:24:45 +0800 Subject: [PATCH 10/10] update --- fangija-zsyf/css/main.css | 5 +- fangija-zsyf/js/district/districtDetail.js | 16 +-- .../views/component/baseInfoComponent.js | 2 +- fangija-zsyf/views/district/detail.html | 122 ++++++++++-------- fangija-zsyf/views/house/cityDetail.html | 30 ++--- fangija-zsyf/views/house/houseDetail.html | 2 +- fangija-zsyf/views/rent/rent.html | 26 ++-- 7 files changed, 109 insertions(+), 94 deletions(-) diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index fc919d7..70b83fc 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -852,9 +852,6 @@ input::-webkit-input-placeholder{ /* 图表 */ .chart{width:100%;height:250px;} .chart tspan{font-size:0.6rem;text-shadow:none;} -#tabChart{width:100%;height:360px;} -#tabChart1{width:100%;position:absolute;z-index:1;} -#tabChart2{width:100%;display:block;position:absolute;z-index:-1;} .scoreBox{height:130px;position:relative;} .score{width:250px;height:250px;margin:0 auto;margin-top:1rem;} .scoreText{width:250px;height:150px;position:absolute;top:0;left:50%;margin-left:-125px;} @@ -874,7 +871,7 @@ input::-webkit-input-placeholder{ .priceBox div em.up i{background:url(../images/up.png) no-repeat center center;background-size:100%;} .priceBox div em.down i{background:url(../images/down.png) no-repeat center center;background-size:100%;} -.topic .topicTitle > div.content-block{float:right;margin-top:0.6rem;padding:0;} +.topic .topicTitle > div.content-block{padding:0;margin:0;position:absolute;top:0.6rem;right:0;z-index:100;} .topic .date{text-align:right;font-size:0.75rem;color:#ccc;padding-right:0.75rem;margin:0;} .buttons-row .button{height:1.35rem;line-height:1.35rem;} .buttons-row01 .button{border-radius:0.1rem;margin-left:0.5rem;padding:0;font-size:0.65rem;} diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index e70cffb..fc5cb03 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -343,7 +343,7 @@ var option01 = { legend: { show: false, top: 30, - data: ['均价', '成交量'] + data: ['均价'] }, tooltip: { triggerOn: 'none', @@ -382,8 +382,8 @@ var option01 = { type: 'slider', xAxisIndex: [0, 1], realtime: false, - start: 0, - end: 100, + start: 5, + end: 95, top: 65, height: 20, handleIcon: 'M10.7,11.9H9.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z', @@ -454,7 +454,7 @@ var option01 = { formatter: '{value}\n' } }, { - name: '成交量(套)', + name: '', nameRotate: 90, nameLocation: 'center', nameGap: 5, @@ -514,10 +514,10 @@ var option01 = { borderColor0: '#88D053' }, emphasis: { - color: 'black', - color0: '#333', - borderColor: 'black', - borderColor0: '#333' + color: '#F18D00', + color0: '#666', + borderColor: '#F18D00', + borderColor0: '#666' } } }] diff --git a/fangija-zsyf/views/component/baseInfoComponent.js b/fangija-zsyf/views/component/baseInfoComponent.js index f7ce495..abc8111 100644 --- a/fangija-zsyf/views/component/baseInfoComponent.js +++ b/fangija-zsyf/views/component/baseInfoComponent.js @@ -27,7 +27,7 @@ Vue.component('base-info-component', {