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
4dfb6e9c
Commit
4dfb6e9c
authored
Feb 27, 2020
by
jiangjiantao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfixed
parent
4e6729c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
actioncmd.js
const/actioncmd.js
+4
-0
index.js
pages/index/index.js
+4
-2
No files found.
const/actioncmd.js
View file @
4dfb6e9c
...
@@ -64,6 +64,10 @@ export const ACTION_USE_COUPON = "ACTION_USE_COUPON";
...
@@ -64,6 +64,10 @@ export const ACTION_USE_COUPON = "ACTION_USE_COUPON";
//系统设置
//系统设置
export
const
ACTION_SYSTEM_SETTING
=
"ACTION_SYSTEM_SETTING"
;
export
const
ACTION_SYSTEM_SETTING
=
"ACTION_SYSTEM_SETTING"
;
//结算页面回到扫商品页面
export
const
ACTION_BALANCE_BACK_GOODS
=
"ACTION_BALANCE_BACK_GOODS"
;
const
FLOW_IDLE
=
"idle"
;
const
FLOW_IDLE
=
"idle"
;
const
FLOW_COLLECTIONS
=
"collections"
;
//收款
const
FLOW_COLLECTIONS
=
"collections"
;
//收款
const
FLOW_REFUND
=
"refund"
;
//退款
const
FLOW_REFUND
=
"refund"
;
//退款
...
...
pages/index/index.js
View file @
4dfb6e9c
...
@@ -7,7 +7,7 @@ import {
...
@@ -7,7 +7,7 @@ import {
ACTION_DIRECT_PAYMENT
,
ACTION_CONVERT_COUPON
,
ACTION_LOGIN_OK
,
ACTION_DIRECT_PAYMENT
,
ACTION_CONVERT_COUPON
,
ACTION_LOGIN_OK
,
ACTION_REFUND
,
ACTION_REFUND_SUCCESS
,
ACTION_REFUND_FAILED
,
ACTION_REFUND
,
ACTION_REFUND_SUCCESS
,
ACTION_REFUND_FAILED
,
ACTION_PRINT_LAST_ORDER
,
ACTION_GET_CUR_AD
,
ACTION_SEND_SEL_AD
,
ACTION_PRINT_LAST_ORDER
,
ACTION_GET_CUR_AD
,
ACTION_SEND_SEL_AD
,
ACTION_SYSTEM_SETTING
,
ACTION_SYSTEM_SETTING
,
ACTION_BALANCE_BACK_GOODS
,
}
from
'../../const/actioncmd'
}
from
'../../const/actioncmd'
import
{
FLOW_IDLE
,
FLOW_COLLECTIONS
,
FLOW_REFUND
,
FLOW_DIRECT_PAYMENT
}
from
'../../const/actioncmd'
import
{
FLOW_IDLE
,
FLOW_COLLECTIONS
,
FLOW_REFUND
,
FLOW_DIRECT_PAYMENT
}
from
'../../const/actioncmd'
...
@@ -318,8 +318,10 @@ Page({
...
@@ -318,8 +318,10 @@ Page({
discCouponMsg
:
coupon
.
discCouponMsg
,
discCouponMsg
:
coupon
.
discCouponMsg
,
discCouponPrice
:
coupon
.
discCouponPrice
discCouponPrice
:
coupon
.
discCouponPrice
})
})
}
else
if
(
res
.
action
==
ACTION_BALANCE_BACK_GOODS
){
//结算页面回到扫商品页面
context
.
goPage
(
'landscan'
);
}
}
}
}
});
});
...
...
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