Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
D
doublescreen-back
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pengguangpu
doublescreen-back
Commits
96d7a388
Commit
96d7a388
authored
Mar 20, 2020
by
jiangjiantao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
2f3b3730
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
72 deletions
+28
-72
index.js
pages/index/index.js
+28
-72
No files found.
pages/index/index.js
View file @
96d7a388
...
...
@@ -114,9 +114,6 @@ Page({
{
url
:
"/images/img_ad1.png"
,
selected
:
true
},
{
url
:
"/images/img_ad2.png"
,
selected
:
false
},
],
isRecive
:
false
},
/**
...
...
@@ -287,75 +284,34 @@ Page({
context
.
setData
({
convertCouponMsg
:
res
.
data
.
msg
})
}
}
else
if
(
res
.
action
==
ACTION_LOGIN_OK
)
{
if
(
!
context
.
data
.
isRecive
)
{
context
.
setData
({
isRecive
:
true
})
setTimeout
(
function
()
{
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
));
},
});
},
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));
// },
// });
// }
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
)
{
//跳转到成功页面
context
.
setData
({
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment