fe / YOHOBUYWAP · Commits

Go to a project

Authored by uedxwg
Commit 9608382a5987126621fc6bae4292e5c5805c3b9c 2 parents fc6f3208 a68a1a8a

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 6 changed files with 68 additions and 86 deletions
... ... @@ -888,10 +888,16 @@
costOfThisYear: 3000,
percent: 80, //当前消费等级进度条
costGap: 300, //距离升级所需消费金额(白金会员不传)
sumCost: 600
sumCost: 600,
//查看全部VIP特权页面
all: true
privilege: [
{
pic: '',
title: '',
description: ''
},
...
]
}
}
... ... @@ -899,7 +905,7 @@
### 我的订单
{
order: {
allOrders: [
orders: [
...
]
}
... ... @@ -925,5 +931,10 @@
...
],
count: 1,
sumCost: '199.00'
sumCost: '199.00',
//status
completed: true, //已完成
unpaid: true, //or 未支付
unshipped: true, //or 未发货
unreceived: '', //or 未收货，查看物流URL
}
\ No newline at end of file
... ...
... ... @@ -30,6 +30,33 @@
.sum-cost {
color: #e01;
}
.order-opt {
padding: 30rem / $pxConvertRem 0;
padding-right: 30rem / $pxConvertRem;
border-top: 1px solid #e0e0e0;
text-align: right;
> .btn {
display: inline-block;
box-sizing: border-box;
height: 60rem / $pxConvertRem;
line-height: 60rem / $pxConvertRem;
width: 140rem / $pxConvertRem;
font-size: 24rem / $pxConvertRem;
text-align: center;
}
.cancel {
border: 1px solid #000;
}
.pay {
background: #d0021b;
color: #fff;
margin-left: 20rem / $pxConvertRem;
}
}
}
}
... ...
... ... @@ -18,11 +18,11 @@
<div id="order-container" class="order-container">
<div class="all orders">
{{# allOrders}}
{{#each orders}}
{{> me/order/order}}
{{/ allOrders}}
{{/each}}
</div>
<div class="obligation orders hide"></div>
<div class="unpaid orders hide"></div>
<div class="unshipped orders hide"></div>
<div class="unreceived orders hide"></div>
</div>
... ...
<div class="order">
<div class="order" data-id="{{orderNum}}">
<header class="header">
订单编号：{{orderNum}}
<span class="trading-status">{{tradingStatus}}</span>
... ... @@ -11,4 +11,17 @@
<footer class="footer">
共{{count}}件商品 实付<span class="sum-cost">¥{{sumCost}}</span>
</footer>
{{#if unpaid}}
<div class="order-opt">
<span class="btn cancel">取消订单</span>
<span class="btn pay">立即付款</span>
</div>
{{/if}}
{{#with unreceived}}
<div class="order-opt">
<a class="check-logistics" href="{{.}}">查看物流</a>
</div>
{{/with}}
</div>
\ No newline at end of file
... ...
<ul>
<li>
<span class="icon icon-discount"></span>
<p>
{{#if vip3}}
购物8.8折
{{/if}}
{{#if vip2}}
购物9.0折
{{/if}}
{{#if vip1}}
购物9.5折
{{/if}}
{{#if all}}
全场最高8.8折
{{/if}}
<span>在原折扣基础上享受VIP折上折</span>
</p>
</li>
<li>
<span class="icon icon-year"></span>
<p>
年度优惠活动
<span>年度级的sale促销活动中，VIP会员可以享受优先购买权</span>
</p>
</li>
<li>
<span class="icon icon-vip"></span>
<p>
VIP活动优惠
<span>优先参加"VIP会员限定"活动</span>
</p>
</li>
<li>
<span class="icon icon-birth"></span>
<p>
生日特惠
<span>赠送生日优惠券</span>
</p>
</li>
<li>
<span class="icon icon-msg"></span>
<p>
优惠信息
<span>获得大量的潮流新品及优惠活动的信息</span>
</p>
</li>
<li>
<span class="icon icon-magazine"></span>
<p>
杂志赠阅
<span>下载《YOHO!潮流志》电子版，浏览magazine版块，最新最权威的潮流资讯尽在掌握！</span>
</p>
</li>
{{#or vip3 vip2 all}}
{{#each privilege}}
<li>
<span class="icon icon-arrival-soon"></span>
<img class="icon" src="{{pic}}">
<p>
快速送达
<span>
白金卡会员的订单将采用最快速度进行配送
</span>
{{title}}
<span>{{description}}</span>
</p>
</li>
{{/or}}
{{#or vip3 all}}
<li>
<span class="icon icon-gift"></span>
<p>
纪念品赠送
<span>
白金会员将有机会获得YOHO!与各潮流品牌和明显合作的联名款纪念品
</span>
</p>
</li>
{{/or}}
{{/each}}
</ul>
\ No newline at end of file
... ...
... ... @@ -45,7 +45,7 @@ class HomeController extends AbstractAction
// $orders = \Index\UserModel::getUserOrderData(967016, $type);
$order = array(
'allOrders' => array(
'orders' => array(
array(
'orderNum' => '408539077',
'tradingStatus' => '交易成功',
... ... @@ -71,7 +71,8 @@ class HomeController extends AbstractAction
)
),
'count' => 2,
'sumCost' => '699.00'
'sumCost' => '699.00',
'unpaid' => true,
)
)
);
... ...