fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 9fe8b8cba680b79204f99ba6f620c4d6ff4b0046 1 parent f45f0963

支付，发货状态，门票

Inline Side-by-side
Showing 3 changed files with 11 additions and 2 deletions
@@ -18,7 +18,9 @@ @@ -18,7 +18,9 @@
18 {{#if operation.goPay}} 18 {{#if operation.goPay}}
19 <a class="go-pay oo-btn" href="{{operation.goPay}}">立即付款</a> 19 <a class="go-pay oo-btn" href="{{operation.goPay}}">立即付款</a>
20 {{/if}} 20 {{/if}}
21 - {{#if changeable}} 21 + {{#if virtualGoods}}
  22 + <!--虚拟商品-->
  23 + {{else if changeable}}
22 <span class="edit-order oo-btn">修改订单</span> 24 <span class="edit-order oo-btn">修改订单</span>
23 {{/if}} 25 {{/if}}
24 {{#if operation.cancelOrder}} 26 {{#if operation.cancelOrder}}
@@ -101,7 +101,13 @@ class PaymentModel @@ -101,7 +101,13 @@ class PaymentModel
101 break; 101 break;
102 } 102 }
103 103
104 - $result['deliveryType'] = isset($order['delivery_time']) ? $order['delivery_time'] : ''; 104 + if (isset($order['attribute']) && $order['attribute'] * 1 === 3) {
  105 + //虚拟商品
  106 + $result['deliveryType'] = '自动发货 - 在您支付成功后，系统将立即为您发放二维码，您可以在您的订单中查看。';
  107 + } else {
  108 + $result['deliveryType'] = empty($order['delivery_time']) ? '': $order['delivery_time'];
  109 + }
  110 +
105 111
106 112
107 // 用户ID 113 // 用户ID
@@ -129,6 +129,7 @@ class OrdersController extends WebAction @@ -129,6 +129,7 @@ class OrdersController extends WebAction
129 $data['noramlPayMode'] = $detail['noramlPayMode']; 129 $data['noramlPayMode'] = $detail['noramlPayMode'];
130 } 130 }
131 else if (isset($detail['virtualPayMode'])) { 131 else if (isset($detail['virtualPayMode'])) {
  132 + $data['virtualGoods'] = $detail['virtualGoods'];
132 $data['virtualPayMode'] = $detail['virtualPayMode']; 133 $data['virtualPayMode'] = $detail['virtualPayMode'];
133 } 134 }
134 //JIT拆单 135 //JIT拆单