Merge branch 'hotfix/newuser6'

毕凯
Commit e71d876c43a5d6b3043629c1c729aae5f5e8c14b 2 parents 8ab105d1 1c2411be
Showing 2 changed files with 41 additions and 35 deletions
static/huodong/cuxiao/js/newuser/coupon2.js
yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Coupon.php
--- a/static/huodong/cuxiao/js/newuser/coupon2.js
View file @e71d876
+++ b/static/huodong/cuxiao/js/newuser/coupon2.js
View file @e71d876
@@ -14,7 +14,7 @@ function GetQueryString(name) {
 $('.get-coupon').click(function () {
     var couponId = $(this).attr('param');
-    isApp = $(this).attr('href') !== 'javascript:;';
+    isApp = GetQueryString('app_version');
     if (isApp) {
         uid = GetQueryString('uid');
@@ -26,7 +26,7 @@ $('.get-coupon').click(function () {
 });
 /* 领所有券 */
 $('#get-all-coupon').click(function () {
-    var isApp = $(this).attr('href') !== 'javascript:;';
+    isApp = GetQueryString('app_version');
     getAllCoupon(activityId, isApp);
 });
@@ -213,7 +213,7 @@ function getNamedCoupon(activityId, couponId, isApp, userIsLogged)
 {
     $.ajax({
         type: 'POST',
-        url: !isApp ? '/cuxiao/coupon/getnamed' :  '/cuxiao/coupon/getnamed?app_version=1&uid=' + uid,
+        url: isApp && uid ? '/cuxiao/coupon/getnamed?uid=' + uid : '/cuxiao/coupon/getnamed',
         data: 'activityId=' + activityId + '&couponId=' + couponId,
         success: function (data) {
             setCookie('_Coupon' + activityId, null, {
@@ -236,7 +236,8 @@ function getNamedCoupon(activityId, couponId, isApp, userIsLogged)
                     //showTip('请先登录！');
                     //跳app登陆页面
                     if ($('.go-login').length <= 0) {
-                        var loginUrl = location.href + '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' + location.href + '","param":{}},"requesturl":{"url":"'+ location.href +'"},"priority":"Y"}}';
+                        var href = location.href.split('?')[0];
+                        var loginUrl = href + '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' + href.replace(/\//g, '\\/') + '","param":{}},"requesturl":{"url":""},"priority":"N"}}';
                         console.log(loginUrl);
                         $('body').append('<a href=\'' + loginUrl + '\' ><span class="go-login"></span></a>');
                     }
--- a/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Coupon.php
View file @e71d876
+++ b/yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Coupon.php
View file @e71d876
@@ -7,7 +7,7 @@ use Api\Yohobuy;
 /**
  * 领券活动
- * 
+ *
  * @name Coupon
  * @package Cuxiao
  * @copyright yoho.inc
@@ -109,7 +109,7 @@ class CouponController extends HuodongAction
     /**
      * 女生的品牌领券
-     * 
+     *
      * 上线时间 2015/12/1
      */
     public function girlsbrandAction()
@@ -202,7 +202,7 @@ class CouponController extends HuodongAction
     /**
      * 潮童的品牌领券
-     * 
+     *
      * 上线时间 2015/12/1
      */
     public function kidsbrandAction()
@@ -250,7 +250,7 @@ class CouponController extends HuodongAction
     /**
      * 创意生活的品牌领券
-     * 
+     *
      * 上线时间 2015/12/1
      */
     public function lifestylebrandAction()
@@ -363,7 +363,7 @@ class CouponController extends HuodongAction
     /**
      * 女生的品牌领券
-     * 
+     *
      * 上线时间 2015/12/7
      */
     public function girlsbrand2Action()
@@ -425,8 +425,8 @@ class CouponController extends HuodongAction
     }
     /**
-     * 新客领券 
-     * 
+     * 新客领券
+     *
      * 上线时间2015/12/2
      */
     public function newuserAction()
@@ -519,7 +519,7 @@ class CouponController extends HuodongAction
             'url_1026' => 'http://list.m.yohobuy.com/?msort=6&misort=45&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"冬靴"}}'
         ));
     }
-    
+
      /**
      * 新客领券（第三波）2016年1月7号上线
      */
@@ -567,7 +567,7 @@ class CouponController extends HuodongAction
 ////            'url_4' => 'http://list.m.yohobuy.com/?msort=3,4&title=下装&openby:yohobuy={"action":"go.list","params":{"msort":"3,4","title":"下装"}}',
 ////            'url_3' => 'http://list.m.yohobuy.com/?msort=7,8&title=包配&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
 ////            'url_6' => 'http://list.m.yohobuy.com/?msort=1,3,6&misort=11,28,12,46&title=反季&openby:yohobuy={"action":"go.list","params":{"msort":"1,3,6","misort":"11,28,12,46","title":"反季"}}',
-//            
+//
 //            'url_1' => 'http://list.m.yohobuy.com/?msort=1&misort=18,20,21,22&title=冬装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22","title":"冬装"}}',
 //            'url_2' => 'http://list.m.yohobuy.com/?msort=1&misort=21,22,226&title=春装外套&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22","title":"春装外套"}}',
 //            'url_3' => 'http://list.m.yohobuy.com/?msort=6&misort=45&title=靴子&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"靴子"}}',
@@ -576,7 +576,7 @@ class CouponController extends HuodongAction
 //            'url_6' => 'http://list.m.yohobuy.com/?msort=1&misort=16,257&title=春装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"16,257","title":"春装"}}',
 //            'url_7' => 'http://list.m.yohobuy.com/?msort=1,3,6&misort=11,28,12,46&title=夏装&openby:yohobuy={"action":"go.list","params":{"msort":"1,3,6","misort":"11,28,12,46","title":"夏装"}}',
 //        ));
-        
+
         // 判断是否是应用访问, 拼接APP需要的URL参数
         $isApp = null !== $this->get('app_version');
         $isAppLogged = true;
@@ -623,7 +623,7 @@ class CouponController extends HuodongAction
             'url_7' => 'http://list.m.yohobuy.com/?msort=1,3,6&misort=11,28,12,46&title=夏装&openby:yohobuy={"action":"go.list","params":{"msort":"1,3,6","misort":"11,28,12,46","title":"夏装"}}',
         ));
     }
-    
+
     /**
      * 新客领券（第4波）2016年3月14号上线
      */
@@ -743,7 +743,7 @@ class CouponController extends HuodongAction
         } else {
             $isLogged = $this->getUid();
         }
-        $urlNewuser = Helpers::url('/cuxiao/coupon/newuser6');
+        $urlNewuser = Helpers::url('/cuxiao/coupon/newuser5');
         $urlYohope = Helpers::url('/cuxiao/coupon/yohope');
         $urlHelp = Helpers::url('/cuxiao/coupon/help');
         $urlMycoupon = Helpers::url('/home/coupons', null, 'default');
@@ -783,7 +783,7 @@ class CouponController extends HuodongAction
     /**
      * 新客领券YOHOPE
-     * 
+     *
      * 上线时间2015/12/2
      */
     public function yohopeAction()
@@ -820,8 +820,8 @@ class CouponController extends HuodongAction
     }
     /**
-     * 新客领券 - 如何使用优惠券帮助页 
-     * 
+     * 新客领券 - 如何使用优惠券帮助页
+     *
      * 上线时间2015/12/2
      */
     public function helpAction()
@@ -830,10 +830,10 @@ class CouponController extends HuodongAction
             'staticTitle' => '如何使用优惠券'
         ));
     }
-    
+
     /**
      * Final Sale 领券活动
-     * 
+     *
      * 上线时间2016/01/12
      */
     public function finalAction()
@@ -844,7 +844,7 @@ class CouponController extends HuodongAction
             //未登录的用户访问，跳转到登录页面。并且在登陆后跳转回本页面
             $this->go(Helpers::url('/signin.html', array('refer' => Helpers::url('/cuxiao/coupon/final')), 'default'));
         }
-        
+
         // 该变量用来控制和显示页面的弹出提示
         $showPopupFlag = '0';
@@ -883,10 +883,10 @@ class CouponController extends HuodongAction
             'downAppUrl' => 'http://www.yohoshow.com/about/index/yohobuyqr',
         ));
     }
-    
+
     /**
      * Final Sale 领券活动第二波
-     * 
+     *
      * 上线时间2016/01/25
      */
     public function final2Action()
@@ -897,7 +897,7 @@ class CouponController extends HuodongAction
             //未登录的用户访问，跳转到登录页面。并且在登陆后跳转回本页面
             $this->go(Helpers::url('/signin.html', array('refer' => Helpers::url('/cuxiao/coupon/final2')), 'default'));
         }
-        
+
         // 该变量用来控制和显示页面的弹出提示
         $showPopupFlag = '0';
@@ -936,11 +936,11 @@ class CouponController extends HuodongAction
             'downAppUrl' => 'http://www.yohoshow.com/about/index/yohobuyqr',
         ));
     }
-          
+
     /**
      * 领取指定的优惠券
-     * 
+     *
      * @param int activityId 活动ID
      * @param int couponId 优惠券ID
      * @return json
@@ -964,9 +964,14 @@ class CouponController extends HuodongAction
             /* 判断用户是否登录 */
             $uid = $this->getSession(self::SESSION_UID);
+
             if (!$uid) {
                 $uid = $this->getUid();
                 if (!$uid) {
+                    $uid = $this->get('uid'); // session 获取不到 UID，直接获取查询字符串的 uid, 严重问题，不安全，需要修复
+                }
+
+                if (empty($uid)) {
                     $result['code'] = 400;
                     $result['message'] = '请先登录';
                     $result['data'] = Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', '/')), 'default');
@@ -983,7 +988,7 @@ class CouponController extends HuodongAction
     /**
      * 领取所有的优惠券
-     * 
+     *
      * @param int activityId 活动ID
      * @return json
      */
@@ -1024,7 +1029,7 @@ class CouponController extends HuodongAction
     /**
      * 检查用户是否登录
-     * 
+     *
      * @return bool (false:表示未登录,true:表示已登录)
      */
     private function checkIsLogin()
@@ -1049,10 +1054,10 @@ class CouponController extends HuodongAction
         return false;
     }
-    
+
         /**
      * 检测登录状态
-     * 
+     *
      * @return int
      */
     private function getLoggedUid()
@@ -1071,7 +1076,7 @@ class CouponController extends HuodongAction
     /**
      * 发送站内信
-     * 
+     *
      * @param int $uid 用户ID
      */
     private function sendMessage($uid, $title, $content)
@@ -1085,7 +1090,7 @@ class CouponController extends HuodongAction
     /**
      * 根据环境来获取活动ID
-     * 
+     *
      * @return int
      */
     private function getActivityId()
@@ -1101,10 +1106,10 @@ class CouponController extends HuodongAction
                 return 89;
         }
     }
-    
+
     /**
      * 根据环境来获取活动ID
-     * 
+     *
      * @return int
      */
     private function getActivityId2()