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 @@ @@ -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 - <span class="sep">|</span>  
346 - <span class="title">材质洗涤 MATERIALS</span> 345 + {{#if goodsInfo.virtualGoods}}
  346 + <!---虚拟商品-->
  347 + {{else}}
  348 + <span class="sep">|</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,67 +378,75 @@ @@ -374,67 +378,75 @@
374 {{/if}} 378 {{/if}}
375 {{/ description}} 379 {{/ description}}
376 </div> 380 </div>
377 - <div class="material-content">  
378 - {{# material}}  
379 - {{#if materialDetail}}  
380 - <ul class="material-detail">  
381 - {{# materialDetail}}  
382 - <li class="clearfix">  
383 - <img src="{{img}}">  
384 - <p class="name">{{name}}<br>{{enName}}</p>  
385 - <p class="text">{{text}}</p>  
386 - </li>  
387 - {{/ materialDetail}}  
388 - </ul>  
389 - {{/if}} 381 + {{#if goodsInfo.virtualGoods}}
  382 + <!---虚拟商品-->
  383 + {{else}}
  384 + <div class="material-content">
  385 + {{# material}}
  386 + {{#if materialDetail}}
  387 + <ul class="material-detail">
  388 + {{# materialDetail}}
  389 + <li class="clearfix">
  390 + <img src="{{img}}">
  391 + <p class="name">{{name}}<br>{{enName}}</p>
  392 + <p class="text">{{text}}</p>
  393 + </li>
  394 + {{/ materialDetail}}
  395 + </ul>
  396 + {{/if}}
390 397
391 - {{#if wash}}  
392 - <ul class="wash">  
393 - {{# wash}}  
394 - <li>  
395 - <img class="wash-icon" src="{{img}}">  
396 - <p class="wash-name">{{name}}</p>  
397 - </li>  
398 - {{/ wash}}  
399 - </ul>  
400 - {{/if}}  
401 - {{/ material}}  
402 - </div> 398 + {{#if wash}}
  399 + <ul class="wash">
  400 + {{# wash}}
  401 + <li>
  402 + <img class="wash-icon" src="{{img}}">
  403 + <p class="wash-name">{{name}}</p>
  404 + </li>
  405 + {{/ wash}}
  406 + </ul>
  407 + {{/if}}
  408 + {{/ material}}
  409 + </div>
  410 + {{/if}}
403 </div> 411 </div>
404 - <div class="size-info info-block">  
405 - <p class="block-title">  
406 - <span class="title cur">尺码信息 SIZE INFO</span>  
407 - </p>  
408 - {{# size}}  
409 - <table class="size-table">  
410 - <thead>  
411 - <tr>  
412 - {{# thead}}  
413 - <th>{{name}}</th>  
414 - {{/ thead}}  
415 - </tr>  
416 - </thead>  
417 - <tbody>  
418 - {{# tbody}} 412 + {{#if goodsInfo.virtualGoods}}
  413 + <!---虚拟商品-->
  414 + {{else}}
  415 + <div class="size-info info-block">
  416 + <p class="block-title">
  417 + <span class="title cur">尺码信息 SIZE INFO</span>
  418 + </p>
  419 + {{# size}}
  420 + <table class="size-table">
  421 + <thead>
419 <tr> 422 <tr>
420 - {{#each .}}  
421 - <td>{{.}}</td>  
422 - {{/each}} 423 + {{# thead}}
  424 + <th>{{name}}</th>
  425 + {{/ thead}}
423 </tr> 426 </tr>
424 - {{/ tbody}}  
425 - </tbody>  
426 - </table>  
427 - <p class="size-tip">  
428 - ※ 以上尺寸为实物人工测量，因测量方式不同会有1-2CM误差，相关数据仅作参考，以收到实物为准。 单位：CM  
429 - </p>  
430 - <p class="size-tip">  
431 - ※ 参考尺码因衣服版型、剪裁不同会有误差，仅供参考  
432 - </p>  
433 - {{#if sizeImg}}  
434 - <img class="size-img" src="{{sizeImg}}">  
435 - {{/if}}  
436 - {{/ size}}  
437 - </div> 427 + </thead>
  428 + <tbody>
  429 + {{# tbody}}
  430 + <tr>
  431 + {{#each .}}
  432 + <td>{{.}}</td>
  433 + {{/each}}
  434 + </tr>
  435 + {{/ tbody}}
  436 + </tbody>
  437 + </table>
  438 + <p class="size-tip">
  439 + ※ 以上尺寸为实物人工测量，因测量方式不同会有1-2CM误差，相关数据仅作参考，以收到实物为准。 单位：CM
  440 + </p>
  441 + <p class="size-tip">
  442 + ※ 参考尺码因衣服版型、剪裁不同会有误差，仅供参考
  443 + </p>
  444 + {{#if sizeImg}}
  445 + <img class="size-img" src="{{sizeImg}}">
  446 + {{/if}}
  447 + {{/ size}}
  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,19 +85,23 @@ @@ -85,19 +85,23 @@
85 {{#if shipped}} 85 {{#if shipped}}
86 <span class="shipped"> 86 <span class="shipped">
87 待收货 87 待收货
88 - <em class="check-logistics">查看物流</em>  
89 - <div class="logistics hide">  
90 - <ul class="logistics-list">  
91 - {{#each logistics}}  
92 - <li>  
93 - {{.}}  
94 - </li>  
95 - {{/each}}  
96 - </ul>  
97 - <span class="close-logistics iconfont">&#xe602;</span>  
98 - <div class="right-triangle bottom"></div>  
99 - <div class="right-triangle top"></div>  
100 - </div> 88 + {{#if virtualGoods}}
  89 + <!--虚拟商品-->
  90 + {{else}}
  91 + <em class="check-logistics">查看物流</em>
  92 + <div class="logistics hide">
  93 + <ul class="logistics-list">
  94 + {{#each logistics}}
  95 + <li>
  96 + {{.}}
  97 + </li>
  98 + {{/each}}
  99 + </ul>
  100 + <span class="close-logistics iconfont">&#xe602;</span>
  101 + <div class="right-triangle bottom"></div>
  102 + <div class="right-triangle top"></div>
  103 + </div>
  104 + {{/if}}
101 </span> 105 </span>
102 {{/if}} 106 {{/if}}
103 107
@@ -523,7 +523,8 @@ @@ -523,7 +523,8 @@
523 .basic { 523 .basic {
524 width: 640px; 524 width: 640px;
525 margin: 0 auto; 525 margin: 0 auto;
526 - 526 + text-align: center;
  527 +
527 li { 528 li {
528 float: left; 529 float: left;
529 width: 25%; 530 width: 25%;
@@ -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