Merge branch 'feature/ticket'

@@ -269,8 +269,10 @@
                                 <div class="row">
                                     {{#if virtualGoods}}
                                         {{!-- 电子门票按钮 --}}
-                                        <form name="ticket-form" action="/cart/index/ticketEnsure" method="POST" class="hide"></form>
-                                        <span id="buy-ticket" class="buy-ticket buy-now item-buy{{#if dis}} dis{{/if}}" >立即购买</span>
+                                        {{#if isVirtualBtn}}
+                                            <form name="ticket-form" action="/cart/index/ticketEnsure" method="POST" class="hide"></form>
+                                            <span id="buy-ticket" class="buy-ticket buy-now item-buy{{#if dis}} dis{{/if}}" >立即购买</span>
+                                        {{/if}}
                                     {{^}}
                                         {{!-- 各颜色下所有尺码均售罄则只显示售罄按钮 --}}
                                         {{#unless soldOut}}

@@ -174,6 +174,11 @@ class ItemModel
         $virtualGoods = $baseInfo['attribute'] == 3;//虚拟商品
         //是否展览票
         $goodsInfo['isTicket'] = $goodsInfo['skn'] * 1 === EXHIBITION_TICKET;
+        $goodsInfo['virtualGoods'] = $virtualGoods;//是否是虚拟商品
+        if ($goodsInfo['virtualGoods']) {
+            //是否显示虚拟商品，立即购买按钮
+            $goodsInfo['isVirtualBtn'] = $soldOut ? false : true;
+        }
 
         if (!$soldOut && !$notForSale && !$virtualGoods) {
             $goodsInfo['addToCart'] = true;
@@ -196,7 +201,6 @@ class ItemModel
         else if ($virtualGoods) {
             $goodsInfo['buyNow'] = true;//是否立即购买
             $goodsInfo['buyNowBase'] = Helpers::url('/ticket', array(), 'shopping');
-            $goodsInfo['virtualGoods'] = $virtualGoods;
             if (isset($goodsInfo['salePrice'])) {
                 $goodsInfo['advancePrice'] = $goodsInfo['salePrice'];//先行价格
                 unset($goodsInfo['salePrice']);