Commit 96d7a388 authored by jiangjiantao's avatar jiangjiantao

bugfix

parent 2f3b3730
...@@ -114,9 +114,6 @@ Page({ ...@@ -114,9 +114,6 @@ Page({
{ url: "/images/img_ad1.png", selected: true }, { url: "/images/img_ad1.png", selected: true },
{ url: "/images/img_ad2.png", selected: false }, { url: "/images/img_ad2.png", selected: false },
], ],
isRecive : false
}, },
/** /**
...@@ -287,75 +284,34 @@ Page({ ...@@ -287,75 +284,34 @@ Page({
context.setData({ convertCouponMsg: res.data.msg }) context.setData({ convertCouponMsg: res.data.msg })
} }
} else if (res.action == ACTION_LOGIN_OK) { } else if (res.action == ACTION_LOGIN_OK) {
if (!context.isFrontScreenLoginOK) {
if (!context.data.isRecive) { //前屏登录完成
context.setData({ isRecive: true }) my.ix.sendBuddyMessage({
setTimeout(function () { target: getApp().globalData.frontScreenAppId,
data: {
my.ix.sendBuddyMessage({ action: ACTION_LOGIN_OK,
target: getApp().globalData.frontScreenAppId, data: null
data: { },
action: ACTION_LOGIN_OK, success: (result) => {
data: null var loginOptions = res.data;
}, var sn = loginOptions.sn;
success: (result) => { var account = loginOptions.account;
var loginOptions = res.data; var version = loginOptions.containerVersion;
var sn = loginOptions.sn; context.setData({
var account = loginOptions.account; isFrontScreenLoginOK: true,
var version = loginOptions.containerVersion; storeName: account.storeName,
context.setData({ storeId: account.storeId,
isFrontScreenLoginOK: true, userName: account.userName,
storeName: account.storeName, serialNo: sn,
storeId: account.storeId, containerVersion: version,
userName: account.userName, })
serialNo: sn, console.log("通知前屏回到首页 成功 ===》" + JSON.stringify(res));
containerVersion: version, },
}) fail: (res) => {
console.log("通知前屏回到首页 成功 ===》" + JSON.stringify(res)); console.log("通知前屏回到首页 失败 ===》 " + JSON.stringify(res));
}, },
fail: (res) => { });
console.log("通知前屏回到首页 失败 ===》 " + JSON.stringify(res)); }
},
});
}, 1000)
}
// if (!context.isFrontScreenLoginOK) {
// //前屏登录完成
// my.ix.sendBuddyMessage({
// target: getApp().globalData.frontScreenAppId,
// data: {
// action: ACTION_LOGIN_OK,
// data: null
// },
// success: (result) => {
// var loginOptions = res.data;
// var sn = loginOptions.sn;
// var account = loginOptions.account;
// var version = loginOptions.containerVersion;
// context.setData({
// isFrontScreenLoginOK: true,
// storeName: account.storeName,
// storeId: account.storeId,
// userName: account.userName,
// serialNo: sn,
// containerVersion: version,
// })
// console.log("通知前屏回到首页 成功 ===》" + JSON.stringify(res));
// },
// fail: (res) => {
// console.log("通知前屏回到首页 失败 ===》 " + JSON.stringify(res));
// },
// });
// }
} else if (res.action == ACTION_REFUND_SUCCESS) { } else if (res.action == ACTION_REFUND_SUCCESS) {
//跳转到成功页面 //跳转到成功页面
context.setData({ context.setData({
......
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