fe / YOHOBUYPC · Commits

Go to a project

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

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

Inline Side-by-side
Showing 5 changed files with 31 additions and 1 deletions
@@ -342,8 +342,12 @@ @@ -342,8 +342,12 @@
342 <div class="description-material info-block"> 342 <div class="description-material info-block">
343 <p class="block-title"> 343 <p class="block-title">
344 <span class="title cur">商品信息 DESCRIPTION</span> 344 <span class="title cur">商品信息 DESCRIPTION</span>
  345 + {{#if goodsInfo.virtualGoods}}
  346 + <!---虚拟商品-->
  347 + {{else}}
345 <span class="sep">|</span> 348 <span class="sep">|</span>
346 <span class="title">材质洗涤 MATERIALS</span> 349 <span class="title">材质洗涤 MATERIALS</span>
  350 + {{/if}}
347 </p> 351 </p>
348 <div class="description-content"> 352 <div class="description-content">
349 {{# description}} 353 {{# description}}
@@ -374,6 +378,9 @@ @@ -374,6 +378,9 @@
374 {{/if}} 378 {{/if}}
375 {{/ description}} 379 {{/ description}}
376 </div> 380 </div>
  381 + {{#if goodsInfo.virtualGoods}}
  382 + <!---虚拟商品-->
  383 + {{else}}
377 <div class="material-content"> 384 <div class="material-content">
378 {{# material}} 385 {{# material}}
379 {{#if materialDetail}} 386 {{#if materialDetail}}
@@ -400,7 +407,11 @@ @@ -400,7 +407,11 @@
400 {{/if}} 407 {{/if}}
401 {{/ material}} 408 {{/ material}}
402 </div> 409 </div>
  410 + {{/if}}
403 </div> 411 </div>
  412 + {{#if goodsInfo.virtualGoods}}
  413 + <!---虚拟商品-->
  414 + {{else}}
404 <div class="size-info info-block"> 415 <div class="size-info info-block">
405 <p class="block-title"> 416 <p class="block-title">
406 <span class="title cur">尺码信息 SIZE INFO</span> 417 <span class="title cur">尺码信息 SIZE INFO</span>
@@ -435,6 +446,7 @@ @@ -435,6 +446,7 @@
435 {{/if}} 446 {{/if}}
436 {{/ size}} 447 {{/ size}}
437 </div> 448 </div>
  449 + {{/if}}
438 450
439 {{#if reference}} 451 {{#if reference}}
440 <div class="reference info-block"> 452 <div class="reference info-block">
@@ -85,6 +85,9 @@ @@ -85,6 +85,9 @@
85 {{#if shipped}} 85 {{#if shipped}}
86 <span class="shipped"> 86 <span class="shipped">
87 待收货 87 待收货
  88 + {{#if virtualGoods}}
  89 + <!--虚拟商品-->
  90 + {{else}}
88 <em class="check-logistics">查看物流</em> 91 <em class="check-logistics">查看物流</em>
89 <div class="logistics hide"> 92 <div class="logistics hide">
90 <ul class="logistics-list"> 93 <ul class="logistics-list">
@@ -98,6 +101,7 @@ @@ -98,6 +101,7 @@
98 <div class="right-triangle bottom"></div> 101 <div class="right-triangle bottom"></div>
99 <div class="right-triangle top"></div> 102 <div class="right-triangle top"></div>
100 </div> 103 </div>
  104 + {{/if}}
101 </span> 105 </span>
102 {{/if}} 106 {{/if}}
103 107
@@ -523,6 +523,7 @@ @@ -523,6 +523,7 @@
523 .basic { 523 .basic {
524 width: 640px; 524 width: 640px;
525 margin: 0 auto; 525 margin: 0 auto;
  526 + text-align: center;
526 527
527 li { 528 li {
528 float: left; 529 float: left;
@@ -80,6 +80,11 @@ class OrderModel @@ -80,6 +80,11 @@ class OrderModel
80 } 80 }
81 //操作 81 //操作
82 $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); 82 $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);
  83 +
  84 + if ($orderV['attribute'] * 1 === 3) {
  85 + //包含虚拟商品，订单列表不显示物流属性
  86 + $orders[$orderK]['virtualGoods'] = true;
  87 + }
83 } 88 }
84 if ($isPage) { 89 if ($isPage) {
85 $orders['pager']['total'] = $orderInfo['data']['total']; 90 $orders['pager']['total'] = $orderInfo['data']['total'];
@@ -947,6 +947,14 @@ class ItemModel @@ -947,6 +947,14 @@ class ItemModel
947 { 947 {
948 $description = array(); 948 $description = array();
949 // 商品信息 949 // 商品信息
  950 + if (isset($sizeInfo['productBo']['attribute']) && $sizeInfo['productBo']['attribute'] * 1 === 3) {
  951 + //虚拟商品
  952 + $description['basic'][] = array('key' =>'编号','value' => $sizeInfo['productDescBo']['erpProductId']);
  953 + $description['basic'][] = array('key' =>'日期','value' => $sizeInfo['productDescBo']['colorName'], 'dColor' => true);
  954 + $description['basic'][] = array('key' =>'属性','value' => '虚拟商品');
  955 + return $description;
  956 + }
  957 +
950 if (isset($sizeInfo['productDescBo']['erpProductId'])) { 958 if (isset($sizeInfo['productDescBo']['erpProductId'])) {
951 $sex = '通用'; 959 $sex = '通用';
952 switch ($sizeInfo['productDescBo']['gender']) { 960 switch ($sizeInfo['productDescBo']['gender']) {
@@ -1028,7 +1036,7 @@ class ItemModel @@ -1028,7 +1036,7 @@ class ItemModel
1028 'size' => array(), 1036 'size' => array(),
1029 ); 1037 );
1030 //不是门票的要显示图片,虚拟商品 1038 //不是门票的要显示图片,虚拟商品
1031 - if ($baseInfo['attribute'] === 3) { 1039 + if ($baseInfo['attribute'] !== 3) {
1032 $goodsGroup['src'] = Images::getImageUrl($value['colorImage'], 40, 40); 1040 $goodsGroup['src'] = Images::getImageUrl($value['colorImage'], 40, 40);
1033 } 1041 }
1034 1042