fe / YOHOBUYWAP · Commits

Go to a project

Authored by 郭成尧
Commit cff6d6d51801d7958a1b90d9a28080b09b2622dc 2 parents f741e10f e4b7a856

Merge branch 'release/5.3.1' into gray

Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
@@ -57,13 +57,15 @@ @@ -57,13 +57,15 @@
57 <span class="iconfont {{#if promotionId}}disabled{{/if}}">&#xe624;</span> 57 <span class="iconfont {{#if promotionId}}disabled{{/if}}">&#xe624;</span>
58 </a> 58 </a>
59 </div> 59 </div>
60 - {{#unless discountBuy}} 60 + {{#unless discountBuy.discount}}
61 <span class="left-num"></span> 61 <span class="left-num"></span>
62 {{/unless}} 62 {{/unless}}
63 <input id="left-num" type="hidden" value="0"> 63 <input id="left-num" type="hidden" value="0">
64 <input id="limitNum" type="hidden" value="{{limit}}"> 64 <input id="limitNum" type="hidden" value="{{limit}}">
65 {{# discountBuy}} 65 {{# discountBuy}}
66 - <span class="left-num-discount" style="color: #e10;position: absolute;top: 0.5rem;left: 9.5rem;overflow: hidden;white-space: nowrap;width: 5.2rem;-o-text-overflow: ellipsis;text-overflow: ellipsis;">{{mnum}}件起购享{{discount}}折</span> 66 + {{if discount}}
  67 + <span class="left-num-discount" style="color: #e10;position: absolute;top: 0.5rem;left: 9.5rem;overflow: hidden;white-space: nowrap;width: 5.2rem;-o-text-overflow: ellipsis;text-overflow: ellipsis;">{{mnum}}件起购享{{discount}}折</span>
  68 + {{/if}}
67 <input id="mnum" type="hidden" value="{{mnum}}"> 69 <input id="mnum" type="hidden" value="{{mnum}}">
68 {{/ discountBuy}} 70 {{/ discountBuy}}
69 </div> 71 </div>
@@ -267,7 +267,7 @@ class CartModel @@ -267,7 +267,7 @@ class CartModel
267 if ($apiResult && $apiResult['code'] === 200 && isset($apiResult['data'])) { 267 if ($apiResult && $apiResult['code'] === 200 && isset($apiResult['data'])) {
268 if (isset($apiResult['data']['bundleInfo'])) { 268 if (isset($apiResult['data']['bundleInfo'])) {
269 $result['mnum'] = $apiResult['data']['bundleInfo']['bundleCount']; 269 $result['mnum'] = $apiResult['data']['bundleInfo']['bundleCount'];
270 - $result['discount'] = $apiResult['data']['bundleInfo']['discount']; 270 + $result['discount'] = isset($apiResult['data']['bundleInfo']['discount']) ? $apiResult['data']['bundleInfo']['discount'] : false;
271 $result['promotionPhrase'] = $apiResult['data']['bundleInfo']['promotionPhrase']; 271 $result['promotionPhrase'] = $apiResult['data']['bundleInfo']['promotionPhrase'];
272 } 272 }
273 273