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 @@ @@ -7,7 +7,7 @@
7 <li> 7 <li>
8 <a data-key="{{key}}" href="{{brandDomain}}" target="_blank"> 8 <a data-key="{{key}}" href="{{brandDomain}}" target="_blank">
9 <img class="lazy" data-original="{{image brandIco 270 190}}"> 9 <img class="lazy" data-original="{{image brandIco 270 190}}">
10 - <span>{{#if brandNameEn}}{{brandNameEn}}{{else}}{{brandNameCn}}{{/if}}</span> 10 + <span>{{#if brandNameEn}}{{brandNameEn}}{{else}}{{brandName}}{{/if}}</span>
11 </a> 11 </a>
12 </li> 12 </li>
13 {{/each}} 13 {{/each}}
@@ -20,13 +20,13 @@ @@ -20,13 +20,13 @@
20 </div> 20 </div>
21 <div class="common-column special-border operation"> 21 <div class="common-column special-border operation">
22 {{#if showPayButton}} 22 {{#if showPayButton}}
23 - <div class="pay-operation"> 23 + <div class="pay-operation {{#unless showLeftTime}}marginhack{{/unless}}">
24 {{#if isOnlinePaid}} 24 {{#if isOnlinePaid}}
25 {{#if showLeftTime}} 25 {{#if showLeftTime}}
26 <span class="iconfont hide-when-invalid">&#xe606;</span><p class="left-time" data-left="{{payLefttime}}"></p> 26 <span class="iconfont hide-when-invalid">&#xe606;</span><p class="left-time" data-left="{{payLefttime}}"></p>
27 {{/if}} 27 {{/if}}
28 <a href="{{payUrl}}"> 28 <a href="{{payUrl}}">
29 - <span class="btn red hide-when-invalid">立即付款</span> 29 + <span class="btn red hide-when-invalid ">立即付款</span>
30 </a> 30 </a>
31 {{/if}} 31 {{/if}}
32 <p class="subtext cancel">取消订单</p> 32 <p class="subtext cancel">取消订单</p>
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 <p class="subtext express">物流进度</p> 46 <p class="subtext express">物流进度</p>
47 {{/if}} 47 {{/if}}
48 48
49 - <div class="buy-operation{{#unless showBuyBtn}} hide{{/unless}}"> 49 + <div class="buy-operation{{#unless showBuyBtn}} hide{{/unless}}{{#unless showPayButton}} marginhack{{/unless}}">
50 <span class="btn black buy">再次购买</span> 50 <span class="btn black buy">再次购买</span>
51 <p class="subtext delete">删除订单</p> 51 <p class="subtext delete">删除订单</p>
52 </div> 52 </div>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="progress-text"> 4 <div class="progress-text">
5 <span>验证身份</span> 5 <span>验证身份</span>
6 <span class="gray-text">{{proTitle}}</span> 6 <span class="gray-text">{{proTitle}}</span>
7 - <span class="gray-text">完成</span> 7 + <span class="gray-text pad66">完成</span>
8 </div> 8 </div>
9 {{#if isShowMobile}} 9 {{#if isShowMobile}}
10 <div class="operate1"> 10 <div class="operate1">
1 {{> sign-header}} 1 {{> sign-header}}
2 <div class="login-page passport-page"> 2 <div class="login-page passport-page">
3 {{# passport}} 3 {{# passport}}
  4 + <form method='post' onsubmit='return false;'>
4 <ul> 5 <ul>
5 <li class="clearfix"> 6 <li class="clearfix">
6 <div class="title">登录 SIGN IN</div> 7 <div class="title">登录 SIGN IN</div>
@@ -51,8 +52,7 @@ @@ -51,8 +52,7 @@
51 <span class="iconfont">&#xe61d;</span> 52 <span class="iconfont">&#xe61d;</span>
52 <em></em> 53 <em></em>
53 </span> 54 </span>
54 -  
55 - <a id="login-btn" class="btn login-btn">登录</a> 55 + <input type="submit" id="login-btn" class="btn login-btn" value='登录'/>
56 </li> 56 </li>
57 57
58 <li class="clearfix"> 58 <li class="clearfix">
@@ -93,5 +93,6 @@ @@ -93,5 +93,6 @@
93 </li> 93 </li>
94 </ul> 94 </ul>
95 <input id="country-code-hide" name="countryCode" type="hidden" value="{{countryCode}}"> 95 <input id="country-code-hide" name="countryCode" type="hidden" value="{{countryCode}}">
  96 + </form>
96 {{/ passport}} 97 {{/ passport}}
97 </div> 98 </div>
@@ -23,11 +23,8 @@ module.exports = { @@ -23,11 +23,8 @@ module.exports = {
23 cookieDomain: 'yohoblk.com', 23 cookieDomain: 'yohoblk.com',
24 domains: { 24 domains: {
25 singleApi: 'http://192.168.102.31:8092/', 25 singleApi: 'http://192.168.102.31:8092/',
26 - api: 'http://api-test2.yohops.com:9999/',  
27 - service: 'http://service-test2.yohops.com:9999/',  
28 -  
29 - // api: 'http://api.yoho.yohoops.org/',  
30 - // service: 'http://service.yoho.yohoops.org/', 26 + api: 'http://api.yoho.yohoops.org/',
  27 + service: 'http://service.yoho.yohoops.org/',
31 search: 'http://192.168.102.216:8080/yohosearch/' 28 search: 'http://192.168.102.216:8080/yohosearch/'
32 }, 29 },
33 useOneapm: false, 30 useOneapm: false,
@@ -245,8 +245,8 @@ a { @@ -245,8 +245,8 @@ a {
245 .body-mask { 245 .body-mask {
246 position: fixed; 246 position: fixed;
247 z-index: 100; 247 z-index: 100;
248 - background: #1d1d1d;  
249 - opacity: 0.3; 248 + background: #000;
  249 + opacity: 0.4;
250 top: 0; 250 top: 0;
251 left: 0; 251 left: 0;
252 } 252 }
@@ -5,9 +5,9 @@ @@ -5,9 +5,9 @@
5 left: 50%; 5 left: 50%;
6 min-height: 130px; 6 min-height: 130px;
7 min-width: 420px; 7 min-width: 420px;
8 - background: #f8f8f8; 8 + background: #ffffff;
9 z-index: 1001; 9 z-index: 1001;
10 - border: 1px solid #8f8f8f; 10 + /*border: 1px solid #8f8f8f;*/
11 11
12 .close { 12 .close {
13 padding: 5px; 13 padding: 5px;
1 -.goods-info {  
2 - width: 274px;  
3 - margin-right: 18px;  
4 -  
5 - .thumb {  
6 - width: 100%;  
7 - height: 366px;  
8 - }  
9 -  
10 - .desc {  
11 - text-align: center;  
12 - }  
13 -  
14 - .name {  
15 - font-size: 14px;  
16 - line-height: 50px;  
17 - }  
18 -  
19 - .price {  
20 - font-size: 16px;  
21 - font-weight: bold;  
22 - }  
23 -} 1 +.goods-info {
  2 + width: 274px;
  3 + margin-right: 18px;
  4 +
  5 + .thumb {
  6 + width: 100%;
  7 + height: 366px;
  8 + }
  9 +
  10 + .desc {
  11 + text-align: center;
  12 + }
  13 +
  14 + .name {
  15 + font-size: 14px;
  16 + line-height: 50px;
  17 + display: block;
  18 + margin-top: -2px;
  19 + }
  20 +
  21 + .price {
  22 + font-size: 16px;
  23 + font-weight: bold;
  24 + display: block;
  25 + margin-top: -2px;
  26 + }
  27 +}
@@ -73,7 +73,6 @@ @@ -73,7 +73,6 @@
73 .tag-bag { 73 .tag-bag {
74 padding-right: 6px; 74 padding-right: 6px;
75 margin-right: 8px; 75 margin-right: 8px;
76 - font-weight: normal;  
77 position: relative; 76 position: relative;
78 77
79 &:hover { 78 &:hover {
@@ -114,6 +113,7 @@ @@ -114,6 +113,7 @@
114 width: 230px; 113 width: 230px;
115 color: #1b1b1b; 114 color: #1b1b1b;
116 font-size: 14px; 115 font-size: 14px;
  116 + font-weight: normal;
117 padding: 20px 0; 117 padding: 20px 0;
118 margin-left: -86px; 118 margin-left: -86px;
119 line-height: 1.5; 119 line-height: 1.5;
@@ -144,6 +144,7 @@ @@ -144,6 +144,7 @@
144 width: 370px; 144 width: 370px;
145 padding: 18px; 145 padding: 18px;
146 border: 1px solid #eee; 146 border: 1px solid #eee;
  147 + font-weight: normal;
147 background: #fff; 148 background: #fff;
148 position: absolute; 149 position: absolute;
149 z-index: 50; 150 z-index: 50;
@@ -212,7 +212,7 @@ @@ -212,7 +212,7 @@
212 212
213 .btn { 213 .btn {
214 display: inline-block; 214 display: inline-block;
215 - margin-bottom: 14px; 215 + margin-bottom: 18px;
216 cursor: pointer; 216 cursor: pointer;
217 217
218 &.black { 218 &.black {
@@ -220,6 +220,14 @@ @@ -220,6 +220,14 @@
220 } 220 }
221 } 221 }
222 222
  223 + .marginhack{
  224 + margin-top: -4px;
  225 +
  226 + .black{
  227 + margin-top: 0;
  228 + }
  229 + }
  230 +
223 p { 231 p {
224 margin-bottom: $space; 232 margin-bottom: $space;
225 line-height: 20px; 233 line-height: 20px;
@@ -22,13 +22,17 @@ @@ -22,13 +22,17 @@
22 background-repeat: no-repeat; 22 background-repeat: no-repeat;
23 } 23 }
24 .progress-text { 24 .progress-text {
25 - margin-left: 48px; 25 + margin-left: 62px;
26 26
27 span { 27 span {
28 padding: 0 50px; 28 padding: 0 50px;
29 } 29 }
30 .gray-text { 30 .gray-text {
31 color: #d3d3d3; 31 color: #d3d3d3;
  32 + padding: 0 38px;
  33 + }
  34 + .pad66{
  35 + padding-left: 66px;
32 } 36 }
33 } 37 }
34 .operate1, 38 .operate1,
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
55 height: $item-height; 55 height: $item-height;
56 width: $item-width; 56 width: $item-width;
57 line-height: @height; 57 line-height: @height;
  58 + border: none;
58 } 59 }
59 60
60 .captcha-component { 61 .captcha-component {
@@ -58,9 +58,15 @@ @@ -58,9 +58,15 @@
58 text-align: center; 58 text-align: center;
59 } 59 }
60 60
  61 + .trade-wrapper{
  62 + text-align: center;
  63 + }
  64 +
61 .brand-name { 65 .brand-name {
62 font-size: 24px; 66 font-size: 24px;
63 font-weight: bold; 67 font-weight: bold;
  68 + margin: 0 40px;
  69 + line-height: 1.3;
64 } 70 }
65 71
66 .name { 72 .name {
@@ -88,12 +94,14 @@ @@ -88,12 +94,14 @@
88 } 94 }
89 95
90 .option-content { 96 .option-content {
91 - width: 226px; 97 + /*width: 226px;*/
92 margin: 0 auto; 98 margin: 0 auto;
93 padding: 40px 0 20px; 99 padding: 40px 0 20px;
  100 + display: inline-block;
94 101
95 > p { 102 > p {
96 line-height: 50px; 103 line-height: 50px;
  104 + text-align: left;
97 } 105 }
98 106
99 .title { 107 .title {
@@ -102,17 +110,22 @@ @@ -102,17 +110,22 @@
102 } 110 }
103 111
104 .color-list { 112 .color-list {
105 - width: 246px; 113 + min-width: 226px;
  114 + max-width: 300px;
106 115
107 .color-item { 116 .color-item {
108 float: left; 117 float: left;
109 margin-right: 20px; 118 margin-right: 20px;
110 margin-bottom: 10px; 119 margin-bottom: 10px;
  120 + &:last-child{
  121 + margin-right: 0;
  122 + }
111 } 123 }
112 } 124 }
113 125
114 .size-list { 126 .size-list {
115 - width: 236px; 127 + min-width: 226px;
  128 + max-width: 300px;
116 129
117 li { 130 li {
118 height: 34px; 131 height: 34px;
@@ -125,6 +138,9 @@ @@ -125,6 +138,9 @@
125 border: 1px solid #f0f0f0; 138 border: 1px solid #f0f0f0;
126 font-weight: bold; 139 font-weight: bold;
127 cursor: pointer; 140 cursor: pointer;
  141 + &:last-child{
  142 + margin-right: 0;
  143 + }
128 } 144 }
129 145
130 .disable { 146 .disable {
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 .goods-info { 117 .goods-info {
118 float: left; 118 float: left;
119 width: 272px; 119 width: 272px;
120 - margin: 25px 10px; 120 + margin: 26px 10px;
121 border-width: 1px; 121 border-width: 1px;
122 122
123 .desc { 123 .desc {