order list show qrcode logic

@@ -56,7 +56,7 @@
     {{/if}}
     {{#if qrcode}}
         <div class="order-opt">
-            <a class="locHref" href="{{codeUrl}}">
+            <a class="locHref" href="{{qrcode}}">
                 <span class="btn check-logistics">查看二维码</span>
             </a>
         </div>

@@ -306,14 +306,29 @@ class OrderModel
                         break;
                     case 4:
                     case 5:
-                        //已发货状态，给查看物流URL
+                        //已发货状态，给查看物流或二维码URL
                         $result['unreceived'] = true;
-                        self::assignExpressInfo($showLogistics, $order, $result);
+                        //门票
+                        if (isset($order['virtual_type']) && $order['virtual_type'] === 3) {
+                            $result['qrcode'] = Helpers::url('/QRcode/'.$order['order_code']);
+                        }
+                        //非门票
+                        else {
+                            self::assignExpressInfo($showLogistics, $order, $result);
+                        }
                         break;
+
                     case 6:
                         $result['completed'] = true;
-                        // 已成功订单，给查看物流URL
-                        self::assignExpressInfo($showLogistics, $order, $result);
+                        // 已成功订单，给查看物流或二维码URL
+                        //门票
+                        if (isset($order['virtual_type']) && $order['virtual_type'] === 3) {
+                            $result['qrcode'] = Helpers::url('/QRcode/'.$order['order_code']);
+                        }
+                        //非门票
+                        else {
+                            self::assignExpressInfo($showLogistics, $order, $result);
+                        }
                         break;
                     default:
                         break;