Authored by biao

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

@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <div class="goods-wrapper"> 28 <div class="goods-wrapper">
29 <div class="goods"> 29 <div class="goods">
30 </div> 30 </div>
31 - <div class="goods-img-list"> 31 + <div class="goods-img-list clearfix">
32 </div> 32 </div>
33 </div> 33 </div>
34 </div> 34 </div>
@@ -94,8 +94,8 @@ if (isProduction) { @@ -94,8 +94,8 @@ if (isProduction) {
94 Object.assign(module.exports, { 94 Object.assign(module.exports, {
95 appName: 'www.yohoblk.com for test', 95 appName: 'www.yohoblk.com for test',
96 domains: { 96 domains: {
97 - api: 'http://api-test1.yohops.com:9999/',  
98 - service: 'http://service-test1.yohops.com:9999/', 97 + api: 'http://testapi.yoho.cn:28078/',
  98 + service: 'http://testservice.yoho.cn:28077/',
99 search: 'http://192.168.102.216:8080/yohosearch/' 99 search: 'http://192.168.102.216:8080/yohosearch/'
100 }, 100 },
101 useOneapm: true, 101 useOneapm: true,
@@ -342,12 +342,13 @@ @@ -342,12 +342,13 @@
342 } 342 }
343 343
344 .goods-img-list { 344 .goods-img-list {
345 - float: right;  
346 - margin: 2px 10px; 345 + margin: 2px 13px;
  346 + float: left;
347 347
348 .goods-img-col { 348 .goods-img-col {
349 display: inline-block; 349 display: inline-block;
350 vertical-align: top; 350 vertical-align: top;
  351 + width: 60px;
351 } 352 }
352 353
353 img { 354 img {