Merge branch 'release/5.3.1' into gray

@@ -57,13 +57,15 @@
                             <span class="iconfont {{#if promotionId}}disabled{{/if}}">&#xe624;</span>
                             <span class="iconfont {{#if promotionId}}disabled{{/if}}">&#xe624;</span>
                         </a>
                         </a>
                     </div>
                     </div>
-                    {{#unless discountBuy}}
+                    {{#unless discountBuy.discount}}
                     <span class="left-num"></span>
                     <span class="left-num"></span>
                     {{/unless}}
                     {{/unless}}
                     <input id="left-num" type="hidden" value="0">
                     <input id="left-num" type="hidden" value="0">
                     <input id="limitNum" type="hidden" value="{{limit}}">
                     <input id="limitNum" type="hidden" value="{{limit}}">
                     {{# discountBuy}}
                     {{# discountBuy}}
+                        {{if discount}}
                         <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>
                         <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>
+                        {{/if}}
                     <input id="mnum" type="hidden" value="{{mnum}}">
                     <input id="mnum" type="hidden" value="{{mnum}}">
                     {{/ discountBuy}}
                     {{/ discountBuy}}
                 </div>
                 </div>

@@ -267,7 +267,7 @@ class CartModel
         if ($apiResult && $apiResult['code'] === 200 && isset($apiResult['data'])) {
         if ($apiResult && $apiResult['code'] === 200 && isset($apiResult['data'])) {
             if (isset($apiResult['data']['bundleInfo'])) {
             if (isset($apiResult['data']['bundleInfo'])) {
                 $result['mnum'] = $apiResult['data']['bundleInfo']['bundleCount'];
                 $result['mnum'] = $apiResult['data']['bundleInfo']['bundleCount'];
-                $result['discount'] = $apiResult['data']['bundleInfo']['discount'];
+                $result['discount'] = isset($apiResult['data']['bundleInfo']['discount']) ? $apiResult['data']['bundleInfo']['discount'] : false;
                 $result['promotionPhrase'] = $apiResult['data']['bundleInfo']['promotionPhrase'];
                 $result['promotionPhrase'] = $apiResult['data']['bundleInfo']['promotionPhrase'];
             }
             }