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
06e71329
Commit
06e71329
authored
Mar 02, 2020
by
gaodapeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加退出的流程
parent
563a43ae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
29 deletions
+36
-29
actioncmd.js
const/actioncmd.js
+2
-1
index.js
pages/index/index.js
+34
-28
No files found.
const/actioncmd.js
View file @
06e71329
...
...
@@ -91,7 +91,8 @@ const FLOW_COLLECTIONS = "collections";//收款
const
FLOW_REFUND
=
"refund"
;
//退款
const
FLOW_DIRECT_PAYMENT
=
"direct_payment"
//直接收款
const
FLOW_VERIFY
=
"verify"
;
//核验
const
FLOW_QUIT
=
"quit"
;
export
{
FLOW_IDLE
,
FLOW_COLLECTIONS
,
FLOW_REFUND
,
FLOW_DIRECT_PAYMENT
,
FLOW_VERIFY
FLOW_IDLE
,
FLOW_COLLECTIONS
,
FLOW_REFUND
,
FLOW_DIRECT_PAYMENT
,
FLOW_VERIFY
,
FLOW_QUIT
}
pages/index/index.js
View file @
06e71329
...
...
@@ -10,7 +10,7 @@ import {
ACTION_SYSTEM_SETTING
,
ACTION_BALANCE_BACK_GOODS
,
ACTION_DAY_CHECK
,
ACTION_VERIFY
,
ACTION_VERIFY_SUCCESS
,
ACTION_VERIFY_FAILED
,
ACTION_PICK_UP_GOODS
}
from
'../../const/actioncmd'
import
{
FLOW_IDLE
,
FLOW_COLLECTIONS
,
FLOW_REFUND
,
FLOW_DIRECT_PAYMENT
,
FLOW_VERIFY
}
from
'../../const/actioncmd'
import
{
FLOW_IDLE
,
FLOW_COLLECTIONS
,
FLOW_REFUND
,
FLOW_DIRECT_PAYMENT
,
FLOW_VERIFY
,
FLOW_QUIT
}
from
'../../const/actioncmd'
Page
({
...
...
@@ -106,7 +106,6 @@ Page({
operateReDo
:
"重新退款"
,
/** 重新检查的窗口 */
recheckBlock
:
false
,
//屏蔽取消操作,防止在实际已经进行了接口请求时还能取消,使得流程混乱
recheckShow
:
false
,
recheckRemind
:
"确定要取消此收款订单吗?"
,
...
...
@@ -116,8 +115,6 @@ Page({
{
url
:
"/images/img_ad2.png"
,
selected
:
false
},
],
/**键盘 */
keyboardErrMsg
:
""
,
},
/**
...
...
@@ -431,26 +428,9 @@ Page({
onQuit
()
{
console
.
log
(
"onQuit"
);
this
.
setData
({
isFrontScreenLoginOK
:
false
,
storeName
:
"--"
,
storeId
:
"--"
,
userName
:
"--"
,
})
this
.
goPage
(
'home'
)
my
.
ix
.
sendBuddyMessage
({
target
:
getApp
().
globalData
.
frontScreenAppId
,
data
:
{
action
:
ACTION_QUIT
,
data
:
null
},
success
:
(
res
)
=>
{
console
.
log
(
"通知前屏退出 成功 ===》"
+
JSON
.
stringify
(
res
));
},
fail
:
(
res
)
=>
{
console
.
log
(
"通知前屏退出 失败 ===》"
+
JSON
.
stringify
(
res
));
}
flowType
:
FLOW_QUIT
,
recheckShow
:
true
,
recheckRemind
:
"确定要退出登录吗?"
,
})
},
...
...
@@ -1298,10 +1278,36 @@ Page({
//重检查提示点击确定
recheckConfirm
()
{
this
.
setData
({
recheckShow
:
false
,
});
this
.
goHome
();
if
(
this
.
data
.
flowType
==
FLOW_QUIT
)
{
this
.
setData
({
isFrontScreenLoginOK
:
false
,
storeName
:
"--"
,
storeId
:
"--"
,
userName
:
"--"
,
recheckShow
:
false
,
})
this
.
goPage
(
'home'
)
my
.
ix
.
sendBuddyMessage
({
target
:
getApp
().
globalData
.
frontScreenAppId
,
data
:
{
action
:
ACTION_QUIT
,
data
:
null
},
success
:
(
res
)
=>
{
console
.
log
(
"通知前屏退出 成功 ===》"
+
JSON
.
stringify
(
res
));
},
fail
:
(
res
)
=>
{
console
.
log
(
"通知前屏退出 失败 ===》"
+
JSON
.
stringify
(
res
));
}
})
}
else
{
this
.
setData
({
recheckShow
:
false
,
});
this
.
goHome
();
}
},
recheckCancel
()
{
...
...
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