fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 7e42ce23c1f53ee1bd884f9aa4f9d14461cc875e 2 parents a29afdfd 2cc4c095

Merge branch 'feature/ticket'

Inline Side-by-side
Showing 2 changed files with 9 additions and 3 deletions
@@ -269,8 +269,10 @@ @@ -269,8 +269,10 @@
269 <div class="row"> 269 <div class="row">
270 {{#if virtualGoods}} 270 {{#if virtualGoods}}
271 {{!-- 电子门票按钮 --}} 271 {{!-- 电子门票按钮 --}}
272 - <form name="ticket-form" action="/cart/index/ticketEnsure" method="POST" class="hide"></form>  
273 - <span id="buy-ticket" class="buy-ticket buy-now item-buy{{#if dis}} dis{{/if}}" >立即购买</span> 272 + {{#if isVirtualBtn}}
  273 + <form name="ticket-form" action="/cart/index/ticketEnsure" method="POST" class="hide"></form>
  274 + <span id="buy-ticket" class="buy-ticket buy-now item-buy{{#if dis}} dis{{/if}}" >立即购买</span>
  275 + {{/if}}
274 {{^}} 276 {{^}}
275 {{!-- 各颜色下所有尺码均售罄则只显示售罄按钮 --}} 277 {{!-- 各颜色下所有尺码均售罄则只显示售罄按钮 --}}
276 {{#unless soldOut}} 278 {{#unless soldOut}}
@@ -174,6 +174,11 @@ class ItemModel @@ -174,6 +174,11 @@ class ItemModel
174 $virtualGoods = $baseInfo['attribute'] == 3;//虚拟商品 174 $virtualGoods = $baseInfo['attribute'] == 3;//虚拟商品
175 //是否展览票 175 //是否展览票
176 $goodsInfo['isTicket'] = $goodsInfo['skn'] * 1 === EXHIBITION_TICKET; 176 $goodsInfo['isTicket'] = $goodsInfo['skn'] * 1 === EXHIBITION_TICKET;
  177 + $goodsInfo['virtualGoods'] = $virtualGoods;//是否是虚拟商品
  178 + if ($goodsInfo['virtualGoods']) {
  179 + //是否显示虚拟商品，立即购买按钮
  180 + $goodsInfo['isVirtualBtn'] = $soldOut ? false : true;
  181 + }
177 182
178 if (!$soldOut && !$notForSale && !$virtualGoods) { 183 if (!$soldOut && !$notForSale && !$virtualGoods) {
179 $goodsInfo['addToCart'] = true; 184 $goodsInfo['addToCart'] = true;
@@ -196,7 +201,6 @@ class ItemModel @@ -196,7 +201,6 @@ class ItemModel
196 else if ($virtualGoods) { 201 else if ($virtualGoods) {
197 $goodsInfo['buyNow'] = true;//是否立即购买 202 $goodsInfo['buyNow'] = true;//是否立即购买
198 $goodsInfo['buyNowBase'] = Helpers::url('/ticket', array(), 'shopping'); 203 $goodsInfo['buyNowBase'] = Helpers::url('/ticket', array(), 'shopping');
199 - $goodsInfo['virtualGoods'] = $virtualGoods;  
200 if (isset($goodsInfo['salePrice'])) { 204 if (isset($goodsInfo['salePrice'])) {
201 $goodsInfo['advancePrice'] = $goodsInfo['salePrice'];//先行价格 205 $goodsInfo['advancePrice'] = $goodsInfo['salePrice'];//先行价格
202 unset($goodsInfo['salePrice']); 206 unset($goodsInfo['salePrice']);