Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
郝肖肖
8 years ago
Commit
710392621551a62faca7673c11788c82c0207a4c
1 parent
eeca848d
有货币提示靠左
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
18 deletions
web-static/js/order/address.js
web-static/js/order/ensure.js
web-static/js/order/ticket-ensure.js
web-static/sass/order/_pay.css
web-static/js/order/address.js
View file @
7103926
...
...
@@ -770,7 +770,7 @@ $('.to-play input.submit').click(function() {
paymentType
=
$
(
'.pay-time-modify input[name="pay-type"]:checked'
).
val
(),
paymentId
=
$
(
'.pay-time-modify input[name="pay-type"]:checked'
).
data
(
'pay'
),
remark
=
$
(
'#notedesc'
).
val
(),
yohoCoin
=
$
(
'#biprice
'
).
val
()
,
yohoCoin
=
$
(
'#biprice
.is-select'
).
data
(
'yoho-coin-num'
)
*
1
||
0
,
isPreContact
=
$
(
'.pay-time-modify input[name="call-me"]:checked'
).
val
(),
isPrintPrice
=
$
(
'.play-pan input[name="isPP"]:checked'
).
val
(),
redEnvelopes
=
$
(
'.use-envelopes input:checked'
).
attr
(
'data-use'
),
...
...
web-static/js/order/ensure.js
View file @
7103926
...
...
@@ -50,7 +50,6 @@ var Order = {
e
:
{
$pan
:
$
(
'.pan'
),
$jc
:
$
(
'#juancode'
),
$bp
:
$
(
'#biprice'
),
$statistics
:
$
(
'li'
,
'.play-total'
),
$tobi
:
$
(
'p em'
,
'.play-bi-pan .play-pan'
),
$cancel
:
$
(
'.cancel'
,
'.btn-group'
),
...
...
@@ -287,7 +286,10 @@ var Order = {
//如果有货币按钮为打开状态,则关闭
Order
.
Common
.
winHide
(
$
(
'.play-bi-pan'
));
}
$
(
'#biprice'
).
data
(
'yoho-coin-click'
,
data
.
yohoCoinCompute
.
yohoCoinClick
);
$
(
'#biprice'
).
data
({
'yoho-coin-num'
:
data
.
yohoCoinCompute
.
yohoCoinNum
,
'yoho-coin-click'
:
data
.
yohoCoinCompute
.
yohoCoinClick
});
$
(
'#biprice'
).
find
(
'.num-limit-coin'
).
html
(
data
.
yohoCoinCompute
.
yoho_coin_pay_rule
.
num_limit
);
$
(
'#biprice'
).
find
(
'.totalYohoCoinNum'
).
html
(
data
.
yohoCoinCompute
.
totalYohoCoinNum
);
$
(
'#biprice'
).
find
(
'.yohoCoinNum'
).
html
(
data
.
yohoCoinCompute
.
yohoCoinNum
);
...
...
@@ -373,7 +375,6 @@ var Order = {
$biok
:
$
(
'#bisubmit'
),
$carriageGroup
:
$
(
'input[name="carriagegroup"]'
),
$selectExpress
:
$
(
'.express-list input'
),
$bp
:
$
(
'#biprice'
),
$errorTip
:
$
(
'.errbitip'
),
$useEnvelopes
:
$
(
'.use-envelopes'
),
$hasEnvelopes
:
$
(
'.has-envelopes span'
),
...
...
@@ -392,7 +393,7 @@ var Order = {
var
$juangroupInput
=
$
(
'.play-juan.is-select input[name="juangroup"]:checked'
);
var
expressVal
=
$
(
'.express-list input[name="carriagegroup"]:checked'
).
val
();
var
biVal
=
$
(
'#biprice.is-select'
).
data
(
'yoho-coin-num'
)
*
1
;
var
biVal
=
$
(
'#biprice.is-select'
).
data
(
'yoho-coin-num'
)
*
1
||
0
;
var
codeVal
=
$juangroupInput
.
val
();
var
cartType
=
$
(
'.address-manage'
).
attr
(
'cart-type'
);
var
redEnvelopes
=
$
(
'.use-envelopes input:checked'
).
attr
(
'data-use'
);
...
...
@@ -600,17 +601,8 @@ var Order = {
if
(
data
.
code
===
200
)
{
u
.
render
(
data
.
data
,
juanText
);
c
.
winHide
(
$pan
);
$
(
'#biprice'
).
val
(
'0'
);
//$('.play-bi-pan dt').hide();
$
(
'#biprice'
).
removeClass
(
'is-select'
);
$
(
'.errbitip'
).
html
(
''
);
// $('.use-envelopes input').attr('checked', 'checked');
// $('.red-envelopes').addClass('active');
}
else
{
$
(
'.errbitip'
).
html
(
data
.
message
);
}
...
...
@@ -622,7 +614,6 @@ var Order = {
}
else
{
c
.
winHide
(
$pan
);
$
(
'#biprice'
).
val
(
'0'
);
}
});
...
...
web-static/js/order/ticket-ensure.js
View file @
7103926
...
...
@@ -234,7 +234,6 @@ var TicketCat = {
_this
.
render
(
data
.
data
);
c
.
winHide
(
$pan
);
$
(
'#biprice'
).
val
(
'0'
);
$
(
'#biprice'
).
removeClass
(
'is-select'
);
$
(
'.errbitip'
).
html
(
''
);
}
else
{
...
...
@@ -333,7 +332,10 @@ var TicketCat = {
//如果有货币按钮为打开状态,则关闭
_this
.
Common
.
winHide
(
$
(
'.play-bi-pan'
));
}
$
(
'#biprice'
).
data
(
'yoho-coin-click'
,
data
.
yohoCoinCompute
.
yohoCoinClick
);
$
(
'#biprice'
).
data
({
'yoho-coin-num'
:
data
.
yohoCoinCompute
.
yohoCoinNum
,
'yoho-coin-click'
:
data
.
yohoCoinCompute
.
yohoCoinClick
});
$
(
'#biprice'
).
find
(
'.num-limit-coin'
).
html
(
data
.
yohoCoinCompute
.
yoho_coin_pay_rule
.
num_limit
);
$
(
'#biprice'
).
find
(
'.totalYohoCoinNum'
).
html
(
data
.
yohoCoinCompute
.
totalYohoCoinNum
);
$
(
'#biprice'
).
find
(
'.yohoCoinNum'
).
html
(
data
.
yohoCoinCompute
.
yohoCoinNum
);
...
...
@@ -341,7 +343,7 @@ var TicketCat = {
},
getSelectData
:
function
()
{
var
expressVal
=
$
(
'.express-list input[name="carriagegroup"]:checked'
).
val
();
var
biVal
=
$
(
'#biprice.is-select'
).
data
(
'yoho-coin-num'
)
*
1
;
var
biVal
=
$
(
'#biprice.is-select'
).
data
(
'yoho-coin-num'
)
*
1
||
0
;
var
cartType
=
$
(
'.address-manage'
).
attr
(
'cart-type'
);
var
resultData
;
...
...
web-static/sass/order/_pay.css
View file @
7103926
...
...
@@ -355,6 +355,10 @@
.play-bi-pan
{
.errbitip
{
text-align
:
left
;
}
.play-pan
{
width
:
100%
;
...
...
Please
register
or
login
to post a comment