Commit 4d26669d authored by wildfirecode's avatar wildfirecode

1

parent cf85aa64
...@@ -1513,6 +1513,7 @@ export class NetManager extends ABNetManager { ...@@ -1513,6 +1513,7 @@ export class NetManager extends ABNetManager {
* @param {IExposureData} exposure * @param {IExposureData} exposure
*/ */
public showLog(exposure: IExposureData): void { public showLog(exposure: IExposureData): void {
console.log(JSON.stringify(exposure))
const net: INetData = { const net: INetData = {
name: 'showLog', name: 'showLog',
uri: exposure.domain + '/exposure/standard', uri: exposure.domain + '/exposure/standard',
......
...@@ -172,20 +172,7 @@ class Main extends MainBase { ...@@ -172,20 +172,7 @@ class Main extends MainBase {
if (window['pageID']) { if (window['pageID']) {
Buried.init(); Buried.init();
// if (GameConst.getQueryString("InviteSource")) {
yzwNet.homeBaseInfo((s) => {
if (!s) {
if((DataManager.ins.getData("homeBaseInfo").message)){
ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
}else{
ToastCtrl.instance.show("网络异常请重试~");
}
// ToastCtrl.instance.show("网络异常请重试~");
return;
}
}, window['projectId'])
// }
Waiting.instance.hide(); Waiting.instance.hide();
if (window['pageID'] == 'Share2Scene') { if (window['pageID'] == 'Share2Scene') {
...@@ -198,7 +185,9 @@ class Main extends MainBase { ...@@ -198,7 +185,9 @@ class Main extends MainBase {
SceneCtrl.instance.change(ModuleTypes.TeamShareScene); SceneCtrl.instance.change(ModuleTypes.TeamShareScene);
} }
if (window['pageID'] == 'TransScene') { if (window['pageID'] == 'TransScene') {
yzwNet.homeBaseInfo((s) => {
SceneCtrl.instance.change(ModuleTypes.TransScene); SceneCtrl.instance.change(ModuleTypes.TransScene);
}, window['projectId']);
} }
return; return;
} }
...@@ -233,9 +222,9 @@ class Main extends MainBase { ...@@ -233,9 +222,9 @@ class Main extends MainBase {
// } else { // } else {
yzwNet.homeBaseInfo((s) => { yzwNet.homeBaseInfo((s) => {
if (!s) { if (!s) {
if(DataManager.ins.getData("homeBaseInfo") && DataManager.ins.getData("homeBaseInfo").message){ if (DataManager.ins.getData("homeBaseInfo") && DataManager.ins.getData("homeBaseInfo").message) {
ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message) ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
}else{ } else {
ToastCtrl.instance.show("网络异常请重试~"); ToastCtrl.instance.show("网络异常请重试~");
} }
......
...@@ -20,9 +20,9 @@ export default class ConfirmPanel extends Panel { ...@@ -20,9 +20,9 @@ export default class ConfirmPanel extends Panel {
NetManager.ins.yyh_queryInviterPhone(() => { NetManager.ins.yyh_queryInviterPhone(() => {
const data = DataManager.ins.getData('yyh_queryInviterPhone').data; const data = DataManager.ins.getData('yyh_queryInviterPhone').data;
if (data) if (data)
this['tips'].text = `是否确认加入“${data}”的战队参与队伍PK`; this['tips'].text = `是否确认加入“${data}”的战队\n参与队伍PK`;
else else
this['tips'].text = `是否确认加入“未知号码”的战队参与队伍PK`; this['tips'].text = `是否确认加入“未知号码”的战队\n参与队伍PK`;
}, GameConst.getQueryString('joinTeamCode')); }, GameConst.getQueryString('joinTeamCode'));
} }
......
...@@ -29,7 +29,7 @@ export default class JoinShareScene extends Scene { ...@@ -29,7 +29,7 @@ export default class JoinShareScene extends Scene {
this['sharemask'].visible = false; this['sharemask'].visible = false;
}, this); }, this);
} else { } else {
const url = `${window['indexUrl']}?joinTeamCode=${GameConst.getQueryString("shareCode")}&wayId=3` const url = `${window['indexUrl']}?joinTeamCode=${GameConst.getQueryString("joinTeamCode")}&wayId=3`
deeplink(url); deeplink(url);
// PanelCtrl.instance.show(ModuleTypes.ConfirmPanel); // PanelCtrl.instance.show(ModuleTypes.ConfirmPanel);
} }
...@@ -43,7 +43,9 @@ export default class JoinShareScene extends Scene { ...@@ -43,7 +43,9 @@ export default class JoinShareScene extends Scene {
export const deeplink = (activeUrl) => { export const deeplink = (activeUrl) => {
let state = false; let state = false;
window.location.href = 'esports://openapp?url=http://aghzact.zjkczn.com/h5/defaultActive.html?activeUrl=' + encodeURIComponent(activeUrl); const url ='esports://openapp?url=http://aghzact.zjkczn.com/h5/defaultActive.html?activeUrl=' + encodeURIComponent(activeUrl)
console.log(url)
window.location.href = url;
state = true; state = true;
let timer = setTimeout(() => { let timer = setTimeout(() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment