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

This commit is contained in:
zongzhimin
2018-04-17 13:42:33 +08:00
19 changed files with 436 additions and 342 deletions
+5 -24
View File
@@ -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">
+2
View File
@@ -21,6 +21,8 @@ axios.interceptors.response.use(function (response) {
window.location.reload();
})
}else{
$(".loadingBg").hide();
plus.nativeUI.closeWaiting();
plus.webview.getWebviewById("error.html").show();
}
}
+1 -1
View File
@@ -21,7 +21,7 @@ $(document).on("click",".open-about01", function () {
if(collects){
if(collects.indexOf(text)>-1){
$(this).addClass("collectionCity");
$(this).find("i").addClass("icon-collection03");
//$(this).find("i").addClass("icon-collection03");
}
}
+72
View File
@@ -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;
}
+182 -177
View File
@@ -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(){
+22 -4
View File
@@ -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)
});
}
}
@@ -496,6 +513,7 @@ function docollectCity(city, type){
}).then(function (response) {
var msg = response.data.message;
if(msg){
if(msg == "取消关注成功"){
try{
cityInfoVue.$data.collecd = false;
@@ -503,7 +521,7 @@ function docollectCity(city, type){
var da = cityDetaiVue.$data.citys
if(da && da.length>0){
var index = da.indexOf(city)
if(index>0){
if(index>=0){
da.splice(index, 1)
cityDetaiVue.$data.citys = da;
if(da.length>0){
+3 -2
View File
@@ -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": {
@@ -1545,7 +1545,8 @@
"error.html",
"views/rent/rent.html",
"views/district/detail.html",
"views/house/houseList.html"
"views/house/houseList.html",
"views/house/cityDetail.html"
],
"priority": 0
},
@@ -27,8 +27,8 @@ Vue.component('city_increase_ranking',{
'<em class="up">{{!ci.oneMonthUpDownRange||ci.oneMonthUpDownRange==""?"暂无":Math.abs(100*ci.oneMonthUpDownRange).toFixed(2)+"%"}}<i class="icon" v-bind:class="[ci.oneMonthUpDownRange>0?&quot;icon-arrow-red&quot;:&quot;&quot;,ci.oneMonthUpDownRange<0?&quot;icon-arrow-green&quot;:&quot;&quot;]"></i></em>'+
'</div>'+
'<div class="col-20">'+
'<i class="button theme collection collection01" v-bind:class="{dn:ci.follow}" v-on:click="follow(ci.city,$event, 0)">关注</i>'+
'<i class="button collection collection02" v-bind:class="{dn:!ci.follow}" v-on:click="abolish(ci.city,$event, 1)">取消</i>'+
'<i class="button theme collection collection01 confirm-ok" v-bind:class="{dn:ci.follow}" v-on:click="follow(ci.city,$event, 0)" >关注</i>'+
'<i class="button collection collection02 confirm-ok" v-bind:class="{dn:!ci.follow}" v-on:click="abolish(ci.city,$event, 1)">取消</i>'+
'</div>'+
'</div>'+
'</div>'+
@@ -48,46 +48,39 @@ Vue.component('city_increase_ranking',{
})
},
follow:function(city,event, type){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
clicked('/views/user/passLogin.html',true,false,{},{},function(){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
}else{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityPotentialRanking()
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
//cityDetaiVue.$data.citys.push(city);
}).catch(function(error){
console.log(error)
})
}
})
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
}else{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityPotentialRanking()
cityDetaiVue.$data.citys.push(city);
}
}).catch(function(error){
console.log(error)
})
$.confirm('您确定要关注'+city+"?", function () {
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
}else{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityPotentialRanking()
if(type == 0){
var curDatas = cityDetaiVue.$data.citys
if(curDatas && curDatas.length>0){
if(!IsInArray(curDatas, city)){
cityDetaiVue.$data.citys.push(city);
}
}
}
}
}).catch(function(error){
console.log(error)
})
});
}
},
@@ -101,23 +94,26 @@ Vue.component('city_increase_ranking',{
}
})
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus();
reloadCityPotentialRanking()
//plus.webview.getWebviewById('views/user/userInfo.html').reload()
var da = cityDetaiVue.$data.citys
if(da && da.length>0){
var index = da.indexOf(city)
if(index>0){
da.splice(index, 1)
cityDetaiVue.$data.citys = da;
}
}
}).catch(function(error){
console.log(error)
})
$.confirm("您确定要取消关注?", function () {
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus();
reloadCityPotentialRanking()
//plus.webview.getWebviewById('views/user/userInfo.html').reload()
var da = cityDetaiVue.$data.citys
if(da && da.length>0){
var index = da.indexOf(city)
if(index>0){
da.splice(index, 1)
cityDetaiVue.$data.citys = da;
}
}
}).catch(function(error){
console.log(error)
})
});
}
}
@@ -69,26 +69,28 @@ Vue.component('city_potential_ranking',{
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
clicked('/views/user/passLogin.html',true,false,{},{},function(){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
alert("rrrr")
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
}else{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
reloadMyFocus()
reloadCityIncreaseRanking()
//cityDetaiVue.$data.citys.push(city);
}
}).catch(function(error){
console.log(error)
})
$.confirm('您确定要关注'+city+"?", function () {
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
}else{
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
reloadMyFocus()
reloadCityIncreaseRanking()
//cityDetaiVue.$data.citys.push(city);
}
}).catch(function(error){
console.log(error)
})
});
}
})
}else{
@@ -101,7 +103,14 @@ Vue.component('city_potential_ranking',{
$(event.target).addClass("dn");
reloadMyFocus()
reloadCityIncreaseRanking()
cityDetaiVue.$data.citys.push(city);
if(type == 0){
var curDatas = cityDetaiVue.$data.citys
if(curDatas && curDatas.length>0){
if(!IsInArray(curDatas, city)){
cityDetaiVue.$data.citys.push(city);
}
}
}
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
}).catch(function(error){
+1 -1
View File
@@ -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">
@@ -34,7 +34,7 @@
<h1 class="title">评估报告</h1>
</header>
<div class="content">
<div class="list-block media-list" id="house_info">
<div class="list-block media-list" id="house_info" v-cloak>
<ul>
<li>
<div class="item-content">
@@ -51,7 +51,7 @@
</li>
</ul>
</div>
<div class="card cardPrice cardPrice01" id="house_price">
<div class="card cardPrice cardPrice01" id="house_price" v-cloak>
<div class="card-header">
<span>评估总价</span>
<span>均价:<em>{{avg_price}}</em></span>
+14 -18
View File
@@ -28,24 +28,24 @@
<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>
</header>
<div class="content" id="cityInfo">
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
<div class="content" id="cityInfo" v-cloak>
<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>
<div class="card-header">
<span>当前参考均价</span>
</div>
<div class="card-content">
<div class="card-content" >
<div class="card-content-inner" v-if="myCityMap.cityTopMonthAvgPrice">{{myCityMap.cityTopMonthAvgPrice}}<span>元/㎡</span></div>
<div class="card-content-inner" v-else>暂无</div>
</div>
@@ -151,8 +151,14 @@ $.config = {router: false}
var date = new Date();
var year = date.getFullYear()+'年';
var month = date.getMonth()+1+'月';
var city = "神农架"
var cityInfoVue = new Vue({
var city = "普洱"
var cityInfoVue;
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
city = self.city
cityInfoVue = new Vue({
el: '#cityInfo',
data: {
city:"",
@@ -162,12 +168,7 @@ var cityInfoVue = new Vue({
myCityMap : []
}
});
document.addEventListener('plusready', onPlusReady, false);
function onPlusReady() {
var self = plus.webview.currentWebview();
var city = self.city
cityInfoVue.$data.city = city;
cityInfoVue.$data.city = city;
loadCurCity(city);
loadCityPriceInfo(city)
loadUpOrDown(city);
@@ -176,11 +177,6 @@ function onPlusReady() {
}
//loadCurCity(city);
// loadCityPriceInfo(city)
// loadUpOrDown(city);
// loadHotDistrict(city)
// loadCityPricesAndCounts(city)
+17 -25
View File
@@ -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">
+18 -3
View File
@@ -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>
@@ -1565,7 +1565,14 @@ function addFocus(city){
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
createData(city, myDatasVue.$data.cityDatas.length);
var curDatas = response.data.data
if(curDatas && curDatas.length>0){
if(!IsInArray(curDatas, city)){
cityDetaiVue.$data.citys.push(city);
}
}
}).catch(function(error){
console.log(error)
})
@@ -1577,7 +1584,15 @@ function addFocus(city){
reloadMyFocus()
reloadCityIncreaseRanking()
reloadCityPotentialRanking()
cityDetaiVue.$data.citys.push(city);
var curDatas = cityDetaiVue.$data.citys
if(curDatas && curDatas.length>0){
if(!IsInArray(curDatas, city)){
cityDetaiVue.$data.citys.push(city);
}
}
} else {
$.toast(response.data.message);
}
+1 -1
View File
@@ -57,7 +57,7 @@
<h1 class="title">我的房产</h1>
</header>
<div class="content infinite-scroll infinite-scroll-bottom" data-distance="50">
<div class="card cardPrice cardPrice01" id="houseInfo">
<div class="card cardPrice cardPrice01" id="houseInfo" v-cloak>
<div class="card-header">
<span>房产总值</span>
<a class="button theme" href="#" onclick="gotoAddHouse()">添加房产</a>
@@ -156,7 +156,7 @@ function addManagement(id, houseStatus, liveStatus){
$('.loadingBgDiv').show();
checkIsLogin();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
plus.webview.getWebviewById('yfindex.html').reload();
//plus.webview.getWebviewById('yfindex.html').reload();
}else{
$.toast(response.data.message);
}
+1 -1
View File
@@ -106,7 +106,7 @@ mui.init({
});
function logout() {
plus.webview.getWebviewById('yfindex.html').reload();
//plus.webview.getWebviewById('yfindex.html').reload();
localStorage.removeItem("user_token");
localStorage.removeItem("user_token_add_time");
//退出登录之前loading下个人中心
+2 -2
View File
@@ -142,7 +142,7 @@
</div>
</div>
</div>
<div class="buttons-tab fixed-tab theme" data-offset="44" id="tab">
<div class="buttons-tab fixed-tab theme" data-offset="44" id="tab" v-cloak>
<a href="#tabList1" class="tab-link button active">房产({{mh_num}})</a>
<a href="#tabList2" class="tab-link button">关注({{mf_num}})</a>
<a href="#tabList3" class="tab-link button">收藏({{mc_num}})</a>
@@ -290,7 +290,7 @@ 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();
//plus.webview.getWebviewById('yfindex.html').reload();
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
checkIsLogin();
})
+15 -8
View File
@@ -43,7 +43,7 @@
</div>
</div>
<div class="content infinite-scroll infinite-scroll-bottom pstion" data-distance="50">
<div class="card cardPrice" id="baseInfo">
<div class="card cardPrice" id="baseInfo" v-cloak>
<div class="card-header">
<span>{{topMonth}}月份均价</span>
<span>
@@ -87,10 +87,10 @@
<i class="icon icon-home01"></i>
<span>房产管理</span>
</div>
<div onclick="openNewView('views/house/houseList.html')" id="detailHouseDiv">
<!--<div onclick="openNewView('views/house/houseList.html')" id="detailHouseDiv">
<i class="icon icon-home01"></i>
<span>我的房产</span>
</div>
</div>-->
<div onclick="openNewView('views/intelligentHouse/index.html')">
<i class="icon icon-home02"></i>
<span>智能选房</span>
@@ -713,8 +713,8 @@
<div class="city-list">
<span class="city-letter" id="City1">一线城市</span>
<div>
<p class="close-popup collectionCity">北京<i class="icon-collection03"></i></p>
<p class="close-popup collectionCity active">上海<i class="icon-collection03"></i></p>
<p class="close-popup collectionCity">北京</p>
<p class="close-popup collectionCity active">上海</p>
<p class="close-popup">广州<i></i></p>
<p class="close-popup">深圳<i></i></p>
</div>
@@ -1203,6 +1203,7 @@ var oriCity = "";
var oriLat = 0;
var oriLng = 0;
var region = "";
var oriRegion = "";
var scoreCount = 0;
var lat = 0;
var lng = 0;
@@ -1214,7 +1215,8 @@ document.addEventListener('plusready', onPlusReady, false);
function onPlusReady(){
getPosition();
versionUpdate();
}
}
// 获取当前用户位置
function getPosition(){
plus.geolocation.getCurrentPosition(function(p){
@@ -1237,6 +1239,7 @@ function getPosition(){
if(region.endWith("区")){
region = region.substring(0, region.length-1);
}
oriRegion = region;
oriCity = city;
$("#input_city").text(city);
}
@@ -1353,14 +1356,14 @@ function initBaseInfo(city,region,address,lat,lng){
}
baseInfo.isLogin = response.data.data.isLogin;
if(response.data.data.isLogin){
/*if(response.data.data.isLogin){
$("#addHouseDiv").hide();
$("#detailHouseDiv").show();
}else{
$("#addHouseDiv").show();
$("#detailHouseDiv").hide();
}
localStorage.setItem("isLogin", response.data.data.isLogin);*/
if(response.data.data.momRateType>0){
$("#momRateTypeClass").removeClass("icon-arrow-green");
$("#momRateTypeClass").addClass("icon-arrow-red");
@@ -2127,6 +2130,9 @@ function changeCity(cityStr){
var sort = 1;
city = cityStr
if(oriCity== cityStr){
if(oriRegion!=""){
$("#region").text(oriRegion);
}
lat = oriLat;
lng = oriLng;
if(cityStr=="上海"){
@@ -2654,6 +2660,7 @@ $("body").delegate("#hotList ul li", "click", function () {
//var url = '../district/details?city='+select_city+"&region="+select_region+"&name="+select_name;
//clicked(url, true);
});
</script>
</body>