fe / yoho-blk · Commits

Go to a project

Authored by zhangxiaoru
Commit a163651045747f0055bf43f8d418094a7f0d13f5 2 parents 8ed63202 fd3b0ebb

editorial

Inline Side-by-side
Showing 10 changed files with 29 additions and 14 deletions
@@ -345,7 +345,7 @@ const _setRefundDetailData = (data) => { @@ -345,7 +345,7 @@ const _setRefundDetailData = (data) => {
345 mode: data.return_amount_mode_name, 345 mode: data.return_amount_mode_name,
346 account: data.return_amount_mode_name, 346 account: data.return_amount_mode_name,
347 amount: data.return_amount_total, 347 amount: data.return_amount_total,
348 - coin: data.use_yoho_coin_num 348 + coin: parseInt(data.return_yoho_coin * 100, 10)
349 }; 349 };
350 break; 350 break;
351 case 91: 351 case 91:
@@ -31,10 +31,10 @@ @@ -31,10 +31,10 @@
31 {{^}} 31 {{^}}
32 <div class="slide-switch"> 32 <div class="slide-switch">
33 <a class="prev" href="javascript:;"> 33 <a class="prev" href="javascript:;">
34 - <span class="iconfont">&#xe62c;</span> 34 + <span class="iconfont">&#xe64e;</span>
35 </a> 35 </a>
36 <a class="next" href="javascript:;"> 36 <a class="next" href="javascript:;">
37 - <span class="iconfont">&#xe629;</span> 37 + <span class="iconfont">&#xe64c;</span>
38 </a> 38 </a>
39 </div> 39 </div>
40 <div class="slide-wrap"> 40 <div class="slide-wrap">
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 <p>退款方式：{{mode}}<em>由于银行内部处理流程的差异，储蓄卡需要3-7个工作日到账，信用卡需要7-15个工作日到账</em></p> 54 <p>退款方式：{{mode}}<em>由于银行内部处理流程的差异，储蓄卡需要3-7个工作日到账，信用卡需要7-15个工作日到账</em></p>
55 <p class="tip-pad-top">退款账户：{{account}}</p> 55 <p class="tip-pad-top">退款账户：{{account}}</p>
56 <p class="tip-pad-top">金额：¥{{amount}}</p> 56 <p class="tip-pad-top">金额：¥{{amount}}</p>
57 - <p class="tip-pad-top">有货币：{{coin}}</p> 57 + <p class="tip-pad-top">有货币：{{coin}}个</p>
58 </div> 58 </div>
59 {{/ refundSure}} 59 {{/ refundSure}}
60 60
No preview for this file type
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > 2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
3 <svg xmlns="http://www.w3.org/2000/svg"> 3 <svg xmlns="http://www.w3.org/2000/svg">
4 <metadata> 4 <metadata>
5 -Created by FontForge 20120731 at Wed Aug 17 17:32:05 2016 5 +Created by FontForge 20120731 at Tue Aug 23 17:49:33 2016
6 By admin 6 By admin
7 </metadata> 7 </metadata>
8 <defs> 8 <defs>
@@ -16,10 +16,10 @@ Created by FontForge 20120731 at Wed Aug 17 17:32:05 2016 @@ -16,10 +16,10 @@ Created by FontForge 20120731 at Wed Aug 17 17:32:05 2016
16 ascent="896" 16 ascent="896"
17 descent="-128" 17 descent="-128"
18 x-height="792" 18 x-height="792"
19 - bbox="0 -224 1303 896.303" 19 + bbox="0 -224 1506 896.303"
20 underline-thickness="50" 20 underline-thickness="50"
21 underline-position="-100" 21 underline-position="-100"
22 - unicode-range="U+0078-E64D" 22 + unicode-range="U+0078-E650"
23 /> 23 />
24 <missing-glyph horiz-adv-x="374" 24 <missing-glyph horiz-adv-x="374"
25 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" /> 25 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -108,9 +108,9 @@ q0 56 -31 105h363q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140q0 56 -31 @@ -108,9 +108,9 @@ q0 56 -31 105h363q-30 -49 -30 -105q0 -82 58 -140t140 -58t140 58t58 140q0 56 -31
108 t74 -31t31 -74z" /> 108 t74 -31t31 -74z" />
109 <glyph glyph-name="uniE61B" unicode="&#xe61b;" 109 <glyph glyph-name="uniE61B" unicode="&#xe61b;"
110 d="M0 -128v1024h1024v-1024h-1024zM512 704q-133 0 -226.5 -93.5t-93.5 -226.5t93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5t-93.5 226.5t-226.5 93.5z" /> 110 d="M0 -128v1024h1024v-1024h-1024zM512 704q-133 0 -226.5 -93.5t-93.5 -226.5t93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5t-93.5 226.5t-226.5 93.5z" />
111 - <glyph glyph-name="uniE61C" unicode="&#xe61c;" horiz-adv-x="1093"  
112 -d="M1092 225v171q0 101 -39.5 193.5t-106.5 159.5t-160 107t-194 40h-92q-101 0 -193.5 -40t-159.5 -107t-107 -159.5t-40 -193.5v-173v-317q0 -14 10 -24t24 -10h175q15 0 24.5 10t9.5 24v317q0 15 -9.5 24.5t-24.5 9.5h-128v116q0 88 34 168t92 137.5t138 92t168 34.5h67  
113 -q87 0 167 -34.5t138 -92t92 -137.5t34 -168v-113h-129q-15 0 -24.5 -10t-9.5 -25v-317q0 -14 9.5 -24t24.5 -10h175q14 0 24 10t10 24z" /> 111 + <glyph glyph-name="uniE61C" unicode="&#xe61c;" horiz-adv-x="1092"
  112 +d="M1092 226v170q0 101 -40 193.5t-107 159.5t-159.5 107t-193.5 40h-92q-101 0 -193.5 -40t-159.5 -107t-107 -159.5t-40 -193.5v-173v-317q0 -14 10 -24t24 -10h176q14 0 24 10t10 24v317q0 14 -10 24t-24 10h-130v116q0 87 34.5 167t92.5 138t138 92.5t167 34.5h67
  113 +q88 0 168 -34.5t138 -92.5t92 -138t34 -167v-113h-129q-14 0 -24 -10t-10 -24v-317q0 -14 10 -24t24 -10h176q14 0 24 10t10 24v317z" />
114 <glyph glyph-name="uniE61D" unicode="&#xe61d;" 114 <glyph glyph-name="uniE61D" unicode="&#xe61d;"
115 d="M783 526l-45 45l-226 -226l-226 226l-45 -45l226 -226l-226 -226l45 -46l226 227l226 -227l45 46l-226 226z" /> 115 d="M783 526l-45 45l-226 -226l-226 226l-45 -45l226 -226l-226 -226l45 -46l226 227l226 -227l45 46l-226 226z" />
116 <glyph glyph-name="uniE61E" unicode="&#xe61e;" 116 <glyph glyph-name="uniE61E" unicode="&#xe61e;"
@@ -254,9 +254,19 @@ d="M1028 -36l-93 -92l-204 203q-123 -92 -273 -92q-93 0 -178 36.5t-146 97.5t-97.5 @@ -254,9 +254,19 @@ d="M1028 -36l-93 -92l-204 203q-123 -92 -273 -92q-93 0 -178 36.5t-146 97.5t-97.5
254 t119 -118.5t164 -43.5t164.5 43.5t119 118.5t43.5 163.5t-43.5 163.5t-119 119t-164.5 44v0z" /> 254 t119 -118.5t164 -43.5t164.5 43.5t119 118.5t43.5 163.5t-43.5 163.5t-119 119t-164.5 44v0z" />
255 <glyph glyph-name="uniE64B" unicode="&#xe64b;" 255 <glyph glyph-name="uniE64B" unicode="&#xe64b;"
256 d="M812 568l-137 328h-326l-137 -328h-206l79 -696h854l79 696h-206zM418 786h189l91 -218h-371z" /> 256 d="M812 568l-137 328h-326l-137 -328h-206l79 -696h854l79 696h-206zM418 786h189l91 -218h-371z" />
  257 + <glyph glyph-name="uniE64C" unicode="&#xe64c;"
  258 +d="M327 -128q16 0 24 12l376 500l-373 500q-7 9 -20 11t-22 -5q-11 -6 -12.5 -19.5t6.5 -22.5l346 -464l-349 -464q-7 -9 -5 -22t11 -20q6 -6 18 -6z" />
257 <glyph glyph-name="uniE64D" unicode="&#xe64d;" 259 <glyph glyph-name="uniE64D" unicode="&#xe64d;"
258 d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM521 -15q-34 0 -58.5 24t-24.5 58.5t24.5 58.5t58.5 24t58 -24t24 -58 260 d="M512 886q-102 0 -195 -39.5t-160.5 -107t-107 -160.5t-39.5 -195t39.5 -195t107 -160.5t160.5 -107t195 -39.5t195 39.5t160.5 107t107 160.5t39.5 195t-39.5 195t-107 160.5t-160.5 107t-195 39.5zM521 -15q-34 0 -58.5 24t-24.5 58.5t24.5 58.5t58.5 24t58 -24t24 -58
259 q1 -34 -23.5 -58.5t-58.5 -24.5zM738 477q-17 -34 -67 -83q-45 -43 -60 -61q-12 -16 -17 -35q-6 -22 -6 -61l1 -31h-142v30q0 56 9 90q11 38 30 64q17 23 62 71q43 44 52 60q8 13 8 44q0 28 -20 51q-20 21 -61 21q-29 0 -48.5 -9.5t-28.5 -27.5t-12.5 -36t-3.5 -43v-30h-142 261 q1 -34 -23.5 -58.5t-58.5 -24.5zM738 477q-17 -34 -67 -83q-45 -43 -60 -61q-12 -16 -17 -35q-6 -22 -6 -61l1 -31h-142v30q0 56 9 90q11 38 30 64q17 23 62 71q43 44 52 60q8 13 8 44q0 28 -20 51q-20 21 -61 21q-29 0 -48.5 -9.5t-28.5 -27.5t-12.5 -36t-3.5 -43v-30h-142
260 l1 31q2 72 18 111q16 40 52 73q34 31 78 46q41 14 88 14q96 0 160 -56q66 -59 66 -154q0 -43 -17 -79z" /> 262 l1 31q2 72 18 111q16 40 52 73q34 31 78 46q41 14 88 14q96 0 160 -56q66 -59 66 -154q0 -43 -17 -79z" />
  263 + <glyph glyph-name="uniE64E" unicode="&#xe64e;"
  264 +d="M697 -128q-16 0 -24 12l-376 500l373 500q7 9 20 11t22 -5t11 -20t-5 -22l-346 -464l349 -467q7 -9 5 -22t-11 -20q-6 -3 -18 -3z" />
  265 + <glyph glyph-name="uniE64F" unicode="&#xe64f;"
  266 +d="M799 456l127 128v312h-51h-77h-574h-128v-445v-162v-2l421 -412l409 404v181l-415 -401l-287 283v426h574v-312h1zM671 519l-107 21l-53 101l-53 -101l-107 -21l75 -84l-14 -113l99 48l99 -48l-14 113z" />
  267 + <glyph glyph-name="uniE650" unicode="&#xe650;" horiz-adv-x="1506"
  268 +d="M885 540q-13 14 -31 22t-40 8t-39.5 -8t-30.5 -22t-20 -33t-7 -41q0 -23 7 -43t20 -33.5t30.5 -21.5t39.5 -8t39.5 8t30.5 21.5t20.5 33.5t7.5 43q0 22 -7.5 41t-19.5 33v0zM1084 896h-663q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -212v-602l261 181h823q115 0 212 56.5
  269 +t153.5 153.5t56.5 211.5t-56.5 211.5t-153.5 153.5t-212 56.5v0zM574 294h-82v142h-133v-142h-83v341h83v-129h133v129h82v-341v0zM986 392q-14 -34 -39 -57.5t-59 -37t-74 -13.5t-74 13t-59 37t-39 57.5t-14 74.5t14 74t39 56t59 35.5t74 12.5t74 -12.5t59 -35.5t39 -56
  270 +t14 -74t-14 -74zM1283 564h-97v-270h-82v270h-96v71h275v-71z" />
261 </font> 271 </font>
262 </defs></svg> 272 </defs></svg>
No preview for this file type
No preview for this file type
@@ -57,6 +57,7 @@ function setActive($item) { @@ -57,6 +57,7 @@ function setActive($item) {
57 57
58 var $colorList = $item.find('.color-list'); 58 var $colorList = $item.find('.color-list');
59 var $sizeList = $item.find('.size-list'); 59 var $sizeList = $item.find('.size-list');
  60 + var activeIndex = 0;
60 61
61 $colorList.find('.img-box').each(function(i, box) { 62 $colorList.find('.img-box').each(function(i, box) {
62 var $box = $(box); 63 var $box = $(box);
@@ -64,10 +65,14 @@ function setActive($item) { @@ -64,10 +65,14 @@ function setActive($item) {
64 if ($box.find('img').data('color') === color) { 65 if ($box.find('img').data('color') === color) {
65 $colorList.find('.img-box').eq(i).addClass('active'); 66 $colorList.find('.img-box').eq(i).addClass('active');
66 67
  68 + activeIndex = i;
  69 +
67 return false; 70 return false;
68 } 71 }
69 }); 72 });
70 73
  74 + $sizeList = $sizeList.eq(activeIndex).removeClass('hide');
  75 +
71 $sizeList.find('span').each(function(i, s) { 76 $sizeList.find('span').each(function(i, s) {
72 var $size = $(s); 77 var $size = $(s);
73 78
@@ -276,7 +281,6 @@ function bindConfirmEvent() { @@ -276,7 +281,6 @@ function bindConfirmEvent() {
276 var $changeGood = $('.change-info-box.will-change'); 281 var $changeGood = $('.change-info-box.will-change');
277 var changeGoodsList = []; 282 var changeGoodsList = [];
278 var changeData = {}; 283 var changeData = {};
279 - var $specialReason = $changeGood.find('.special-reason');  
280 var $imgs; 284 var $imgs;
281 var imgs = []; 285 var imgs = [];
282 286
@@ -294,6 +298,7 @@ function bindConfirmEvent() { @@ -294,6 +298,7 @@ function bindConfirmEvent() {
294 var $good = $(good); 298 var $good = $(good);
295 var $c = $good.find('.goods-container'); 299 var $c = $good.find('.goods-container');
296 var $f = $good.find('.form'); 300 var $f = $good.find('.form');
  301 + var $specialReason = $good.find('.special-reason');
297 302
298 goodObj.product_skn = $c.data('skn'); 303 goodObj.product_skn = $c.data('skn');
299 goodObj.product_skc = $c.data('skc'); 304 goodObj.product_skc = $c.data('skc');
@@ -45,8 +45,8 @@ var $ = require('yoho-jquery'), @@ -45,8 +45,8 @@ var $ = require('yoho-jquery'),
45 _createOrient: function() { 45 _createOrient: function() {
46 46
47 var orientHtml = '<div class="slide-switch">' + 47 var orientHtml = '<div class="slide-switch">' +
48 - '<a class="prev" href="javascript:;"><span class="iconfont">&#xe635;</span></a>' +  
49 - '<a class="next" href="javascript:;"><span class="iconfont">&#xe636;</span></a>' + 48 + '<a class="prev" href="javascript:;"><span class="iconfont">&#xe64e;</span></a>' +
  49 + '<a class="next" href="javascript:;"><span class="iconfont">&#xe64c;</span></a>' +
50 '</div>'; 50 '</div>';
51 51
52 if (this.$element.find('.slide-switch').length > 0) { 52 if (this.$element.find('.slide-switch').length > 0) {
1 <div> 1 <div>
2 {{#goodsList}} 2 {{#goodsList}}
3 - <div class="{{#unless @first}}hide{{/unless}} size-list" data-index="{{@index}}"> 3 + <div class="hide size-list" data-index="{{@index}}">
4 {{#sizeList}} 4 {{#sizeList}}
5 <span data-size="{{sizeName}}" data-sku="{{productSku}}" data-id="{{goodsId}}" {{#unless storageNumber}}class="disable"{{/unless}}>{{sizeName}}</span> 5 <span data-size="{{sizeName}}" data-sku="{{productSku}}" data-id="{{goodsId}}" {{#unless storageNumber}}class="disable"{{/unless}}>{{sizeName}}</span>
6 {{/sizeList}} 6 {{/sizeList}}