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

This commit is contained in:
xuhe@fangjia.com
2018-04-16 19:38:52 +08:00
11 changed files with 53 additions and 69 deletions
+2 -2
View File
@@ -2,9 +2,9 @@
//var BASE_PATH = "http://192.168.10.128: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.47:8086";
//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.53:8084";
//var BASE_PATH = "http://192.168.10.171:8084";
/**是否显示过启动页面**/
var lauchFlag = false;
+1
View File
@@ -2,6 +2,7 @@
/* CSS Document */
/* 公用 */
[v-cloak]{display:none;}
*{font-size:16px;font-family:arial,"华文细黑";}
ul li{list-style:none;}
img{display:block;}
+6 -2
View File
@@ -524,16 +524,17 @@ var option01 = {
};
$("#trendDiv2 a").click(function(){
/*$("#trendDiv2 a").click(function(){
$("#trendDiv2 a").removeClass("active")
$(this).addClass("active")
//var v = $(this).attr("t-v");
loadRentTrends(city, region, name);
});
});*/
/* 小区租金走势 */
function loadRentTrends(city, region, name, type){
if(type == undefined) type= 2;
axios.get("/rest/trend/distRentTrends", {
params: {
@@ -549,6 +550,7 @@ function loadRentTrends(city, region, name, type){
var m = re.times;
var pm = re.distMap
var rooms = re.rooms;
if(m && rooms.length>0){
for(var i=0;i<m.length;i++){
@@ -572,7 +574,9 @@ function loadRentTrends(city, region, name, type){
distObj.type = 'line';
distObj.symbolSize = 0;
series.push(distObj);
//alert(distDatas);
}
//alert(categories);
//showRentChart(categories, series);
showRentChart2(categories, series);
+9 -4
View File
@@ -475,22 +475,23 @@ function addDownChart(dataDown){
}
function collectCity(city){
function collectCity(city, type){
if (localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == "") {
clicked('../user/codeSms.html',true,false,{},{},function(){
collectCity(city)
})
return;
} else {
docollectCity(city)
docollectCity(city, type)
}
}
function docollectCity(city){
function docollectCity(city, type){
axios.get("/rest/quotations/collectCity",{
params:{
city : city
city : city,
type:type
}
}).then(function (response) {
var msg = response.data.message;
@@ -518,10 +519,14 @@ function docollectCity(city){
$("a[href='#tabQuotation1']").click();
//plus.webview.getWebviewById('views/house/houseDetail.html').reload();
reloadMyFocus();
reloadCityPotentialRanking()
reloadCityIncreaseRanking()
}else if(msg == "关注成功"){
cityInfoVue.$data.collecd = true;
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
reloadMyFocus();
reloadCityPotentialRanking()
reloadCityIncreaseRanking()
}else{
$.toast(msg);
}
@@ -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)">关注</i>'+
'<i class="button collection collection02" v-bind:class="{dn:!ci.follow}" 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, 0)">关注</i>'+
'<i class="button collection collection02" v-bind:class="{dn:!ci.follow}" v-on:click="abolish(ci.city,$event, 1)">取消</i>'+
'</div>'+
'</div>'+
'</div>'+
@@ -47,12 +47,12 @@ Vue.component('city_increase_ranking',{
console.log(error)
})
},
follow:function(city,event){
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}}).then(function(response){
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
@@ -73,7 +73,7 @@ Vue.component('city_increase_ranking',{
}
})
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
@@ -91,7 +91,7 @@ Vue.component('city_increase_ranking',{
}
},
abolish:function(city,event){
abolish: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") == ""){
@@ -101,7 +101,7 @@ Vue.component('city_increase_ranking',{
}
})
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus();
@@ -33,8 +33,8 @@ Vue.component('city_potential_ranking',{
'</span>'+
'</div>'+
'<div class="col-20">'+
'<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>'+
'<i class="button theme collection collection01" v-bind:class="{dn:cp.follow}" v-on:click="follow(cp.city,$event,0)">关注</i>'+
'<i class="button collection collection02" v-bind:class="{dn:!cp.follow}" v-on:click="abolish(cp.city,$event,1)">取消</i>'+
'</div>'+
'</div>'+
'</div>'+
@@ -65,13 +65,13 @@ Vue.component('city_potential_ranking',{
console.log(error)
})
},
follow:function(city,event){
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") == ""){
alert("rrrr")
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
@@ -92,7 +92,7 @@ Vue.component('city_potential_ranking',{
}
})
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
var msg = response.data.message;
if(msg != "取消关注成功" && msg != "关注成功"){
$.toast(msg);
@@ -110,8 +110,8 @@ Vue.component('city_potential_ranking',{
}
},
abolish:function(city,event){
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
abolish:function(city,event,type){
axios.get("/rest/quotations/collectCity",{params:{city:city, type:type}}).then(function(response){
$(event.target).parent().children().removeClass("dn");
$(event.target).addClass("dn");
reloadMyFocus()
@@ -75,6 +75,7 @@ function reloadMyFocus(){
$("#myFocusFirstPage").hide();
$("#myFocus").hide();
}else{
myFocusDatas.myFocusList = response.data.data;
}
}).catch(function(error){
+3 -32
View File
@@ -43,7 +43,7 @@
<body>
<div class="page-group">
<div class="page page-current" id="districtBaseInfo">
<div class="page page-current" id="districtBaseInfo" v-cloak>
<div class="loadingBg">
<div class="infinite-scroll-preloader">
@@ -128,35 +128,6 @@
</div>
</div>
<div class="chart" id="chart02"></div>
<!--<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" @click="showChat(1)">均价</a>
<a href="#tabChart2" class="tab-link button" id="tabRentDiv" @click="showChat(2)">租金</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>
</div>
</div>-->
</div>
</div>
<!--<div class="card cardPrice cardPrice02" style="border-bottom:solid 0.5rem #f3f3f3;">
@@ -256,8 +227,8 @@ $.config = {router: false}
<script>
var city = "上海"
var region = "长宁"
var name = "新泾三村"
var region = "黄浦"
var name = "花园公寓 "
//var lat = 31.292437
//var lng = 121.48703
+2 -3
View File
@@ -32,15 +32,14 @@
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<h1 class="title">房产行情</h1>
</header>
<div class="content" id="cityInfo">
<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 collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city)">关注</a>
<a v-if="collecd" class="button theme 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">
+4 -4
View File
@@ -172,8 +172,8 @@
<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 collection collection02 " @click="collectCity(myCityMap.city)">取消关注</a>
<a v-else class="button theme collection collection01" @click="collectCity(myCityMap.city)">关注</a>
<a v-if="collecd" class="button theme 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">
@@ -1558,7 +1558,7 @@ function addFocus(city){
if(localStorage.getItem("user_token") == null || localStorage.getItem("user_token") == ""){
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
axios.get("/rest/quotations/collectCity",{params:{city:city,type:0}}).then(function(response){
reloadMyFocus()
reloadCityIncreaseRanking()
reloadCityPotentialRanking()
@@ -1572,7 +1572,7 @@ function addFocus(city){
}
})
}else{
axios.get("/rest/quotations/collectCity",{params:{city:city}}).then(function(response){
axios.get("/rest/quotations/collectCity",{params:{city:city,type:0}}).then(function(response){
if(response.data.status){
reloadMyFocus()
reloadCityIncreaseRanking()
+11 -8
View File
@@ -37,7 +37,7 @@
<body>
<div class="page-group">
<div class="page page-current" id="districtBaseInfo">
<div class="page page-current" id="districtBaseInfo" v-cloak>
<div class="loadingBg">
<div class="infinite-scroll-preloader">
@@ -94,14 +94,16 @@
<div class="topicTitle" style="position:relative;">小区租金走势
<div class="content-block">
<div class="buttons-row theme" id="trendDiv2">
<a t-v="2" class="tab-link button active">半年</a>
<a t-v="3" class="tab-link button">一年</a>
<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="topicContent" style="padding:0;padding-bottom:0.75rem;" id="rentTrendDiv">
<div class="chart" id="chart02" style="margin-top:0.75rem;"></div>
</div>
</div>
<div class="topic dn" id="mapDiv">
@@ -175,8 +177,8 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
var city = "上海"
var region = "闵行"
var name = "卓越维港别墅"
var region = "黄浦"
var name = "花园公寓"
var lat;
var lng;
@@ -210,8 +212,11 @@ function onPlusReady() {
tags:[]
}
})
/* 小区租金走势 */
loadRentTrends(city, region, name,2);
}
//baseInfo = new Vue({
// el: '#districtBaseInfo',
// data: {
@@ -222,10 +227,8 @@ function onPlusReady() {
// tags:[]
// }
// })
//
/* 小区租金走势 */
loadRentTrends(city, region, name);
function openMapWindow(){
clicked('../district/arround.html',true,false,{},{city:city,region:region,name:name,lat:lat,lng:lng});