fe / yoho-blk · Commits

Go to a project

Authored by 姜枫
Commit 4cf35b2886601f85c4b09961f0da8ba6cc6d93c2 2 parents 4d0e5f57 7b003eb8

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

Inline Side-by-side
Showing 14 changed files with 78 additions and 46 deletions
... ... @@ -7,7 +7,7 @@
<li>
<a data-key="{{key}}" href="{{brandDomain}}" target="_blank">
<img class="lazy" data-original="{{image brandIco 270 190}}">
<span>{{#if brandNameEn}}{{brandNameEn}}{{else}}{{brandNameCn}}{{/if}}</span>
<span>{{#if brandNameEn}}{{brandNameEn}}{{else}}{{brandName}}{{/if}}</span>
</a>
</li>
{{/each}}
... ...
... ... @@ -20,13 +20,13 @@
</div>
<div class="common-column special-border operation">
{{#if showPayButton}}
<div class="pay-operation">
<div class="pay-operation {{#unless showLeftTime}}marginhack{{/unless}}">
{{#if isOnlinePaid}}
{{#if showLeftTime}}
<span class="iconfont hide-when-invalid">&#xe606;</span><p class="left-time" data-left="{{payLefttime}}"></p>
{{/if}}
<a href="{{payUrl}}">
<span class="btn red hide-when-invalid">立即付款</span>
<span class="btn red hide-when-invalid ">立即付款</span>
</a>
{{/if}}
<p class="subtext cancel">取消订单</p>
... ... @@ -46,7 +46,7 @@
<p class="subtext express">物流进度</p>
{{/if}}
<div class="buy-operation{{#unless showBuyBtn}} hide{{/unless}}">
<div class="buy-operation{{#unless showBuyBtn}} hide{{/unless}}{{#unless showPayButton}} marginhack{{/unless}}">
<span class="btn black buy">再次购买</span>
<p class="subtext delete">删除订单</p>
</div>
... ...
... ... @@ -4,7 +4,7 @@
<div class="progress-text">
<span>验证身份</span>
<span class="gray-text">{{proTitle}}</span>
<span class="gray-text">完成</span>
<span class="gray-text pad66">完成</span>
</div>
{{#if isShowMobile}}
<div class="operate1">
... ...
{{> sign-header}}
<div class="login-page passport-page">
{{# passport}}
<form method='post' onsubmit='return false;'>
<ul>
<li class="clearfix">
<div class="title">登录 SIGN IN</div>
... ... @@ -51,8 +52,7 @@
<span class="iconfont">&#xe61d;</span>
<em></em>
</span>
<a id="login-btn" class="btn login-btn">登录</a>
<input type="submit" id="login-btn" class="btn login-btn" value='登录'/>
</li>
<li class="clearfix">
... ... @@ -93,5 +93,6 @@
</li>
</ul>
<input id="country-code-hide" name="countryCode" type="hidden" value="{{countryCode}}">
</form>
{{/ passport}}
</div>
... ...
... ... @@ -23,11 +23,8 @@ module.exports = {
cookieDomain: 'yohoblk.com',
domains: {
singleApi: 'http://192.168.102.31:8092/',
api: 'http://api-test2.yohops.com:9999/',
service: 'http://service-test2.yohops.com:9999/',
// api: 'http://api.yoho.yohoops.org/',
// service: 'http://service.yoho.yohoops.org/',
api: 'http://api.yoho.yohoops.org/',
service: 'http://service.yoho.yohoops.org/',
search: 'http://192.168.102.216:8080/yohosearch/'
},
useOneapm: false,
... ...
... ... @@ -245,8 +245,8 @@ a {
.body-mask {
position: fixed;
z-index: 100;
background: #1d1d1d;
opacity: 0.3;
background: #000;
opacity: 0.4;
top: 0;
left: 0;
}
... ...
... ... @@ -5,9 +5,9 @@
left: 50%;
min-height: 130px;
min-width: 420px;
background: #f8f8f8;
background: #ffffff;
z-index: 1001;
border: 1px solid #8f8f8f;
/*border: 1px solid #8f8f8f;*/
.close {
padding: 5px;
... ...
.goods-info {
width: 274px;
margin-right: 18px;
.thumb {
width: 100%;
height: 366px;
}
.desc {
text-align: center;
}
.name {
font-size: 14px;
line-height: 50px;
}
.price {
font-size: 16px;
font-weight: bold;
}
}
.goods-info {
width: 274px;
margin-right: 18px;
.thumb {
width: 100%;
height: 366px;
}
.desc {
text-align: center;
}
.name {
font-size: 14px;
line-height: 50px;
display: block;
margin-top: -2px;
}
.price {
font-size: 16px;
font-weight: bold;
display: block;
margin-top: -2px;
}
}
... ...
... ... @@ -73,7 +73,6 @@
.tag-bag {
padding-right: 6px;
margin-right: 8px;
font-weight: normal;
position: relative;
&:hover {
... ... @@ -114,6 +113,7 @@
width: 230px;
color: #1b1b1b;
font-size: 14px;
font-weight: normal;
padding: 20px 0;
margin-left: -86px;
line-height: 1.5;
... ... @@ -144,6 +144,7 @@
width: 370px;
padding: 18px;
border: 1px solid #eee;
font-weight: normal;
background: #fff;
position: absolute;
z-index: 50;
... ...
... ... @@ -212,7 +212,7 @@
.btn {
display: inline-block;
margin-bottom: 14px;
margin-bottom: 18px;
cursor: pointer;
&.black {
... ... @@ -220,6 +220,14 @@
}
}
.marginhack{
margin-top: -4px;
.black{
margin-top: 0;
}
}
p {
margin-bottom: $space;
line-height: 20px;
... ...
... ... @@ -22,13 +22,17 @@
background-repeat: no-repeat;
}
.progress-text {
margin-left: 48px;
margin-left: 62px;
span {
padding: 0 50px;
}
.gray-text {
color: #d3d3d3;
padding: 0 38px;
}
.pad66{
padding-left: 66px;
}
}
.operate1,
... ...
... ... @@ -55,6 +55,7 @@
height: $item-height;
width: $item-width;
line-height: @height;
border: none;
}
.captcha-component {
... ...
... ... @@ -58,9 +58,15 @@
text-align: center;
}
.trade-wrapper{
text-align: center;
}
.brand-name {
font-size: 24px;
font-weight: bold;
margin: 0 40px;
line-height: 1.3;
}
.name {
... ... @@ -88,12 +94,14 @@
}
.option-content {
width: 226px;
/*width: 226px;*/
margin: 0 auto;
padding: 40px 0 20px;
display: inline-block;
> p {
line-height: 50px;
text-align: left;
}
.title {
... ... @@ -102,17 +110,22 @@
}
.color-list {
width: 246px;
min-width: 226px;
max-width: 300px;
.color-item {
float: left;
margin-right: 20px;
margin-bottom: 10px;
&:last-child{
margin-right: 0;
}
}
}
.size-list {
width: 236px;
min-width: 226px;
max-width: 300px;
li {
height: 34px;
... ... @@ -125,6 +138,9 @@
border: 1px solid #f0f0f0;
font-weight: bold;
cursor: pointer;
&:last-child{
margin-right: 0;
}
}
.disable {
... ...
... ... @@ -117,7 +117,7 @@
.goods-info {
float: left;
width: 272px;
margin: 25px 10px;
margin: 26px 10px;
border-width: 1px;
.desc {
... ...