Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
This commit is contained in:
+5
-24
@@ -11,33 +11,13 @@
|
||||
|
||||
<link rel="stylesheet" href="css/sm.css">
|
||||
<link rel="stylesheet" href="css/main.css">
|
||||
<link rel="stylesheet" href="css/theme-blue.css">
|
||||
<link rel="stylesheet" href="css/theme-orange.css">
|
||||
|
||||
<style>
|
||||
.contentError img{width:20%;margin-bottom:1.5rem;}
|
||||
.contentError em{font-size:1rem;color:#8890a4;margin-bottom:0.5rem;}
|
||||
.contentError p{color:#bac0ce;}
|
||||
.contentError a{width:50%;margin:0 auto;margin-top:2rem;text-decoration:none;}
|
||||
.iback {
|
||||
background: no-repeat center center url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABYCAYAAAADWlKCAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAKwwAACsMBNCkkqwAAABZ0RVh0Q3JlYXRpb24gVGltZQAwOS8xMi8xM5w+I3MAAAAcdEVYdFNvZnR3YXJlAEFkb2JlIEZpcmV3b3JrcyBDUzVxteM2AAACcklEQVR4nO3a0XESURiG4TeO99iBWoGZ+RvADtKBpAPtwBLsANJBrEAs4MyYDmIHSQXkgk0mMLK7ILt8/+F778ici394OGfDsher1Qqn05tTD+A2M4hYBhHLIGIZRCyDiGUQsQwilkHEMohYBhHLIGIZRCyDiGUQsQwilkHEMohYBhHLIGIZRCyDiGUQsQwilkHEMohYb089wNCVUq6Ay+blfUQsTjhOZxc1P9tbSlkAX7b+/C0ifpxgnF5Ve2TtwAD4OvIoe1UlSAsGwPsRR9m76kA6MAD+jjTKQVUF0gMD4HaEUQ6umot6T4ybiJgNP83hVbFDasGACnZIT4yfEXE1wjj/Xeod0hPjDpgNPsyRSguyB8Y0Ih6Gn+g4pQSpFQMSgtSMAclAaseARCDngAFJQM4FAxKAnBMGiH8xLKVMgV89ln6MiPthpxkn6R0SEUvgusfSZSnlsnuZftI75LlSygyYdyx7ZH1s/Rl+ouFKAQIvx9ctMGlZlh4lDQhAcywtqRhF+hqyXfMmT1m/6buasL6mzMaY6dilAoENlLuWZRNgnhEl1ZH1ulLKO9bH16eOpdfqz2K9Lt0Oea75EjilfadAsp2SFgQ2UH53LJ2XUr4PPtARSntkbVfL7+rVgEBvlM/NHQDJUh9Z2zWf/puOZbPhJzm8qkDgBaXt/teHcSY5rOpAAJp/c/vclJSrShDYifKI+NPvVV3U/1VzU3LavFyo/25SPUi2qj2ysmYQsQwilkHEMohYBhHLIGIZRCyDiGUQsQwilkHEMohYBhHLIGIZRCyDiGUQsQwilkHEMohYBhHLIGIZRCyDiGUQsZ4Ak9fPFwUy/HsAAAAASUVORK5CYII=);
|
||||
background-size: 50px 44px;
|
||||
}
|
||||
header {
|
||||
|
||||
background: #D74B28;
|
||||
/*background: -webkit-linear-gradient(top,rgba(215,75,40,1),rgba(215,75,40,0.8));*/
|
||||
z-index: 9999;
|
||||
/*border-bottom: 1px solid rgba(215,75,40,0.8);*/
|
||||
-ms-touch-action: none;
|
||||
}
|
||||
.nvbt {
|
||||
width:5%;
|
||||
height:100%;
|
||||
float:left;
|
||||
overflow:hidden;
|
||||
text-overflow:ellipsis;
|
||||
white-space:nowrap;
|
||||
}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
@@ -46,9 +26,10 @@ header {
|
||||
|
||||
<div class="page-group">
|
||||
<div class="page page-current">
|
||||
<header class="bar bar-nav">
|
||||
<div class="nvbt iback" onclick="back(),plus.nativeUI.closeWaiting();"></div>
|
||||
<h1 class="title"></h1>
|
||||
<header class="bar bar-nav barBorder">
|
||||
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
|
||||
<span class="icon icon-left"></span>
|
||||
</button>
|
||||
</header>
|
||||
<div class="content contentError">
|
||||
<img src="img/errorInternet.png">
|
||||
|
||||
@@ -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 += '<br/> 月初 : ' + params[0].value[1];
|
||||
res += '<br/> 月末 : ' + params[0].value[2];
|
||||
res += '<br/> 最低 : ' + params[0].value[3];
|
||||
res += '<br/> 最高 : ' + 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 += '<br/> 月初 : ' + params[0].value[1];
|
||||
res += '<br/> 月末 : ' + params[0].value[2];
|
||||
res += '<br/> 最低 : ' + params[0].value[3];
|
||||
res += '<br/> 最高 : ' + 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(){
|
||||
|
||||
@@ -310,7 +310,7 @@
|
||||
"description": "可选,微信分享",
|
||||
"appid": "wx734a9e3085abcd90",
|
||||
"appsecret": "47ce59f3c52984c4e193880fb09b12af"
|
||||
}
|
||||
},"qq":{"appid":"1106734669","description":"QQ分享"},"sina":{"appkey":"3194052034","appsecret":"e863ae4e4f14d41af3142e5ae06867dd","redirect_uri":"http://fangjia.com","description":"可选,新浪微博分享"}
|
||||
},
|
||||
"payment": {},
|
||||
"oauth": {
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="chart" id="chart01" style="height:320px;margin-top:-2.75rem;"></div>
|
||||
<div class="chart" id="chart01" style="height:270px;"></div>
|
||||
<div class="topicTitle topicTitle01" style="position:relative;border-top:solid 1px #e7e7e7;">租金
|
||||
<div class="content-block">
|
||||
<div class="buttons-row theme" id="trendDiv2">
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
<div class="page-group">
|
||||
<div class="page page-current">
|
||||
|
||||
<header class="bar bar-nav barBorder ">
|
||||
<header class="bar bar-nav barBorder">
|
||||
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
|
||||
<span class="icon icon-left"></span>
|
||||
</button>
|
||||
@@ -38,7 +38,7 @@
|
||||
<div class="card cardPrice cardPrice01 cardCity01 dn" id="priceDiv" v-bind:hrefid="myCityMap.hrefId">
|
||||
<div class="card-header">
|
||||
<label>{{myCityMap.city}}</label>
|
||||
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city, 1)">取消关注</a>
|
||||
<a v-if="collecd" class="button collection collection02" @click="collectCity(myCityMap.city, 1)">取消关注</a>
|
||||
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city, 0)">关注</a>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -228,34 +228,26 @@
|
||||
</div>
|
||||
<div class="topic">
|
||||
<div class="topicTitle">小区走势分析</div>
|
||||
<div class="topicContent" style="padding:0;">
|
||||
<div class="content-block content-block01 content-block01a">
|
||||
<div class="buttons-row theme" id="trendTabDiv">
|
||||
<a href="#tabChart1" class="tab-link button active" id="tabAvgDiv">均价</a>
|
||||
<a href="#tabChart2" class="tab-link button" id="tabRentDiv">租金</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tabs">
|
||||
<div id="tabChart1" class="tab tabChart1 active">
|
||||
<div class="content-block content-block01a" style="margin:0;padding-left:0;padding-right:0;">
|
||||
<div class="buttons-row theme" style="padding:0 0.75rem;" id="trendDiv1">
|
||||
<a t-v="6" class="tab-link button active" onclick="showTrends(6)">半年</a>
|
||||
<a t-v="12" class="tab-link button" onclick="showTrends(12)">一年</a>
|
||||
<a t-v="36" class="tab-link button" onclick="showTrends(36)">三年</a>
|
||||
</div>
|
||||
<div class="chart" id="chart01" style="height:360px;"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="tabChart2" class="tab tabChart2" style="display: block;">
|
||||
<div class="content-block content-block01a" style="margin:0;padding-left:0;padding-right:0;">
|
||||
<div class="buttons-row theme" style="padding:0 0.75rem;" id="trendDiv2">
|
||||
<a t-v="2" id="trendDivTab2" class="tab-link button active" onclick="showLoadRentTrends(2)">半年</a>
|
||||
<a t-v="3" id="trendDivTab3" class="tab-link button" onclick="showLoadRentTrends(3)">一年</a>
|
||||
</div>
|
||||
<div class="chart" id="chart02" style="margin-top:0.75rem;"></div>
|
||||
<div class="topicContent" style="padding:0;padding-bottom:0.75rem;">
|
||||
<div class="topicTitle topicTitle01" style="position:relative;">均价
|
||||
<div class="content-block">
|
||||
<div class="buttons-row theme" id="trendDiv1">
|
||||
<a t-v="6" class="tab-link button active" onclick="showTrends(6)">半年</a>
|
||||
<a t-v="12" class="tab-link button" onclick="showTrends(12)">一年</a>
|
||||
<a t-v="36" class="tab-link button" onclick="showTrends(36)">三年</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="chart" id="chart01" style="height:270px;"></div>
|
||||
<div class="topicTitle topicTitle01" style="position:relative;border-top:solid 1px #e7e7e7;">租金
|
||||
<div class="content-block">
|
||||
<div class="buttons-row theme" id="trendDiv2">
|
||||
<a t-v="2" id="trendDivTab2" class="tab-link button active" onclick="showLoadRentTrends(2)">半年</a>
|
||||
<a t-v="3" id="trendDivTab3" class="tab-link button" onclick="showLoadRentTrends(3)">一年</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="chart" id="chart02"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="topic" v-show="rentRooms.length>0">
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
|
||||
<div class="card-header">
|
||||
<label>{{myCityMap.city}}</label>
|
||||
<a v-if="collecd" class="button theme collection collection02 " @click="collectCity(myCityMap.city, 1)">取消关注</a>
|
||||
<a v-if="collecd" class="button collection collection02 " @click="collectCity(myCityMap.city, 1)">取消关注</a>
|
||||
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city, 0)">关注</a>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user