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

This commit is contained in:
2018-05-21 12:03:34 +08:00
2 changed files with 57 additions and 10 deletions
+56 -9
View File
@@ -1,3 +1,8 @@
String.prototype.startWith=function(str){
var reg=new RegExp("^"+str);
return reg.test(this);
}
/**
* 推送处理业务逻辑
* yinjihuan
@@ -71,9 +76,32 @@ document.addEventListener("plusready", function() {
}
});
} else if (payload.type == "2") {
plus.ui.alert(content,function(){
clicked('views/webview_embed.html', true,false,{},{url:payload.url})
});
if (payload.url.startWith("http")) {
plus.ui.alert(content,function(){
clicked('views/webview_embed.html', true,false,{},{url:payload.url})
});
} else {
// 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面
// 否则就是打开app内部页面
plus.ui.alert(content,function(){
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)
});
}
}
}
@@ -116,13 +144,32 @@ document.addEventListener("plusready", function() {
}
});
} else if (payload.type == "2") {
plus.ui.alert(title+"\n"+content,function(){
openUrl(BASE_PATH+'/message/openView?url='+payload.url);
});
if (payload.url.startWith("http")) {
plus.ui.alert(content,function(){
clicked('views/webview_embed.html', true,false,{},{url:payload.url})
});
} else {
// 处理打开app中的二级页面,一级页面在type=1中已经处理了,如果有http的地址就是打开外部页面
// 否则就是打开app内部页面
plus.ui.alert(content,function(){
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)
});
}
}
}, false);
}, false);
function openUrl(url){
clicked(url,true);
}
+1 -1
View File
@@ -434,7 +434,7 @@ function selectUserInfo(){
var mobile = result.mobile;
//加载个人信息时候为该变量赋值
_mobile = result.mobile;
$('#user_mobile').html(mobile.substring(0,3)+'****'+mobile.substring(7)+'<br><span class="tag"><!--<small>土豪</small>--></span>');
$('#user_mobile').html('<br><span class="tag"><small>'+mobile.substring(0,3)+'****'+mobile.substring(7)+'</small></span>');
if(result.headImg != null && result.headImg.length > 0){
$('#user_headImg').attr('src', result.headImg);
}