Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
joshine
Overview
Overview
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
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
joshine
Commits
a4ba514f
Commit
a4ba514f
authored
May 18, 2023
by
dhn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加支付等待按钮
parent
045915c8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
9 deletions
+30
-9
app/code/Magento/Checkout/view/frontend/web/js/view/part.js
+10
-1
app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
+6
-5
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
+6
-2
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/shipping.html
+8
-1
No files found.
app/code/Magento/Checkout/view/frontend/web/js/view/part.js
View file @
a4ba514f
...
...
@@ -111,8 +111,8 @@ define([
$
(
'#breadcrumb-logistics'
).
removeClass
(
'trade_checkout_step_waiting'
);
addressOneVisible
(
false
);
shippingTwoVisible
(
true
);
checkoutDataResolver
.
resolveEstimationAddress
();
//quote.billAddressMent(true);
checkoutDataResolver
.
resolveEstimationAddress
();
});
$
(
document
).
on
(
'click'
,
'.continue-payment'
,
function
()
{
...
...
@@ -152,6 +152,8 @@ define([
obj
.
backToInformation
();
return
false
;
}
$
(
'.waitBtn'
).
show
();
$
(
'.complete-order'
).
hide
();
if
(
!
registry
.
get
(
'checkout.steps.shipping-step.shippingAddress.after-shipping-method-form.billing-address-form'
).
isAddressSameAsShipping
())
{
var
billadressForm
=
$
(
'.checkout-billing-address form'
);
...
...
@@ -185,6 +187,8 @@ define([
$
(
selectInput
[
i
]).
removeAttr
(
'name'
)
}
}
$
(
'.waitBtn'
).
hide
();
$
(
'.complete-order'
).
show
();
return
false
;
}
...
...
@@ -194,15 +198,20 @@ define([
}
}
}
else
{
$
(
'.waitBtn'
).
hide
();
$
(
'.complete-order'
).
show
();
return
false
;
}
$
(
'#submitBill'
).
trigger
(
'click'
);
if
(
quote
.
responseBillStatus
()
==
400
)
{
$
(
'.waitBtn'
).
hide
();
$
(
'.complete-order'
).
show
();
return
false
;
}
}
$
(
'.checkout-index-index .payment-method._active'
).
find
(
'.actions-toolbar'
).
find
(
'button'
).
trigger
(
'click'
);
});
$
(
document
).
on
(
'click'
,
'.back-to-information,.trade_checkout_step_doing.custom-link-color,.right-email,.right-address'
,
function
()
{
...
...
app/code/Magento/Checkout/view/frontend/web/js/view/payment/default.js
View file @
a4ba514f
...
...
@@ -149,14 +149,15 @@ define([
}
}
).
always
(
function
()
{
self
.
isPlaceOrderActionAllowed
(
true
);
}
);
function
()
{
self
.
isPlaceOrderActionAllowed
(
true
);
}
);
return
true
;
}
$
(
'.waitBtn'
).
hide
();
$
(
'.complete-order'
).
show
();
return
false
;
},
...
...
app/design/frontend/Joshine/breeze/Magento_Checkout/templates/onepage.phtml
View file @
a4ba514f
...
...
@@ -1676,8 +1676,8 @@ $isMobile = $mobileDetect->isMobile();
color
:
#276EAF
;
}
.jkl
{
width
:
20
px
;
height
:
20
px
;
width
:
17
px
;
height
:
17
px
;
border
:
2px
solid
#f2f2f2
;
border-top-color
:
#dbb893
;
border-radius
:
50%
;
...
...
@@ -1687,6 +1687,10 @@ $isMobile = $mobileDetect->isMobile();
-o-animation
:
fadenum
1s
linear
infinite
;
vertical-align
:
sub
;
display
:
inline-block
;
margin-left
:
15px
;
}
.wait-loop
{
display
:
inline-block
;
}
@keyframes
fadenum
{
100
%
{
transform
:
rotate
(
360deg
);}
...
...
app/design/frontend/Joshine/breeze/Magento_Checkout/web/template/shipping.html
View file @
a4ba514f
...
...
@@ -190,7 +190,14 @@
</button>
<span
class=
"save-continue continue-shipping address-one"
data-bind=
"fadeVisible: addressVisible"
>
<!-- ko i18n: 'Continue to Shipping'--><!-- /ko -->
</span>
<span
class=
"save-continue continue-payment shipping-two"
data-bind=
"fadeVisible: shippingVisible"
>
<!-- ko i18n: 'Continue to Payment'--><!-- /ko -->
</span>
<span
class=
"save-continue complete-order payment-three "
data-bind=
"fadeVisible: paymentVisible"
>
<!-- ko i18n: 'Complete Order'--><!-- /ko -->
</span>
<span
class=
"save-continue complete-order payment-three "
data-bind=
"fadeVisible: paymentVisible"
>
<span
class=
"coBtn"
>
<!-- ko i18n: 'Complete Order'--><!-- /ko -->
</span>
</span>
<span
class=
"save-continue waitBtn"
style=
"display: none;"
>
<span
class=
"wait-loop"
>
<!-- ko i18n: 'Please wait'--><!-- /ko -->
<div
class=
"jkl"
></div></span>
</span>
</div>
</li>
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