diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css index edb2105..5f3c7a7 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;} @@ -852,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;} @@ -874,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;} @@ -1060,7 +1059,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;} 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) { 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/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/manifest.json b/fangija-zsyf/manifest.json index 10a872c..672f893 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1721,6 +1721,27 @@ } }, "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/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" ] } \ No newline at end of file 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/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/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 @@
    小区走势分析
    -
    -

    房产行情

    -
    -
    +
    +
    全国
    {{mycollectcity}} @@ -46,8 +46,8 @@
    -
    -
    +
    +
    @@ -80,7 +80,7 @@
    -
    +
    @@ -168,11 +168,11 @@
    -
    +
    - 取消 + 取消关注 关注
    @@ -1576,6 +1576,13 @@ function addFocus(city){ reloadCityIncreaseRanking() reloadCityPotentialRanking() 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) }) 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/rent.html b/fangija-zsyf/views/rent/rent.html index bc76248..dc4ae04 100644 --- a/fangija-zsyf/views/rent/rent.html +++ b/fangija-zsyf/views/rent/rent.html @@ -61,8 +61,8 @@
    {{city}}{{region}}{{address}}
    @@ -212,17 +212,17 @@ function onPlusReady() { }) } -/*baseInfo = new Vue({ - el: '#districtBaseInfo', - data: { - name : "", - city:"", - region: "", - address: "", - tags:[] - } - })*/ - +//baseInfo = new Vue({ +// el: '#districtBaseInfo', +// data: { +// name : "", +// city:"", +// region: "", +// address: "", +// tags:[] +// } +// }) +// /* 小区租金走势 */ loadRentTrends(city, region, name); 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);