fe / yohobuywap-node · Commits

Go to a project

Authored by 郝肖肖
Commit 715fe1f73b47e1cbb53e1279bddf198cfd2ef717 1 parent 5ba2bb85

定金预售去除按钮，并添加提示语

Inline Side-by-side
Showing 3 changed files with 60 additions and 50 deletions
... ... @@ -308,7 +308,8 @@ const getOrders = (params) => {
goods: _formatOrderGoods(value.order_goods, count, false, isTickets),
detailUrl: helpers.urlFormat('/home/orderdetail', {order_code: value.order_code}),
count: value.buy_total,
isVirtual: isTickets
isVirtual: isTickets,
isDepositAdvance: value.attribute * 1 === 9// 定金预售
});
/* 如果运费大于0，会显示运费 */
... ...
... ... @@ -14,61 +14,67 @@
</footer>
{{!-- 对应订单状态的操作逻辑 --}}
{{#if isDepositAdvance}}
<div class="order-opt">
<span class="order-opt-info">请到App完成订单相关操作</span>
</div>
{{^}}
{{!-- 完成和取消订单显示删除按钮 --}}
{{#unless isAdvance}}
{{#unless unpaid}}
<div class="order-opt">
{{#unless unreceived}}
<span class="btn del">删除订单</span>
{{#if isVirtual}}
<!--虚拟商品-->
{{else}}
{{#unless useLimitCode}}<span class="btn rebuy">再次购买</span>{{/unless}}
{{/if}}
{{/unless}}
{{!-- 完成和取消订单显示删除按钮 --}}
{{#unless isAdvance}}
{{#unless unpaid}}
<div class="order-opt">
{{#unless unreceived}}
<span class="btn del">删除订单</span>
{{#if isVirtual}}
<!--虚拟商品-->
{{else}}
{{#unless useLimitCode}}<span class="btn rebuy">再次购买</span>{{/unless}}
{{#if qrcode}}
<a class="locHref" href="{{qrcode}}">
<span class="btn check-logistics">查看二维码</span>
</a>
{{/if}}
{{/unless}}
{{#if qrcode}}
<a class="locHref" href="{{qrcode}}">
<span class="btn check-logistics">查看二维码</span>
</a>
{{/if}}
</div>
</div>
{{/unless}}
{{/unless}}
{{/unless}}
{{#unless isAdvance}}
{{#if unpaid}}
<div class="order-opt">
<ul class="count-down hide">
<li>
<span class="iconfont count-down-icon">&#xe64a;</span>
</li>
<li>
<span class="hours">{{leftTime}}</span>
</li>
</ul>
<span class="btn cancel">取消订单</span>
{{#if payUrl}}
<a class="locHref" href="{{payUrl}}">
<span class="btn pay">立即付款</span>
</a>
{{/if}}
</div>
{{/if}}
{{^}}
<div class="order-opt">
*定金预售订单只能在APP端操作
</div>
{{/unless}}
{{!-- 包含未发货和已发货状态，未发货不传logisticsUrl --}}
{{#if unreceived}}
{{#if logisticsUrl}}
{{#unless isAdvance}}
{{#if unpaid}}
<div class="order-opt">
<ul class="count-down hide">
<li>
<span class="iconfont count-down-icon">&#xe64a;</span>
</li>
<li>
<span class="hours">{{leftTime}}</span>
</li>
</ul>
<span class="btn cancel">取消订单</span>
{{#if payUrl}}
<a class="locHref" href="{{payUrl}}">
<span class="btn pay">立即付款</span>
</a>
{{/if}}
</div>
{{/if}}
{{^}}
<div class="order-opt">
<a class="locHref" href="{{logisticsUrl}}">
<span class="btn check-logistics">查看物流</span>
</a>
*定金预售订单只能在APP端操作
</div>
{{/unless}}
{{!-- 包含未发货和已发货状态，未发货不传logisticsUrl --}}
{{#if unreceived}}
{{#if logisticsUrl}}
<div class="order-opt">
<a class="locHref" href="{{logisticsUrl}}">
<span class="btn check-logistics">查看物流</span>
</a>
</div>
{{/if}}
{{/if}}
{{/if}}
... ...
... ... @@ -165,6 +165,9 @@
.rebuy {
margin-left: 20px;
}
.order-opt-info{
color: #b6b6b6;
}
}
}
... ...