do cuxiao new user coupon feature coupon/hf

@@ -27,7 +27,6 @@ class HomeController extends AbstractAction
         // 检查用户是否登录, 未登录则跳转到登录页
 
         // @todo 为了方便测试，支持传uid参数
-<<<<<<< HEAD
         $uid = $this->getUid();
 //        if (!$uid) {
 //            $uid = $this->_uid = $this->get('uid', 8826435); //$this->getUid(true);
@@ -36,16 +35,6 @@ class HomeController extends AbstractAction
         $action = $this->getRequest()->getActionName();
         if (!$uid && $action !== 'index') {
             $this->go(Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', '/'))));
-=======
-	    $this->_uid = $this->getUid();
-        /*if (!$uid) {
-            $uid = $this->_uid = $this->get('uid', 8826435); //$this->getUid(true);
-        }*/
-        
-        $action = $this->getRequest()->getActionName();
-        if (!$this->_uid && $action !== 'index' && !$this->isAjax()) {
-            $this->go(Helpers::url('/signin.html'));
->>>>>>> 1ec902b4c071264e1feadc6a5e4fe2ea287ed658
         }
 
         parent::init();
@@ -64,12 +53,7 @@ class HomeController extends AbstractAction
             'showDownloadApp' => true,
             'pageFooter' => true
         );
-<<<<<<< HEAD
-        $uid = $this->getUid();
-        if ($uid) {
-=======
         if ($this->_uid) {
->>>>>>> 1ec902b4c071264e1feadc6a5e4fe2ea287ed658
             $data['isLogin'] = true;
             $data += UserModel::getUserProfileData($this->_uid);
             $data += UserModel::getInfoNumData($this->_uid);