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

@@ -27,7 +27,7 @@ class Yohobuy
     const API_URL = 'http://test2.open.yohobuy.com/';
     const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
-    const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL
+    const API_URL_MYCENTER = 'http://192.168.102.205:8081/api-gateway-web/'; // 我的个人中心接口URL
     const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
     const API_URL_PRODUCTDETAIL = 'http://192.168.102.209:18080/yoho-product/'; // 商品详情页
 

@@ -252,20 +252,22 @@ $basicBtnC:#eb0313;
                     width: pxToRem(53px);
                     height: pxToRem(32px);
             }
-            &:nth-child(3)   .vip-img{
-                background: image-url('product/silver.png') no-repeat;
-            }
-            &:nth-child(2)  .vip-img{
-                background: image-url('product/golden.png') no-repeat;
+            &:nth-child(3) {
+                text-align: right;
+                .vip-img{
+                    background: image-url('product/silver.png') no-repeat;
+                }
             }
-            &:nth-child(1) .vip-img{
-                background: image-url('product/platinum.png') no-repeat;
+            &:nth-child(2) {
+                .vip-img{
+                    background: image-url('product/golden.png') no-repeat;
+                }
             }
-            &:first-child {
+            &:nth-child(1) { 
                 text-align: left;
-            }
-            &:last-child {
-                text-align: right;
+                .vip-img{
+                    background: image-url('product/platinum.png') no-repeat;
+                }
             }
         }
     }

@@ -127,7 +127,7 @@ class HomeController extends AbstractAction
 
         if ($this->isAjax()) {
             $uid = $this->getUid();
-            $fav_id = $this->post('fav_id', 0);
+            $fav_id = $this->post('id', 0);
 
             $result = UserModel::favoriteDelete($uid, $fav_id);
         }

@@ -162,9 +162,9 @@ class UserModel
 				$product['fav_id'] = $val['product_id'];
 				$product['imgUrl'] = $val['image'];
 				$product['title'] = $val['product_name'];
-				$product['price'] = '￥'.$val['market_price'];
-				$product['discountPrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '￥'.$val['sales_price'] : false;
-				$product['savePrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '￥'.($val['market_price'] - $val['sales_price']) : false;
+				$product['price'] = !empty($val['market_price']) ? '￥'.$val['market_price'] . '.00' : 0;
+				$product['discountPrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '￥' . $val['sales_price'] . '.00' : false;
+				$product['savePrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '￥'.($val['market_price'] - $val['sales_price']) . '.00' : false;
 				$product['sellOut'] = (bool)($val['price_down']);
 
 				$result[] = $product;