Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
Showing
11 changed files
with
54 additions
and
45 deletions
@@ -322,8 +322,8 @@ const _processContentData = (list) => { | @@ -322,8 +322,8 @@ const _processContentData = (list) => { | ||
322 | if (related.relatedReco) { | 322 | if (related.relatedReco) { |
323 | _.forEach(related.relatedReco, function(data, key) { | 323 | _.forEach(related.relatedReco, function(data, key) { |
324 | 324 | ||
325 | - _.forEach(result, function(list, index) { | ||
326 | - if(data.id === list.productSkn) { | 325 | + _.forEach(result, function(lis, index) { |
326 | + if (data.id === lis.productSkn) { | ||
327 | data = _.assign(data, { | 327 | data = _.assign(data, { |
328 | link: config.siteUrl + '/product/list/pro_' + | 328 | link: config.siteUrl + '/product/list/pro_' + |
329 | result[index].productId + '_' + data.productSkc + '/' + | 329 | result[index].productId + '_' + data.productSkc + '/' + |
@@ -343,8 +343,8 @@ const _processContentData = (list) => { | @@ -343,8 +343,8 @@ const _processContentData = (list) => { | ||
343 | if (related.relatedGroup) { | 343 | if (related.relatedGroup) { |
344 | _.forEach(related.relatedGroup, function(data, key) { | 344 | _.forEach(related.relatedGroup, function(data, key) { |
345 | 345 | ||
346 | - _.forEach(result, function(list, index) { | ||
347 | - if(data.id === list.productSkn) { | 346 | + _.forEach(result, function(lis, index) { |
347 | + if (data.id === lis.productSkn) { | ||
348 | data = _.assign(data, { | 348 | data = _.assign(data, { |
349 | link: config.siteUrl + '/product/list/pro_' + | 349 | link: config.siteUrl + '/product/list/pro_' + |
350 | result[index].productId + '_' + data.productSkc + '/' + | 350 | result[index].productId + '_' + data.productSkc + '/' + |
@@ -125,7 +125,7 @@ | @@ -125,7 +125,7 @@ | ||
125 | </li> | 125 | </li> |
126 | <li id="collect-btn" class="sort-collect{{# isCollected}} collected{{/ isCollected}}"> | 126 | <li id="collect-btn" class="sort-collect{{# isCollected}} collected{{/ isCollected}}"> |
127 | <a href="javascript:;"> | 127 | <a href="javascript:;"> |
128 | - <i class="iconfont"></i> | 128 | + <i class="iconfont"></i> |
129 | <span>收藏</span> | 129 | <span>收藏</span> |
130 | </a> | 130 | </a> |
131 | </li> | 131 | </li> |
@@ -131,7 +131,8 @@ const statusMap = { | @@ -131,7 +131,8 @@ const statusMap = { | ||
131 | value: 3, | 131 | value: 3, |
132 | valueStr: '交易完成', | 132 | valueStr: '交易完成', |
133 | step: 4, | 133 | step: 4, |
134 | - showEditor: true | 134 | + showEditor: true, |
135 | + btns: [] | ||
135 | } | 136 | } |
136 | }; | 137 | }; |
137 | 138 | ||
@@ -537,6 +538,7 @@ const getOrderDetail = (uid, code) => { | @@ -537,6 +538,7 @@ const getOrderDetail = (uid, code) => { | ||
537 | if (detail.isCancel !== 'Y') { | 538 | if (detail.isCancel !== 'Y') { |
538 | detail.steps = _getStepByOrderStatus(st); | 539 | detail.steps = _getStepByOrderStatus(st); |
539 | 540 | ||
541 | + console.log(st); | ||
540 | statusMap[st].btns.forEach(function(btn) { | 542 | statusMap[st].btns.forEach(function(btn) { |
541 | btns.push(btn); | 543 | btns.push(btn); |
542 | }); | 544 | }); |
@@ -208,28 +208,30 @@ const setPathNav = (data, name, channel) => { | @@ -208,28 +208,30 @@ const setPathNav = (data, name, channel) => { | ||
208 | link: helpers.urlFormat(`/${link}`), | 208 | link: helpers.urlFormat(`/${link}`), |
209 | name: `${_.toUpper(channel)}首页` | 209 | name: `${_.toUpper(channel)}首页` |
210 | }]; | 210 | }]; |
211 | - let sort = data.sort[0] || {}; | 211 | + let sort = _.get(data, 'sort[0]', {}); |
212 | 212 | ||
213 | - navs.push({ | ||
214 | - link: helpers.urlFormat('/list', { | ||
215 | - msort: sort.sort_id, | ||
216 | - gender: gender | ||
217 | - }), | ||
218 | - name: sort.sort_name, | ||
219 | - pathTitle: sort.sort_name | ||
220 | - }); | ||
221 | - | ||
222 | - // 二级分类 | ||
223 | - if (!_.isEmpty(sort.sub)) { | 213 | + if (!_.isEmpty(sort)) { |
224 | navs.push({ | 214 | navs.push({ |
225 | link: helpers.urlFormat('/list', { | 215 | link: helpers.urlFormat('/list', { |
226 | msort: sort.sort_id, | 216 | msort: sort.sort_id, |
227 | - misort: sort.sub.sort_id, | ||
228 | gender: gender | 217 | gender: gender |
229 | }), | 218 | }), |
230 | - name: sort.sub[0].sort_name, | ||
231 | - pathTitle: sort.sub[0].sort_name | 219 | + name: sort.sort_name, |
220 | + pathTitle: sort.sort_name | ||
232 | }); | 221 | }); |
222 | + | ||
223 | + // 二级分类 | ||
224 | + if (!_.isEmpty(sort.sub)) { | ||
225 | + navs.push({ | ||
226 | + link: helpers.urlFormat('/list', { | ||
227 | + msort: sort.sort_id, | ||
228 | + misort: sort.sub.sort_id, | ||
229 | + gender: gender | ||
230 | + }), | ||
231 | + name: sort.sub[0].sort_name, | ||
232 | + pathTitle: sort.sub[0].sort_name | ||
233 | + }); | ||
234 | + } | ||
233 | } | 235 | } |
234 | 236 | ||
235 | navs.push({ | 237 | navs.push({ |
@@ -148,8 +148,10 @@ function validatePhoneNum() { | @@ -148,8 +148,10 @@ function validatePhoneNum() { | ||
148 | return validate().then(function() { | 148 | return validate().then(function() { |
149 | hideTip($phoneNumInput); | 149 | hideTip($phoneNumInput); |
150 | ep.emit('phone-num', true); | 150 | ep.emit('phone-num', true); |
151 | + return true; | ||
151 | }).fail(function() { | 152 | }).fail(function() { |
152 | ep.emit('phone-num', false); | 153 | ep.emit('phone-num', false); |
154 | + return false; | ||
153 | }); | 155 | }); |
154 | } | 156 | } |
155 | 157 | ||
@@ -215,8 +217,10 @@ function validateImgCaptcha() { | @@ -215,8 +217,10 @@ function validateImgCaptcha() { | ||
215 | 217 | ||
216 | return validate().then(function() { | 218 | return validate().then(function() { |
217 | ep.emit('captcha-img', true); | 219 | ep.emit('captcha-img', true); |
220 | + return true; | ||
218 | }).fail(function() { | 221 | }).fail(function() { |
219 | ep.emit('captcha-img', false); | 222 | ep.emit('captcha-img', false); |
223 | + return false; | ||
220 | }); | 224 | }); |
221 | } | 225 | } |
222 | 226 |
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | height: 50px; | 2 | height: 50px; |
3 | line-height: 50px; | 3 | line-height: 50px; |
4 | font-size: 12px; | 4 | font-size: 12px; |
5 | + font-weight: 500; | ||
5 | 6 | ||
6 | .yoho-group-map { | 7 | .yoho-group-map { |
7 | padding-right: 2px; | 8 | padding-right: 2px; |
@@ -11,7 +12,7 @@ | @@ -11,7 +12,7 @@ | ||
11 | .iconfont { | 12 | .iconfont { |
12 | font-size: 18px; | 13 | font-size: 18px; |
13 | position: relative; | 14 | position: relative; |
14 | - top: -1px; | 15 | + top: -2px; |
15 | } | 16 | } |
16 | 17 | ||
17 | a { | 18 | a { |
@@ -41,6 +42,7 @@ | @@ -41,6 +42,7 @@ | ||
41 | padding: 20px 0; | 42 | padding: 20px 0; |
42 | background: #fff; | 43 | background: #fff; |
43 | position: absolute; | 44 | position: absolute; |
45 | + font-weight: normal; | ||
44 | z-index: 50; | 46 | z-index: 50; |
45 | top: 50px; | 47 | top: 50px; |
46 | 48 | ||
@@ -72,6 +74,7 @@ | @@ -72,6 +74,7 @@ | ||
72 | .tag-bag { | 74 | .tag-bag { |
73 | padding-right: 6px; | 75 | padding-right: 6px; |
74 | margin-right: 8px; | 76 | margin-right: 8px; |
77 | + font-weight: normal; | ||
75 | position: relative; | 78 | position: relative; |
76 | 79 | ||
77 | &:hover { | 80 | &:hover { |
@@ -19,6 +19,10 @@ | @@ -19,6 +19,10 @@ | ||
19 | cursor: pointer; | 19 | cursor: pointer; |
20 | font-size: 20px; | 20 | font-size: 20px; |
21 | } | 21 | } |
22 | + | ||
23 | + .weixin { | ||
24 | + height: 30px; | ||
25 | + } | ||
22 | } | 26 | } |
23 | 27 | ||
24 | .weixin-share-box { | 28 | .weixin-share-box { |
@@ -51,7 +55,7 @@ | @@ -51,7 +55,7 @@ | ||
51 | z-index: 100; | 55 | z-index: 100; |
52 | height: 12px; | 56 | height: 12px; |
53 | display: block; | 57 | display: block; |
54 | - background-image: resolve('layout/up.png'); | 58 | + background-image: resolve("layout/up.png"); |
55 | top: 17px; | 59 | top: 17px; |
56 | } | 60 | } |
57 | } | 61 | } |
@@ -81,5 +85,4 @@ | @@ -81,5 +85,4 @@ | ||
81 | color: #9f9f9f; | 85 | color: #9f9f9f; |
82 | line-height: 20px; | 86 | line-height: 20px; |
83 | } | 87 | } |
84 | - | ||
85 | } | 88 | } |
@@ -6,10 +6,6 @@ | @@ -6,10 +6,6 @@ | ||
6 | margin: 30px auto; | 6 | margin: 30px auto; |
7 | } | 7 | } |
8 | 8 | ||
9 | - .font { | ||
10 | - font-family: '黑体'; | ||
11 | - } | ||
12 | - | ||
13 | .detail-title { | 9 | .detail-title { |
14 | font-size: 24px; | 10 | font-size: 24px; |
15 | text-align: center; | 11 | text-align: center; |
@@ -77,6 +73,7 @@ | @@ -77,6 +73,7 @@ | ||
77 | margin-right: 30px; | 73 | margin-right: 30px; |
78 | } | 74 | } |
79 | } | 75 | } |
76 | + | ||
80 | .article-main { | 77 | .article-main { |
81 | text-align: center; | 78 | text-align: center; |
82 | margin: 0 auto; | 79 | margin: 0 auto; |
@@ -88,8 +85,6 @@ | @@ -88,8 +85,6 @@ | ||
88 | } | 85 | } |
89 | } | 86 | } |
90 | 87 | ||
91 | - | ||
92 | - | ||
93 | .article-pictwo { | 88 | .article-pictwo { |
94 | max-width: 930px; | 89 | max-width: 930px; |
95 | margin: 0 auto; | 90 | margin: 0 auto; |
@@ -99,7 +94,7 @@ | @@ -99,7 +94,7 @@ | ||
99 | img { | 94 | img { |
100 | display: inline-block; | 95 | display: inline-block; |
101 | max-width: 460px; | 96 | max-width: 460px; |
102 | - margin-right: 2px; | 97 | + margin-right: 2px; |
103 | } | 98 | } |
104 | } | 99 | } |
105 | 100 | ||
@@ -274,8 +269,10 @@ | @@ -274,8 +269,10 @@ | ||
274 | 269 | ||
275 | .user-handle { | 270 | .user-handle { |
276 | float: right; | 271 | float: right; |
272 | + | ||
277 | ul { | 273 | ul { |
278 | display: inline-block; | 274 | display: inline-block; |
275 | + | ||
279 | li { | 276 | li { |
280 | float: left; | 277 | float: left; |
281 | margin: 0 15px; | 278 | margin: 0 15px; |
@@ -330,6 +327,7 @@ | @@ -330,6 +327,7 @@ | ||
330 | i { | 327 | i { |
331 | opacity: 1; | 328 | opacity: 1; |
332 | } | 329 | } |
330 | + | ||
333 | .cancel-collect { | 331 | .cancel-collect { |
334 | display: inline; | 332 | display: inline; |
335 | } | 333 | } |
@@ -415,7 +413,6 @@ | @@ -415,7 +413,6 @@ | ||
415 | a { | 413 | a { |
416 | float: right; | 414 | float: right; |
417 | } | 415 | } |
418 | - | ||
419 | } | 416 | } |
420 | 417 | ||
421 | .comment-area { | 418 | .comment-area { |
@@ -467,10 +464,6 @@ | @@ -467,10 +464,6 @@ | ||
467 | font-size: 14px; | 464 | font-size: 14px; |
468 | background: #000; | 465 | background: #000; |
469 | cursor: pointer; | 466 | cursor: pointer; |
470 | - | ||
471 | - /* &:hover { | ||
472 | - background: #000; | ||
473 | - }*/ | ||
474 | } | 467 | } |
475 | 468 | ||
476 | .disable { | 469 | .disable { |
@@ -502,7 +495,7 @@ | @@ -502,7 +495,7 @@ | ||
502 | width: 12px; | 495 | width: 12px; |
503 | height: 7px; | 496 | height: 7px; |
504 | background: #fff; | 497 | background: #fff; |
505 | - background-image: resolve('layout/down.png'); | 498 | + background-image: resolve("layout/down.png"); |
506 | position: absolute; | 499 | position: absolute; |
507 | left: 15px; | 500 | left: 15px; |
508 | } | 501 | } |
@@ -524,7 +517,6 @@ | @@ -524,7 +517,6 @@ | ||
524 | } | 517 | } |
525 | 518 | ||
526 | .comments-list { | 519 | .comments-list { |
527 | - | ||
528 | li { | 520 | li { |
529 | margin: 14px 0 0; | 521 | margin: 14px 0 0; |
530 | padding: 0 0 15px; | 522 | padding: 0 0 15px; |
@@ -550,6 +542,7 @@ | @@ -550,6 +542,7 @@ | ||
550 | font-weight: bold; | 542 | font-weight: bold; |
551 | } | 543 | } |
552 | } | 544 | } |
545 | + | ||
553 | .comment-info { | 546 | .comment-info { |
554 | .comment-content { | 547 | .comment-content { |
555 | margin-top: 10px; | 548 | margin-top: 10px; |
@@ -566,7 +559,6 @@ | @@ -566,7 +559,6 @@ | ||
566 | clear: both; | 559 | clear: both; |
567 | } | 560 | } |
568 | } | 561 | } |
569 | - | ||
570 | } | 562 | } |
571 | } | 563 | } |
572 | 564 |
@@ -81,7 +81,7 @@ | @@ -81,7 +81,7 @@ | ||
81 | cursor: pointer; | 81 | cursor: pointer; |
82 | 82 | ||
83 | &.disable { | 83 | &.disable { |
84 | - background-color: $inactive-color; | 84 | + background-color: $theme-color; |
85 | } | 85 | } |
86 | } | 86 | } |
87 | 87 | ||
@@ -146,7 +146,7 @@ | @@ -146,7 +146,7 @@ | ||
146 | line-height: @height; | 146 | line-height: @height; |
147 | 147 | ||
148 | &.disable { | 148 | &.disable { |
149 | - background-color: $inactive-color; | 149 | + background-color: $theme-color; |
150 | } | 150 | } |
151 | } | 151 | } |
152 | 152 | ||
@@ -166,7 +166,7 @@ | @@ -166,7 +166,7 @@ | ||
166 | margin: 0 calc(($item-width - @width) / 2); | 166 | margin: 0 calc(($item-width - @width) / 2); |
167 | 167 | ||
168 | &.disable { | 168 | &.disable { |
169 | - background-color: $inactive-color; | 169 | + background-color: $theme-color; |
170 | } | 170 | } |
171 | } | 171 | } |
172 | 172 | ||
@@ -195,7 +195,7 @@ | @@ -195,7 +195,7 @@ | ||
195 | cursor: pointer; | 195 | cursor: pointer; |
196 | 196 | ||
197 | &.disable { | 197 | &.disable { |
198 | - background-color: $inactive-color; | 198 | + background-color: $theme-color; |
199 | } | 199 | } |
200 | } | 200 | } |
201 | } | 201 | } |
@@ -325,6 +325,10 @@ | @@ -325,6 +325,10 @@ | ||
325 | .material-detail { | 325 | .material-detail { |
326 | display: table; | 326 | display: table; |
327 | 327 | ||
328 | + & + .material-wash { | ||
329 | + border-top: 1px solid #eaeceb; | ||
330 | + } | ||
331 | + | ||
328 | li { | 332 | li { |
329 | display: table-row; | 333 | display: table-row; |
330 | } | 334 | } |
@@ -364,7 +368,6 @@ | @@ -364,7 +368,6 @@ | ||
364 | 368 | ||
365 | .material-wash { | 369 | .material-wash { |
366 | text-align: center; | 370 | text-align: center; |
367 | - border-top: 1px solid #eaeceb; | ||
368 | padding-top: 15px; | 371 | padding-top: 15px; |
369 | 372 | ||
370 | li { | 373 | li { |
-
Please register or login to post a comment