diff --git a/fangija-zsyf/js/city.js b/fangija-zsyf/js/city.js
new file mode 100644
index 0000000..dcfe49a
--- /dev/null
+++ b/fangija-zsyf/js/city.js
@@ -0,0 +1,72 @@
+var renameCitys = [{"baiduCity": "阿克苏地区", "city": "阿克苏"},
+ {"baiduCity": "阿勒泰地区", "city": "阿勒泰"},
+ {"baiduCity": "阿里地区", "city": "阿里"},
+ {"baiduCity": "博尔塔拉蒙古自治州", "city": "博尔塔拉"},
+ {"baiduCity": "昌都地区", "city": "昌都"},
+ {"baiduCity": "昌吉回族自治州", "city": "昌吉"},
+ {"baiduCity": "白沙黎族自治县", "city": "白沙"},
+ {"baiduCity": "保亭黎族苗族自治县", "city": "保亭"},
+ {"baiduCity": "巴音郭楞蒙古自治州", "city": "巴音郭楞"},
+ {"baiduCity": "毕节地区", "city": "毕节"},
+ {"baiduCity": "昌都地区", "city": "昌都"},
+ {"baiduCity": "昌江黎族自治县", "city": "昌江"},
+ {"baiduCity": "楚雄彝族自治州", "city": "楚雄"},
+ {"baiduCity": "澄迈县", "city": "澄迈"},
+ {"baiduCity": "定安县", "city": "定安"},
+ {"baiduCity": "大兴安岭地区", "city": "大兴安岭"},
+ {"baiduCity": "迪庆藏族自治州", "city": "迪庆州"},
+ {"baiduCity": "德宏傣族景颇族自治州", "city": "德宏州"},
+ {"baiduCity": "恩施土家族苗族自治州", "city": "恩施"},
+ {"baiduCity": "甘南藏族自治州", "city": "甘南"},
+ {"baiduCity": "甘孜藏族自治州", "city": "甘孜州"},
+ {"baiduCity": "果洛藏族自治州", "city": "果洛州"},
+ {"baiduCity": "哈密地区", "city": "哈密"},
+ {"baiduCity": "海北藏族自治州", "city": "海北州"},
+ {"baiduCity": "海南藏族自治州", "city": "海南州"},
+ {"baiduCity": "海西蒙古族藏族自治州", "city": "海西州"},
+ {"baiduCity": "海东地区", "city": "海东"},
+ {"baiduCity": "和田地区", "city": "和田"},
+ {"baiduCity": "红河哈尼族彝族自治州", "city": "红河"},
+ {"baiduCity": "黄南藏族自治州", "city": "黄南州"},
+ {"baiduCity": "喀什地区", "city": "喀什"},
+ {"baiduCity": "克孜勒苏柯尔克孜自治州", "city": "克孜勒苏"},
+ {"baiduCity": "乐东黎族自治县", "city": "乐东"},
+ {"baiduCity": "凉山彝族自治州", "city": "凉山州"},
+ {"baiduCity": "临高县", "city": "临高"},
+ {"baiduCity": "临夏回族自治州", "city": "临夏"},
+ {"baiduCity": "陵水黎族自治县", "city": "陵水"},
+ {"baiduCity": "林芝地区", "city": "林芝"},
+ {"baiduCity": "那曲地区", "city": "那曲"},
+ {"baiduCity": "怒江傈僳族自治州", "city": "怒江州"},
+ {"baiduCity": "琼中黎族苗族自治县", "city": "琼中"},
+ {"baiduCity": "黔东南苗族侗族自治州", "city": "黔东南"},
+ {"baiduCity": "黔南布依族苗族自治州", "city": "黔南"},
+ {"baiduCity": "黔西南布依族苗族自治州", "city": "黔西南"},
+ {"baiduCity": "日喀则地区", "city": "日喀则"},
+ {"baiduCity": "山南地区", "city": "山南"},
+ {"baiduCity": "神农架林区", "city": "神农架"},
+ {"baiduCity": "塔城地区", "city": "塔城"},
+ {"baiduCity": "铜仁地区", "city": "铜仁"},
+ {"baiduCity": "吐鲁番地区", "city": "吐鲁番"},
+ {"baiduCity": "屯昌县", "city": "屯昌"},
+ {"baiduCity": "文山壮族苗族自治州", "city": "文山州"},
+ {"baiduCity": "西双版纳傣族自治州", "city": "西双版纳州"},
+ {"baiduCity": "湘西土家族苗族自治州", "city": "湘西"},
+ {"baiduCity": "延边朝鲜族自治州", "city": "延边"},
+ {"baiduCity": "伊犁哈萨克自治州", "city": "伊犁"},
+ {"baiduCity": "玉树藏族自治州", "city": "玉树州"}];
+/**
+ * 把百度的城市格式化成房价网的城市
+ * @param baiduCity
+ * @returns {string}
+ */
+function formatBaiduCity(baiduCity) {
+ var newCity = "";
+ for (var i = 0; i < renameCitys.length; i++) {
+ if (renameCitys[i].baiduCity == baiduCity) {
+ newCity = renameCitys[i].city;
+ break;
+ }
+ }
+ return newCity;
+}
diff --git a/fangija-zsyf/js/district/districtDetail.js b/fangija-zsyf/js/district/districtDetail.js
index d625c0a..70c6ffc 100644
--- a/fangija-zsyf/js/district/districtDetail.js
+++ b/fangija-zsyf/js/district/districtDetail.js
@@ -334,194 +334,199 @@ function showTrends(v){
var option01 = {
- 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;
+ 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: 1,
+ end: 99,
+ top: 5,
+ 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: '#666' } },
+ axisLabel: {
+ formatter: function (value) {
+ return echarts.format.formatTime('MM-dd', value);
}
},
+ min: 'dataMin',
+ max: 'dataMax',
axisPointer: {
- link: [{
- xAxisIndex: [0, 1]
- }]
- },
- dataZoom: [{
- type: 'slider',
- xAxisIndex: [0, 1],
- realtime: false,
- 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',
- 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: '#666' } },
+ show: true
+ }
+ }, {
+ type: 'category',
+ gridIndex: 1,
+ data: dates,
+ scale: false,
+ boundaryGap : false,
+ splitLine: {show: false},
+ axisLabel: {show: false},
+ axisTick: {show: false},
+ axisLine: {lineStyle: { color: '#fff' } },
+ splitNumber: 20,
+ min: 'dataMin',
+ max: 'dataMax',
+ axisPointer: {
+ type: 'line',
+ lineStyle: {
+ color: '#fff',
+ width: 1,
+ type: 'solid'
+ },
+ label: {show: false},
+ triggerTooltip: true,
+ handle: {
+ show: true,
+ margin: -70,
+ color: '#F18D00'
+ }
+ }
+ }],
+ 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: {
- formatter: function (value) {
- return echarts.format.formatTime('MM-dd', value);
- }
- },
- min: 'dataMin',
- max: 'dataMax',
- axisPointer: {
- show: true
+ inside: true,
+ formatter: '{value}\n'
}
}, {
- type: 'category',
+ name: '',
+ nameRotate: 90,
+ nameLocation: 'center',
+ nameGap: 5,
+ position: 'right',
+ nameTextStyle: {
+ color: '#999'
+ },
+ scale: true,
gridIndex: 1,
- data: dates,
- scale: false,
- boundaryGap : false,
- splitLine: {show: false},
+ splitNumber: 2,
axisLabel: {show: false},
+ axisLine: {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: -20,
- color: '#F18D00'
+ splitLine: {show: false}
+ }],
+ grid: [{
+ left: 20,
+ right: 20,
+ top: 60,
+ height: 120
+ }, {
+ left: 20,
+ right: 20,
+ height: 40,
+ top: 260
+ }],
+ graphic: [{
+ type: 'group',
+ left: 'center',
+ top: 70,
+ width: 300,
+ bounding: 'raw'
+ }],
+ series: [/*{
+ name: '成交量',
+ type: 'bar',
+ xAxisIndex: 1,
+ yAxisIndex: 1,
+ itemStyle: {
+ normal: {
+ color: '#87cefa'
+ },
+ emphasis: {
+ color: 'black'
+ }
+ },
+ data: volumes
+ }, */{
+ type: 'candlestick',
+ name: '均价',
+ data: data,
+ itemStyle: {
+ normal: {
+ color: '#EB5F34',
+ color0: '#88D053',
+ borderColor: '#EB5F34',
+ borderColor0: '#88D053'
+ },
+ emphasis: {
+ color: '#F18D00',
+ color0: '#666',
+ borderColor: '#F18D00',
+ borderColor0: '#666'
}
}
- }],
- 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: [/*{
- name: '成交量',
- type: 'bar',
- xAxisIndex: 1,
- yAxisIndex: 1,
- itemStyle: {
- normal: {
- color: '#87cefa'
- },
- emphasis: {
- color: 'black'
- }
- },
- data: volumes
- }, */{
- type: 'candlestick',
- name: '均价',
- data: data,
- itemStyle: {
- normal: {
- color: '#EB5F34',
- color0: '#88D053',
- borderColor: '#EB5F34',
- borderColor0: '#88D053'
- },
- emphasis: {
- color: '#F18D00',
- color0: '#666',
- borderColor: '#F18D00',
- borderColor0: '#666'
- }
- }
- }]
- };
+ }]
+};
/*$("#trendDiv2 a").click(function(){
diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js
index 33f09e9..1dd4e75 100644
--- a/fangija-zsyf/js/quotations/cityDetail.js
+++ b/fangija-zsyf/js/quotations/cityDetail.js
@@ -15,11 +15,12 @@ function loadMyCollectCity(){
if(positionCity){
cityDetaiVue.$data.citys.push(positionCity);
}
-
- $("#cityInfo").hide()
}
+ $("#cityInfo").hide()
plus.nativeUI.closeWaiting();
+
}).catch(function (error) {
+ plus.nativeUI.closeWaiting();
console.log(error);
});
}
@@ -36,8 +37,10 @@ function loadCurCity(city){
cityInfoVue.$data.collecd = false;
}
}
+
plus.nativeUI.closeWaiting();
}).catch(function (error) {
+ plus.nativeUI.closeWaiting();
console.log(error);
});
}
@@ -50,6 +53,7 @@ function loadCityPriceInfo(city){
}
}).then(function (response) {
var data1 = response.data.data
+
if(data1){
var cityObj = new Object();
cityObj.city = data1.city
@@ -62,7 +66,9 @@ function loadCityPriceInfo(city){
cityObj.rangeLevel = data1.rangeLevel
cityObj.time = year + month
cityInfoVue.$data.myCityMap = cityObj;
+ $("#priceDiv").removeClass("dn");
}
+
}).catch(function (error) {
console.log(error);
});
@@ -482,7 +488,18 @@ function collectCity(city, type){
})
return;
} else {
- docollectCity(city, type)
+
+ var title = ""
+ if(type == 0){
+ title = "您确定要添加关注?"
+ }else{
+ title = "您确定要取消关注?"
+ }
+
+ $.confirm(title, function () {
+ docollectCity(city, type)
+ });
+
}
}
diff --git a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js
index 6998105..e06f0e1 100644
--- a/fangija-zsyf/views/component/cityIncreaseRankingComponent.js
+++ b/fangija-zsyf/views/component/cityIncreaseRankingComponent.js
@@ -27,8 +27,8 @@ Vue.component('city_increase_ranking',{
'{{!ci.oneMonthUpDownRange||ci.oneMonthUpDownRange==""?"暂无":Math.abs(100*ci.oneMonthUpDownRange).toFixed(2)+"%"}}'+
''+
'