fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit f45f0963cb0fdff89eb2348741ad8ebbe0db0f67 1 parent 9e8f7e73

门票我的订单显示

Inline Side-by-side
Showing 5 changed files with 62 additions and 48 deletions
... ... @@ -16,13 +16,13 @@
<p class="cur-status clearfix">
当前状态：{{curStatus}}
{{#if operation.goPay}}
<a class="go-pay oo-btn" href="{{operation.goPay}}">立即付款</a>
<a class="go-pay oo-btn" href="{{operation.goPay}}">立即付款</a>
{{/if}}
{{#if changeable}}
<span class="edit-order oo-btn">修改订单</span>
<span class="edit-order oo-btn">修改订单</span>
{{/if}}
{{#if operation.cancelOrder}}
<span class="cancel-order oo-btn">取消订单</span>
<span class="cancel-order oo-btn">取消订单</span>
{{/if}}
</p>
{{#if complete}}
... ... @@ -207,16 +207,25 @@
</a>
<p class="name-color-size">
<a class="name" href="{{url}}" target="_blank">{{name}}</a>
{{#if color}}
颜色：{{color}}
{{/if}}
{{#if virtualGood}}
{{#if color}}
日期：{{color}}
{{/if}}
{{#if size}}
区域：{{size}}
{{/if}}
{{else}}
{{#if color}}
颜色：{{color}}
{{/if}}
{{#if size}}
尺码：{{size}}
{{/if}}
{{#if size}}
尺码：{{size}}
{{/if}}
{{#if date}}
日期：{{date}}
{{#if date}}
日期：{{date}}
{{/if}}
{{/if}}
</p>
</td>
... ...
... ... @@ -151,7 +151,7 @@
<div class="trade-content">
<div id="type-chose" class="type-chose">
{{#if isTicket}}
{{#if virtualGoods}}
<div class="chose-ticket chose-color row clearfix">
<span class="title pull-left">选日期：</span>
<div class="size-wrapper pull-left">
... ... @@ -198,11 +198,7 @@
</div>
<div class="chose-size row clearfix">
<span class="title pull-left">
{{#if virtualGoods}}
选日期：
{{^}}
选尺码：
{{/if}}
选尺码：
</span>
<div id="sizes" class="size-wrapper pull-left">
... ... @@ -212,17 +208,9 @@
<li {{#unless num}}class="disable"{{/unless}} data-sku="{{sku}}" data-num="{{num}}" data-name="{{name}}">{{name}}</li>
{{/each}}
{{#unless virtualGoods}}
<span class="size-ruler"></span>
{{/unless}}
<span class="size-warn warn-tip hide">
<i class="iconfont">&#xe62c;</i>
{{#if virtualGoods}}
请选择日期
{{^}}
请选择尺码
{{/if}}
请选择尺码
</span>
</ul>
{{/each}}
... ... @@ -271,16 +259,16 @@
{{/if}}
{{/ fashionTopGoods}}
{{#if isTicket}}
{{#if virtualGoods}}
<span class="size-warn warn-tip"> &nbsp;限购4张</span>
{{/if}}
</div>
</div>
<div class="row">
{{#if isTicket}}
{{#if virtualGoods}}
{{!-- 电子门票按钮 --}}
<form name="ticket-form" action="/cart/index/ticketEnsure" method="POST"></form>
<form name="ticket-form" action="/cart/index/ticketEnsure" method="POST" class="hide"></form>
<span id="buy-ticket" class="buy-btn buy-now item-buy{{#if dis}} dis{{/if}}" >立即购买</span>
{{^}}
{{!-- 各颜色下所有尺码均售罄则只显示售罄按钮 --}}
... ...
... ... @@ -34,16 +34,25 @@
{{/if}}
<a class="name" href="{{href}}" target="_blank">{{name}}</a>
<span class="color-size">
{{#if color}}
颜色：{{color}}&nbsp;&nbsp;
{{/if}}
{{#if virtualGood}}
{{#if color}}
日期：{{color}}&nbsp;&nbsp;
{{/if}}
{{#if size}}
区域：{{size}}
{{/if}}
{{else}}
{{#if color}}
颜色：{{color}}&nbsp;&nbsp;
{{/if}}
{{#if size}}
尺码：{{size}}
{{/if}}
{{#if size}}
尺码：{{size}}
{{/if}}
{{#if arrivalDate}}
<i class="arrival-date">上市期：{{arrivalDate}}</i>
{{#if arrivalDate}}
<i class="arrival-date">上市期：{{arrivalDate}}</i>
{{/if}}
{{/if}}
</span>
</div>
... ...
... ... @@ -124,11 +124,24 @@ var TicketCat = {
new dialog.Alert('请输入正确的手机号！').show();
return;
}
el.$showTicketMobile.removeClass('hide');
el.$setTicketMobile.addClass('hide');
el.$ticketMobile.text(val);
window.setCookie('ticketMobileInput', val, {
domain: '.yohobuy.com',
path: '/'
});
});
//手机号，保存cookie中,防止用户刷新
if (el.phoneReg.test(window.cookie('ticketMobileInput'))) {
el.$showTicketMobile.removeClass('hide');
el.$setTicketMobile.addClass('hide');
el.$ticketMobile.text(window.cookie('ticketMobileInput'));
}
// 使用优惠券、使用yoho币点击展开
el.$pan.find('dt').click(function() {
var pan = $(this).parent('dl.pan');
... ...
... ... @@ -68,10 +68,7 @@ class ItemModel
if (!empty($baseInfo['isOutlets'])) {
$goodsInfo['isOutlets'] = $baseInfo['isOutlets'] == 'Y' ? 'outlets' : '';
}
//电子门票
$goodsInfo['isTicket'] = $baseInfo['isTicket'] = TRUE;
// 商品价格
if (isset($baseInfo['productPriceBo'])) {
$goodsInfo['marketPrice'] = $baseInfo['productPriceBo']['formatMarketPrice'];
... ... @@ -1010,8 +1007,6 @@ class ItemModel
$skuGoods = array();//sku商品
$defaultImage = '';//默认图
$chooseSkuFlag = false;//选中sku状态
//摸拟数据
$baseInfo['isTicket'] = empty($baseInfo['isTicket']) ? false : $baseInfo['isTicket'];
if (!empty($baseInfo['goodsList'])) {
$goodsGroup = array();
... ... @@ -1032,8 +1027,8 @@ class ItemModel
'thumbs' => array(),
'size' => array(),
);
//不是门票的要显示图片
if ($baseInfo['isTicket']) {
//不是门票的要显示图片,虚拟商品
if ($baseInfo['attribute'] === 3) {
$goodsGroup['src'] = Images::getImageUrl($value['colorImage'], 40, 40);
}
... ... @@ -1058,8 +1053,8 @@ class ItemModel
//商品的尺码列表
foreach ($value['goodsSizeBoList'] as $size) {
if($baseInfo['attribute'] == 3 ) { //虚拟商品,增加为一件
$size['goodsSizeStorageNum'] = $size['goodsSizeStorageNum'] > 1 ? 1: 0;
if($baseInfo['attribute'] == 3 ) { //虚拟商品,门票默认最大为4,
$size['goodsSizeStorageNum'] = $size['goodsSizeStorageNum'] > 4 ? 4: 0;
}
//如果status为0，即skc下架时就跳过该商品
if ($value['status'] === 0) {
... ... @@ -1068,7 +1063,7 @@ class ItemModel
$goodsGroup['size'][] = array(
'name' => $size['sizeName'],
'sku' => $size['goodsSizeSkuId'],
'num' => $baseInfo['isTicket'] && $size['goodsSizeStorageNum'] > 4 ? 4 : intval($size['goodsSizeStorageNum']),
'num' => intval($size['goodsSizeStorageNum']),
'goodsId'=> $size['goodsId']
);
//单个sku商品的总数
... ...