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

This commit is contained in:
zongzhimin
2018-05-10 15:39:28 +08:00
8 changed files with 27 additions and 17 deletions
+4 -3
View File
@@ -80,9 +80,9 @@ var openw=null,waiting=null;
* @param {JSON} ws : Webview窗口属性
*/
w.clicked=function(id,wa,ns,ws, params,callback,callbackParams){
if(openw){//避免多次打开同一个页面
return null;
}
// if(openw){//避免多次打开同一个页面
// return null;
// }
if(w.plus){
wa&&(waiting=plus.nativeUI.showWaiting());
ws=ws||{};
@@ -90,6 +90,7 @@ w.clicked=function(id,wa,ns,ws, params,callback,callbackParams){
ws.scalable||(ws.scalable=false);
var pre='';//'http://192.168.1.178:8080/h5/';
openw=plus.webview.create(pre+id,id,ws,params);
ns||openw.addEventListener('loaded',function(){//页面加载完成后才显示
// setTimeout(function(){//延后显示可避免低端机上动画时白屏
openw.show(as);
+16 -7
View File
@@ -1342,10 +1342,7 @@ function onPlusReady() {
var self = plus.webview.currentWebview();
hsId = self.hsId
houseId = self.houseId
if(hsId){
//如果是修改置换建议,则默认将值填入
updateChangeSubtation(hsId);
}
if(houseId){
//小区报告页带入
@@ -1359,15 +1356,25 @@ function onPlusReady() {
var formatCity = formatBaiduCity(city);
if(formatCity){
step2Vue.defaultCity = formatCity
loadingRegion(formatCity);
}else{
step2Vue.defaultCity = dCity
loadingRegion(dCity);
}
if(hsId){
//如果是修改置换建议,则默认将值填入
updateChangeSubtation(hsId);
}else{
loadingRegion(step2Vue.defaultCity);
}
}, function(e){
step2Vue.defaultCity = dCity
loadingRegion(dCity);
if(hsId){
//如果是修改置换建议,则默认将值填入
updateChangeSubtation(hsId);
}else{
loadingRegion(step2Vue.defaultCity);
}
},
{
provider:'baidu',
@@ -1375,6 +1382,8 @@ function onPlusReady() {
coordsType:'bd09ll'
}
);
}
+1 -1
View File
@@ -117,7 +117,7 @@
</div>
</div>
<a class="ad bb"><img id="img"></a>
<a class="ad bb" href="#"><img id="img"></a>
<div class="topic">
<div class="topicTitle">小区走势分析</div>
@@ -105,7 +105,7 @@
</li>
</ul>
</div>
<a class="ad bb" id="img_ad"><img id="img"></a>
<a class="ad bb" href="#"><img id="img"></a>
<div class="topic">
<div class="topicTitle" style="position:relative;">均价走势
<div class="content-block">
+1 -1
View File
@@ -110,7 +110,7 @@
</div>
</div>
<a class="ad bb"><img id="img"></a>
<a class="ad bb" href="#"><img id="img"></a>
<div class="topic rentBox dn">
<div class="topicContent" style="padding:0.5rem 0;">
<div class="list-block dataList">
+2 -2
View File
@@ -81,7 +81,7 @@
</div>
</div>
<a class="ad bb"><img id="img"></a>
<a class="ad bb" href="#"><img id="img"></a>
<div id="myFocusFirstPage" v-cloak>
<my_focus></my_focus>
@@ -205,7 +205,7 @@
</div>
</div>
<a class="ad bb"><img id="img2"></a>
<a class="ad bb" href="#"><img id="img2"></a>
<div class="topic">
<div class="topicTitle topicTitle02">{{myCityMap.time}}楼市行情<span><a @click="showRegionInfo(myCityMap.city)">区县涨跌详情<i class="icon icon-right"></i></a></span></div>
@@ -53,7 +53,7 @@
</div>
</div>
<div class="content">
<a class="ad bb"><img id="img"></a>
<a class="ad bb" href="#"><img id="img"></a>
<div class="list-block media-list">
<!-- 动态封装部分 begin -->
<ul>
+1 -1
View File
@@ -84,7 +84,7 @@
<room-rent-component></room-rent-component>
</div>
<a class="ad bb"><img id="img"></a>
<a class="ad bb" href="#"><img id="img"></a>
<div id="baseInfo" class="list-block">
<base-info-component></base-info-component>