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

 .my-page {
 .my-page {
+    color: #444;
     background: #f0f0f0;
     background: #f0f0f0;
 
 
+    a {
+        color: #444;
+    }
+
     .user-info {
     .user-info {
         display: block;
         display: block;
         position: relative;
         position: relative;
@@ -136,7 +141,7 @@
             }
             }
 
 
             .iconfont {
             .iconfont {
-                font-size: pxToRem(60px);
+                font-size: pxToRem(40px);
             }
             }
         }
         }
     }
     }

@@ -58,6 +58,7 @@
                 float: right;
                 float: right;
                 margin-right: rem(30);
                 margin-right: rem(30);
                 color: #ccc;
                 color: #ccc;
+                font-size: rem(32);
             }
             }
 
 
             &:last-child {
             &:last-child {
@@ -87,6 +88,7 @@
         .icon-yoho-enter {
         .icon-yoho-enter {
             color: #ccc;
             color: #ccc;
             float: right;
             float: right;
+            font-size: rem(32);
         }
         }
 
 
         .connect-item {
         .connect-item {

@@ -12,7 +12,7 @@
                     <p class="good-tag sale-tag">SALE</p>
                     <p class="good-tag sale-tag">SALE</p>
                 {{/ is_discount}}
                 {{/ is_discount}}
                 {{# is_yohoood}}
                 {{# is_yohoood}}
-                    <div class="good-tag yohood-tag"></div>
+	                <p class="good-tag new-festival-tag">新品节</p>
                 {{/ is_yohoood}}
                 {{/ is_yohoood}}
                 {{# is_limited}}
                 {{# is_limited}}
                     <p class="good-tag limit-tag">限量商品</p>
                     <p class="good-tag limit-tag">限量商品</p>

@@ -51,18 +51,35 @@ class HomeController extends AbstractAction
         );
         );
         $uid = $this->getUid();
         $uid = $this->getUid();
         if ($uid) {
         if ($uid) {
-            // 优选新品数据
-            $channel = Helpers::getChannelByCookie();
-            
+
             $data['isLogin'] = true;
             $data['isLogin'] = true;
             $data += UserModel::getUserProfileData($uid);
             $data += UserModel::getUserProfileData($uid);
             $data += UserModel::getInfoNumData($uid);
             $data += UserModel::getInfoNumData($uid);
-            $data['recommendForYou'] = UserModel::getPreferenceData($channel);
         }
         }
 
 
         $this->_view->display('index', $data);
         $this->_view->display('index', $data);
     }
     }
 
 
+	/**
+	 * 为您优选
+	 */
+	public function preferenceAction()
+	{
+		$result = array();
+
+		if ($this->isAjax()) {
+			// 优选新品数据
+			$channel = Helpers::getChannelByCookie();
+			$result = UserModel::getPreferenceData($channel);
+		}
+
+		if (empty($result)) {
+			echo ' ';
+		} else {
+			$this->_view->display('recommend-content', $result);
+		}
+	}
+
     /**
     /**
      * 用户收藏的商品
      * 用户收藏的商品
      */
      */