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
09942fc8623694c111fb2f6bb935c78d732cb671
1 parent
6babd016
m
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
9 deletions
template/www.yohobuy.com/partials/layout/page-header.phtml
web-static/js/header.js
web-static/js/home/order-block.js
web-static/js/order/address.js
yohobuy/www.yohobuy.com/application/models/Product/Item.php
yohobuy/www.yohobuy.com/application/models/Shopping/Cart.php
yohobuy/www.yohobuy.com/application/modules/Cart/controllers/Index.php
template/www.yohobuy.com/partials/layout/page-header.phtml
View file @
09942fc
...
...
@@ -216,7 +216,7 @@
</div>
<div
class=
"gobuy-notempty-footer"
>
<h
3
>
<a
href=
"//www.yohobuy.com/
shopping
/cart"
>去购物车结算</a>
<a
href=
"//www.yohobuy.com/
cart
/cart"
>去购物车结算</a>
</h
3
>
</div>
\
{
\{/carData\
}
\}
...
...
web-static/js/header.js
View file @
09942fc
...
...
@@ -1207,7 +1207,7 @@ function actionListenCartMore() {
*/
function
actionClickMiniCartBox
()
{
var
$target
;
var
shopcarurl
=
'//www.yohobuy.com/
shopping
/cart'
;
var
shopcarurl
=
'//www.yohobuy.com/
cart
/cart'
;
$
(
'#miniCartBox'
).
on
(
'click'
,
function
(
e
)
{
$target
=
$
(
e
.
target
);
...
...
web-static/js/home/order-block.js
View file @
09942fc
...
...
@@ -193,7 +193,7 @@ function buyAgain(id){
data
:
{
orderCode
:
id
}
}).
then
(
function
(
d
)
{
if
(
d
.
code
===
200
)
{
location
.
href
=
'/
shopping
/cart'
;
location
.
href
=
'/
cart
/cart'
;
}
else
{
new
dialog
.
Alert
(
d
.
message
).
show
();
}
...
...
web-static/js/order/address.js
View file @
09942fc
...
...
@@ -847,7 +847,7 @@ $('.to-play input.submit').click(function() {
btnClass
:
[
'confirm-sure'
,
'w110'
],
name
:
'重新选择商品'
,
cb
:
function
()
{
window
.
location
.
href
=
'//www.yohobuy.com/
shopping
/cart'
;
window
.
location
.
href
=
'//www.yohobuy.com/
cart
/cart'
;
}
},
{
id
:
'confirm-sure'
,
...
...
yohobuy/www.yohobuy.com/application/models/Product/Item.php
View file @
09942fc
...
...
@@ -47,7 +47,7 @@ class ItemModel
$goodsInfo
[
'maxSortId'
]
=
$baseInfo
[
'maxSortId'
];
$goodsInfo
[
'smallSortId'
]
=
$baseInfo
[
'smallSortId'
];
$goodsInfo
[
'promotionId'
]
=
$baseInfo
[
'isPromotion'
];
$goodsInfo
[
'goCartUrl'
]
=
Helpers
::
url
(
'/
shopping
/cart'
);
$goodsInfo
[
'goCartUrl'
]
=
Helpers
::
url
(
'/
cart
/cart'
);
$brandId
=
0
;
//设置并发请求数据
self
::
setMultiResourceByProductBaseInfo
(
$baseInfo
);
...
...
yohobuy/www.yohobuy.com/application/models/Shopping/Cart.php
View file @
09942fc
...
...
@@ -49,7 +49,7 @@ class CartModel
// 未登录
if
(
!
$uid
)
{
$result
[
'loginUrl'
]
=
Helpers
::
url
(
'/signin.html'
,
array
(
'refer'
=>
Helpers
::
url
(
'/
shopping
/cart'
)));
$result
[
'loginUrl'
]
=
Helpers
::
url
(
'/signin.html'
,
array
(
'refer'
=>
Helpers
::
url
(
'/
cart
/cart'
)));
}
// 调用接口,获取购物车数据
...
...
@@ -318,7 +318,7 @@ class CartModel
if
(
empty
(
$uid
))
{
$result
[
'code'
]
=
403
;
$result
[
'message'
]
=
'请先登录!'
;
$result
[
'data'
][
'url'
]
=
Helpers
::
url
(
'/signin.html'
,
array
(
'refer'
=>
Helpers
::
url
(
'/
shopping
/cart'
)));
$result
[
'data'
][
'url'
]
=
Helpers
::
url
(
'/signin.html'
,
array
(
'refer'
=>
Helpers
::
url
(
'/
cart
/cart'
)));
break
;
}
...
...
@@ -892,7 +892,7 @@ class CartModel
// 购物车类型, 调接口需要的
$result
[
'cartType'
]
=
$cartType
;
// 购物车链接
$result
[
'cartUrl'
]
=
Helpers
::
url
(
'/
shopping
/cart'
);
$result
[
'cartUrl'
]
=
Helpers
::
url
(
'/
cart
/cart'
);
// 是否要显示优惠券支付
$result
[
'showCouponPay'
]
=
$isAdvanceCart
?
false
:
true
;
// 是否是预售
...
...
yohobuy/www.yohobuy.com/application/modules/Cart/controllers/Index.php
View file @
09942fc
...
...
@@ -254,7 +254,7 @@ class IndexController extends WebAction
$orderEnsure
=
CartModel
::
cartPay
(
$uid
,
$cartType
,
$isAdvanceCart
);
if
(
empty
(
$orderEnsure
))
{
$this
->
go
(
Helpers
::
url
(
'/
shopping
/cart'
));
$this
->
go
(
Helpers
::
url
(
'/
cart
/cart'
));
}
$this
->
_view
->
display
(
'order-ensure'
,
array
(
...
...
Please
register
or
login
to post a comment