Merge branch 'feature/mars-limit' into 'release/6.8.2'

mars 商品详情



See merge request !1592

@@ -101,7 +101,7 @@ module.exports = class extends global.yoho.BaseModel {
                 break;
                 break;
             case 4: // 开售后，立即购买（用户已领取限购码）
             case 4: // 开售后，立即购买（用户已领取限购码）
                 data.gotCode = true;
                 data.gotCode = true;
-                data.cartInfo.canNotBuy = true;
+                data.cartInfo.appBuy = 'limitProduct';
                 break;
                 break;
             case 5: // 开售前，限购码已被抢光（用户未领取限购码）
             case 5: // 开售前，限购码已被抢光（用户未领取限购码）
                 data.codeEmpty = true;
                 data.codeEmpty = true;
@@ -615,9 +615,7 @@ module.exports = class extends global.yoho.BaseModel {
                         let isBeginSale = (result.data.saleStatus === 1);
                         let isBeginSale = (result.data.saleStatus === 1);
 
 
                         // 限购商品有关的展示状态
                         // 限购商品有关的展示状态
-                        let showStatus = 1;
-
-                        origin.showStatus && (showStatus = parseInt(result.data.showStatus, 10));
+                        let showStatus = parseInt(result.data.showStatus, 10);
 
 
                         // 处理限购商品有关的按钮状态
                         // 处理限购商品有关的按钮状态
                         dest = this._procShowStatus(dest, showStatus, isBeginSale);
                         dest = this._procShowStatus(dest, showStatus, isBeginSale);

@@ -330,9 +330,17 @@ setTimeout(() => {
 
 
                     $('.mars-jump-min-app').on('click', function() {
                     $('.mars-jump-min-app').on('click', function() {
                         if (yoho && yoho.isMarsApp) {
                         if (yoho && yoho.isMarsApp) {
-                            yoho.invokeMethod('go.minAppGoodsDetail', {
-                                url: '/pages/goodsDetail/goodsDetail?productSkn=' + productSkn
-                            });
+                            let Limitcode = $('#limitProductCode').val();
+
+                            if (Limitcode) {
+                                yoho.invokeMethod('go.minAppLimitDetail', {
+                                    url: '/pages/product/detail/detail?limitProductCode=' + Limitcode // eslint-disable-line
+                                });
+                            } else {
+                                yoho.invokeMethod('go.minAppGoodsDetail', {
+                                    url: '/pages/goodsDetail/goodsDetail?productSkn=' + productSkn
+                                });
+                            }
                         }
                         }
                     });
                     });