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 @@ -716,6 +716,7 @@ class Helpers
716 $oneGoods['yohoIcon'] = isset($value['get_yoho_coin']) ? $value['get_yoho_coin'] : 0; 716 $oneGoods['yohoIcon'] = isset($value['get_yoho_coin']) ? $value['get_yoho_coin'] : 0;
717 $oneGoods['productSubtotal'] = self::transPrice( floatval($value['last_vip_price']) * intval($value['buy_number']) ); 717 $oneGoods['productSubtotal'] = self::transPrice( floatval($value['last_vip_price']) * intval($value['buy_number']) );
718 $oneGoods['promotionId'] = empty($value['promotion_id']) ? '0' : $value['promotion_id']; 718 $oneGoods['promotionId'] = empty($value['promotion_id']) ? '0' : $value['promotion_id'];
  719 + $oneGoods['isLimitSkn'] = $value['is_limit_skn'] === 'Y'; //is_limit_skn=Y 不支持7天无理由退货
719 720
720 // 已下架 721 // 已下架
721 if ($isOffShelves) { 722 if ($isOffShelves) {
@@ -251,7 +251,7 @@ @@ -251,7 +251,7 @@
251 <span class="gift">赠品</span> 251 <span class="gift">赠品</span>
252 {{/isGift}} 252 {{/isGift}}
253 </a> 253 </a>
254 - <p class="pay-pro-info"> 254 + <p class="pay-pro-info" {{# isLimitSkn}}style="padding-top:4px;"{{/ isLimitSkn}}>
255 <a href="{{link}}" target="_blank">{{productTitle}}</a> 255 <a href="{{link}}" target="_blank">{{productTitle}}</a>
256 <span> 256 <span>
257 {{#if productColor}} 257 {{#if productColor}}
@@ -261,6 +261,7 @@ @@ -261,6 +261,7 @@
261 尺码：{{productSize}} 261 尺码：{{productSize}}
262 {{/if}} 262 {{/if}}
263 </span> 263 </span>
  264 + {{# isLimitSkn}}<span class="special-limit-7day"><i></i>不支持7天无理由退换</span>{{/ isLimitSkn}}
264 </p> 265 </p>
265 </div> 266 </div>
266 </td> 267 </td>
@@ -35,7 +35,9 @@ @@ -35,7 +35,9 @@
35 <input type="hidden" value="{{sku}}" name="sku"> 35 <input type="hidden" value="{{sku}}" name="sku">
36 <input type="hidden" value="{{price}}" name="price"> 36 <input type="hidden" value="{{price}}" name="price">
37 <input type="hidden" value="{{goods_type_id}}" name="typeid"> 37 <input type="hidden" value="{{goods_type_id}}" name="typeid">
38 - <input type="checkbox" checked="true"> 38 + {{#unless isLimitSkn}}
  39 + <input type="checkbox" checked="true">
  40 + {{/unless}}
39 {{/unless}} 41 {{/unless}}
40 </td> 42 </td>
41 <td width="60"> 43 <td width="60">
@@ -63,7 +65,7 @@ @@ -63,7 +65,7 @@
63 <td class="exchange-choose-wrap"> 65 <td class="exchange-choose-wrap">
64 <p> 66 <p>
65 颜色要换成: 67 颜色要换成:
66 - <select class="exchange-color"> 68 + <select class="exchange-color" {{#if isLimitSkn}}disabled{{/if}}>
67 <option value="0">请选择颜色</option> 69 <option value="0">请选择颜色</option>
68 {{# colorSize}} 70 {{# colorSize}}
69 <option value="{{goodsId}}">{{color}}</option> 71 <option value="{{goodsId}}">{{color}}</option>
@@ -79,13 +81,13 @@ @@ -79,13 +81,13 @@
79 </p> 81 </p>
80 <p> 82 <p>
81 尺码要换成: 83 尺码要换成:
82 - <select class="exchange-size"> 84 + <select class="exchange-size" {{#if isLimitSkn}}disabled{{/if}}>
83 <option value="0">请选择尺码</option> 85 <option value="0">请选择尺码</option>
84 </select> 86 </select>
85 </p> 87 </p>
86 </td> 88 </td>
87 <td class="return-reason-wrap"> 89 <td class="return-reason-wrap">
88 - <select class="return-reason"> 90 + <select class="return-reason" {{#if isLimitSkn}}disabled{{/if}}>
89 <option value="0">请选择换货原因</option> 91 <option value="0">请选择换货原因</option>
90 {{#with exchange}} 92 {{#with exchange}}
91 {{# reason}} 93 {{# reason}}
@@ -166,7 +168,9 @@ @@ -166,7 +168,9 @@
166 <input type="hidden" value="{{sku}}" name="sku"> 168 <input type="hidden" value="{{sku}}" name="sku">
167 <input type="hidden" value="{{price}}" name="price"> 169 <input type="hidden" value="{{price}}" name="price">
168 <input type="hidden" value="{{goods_type_id}}" name="typeid"> 170 <input type="hidden" value="{{goods_type_id}}" name="typeid">
169 - <input type="checkbox" checked="true"> 171 + {{#unless isLimitSkn}}
  172 + <input type="checkbox" checked="true">
  173 + {{/unless}}
170 {{/unless}} 174 {{/unless}}
171 </td> 175 </td>
172 <td width="60"> 176 <td width="60">
@@ -192,7 +196,7 @@ @@ -192,7 +196,7 @@
192 {{#if banMsg}} 196 {{#if banMsg}}
193 <label>{{banMsg}}</label> 197 <label>{{banMsg}}</label>
194 {{^}} 198 {{^}}
195 - <select class="return-reason"> 199 + <select class="return-reason" {{#if isLimitSkn}}disabled{{/if}}>
196 <option value="0">请选择退货原因</option> 200 <option value="0">请选择退货原因</option>
197 {{#with refund}} 201 {{#with refund}}
198 {{# reason}} 202 {{# 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 @@ @@ -391,6 +391,19 @@
391 background-repeat: no-repeat; 391 background-repeat: no-repeat;
392 } 392 }
393 } 393 }
  394 + .special-limit-7day{
  395 + display: block;
  396 + height: 16px;
  397 + line-height: 16px;
  398 + }
  399 + .special-limit-7day i{
  400 + float: left;
  401 + display: block;
  402 + width: 16px;
  403 + height: 16px;
  404 + margin-right: 2px;
  405 + background: url(/cart/7day-limit.png) no-repeat;
  406 + }
394 } 407 }
395 408
396 .cartnew-sum { 409 .cartnew-sum {
@@ -317,12 +317,14 @@ class ReturnsModel @@ -317,12 +317,14 @@ class ReturnsModel
317 317
318 $result['goods'][$key]['reason'] = $data['data']['return_reason']; 318 $result['goods'][$key]['reason'] = $data['data']['return_reason'];
319 319
  320 + $result['goods'][$key]['isLimitSkn'] = $value['is_limit_skn'] === 'Y'; //is_limit_skn=Y 不支持7天无理由退换货
  321 +
320 // tar note 为每个特殊商品都添加标识 322 // tar note 为每个特殊商品都添加标识
321 if ($value['is_limit_skn'] === 'Y') { 323 if ($value['is_limit_skn'] === 'Y') {
322 $remarks = explode(' ', $data['data']['special_notice']['remark'], 2); // 使用3个空格拆分 324 $remarks = explode(' ', $data['data']['special_notice']['remark'], 2); // 使用3个空格拆分
323 $result['goods'][$key]['specialNoticeBo']['title'] = $data['data']['special_notice']['title']; 325 $result['goods'][$key]['specialNoticeBo']['title'] = $data['data']['special_notice']['title'];
324 - $result['goods'][$key]['specialNoticeBo']['remark1'] = $remarks[0];  
325 - $result['goods'][$key]['specialNoticeBo']['remark2'] = $remarks[1]; 326 + $result['goods'][$key]['specialNoticeBo']['remark1'] = '该商品非质量问题不支持退换货，如有疑问，请联系客服。'; //$remarks[0];
  327 + //$result['goods'][$key]['specialNoticeBo']['remark2'] = $remarks[1];
326 328
327 // tar note 对数组做处理，为不显示的添加 inactive 329 // tar note 对数组做处理，为不显示的添加 inactive
328 if (isset($data['data']['special_return_reason'])) { 330 if (isset($data['data']['special_return_reason'])) {
@@ -406,13 +408,14 @@ class ReturnsModel @@ -406,13 +408,14 @@ class ReturnsModel
406 $result['goods'][$key]['goods_type_id'] = $value['goods_type_id']; 408 $result['goods'][$key]['goods_type_id'] = $value['goods_type_id'];
407 409
408 $result['goods'][$key]['reason'] = $data['data']['exchange_reason']; 410 $result['goods'][$key]['reason'] = $data['data']['exchange_reason'];
  411 + $result['goods'][$key]['isLimitSkn'] = $value['is_limit_skn'] === 'Y'; //is_limit_skn=Y 不支持7天无理由退换货
409 412
410 // tar note 为每个特殊商品都添加标识 413 // tar note 为每个特殊商品都添加标识
411 if ($value['is_limit_skn'] === 'Y') { 414 if ($value['is_limit_skn'] === 'Y') {
412 $remarks = explode(' ', $data['data']['specialNoticeBo']['remark'], 2); // 使用3个空格拆分 415 $remarks = explode(' ', $data['data']['specialNoticeBo']['remark'], 2); // 使用3个空格拆分
413 $result['goods'][$key]['specialNoticeBo']['title'] = $data['data']['specialNoticeBo']['title']; 416 $result['goods'][$key]['specialNoticeBo']['title'] = $data['data']['specialNoticeBo']['title'];
414 - $result['goods'][$key]['specialNoticeBo']['remark1'] = $remarks[0];  
415 - $result['goods'][$key]['specialNoticeBo']['remark2'] = $remarks[1]; 417 + $result['goods'][$key]['specialNoticeBo']['remark1'] = '该商品非质量问题不支持退换货，如有疑问，请联系客服。'; //$remarks[0];
  418 + //$result['goods'][$key]['specialNoticeBo']['remark2'] = $remarks[1];
416 419
417 // tar note 对数组做处理，为不显示的添加 inactive 420 // tar note 对数组做处理，为不显示的添加 inactive
418 if (isset($data['data']['special_exchange_reason'])) { 421 if (isset($data['data']['special_exchange_reason'])) {