code review by fei.hong: do merge yang.yang and shaofeng.zhou fixes bugs codes

@@ -525,6 +525,58 @@ class CouponController extends HuodongAction
      */
     public function newuser3Action()
     {
+//        // 判断是否是应用访问, 拼接APP需要的URL参数
+//        $isApp = null !== $this->get('app_version');
+//        $isAppLogged = true;
+//        if ($isApp) {
+//            $isLogged = $this->get('uid') !== null;
+//            $isAppLogged = $this->checkIsLogin();
+//        } else {
+//            $isLogged = $this->getUid();
+//        }
+//        $urlNewuser = Helpers::url('/cuxiao/coupon/newuser3');
+//        $urlYohope = Helpers::url('/cuxiao/coupon/yohope');
+//        $urlHelp = Helpers::url('/cuxiao/coupon/help');
+//        $urlMycoupon = Helpers::url('/home/coupons', null, 'default');
+//        $urlEncode = strtr($urlNewuser, array('/' => '\\/'));
+//        $channel = $this->get('yh_channel', '1');
+//        switch (strval($channel)) {
+//            case '1':
+//                $gender = '1,3';
+//                break;
+//            case '2':
+//                $gender = '2,3';
+//                break;
+//            default:
+//                $gender = '1,2,3';
+//        }
+//        $url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}';
+//
+//        $this->_view->display('newuser3', array(
+//            'activityId' => 508, //498, //492, // 94活动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', // 标识是否登录
+//            'url_mycoupon' => $urlMycoupon . '?openby:yohobuy={"action":"go.coupon"}',
+//            'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}',
+//            'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
+//            'url_more' => $url,
+////            '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=6&misort=45&title=靴子&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"靴子"}}',
+////            'url_5' => 'http://list.m.yohobuy.com/?msort=1&misort=16,257&title=春装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"16,257","title":"春装"}}',
+////            '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":"靴子"}}',
+//            'url_4' => 'http://list.m.yohobuy.com/?msort=3,4&title=下装&openby:yohobuy={"action":"go.list","params":{"msort":"3,4","title":"下装"}}',
+//            'url_5' => '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&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;
@@ -534,7 +586,7 @@ class CouponController extends HuodongAction
         } else {
             $isLogged = $this->getUid();
         }
-        $urlNewuser = Helpers::url('/cuxiao/coupon/newuser3');
+        $urlNewuser = Helpers::url('/cuxiao/coupon/newuser4');
         $urlYohope = Helpers::url('/cuxiao/coupon/yohope');
         $urlHelp = Helpers::url('/cuxiao/coupon/help');
         $urlMycoupon = Helpers::url('/home/coupons', null, 'default');
@@ -552,8 +604,8 @@ class CouponController extends HuodongAction
         }
         $url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}';
 
-        $this->_view->display('newuser3', array(
-            'activityId' => 508, //498, //492, // 94活动ID
+        $this->_view->display('newuser4', array(
+            'activityId' => 536, //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', // 标识是否登录
@@ -561,19 +613,13 @@ class CouponController extends HuodongAction
             'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}',
             'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
             'url_more' => $url,
-//            '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=6&misort=45&title=靴子&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"靴子"}}',
-//            'url_5' => 'http://list.m.yohobuy.com/?msort=1&misort=16,257&title=春装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"16,257","title":"春装"}}',
-//            '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":"靴子"}}',
-            '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=1&misort=16,257&title=春装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"16,257","title":"春装"}}',
+            'url_4' => 'http://list.m.yohobuy.com/?msort=6&misort=48&title=时装鞋&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"48","title":"时装鞋"}}',
             'url_5' => '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&misort=16,257&title=春装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"16,257","title":"春装"}}',
+            'url_6' => 'http://list.m.yohobuy.com/?msort=3,4&title=下装&openby:yohobuy={"action":"go.list","params":{"msort":"3,4","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":"夏装"}}',
         ));
     }