fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 437d6401c14ef5182ac04f676b26bce71040469c 2 parents 099a9acc f2ea6d45

Merge branch 'feature/specialLimit'

Inline Side-by-side
Showing 8 changed files with 33 additions and 11 deletions
... ... @@ -716,6 +716,7 @@ class Helpers
$oneGoods['yohoIcon'] = isset($value['get_yoho_coin']) ? $value['get_yoho_coin'] : 0;
$oneGoods['productSubtotal'] = self::transPrice( floatval($value['last_vip_price']) * intval($value['buy_number']) );
$oneGoods['promotionId'] = empty($value['promotion_id']) ? '0' : $value['promotion_id'];
$oneGoods['isLimitSkn'] = $value['is_limit_skn'] === 'Y'; //is_limit_skn=Y 不支持7天无理由退货
// 已下架
if ($isOffShelves) {
... ...
... ... @@ -251,7 +251,7 @@
<span class="gift">赠品</span>
{{/isGift}}
</a>
<p class="pay-pro-info">
<p class="pay-pro-info" {{# isLimitSkn}}style="padding-top:4px;"{{/ isLimitSkn}}>
<a href="{{link}}" target="_blank">{{productTitle}}</a>
<span>
{{#if productColor}}
... ... @@ -261,6 +261,7 @@
尺码：{{productSize}}
{{/if}}
</span>
{{# isLimitSkn}}<span class="special-limit-7day"><i></i>不支持7天无理由退换</span>{{/ isLimitSkn}}
</p>
</div>
</td>
... ...
... ... @@ -35,7 +35,9 @@
<input type="hidden" value="{{sku}}" name="sku">
<input type="hidden" value="{{price}}" name="price">
<input type="hidden" value="{{goods_type_id}}" name="typeid">
<input type="checkbox" checked="true">
{{#unless isLimitSkn}}
<input type="checkbox" checked="true">
{{/unless}}
{{/unless}}
</td>
<td width="60">
... ... @@ -63,7 +65,7 @@
<td class="exchange-choose-wrap">
<p>
颜色要换成:
<select class="exchange-color">
<select class="exchange-color" {{#if isLimitSkn}}disabled{{/if}}>
<option value="0">请选择颜色</option>
{{# colorSize}}
<option value="{{goodsId}}">{{color}}</option>
... ... @@ -79,13 +81,13 @@
</p>
<p>
尺码要换成:
<select class="exchange-size">
<select class="exchange-size" {{#if isLimitSkn}}disabled{{/if}}>
<option value="0">请选择尺码</option>
</select>
</p>
</td>
<td class="return-reason-wrap">
<select class="return-reason">
<select class="return-reason" {{#if isLimitSkn}}disabled{{/if}}>
<option value="0">请选择换货原因</option>
{{#with exchange}}
{{# reason}}
... ... @@ -166,7 +168,9 @@
<input type="hidden" value="{{sku}}" name="sku">
<input type="hidden" value="{{price}}" name="price">
<input type="hidden" value="{{goods_type_id}}" name="typeid">
<input type="checkbox" checked="true">
{{#unless isLimitSkn}}
<input type="checkbox" checked="true">
{{/unless}}
{{/unless}}
</td>
<td width="60">
... ... @@ -192,7 +196,7 @@
{{#if banMsg}}
<label>{{banMsg}}</label>
{{^}}
<select class="return-reason">
<select class="return-reason" {{#if isLimitSkn}}disabled{{/if}}>
<option value="0">请选择退货原因</option>
{{#with refund}}
{{# reason}}
... ...

48.3 KB | W: | H:

48.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

48.3 KB | W: | H:

50.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -391,6 +391,19 @@
background-repeat: no-repeat;
}
}
.special-limit-7day{
display: block;
height: 16px;
line-height: 16px;
}
.special-limit-7day i{
float: left;
display: block;
width: 16px;
height: 16px;
margin-right: 2px;
background: url(/cart/7day-limit.png) no-repeat;
}
}
.cartnew-sum {
... ...
... ... @@ -317,12 +317,14 @@ class ReturnsModel
$result['goods'][$key]['reason'] = $data['data']['return_reason'];
$result['goods'][$key]['isLimitSkn'] = $value['is_limit_skn'] === 'Y'; //is_limit_skn=Y 不支持7天无理由退换货
// tar note 为每个特殊商品都添加标识
if ($value['is_limit_skn'] === 'Y') {
$remarks = explode(' ', $data['data']['special_notice']['remark'], 2); // 使用3个空格拆分
$result['goods'][$key]['specialNoticeBo']['title'] = $data['data']['special_notice']['title'];
$result['goods'][$key]['specialNoticeBo']['remark1'] = $remarks[0];
$result['goods'][$key]['specialNoticeBo']['remark2'] = $remarks[1];
$result['goods'][$key]['specialNoticeBo']['remark1'] = '该商品非质量问题不支持退换货，如有疑问，请联系客服。'; //$remarks[0];
//$result['goods'][$key]['specialNoticeBo']['remark2'] = $remarks[1];
// tar note 对数组做处理，为不显示的添加 inactive
if (isset($data['data']['special_return_reason'])) {
... ... @@ -406,13 +408,14 @@ class ReturnsModel
$result['goods'][$key]['goods_type_id'] = $value['goods_type_id'];
$result['goods'][$key]['reason'] = $data['data']['exchange_reason'];
$result['goods'][$key]['isLimitSkn'] = $value['is_limit_skn'] === 'Y'; //is_limit_skn=Y 不支持7天无理由退换货
// tar note 为每个特殊商品都添加标识
if ($value['is_limit_skn'] === 'Y') {
$remarks = explode(' ', $data['data']['specialNoticeBo']['remark'], 2); // 使用3个空格拆分
$result['goods'][$key]['specialNoticeBo']['title'] = $data['data']['specialNoticeBo']['title'];
$result['goods'][$key]['specialNoticeBo']['remark1'] = $remarks[0];
$result['goods'][$key]['specialNoticeBo']['remark2'] = $remarks[1];
$result['goods'][$key]['specialNoticeBo']['remark1'] = '该商品非质量问题不支持退换货，如有疑问，请联系客服。'; //$remarks[0];
//$result['goods'][$key]['specialNoticeBo']['remark2'] = $remarks[1];
// tar note 对数组做处理，为不显示的添加 inactive
if (isset($data['data']['special_exchange_reason'])) {
... ...