Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYWAP
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
zhangxiaoru
9 years ago
Commit
8005c61ae5ba9a9db23e54c4efddaf2c0cd005b7
2 parents
2e04150a
844f87fa
orderENsore
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
40 additions
and
3 deletions
library/LibModels/Wap/Home/CartData.php
static/img/product/yoho_icon.png
static/sass/cart/_order-ensure.css
static/sass/me/_order.css
template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
template/m.yohobuy.com/partials/me/order/good.phtml
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
yohobuy/m.yohobuy.com/application/modules/Cart/controllers/Index.php
library/LibModels/Wap/Home/CartData.php
View file @
8005c61
...
...
@@ -267,6 +267,7 @@ class CartData
}
$param
[
'client_secret'
]
=
Sign
::
getSign
(
$param
);
// print_r(Yohobuy::get(API_URL, $param));
return
Yohobuy
::
get
(
API_URL
,
$param
);
}
...
...
static/img/product/yoho_icon.png
0 → 100644
View file @
8005c61
5 KB
static/sass/cart/_order-ensure.css
View file @
8005c61
...
...
@@ -244,6 +244,14 @@
display
:
inline-block
;
}
}
.yoho-coin
{
margin
:
50px
0
30px
;
background
:
resolve
(
'product/yoho_icon.png'
)
no-repeat
;
padding-left
:
68px
;
font-size
:
28px
;
height
:
52px
;
}
}
.order-good
{
...
...
static/sass/me/_order.css
View file @
8005c61
...
...
@@ -303,6 +303,10 @@
-webkit-box-orient
:
vertical
;
}
.limit
{
color
:
#b6b6b6
;
}
.row
:nth-child
(
2
)
{
height
:
45px
;
line-height
:
45px
;
...
...
template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
View file @
8005c61
...
...
@@ -177,6 +177,13 @@
实付金额
<span>¥
{
{price
}
}</span>
</div>
{
{#if
returnYohoCoin
}
}
<div
class=
"yoho-coin"
>
共返有货币:
{
{yohoCoinNum
}
}个
</div>
{
{/if
}
}
</section>
<div
class=
"bill"
>
您需要支付:<span>¥
{
{price
}
}</span>
...
...
template/m.yohobuy.com/partials/me/order/good.phtml
View file @
8005c61
...
...
@@ -21,7 +21,12 @@
{{#if tickets}}区域{{else}}尺码{{/if}}:{{size}}
</span>
{{/if}}
</p>
{{#if isLimitSkn}}
<p class="limit">不支持七天无理由退换货</p>
{{/if}}
<p class="row price-wrap">
<span class="price">
¥{{price}}
...
...
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
View file @
8005c61
...
...
@@ -492,7 +492,11 @@ class CartModel
$oneGoods
[
'size'
]
=
$single
[
'size_name'
];
$oneGoods
[
'count'
]
=
$single
[
'buy_number'
];
$oneGoods
[
'price'
]
=
Helpers
::
transPrice
(
$single
[
'last_price'
]);
if
(
isset
(
$single
[
'is_limit_skn'
]))
{
$oneGoods
[
'isLimitSkn'
]
=
$single
[
'is_limit_skn'
];
}
$oneGoods
[
'yohoCoinNum'
]
=
$single
[
'yoho_coin_num'
];
//gift=>是否赠品,advanceBuy=>是否加价购;
if
(
$single
[
'goods_type'
]
==
'gift'
&&
!
isset
(
$single
[
'isAdvanceBuy'
]))
{
$oneGoods
[
'gift'
]
=
true
;
...
...
@@ -511,6 +515,7 @@ class CartModel
// 商品金额
$result
[
'goodsPrice'
]
=
Helpers
::
transPrice
(
$goodsPrice
);
}
// 支付方式
...
...
@@ -570,6 +575,12 @@ class CartModel
$result
[
'num'
]
=
$payReturn
[
'shopping_cart_data'
][
'selected_goods_count'
];
// 商品金额
// $result['goodsPrice'] = $payReturn['shopping_cart_data']['str_order_amount'];
//有货币
if
(
$payReturn
[
'shopping_cart_data'
][
'gain_yoho_coin'
]
>
0
)
{
$result
[
'yohoCoinNum'
]
=
$payReturn
[
'shopping_cart_data'
][
'gain_yoho_coin'
];
$result
[
'returnYohoCoin'
]
=
true
;
}
}
// 发票有关数据
...
...
@@ -608,7 +619,7 @@ class CartModel
$result
[
'coupon'
]
=
$coupons
;
}
while
(
false
);
return
$result
;
}
...
...
yohobuy/m.yohobuy.com/application/modules/Cart/controllers/Index.php
View file @
8005c61
...
...
@@ -352,9 +352,10 @@ class IndexController extends AbstractAction
'userMobile'
=>
$mobile
);
$this
->
setTitle
(
'确认订单'
);
$this
->
setNavHeader
(
'确认订单'
,
$returnUrl
,
false
);
// 不显示右上角home按钮
//print_r($data);
$this
->
_view
->
display
(
'order-ensure'
,
$data
);
}
...
...
Please
register
or
login
to post a comment