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 01/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 02/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', {