Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
D
doublescreen-front
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-front
Commits
5ac3f75d
Commit
5ac3f75d
authored
Mar 11, 2020
by
pengguangpu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加直接收款的0元判断;
parent
be95517e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
5 deletions
+21
-5
app.js
app.js
+1
-1
balance.js
pages/balance/balance.js
+1
-0
home.js
pages/home/home.js
+19
-4
No files found.
app.js
View file @
5ac3f75d
App
({
App
({
globalData
:
{
globalData
:
{
version
:
"1.0.
0.20200203
"
,
version
:
"1.0.
1.20200311
"
,
//是否使用测试支付数据
//是否使用测试支付数据
useTestPayInfo
:
false
,
useTestPayInfo
:
false
,
printerId
:
null
,
printerId
:
null
,
...
...
pages/balance/balance.js
View file @
5ac3f75d
...
@@ -176,6 +176,7 @@ Page({
...
@@ -176,6 +176,7 @@ Page({
this
.
setData
({
this
.
setData
({
isPaying
:
false
isPaying
:
false
});
});
hideLoading
();
}
}
}
}
}.
bind
(
this
));
}.
bind
(
this
));
...
...
pages/home/home.js
View file @
5ac3f75d
...
@@ -80,10 +80,25 @@ Page({
...
@@ -80,10 +80,25 @@ Page({
}
}
});
});
}
else
if
(
res
.
action
==
ACTION_DIRECT_PAYMENT
)
{
}
else
if
(
res
.
action
==
ACTION_DIRECT_PAYMENT
)
{
//判断金额,不允许0元支付
if
(
res
.
data
==
null
)
{
my
.
showToast
({
content
:
"数据错误"
});
}
else
{
var
miyapayUtils
=
require
(
"../../utils/miyapay4.js"
);
var
priceFen
=
miyapayUtils
.
yuan2Fen
(
res
.
data
);
if
(
priceFen
==
0
)
{
my
.
showToast
({
content
:
"不允许0元支付"
});
return
;
}
//直接收款
//直接收款
my
.
reLaunch
({
my
.
reLaunch
({
url
:
"/pages/balance/balance?totalPrice="
+
res
.
data
+
"&totalQuantity=0&totalDisc=0&type=direct"
,
url
:
"/pages/balance/balance?totalPrice="
+
res
.
data
+
"&totalQuantity=0&totalDisc=0&type=direct"
,
});
});
}
}
else
if
(
res
.
action
==
ACTION_CONVERT_COUPON
)
{
}
else
if
(
res
.
action
==
ACTION_CONVERT_COUPON
)
{
//兑换券
//兑换券
context
.
setData
({
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