From 377b064ad41890f2ace2f469357ab8d2da7c7dd8 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 8 May 2018 18:50:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fangija-zsyf/config.js | 3 +- fangija-zsyf/manifest.json | 6 ++- fangija-zsyf/views/changeHouse/index.html | 57 ++++++++++++----------- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js index 8b9fcf3..4380bdf 100644 --- a/fangija-zsyf/config.js +++ b/fangija-zsyf/config.js @@ -1,8 +1,9 @@ /**服务端地址**/ //var BASE_PATH = "http://youfang.fangjia.com"; //var BASE_PATH = "http://192.168.10.128:8084"; -var BASE_PATH = "http://192.168.10.164:8084"; +//var BASE_PATH = "http://192.168.10.164:8084"; //var BASE_PATH = "http://192.168.10.53: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.170:8084"; //var BASE_PATH = "http://192.168.10.171:8084"; diff --git a/fangija-zsyf/manifest.json b/fangija-zsyf/manifest.json index ff296a5..4063ebe 100644 --- a/fangija-zsyf/manifest.json +++ b/fangija-zsyf/manifest.json @@ -1654,7 +1654,8 @@ "css/theme-blue.css" ], "refer": [ - "views/house/add.html" + "views/house/add.html", + "views/webview_embed.html" ], "priority": 0 }, @@ -1768,7 +1769,8 @@ "resources": [], "refer": [ "views/rent/rentManager.html", - "views/loan/loanInfo.html" + "views/loan/loanInfo.html", + "views/changeHouse/index.html" ], "priority": 0 } diff --git a/fangija-zsyf/views/changeHouse/index.html b/fangija-zsyf/views/changeHouse/index.html index 3cce608..2c98b8b 100644 --- a/fangija-zsyf/views/changeHouse/index.html +++ b/fangija-zsyf/views/changeHouse/index.html @@ -1301,6 +1301,8 @@ var houseListData = new Vue({ } }) + + var step2Vue = new Vue({ el: '#step2Div', data: { @@ -1308,28 +1310,7 @@ var step2Vue = new Vue({ regions : [] }, methods:{ - //加载第二步的区域列表 - loadRegion: function(){ - - //this.defaultCity = dCity - //loadingRegion(dCity); - plus.geolocation.getCurrentPosition(function(p){ - city = p.address.city; - - var formatCity = formatBaiduCity(city); - step2Vue.defaultCity = formatCity - loadingRegion(formatCity); - }, function(e){ - step2Vue.defaultCity = dCity - loadingRegion(dCity); - }, - { - provider:'baidu', - enableHighAccuracy:true, - coordsType:'bd09ll' - } - ); - }, + clickTags: function(e){ if($(event.target).hasClass("active")){ @@ -1351,11 +1332,11 @@ var step2Vue = new Vue({ } }, created:function(){ - - this.loadRegion(); + //this.loadRegion(); } }) + document.addEventListener('plusready', onPlusReady, false); function onPlusReady() { var self = plus.webview.currentWebview(); @@ -1371,8 +1352,32 @@ function onPlusReady() { fillHouseInfo(houseId); } - + //加载第二步的区域列表 + plus.geolocation.getCurrentPosition(function(p){ + city = p.address.city; + + var formatCity = formatBaiduCity(city); + if(formatCity){ + step2Vue.defaultCity = formatCity + loadingRegion(formatCity); + }else{ + step2Vue.defaultCity = dCity + loadingRegion(dCity); + } + + }, function(e){ + step2Vue.defaultCity = dCity + loadingRegion(dCity); + }, + { + provider:'baidu', + enableHighAccuracy:true, + coordsType:'bd09ll' + } + ); } + + //修改置换建议填充默认值 function updateChangeSubtation(hsId){ axios.get(BASE_PATH + "/rest/changeHouse/loadHouseSubInfo",{ @@ -1429,7 +1434,7 @@ function fillHouseInfo(houseId){ var data = response.data.data; if(data){ addBaseHouseInfo(data); - baseInfo.houseId = hs.houseId + baseInfo.houseId = houseId } }).catch(function (error) { console.log(error);