diff --git a/fangija-zsyf/js/axiosPlugin.js b/fangija-zsyf/js/axiosPlugin.js index 3d46b8e..b3f4b53 100644 --- a/fangija-zsyf/js/axiosPlugin.js +++ b/fangija-zsyf/js/axiosPlugin.js @@ -14,5 +14,6 @@ axios.interceptors.request.use(function (config) { axios.interceptors.response.use(function (response) { return response; }, function (error) { - return Promise.reject(error); + clicked('error.html',true,false,{},{},function(){}) + return Promise.reject(error); }); \ No newline at end of file diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index 4eb5ef7..00f2244 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -5,6 +5,7 @@ var dates; var data; var volumes; var curOption; +var mapLoadCount = 0; /* 关注&已关注切换 */ @@ -35,6 +36,8 @@ function addCollect(){ } alert(12) plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('yfindex.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); }) .catch(function (error) { console.log(error); @@ -67,6 +70,8 @@ function removeCollect(){ $.toast("取消关注"); } plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('yfindex.html').reload(); + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); }) .catch(function (error) { console.log(error); @@ -89,11 +94,20 @@ $("#tabRentDiv").on("click", function () { $("#tabChart1").css("z-index","-1"); }); -var t1 = window.setTimeout(loadMap,1000); +var t1 = window.setInterval(loadMap,1000); function loadMap(){ + mapLoadCount++; if(lng && lat){ loadMapPoi(); - window.clearTimeout(t1); + $("#mapDiv").show(); + window.clearInterval(t1); + }else{ + if(mapLoadCount == 10){ + $("#mapDiv").hide(); + window.clearInterval(t1); + }else{ + $("#mapDiv").hide(); + } } } @@ -271,21 +285,15 @@ function loadKLineData(city, region, name){ counts.push(datas[d][4]); } -// if(haveCount){ option01.xAxis[0].data = times option01.xAxis[1].data = times //option01.series[0].data = counts option01.series[0].data = trends curOption = option01; + var myChart01 = echarts.init(document.getElementById('chart01')); myChart01.setOption(option01,true); -// }else{ -// option02.xAxis[0].data = times -// option02.xAxis[1].data = times -// option02.series[0].data = trends -// curOption = option02; -// myChart01.setOption(option02,true); -// } + } }).catch(function (error) { alert(error) @@ -515,183 +523,6 @@ var option01 = { } }] }; - -/*var option02 = { - animation: false, - color: colorList, - title: { - text: null, - left: 'center' - }, - legend: { - show: false, - top: 30, - data: ['均价'] - }, - tooltip: { - triggerOn: 'none', - transitionDuration: 0, - confine: true, - bordeRadius: 4, - borderWidth: 1, - borderColor: '#333', - backgroundColor: 'rgba(255,255,255,0.9)', - textStyle: { - fontSize: 12, - color: '#333' - }, - formatter: function (params) { - var res = params[0].seriesName + ' ' + params[0].name; - res += '
月初 : ' + params[0].value[1] - res += '
月末 : ' + params[0].value[2]; - res += '
最低 : ' + params[0].value[3]; - res += '
最高 : ' + params[0].value[4]; - return res; - }, - position: function (pos, params, el, elRect, size) { - var obj = { - top: 60 - }; - obj[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 5; - return obj; - } - }, - axisPointer: { - link: [{ - xAxisIndex: [0, 1] - }] - }, - dataZoom: [{ - type: 'slider', - xAxisIndex: [0, 1], - realtime: false, - start: 50, - end: 100, - 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', - handleSize: '120%' - }, { - type: 'inside', - xAxisIndex: [0, 1], - start: 40, - end: 70, - top: 30, - height: 20 - }], - xAxis: [{ - type: 'category', - data: dates, - boundaryGap : false, - axisLine: { lineStyle: { color: '#999' } }, - axisLabel: { - formatter: function (value) { - return echarts.format.formatTime('yy-MM', value); - } - }, - min: 'dataMin', - max: 'dataMax', - axisPointer: { - show: true - } - }, { - type: 'category', - gridIndex: 1, - data: dates, - scale: true, - boundaryGap : false, - splitLine: {show: false}, - axisLabel: {show: false}, - axisTick: {show: false}, - axisLine: { lineStyle: { color: '#fff' } }, - splitNumber: 20, - min: 'dataMin', - max: 'dataMax', - axisPointer: { - type: 'shadow', - label: {show: false}, - triggerTooltip: true, - handle: { - show: true, - margin: 30, - color: '#B80C00' - } - } - }], - yAxis: [{ - name: '均价(元/㎡)', - nameRotate: 90, - nameLocation: 'center', - nameGap: 5, - position: 'right', - nameTextStyle: { - color: '#999' - }, - scale: true, - splitNumber: 2, - axisLine: { lineStyle: { color: '#999' } }, - splitLine: { show: true }, - axisTick: { show: false }, - axisLabel: { - inside: true, - formatter: '{value}\n' - } - }, { - name: '成交量(套)', - nameRotate: 90, - nameLocation: 'center', - nameGap: 5, - position: 'right', - nameTextStyle: { - color: '#999' - }, - scale: true, - gridIndex: 1, - splitNumber: 2, - axisLabel: {show: false}, - axisLine: {show: false}, - axisTick: {show: false}, - splitLine: {show: false} - }], - grid: [{ - left: 20, - right: 20, - top: 110, - height: 120 - }, { - left: 20, - right: 20, - height: 40, - top: 260 - }], - graphic: [{ - type: 'group', - left: 'center', - top: 70, - width: 300, - bounding: 'raw' - }], - series: [ { - type: 'candlestick', - name: '均价', - data: data, - itemStyle: { - normal: { - color: '#ff4500', - color0: '#22ac38', - borderColor: '#ff4500', - borderColor0: '#22ac38' - }, - emphasis: { - color: 'black', - color0: '#444', - borderColor: 'black', - borderColor0: '#444' - } - } - }] - }; -*/ $("#trendDiv2 a").click(function(){ diff --git a/fangija-zsyf/js/quotations/collectCity.js b/fangija-zsyf/js/quotations/collectCity.js index bef734b..1e51f55 100644 --- a/fangija-zsyf/js/quotations/collectCity.js +++ b/fangija-zsyf/js/quotations/collectCity.js @@ -530,7 +530,11 @@ function showRegionInfo(city){ function collectCity(city, index){ if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") { clicked('../user/codeSms.html',true,false,{},{},function(){ + plus.webview.getWebviewById('views/house/houseDetail.html').reload(); collectCity(city) + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('views/user/userInfo.html').reload(); + }) return; } else { @@ -571,12 +575,20 @@ function docollectCity(city){ } } if(isLast){ - window.location.reload(); + //window.location.reload(); + $("a[href='#tabQuotation0']").click(); } myDatasVue.$data.cityDatas = newRet1; citysVue.$data.citys = newRet2 }else{ - alert(msg); + var datas = myDatasVue.$data.cityDatas + for(var i in datas){ + var obj = datas[i] + if(obj.city == city){ + obj.colled = true; + } + } + } } diff --git a/fangija-zsyf/js/user/myFocus.js b/fangija-zsyf/js/user/myFocus.js index 84d4309..54eb467 100644 --- a/fangija-zsyf/js/user/myFocus.js +++ b/fangija-zsyf/js/user/myFocus.js @@ -63,7 +63,7 @@ function addEstate(number, lastIndex) { ''+ '
'+ '
'+(this.address?(this.city+this.region+this.address):'')+'
'+ - '
'+(this.distance?"距您"+this.distance+"m":"暂无")+'
'+ +// '
'+(this.distance?"距您"+this.distance+"m":"暂无")+'
'+ '
'+ '
'+ '
潜力指数: '+starStr+'
'+ diff --git a/fangija-zsyf/js/user/myHouse.js b/fangija-zsyf/js/user/myHouse.js index c4419ab..b184d4b 100644 --- a/fangija-zsyf/js/user/myHouse.js +++ b/fangija-zsyf/js/user/myHouse.js @@ -81,7 +81,7 @@ function mhAddItems(itemsPerLoad, lastIndex, dataObj, xqOneMonthUpDownRangeMap, } html += '
  • '; html += "
    "; - html += "
    "+result.name+" "+tempTotalPrice+"万"; + html += "
    "+tempTotalPrice+"万"; if(result.liveStatus!=null && result.liveStatus.length>0){ html += ""+result.liveStatus+"
    "; }else{ diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index 8ed8840..6bbd6c7 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1568,7 +1568,9 @@ "resources": [ "/views/user/bindingMobile.html" ], - "refer": [], + "refer": [ + "views/user/passLogin.html" + ], "priority": 0 }, "views/district/detail.html": { @@ -1617,7 +1619,8 @@ "refer": [ "views/user/passLogin.html", "views/district/detail.html", - "views/setting/setting.html" + "views/setting/setting.html", + "views/user/codeSms.html" ], "priority": 0 }, @@ -1670,7 +1673,15 @@ "views/house/regions.html", "views/district/detail.html", "views/user/codeSms.html", - "views/house/cityDetail.html" + "views/house/cityDetail.html", + "views/user/passLogin.html" + ], + "priority": 0 + }, + "views/house/houseManageList.html": { + "resources": [], + "refer": [ + "views/house/add.html" ], "priority": 0 } diff --git a/fangija-zsyf/views/component/nearDist.js b/fangija-zsyf/views/component/nearDist.js index 99b2532..a955c91 100644 --- a/fangija-zsyf/views/component/nearDist.js +++ b/fangija-zsyf/views/component/nearDist.js @@ -65,7 +65,7 @@ Vue.component('near-dist-component', { }); }, showDistrict:function(index){ - clicked('../district/detail.html',true,false,{},{city:distDatas.nearDists[index].city,region:distDatas.nearDists[index].region,name:distDatas.nearDists[index].name}); + clicked('../district/detail.html',true,false,{},{city:distDatas.nearDists[index].city,region:distDatas.nearDists[index].district,name:distDatas.nearDists[index].name}); } }, mounted:function(){ diff --git a/fangija-zsyf/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 44abd11..562d89e 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -165,7 +165,7 @@
    -
    +
    位置及周边
  • - +
    均价走势
    @@ -266,10 +266,12 @@ $.config = {router: false} // evaluate_msg.evaluate_words="暂无" // } // evaluate_msg.msg=h.evaluateMsg - $("#img").attr("src",BASE_PATH+"/img/"+h.imgId); - $("#img").click(function(){ - clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){}) - }) + if(typeof(h.imgId)!="undefined"&&h.imgId!=null&&$.trim(h.imgId)!=""){ + $("#img").attr("src",BASE_PATH+"/img/"+h.imgId); + $("#img").click(function(){ + clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){}) + }) + } loadingChart(h.city,h.region,h.name,2) //按照时间范围加载数据 $(".avgPriceTrend a").click(function(){ diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html index 42e362d..cffcb0f 100644 --- a/fangija-zsyf/views/house/detail.html +++ b/fangija-zsyf/views/house/detail.html @@ -61,7 +61,7 @@
    -
    {{name}}{{cityRegion}}
    +
    {{cityRegion}}
      {{area}}m  
    diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 9dcbfe0..3beeede 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -180,7 +180,8 @@ 当前参考均价
    -
    {{myCityMap.cityTopMonthAvgPrice}}元/㎡
    +
    {{myCityMap.cityTopMonthAvgPrice}}元/㎡
    +
    暂无