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

@@ -5317,8 +5317,6 @@ var goodsDiscountEl = document.getElementById('goodsDiscount'),
 
 var $cart = $('.cart-bar');
 
-var limitSaleHammer = (limitSaleHammer = document.getElementById('limit-sale')) && new Hammer(limitSaleHammer);
-
 var appUrl = $('input[name="limitCodeUrl"]').val();
 
 var dialog = require("js/me/dialog");
@@ -5381,23 +5379,40 @@ if (goodsDiscountHammer && $discountFolder.children().length > 0) {
     });
 }
 
-limitSaleHammer && limitSaleHammer.on('tap', function(e) {
-    e.srcEvent.stopPropagation();
-    dialog.showDialog({
-        dialogText: '打开有货APP限定发售频道\n获取限购码',
-        hasFooter: {
-            rightBtnText: '打开Yoho!Buy有货APP'
-        }
-    }, function() {
-        window.location.href = appUrl;
-    }, undefined, true);
+$('#limit-sale').on('touchend', function(e) {
+    var loginUrl = $('#loginUrl').val(),
+        ifr;
 
-    $('.dialog-wrapper').off('touchstart').on('touchstart', function(e) {
-        e.stopPropagation();
-        if ($(e.target).hasClass('dialog-wrapper')) {
-            dialog.hideDialog();
-        }
-    });
+    e.stopPropagation();
+
+    if(loginUrl) {
+        window.location = loginUrl;
+    } else {
+        dialog.showDialog({
+            dialogText: '进入有货APP，获取限购码',
+            hasFooter: {
+                rightBtnText: '打开Yoho!Buy有货APP'
+            }
+        }, function() {
+                ifr = document.createElement('iframe');
+                ifr.src = appUrl;
+                ifr.style.display = 'none';
+                document.body.appendChild(ifr);
+                window.location.href = appUrl;
+                window.setTimeout(function(){
+                    document.body.removeChild(ifr);
+                    window.location.href = 'http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho';
+                },3000);
+
+        }, undefined, true);
+
+        $('.dialog-wrapper').off('touchstart').on('touchstart', function(e) {
+            e.stopPropagation();
+            if ($(e.target).hasClass('dialog-wrapper')) {
+                dialog.hideDialog();
+            }
+        });
+    }
 });
 
 require("js/product/detail/desc");
@@ -5569,6 +5584,16 @@ var limitProductCode,
     // 限购商品的skn。只有限购商品时才会设置。
     skn;
 
+//禁用数字编辑
+function disableNumEdit() {
+    var $numBtn = $('.chose-panel').find('.num .btn>.iconfont');
+
+    //添加disabled样式
+    $numBtn.hasClass('disabled') ? null : $numBtn.addClass('disabled');
+
+    $yohoPage.off('touchstart', '.btn-minus');
+    $yohoPage.off('touchstart', '.btn-plus');
+}
 
 // 初始化购物车面板显示
 function init() {
@@ -5614,6 +5639,7 @@ function setEditModeWithSknId(sknId, isThisGoodSelected) {
  * @return {undefined}
  */
 function setLimitGoodModeWithSknId(code, sknId) {
+    disableNumEdit();
     $('#chose-btn-sure').html('立即购买');
     limitProductCode = code;
     skn = sknId;
@@ -5647,16 +5673,6 @@ function checkColorSizeNum() {
     return true;
 }
 
-//禁用数字编辑
-function disableNumEdit() {
-    var $numBtn = $('.chose-panel').find('.num .btn>.iconfont');
-
-    //添加disabled样式
-    $numBtn.hasClass('disabled') ? null : $numBtn.addClass('disabled');
-
-    $yohoPage.off('touchstart', '.btn-minus');
-    $yohoPage.off('touchstart', '.btn-plus');
-}
 
 
 function show(html, cb) {
@@ -5992,12 +6008,36 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
 
         } else if (limitProductCode) {
 
+            $(this).css('background-color', '#ccc').removeAttr('id');
+
             // 当前面板选择的是限购商品
             url = $('#limitProductPay').val() + '?limitproductcode=' + limitProductCode + '&sku=' +
                   productSku + '&skn=' + skn + '&buy_number=' + buyNumber;
 
-            //打开结算页面，结束函数执行。
-            window.location.href = url;
+            removePannel();
+            loading.showLoadingMask();
+
+            // 调用接口判断商品是否可以购买
+            $.ajax({
+                url: url
+            }).then(function(res) {
+
+                // 如果有错，则商品不可购买，执行页面刷新，否则跳到结算页面
+                if (res.error) {
+                    tip.show(res.message);
+                    setTimeout(function() {
+                        location.reload();
+                    }, 2000);
+                } else {
+                    location.href = url;
+                }
+            }).fail(function() {
+                tip.show('网络异常!');
+                setTimeout(function() {
+                    location.reload();
+                }, 2000);
+            });
+
             return false;
 
         } else {

+var $tip, tipItime;
+
+/* 领指定券 */
+var activityId = $('#coupon-container').attr('param');
+var userIsLogged = $('#coupon-container').attr('isLogged') === 'Y';
+var isApp = true;
+
+$('.get-coupon').click(function () {
+    var couponId = $(this).attr('param');
+    isApp = $(this).attr('href') !== 'javascript:;';
+    if (!isNaN(activityId) && !isNaN(couponId)) {
+        getNamedCoupon(activityId, couponId, isApp, userIsLogged);
+    }
+});
+/* 领所有券 */
+$('#get-all-coupon').click(function () {
+    var isApp = $(this).attr('href') !== 'javascript:;';
+    getAllCoupon(activityId, isApp);
+});
+
+/* 检查是否有在领取中的券,有则直接领取 */
+if (userIsLogged) {
+    var cookieCouponId = cookie('_Coupon' + activityId);
+    if (cookieCouponId && !isNaN(cookieCouponId)) {
+        getNamedCoupon(activityId, cookieCouponId, isApp, userIsLogged);
+    }
+}
+
+/**
+ * 微信分享 
+ */
+(function ($) {
+    if (typeof (wx) == "undefined") {
+        return;
+    }
+    var _weChatInterface = 'http://www.yohoshow.com/api/wechat/getSignPackage';
+    $.getJSON(_weChatInterface + '?pageurl=' +
+            encodeURIComponent(location.href.split('#')[0]) + '&callback=?', function (json) {
+        var _appId, _timestamp, _nonceStr, _signature;
+        if (json !== undefined && json !== '') {
+            _appId = json.appId.toString();
+            _timestamp = json.timestamp;
+            _nonceStr = json.nonceStr.toString();
+            _signature = json.signature.toString();
+
+            wx.config({
+                debug: false,
+                appId: _appId,
+                timestamp: _timestamp,
+                nonceStr: _nonceStr,
+                signature: _signature,
+                jsApiList: [
+                    'checkJsApi',
+                    'onMenuShareTimeline',
+                    'onMenuShareAppMessage',
+                    'onMenuShareQQ',
+                    'onMenuShareWeibo',
+                    'hideMenuItems',
+                    'showMenuItems',
+                    'hideAllNonBaseMenuItem',
+                    'showAllNonBaseMenuItem',
+                    'translateVoice',
+                    'startRecord',
+                    'stopRecord',
+                    'onRecordEnd',
+                    'playVoice',
+                    'pauseVoice',
+                    'stopVoice',
+                    'uploadVoice',
+                    'downloadVoice',
+                    'chooseImage',
+                    'previewImage',
+                    'uploadImage',
+                    'downloadImage',
+                    'getNetworkType',
+                    'openLocation',
+                    'getLocation',
+                    'hideOptionMenu',
+                    'showOptionMenu',
+                    'closeWindow',
+                    'scanQRCode',
+                    'chooseWXPay',
+                    'openProductSpecificView',
+                    'addCard',
+                    'chooseCard',
+                    'openCard'
+                ]
+            });
+        }
+    });
+    wx.ready(function () {
+        var shareTitle = $('#shareTitle').val();
+        var shareImg = $('#shareImg').val();
+        var shareDesc = $('#shareDesc').val();
+        var shareLink = $('#shareLink').val();
+        var shareData = {
+            title: shareTitle,
+            desc: shareDesc,
+            imgUrl: shareImg,
+            link: shareLink
+        };
+        wx.onMenuShareAppMessage(shareData);
+        wx.onMenuShareTimeline(shareData);
+        wx.onMenuShareQQ(shareData);
+        wx.onMenuShareWeibo(shareData);
+    });
+}(jQuery));
+
+/**
+ * 初始化提示框
+ */
+(function () {
+    var tipHtml = '<div id="yoho-tip" class="yoho-tip"></div>';
+
+    //插入提示HTML
+    $('#coupon-container').append(tipHtml);
+
+    $tip = $('#yoho-tip');
+    $tip.on('touchend', function () {
+        $tip.hide();
+
+        //清除Timeout
+        clearTimeout(tipItime);
+    });
+}());
+
+function cookie(name) {
+    var cookies = document.cookie,
+            cookieVal,
+            offset;
+
+    if (document.cookie && document.cookie !== '') {
+        offset = cookies.indexOf(name + '=');
+        if (offset > -1) {
+            offset += name.length + 1;
+
+            cookieVal = decodeURIComponent($.trim(cookies.substring(offset, cookies.indexOf(';', offset))));
+        }
+    }
+
+    return cookieVal;
+}
+
+function setCookie(name, value, options) {
+    var expires = '',
+            path,
+            domain,
+            secure,
+            date;
+
+    if (typeof value !== 'undefined') {
+        options = options || {};
+        if (value === null) {
+            value = '';
+            options.expires = -1;
+        }
+
+        if (options.expires &&
+                (typeof options.expires === 'number' || options.expires.toUTCString)) {
+            if (typeof options.expires === 'number') {
+                date = new Date();
+                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+            } else {
+                date = options.expires;
+            }
+            expires = '; expires=' + date.toUTCString();
+        }
+        path = options.path ? '; path=' + options.path : '';
+        domain = options.domain ? '; domain=' + options.domain : '';
+        secure = options.secure ? '; secure' : '';
+        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+    }
+}
+
+/**
+ * 显示提示
+ */
+function showTip(con, dur) {
+    var content, duration;
+
+    if (typeof con === 'undefined') {
+        return;
+    }
+
+    content = con.toString();
+    duration = (dur && dur > 0) ? dur : 3000;
+
+    $tip.html(content).show();
+
+    tipItime = setTimeout(function () {
+        if ($tip.css('display') === 'block') {
+            $tip.hide();
+        }
+    }, duration);
+}
+
+/**
+ * 获取活动的指定优惠券 
+ */
+function getNamedCoupon(activityId, couponId, isApp, userIsLogged)
+{
+    $.ajax({
+        type: 'POST',
+        url: '/cuxiao/coupon/getnamed',
+        data: 'activityId=' + activityId + '&couponId=' + couponId,
+        success: function (data) {
+            setCookie('_Coupon' + activityId, null, {
+                expires: -2,
+                domain: '.m.yohobuy.com'
+            });
+            if (isApp && !userIsLogged) {
+                return;
+            }
+            if (data.code == 200) {
+                showTip('恭喜您成功领取优惠券！<br><br>稍后即会到账，请耐心等待。');
+            }
+            else if (data.code == 201) {
+                showTip('您已领取过品牌优惠券<br><br>快去选购心仪的商品吧！');
+            }
+            else if (data.code == 400) {
+                setCookie('_Coupon' + activityId, couponId, {
+                    expires: 1,
+                    domain: '.m.yohobuy.com'
+                });
+                if (isApp) {
+                    //showTip('请先登录！');
+                } else {
+                    location.href = decodeURIComponent(data.data);
+                }
+            }
+            else if (data.message) {
+                //showTip(data.message);
+                if (data.message == '新用户才可领取') {
+                    showTip('Sorry,新客券只有新客才能领取呦!');
+                } else {
+                    showTip('领取失败<br><br>请稍候再试');
+                }
+                setCookie('_Coupon' + activityId, null);
+            }
+
+        },
+        error: function () {
+            showTip('网络断开连接啦~');
+        }
+    });
+}
+
+/**
+ * 获取活动所有的优惠券 
+ */
+function getAllCoupon(activityId, isApp)
+{
+    $.ajax({
+        type: 'POST',
+        url: '/cuxiao/coupon/getall',
+        data: 'activityId=' + activityId,
+        dataType: 'json',
+        success: function (data) {
+            if (data.code == 200) {
+                showTip('恭喜您，成功领取');
+            }
+            else if (data.code == 201) {
+                showTip('对不起，您已经领取过');
+            }
+            else if (data.code == 400) {
+                if (isApp) {
+                    showTip('请先登录！');
+                } else {
+                    location.href = decodeURIComponent(data.data);
+                }
+            }
+            else if (data.message) {
+                //showTip(data.message);
+                showTip('系统繁忙，请稍候再试！');
+            }
+        },
+        error: function () {
+            showTip('网络断开连接啦~');
+        }
+    });
+}
\ No newline at end of file

@@ -18,8 +18,6 @@ var goodsDiscountEl = document.getElementById('goodsDiscount'),
 
 var $cart = $('.cart-bar');
 
-var limitSaleHammer = (limitSaleHammer = document.getElementById('limit-sale')) && new Hammer(limitSaleHammer);
-
 var appUrl = $('input[name="limitCodeUrl"]').val();
 
 var dialog = require('../../me/dialog');
@@ -84,7 +82,7 @@ if (goodsDiscountHammer && $discountFolder.children().length > 0) {
 
 $('#limit-sale').on('touchend', function(e) {
     var loginUrl = $('#loginUrl').val(),
-        u = navigator.userAgent,
+        time,
         ifr;
 
     e.stopPropagation();
@@ -98,16 +96,19 @@ $('#limit-sale').on('touchend', function(e) {
                 rightBtnText: '打开Yoho!Buy有货APP'
             }
         }, function() {
-
-                ifr = document.createElement('iframe');
-                ifr.src = appUrl;
-                ifr.style.display = 'none';
-                document.body.appendChild(ifr);
-                window.location.href = appUrl;
-                window.setTimeout(function(){
-                    document.body.removeChild(ifr);
+            ifr = document.createElement('iframe');
+            ifr.src = appUrl;
+            ifr.style.display = 'none';
+            document.body.appendChild(ifr);
+            window.location.href = appUrl;
+
+            time = Date.now();
+            window.setTimeout(function() {
+                document.body.removeChild(ifr);
+                if (Date.now()- time < 3200) {
                     window.location.href = 'http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho';
-                },3000);
+                }
+            }, 3000);
 
         }, undefined, true);
 

@@ -107,6 +107,6 @@
         <img src="{{jsUrl}}/cuxiao/img/newuser/160310/27.jpg">
     </div>
     <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
-    <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
+    <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon3.js"></script>
 </body>
 </html>
\ No newline at end of file

@@ -107,6 +107,6 @@
         <img src="{{jsUrl}}/cuxiao/img/newuser/160310/27.jpg">
     </div>
     <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
-    <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
+    <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon3.js"></script>
 </body>
 </html>
\ No newline at end of file

@@ -610,8 +610,8 @@ class CouponController extends HuodongAction
         }
         $url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}';
 
-        $this->_view->display('newuser4', array(
-            'activityId' => 536, //495, // 536活动ID
+        $this->_view->display('newuser4-test', array(
+            'activityId' => 495, //495, // 536活动ID
             'staticTitle' => '新人潮这看，超值惊喜等你领', // 标题
             'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
             'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录
@@ -812,8 +812,8 @@ class CouponController extends HuodongAction
             }
 
             /* 判断用户是否登录 */
-//            $uid = $this->getSession(self::SESSION_UID);
-//            if (!$uid) {
+            $uid = $this->getSession(self::SESSION_UID);
+            if (!$uid) {
                 $uid = $this->getUid();
                 if (!$uid) {
                     $result['code'] = 400;
@@ -821,7 +821,7 @@ class CouponController extends HuodongAction
                     $result['data'] = Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', '/')), 'default');
                     break;
                 }
-//            }
+            }
 
             /* 领取指定的优惠券操作 */
             $result = ActivityData::getCouponNamed($uid, $activityId, $couponId);

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