diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js index c74e870..4527d18 100644 --- a/fangija-zsyf/js/district/districtDetail.js +++ b/fangija-zsyf/js/district/districtDetail.js @@ -275,21 +275,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) @@ -519,183 +513,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/views/district/detail.html b/fangija-zsyf/views/district/detail.html index 44abd11..38d2322 100644 --- a/fangija-zsyf/views/district/detail.html +++ b/fangija-zsyf/views/district/detail.html @@ -252,7 +252,60 @@ $.config = {router: false} var address; var tags; - var baseInfo = new Vue({ + var baseInfo; + + + + + + + - - - - - diff --git a/fangija-zsyf/views/house/houseManageList.html b/fangija-zsyf/views/house/houseManageList.html index bb0ad74..34f42e4 100644 --- a/fangija-zsyf/views/house/houseManageList.html +++ b/fangija-zsyf/views/house/houseManageList.html @@ -240,13 +240,13 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap var cityAvgPriceValue = cityAvgPriceMap[cityAvgPriceKey]; if(!isNaN(cityAvgPriceValue)){ if(parseInt(cityAvgPriceValue)>=parseInt(result.price)){ - htmlContent = htmlContent + "
相比"+result.city+"均价: 高"+(parseInt(cityAvgPriceValue)-parseInt(result.price))+"元
"; + htmlContent = htmlContent + "
相比"+result.city+"均价: 低"+(parseInt(cityAvgPriceValue)-parseInt(result.price))+"元
"; }else{ - htmlContent = htmlContent + "
相比"+result.city+"均价: 低"+(parseInt(result.price)-parseInt(cityAvgPriceValue))+"元
"; + htmlContent = htmlContent + "
相比"+result.city+"均价: 高"+(parseInt(result.price)-parseInt(cityAvgPriceValue))+"元
"; } }else{ //为非数字清空放空格 - htmlContent = htmlContent + "
相比"+result.city+"均价: "+' '+"
"; + htmlContent = htmlContent + "
相比"+result.city+"均价: 暂无
"; } htmlContent = htmlContent + "
均价: "+result.price+"元/㎡
"; htmlContent = htmlContent + "
"+tempTotalPrice+"万
"; diff --git a/fangija-zsyf/views/rent/rent.html b/fangija-zsyf/views/rent/rent.html index cf45d31..9d34a6f 100644 --- a/fangija-zsyf/views/rent/rent.html +++ b/fangija-zsyf/views/rent/rent.html @@ -35,6 +35,13 @@
+ +
+
+
+
+
+
+ +
+
+ +

您的小区数据目前仍在更新
敬请期待

+
+
+ @@ -190,20 +205,10 @@ function onPlusReady() { city = self.city region = self.region name = self.name; - // loadDistrictInfo(); - - // 创建根实例 new Vue({ el: '#baseInfo' }) - -//new Vue({ -// el: '#nearDistDiv' -//}) -//new Vue({ -// el: '#mapDiv' -//}) } //new Vue({ diff --git a/fangija-zsyf/views/setting/setting.html b/fangija-zsyf/views/setting/setting.html index 53b4c9d..0ef2602 100644 --- a/fangija-zsyf/views/setting/setting.html +++ b/fangija-zsyf/views/setting/setting.html @@ -109,6 +109,7 @@ function logout() { //退出登录之前loading下个人中心 plus.webview.getWebviewById('views/house/houseManageList.html').reload(); plus.webview.getWebviewById('views/user/userInfo.html').reload(); + plus.webview.getWebviewById('yfindex.html').reload(); timer.start(); } diff --git a/fangija-zsyf/views/user/updatePass.html b/fangija-zsyf/views/user/updatePass.html index f601f24..2cb8847 100644 --- a/fangija-zsyf/views/user/updatePass.html +++ b/fangija-zsyf/views/user/updatePass.html @@ -111,7 +111,11 @@ new Vue({ }, // 修改密码 updatePass: function() { - if (this.pass == '' || this.pass.length < 7) { + if (this.pass == '') { + $.toast("请输入密码"); + return; + } + if (this.pass.length < 7) { $.toast("请输入6位以上数字或字母"); return; } diff --git a/fangija-zsyf/views/user/userInfo.html b/fangija-zsyf/views/user/userInfo.html index e071a1a..c9374ff 100644 --- a/fangija-zsyf/views/user/userInfo.html +++ b/fangija-zsyf/views/user/userInfo.html @@ -292,6 +292,8 @@ function checkIsLogin(){ //跳转登录方法, 考虑回调 function gotoLogin(){ clicked('/views/user/codeSms.html',true,false,{},{},function(){ + plus.webview.getWebviewById('views/house/houseManageList.html').reload(); + plus.webview.getWebviewById('yfindex.html').reload(); checkIsLogin(); }) } @@ -305,10 +307,12 @@ function gotoUpdatePass(){ function gotoLoanApply(houseId, city){ clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: city, mobile: _mobile},function(){}) } + //跳转到小区详情 function gotoDistrictDetail(city,region,name){ clicked('/views/district/detail.html',true,false,{},{city:city,region:region,name:name},function(){}) } + //跳转房产详情 function gotoHouseDetail(id){ clicked('/views/house/detail.html',true,false,{},{houseId:id},function(){