diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index 06da6da..5f3c7a7 100644 --- a/fangija-zsyf/css/main.css +++ b/fangija-zsyf/css/main.css @@ -854,9 +854,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;} @@ -876,7 +873,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/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/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', {
diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js index de7e321..411193a 100644 --- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js +++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js @@ -56,6 +56,7 @@ Vue.component('city_increase_ranking',{ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus() + reloadCityPotentialRanking() plus.webview.getWebviewById('views/house/houseDetail.html').reload(); plus.webview.getWebviewById('views/house/houseManageList.html').reload(); plus.webview.getWebviewById('views/user/userInfo.html').reload(); @@ -70,6 +71,7 @@ Vue.component('city_increase_ranking',{ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus() + reloadCityPotentialRanking() cityDetaiVue.$data.citys.push(city); }).catch(function(error){ console.log(error) @@ -91,6 +93,7 @@ Vue.component('city_increase_ranking',{ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus(); + reloadCityPotentialRanking() //plus.webview.getWebviewById('views/user/userInfo.html').reload() var da = cityDetaiVue.$data.citys if(da && da.length>0){ @@ -111,3 +114,11 @@ Vue.component('city_increase_ranking',{ this.loadCityIncreaseRanking(); } }) + +function reloadCityIncreaseRanking(){ + axios.get("/rest/quotations/markUpTopInfos").then(function(response){ + cityIncreaseRankingData.cityIncreaseRankingList = response.data.data; + }).catch(function(error){ + console.log(error) + }) +} diff --git a/fangija-zsyf/views/component/cityPotentialRankingComponent.js b/fangija-zsyf/views/component/cityPotentialRankingComponent.js index 8875151..73c205a 100644 --- a/fangija-zsyf/views/component/cityPotentialRankingComponent.js +++ b/fangija-zsyf/views/component/cityPotentialRankingComponent.js @@ -69,16 +69,15 @@ Vue.component('city_potential_ranking',{ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ clicked('/views/user/passLogin.html',true,false,{},{},function(){ if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){ - alert("rrrr") }else{ axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); - alert(city) plus.webview.getWebviewById('views/house/houseDetail.html').reload(); plus.webview.getWebviewById('views/house/houseManageList.html').reload(); plus.webview.getWebviewById('views/user/userInfo.html').reload(); reloadMyFocus() + reloadCityIncreaseRanking() //cityDetaiVue.$data.citys.push(city); }).catch(function(error){ console.log(error) @@ -90,6 +89,7 @@ Vue.component('city_potential_ranking',{ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus() + reloadCityIncreaseRanking() cityDetaiVue.$data.citys.push(city); //plus.webview.getWebviewById('views/user/userInfo.html').reload(); }).catch(function(error){ @@ -103,7 +103,7 @@ Vue.component('city_potential_ranking',{ $(event.target).parent().children().removeClass("dn"); $(event.target).addClass("dn"); reloadMyFocus() - + reloadCityIncreaseRanking() var da = cityDetaiVue.$data.citys if(da && da.length>0){ var index = da.indexOf(city) @@ -121,4 +121,24 @@ Vue.component('city_potential_ranking',{ mounted:function(){ this.loadCityPotentialRanking(); } -}) \ No newline at end of file +}) + +function reloadCityPotentialRanking(){ + axios.get("/rest/quotations/potentialUpTopInfos").then(function(response){ + list = response.data.data; + $(list).each(function(i){ + var index = this.index; + var totalHalfStar = Math.round(Math.round(index/5)/2) //总半星 + var starNum = Math.floor(totalHalfStar/2) //全星 + var halfStarNum = totalHalfStar%2 //半星 + var noneStarNum = 5-starNum-halfStarNum //空星 + this.starNum = starNum; + this.halfStarNum = halfStarNum; + this.noneStarNum = noneStarNum; + }) + cityPotentialRankingData.cityPotentialRankingList = response.data.data; + + }).catch(function(error){ + console.log(error) + }) +} diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 0b3a0d8..deb2de7 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -30,9 +30,6 @@ .cardNearbyBox01 .cardNearby .card-header{padding-top:0;} .topic .topicTitle > span.star{float:none;} .topic .topicTitle > span.star .icon{vertical-align:middle;} - .tabs{width:100%;height:350px;} - .tabChart1{z-index:1;} - .tabChart2{z-index:-1;} .mark-icon-box {width:24px;height:30px;position:absolute;z-index:98;} .mark-icon-box .mark-icon {width: 20px;height: 30px;display: block;cursor: pointer;font-size: 14px; color: #fff;font-weight: bold;text-align: center;line-height: 24px;background: url(../../images/dw.png) no-repeat;} @@ -111,8 +108,29 @@