fe / YOHOBUYPC · Commits

Go to a project

Authored by 黄涛
Commit be77f262811ee60c209c8589d491dc52a22ee03a 2 parents 6c4cd7da f0540fbf

Merge branch 'feature/colorLength' into 'release/5.3' 

厂家颜色

厂家颜色  接口参数

See merge request !7
Inline Side-by-side
Showing 17 changed files with 36 additions and 22 deletions
... ... @@ -822,7 +822,7 @@ class HelperSearch
$color['color_value'] = empty($color['color_value']) ? '' : Helpers::getUrlSafe($color['color_value']);
$result[] = array(
'name' => $color['color_name'],
'name' => $color['factory_color_name'],
'rgb' => empty($color['color_value']) ? '#' . $color['color_code'] : "url({$color['color_value']})",
'href' => self::buildUrl(array_merge($params, array(
'color' => $color['color_id']
... ... @@ -845,7 +845,7 @@ class HelperSearch
$checked = true;
}
$result[] = array(
'name' => $v['color_name'],
'name' => $v['factory_color_name'],
'rgb' => empty($v['color_value']) ? '#' . $v['color_code'] : "url({$v['color_value']})",
'href' => self::buildUrl(array_merge($params, array(
'color' => $v['color_id']
... ...
... ... @@ -707,7 +707,8 @@ class Helpers
$oneGoods['isChecked'] = $value['selected'] === 'Y';
$oneGoods['productTitle'] = $value['product_name'];
$oneGoods['imgCover'] = !empty($value['goods_images']) ? Images::getImageUrl($value['goods_images'], 60, 60) : '';
$oneGoods['productColor'] = $value['color_name'];
$oneGoods['productColor'] = $value['factory_goods_name'];
$oneGoods['productSize'] = $value['size_name'];
$oneGoods['productPrice'] = self::transPrice($value['last_vip_price']); //self::transPrice($value['real_price']);
$oneGoods['productNum'] = $value['buy_number'];
... ...
... ... @@ -29,7 +29,7 @@
      《YOHO!潮流志》、《YOHO!GIRL》为YOHO!旗下在国内潮流领域影响力的杂志媒体。《YOHO!潮流志》2005 年10月创刊。他是国内第一本完全原创版权的，提供潮流和 lifestyle 资讯，属于年轻人的潮流时尚半月刊，通过正规发行渠道（报刊亭、连锁商超等）发行至全国各大中城市，深受全国年轻人的喜爱。设计给国内年轻女性的中高端时装月刊《YOHO!GIRL》，2013年3月正式创刊，在香港、大陆以及日本东京茑屋地区同步发行。以大量独家资讯加上独特的编采手法，改变读者的阅读习惯，扩阔大家在时装、美容、设计、生活、次文化等各方面的视野。深入结构品牌背后的哲学和时装趋势，带领各读者一探最新时尚。
<br/>
<br/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;作为中国影响力最大、权威性最高、发行量最广的潮流杂志电子平台， “Yoho!Now”于 iOS 和 Android平台触亮全球潮流资讯，“Yoho!Now”7*24h 无休供应时装、运动、设计、科技、美容、家居、趣闻等严选潮流营养，并于每周发布特别线上专题，与读者Play and Learn。《YOHO!潮流志》和《YOHO!GIRL》亦于各自App內每周上架新鲜线上周刊，打包纸质版内容精华，汇通YOHO!潮流矩阵。
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;YOHO!作为中国权威的潮流杂志电子平台，无论是影响力或发行量均名列前茅。“Yoho!Now”于 iOS 和 Android平台触亮全球潮流资讯，“Yoho!Now”7*24h 无休供应时装、运动、设计、科技、美容、家居、趣闻等严选潮流营养，并于每周发布特别线上专题，与读者Play and Learn。《YOHO!潮流志》和《YOHO!GIRL》亦于各自App內每周上架新鲜线上周刊，打包纸质版内容精华，汇通YOHO!潮流矩阵。
<br/>
<br/>
2、关于“Yoho!Buy有货”
... ...
... ... @@ -102,7 +102,7 @@
</a>
<p class="pay-pro-info">
<a href="{{link}}" target="_blank">{{productTitle}}</a>
<span>颜色：{{productColor}} 尺码：{{productSize}}</span>
<span><b title="{{productColor}}">颜色：{{productColor}}<b> 尺码：{{productSize}}</span>
<span class="presell">上市期：{{preSellDate}}</span>
</p>
</div>
... ... @@ -154,7 +154,7 @@
</a>
<p class="pay-pro-info">
<a href="{{link}}" target="_blank">{{productTitle}}<br /></a>
<span><b title="{{productColor}}">颜色：{{productColor}}</b> 尺码：{{productSize}}</span>
<span><b title="{{productColor}}">颜色：{{productColor}}</b> 尺码：{{productSize}}</span>
</p>
</div>
</td>
... ...
... ... @@ -45,7 +45,7 @@
</td>
<td class="return-goods-info">
<a href="{{href}}">{{name}}</a>
<span>颜色：{{color}} 尺码：{{size}}</span>
<span><b title="{{color}}">颜色：{{color}}</b> 尺码：{{size}}</span>
{{#if specialNoticeBo}}
<div class="special-tip">
<span>{{specialNoticeBo.title}} <i class="doubt"></i></span>
... ... @@ -178,7 +178,7 @@
</td>
<td class="return-goods-info">
<a href="{{href}}">{{name}}</a>
<span>颜色：{{color}} 尺码：{{size}}</span>
<span><b title="{{color}}">颜色：{{color}}</b> 尺码：{{size}}</span>
{{#if specialNoticeBo}}
<div class="special-tip">
<span>{{specialNoticeBo.title}} <i class="doubt"></i></span>
... ...
{
"name": "web-yohobuy",
"version": "5.2.2",
"version": "5.2.4",
"description": "web yohobuy static",
"keywords": [],
"homepage": "",
... ...
... ... @@ -97,6 +97,15 @@
}
span {
color: #999;
b {
display: inline-block;
font-weight: 400;
max-width: 120px;
vertical-align: middle;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
.special-tip{
... ...
... ... @@ -77,7 +77,7 @@
display: inline-block;
vertical-align: bottom;
font-weight: 400;
max-width: 130px;
max-width: 110px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
... ...
... ... @@ -59,7 +59,7 @@ class OrderModel
$goods[$gokey]['href'] = Helpers::getUrlBySkc($goval['product_id'], $goval['goods_id'], $goval['cn_alphabet']);
$goods[$gokey]['thumb'] = (isset($goval['goods_image']) && $goval['goods_image']) ? str_replace('quality/80', 'quality/90', Images::getImageUrl($goval['goods_image'], 100, 100)) : '';
$goods[$gokey]['name'] = $goval['product_name'];
$goods[$gokey]['color'] = $goval['color_name'];
$goods[$gokey]['color'] = $goval['factory_color_name'];
$goods[$gokey]['size'] = ($goval['product_skn'] * 1 === EXHIBITION_TICKET) ? '' : $goval['size_name'];
$goods[$gokey]['price'] = $goval['goods_price'];
$buyNum = intval($goval['buy_number']);
... ... @@ -226,7 +226,7 @@ class OrderModel
$detail['goods'][$gok]['url'] = Helpers::getUrlBySkc($gov['product_id'], $gov['goods_id'], $gov['cn_alphabet']);
$detail['goods'][$gok]['img'] = Images::getImageUrl($gov['goods_image'], 60, 60);
$detail['goods'][$gok]['name'] = $gov['product_name'];
$detail['goods'][$gok]['color'] = $gov['color_name'];
$detail['goods'][$gok]['color'] = $gov['factory_color_name'];
$detail['goods'][$gok]['size'] = $gov['size_name'];
$detail['goods'][$gok]['price'] = $gov['goods_price'];
$detail['goods'][$gok]['coin'] = $gov['yoho_give_coin'];
... ...
... ... @@ -202,7 +202,7 @@ class ReturnsModel
$result[$key]['href'] = Helpers::getUrlBySkc($value['product_id'], $value['goods_id'], $cnAlphabet);
$result[$key]['thumb'] = Helpers::getImageUrl($value['goods_image'], 60, 60);
$result[$key]['name'] = $value['product_name'];
$result[$key]['color'] = $value['color_name'];
$result[$key]['color'] = $value['factory_color_name'];
$result[$key]['size'] = $value['size_name'];
}
... ... @@ -306,7 +306,7 @@ class ReturnsModel
$result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_id'], $value['goods_id'], $cnAlphabet);
$result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'], 60, 60);
$result['goods'][$key]['name'] = $value['product_name'];
$result['goods'][$key]['color'] = $value['color_name'];
$result['goods'][$key]['color'] = $value['factory_color_name'];
$result['goods'][$key]['size'] = $value['size_name'];
$result['goods'][$key]['price'] = $value['last_price'];
$result['goods'][$key]['skn'] = $value['product_skn'];
... ... @@ -401,7 +401,7 @@ class ReturnsModel
$result['goods'][$key]['href'] = Helpers::getUrlBySkc($value['product_id'], $value['goods_id'], $cnAlphabet);
$result['goods'][$key]['thumb'] = Helpers::getImageUrl($value['goods_image'], 60, 60);
$result['goods'][$key]['name'] = $value['product_name'];
$result['goods'][$key]['color'] = $value['color_name'];
$result['goods'][$key]['color'] = $value['factory_color_name'];
$result['goods'][$key]['size'] = $value['size_name'];
$result['goods'][$key]['price'] = $value['last_price'];
$result['goods'][$key]['skn'] = $value['product_skn'];
... ... @@ -465,10 +465,14 @@ class ReturnsModel
foreach ($v['size_list'] as $k1 => $v1) {//遍历颜色得到每个尺码
$num += $v1['storage_number'];//将商品颜色对应尺码下的每个商品的库存相加
if ($v1['storage_number'] > 0) {//当某个尺码下有库存时，将该颜色及其对应的尺码加入该商品选项下
$result['goods'][$key]['colorSize'][$k]['color'] = $v['color_name'];
$result['goods'][$key]['colorSize'][$k]['color'] = $v['factory_goods_name'];
$result['goods'][$key]['colorSize'][$k]['colorId'] = $v['color_id'];
$result['goods'][$key]['colorSize'][$k]['goodsId'] = $v['goods_id'];
$result['goods'][$key]['colorSize'][$k]['sizeList'][] = $v1;
if($result['goods'][$key]['colorSize'][$k]['color'].length>10){
$result['goods'][$key]['colorSize'][$k]['color'] = substr($result['goods'][$key]['colorSize'][$k]['color'],0,10) + '...';
}
}
}
}
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.2.2"
application.version = "5.2.4"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.2.2"
application.version = "5.2.4"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.2.2"
application.version = "5.2.4"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets/web"
; 应用的版本号
application.version = "5.2.2"
application.version = "5.2.4"
; 网站SEO信息
application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
... ...
... ... @@ -14,8 +14,8 @@ define('EXHIBITION_TICKET', 51335912);//展览票skn
define('USE_INTER_FACE_SHUNT', false);//分流开关
define('API_URL', 'http://api-test3.yohops.com:9999/');
define('SERVICE_URL', 'http://service-test3.yohops.com:9999/');
define('API_URL', getenv('TEST_API') ? getenv('TEST_API') : 'http://api-test3.yohops.com:9999/');
define('SERVICE_URL', getenv('TEST_SERVICE') ? getenv('TEST_SERVICE') : 'http://service-test3.yohops.com:9999/');
define('YOHOBUY_URL', 'http://www.yohobuy.com/');
define('SERVICE_NOTIFY', 'http://testservice.yoho.cn:28077/');
define('API_OLD', 'http://test2.open.yohobuy.com/');
... ...