Showing
5 changed files
with
27 additions
and
15 deletions
@@ -357,7 +357,8 @@ const _getSkuDataByProductBaseInfo = (data) => { | @@ -357,7 +357,8 @@ const _getSkuDataByProductBaseInfo = (data) => { | ||
357 | goodsId: size.size_id, | 357 | goodsId: size.size_id, |
358 | notify: size.notify, | 358 | notify: size.notify, |
359 | soldOut: _.parseInt(size.storage_number) === 0, | 359 | soldOut: _.parseInt(size.storage_number) === 0, |
360 | - info: _.get(size, 'size_info', '').replace(/\//ig, '-').replace(/ /ig, '/').replace(/:/ig, ' ') | 360 | + info: _.get(size, 'size_info', '').replace(/\//ig, '-').replace(/ /ig, '/').replace(/:/ig, ' '), |
361 | + helper: _.get(size, 'size_rec', '') | ||
361 | }); | 362 | }); |
362 | 363 | ||
363 | // 单个sku商品的总数 | 364 | // 单个sku商品的总数 |
@@ -12,7 +12,8 @@ | @@ -12,7 +12,8 @@ | ||
12 | data-name="{{name}}" | 12 | data-name="{{name}}" |
13 | data-notify="{{notify}}" | 13 | data-notify="{{notify}}" |
14 | data-title="{{title}}" | 14 | data-title="{{title}}" |
15 | - data-info="{{info}}"> | 15 | + data-info="{{info}}" |
16 | + data-helper="{{helper}}"> | ||
16 | {{name}}</li> | 17 | {{name}}</li> |
17 | {{/each}} | 18 | {{/each}} |
18 | 19 | ||
@@ -21,7 +22,10 @@ | @@ -21,7 +22,10 @@ | ||
21 | 22 | ||
22 | 23 | ||
23 | {{#unless virtualGoods}} | 24 | {{#unless virtualGoods}} |
24 | - <p class="color-size-tip hide"></p> | 25 | + <p class="color-size-tip hide"> |
26 | + <span class="tip"></span> | ||
27 | + <span class="helper"></span> | ||
28 | + </p> | ||
25 | {{/unless}} | 29 | {{/unless}} |
26 | 30 | ||
27 | <p class="size-warn warn-tip hide"> <i class="iconfont"></i> 请选择尺码 </p> | 31 | <p class="size-warn warn-tip hide"> <i class="iconfont"></i> 请选择尺码 </p> |
@@ -25,12 +25,12 @@ module.exports = { | @@ -25,12 +25,12 @@ module.exports = { | ||
25 | // platformApi: 'http://192.168.102.48:8088/', | 25 | // platformApi: 'http://192.168.102.48:8088/', |
26 | 26 | ||
27 | // test2 | 27 | // test2 |
28 | - singleApi: 'http://api-test2.yohops.com:9999/', | ||
29 | - api: 'http://api-test2.yohops.com:9999/', | ||
30 | - service: 'http://service-test2.yohops.com:9999/', | ||
31 | - serviceNotify: 'http://service-test2.yohops.com:9999/', | ||
32 | - global: 'http://global-test-soa.yohops.com:9999/', | ||
33 | - platformApi: 'http://192.168.102.48:8088/', | 28 | + // singleApi: 'http://api-test2.yohops.com:9999/', |
29 | + // api: 'http://api-test2.yohops.com:9999/', | ||
30 | + // service: 'http://service-test2.yohops.com:9999/', | ||
31 | + // serviceNotify: 'http://service-test2.yohops.com:9999/', | ||
32 | + // global: 'http://global-test-soa.yohops.com:9999/', | ||
33 | + // platformApi: 'http://192.168.102.48:8088/', | ||
34 | 34 | ||
35 | // prod | 35 | // prod |
36 | // singleApi: 'http://single.yoho.cn/', | 36 | // singleApi: 'http://single.yoho.cn/', |
@@ -47,11 +47,11 @@ module.exports = { | @@ -47,11 +47,11 @@ module.exports = { | ||
47 | // platformApi: 'http://172.16.6.210:8088/', | 47 | // platformApi: 'http://172.16.6.210:8088/', |
48 | 48 | ||
49 | // dev | 49 | // dev |
50 | - // api: 'http://dev-api.yohops.com:9999/', | ||
51 | - // service: 'http://dev-service.yohops.com:9999/', | ||
52 | - // serviceNotify: 'http://dev-service.yohops.com:9999/', | ||
53 | - // singleApi: 'http://dev-api.yohops.com:9999/', | ||
54 | - // platformApi: 'http://192.168.102.48:8088/',, | 50 | + api: 'http://dev-api.yohops.com:9999/', |
51 | + service: 'http://dev-service.yohops.com:9999/', | ||
52 | + serviceNotify: 'http://dev-service.yohops.com:9999/', | ||
53 | + singleApi: 'http://dev-api.yohops.com:9999/', | ||
54 | + platformApi: 'http://192.168.102.48:8088/', | ||
55 | 55 | ||
56 | imSocket: 'ws://socket.yohobuy.com:10240', | 56 | imSocket: 'ws://socket.yohobuy.com:10240', |
57 | imCs: 'http://im.yohobuy.com/api', | 57 | imCs: 'http://im.yohobuy.com/api', |
@@ -652,7 +652,10 @@ bindEvent.add(function() { | @@ -652,7 +652,10 @@ bindEvent.add(function() { | ||
652 | $this.siblings('.focus').removeClass('focus'); | 652 | $this.siblings('.focus').removeClass('focus'); |
653 | $this.addClass('focus'); | 653 | $this.addClass('focus'); |
654 | 654 | ||
655 | - $sizeTip.html($this.data('info')).removeClass('hide'); | 655 | + $sizeTip |
656 | + .find('.tip').html($this.data('info')).end() | ||
657 | + .find('.helper').html($this.data('helper')).end() | ||
658 | + .removeClass('hide'); | ||
656 | 659 | ||
657 | $sizeWarn.addClass('hide'); | 660 | $sizeWarn.addClass('hide'); |
658 | 661 |
-
Please register or login to post a comment