Merge branch 'YOUFANGAPP1.1.5' of http://gitlab.fangjia.com/dev0/youfang-app into xh-YOUFANGAPP1.1.5
This commit is contained in:
@@ -4,6 +4,10 @@ function add_imgage(imageId,adPosition,device){
|
||||
}).then(function(response){
|
||||
if(response.data.status){
|
||||
var h = response.data.data;
|
||||
if (h == "" || h == null) {
|
||||
return;
|
||||
}
|
||||
console.log(h);
|
||||
if(typeof(h.imgUrl)!="undefined"&&h.imgUrl!=null&&$.trim(h.imgUrl)!=""){
|
||||
$("#"+imageId).attr("src",h.imgUrl);
|
||||
}
|
||||
|
||||
@@ -164,21 +164,26 @@ document.addEventListener("plusready", function() {
|
||||
} else if (payload.type == "2") {
|
||||
plus.nativeUI.confirm(content, function(e){
|
||||
if (e.index==0) {
|
||||
var url = payload.url;
|
||||
var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?');
|
||||
var openUrl = url.substring(0, sindex);
|
||||
var paramStr = url.substring(sindex+1);
|
||||
var jsonData = {};
|
||||
var parray = paramStr.split('&')
|
||||
for(var i=0;i<parray.length;i++){
|
||||
var subArray = parray[i].split('=')
|
||||
if(parray[i] != ""){
|
||||
if(subArray.length > 0) {
|
||||
jsonData[subArray[0]] = subArray[1];
|
||||
if (payload.url.startWith("http")) {
|
||||
clicked('views/webview_embed.html', true,false,{},{url:payload.url})
|
||||
} else {
|
||||
var url = payload.url;
|
||||
var sindex = url.indexOf('?') == -1 ? url.length : url.indexOf('?');
|
||||
var openUrl = url.substring(0, sindex);
|
||||
var paramStr = url.substring(sindex+1);
|
||||
var jsonData = {};
|
||||
var parray = paramStr.split('&')
|
||||
for(var i=0;i<parray.length;i++){
|
||||
var subArray = parray[i].split('=')
|
||||
if(parray[i] != ""){
|
||||
if(subArray.length > 0) {
|
||||
jsonData[subArray[0]] = subArray[1];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
clicked(openUrl,true,false,{},jsonData)
|
||||
clicked(openUrl,true,false,{},jsonData)
|
||||
}
|
||||
|
||||
}
|
||||
}, title, ["查看","忽略"] );
|
||||
|
||||
|
||||
+5
-24
@@ -100,29 +100,11 @@
|
||||
plus.navigator.setFullscreen(false);
|
||||
|
||||
} else {
|
||||
plus.geolocation.getCurrentPosition(
|
||||
function(p){
|
||||
try {
|
||||
city = p.address.city;
|
||||
if(city){
|
||||
city = formatBaiduCity(city);
|
||||
}
|
||||
} catch(e){
|
||||
city = "上海";
|
||||
}
|
||||
loadStartPage(city);
|
||||
}, function(e){
|
||||
city = "上海";
|
||||
loadStartPage(city);
|
||||
},
|
||||
{
|
||||
provider:'baidu',
|
||||
enableHighAccuracy:true,
|
||||
coordsType:'bd09ll'
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
var city = localStorage.getItem("init_city");
|
||||
if (city == null || city == "") {
|
||||
city = "全国";
|
||||
}
|
||||
loadStartPage(city);
|
||||
//显示启动导航
|
||||
mui.openWindow({
|
||||
id: 'guide',
|
||||
@@ -334,7 +316,6 @@
|
||||
};
|
||||
} else {
|
||||
var imei = plus.device.imei;
|
||||
alert(imei);
|
||||
data = {
|
||||
"account_id":8008196,
|
||||
"user_action_set_id":1106980650,
|
||||
|
||||
@@ -1741,13 +1741,13 @@ function addFocus(city){
|
||||
|
||||
}else{
|
||||
axios.get("/rest/quotations/collectCity",{params:{city:city,type:0}}).then(function(response){
|
||||
reloadMyFocus()
|
||||
reloadCityIncreaseRanking()
|
||||
reloadCityPotentialRanking()
|
||||
|
||||
if(plus.webview.getWebviewById('views/house/houseDetail.html')!= null) {
|
||||
plus.webview.getWebviewById('views/house/houseDetail.html').reload();
|
||||
}
|
||||
|
||||
/*reloadMyFocus()
|
||||
reloadCityIncreaseRanking()
|
||||
reloadCityPotentialRanking()*/
|
||||
if(plus.webview.getWebviewById('views/house/houseManageList.html') != null) {
|
||||
plus.webview.getWebviewById('views/house/houseManageList.html').reload();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user