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 1/5] 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 2/5] =?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 3/5] 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 5/5] =?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) })