fe / YOHOBUYPC · Commits

Go to a project

Authored by Lynnic
Commit e105ac7b68bd858c2672801f2def8465c1a2f477 2 parents 38e8d255 812176a5

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

Inline Side-by-side
Showing 5 changed files with 8 additions and 8 deletions
@@ -27,7 +27,7 @@ class Yohobuy @@ -27,7 +27,7 @@ class Yohobuy
27 const API_URL = 'http://test2.open.yohobuy.com/'; 27 const API_URL = 'http://test2.open.yohobuy.com/';
28 const SERVICE_URL = 'http://test.service.api.yohobuy.com/'; 28 const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
29 const YOHOBUY_URL = 'http://www.yohobuy.com/'; 29 const YOHOBUY_URL = 'http://www.yohobuy.com/';
30 - const API_URL_MYCENTER = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的个人中心接口URL 30 + const API_URL_MYCENTER = 'http://192.168.102.205:8081/api-gateway-web/'; // 我的个人中心接口URL
31 const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL 31 const API_URL_SHOPINGCART = 'http://192.168.102.213:8080/api-gateway-web/'; // 我的购物车接口URL
32 const API_URL_PRODUCTDETAIL = 'http://192.168.102.209:18080/yoho-product/'; // 商品详情页 32 const API_URL_PRODUCTDETAIL = 'http://192.168.102.209:18080/yoho-product/'; // 商品详情页
33 33
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 height: 180rem / $pxConvertRem; 31 height: 180rem / $pxConvertRem;
32 overflow: hidden; 32 overflow: hidden;
33 margin: 20rem / $pxConvertRem auto; 33 margin: 20rem / $pxConvertRem auto;
34 - background: url('../img/me/employ/employ.jpg') top center no-repeat; 34 + background: image-url('me/employ/employ.jpg') top center no-repeat;
35 background-size: 100% 100%; 35 background-size: 100% 100%;
36 color: #fff; 36 color: #fff;
37 span{ 37 span{
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="personal-details"> 2 <div class="personal-details">
3 <ul> 3 <ul>
4 - <li><span>头像</span><span><i class="head-portrait"><span class="user-avatar" data-avatar="{{ head_ico }}"></span></i></span></li>  
5 - <li><span>昵称</span><span>{{ username }}</span></li> 4 + <li><span>头像</span><span><i class="head-portrait"><img class="user-avatar" src="{{ head_ico }}"></i></span></li>
  5 + <li><span>昵称</span><span>{{ nickname }}</span></li>
6 <li><span>性别</span><span>{{ gender }}</span></li> 6 <li><span>性别</span><span>{{ gender }}</span></li>
7 <li><span>生日</span><span>{{ birthday }}</span></li> 7 <li><span>生日</span><span>{{ birthday }}</span></li>
8 <li><span>会员等级</span> 8 <li><span>会员等级</span>
@@ -127,7 +127,7 @@ class HomeController extends AbstractAction @@ -127,7 +127,7 @@ class HomeController extends AbstractAction
127 127
128 if ($this->isAjax()) { 128 if ($this->isAjax()) {
129 $uid = $this->getUid(); 129 $uid = $this->getUid();
130 - $fav_id = $this->post('fav_id', 0); 130 + $fav_id = $this->post('id', 0);
131 131
132 $result = UserModel::favoriteDelete($uid, $fav_id); 132 $result = UserModel::favoriteDelete($uid, $fav_id);
133 } 133 }
@@ -162,9 +162,9 @@ class UserModel @@ -162,9 +162,9 @@ class UserModel
162 $product['fav_id'] = $val['product_id']; 162 $product['fav_id'] = $val['product_id'];
163 $product['imgUrl'] = $val['image']; 163 $product['imgUrl'] = $val['image'];
164 $product['title'] = $val['product_name']; 164 $product['title'] = $val['product_name'];
165 - $product['price'] = '￥'.$val['market_price'];  
166 - $product['discountPrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '￥'.$val['sales_price'] : false;  
167 - $product['savePrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '￥'.($val['market_price'] - $val['sales_price']) : false; 165 + $product['price'] = !empty($val['market_price']) ? '￥'.$val['market_price'] . '.00' : 0;
  166 + $product['discountPrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '￥' . $val['sales_price'] . '.00' : false;
  167 + $product['savePrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '￥'.($val['market_price'] - $val['sales_price']) . '.00' : false;
168 $product['sellOut'] = (bool)($val['price_down']); 168 $product['sellOut'] = (bool)($val['price_down']);
169 169
170 $result[] = $product; 170 $result[] = $product;