Authored by hf

Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap

@@ -323,7 +323,7 @@ class DetailModel @@ -323,7 +323,7 @@ class DetailModel
323 self::procShowStatus($result, $showStatus, $isBeginSale); 323 self::procShowStatus($result, $showStatus, $isBeginSale);
324 324
325 $result['cartInfo']['limitProductCode'] = $baseInfo['limitProductCode']; 325 $result['cartInfo']['limitProductCode'] = $baseInfo['limitProductCode'];
326 - $result['cartInfo']['limitCodeUrl'] = self::getLimitCodeUrl($baseInfo['limitProductCode']); 326 + $result['cartInfo']['limitCodeUrl'] = self::getLimitCodeUrl($baseInfo['limitProductCode'], $baseInfo['erpProductId']);
327 $result['cartInfo']['limitProductPay'] = Helpers::url('/cart/index/orderEnsure'); 327 $result['cartInfo']['limitProductPay'] = Helpers::url('/cart/index/orderEnsure');
328 } else { 328 } else {
329 $result['cartInfo']['addToCartUrl'] = Helpers::url('/product/buy_' . $productId . '_' . $goodsId . '.html'); 329 $result['cartInfo']['addToCartUrl'] = Helpers::url('/product/buy_' . $productId . '_' . $goodsId . '.html');
@@ -879,11 +879,12 @@ class DetailModel @@ -879,11 +879,12 @@ class DetailModel
879 * 根据设备类型获得限购商品跳转app的url 879 * 根据设备类型获得限购商品跳转app的url
880 * 880 *
881 * @param string $productCode 限购商品码 881 * @param string $productCode 限购商品码
  882 + * @param string $skn 限购商品skn
882 * @return string 限购商品跳转url 883 * @return string 限购商品跳转url
883 */ 884 */
884 - private static function getLimitCodeUrl($productCode) 885 + private static function getLimitCodeUrl($productCode, $skn)
885 { 886 {
886 - $url = 'yohoapp://yoho.app/openwith?limit_product_code=' . $productCode; 887 + $url = 'yohoapp://yoho.app/openwith?limit_product_code=' . $productCode . '&product_skn=' . $skn;
887 888
888 // 苹果设备或者苹果IPAD 889 // 苹果设备或者苹果IPAD
889 if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) { 890 if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {