Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1.2

This commit is contained in:
2018-05-18 17:07:01 +08:00
8 changed files with 29 additions and 21 deletions
+9 -2
View File
@@ -69,8 +69,15 @@
<div class="col-15 tac" v-if="index <= 2"><img :src="'../../images/rankingImg0' + (index+1)+'a.png'"></div>
<div class="col-25">{{info.region}}</div>
<div class="col-33">{{info.avgPrice}}元/㎡</div>
<div class="col-25" v-if="info.oneMonthUpDownRange > 0"><em class="up">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-red"></i></em></div>
<div class="col-25" v-if="info.oneMonthUpDownRange < 0"><em class="down">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-green"></i></em></div>
<div class="col-25" v-if="info.oneMonthUpDownRange>=0">
<em class="up">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-red"></i></em>
</div>
<div class="col-25" v-else-if="info.oneMonthUpDownRange<0">
<em class="down">{{info.oneMonthUpDownRange}}%<i class="icon icon-arrow-green"></i></em>
</div>
<div class="col-25" v-else>
<em class="up">暂无</em>
</div>
</div>
</div>
</a>
@@ -26,7 +26,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
+4 -4
View File
@@ -30,7 +30,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
@@ -139,7 +139,7 @@ $.config = {router: false}
var pageBean=new Vue({
data:{
pageNo:1,
pageNo:2,
pageSize:10
}
});
@@ -215,7 +215,7 @@ $(function() {
.then(function (response) {
tableList.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo==1){
if(pageNo==1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.markup = response.data.data.list[0].markup;
@@ -227,7 +227,7 @@ $(function() {
});
}
//预先加载10条
addItems(pageBean.pageNo, pageBean.pageSize);
addItems(1, 20);
// 上次加载的序号
var lastIndex = 10;
@@ -30,7 +30,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
@@ -146,7 +146,7 @@ $.config = {router: false}
var pageBean=new Vue({
data:{
pageNo:1,
pageNo:2,
pageSize:10
}
});
@@ -222,7 +222,7 @@ $(function() {
.then(function (response) {
tableList.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo==1){
if(pageNo==1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.markup = response.data.data.list[0].markup;
@@ -234,7 +234,7 @@ $(function() {
});
}
//预先加载10条
addItems(1, 10);
addItems(1, 20);
// 上次加载的序号
var lastIndex = 10;
@@ -31,7 +31,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
@@ -161,7 +161,7 @@ $.config = {router: false}
var pageBean=new Vue({
data:{
pageNo:1,
pageNo:2,
pageSize:10
}
});
@@ -237,7 +237,7 @@ $(function() {
.then(function (response) {
tableList.end = response.data.data.end;
tableList.list = tableList.list.concat(response.data.data.list);
if(pageBean.pageNo==1){
if(pageNo==1){
tableList.avgPrice = response.data.data.list[0].avgPrice;
tableList.city = response.data.data.list[0].city;
tableList.index = response.data.data.list[0].index;
@@ -249,7 +249,7 @@ $(function() {
});
}
//预先加载10条
addItems(1, 10);
addItems(1, 20);
// 上次加载的序号
var lastIndex = 10;
+1 -1
View File
@@ -27,7 +27,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav barBorder">
<button class="button button-link button-nav pull-left" onclick="history.go(-1)">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<button class="button button-link button-nav pull-right" onclick="share()">
+5 -5
View File
@@ -59,11 +59,11 @@
</div>
<div class="card-content">
<div class="card-content-inner row">
<span class="col-50" onclick="window.location.href='cityUpRanking.html'">
<span class="col-50" onclick="clicked('cityUpRanking.html', true,false,{},{})">
<em class="up"><strong>{{upRate}}</strong>%</em>
<label>城市上涨</label>
</span>
<span class="col-50" onclick="window.location.href='cityDownRanking.html'">
<span class="col-50" onclick="clicked('cityDownRanking.html', true,false,{},{})">
<em class="down"><strong>{{downRate}}</strong>%</em>
<label>城市下跌</label>
</span>
@@ -89,7 +89,7 @@
<div class="cardNearbyBox cardNearbyBox01 cardRankingBox cardRankingBox01" id="countryRank" v-cloak>
<div class="cardNearbyWin">
<div class="card cardNearby cardRanking" v-for="item in datas">
<a v-if="item.type==0" href="cityRanking.html">
<a v-if="item.type==0" href="#" onclick="clicked('cityRanking.html', true,false,{},{})">
<div class="card-header" v-if="item.type==0">
城市涨幅排行
</div>
@@ -104,7 +104,7 @@
</div>
</a>
<a v-if="item.type==1" href="cityRankingPotential.html">
<a v-if="item.type==1" href="#" onclick="clicked('cityRankingPotential.html', true,false,{},{})">
<div class="card-header" v-if="item.type==1">
城市潜力排行
</div>
@@ -151,7 +151,7 @@
</div>
</a>
<a v-if="item.type==2" href="cityRankingAvgPrice.html">
<a v-if="item.type==2" href="#" onclick="clicked('cityRankingAvgPrice.html', true,false,{},{})">
<div class="card-header" v-if="item.type==2">
城市均价排行
</div>
+1
View File
@@ -1270,6 +1270,7 @@ function getPosition(){
oriLng = p.coords.longitude;
oriLat = p.coords.latitude;
if(region.endWith("区") || region.endWith("市") ){
region = region.substring(0, region.length-1);
}