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

This commit is contained in:
尹吉欢
2018-04-12 20:35:22 +08:00
15 changed files with 254 additions and 140 deletions
+2 -2
View File
@@ -3,8 +3,8 @@
//var BASE_PATH = "http://192.168.10.47:8086";
//var BASE_PATH = "http://192.168.10.161:8084";
//var BASE_PATH = "http://192.168.10.47:8086";
var BASE_PATH = "http://192.168.10.161:8084";
//var BASE_PATH = "http://192.168.10.53:8084";
//var BASE_PATH = "http://192.168.10.161:8084";
var BASE_PATH = "http://192.168.10.53:8084";
//var BASE_PATH = "http://192.168.10.171:8084";
/**是否显示过启动页面**/
var lauchFlag = false;
+1 -1
View File
@@ -971,7 +971,7 @@ input::-webkit-input-placeholder{
.topicContent.cityImgBox{padding-top:0;padding-bottom:0;}
.topicContent.cityImgBox p{font-size:0.7rem;color:#333;margin-top:0.2rem;}
.chartBox .chart{height:100px;margin-bottom:0.5rem;}
.chartBox .chart{width:100px;height:100px;margin:0 auto;margin-bottom:0.5rem;}
.chartBox span{text-align:center;}
.chartBox span em{font-size:0.75rem;}
.chartBox span em strong{font-size:1rem;}
+3 -2
View File
@@ -33,7 +33,8 @@ function addCollect(){
$(".collection02").show();
$.toast("随时掌握小区动态");
}
plus.webview.getWebviewById('/views/user/userInfo.html').reload();
alert(12)
plus.webview.getWebviewById('views/user/userInfo.html').reload();
})
.catch(function (error) {
console.log(error);
@@ -65,7 +66,7 @@ function removeCollect(){
$(".collection01").show();
$.toast("取消关注");
}
plus.webview.getWebviewById('/views/user/userInfo.html').reload();
plus.webview.getWebviewById('views/user/userInfo.html').reload();
})
.catch(function (error) {
console.log(error);
+205 -107
View File
@@ -3,6 +3,7 @@ var myCollectCitys = [];
var lat = 31.222578;
var lng = 121.359555;
var allCity = []
var collCount = 0;
var myDatasVue = new Vue({
el: '#contentTabDiv',
data: {
@@ -29,7 +30,7 @@ var month = date.getMonth()+1+'月';
//
//}
loadMyCollectCity();
//loadMyCollectCity();
@@ -133,6 +134,8 @@ function loadMyCollectCity(){
axios.get("/rest/quotations/userCollectCitys",{}).then(function (response) {
var curDatas = response.data.data
var collecteds = [];
collCount = curDatas.length;
if(curDatas){
var ret = []
for(var i in curDatas){
@@ -141,9 +144,9 @@ function loadMyCollectCity(){
allCity.push(curCity)
myCollectCitys.push(curCity);
}
collecteds.push(curCity);
}
}
if(myCollectCitys && myCollectCitys.length>0){
for(var j in myCollectCitys){
var curCity = myCollectCitys[j]
@@ -158,6 +161,11 @@ function loadMyCollectCity(){
cityObj.numId_up_chart = (parseInt(m)+1)+"_up_chart";
cityObj.numId_down_chart = (parseInt(m)+1)+"_down_chart";
cityObj.numId_price_chart = (parseInt(m)+1)+"_price_chart";
cityObj.colled = false;
if(IsInArray(collecteds, curCity)){
cityObj.colled = true;
}
m = m + 1;
if(data1){
cityObj.city = data1.city
@@ -189,7 +197,8 @@ function loadMyCollectCity(){
var nearObj = new Object();
nearObj.city = v.city
nearObj.region = v.region
nearObj.name = v.name
nearObj.name = v.name;
nearObj.sname = nameConver(v.name)
nearObj.avgPrice = v.avgPrice
nears.push(nearObj);
}
@@ -209,6 +218,14 @@ function loadMyCollectCity(){
});
}
function nameConver(textName){
var length = textName.length;
var textStr = textName;
if(length > 5){
textStr = textName.substr(0,5)+ "...";
}
return textStr;
}
function loadCityPriceInfo(city){
return axios.get("/rest/quotations/cityPriceInfo?city="+city);
@@ -227,6 +244,22 @@ function loadHotDistrict(city){
}
function clickTrend(city, type, num){
if(type == 5){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
startingLoadCharts(city, type, num);
})
return;
} else {
startingLoadCharts(city, type, num);
}
}else{
startingLoadCharts(city, type, num);
}
}
function startingLoadCharts(city, type, num){
axios.get("/rest/quotations/loadCityPriceTrends", {
params: {
city: city,
@@ -280,8 +313,7 @@ function IsInArray(arr, val){
var t1 = window.setInterval(loadChart,1000);
function loadChart(){
var d1 = myDatasVue.$data.cityDatas.length
var d2 = allCity.length;
if(d2>0 && d2==d1){
if(d1>0 && d1>=collCount){
loadTabCity();
@@ -315,28 +347,38 @@ function loadUpOrDownChart(){
var obj = datas[i]
var num = parseInt(i)+1;
var cityObj1 = new Object();
cityObj1.name= ""
cityObj1.value = obj.upRate
var cityObj2 = new Object();
cityObj2.name= ""
cityObj2.value = 100 - obj.upRate
dataUp = [cityObj1, cityObj2]
addUpChart(dataUp, num)
if(obj.upRate){
var cityObj1 = new Object();
cityObj1.name= ""
cityObj1.value = obj.upRate
var cityObj2 = new Object();
cityObj2.name= ""
cityObj2.value = 100 - obj.upRate
dataUp = [cityObj1, cityObj2]
addUpChart(dataUp, num)
}else{
$("#"+num+"_up_chart").parent().parent().hide()
}
var cityObj3 = new Object();
cityObj3.name= ""
cityObj3.value = obj.downRate
var cityObj4 = new Object();
cityObj4.name= ""
cityObj4.value = 100 - obj.downRate
if(obj.downRate){
var cityObj3 = new Object();
cityObj3.name= ""
cityObj3.value = obj.downRate
var cityObj4 = new Object();
cityObj4.name= ""
cityObj4.value = 100 - obj.downRate
dataDown = [cityObj3, cityObj4]
addDownChart(dataDown, num)
}else{
$("#"+num+"_down_chart").parent().parent().hide()
}
dataDown = [cityObj3, cityObj4]
addDownChart(dataDown, num)
}
}
@@ -377,89 +419,85 @@ function showChart(idDom, categories, prices, counts){
}
/* 城市均价及挂牌走势 */
var chart = Highcharts.chart(idDom, {
title: {
text: '城市均价及挂牌走势',
y: -30
},
colors: ['#F88C9F', '#78CDE6'],
xAxis: {
type: 'datetime',
categories: categories,
boundaryGap: false,
tickInterval: 2,
tickLength: 6,
crosshair: true
},
yAxis: [{ // 第一个Y轴,放置在左边
title: {
text: '元/㎡',
align: 'high',
offset: 4,
rotation: 0,
y: -20
},
plotLines: [{
value: 0,
width: 1,
color: '#808080'
}],
allowDecimals: false
}, { // 第二个Y轴,放置在右边
linkedTo: 0,
opposite: true, // 通过此参数设置坐标轴显示在对立面
title: {
text: '套',
align: 'high',
offset: 25,
rotation: 0,
y: -20
},
plotLines: [{
value: 0,
width: 1,
color: '#808080'
}],
allowDecimals: false
}],
credits: {
enabled: false
},
plotOptions: {
line: {
connectNulls: true //该设置会连接空值点
},
series: {
events: {
legendItemClick: function(e) {
return false;
}
},
marker: {
radius: 3, //曲线点半径,默认是4
symbol: 'circle' //曲线点类型:"circle", "square", "diamond", "triangle","triangle-down",默认是"circle"
}
}
},
tooltip: {
shared: true
},
series: [{
name: '均价',
zIndex: 1,
data: prices,
tooltip: {
valueSuffix: '元/㎡'
}
}, {
name: '挂牌量',
type: 'column',
borderColor: null,
data: counts,
tooltip: {
valueSuffix: '套'
}
}]
});
colors: ['#ff7f50','#87cefa'],
title: {
text: '城市楼市均价及挂牌走势',
y: -30
},
xAxis: [{
categories:categories,
crosshair: true
}],
yAxis: [{
title: {
text: '元/㎡',
align: 'high',
offset: 4,
rotation: 0,
y: -20
},
allowDecimals: false,
plotLines: [{
value: 0,
width: 1,
color: '#808080'
}]
}, { // Secondary yAxis
title: {
text: '套',
align: 'high',
offset: 25,
rotation: 0,
y: -20
},
allowDecimals: false,
opposite: true
}],
tooltip: {
shared: true
},
credits: {
enabled: false
},
plotOptions: {
line: {
connectNulls: true //该设置会连接空值点
},
series: {
events: {
legendItemClick: function(e) {
return false;
}
},
marker: {
radius: 3, //曲线点半径,默认是4
symbol: 'circle' //曲线点类型:"circle", "square", "diamond", "triangle","triangle-down",默认是"circle"
}
}
},
series: [{
name: '均价',
type: 'line',
zIndex: 1,
tooltip: {
valueSuffix: ' 元/㎡'
},
data: prices
},{
name: '挂牌量',
type: 'column',
yAxis: 1,
tooltip: {
valueSuffix: ' 套'
},
data: counts
}]
});
}
@@ -468,7 +506,7 @@ function showDistrictDetail(index, city){
if(datas){
for(var i in datas){
var obj = datas[i]
if(obj.name == city){
if(obj.city == city){
var dists = obj.nears
var dm = dists[index]
clicked('../district/detail.html',true,false,{},{city:dm.city,region:dm.region,name:dm.name});
@@ -479,4 +517,64 @@ function showDistrictDetail(index, city){
function showRegionInfo(city){
clicked('../house/regions.html',true,false,{},{city:city});
}
function collectCity(city, index){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
docollectCity(city)
})
return;
} else {
docollectCity(city)
}
}
function docollectCity(city){
axios.get("/rest/quotations/collectCity",{
params:{
city : city
}
}).then(function (response) {
var msg = response.data.message;
if(msg){
var newRet1 = []
var newRet2 = []
if(msg == "取消关注成功"){
var datas = myDatasVue.$data.cityDatas
for(var i in datas){
var obj = datas[i]
if(obj.city != city){
newRet1.push(obj)
}
}
var data2s = citysVue.$data.citys
var isLast = false;
for(var i in data2s){
var obj = data2s[i]
if(obj.city != city){
newRet2.push(obj)
}else{
if(parseInt(i)+1==data2s.length){
isLast = true;
}
}
}
if(isLast){
window.location.reload();
}
myDatasVue.$data.cityDatas = newRet1;
citysVue.$data.citys = newRet2
}else{
alert(msg);
}
}
})
.catch(function (error) {
console.log(error);
});
}
+8
View File
@@ -1662,6 +1662,14 @@
"views/evaluate/evaluateReport.html"
],
"priority": 0
},
"views/house/houseDetail.html": {
"resources": [],
"refer": [
"views/house/regions.html",
"views/district/detail.html"
],
"priority": 0
}
},
"idle": {
@@ -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-on:click="follow(ci.city,$event)">关注</i>'+
'<i class="button collection collection02 dn" v-on:click="abolish(ci.city,$event)">取消</i>'+
'<i class="button theme collection collection01" v-bind:class="{dn:ci.follow}" v-on:click="follow(ci.city,$event)">关注</i>'+
'<i class="button collection collection02" v-bind:class="{dn:!ci.follow}" v-on:click="abolish(ci.city,$event)">取消</i>'+
'</div>'+
'</div>'+
'</div>'+
@@ -51,6 +51,7 @@ Vue.component('city_increase_ranking',{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
//plus.webview.getWebviewById('views/user/userInfo.html').reload()
}).catch(function(error){
console.log(error)
})
@@ -59,6 +60,7 @@ Vue.component('city_increase_ranking',{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
//plus.webview.getWebviewById('views/user/userInfo.html').reload()
}).catch(function(error){
console.log(error)
})
@@ -33,8 +33,8 @@ Vue.component('city_potential_ranking',{
'</span>'+
'</div>'+
'<div class="col-20">'+
'<i class="button theme collection collection01" v-on:click="follow(cp.city,$event)">关注</i>'+
'<i class="button collection collection02 dn" v-on:click="abolish(cp.city,$event)">取消</i>'+
'<i class="button theme collection collection01" v-bind:class="{dn:cp.follow}" v-on:click="follow(cp.city,$event)">关注</i>'+
'<i class="button collection collection02" v-bind:class="{dn:!cp.follow}" v-on:click="abolish(cp.city,$event)">取消</i>'+
'</div>'+
'</div>'+
'</div>'+
@@ -69,7 +69,7 @@ Vue.component('city_potential_ranking',{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
loadCityPotentialRanking()
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}).catch(function(error){
console.log(error)
})
@@ -78,7 +78,7 @@ Vue.component('city_potential_ranking',{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
loadCityPotentialRanking()
plus.webview.getWebviewById('views/user/userInfo.html').reload();
}).catch(function(error){
console.log(error)
})
@@ -8,7 +8,6 @@ Vue.component('map-component', {
},
methods: {
loadMap:function(){
alert("map:"+lat+"address:"+address);
baseInfo.address = address;
if(lat && lng && address){
@@ -37,7 +36,6 @@ Vue.component('map-component', {
}
},
mounted:function(){
alert("map start.....")
this.loadMap();
}
})
@@ -104,7 +104,7 @@
</li>
</ul>
</div>
<a class="ad" href=""><img src="../../images/adImg.png" id="img"></a>
<a class="ad"><img src="../../images/adImg.png" id="img"></a>
<div class="topic">
<div class="topicTitle" style="position:relative;">均价走势
<div class="content-block">
@@ -147,7 +147,6 @@ $.config = {router: false}
var self = plus.webview.currentWebview();
var hid = self.hid;
var houseStatus = ""
hid = '104631167348637696';
var house_info = new Vue({
el:'#house_info',
data:{
@@ -259,6 +258,9 @@ $.config = {router: false}
// }
// evaluate_msg.msg=h.evaluateMsg
$("#img").attr("src",BASE_PATH+"/img/"+h.imgId);
$("#img").click(function(){
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: hid, city: h.city, mobile: ""},function(){})
})
loadingChart(h.city,h.region,h.name,2)
//按照时间范围加载数据
$(".avgPriceTrend a").click(function(){
+4 -2
View File
@@ -102,7 +102,7 @@
<i class="icon icon-evaluation03"></i>
<span>我要置换</span>
</div>-->
<div onclick="openNewView('/views/loan/loanInfo.html')">
<div onclick="gotoLoanApply()">
<i class="icon icon-personal03"></i>
<span>我要贷款</span>
</div>
@@ -504,9 +504,11 @@ $("#tabRentDiv").on("click", function () {
$("#tabChart1").css("z-index","-1");
});
function openNewView(viewHtml) {
alert(viewHtml)
clicked(viewHtml,true,false,{},{city:oriCity,region:oriRegion,name:oriName})
}
function gotoLoanApply(){
clicked('/views/loan/loanInfo.html',true,false,{},{houseId: houseId, city: oriCity, mobile: ""},function(){})
}
</script>
</body>
+12 -10
View File
@@ -169,8 +169,9 @@
<div class="card cardPrice cardPrice01 cardCity01" v-bind:hrefid="myCityMap.hrefId">
<div class="card-header">
<label>{{myCityMap.city}}</label>
<a class="button theme collection collection01">关注</a>
<a class="button collection collection02 dn">取消</a>
<a v-if="myCityMap.colled" class="button collection collection02 " @click="collectCity(myCityMap.city, index)">取消</a>
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city, index)">关注</a>
</div>
<div class="card-header">
<span>当前参考均价</span>
@@ -184,7 +185,7 @@
<label>近30天涨跌幅</label>
</span>
<span v-else>
<em><strong>{{myCityMap.oneMonthUpDownRange*100}}</strong>%<i class="icon icon-arrow-green"></i></em>
<em><strong>{{myCityMap.oneMonthUpDownRange}}</strong>%<i class="icon icon-arrow-green"></i></em>
<label>近30天涨跌幅</label>
</span>
<span>
@@ -235,8 +236,8 @@
<div class="topicContent" style="padding:0;">
<div class="cardNearbyBox cardNearbyBox01">
<div class="cardNearbyWin" style="width: 38rem;">
<div class="card cardNearby" v-for="nearDist in myCityMap.nears" @click="showDistrict(index, myCityMap.city)">
<div class="card-header">{{nearDist.name}}</div>
<div class="card cardNearby" v-for="nearDist in myCityMap.nears" @click="showDistrictDetail(index, myCityMap.city)">
<div class="card-header">{{nearDist.sname}}</div>
<div class="card-content">
<div class="card-content-inner">{{nearDist.avgPrice}}元/㎡</div>
</div>
@@ -345,11 +346,9 @@ $.config = {router: false}
city = city.substring(0, city.length-1)
myCollectCitys.push(city);
}
lng = p.coords.longitude;//获取到当前位置的经度
lat = p.coords.latitude;//获取到当前位置的纬度;
alert("ww:"+myCollectCitys+" lng:"+lng+" lat:"+lat)
//lng = p.coords.longitude;//获取到当前位置的经度
//lat = p.coords.latitude;//获取到当前位置的纬度;
loadMyCollectCity();
}, function(e){
},
{
@@ -534,6 +533,9 @@ $(document).ready(function () {
});
});
$("a[href='#tabQuotation1'],a[href='#tabQuotation0']").click(function(){
$("#tabCityDiv a").removeClass("active");
})
function clickCity(val){
$("#tabCityDiv a").removeClass("active");
@@ -210,7 +210,7 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
//转换成元,四舍五入
tempTotalPrice = (parseFloat(tempTotalPrice)/10000).toFixed(2);
}
htmlContent = htmlContent +"<li><a href='#' class='item-content'>";
htmlContent = htmlContent +'<li><a onclick="openReportWindow(\''+result.id+'\')" class="item-content">';
htmlContent = htmlContent +"<div class='item-inner'><div class='item-title-row'>";
htmlContent = htmlContent +"<div class='item-title'>"+result.name+"<span class='span01'>"+result.city+"-"+result.region+"</span></div>";
htmlContent = htmlContent +"</div><div class='item-title-row'>";
@@ -261,6 +261,10 @@ function openaddWindow(){
clicked('/views/house/add.html',true,false,{},{type:1},function(){
})
}
function openReportWindow(id){
clicked('/views/evaluate/evaluateReport.html',true,false,{},{hid:id})
}
//判断是否登录
function checkIsLogin(){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
+1 -1
View File
@@ -20,7 +20,7 @@
<div class="page-group">
<div class="page page-current" id="regionInfo">
<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>
<h1 class="title">{{city}}各区县涨跌排行</h1>
+1 -1
View File
@@ -524,7 +524,7 @@ function collect(){
$(".collection").removeClass("collection02")
$(".collection i").removeClass("icon-collection02")
}
plus.webview.getWebviewById('/views/user/userInfo.html').reload()
plus.webview.getWebviewById('views/user/userInfo.html').reload()
}
$.toast(msg);
-3
View File
@@ -307,9 +307,6 @@ function gotoLoanApply(houseId, city){
}
//跳转到小区详情
function gotoDistrictDetail(city,region,name){
alert(city)
alert(region)
alert(name)
clicked('/views/district/detail.html',true,false,{},{city:city,region:region,name:name},function(){})
}
//跳转房产详情