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

@@ -342,8 +342,12 @@
                 <div class="description-material info-block">
                     <p class="block-title">
                         <span class="title cur">商品信息 DESCRIPTION</span>
+                        {{#if goodsInfo.virtualGoods}}
+                            <!---虚拟商品-->
+                        {{else}}
                             <span class="sep">|</span>
                             <span class="title">材质洗涤 MATERIALS</span>
+                        {{/if}}
                     </p>
                     <div class="description-content">
                         {{# description}}
@@ -374,6 +378,9 @@
                             {{/if}}
                         {{/ description}}
                     </div>
+                    {{#if goodsInfo.virtualGoods}}
+                            <!---虚拟商品-->
+                    {{else}}
                         <div class="material-content">
                             {{# material}}
                                 {{#if materialDetail}}
@@ -400,7 +407,11 @@
                                 {{/if}}
                             {{/ material}}
                         </div>
+                    {{/if}}
                 </div>
+                {{#if goodsInfo.virtualGoods}}
+                    <!---虚拟商品-->
+                {{else}}
                     <div class="size-info info-block">
                         <p class="block-title">
                             <span class="title cur">尺码信息 SIZE INFO</span>
@@ -435,6 +446,7 @@
                             {{/if}}
                         {{/ size}}
                     </div>
+                {{/if}}
 
                 {{#if reference}}
                     <div class="reference info-block">

@@ -85,6 +85,9 @@
                         {{#if shipped}}
                             <span class="shipped">
                                 待收货
+                                {{#if virtualGoods}}
+                                    <!--虚拟商品-->
+                                {{else}}
                                     <em class="check-logistics">查看物流</em>
                                     <div class="logistics hide">
                                         <ul class="logistics-list">
@@ -98,6 +101,7 @@
                                         <div class="right-triangle bottom"></div>
                                         <div class="right-triangle top"></div>
                                     </div>
+                                {{/if}}
                             </span>
                         {{/if}}
 

@@ -523,6 +523,7 @@
         .basic {
             width: 640px;
             margin: 0 auto;
+            text-align: center;
             
             li {
                 float: left;

@@ -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);
                     }