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 API_URL = 'http://test2.open.yohobuy.com/';
     const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
     const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
     const YOHOBUY_URL = 'http://www.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_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
     const API_URL_PRODUCTDETAIL = 'http://192.168.102.209:18080/yoho-product/'; // 商品详情页
     const API_URL_PRODUCTDETAIL = 'http://192.168.102.209:18080/yoho-product/'; // 商品详情页
 
 

@@ -31,7 +31,7 @@
 		height: 180rem / $pxConvertRem;
 		height: 180rem / $pxConvertRem;
 		overflow: hidden;
 		overflow: hidden;
 		margin: 20rem / $pxConvertRem auto;
 		margin: 20rem / $pxConvertRem auto;
-		background: url('../img/me/employ/employ.jpg') top center no-repeat;
+		background: image-url('me/employ/employ.jpg') top center no-repeat;
 		background-size: 100% 100%;
 		background-size: 100% 100%;
 		color: #fff;
 		color: #fff;
 		span{
 		span{

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

 {{> layout/header}}
 {{> layout/header}}
     <div class="personal-details">
     <div class="personal-details">
         <ul>
         <ul>
-            <li><span>头像</span><span><i class="head-portrait"><span class="user-avatar" data-avatar="{{ head_ico }}"></span></i></span></li>
-            <li><span>昵称</span><span>{{ username }}</span></li>
+            <li><span>头像</span><span><i class="head-portrait"><img class="user-avatar" src="{{ head_ico }}"></i></span></li>
+            <li><span>昵称</span><span>{{ nickname }}</span></li>
             <li><span>性别</span><span>{{ gender }}</span></li>
             <li><span>性别</span><span>{{ gender }}</span></li>
             <li><span>生日</span><span>{{ birthday }}</span></li>
             <li><span>生日</span><span>{{ birthday }}</span></li>
             <li><span>会员等级</span>
             <li><span>会员等级</span>

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

@@ -162,9 +162,9 @@ class UserModel
 				$product['fav_id'] = $val['product_id'];
 				$product['fav_id'] = $val['product_id'];
 				$product['imgUrl'] = $val['image'];
 				$product['imgUrl'] = $val['image'];
 				$product['title'] = $val['product_name'];
 				$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']);
 				$product['sellOut'] = (bool)($val['price_down']);
 
 
 				$result[] = $product;
 				$result[] = $product;