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

This commit is contained in:
raoyanhui
2018-04-10 13:17:19 +08:00
12 changed files with 233 additions and 72 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);
}
}
/* 小区均价分析 */
@@ -56,7 +56,7 @@
<!-- 动态封装部分 end -->
</div>
<div class="content-block" style="display: none;">
<p><a href="#" class="button button-big button-fill theme">立即评估</a></p>
<p><a onclick="openaddWindow()" class="button button-big button-fill theme">立即评估</a></p>
</div>
</div>
</div>
@@ -232,6 +232,11 @@ function constructHtmlContent(results, xqOneMonthUpDownRangeMap, cityAvgPriceMap
$(document).ready(function () {
selectEvaluateList();
});
function openaddWindow(){
clicked('/views/house/add.html',true,false,{},{})
}
</script>
</body>
@@ -28,7 +28,7 @@
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav">
<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">评估报告</h1>
@@ -144,7 +144,7 @@ $.config = {router: false}
<script>
var lat = 31.2221;
/*var lat = 31.2221;
var lng = 121.359204;
var city = "上海";
var address="广顺小区";
@@ -153,8 +153,36 @@ var minAvgPrice=50000;
var maxAvgPrice=80000;
var areaTag=3;
var tag="近地铁_公交多_买菜做饭_商超便利_爱逛街_在外面吃_近医疗_近幼儿园_近小学_近中学";
var orderBy=0;
var orderBy=0;*/
var lat;
var lng;
var city;
var address;
var travelTime;
var minAvgPrice;
var maxAvgPrice;
var areaTag;
var tag;
var orderBy;
var dataObj = [];
document.addEventListener('plusready', onPlusReady, false);
//扩展API加载完毕,现在可以正常调用扩展API
function onPlusReady(){
var self = plus.webview.currentWebview();
lat = self.lat;
lng = self.lng;
city = self.city;
address = self.address;
travelTime = self.travelTime;
minAvgPrice = self.minAvgPrice;
maxAvgPrice = self.maxAvgPrice;
areaTag = self.areaTag;
tag = self.tag;
orderBy = self.orderBy;
init();
}
function init(){
axios.get("/rest/intelligentHouse/aroundDetail", {
@@ -184,7 +212,6 @@ function init(){
dataObj = $.parseJSON(response.data.data.houseListJson);
//加载区域
var regionList = response.data.data.regionList;
console.log(regionList);
var html = '<p class="buttons-row buttons-row01 buttons-row01a theme"><a class="button active">不限</a>';
for(var i=0;i<regionList.length;i++){
if((i+1)%4 == 0){
@@ -206,7 +233,6 @@ function init(){
console.log(error);
});
}
init();
function turnMap(){
var city = $("#city").val();
var address = $("#address").val();
@@ -135,22 +135,35 @@ $.config = {router: false}
<script type='text/javascript' src='../../js/validate.js' charset='utf-8'></script>
<script>
//document.addEventListener('plusready', onPlusReady, false);
var lat = 31.2221;
document.addEventListener('plusready', onPlusReady, false);
var lat = 31.2221;
var lng = 121.359204;
var city = "上海";
var address="广顺小区";
var outTime="20分钟";
var budget=500;
var area="90-110㎡";
//var houseListJson=[]
/*var lat;
var lng;
var city;
var address;
var outTime;
var budget;
var area;*/
var houseListJson=[]
var mapConfig = {}
//扩展API加载完毕,现在可以正常调用扩展API
/*function onPlusReady(){
function onPlusReady(){
var self = plus.webview.currentWebview();
houseStatus = self.houseStatus;
}*/
var mapConfig = {
lat = self.lat;
lng = self.lng;
city = self.city;
address = self.address;
outTime = self.outTime;
budget = self.budget;
area = self.area;
mapConfig = {
isFirstLoad: true,
datas: {
// myIcon: "<div class='positionIcon'></div>",
@@ -194,6 +207,7 @@ var mapConfig = {
this.mapObj = new BMap.Map("map", {minZoom:this.datas.minZoom,maxZoom:this.datas.maxZoom})
}
this.mapObj.enableScrollWheelZoom();
alert(this.datas.center.lat);
this.mapObj.centerAndZoom(this.datas.center, this.datas.zoom);
var that = this;
@@ -476,8 +490,17 @@ var mapConfig = {
   localSearch.search(region);
}
}
$(document).ready(function(){
mapInit();
//setTimeout("mapInit()","1000");
}
function mapInit(){
/*lat = 31.2221;
lng = 121.359204;
city = "上海";
address="广顺小区";
outTime="20分钟";
budget=500;
area="90-110㎡";*/
axios.get("/rest/intelligentHouse/mapDetail", {
params: {
city: city,
@@ -490,7 +513,6 @@ $(document).ready(function(){
}
})
.then(function (response) {
console.log(response)
houseListJson = response.data.data.houseListJson;
$("#city").val(response.data.data.city);
$("#address").val(response.data.data.address);
@@ -501,6 +523,7 @@ $(document).ready(function(){
$("#minAvgPrice").val(response.data.data.minAvgPrice);
$("#maxAvgPrice").val(response.data.data.maxAvgPrice);
$("#houseNum").text(response.data.data.houseNum);
//mapInit();
mapConfig.init()
$('#map').on('click', ".positionBox .close", function (e) {
mapConfig.hidePopWin()
@@ -509,7 +532,25 @@ $(document).ready(function(){
.catch(function (error) {
console.log(error);
});
})
}
//mapInit()
$(document).ready(function(){
});
/*var t1;
function mapInit(){
t1 = window.setTimeout(loadMap,1000);
}
function loadMap(){
if(lng && lat){
mapConfig.init();
window.clearTimeout(t1);
}
}*/
function getAroundList(){
var city = $("#city").val();
var address = $("#address").val();
+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);
+18 -16
View File
@@ -101,7 +101,7 @@
<i class="icon icon-home01"></i>
<span>我的房产</span>
</div>
<div onclick="openUrl(BASE_PATH+'/intelligentHouse/index',true)">
<div onclick="openIntelligentHouseView()">
<i class="icon icon-home02"></i>
<span>智能选房</span>
</div>
@@ -120,7 +120,7 @@
<div class="content-block-title cardNearbyName" id="nearAddress"><i class="icon icon-address02"></i><span id="nearDistrictSpan"></span><i class="icon arrow-up"></i></div>
<div class="cardNearbyBox" id="nearDistricts">
</div>
<div class="content-block-title recommend">今日推荐</div>
<div class="content-block-title recommend" id="todayNews">今日推荐</div>
<div id="newsList">
</div>
@@ -1173,7 +1173,7 @@
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
Zepto = $
$.config = {router: false}
var cat = ""
</script>
<script type="text/javascript" src="js/vue.js"></script>
<script type="text/javascript" src="js/light7-2.js" charset="utf-8"></script>
@@ -1212,8 +1212,8 @@ var scoreCount = 0;
var lat = 0;
var lng = 0;
var address = "";
var cat;
var timestamp1 = new Date().getTime();
document.addEventListener('plusready', onPlusReady, false);
//扩展API加载完毕,现在可以正常调用扩展API
function onPlusReady(){
@@ -1504,8 +1504,8 @@ function initNearDistricts(cityParam,latParam,lngParam,regionParam,order,minPric
textStr = textName.substr(0,5)+ "...";
}
html += '<div class="card cardNearby" onclick="openDistWindow('+response.data.data.dtos[i].city+','+response.data.data.dtos[i].district+','+response.data.data.dtos[i].name+')"><div class="card-header">'+
textStr+
html += '<div class="card cardNearby" onclick="openDistWindow('+response.data.data.dtos[i].city+','+response.data.data.dtos[i].district+','+response.data.data.dtos[i].name+')"><div class="card-header">'+
textStr+
'</div><div class="card-content"><div class="card-content-inner">'+response.data.data.dtos[i].avgPrice+'元/㎡</div></div><div class="card-footer">'+
'距您'+response.data.data.dtos[i].distance+'m</div></div>';
}
@@ -1538,6 +1538,11 @@ function initNews(page){
// 加载完毕,则注销无限加载事件,以防不必要的加载
$.detachInfiniteScroll($('.infinite-scroll'));
}
if(page==1 && response.data.data.list.length == 0){
$("#todayNews").hide();
}else{
$("#todayNews").show();
}
for(var i in response.data.data.list){
dataObj.push(response.data.data.list[i])
}
@@ -2604,14 +2609,12 @@ function openNewsView(newId) {
$("#visitCount_"+newId).text(count+'人');
}
}
function openIntelligentHouseView() {
clicked('views/intelligentHouse/index.html',true,false,{},{})
}
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 +2636,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;