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
yyq
8 years ago
Commit
c6537ec6f7589ffe134114042412aa55c147580b
1 parent
6546da38
fix js
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
50 additions
and
5 deletions
template/www.yohobuy.com/partials/layout/use.phtml
web-static/index.js
web-static/js/pay/best-for-you.js
web-static/js/pay/success.js
web-static/sass/pay/_notice.css
web-static/sass/shopping/_cashondelivery.css
yohobuy/www.yohobuy.com/application/modules/Pay/controllers/Notice.php
yohobuy/www.yohobuy.com/application/modules/Pay/controllers/Payreturn.php
yohobuy/www.yohobuy.com/application/modules/Shopping/controllers/Pay.php
template/www.yohobuy.com/partials/layout/use.phtml
View file @
c6537ec
...
...
@@ -292,6 +292,13 @@
</script>
{{/if}}
{{!-- 支付成功页面 --}}
{{#if paySuccessPage}}
<script>
seajs.use('js/pay/success');
</script>
{{/if}}
{{!-- 微信支付 --}}
{{#if wechatqrcodePage}}
<script>
...
...
web-static/index.js
View file @
c6537ec
...
...
@@ -45,6 +45,9 @@ require('./js/shopping/pay');
//微信扫码支付
require
(
'./js/pay/wechatqrcode'
);
//支付成功页
require
(
'./js/pay/success'
);
//关于我们
require
(
'./js/about/entry'
);
...
...
web-static/js/pay/best-for-you.js
0 → 100644
View file @
c6537ec
var
$
=
require
(
'yoho.jquery'
);
(
function
()
{
var
$bestForYou
=
$
(
'#best-for-you'
);
var
$box
,
boxInfo
;
if
(
!
$bestForYou
.
length
)
{
return
;
}
$box
=
$bestForYou
.
children
(
'.product-wrap'
);
boxInfo
=
{
index
:
0
,
width
:
$box
.
find
(
'li'
).
width
()
+
10
,
totalPage
:
Math
.
ceil
((
$box
.
find
(
'li'
).
length
+
1
)
/
5
)
};
if
(
boxInfo
.
totalPage
>
1
)
{
boxInfo
.
totalPage
=
boxInfo
.
totalPage
>
3
?
3
:
boxInfo
.
totalPage
;
$bestForYou
.
find
(
'.change-btn'
).
show
().
click
(
function
()
{
boxInfo
.
index
++
;
$box
.
get
(
0
).
scrollLeft
=
(
boxInfo
.
index
%
boxInfo
.
totalPage
)
*
boxInfo
.
width
*
5
;
});
}
})();
...
...
web-static/js/pay/success.js
0 → 100644
View file @
c6537ec
/**
* 支付成功页
*/
require
(
'./best-for-you'
);
...
...
web-static/sass/pay/_notice.css
View file @
c6537ec
...
...
@@ -15,13 +15,14 @@
border
:
1px
solid
#e0e0e0
;
>
h1
{
font-size
:
2
6
px
;
font-size
:
2
8
px
;
line-height
:
1
;
.pay-sure-icon
{
display
:
inline-block
;
width
:
32px
;
height
:
32px
;
margin-right
:
20px
;
background
:
resolve
(
'pay/pay-sure-icon.png'
);
vertical-align
:
text-bottom
;
}
...
...
web-static/sass/shopping/_cashondelivery.css
View file @
c6537ec
...
...
@@ -15,13 +15,14 @@
border
:
1px
solid
#e0e0e0
;
>
h1
{
font-size
:
2
6
px
;
font-size
:
2
8
px
;
line-height
:
1
;
.pay-sure-icon
{
display
:
inline-block
;
width
:
32px
;
height
:
32px
;
margin-right
:
20px
;
background
:
resolve
(
'pay/pay-sure-icon.png'
);
vertical-align
:
text-bottom
;
}
...
...
yohobuy/www.yohobuy.com/application/modules/Pay/controllers/Notice.php
View file @
c6537ec
...
...
@@ -396,7 +396,8 @@ class NoticeController extends WebAction
'orderNum'
=>
$dealResult
[
'data'
][
'orderNum'
],
'items'
=>
$dealResult
[
'data'
][
'items'
]
),
'point'
=>
$point
'point'
=>
$point
,
'paySuccessPage'
=>
true
);
}
...
...
yohobuy/www.yohobuy.com/application/modules/Pay/controllers/Payreturn.php
View file @
c6537ec
...
...
@@ -168,7 +168,7 @@ class PayreturnController extends WebAction
$dealResult
[
'data'
][
'bestForYou'
]
=
IndexModel
::
preferenceData
(
$channelNum
,
$uid
,
$udid
,
'100004'
,
15
);
$data
=
array
(
'payNotice'
=>
$dealResult
[
'data'
],
'point'
=>
$point
);
$data
=
array
(
'payNotice'
=>
$dealResult
[
'data'
],
'point'
=>
$point
,
'paySuccessPage'
=>
true
);
}
//头部导航
...
...
yohobuy/www.yohobuy.com/application/modules/Shopping/controllers/Pay.php
View file @
c6537ec
...
...
@@ -102,7 +102,8 @@ class PayController extends WebAction
'orderNum'
=>
$data
[
'orderNum'
],
'items'
=>
$data
[
'orderGoods'
]
),
'payPage'
=>
true
'payPage'
=>
true
,
'paySuccessPage'
=>
true
));
}
/**
...
...
Please
register
or
login
to post a comment