Authored by biao

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

... ... @@ -28,7 +28,7 @@
<div class="goods-wrapper">
<div class="goods">
</div>
<div class="goods-img-list">
<div class="goods-img-list clearfix">
</div>
</div>
</div>
... ...
... ... @@ -94,8 +94,8 @@ if (isProduction) {
Object.assign(module.exports, {
appName: 'www.yohoblk.com for test',
domains: {
api: 'http://api-test1.yohops.com:9999/',
service: 'http://service-test1.yohops.com:9999/',
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/',
search: 'http://192.168.102.216:8080/yohosearch/'
},
useOneapm: true,
... ...
... ... @@ -342,12 +342,13 @@
}
.goods-img-list {
float: right;
margin: 2px 10px;
margin: 2px 13px;
float: left;
.goods-img-col {
display: inline-block;
vertical-align: top;
width: 60px;
}
img {
... ...