This commit is contained in:
2018-04-17 17:22:09 +08:00
parent f67f0ffcda
commit f3d07ed3ea
9 changed files with 100 additions and 80 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;
+3 -1
View File
@@ -588,7 +588,9 @@ function loadRentTrends(city, region, name, type){
}else{
//没数据
//$("#tabChart2").hide();
$("#tabRentDiv").addClass("dn")
$("#trendDiv2").parent().parent().addClass("dn")
$("#chart02").addClass("dn")
$("#rentTrendDiv").addClass("dn")
}
}).catch(function (error) {
console.log(error);
+1 -4
View File
@@ -383,10 +383,7 @@ function nameConver(textName){
}
function IsInArray(arr, val){
  var testStr=','+arr.join(",")+",";
  return testStr.indexOf(","+val+",")!=-1;
}
function addUpChart(dataUp, num){
/* 小区上涨 */
@@ -94,49 +94,54 @@ Vue.component('city_potential_ranking',{
}
})
}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()
reloadCityIncreaseRanking()
if(type == 0){
var curDatas = cityDetaiVue.$data.citys
if(curDatas && curDatas.length>0){
if(!IsInArray(curDatas, city)){
cityDetaiVue.$data.citys.push(city);
$.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()
reloadCityIncreaseRanking()
if(type == 0){
var curDatas = cityDetaiVue.$data.citys
if(curDatas && curDatas.length>0){
console.log("ddd");
if(!IsInArray(curDatas, city)){
cityDetaiVue.$data.citys.push(city);
}
}
}
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
}
}).catch(function(error){
console.log(error)
})
}).catch(function(error){
console.log(error)
})
});
}
},
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()
reloadCityIncreaseRanking()
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;
$.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()
reloadCityIncreaseRanking()
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;
}
}
}
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
}).catch(function(error){
console.log(error)
})
//plus.webview.getWebviewById('views/user/userInfo.html').reload();
}).catch(function(error){
console.log(error)
})
});
}
},
mounted:function(){
@@ -159,7 +164,10 @@ function reloadCityPotentialRanking(){
})
cityPotentialRankingData.cityPotentialRankingList = response.data.data;
}).catch(function(error){
console.log(error)
})
}
}
+4 -3
View File
@@ -119,6 +119,7 @@
</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">
@@ -226,9 +227,9 @@ $.config = {router: false}
<script>
var city = "上海"
var region = "黄浦"
var name = "花园公寓 "
var city = "北京"
var region = "朝阳"
var name = "姜庄湖园林一期"
//var lat = 31.292437
//var lng = 121.48703
+31 -26
View File
@@ -45,8 +45,8 @@
<a href="#tabQuotation0" class="tab-link button">添加</a>
</div>
<div class="tabs">
<div id="tabQuotation1" class="tab active" >
<div class="tabs" >
<div id="tabQuotation1" class="tab active" v-cloak>
<div class="card cardPrice cardPrice01 cardCity" id="countryInfo" v-cloak>
<div class="card-header">
<label>全国</label>
@@ -1211,6 +1211,7 @@ $.config = {router: false}
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<script type="text/javascript" src="../../js/quotations/cityDetail.js" ></script>
<script type="text/javascript" src="../component/myFocusComponent.js"></script>
<script type="text/javascript" src="../component/cityIncreaseRankingComponent.js"></script>
<script type="text/javascript" src="../component/cityPotentialRankingComponent.js"></script>
@@ -1218,7 +1219,9 @@ $.config = {router: false}
<script type="text/javascript" src="../component/cityChooseComponent.js"></script>
<script type="text/javascript" src="../../js/echarts.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/highcharts-4.2.3.js" charset="utf-8"></script>
<script type="text/javascript" src="../../js/quotations/cityDetail.js" ></script>
<script type="text/javascript" src="../../js/city.js" ></script>
<script>
var date = new Date();
@@ -1247,14 +1250,14 @@ $.config = {router: false}
function onPlusReady(){
var city = "";
plus.geolocation.getCurrentPosition(function(p){
//province = p.address.province;
city = p.address.city;
//region = p.address.district;
if(city && city.endsWith("市")){
positionCity = city.substring(0, city.length-1)
var formatCity = formatBaiduCity(city);
positionCity = formatCity
city = formatCity;
$(".nowCity").html(city);
}
//lng = p.coords.longitude;//获取到当前位置的经度
//lat = p.coords.latitude;//获取到当前位置的纬度;
}, function(e){
},
@@ -1279,21 +1282,21 @@ $.config = {router: false}
// city:''
// }
// })
plus.geolocation.getCurrentPosition(function(p){
//province = p.address.province;
var cityStr = p.address.city;
if(cityStr){
$(".nowCity").html(cityStr.endsWith("市")?cityStr.substring(0,cityStr.length-1):cityStr);
}
//region = p.address.district;
}, function(e){
},
{
provider:'baidu',
enableHighAccuracy:true,
coordsType:'bd09ll'
}
);
// plus.geolocation.getCurrentPosition(function(p){
// //province = p.address.province;
// var cityStr = p.address.city;
// if(cityStr){
// $(".nowCity").html(cityStr.endsWith("市")?cityStr.substring(0,cityStr.length-1):cityStr);
// }
// //region = p.address.district;
// }, function(e){
// },
// {
// provider:'baidu',
// enableHighAccuracy:true,
// coordsType:'bd09ll'
// }
// );
/* button状态切换 */
@@ -1605,12 +1608,14 @@ function addFocus(city){
}
function hotCity(city){
clicked('../house/cityDetail.html',true,false,{},{city:city},function(){
clicked('../house/cityDetail.html',true,false,{},{city:city},function(){
});
}
function IsInArray(arr, val){
  var testStr=','+arr.join(",")+",";
  return testStr.indexOf(","+val+",")!=-1;
}
</script>
+6
View File
@@ -124,6 +124,8 @@ $.config = {router: false}
<script type="text/javascript" src="../../js/shara/sharaMine.js" ></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script type="text/javascript" src="../../js/city.js" ></script>
<script>
document.addEventListener('plusready', onPlusReady, false);
var id; //= "186182250936643584";
@@ -238,6 +240,10 @@ function getPosition(){
province = p.address.province;
city = p.address.city;
region = p.address.district;
if(city){
city = formatBaiduCity(city);
}
}, function(e){
},
+3 -5
View File
@@ -102,8 +102,6 @@
<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">
@@ -176,9 +174,9 @@ $.config = {router: false}
<script type='text/javascript' src='../../js/common.js' charset='utf-8'></script>
<script type="text/javascript" src="../../js/log/log_stat.js" ></script>
<script>
var city = "上海"
var region = "黄浦"
var name = "花园公寓"
var city = "北京"
var region = "朝阳"
var name = "姜庄湖园林一期"
var lat;
var lng;
+6 -3
View File
@@ -1182,6 +1182,8 @@ $.config = {router: false}
</script>
<script type='text/javascript' src='js/jquery.cookie.js?version=${version!}' charset='utf-8'></script>
<script type="text/javascript" src="js/updateVersion/updateVersion.js" charset='utf-8'></script>
<script type="text/javascript" src="js/city.js" ></script>
<script>
function openHangQing(city){
clicked('views/house/cityDetail.html',true,false,{},{city:city},function(){
@@ -1233,9 +1235,10 @@ function getPosition(){
oriLng = p.coords.longitude;
oriLat = p.coords.latitude;
//alert("4"+oriLng);
if(city.endWith("市")){
city = city.substring(0, city.length-1);
}
if(city){
city = formatBaiduCity(city);
}
if(region.endWith("区")){
region = region.substring(0, region.length-1);
}