fe / yoho-blk · Commits

Go to a project

Authored by 姜枫
Commit c0d0128a30639f7269fc74f510c918980082f978 2 parents 62deb03e 33e2e3fa

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

Inline Side-by-side
Showing 9 changed files with 33 additions and 17 deletions
{{# classicBrands}}
<div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
<a href="{{url}}" target="_blank">
{{# big}}
<img class="big-img" src="{{image src 565 340}}" alt="big-img">
<a href="{{url}}" target="_blank">
<img class="big-img" src="{{image src 565 340}}">
</a>
{{/ big}}
{{# small}}
<img class="small-img {{#if @first}}first{{/if}}" src="{{image src 281 285}}" alt="big-img">
{{/ small}}
<a href="{{url}}" target="_blank">
<img class="small-img {{#if @first}}first{{/if}}" src="{{image src 281 285}}">
</a>
{{/ small}}
</div>
{{/ classicBrands}}
... ...
... ... @@ -15,9 +15,11 @@
{{/each}}
</ul>
{{#banner}}
{{#if image}}
<a href="{{url}}">
<img class="banner-img" data-original="{{image banner 150 120}}">
</a>
{{/if}}
{{/banner}}
</div>
... ...
... ... @@ -23,7 +23,7 @@ module.exports = {
},
cookieDomain: 'yohoblk.com',
domains: {
singleApi: 'http://192.168.102.31:8092/brower',
singleApi: 'http://192.168.102.31:8092/',
api: 'http://api-test1.yohops.com:9999/',
service: 'http://service-test1.yohops.com:9999/',
search: 'http://192.168.102.216:8080/yohosearch/'
... ... @@ -111,7 +111,7 @@ if (isProduction) {
Object.assign(module.exports, {
appName: 'www.yohoblk.com for test',
domains: {
singleApi: process.env.TEST_SINGLEAPI || 'http://192.168.102.31:8092/brower',
singleApi: process.env.TEST_SINGLEAPI || 'http://192.168.102.31:8092/',
api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/'
... ...
No preview for this file type
... ... @@ -78,15 +78,16 @@
text-align: center;
color: #222;
cursor: pointer;
font-size: 14px;
}
}
.brands-list {
dt {
height: 70px;
line-height: 70px;
height: 58px;
line-height: 58px;
font-weight: bold;
font-size: 24px;
font-size: 16px;
}
dd {
... ... @@ -102,10 +103,6 @@
margin-top: 20px;
}
/* li:nth-child(4n) {
margin-right: 0;
}*/
li:nth-child(-n+4) {
margin-top: 0;
}
... ...
... ... @@ -231,7 +231,7 @@
}
.brands {
width: 960px;
width: 975px;
padding: 30px 0 0 30px;
overflow: hidden;
}
... ...
... ... @@ -13,6 +13,7 @@
text-align: center;
background: #fff;
}
.nav {
li {
cursor: pointer;
... ... @@ -26,8 +27,10 @@
height: 14px;
width: 14px;
background-repeat: no-repeat;
background-image: resolve('help/plus.png');
background-image: resolve("help/plus.png");
background-size: 14px 14px;
position: relative;
top: 3px;
}
.mult {
... ... @@ -51,6 +54,7 @@
width: 990px;
padding: 35px 30px;
background-color: #fff;
font-size: 14px;
.normal-data,
.step-data {
... ... @@ -61,13 +65,14 @@
.big-title {
font-size: 20px;
}
.step-title {
font-weight: bolder;
padding-bottom: 5px;
}
.step {
list-style: disc;
}
}
}
... ...
... ... @@ -125,6 +125,15 @@
padding: 5px;
margin-top: 8px;
}
.consignee {
display: block;
float: left;
max-width: 140px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.address-chosed {
... ...
... ... @@ -10,7 +10,7 @@
</p>
<p class="name-and-phone">
{{consignee}}
<em class="consignee">{{consignee}}</em>
<span class="phone bold">{{mobile}}</span>
</p>
... ...