This commit is contained in:
2018-04-10 09:37:45 +08:00
parent 2c339824de
commit f45baef380
8 changed files with 130 additions and 48 deletions
@@ -52,6 +52,14 @@ $(".content-block .button").on("click", function () {
$(this).addClass("active");
});
var t1 = window.setTimeout(loadMap,1000);
function loadMap(){
if(lng && lat){
loadMapPoi();
window.clearTimeout(t1);
}
}
//小区详情
function loadDistrictInfo(){
axios.get("/rest/districts/detail", {
+19 -18
View File
@@ -7,15 +7,22 @@ var searchDistVue = new Vue({
openDistrictDetail:function(index) {
saveHistory({district:this.searchDistricts[index].region,name:this.searchDistricts[index].name,city:this.searchDistricts[index].city})
//clicked(BASE_PATH+'/district/details?city='+this.searchDistricts[index].city+'&region='+this.searchDistricts[index].region+'&name='+this.searchDistricts[index].name,true);
if(cat=="district"){
clicked('views/district/detail.html',true,false,{},{city:this.searchDistricts[index].city,region:this.searchDistricts[index].region,name:this.searchDistricts[index].name});
}else if(cat == "rent"){
if(cat == "rent"){
clicked('views/rent/rent.html',true,false,{},{city:this.searchDistricts[index].city,region:this.searchDistricts[index].region,name:this.searchDistricts[index].name})
}else{
clicked('views/district/detail.html',true,false,{},{city:this.searchDistricts[index].city,region:this.searchDistricts[index].region,name:this.searchDistricts[index].name});
}
}
}
})
var hotDistVue = new Vue({
el: '#hotList',
data: {
hotDists: []
}
})
$("#districtName").bind("input propertychange keyup" , function () {
var keyword = $(this).val()
if(xhr){
@@ -96,7 +103,6 @@ function recover() {
}
/* 弹出搜索小区页面 */
$("body").delegate(".open-about02", "click", function () {
alert("ssss");
$("#districtName").val("");
if($("#input_city").text()==""){
$.toast("请选择城市")
@@ -105,12 +111,11 @@ alert("ssss");
var text = $(this).text().trim();
if(text=="房价查询"){
cat = "district"
}else if(text=="房租查询"){
if(text=="房租查询"){
cat = "rent"
}else{
cat = "district"
}
alert("test:"+text+" cat:"+cat)
$('.historyList').show();
$("#notFound").hide();
$('.hotList').show();
@@ -139,12 +144,8 @@ function addHotDistricts(cityParam){
dists.push(map);
}
new Vue({
el: '#hotList',
data: {
hotDists: dists
}
})
hotDistVue.$data.hotDists=dists
}
@@ -160,10 +161,10 @@ var historyVue = new Vue({
histories: histories
},methods: {
openHistoryDetail:function(index) {
if(cat=="district"){
clicked('views/district/detail.html',true,false,{},{city:this.searchDistricts[index].city,region:this.searchDistricts[index].region,name:this.searchDistricts[index].name});
}else if(cat == "rent"){
clicked('views/rent/rent.html',true,false,{},{city:this.searchDistricts[index].city,region:this.searchDistricts[index].region,name:this.searchDistricts[index].name})
if(cat == "rent"){
clicked('views/rent/rent.html',true,false,{},{city:this.histories[index].city,region:this.histories[index].region,name:this.histories[index].name})
}else{
clicked('views/district/detail.html',true,false,{},{city:this.histories[index].city,region:this.histories[index].region,name:this.histories[index].name});
}
}
}
+77 -2
View File
@@ -1480,7 +1480,13 @@
},
"main.html": {
"resources": [
"yfindex.html"
"yfindex.html",
"js/common.js",
"css/main.css",
"js/mui.min.js",
"css/mui.min.css",
"js/push-common.js",
"config.js"
],
"refer": [
"start.html",
@@ -1499,7 +1505,38 @@
"yfindex.html": {
"resources": [
"fonts/mui.ttf",
"images/icon-clear.png"
"images/icon-clear.png",
"js/axiosPlugin.js",
"fonts/font_1433401008_2229297.woff",
"images/cardBg.png",
"js/jquery.cookie.js",
"js/cn.js",
"images/icon-home04.png",
"js/zepto.js",
"js/axios.min.js",
"js/vue.js",
"js/beacon_release.js",
"js/updateVersion/updateVersion.js",
"css/sm.css",
"js/cityRegion.js",
"images/icon-home01.png",
"css/main.css",
"images/icon-home02.png",
"images/icon-home03.png",
"images/icon-eye-orange.png",
"images/icon-comments-orange.png",
"images/icon-address04.png",
"css/theme-orange.css",
"images/arrow_select.png",
"css/city.css",
"images/search.png",
"js/searchDistrict-app.js",
"js/city-app.js",
"images/icon-address02.png",
"js/light7-2.js",
"images/icon-address03.png",
"images/icon-star01.png",
"images/icon-star02.png"
],
"refer": [
"views/news/newsDetail.html",
@@ -1558,6 +1595,44 @@
"views/district/arround.html"
],
"priority": 0
},
"views/user/userInfo.html": {
"resources": [
"images/icon-personal01.png",
"js/user/myHouse.js",
"images/icon-personal02.png",
"js/user/myCollect.js",
"images/icon-personal04.png",
"js/user/myFocus.js",
"images/icon-houseLevel.png",
"images/icon-arrow-green.png",
"images/icon-personal03.png",
"images/headPortrait.png",
"images/topBg.png",
"images/icon-set.png"
],
"refer": [],
"priority": 0
},
"views/evaluate/evaluateList.html": {
"resources": [
"images/icon-add.png",
"images/icon-arrow-red.png",
"js/shara/sharaMine.js",
"js/light7.js"
],
"refer": [],
"priority": 0
},
"start.html": {
"resources": [
"fonts/mui.ttf",
"css/mui.min.css",
"images/start.png",
"css/theme-blue.css"
],
"refer": [],
"priority": 0
}
},
"idle": {
@@ -32,48 +32,57 @@ Vue.component('base-info-component', {
<div class="col-50">
<p>
<label>竣工年代:</label>
<span>{{finishBuildingDate}}</span>
<span v-if="finishBuildingDate">{{finishBuildingDate}}</span>
<span v-else>暂无数据</span>
</p>
<p>
<label>容<small class="spacing01a">&nbsp;</small>积<small class="spacing01a">&nbsp;</small>率:</label>
<span>{{cubagePercent}}</span>
<span v-if="cubagePercent">{{cubagePercent}}</span>
<span v-else>暂无数据</span>
</p>
<p>
<label>绿<small class="spacing01a">&nbsp;</small>化<small class="spacing01a">&nbsp;</small>率:</label>
<span>{{virescencePercent}}</span>
<span v-if="virescencePercent">{{virescencePercent}}</span>
<span v-else>暂无数据</span>
</p>
<p>
<label>主力面积:</label>
<span>{{moreArea}}</span>
<span v-if="moreArea">{{moreArea}}</span>
<span v-else>暂无数据</span>
</p>
<p>
<label>开<small class="spacing01a">&nbsp;</small>发<small class="spacing01a">&nbsp;</small>商:</label>
<span class="span01">{{developer}}</span>
<span class="span01" v-if="developer">{{developer}}</span>
<span v-else>暂无数据</span>
</p>
<p>
<label>物业公司:</label>
<span class="span01">{{estateCompany}}</span>
<span class="span01" v-if="estateCompany">{{estateCompany}}</span>
<span v-else>暂无数据</span>
</p>
</div>
<div class="col-50">
<p>
<label>总<small class="spacing01a">&nbsp;</small>户<small class="spacing01a">&nbsp;</small>数:</label>
<span>{{householdCount}}</span>
<span v-else>暂无数据</span>
</p>
<p>
<label>停<small class="spacing01a">&nbsp;</small>车<small class="spacing01a">&nbsp;</small>位:</label>
<span>{{carSiteCount}}</span>
<span v-if="carSiteCount">{{carSiteCount}}</span>
<span v-else>暂无数据</span>
</p>
<p>
<label>物<small class="spacing01a">&nbsp;</small>业<small class="spacing01a">&nbsp;</small>费:</label>
<span>{{estateCharge}}元/㎡/月</span>
<span v-if="estateCharge">{{estateCharge}}元/㎡/月</span>
<span v-else>暂无数据</span>
</p>
</div>
</div>
@@ -159,7 +168,7 @@ Vue.component('base-info-component', {
// loadNearDistrict(vo.lat2, vo.lng2);
}else{
$("#noDataDiv").show()
//baseInfo.districtName = "小区详情"
baseInfo.name = "小区详情"
}
}
+1 -1
View File
@@ -30,7 +30,7 @@ Vue.component('room-rent-component', {
}
rentPricesData.rentPrices = ret;
$("#roomDiv .cardRentWin").css("width",(6*ret.length)+"rem");
$("#roomDiv .cardRentWin").css("width",(6.5*ret.length)+"rem");
}else{
$("#roomDiv").hide()
}
+2 -2
View File
@@ -311,11 +311,11 @@ $(document).ready(function () {
<script>
var t1 = window.setTimeout(loadMap,1000);
var t1 = window.setInterval(loadMap,1000);
function loadMap(){
if(lng && lat){
loadMapPoi();
window.clearTimeout(t1);
window.clearInterval(t1);
}
}
/* 小区均价分析 */
+1 -7
View File
@@ -208,13 +208,7 @@ function onPlusReady() {
// el: '#baseInfo'
//})
var t1 = window.setTimeout(loadMap,1000);
function loadMap(){
if(lng && lat){
loadMapPoi();
window.clearTimeout(t1);
}
}
/* 小区租金走势 */
loadRentTrends(city, region, name);
+4 -9
View File
@@ -2606,12 +2606,8 @@ function openNewsView(newId) {
}
function openDistWindow(city, region, name){
clicked('views/district/detail.html',true,false,{},{city:city,region:region,name:name});
if(cat == "rent"){
clicked('views/rent/rent.html',true,false,{},{city:city,region:region,name:name})
}else{
clicked('views/district/detail.html',true,false,{},{city:city,region:region,name:name});
}
}
</script>
<script>
@@ -2633,11 +2629,10 @@ $("body").delegate("#hotList ul li", "click", function () {
var select_name = $(this).find("a").attr("data-name");
saveHistory({district:select_region,name:select_name,city:select_city})
//clicked(BASE_PATH+'/district/details?city='+select_city+'&region='+select_region+'&name='+select_name,true);
alert("--cat:"+cat);
if(cat=="district"){
clicked('views/district/detail.html',true,false,{},{city:select_city,region:select_region,name:select_name});
}else if(cat == "rent"){
if(cat == "rent"){
clicked('views/rent/rent.html',true,false,{},{city:select_city,region:select_region,name:select_name})
}else{
clicked('views/district/detail.html',true,false,{},{city:select_city,region:select_region,name:select_name});
}
//var url = '../district/details?city='+select_city+"&region="+select_region+"&name="+select_name;