fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 3879b1032096cf282ec9de5fd3d13dc2fddf9f5f 1 parent 9fe8b8cb

订单列表，虚拟商品不显示物流信息

Inline Side-by-side
Showing 5 changed files with 104 additions and 74 deletions
... ... @@ -342,8 +342,12 @@
<div class="description-material info-block">
<p class="block-title">
<span class="title cur">商品信息 DESCRIPTION</span>
<span class="sep">|</span>
<span class="title">材质洗涤 MATERIALS</span>
{{#if goodsInfo.virtualGoods}}
<!---虚拟商品-->
{{else}}
<span class="sep">|</span>
<span class="title">材质洗涤 MATERIALS</span>
{{/if}}
</p>
<div class="description-content">
{{# description}}
... ... @@ -374,67 +378,75 @@
{{/if}}
{{/ description}}
</div>
<div class="material-content">
{{# material}}
{{#if materialDetail}}
<ul class="material-detail">
{{# materialDetail}}
<li class="clearfix">
<img src="{{img}}">
<p class="name">{{name}}<br>{{enName}}</p>
<p class="text">{{text}}</p>
</li>
{{/ materialDetail}}
</ul>
{{/if}}
{{#if goodsInfo.virtualGoods}}
<!---虚拟商品-->
{{else}}
<div class="material-content">
{{# material}}
{{#if materialDetail}}
<ul class="material-detail">
{{# materialDetail}}
<li class="clearfix">
<img src="{{img}}">
<p class="name">{{name}}<br>{{enName}}</p>
<p class="text">{{text}}</p>
</li>
{{/ materialDetail}}
</ul>
{{/if}}
{{#if wash}}
<ul class="wash">
{{# wash}}
<li>
<img class="wash-icon" src="{{img}}">
<p class="wash-name">{{name}}</p>
</li>
{{/ wash}}
</ul>
{{/if}}
{{/ material}}
</div>
{{#if wash}}
<ul class="wash">
{{# wash}}
<li>
<img class="wash-icon" src="{{img}}">
<p class="wash-name">{{name}}</p>
</li>
{{/ wash}}
</ul>
{{/if}}
{{/ material}}
</div>
{{/if}}
</div>
<div class="size-info info-block">
<p class="block-title">
<span class="title cur">尺码信息 SIZE INFO</span>
</p>
{{# size}}
<table class="size-table">
<thead>
<tr>
{{# thead}}
<th>{{name}}</th>
{{/ thead}}
</tr>
</thead>
<tbody>
{{# tbody}}
{{#if goodsInfo.virtualGoods}}
<!---虚拟商品-->
{{else}}
<div class="size-info info-block">
<p class="block-title">
<span class="title cur">尺码信息 SIZE INFO</span>
</p>
{{# size}}
<table class="size-table">
<thead>
<tr>
{{#each .}}
<td>{{.}}</td>
{{/each}}
{{# thead}}
<th>{{name}}</th>
{{/ thead}}
</tr>
{{/ tbody}}
</tbody>
</table>
<p class="size-tip">
※ 以上尺寸为实物人工测量，因测量方式不同会有1-2CM误差，相关数据仅作参考，以收到实物为准。 单位：CM
</p>
<p class="size-tip">
※ 参考尺码因衣服版型、剪裁不同会有误差，仅供参考
</p>
{{#if sizeImg}}
<img class="size-img" src="{{sizeImg}}">
{{/if}}
{{/ size}}
</div>
</thead>
<tbody>
{{# tbody}}
<tr>
{{#each .}}
<td>{{.}}</td>
{{/each}}
</tr>
{{/ tbody}}
</tbody>
</table>
<p class="size-tip">
※ 以上尺寸为实物人工测量，因测量方式不同会有1-2CM误差，相关数据仅作参考，以收到实物为准。 单位：CM
</p>
<p class="size-tip">
※ 参考尺码因衣服版型、剪裁不同会有误差，仅供参考
</p>
{{#if sizeImg}}
<img class="size-img" src="{{sizeImg}}">
{{/if}}
{{/ size}}
</div>
{{/if}}
{{#if reference}}
<div class="reference info-block">
... ...
... ... @@ -85,19 +85,23 @@
{{#if shipped}}
<span class="shipped">
待收货
<em class="check-logistics">查看物流</em>
<div class="logistics hide">
<ul class="logistics-list">
{{#each logistics}}
<li>
{{.}}
</li>
{{/each}}
</ul>
<span class="close-logistics iconfont">&#xe602;</span>
<div class="right-triangle bottom"></div>
<div class="right-triangle top"></div>
</div>
{{#if virtualGoods}}
<!--虚拟商品-->
{{else}}
<em class="check-logistics">查看物流</em>
<div class="logistics hide">
<ul class="logistics-list">
{{#each logistics}}
<li>
{{.}}
</li>
{{/each}}
</ul>
<span class="close-logistics iconfont">&#xe602;</span>
<div class="right-triangle bottom"></div>
<div class="right-triangle top"></div>
</div>
{{/if}}
</span>
{{/if}}
... ...
... ... @@ -523,7 +523,8 @@
.basic {
width: 640px;
margin: 0 auto;
text-align: center;
li {
float: left;
width: 25%;
... ...
... ... @@ -80,6 +80,11 @@ class OrderModel
}
//操作
$orders[$orderK]['operation'] = self::getOperateInfo($orderV['attribute'], $orderV['is_cancel'], $orderV['status'], $orderV['payment_status'], $orderV['update_time'], $orderV['order_type'], $orderV['refund_status'], $orderV['payment_type'], $orderV['order_code'], $opRefundStatus);
if ($orderV['attribute'] * 1 === 3) {
//包含虚拟商品，订单列表不显示物流属性
$orders[$orderK]['virtualGoods'] = true;
}
}
if ($isPage) {
$orders['pager']['total'] = $orderInfo['data']['total'];
... ...
... ... @@ -947,6 +947,14 @@ class ItemModel
{
$description = array();
// 商品信息
if (isset($sizeInfo['productBo']['attribute']) && $sizeInfo['productBo']['attribute'] * 1 === 3) {
//虚拟商品
$description['basic'][] = array('key' =>'编号','value' => $sizeInfo['productDescBo']['erpProductId']);
$description['basic'][] = array('key' =>'日期','value' => $sizeInfo['productDescBo']['colorName'], 'dColor' => true);
$description['basic'][] = array('key' =>'属性','value' => '虚拟商品');
return $description;
}
if (isset($sizeInfo['productDescBo']['erpProductId'])) {
$sex = '通用';
switch ($sizeInfo['productDescBo']['gender']) {
... ... @@ -1028,7 +1036,7 @@ class ItemModel
'size' => array(),
);
//不是门票的要显示图片,虚拟商品
if ($baseInfo['attribute'] === 3) {
if ($baseInfo['attribute'] !== 3) {
$goodsGroup['src'] = Images::getImageUrl($value['colorImage'], 40, 40);
}
... ...