fe / yohoblk-wap · Commits

Go to a project

Authored by 陈轩
Commit caf351ff7eaca3f874c8bb65951330e189877c60 2 parents a02e6beb 28a0b447

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 11 changed files with 99 additions and 106 deletions
@@ -5,4 +5,5 @@ @@ -5,4 +5,5 @@
5 |侧边栏| /sidebar| 只有 app 使用| 5 |侧边栏| /sidebar| 只有 app 使用|
6 |品牌列表| /brand-list| | 6 |品牌列表| /brand-list| |
7 |品牌店铺| /brand?domain=colormad| | 7 |品牌店铺| /brand?domain=colormad| |
8 -|品牌店铺分享页面| /brand-share?domain=colormad| |  
  8 +|品牌店铺分享页面| /brand-share?domain=colormad| |
  9 +|商品详情| /product/{id}| |
@@ -14,28 +14,28 @@ @@ -14,28 +14,28 @@
14 </a> 14 </a>
15 <div class="order-type clearfix"> 15 <div class="order-type clearfix">
16 <a class="type-item" href="/home/orders?type=2"> 16 <a class="type-item" href="/home/orders?type=2">
17 - <span>&#xe634;</span> 17 + <span class="icon icon-wait-pay"></span>
18 <br>待付款 18 <br>待付款
19 {{#if wait_pay_num}} 19 {{#if wait_pay_num}}
20 <span class="num">{{wait_pay_num}}</span> 20 <span class="num">{{wait_pay_num}}</span>
21 {{/if}} 21 {{/if}}
22 </a> 22 </a>
23 <a class="type-item" href="/home/orders?type=3"> 23 <a class="type-item" href="/home/orders?type=3">
24 - <span>&#xe63b;</span> 24 + <span class="icon icon-wait-cargo"></span>
25 <br>待发货 25 <br>待发货
26 {{#if wait_cargo_num}} 26 {{#if wait_cargo_num}}
27 <span class="num">{{wait_cargo_num}}</span> 27 <span class="num">{{wait_cargo_num}}</span>
28 {{/if}} 28 {{/if}}
29 </a> 29 </a>
30 <a class="type-item" href="/home/orders?type=4"> 30 <a class="type-item" href="/home/orders?type=4">
31 - <span>&#xe633;</span> 31 + <span class="icon icon-send-cargo"></span>
32 <br>待收货 32 <br>待收货
33 {{#if send_cargo_num}} 33 {{#if send_cargo_num}}
34 <span class="num">{{send_cargo_num}}</span> 34 <span class="num">{{send_cargo_num}}</span>
35 {{/if}} 35 {{/if}}
36 </a> 36 </a>
37 <a class="type-item" href="/home/orders?type=5"> 37 <a class="type-item" href="/home/orders?type=5">
38 - <span>&#xe633;</span> 38 + <span class="icon icon-refund-exchange"></span>
39 <br>退换货 39 <br>退换货
40 {{#if refund_exchange_num}} 40 {{#if refund_exchange_num}}
41 <span class="num">{{refund_exchange_num}}</span> 41 <span class="num">{{refund_exchange_num}}</span>
No preview for this file type
1 <?xml version="1.0" standalone="no"?> 1 <?xml version="1.0" standalone="no"?>
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>  
5 -Created by FontForge 20120731 at Fri Jul 22 18:41:59 2016  
6 - By admin  
7 -</metadata> 4 +<metadata>Generated by IcoMoon</metadata>
8 <defs> 5 <defs>
9 -<font id="iconfont" horiz-adv-x="1024" >  
10 - <font-face  
11 - font-family="iconfont"  
12 - font-weight="500"  
13 - font-stretch="normal"  
14 - units-per-em="1024"  
15 - panose-1="2 0 6 3 0 0 0 0 0 0"  
16 - ascent="896"  
17 - descent="-128"  
18 - x-height="792"  
19 - bbox="-0.0999985 -221.6 1457 896"  
20 - underline-thickness="50"  
21 - underline-position="-100"  
22 - unicode-range="U+0078-E617"  
23 - />  
24 -<missing-glyph horiz-adv-x="374"  
25 -d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />  
26 - <glyph glyph-name=".notdef" horiz-adv-x="374"  
27 -d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />  
28 - <glyph glyph-name=".null" horiz-adv-x="0"  
29 - />  
30 - <glyph glyph-name="nonmarkingreturn" horiz-adv-x="341"  
31 - />  
32 - <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"  
33 -d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5  
34 -t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5  
35 -t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />  
36 - <glyph glyph-name="uniE600" unicode="&#xe600;"  
37 -d="M911 725h-242v123q0 21 -13.5 34.5t-34.5 13.5h-246q-20 0 -33.5 -13.5t-13.5 -34.5v-123h-246q-21 0 -34.5 -13.5t-13.5 -34t13.5 -34t34.5 -13.5h829q21 0 34.5 13.5t13.5 34t-13.5 34t-34.5 13.5zM423 725v72h147v-72h-147zM765 579q-21 0 -34.5 -14t-13.5 -34v-560  
38 -h-441v560q0 20 -13.5 34t-34 14t-34 -14t-13.5 -34v-611q0 -21 13.5 -34.5t34.5 -13.5h536q20 0 33.5 13.5t13.5 34.5v611q3 20 -11.5 34t-35.5 14zM447 67v389q0 20 -13.5 33.5t-34 13.5t-34 -13.5t-13.5 -33.5v-389q0 -21 13.5 -34.5t34 -13.5t34 13.5t13.5 34.5zM645 67  
39 -v389q0 20 -13.5 33.5t-34.5 13.5q-20 0 -35.5 -13.5t-15.5 -33.5v-389q0 -21 13.5 -34.5t34.5 -13.5t36 13.5t15 34.5z" />  
40 - <glyph glyph-name="uniE601" unicode="&#xe601;"  
41 -d="M512 812q43 0 82.5 -17t68 -45.5t45.5 -68t17 -82.5v-43h171v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-512q-53 0 -90.5 37.5t-37.5 90.5v640h171v43q0 43 17 82.5t45.5 68t68 45.5t82.5 17zM811 -84v555h-598v-555q0 -18 12.5 -30.5t30.5 -12.5h512q18 0 30.5 12.5  
42 -t12.5 30.5zM512 727q-53 0 -90.5 -37.5t-37.5 -90.5v-43h256v43q0 53 -37.5 90.5t-90.5 37.5z" />  
43 - <glyph glyph-name="uniE602" unicode="&#xe602;"  
44 -d="M516 256l409 404q2 1 6 6t7 8t8 7t9 5.5t8.5 2t8.5 -2.5l38 -21q7 -7 7.5 -17.5t-6.5 -17.5l-476 -471q-7 -8 -17.5 -8t-17.5 7zM86 669zM531 158q-8 -7 -18.5 -7t-17.5 8l-475 471q-7 7 -7 17.5t7 17.5l38 21q4 3 8.5 2.5t8.5 -2t9 -5.5t8 -7t7 -8t6 -6l415 -407z  
45 -M945 669z" />  
46 - <glyph glyph-name="uniE603" unicode="&#xe603;"  
47 -d="M998.5 724.5q-12.5 11.5 -29.5 11t-29 -12.5l-552 -588l-302 297q-12 12 -29.5 12t-29.5 -12.5t-12 -29.5t13 -29l332 -327v-1q2 -1 9 -5q1 -1 2.5 -2t2.5 -1q7 -3 15 -3t16 3q1 1 3 2l1 1q7 5 9 6l1 1l581 619q12 13 11.5 30t-13 28.5z" />  
48 - <glyph glyph-name="uniE604" unicode="&#xe604;"  
49 -d="M887 653q-19 24 -31 33l-4 4l-4 4q-53 51 -126 51q-103 0 -211 -106q-107 106 -210 106q-74 0 -126 -51l-5 -4l-3 -4q-12 -9 -31 -33q-74 -93 -60 -191q7 -48 33.5 -98.5t61.5 -92t80 -82.5t84 -70t77.5 -54.5t57.5 -36.5t28 -15l13 -7l14 7q8 4 27 15t58 36.5t78 54.5  
50 -t84 70t80 82.5t61.5 92t33.5 98.5q14 98 -60 191zM893 470q-7 -52 -43.5 -109t-81.5 -101t-100 -86.5t-91.5 -66t-65.5 -38.5q-28 15 -64.5 38.5t-92 66t-100 86.5t-81 101t-43.5 109q-13 92 75 176q4 5 11.5 12.5t32 20t52.5 12.5q87 0 189 -111l21 -23l22 23  
51 -q102 111 189 111q27 0 52 -12.5t32.5 -20t11.5 -12.5q88 -84 75 -176z" />  
52 - <glyph glyph-name="uniE605" unicode="&#xe605;"  
53 -d="M512 415l360 360l45 -45l-360 -360l360 -359l-45 -45l-360 359l-360 -359l-45 45l360 359l-360 360l45 45z" />  
54 - <glyph glyph-name="uniE606" unicode="&#xe606;"  
55 -d="M245 384l-9 9l472 472l80 -80l-400 -401l400 -401l-80 -80l-472 472z" />  
56 - <glyph glyph-name="uniE607" unicode="&#xe607;"  
57 -d="M785 384l13 13l-488 487l-84 -84l416 -416l-416 -416l84 -84l488 487z" />  
58 - <glyph glyph-name="uniE608" unicode="&#xe608;"  
59 -d="M682 74q-108 -89 -249 -89q-107 0 -197.5 53t-143.5 143.5t-53 197.5t53 197.5t143.5 143.5t197.5 53t197.5 -53t143.5 -143.5t53 -197.5q0 -141 -89 -249l286 -286l-56 -56zM433.5 64q130.5 0 222.5 92t92 222.5t-92 223t-222.5 92.5t-223 -92.5t-92.5 -223t92.5 -222.5  
60 -t223 -92z" />  
61 - <glyph glyph-name="uniE609" unicode="&#xe609;"  
62 -d="M513 17q-15 0 -121 93t-168 161q-37 40 -64 95.5t-27 99.5q0 97 61.5 166.5t149.5 69.5q49 0 93 -34.5t76 -86.5q31 52 75 86.5t93 34.5q88 0 150 -69.5t62 -166.5q0 -47 -27 -104t-65 -92q-20 -18 -61.5 -57t-74 -68.5t-67 -61t-57 -49t-28.5 -17.5z" />  
63 - <glyph glyph-name="uniE60A" unicode="&#xe60a;" horiz-adv-x="1463"  
64 -d="M798 -160q0 -46 25 -58t61 16l537 420q36 28 36 68t-36 68l-537 424q-36 29 -61 16.5t-25 -57.5v-238q-138 0 -252.5 -24.5t-192 -63t-137.5 -94t-94.5 -109.5t-57.5 -117t-31.5 -109.5t-11 -94t-1.5 -63.5t2 -25q47 62 87 104t90 78t103.5 57.5t127 36.5t161.5 21t207 6  
65 -v-262z" />  
66 - <glyph glyph-name="uniE60B" unicode="&#xe60b;"  
67 -d="M150.5 805q23.5 0 40 -16.5t16.5 -40t-16.5 -40.5t-40 -17t-40.5 17t-17 40.5t17 40t40.5 16.5zM150 600q49 0 87.5 28.5t53.5 74.5h731v91h-731q-15 45 -53.5 73.5t-87.5 28.5q-61 0 -104.5 -43.5t-43.5 -104.5t43.5 -104.5t104.5 -43.5zM723 327q-23 0 -40 16.5  
68 -t-17 40.5t17 40.5t40.5 16.5t40 -16.5t16.5 -40.5t-16.5 -40.5t-40.5 -16.5zM864 430q-15 45 -53.5 73.5t-87 28.5t-87.5 -28.5t-53 -73.5h-583v-92h583q14 -45 53 -73.5t87.5 -28.5t87 28.5t53.5 73.5h160v92h-160zM150.5 -37q-23.5 0 -40.5 16.5t-17 40t17 40.5t40.5 17  
69 -t40 -17t16.5 -40.5t-16.5 -40t-40 -16.5zM150 168q-61 0 -104.5 -43.5t-43.5 -104.5t43.5 -104.5t104.5 -43.5q49 0 87.5 28.5t53.5 73.5h731v91h-731q-15 46 -53.5 74.5t-87.5 28.5z" />  
70 - <glyph glyph-name="uniE60C" unicode="&#xe60c;" horiz-adv-x="1122"  
71 -d="M793 798q92 0 150.5 -65t58.5 -161q0 -82 -54 -145l-398 -413l-399 413q-53 63 -53 145q0 96 58 161t150 65q43 0 90 -22t79 -52t53.5 -58.5t21.5 -42.5q0 14 21 42.5t53.5 58.5t79 52t89.5 22zM793 896q-63 0 -127 -30t-116 -78q-53 48 -117 78t-127 30  
72 -q-131 0 -218.5 -92.5t-87.5 -231.5q0 -118 76 -208l3 -3l2 -2l398 -413l71 -73l70 73l398 413l3 2l2 3q76 90 76 208q0 139 -87.5 231.5t-218.5 92.5z" />  
73 - <glyph glyph-name="uniE60D" unicode="&#xe60d;" horiz-adv-x="1122"  
74 -d="M793 896q-63 0 -127 -30t-116 -78q-53 48 -117 78t-127 30q-131 0 -218.5 -92.5t-87.5 -231.5q0 -118 76 -208l3 -3l2 -2l398 -413l71 -73l70 73l398 413l3 2l2 3q76 90 76 208q0 139 -87.5 231.5t-218.5 92.5z" />  
75 - <glyph glyph-name="uniE60E" unicode="&#xe60e;" horiz-adv-x="1321"  
76 -d="M1297 366l-597 530v-328q-448 -11 -616 -283q-87 -142 -84 -319q1 -32 2 -32q65 82 120.5 129.5t135.5 82t183 47.5t259 15v-328z" />  
77 - <glyph glyph-name="uniE617" unicode="&#xe617;"  
78 -d="M24 94l22 -22q9 -10 22 -10t23 10l424 430l420 -426q9 -9 21.5 -9t21.5 9l22 22q9 9 9 22t-9 23l-458 464q-5 5 -12 7q-9 7 -20.5 6t-20.5 -9l-465 -472q-9 -9 -9 -22t9 -23z" />  
79 - </font>  
80 -</defs></svg> 6 +<font id="iconfont" horiz-adv-x="1024">
  7 +<font-face units-per-em="1024" ascent="896" descent="-128" />
  8 +<missing-glyph horiz-adv-x="1024" />
  9 +<glyph unicode="&#x20;" horiz-adv-x="0" d="" />
  10 +<glyph unicode="&#x78;" glyph-name="x" horiz-adv-x="1001" d="M281 543q-27-1-53-1h-83q-18 0-36.5-6t-32.5-18.5-23-32-9-45.5v-76h912v41q0 16-0.5 30t-0.5 18q0 13-5 29t-17 29.5-31.5 22.5-49.5 9h-133v-97h-438v97zM955 310v-52q0-23 0.5-52t0.5-58-10.5-47.5-26-30-33-16-31.5-4.5q-14-1-29.5-0.5t-29.5 0.5h-32l-45 128h-439l-44-128h-63q-20 0-45 1-25 0-41 9.5t-25.5 23-13.5 29.5-4 30v167h911zM163 247q-12 0-21-8.5t-9-21.5 9-21.5 21-8.5q13 0 22 8.5t9 21.5-9 21.5-22 8.5zM316 123q-8-26-14-48-5-19-10.5-37t-7.5-25-3-15 1-14.5 9.5-10.5 21.5-4h365q23 0 34 12t2 38q-5 13-9.5 30.5t-9.5 34.5q-5 19-11 39h-368zM336 498v228q0 11 2.5 23t10 21.5 20.5 15.5 34 6h188q31 0 51.5-14.5t20.5-52.5v-227h-327z" />
  11 +<glyph unicode="&#xe600;" glyph-name="delete" d="M911 725h-242v123q0 21-13.5 34.5t-34.5 13.5h-246q-20 0-33.5-13.5t-13.5-34.5v-123h-246q-21 0-34.5-13.5t-13.5-34 13.5-34 34.5-13.5h829q21 0 34.5 13.5t13.5 34-13.5 34-34.5 13.5zM423 725v72h147v-72h-147zM765 579q-21 0-34.5-14t-13.5-34v-560h-441v560q0 20-13.5 34t-34 14-34-14-13.5-34v-611q0-21 13.5-34.5t34.5-13.5h536q20 0 33.5 13.5t13.5 34.5v611q3 20-11.5 34t-35.5 14zM447 67v389q0 20-13.5 33.5t-34 13.5-34-13.5-13.5-33.5v-389q0-21 13.5-34.5t34-13.5 34 13.5 13.5 34.5zM645 67v389q0 20-13.5 33.5t-34.5 13.5q-20 0-35.5-13.5t-15.5-33.5v-389q0-21 13.5-34.5t34.5-13.5 36 13.5 15 34.5z" />
  12 +<glyph unicode="&#xe601;" glyph-name="bag" d="M512 812q43 0 82.5-17t68-45.5 45.5-68 17-82.5v-43h171v-640q0-53-37.5-90.5t-90.5-37.5h-512q-53 0-90.5 37.5t-37.5 90.5v640h171v43q0 43 17 82.5t45.5 68 68 45.5 82.5 17zM811-84v555h-598v-555q0-18 12.5-30.5t30.5-12.5h512q18 0 30.5 12.5t12.5 30.5zM512 727q-53 0-90.5-37.5t-37.5-90.5v-43h256v43q0 53-37.5 90.5t-90.5 37.5z" />
  13 +<glyph unicode="&#xe602;" glyph-name="down" d="M516 256l409 404q2 1 6 6t7 8 8 7 9 5.5 8.5 2 8.5-2.5l38-21q7-7 7.5-17.5t-6.5-17.5l-476-471q-7-8-17.5-8t-17.5 7zM531 158q-8-7-18.5-7t-17.5 8l-475 471q-7 7-7 17.5t7 17.5l38 21q4 3 8.5 2.5t8.5-2 9-5.5 8-7 7-8 6-6l415-407z" />
  14 +<glyph unicode="&#xe603;" glyph-name="check" d="M998.5 724.5q-12.5 11.5-29.5 11t-29-12.5l-552-588-302 297q-12 12-29.5 12t-29.5-12.5-12-29.5 13-29l332-327v-1q2-1 9-5 1-1 2.5-2t2.5-1q7-3 15-3t16 3q1 1 3 2l1 1q7 5 9 6l1 1 581 619q12 13 11.5 30t-13 28.5z" />
  15 +<glyph unicode="&#xe604;" glyph-name="love" d="M887 653q-19 24-31 33l-8 8q-53 51-126 51-103 0-211-106-107 106-210 106-74 0-126-51l-5-4-3-4q-12-9-31-33-74-93-60-191 7-48 33.5-98.5t61.5-92 80-82.5 84-70 77.5-54.5 57.5-36.5 28-15l13-7 14 7q8 4 27 15t58 36.5 78 54.5 84 70 80 82.5 61.5 92 33.5 98.5q14 98-60 191zM893 470q-7-52-43.5-109t-81.5-101-100-86.5-91.5-66-65.5-38.5q-28 15-64.5 38.5t-92 66-100 86.5-81 101-43.5 109q-13 92 75 176 4 5 11.5 12.5t32 20 52.5 12.5q87 0 189-111l21-23 22 23q102 111 189 111 27 0 52-12.5t32.5-20 11.5-12.5q88-84 75-176z" />
  16 +<glyph unicode="&#xe605;" glyph-name="close" d="M512 415l360 360 45-45-360-360 360-359-45-45-360 359-360-359-45 45 360 359-360 360 45 45z" />
  17 +<glyph unicode="&#xe606;" glyph-name="left" d="M245 384l-9 9 472 472 80-80-400-401 400-401-80-80-472 472z" />
  18 +<glyph unicode="&#xe607;" glyph-name="right" d="M785 384l13 13-488 487-84-84 416-416-416-416 84-84 488 487z" />
  19 +<glyph unicode="&#xe608;" glyph-name="search" d="M682 74q-108-89-249-89-107 0-197.5 53t-143.5 143.5-53 197.5 53 197.5 143.5 143.5 197.5 53 197.5-53 143.5-143.5 53-197.5q0-141-89-249l286-286-56-56zM433.5 64q130.5 0 222.5 92t92 222.5-92 223-222.5 92.5-223-92.5-92.5-223 92.5-222.5 223-92z" />
  20 +<glyph unicode="&#xe609;" glyph-name="love-solid" d="M513 17q-15 0-121 93t-168 161q-37 40-64 95.5t-27 99.5q0 97 61.5 166.5t149.5 69.5q49 0 93-34.5t76-86.5q31 52 75 86.5t93 34.5q88 0 150-69.5t62-166.5q0-47-27-104t-65-92q-20-18-61.5-57t-74-68.5-67-61-57-49-28.5-17.5z" />
  21 +<glyph unicode="&#xe60a;" glyph-name="yoho-share" horiz-adv-x="1463" d="M798-160q0-46 25-58t61 16l537 420q36 28 36 68t-36 68l-537 424q-36 29-61 16.5t-25-57.5v-238q-138 0-252.5-24.5t-192-63-137.5-94-94.5-109.5-57.5-117-31.5-109.5-11-94-1.5-63.5 2-25q47 62 87 104t90 78 103.5 57.5 127 36.5 161.5 21 207 6v-262z" />
  22 +<glyph unicode="&#xe60b;" glyph-name="filter" d="M150.5 805q23.5 0 40-16.5t16.5-40-16.5-40.5-40-17-40.5 17-17 40.5 17 40 40.5 16.5zM150 600q49 0 87.5 28.5t53.5 74.5h731v91h-731q-15 45-53.5 73.5t-87.5 28.5q-61 0-104.5-43.5t-43.5-104.5 43.5-104.5 104.5-43.5zM723 327q-23 0-40 16.5t-17 40.5 17 40.5 40.5 16.5 40-16.5 16.5-40.5-16.5-40.5-40.5-16.5zM864 430q-15 45-53.5 73.5t-87 28.5-87.5-28.5-53-73.5h-583v-92h583q14-45 53-73.5t87.5-28.5 87 28.5 53.5 73.5h160v92h-160zM150.5-37q-23.5 0-40.5 16.5t-17 40 17 40.5 40.5 17 40-17 16.5-40.5-16.5-40-40-16.5zM150 168q-61 0-104.5-43.5t-43.5-104.5 43.5-104.5 104.5-43.5q49 0 87.5 28.5t53.5 73.5h731v91h-731q-15 46-53.5 74.5t-87.5 28.5z" />
  23 +<glyph unicode="&#xe60c;" glyph-name="focus" horiz-adv-x="1122" d="M793 798q92 0 150.5-65t58.5-161q0-82-54-145l-398-413-399 413q-53 63-53 145 0 96 58 161t150 65q43 0 90-22t79-52 53.5-58.5 21.5-42.5q0 14 21 42.5t53.5 58.5 79 52 89.5 22zM793 896q-63 0-127-30t-116-78q-53 48-117 78t-127 30q-131 0-218.5-92.5t-87.5-231.5q0-118 76-208l5-5 398-413 71-73 70 73 398 413 3 2 2 3q76 90 76 208 0 139-87.5 231.5t-218.5 92.5z" />
  24 +<glyph unicode="&#xe60d;" glyph-name="focused" horiz-adv-x="1122" d="M793 896q-63 0-127-30t-116-78q-53 48-117 78t-127 30q-131 0-218.5-92.5t-87.5-231.5q0-118 76-208l5-5 398-413 71-73 70 73 398 413 3 2 2 3q76 90 76 208 0 139-87.5 231.5t-218.5 92.5z" />
  25 +<glyph unicode="&#xe60e;" glyph-name="share" horiz-adv-x="1321" d="M1297 366l-597 530v-328q-448-11-616-283-87-142-84-319 1-32 2-32 65 82 120.5 129.5t135.5 82 183 47.5 259 15v-328z" />
  26 +<glyph unicode="&#xe617;" glyph-name="up" d="M24 94l22-22q9-10 22-10t23 10l424 430 420-426q9-9 21.5-9t21.5 9l22 22q9 9 9 22t-9 23l-458 464q-5 5-12 7-9 7-20.5 6t-20.5-9l-465-472q-9-9-9-22t9-23z" />
  27 +<glyph unicode="&#xe900;" glyph-name="notdef" horiz-adv-x="374" d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
  28 +<glyph unicode="&#xe901;" glyph-name="wait-cargo" horiz-adv-x="1067" d="M992.619 896h-910.891l-81.088-460.587-0.64-563.413h1062.784v556.011l-70.165 467.989zM919.211 810.667l51.52-341.333h-292.629l-7.531-33.28c-13.76-61.013-71.403-105.301-137.024-105.301-65.429 0-123.029 44.117-136.96 104.917l-7.595 33.131h-295.829l60.181 341.867h765.867zM85.333-42.667v426.133h238.613c33.685-81.685 116.864-138.048 209.6-138.048 93.035 0 176.277 56.576 209.792 138.581h234.112v-426.667h-892.117z" />
  29 +<glyph unicode="&#xe902;" glyph-name="wait-pay" horiz-adv-x="1003" d="M794.122 666.122v229.878h-794.122v-1024h1003.102v794.122h-208.98zM83.592 812.408h626.939v-146.286h-626.939v146.286zM83.592 582.531h835.918v-626.939h-835.918v626.939zM167.184 457.143h668.735v-83.592h-668.735v83.592zM752.327 122.776h83.592v-83.592h-83.592v83.592z" />
  30 +<glyph unicode="&#xe903;" glyph-name="send-cargo" horiz-adv-x="1045" d="M1043.101 896h-1024v-397.061h83.592v-626.939h856.816v626.939h83.592v397.061zM186.284 498.939h689.633v-543.347h-689.633v543.347zM102.693 812.408h856.816v-229.878h-856.816v229.878zM374.366 373.551h313.469v-83.592h-313.469v83.592z" />
  31 +<glyph unicode="&#xe904;" glyph-name="refund-exchange" horiz-adv-x="1208" d="M1062.994 173.281c87.388 186.573 52.531 411.873-100.25 564.675-156.303 156.303-392.52 192.041-587.735 88.924l38.236-72.438c163.287 86.2 360.837 56.3 491.581-74.404 127.713-127.754 156.938-316.068 83.988-472.044l-141.947 66.437 96.154-265.298 265.298 96.154-145.326 67.994zM314.798 84.234c-127.734 127.734-156.959 316.047-84.009 472.023l141.967-66.437-96.174 265.298-265.298-96.154 145.306-67.994c-87.388-186.573-52.511-411.873 100.291-564.654 96.768-96.788 224.133-147.354 353.505-147.333 79.544 0 159.867 19.128 234.209 58.388l-38.236 72.438c-163.287-86.18-360.817-56.32-491.561 74.424z" />
  32 +</font></defs></svg>
No preview for this file type
No preview for this file type
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 7
8 'use strict'; 8 'use strict';
9 9
  10 +const $ = require('yoho-jquery');
10 const template = require('components/modal.hbs'); 11 const template = require('components/modal.hbs');
11 const Overlay = require('./overlay'); 12 const Overlay = require('./overlay');
12 13
@@ -7,6 +7,8 @@ @@ -7,6 +7,8 @@
7 7
8 'use strict'; 8 'use strict';
9 9
  10 +const $ = require('yoho-jquery');
  11 +
10 const ANIMATIONS = { 12 const ANIMATIONS = {
11 none: { 13 none: {
12 in: 'overlay-in', 14 in: 'overlay-in',
@@ -66,6 +68,18 @@ class Overlay { @@ -66,6 +68,18 @@ class Overlay {
66 .removeClass(this.settings.animationClasses.out); 68 .removeClass(this.settings.animationClasses.out);
67 } 69 }
68 70
  71 + _cleanupListener() {
  72 + this.elem.css({
  73 + visibility: 'hidden'
  74 + });
  75 + this._clearStylesClasses();
  76 + this.isVisible = false;
  77 + this.elem.detach();
  78 +
  79 + // 一次性监听，动画完成事件触发后删除监听器
  80 + this.elem[0].removeEventListener('webkitTransitionEnd', this._cleanupListener);
  81 + }
  82 +
69 /** 83 /**
70 * 显示覆盖层 84 * 显示覆盖层
71 */ 85 */
@@ -95,19 +109,8 @@ class Overlay { @@ -95,19 +109,8 @@ class Overlay {
95 hide() { 109 hide() {
96 if (this.isVisible) { 110 if (this.isVisible) {
97 this._clearStylesClasses(); 111 this._clearStylesClasses();
98 - const listener = () => {  
99 - this.elem.css({  
100 - visibility: 'hidden'  
101 - });  
102 - this._clearStylesClasses();  
103 - this.isVisible = false;  
104 - this.elem.detach();  
105 112
106 - // 一次性监听，动画完成事件触发后删除监听器  
107 - this.elem[0].removeEventListener('webkitTransitionEnd', listener);  
108 - };  
109 -  
110 - this.elem[0].addEventListener('webkitTransitionEnd', listener); 113 + this.elem[0].addEventListener('webkitTransitionEnd', this._cleanupListener.bind(this));
111 this.elem.addClass(this.settings.animationClasses.out); 114 this.elem.addClass(this.settings.animationClasses.out);
112 115
113 if (this.settings.disableScrolling) { 116 if (this.settings.disableScrolling) {
@@ -116,6 +119,10 @@ class Overlay { @@ -116,6 +119,10 @@ class Overlay {
116 }); 119 });
117 } 120 }
118 121
  122 + setTimeout(()=> {
  123 + this._cleanupListener();
  124 + }, 100);
  125 +
119 this.settings.onClose(); 126 this.settings.onClose();
120 } 127 }
121 } 128 }
1 const Vue = require('yoho-vue'); 1 const Vue = require('yoho-vue');
2 const app = require('product/detail/index.vue'); 2 const app = require('product/detail/index.vue');
3 const loading = require('common/loading'); 3 const loading = require('common/loading');
4 -const _ = require('lodash'); 4 +const lazyload = require('yoho-vue-lazyload');
5 5
6 require('../common/overlay'); 6 require('../common/overlay');
7 7
  8 +Vue.use(lazyload);
  9 +
  10 +(() => {
  11 + let stop = 0;
  12 +
  13 + $(document).ajaxStart(()=> {
  14 + // start = new Date().getTime();
  15 +
  16 + // setTimeout(()=> {
  17 + if (stop === 0) { // 超过100ms请求仍未结束则显示
  18 + loading.show();
  19 + }
  20 +
  21 + // }, 100);
  22 + });
  23 +
  24 + $(document).ajaxStop(()=> {
  25 + stop = new Date().getTime();
  26 + loading.hide();
  27 + });
  28 +})();
  29 +
8 new Vue({ 30 new Vue({
9 el: '#app', 31 el: '#app',
10 components: { 32 components: {
@@ -12,14 +34,4 @@ new Vue({ @@ -12,14 +34,4 @@ new Vue({
12 } 34 }
13 }); 35 });
14 36
15 -$(document).ajaxStart(()=> {  
16 - _.debounce(()=> {  
17 - loading.show();  
18 - }, 100)();  
19 -});  
20 37
21 -$(document).ajaxStop(()=> {  
22 - _.debounce(()=> {  
23 - loading.hide();  
24 - }, 500)();  
25 -});  
@@ -84,3 +84,19 @@ @@ -84,3 +84,19 @@
84 .icon-share:before { 84 .icon-share:before {
85 content: "\e60e"; 85 content: "\e60e";
86 } 86 }
  87 +
  88 +.icon-wait-cargo:before {
  89 + content: "\e901";
  90 +}
  91 +
  92 +.icon-wait-pay:before {
  93 + content: "\e902";
  94 +}
  95 +
  96 +.icon-send-cargo:before {
  97 + content: "\e903";
  98 +}
  99 +
  100 +.icon-refund-exchange:before {
  101 + content: "\e904";
  102 +}
@@ -81,6 +81,10 @@ @@ -81,6 +81,10 @@
81 text-align: center; 81 text-align: center;
82 border-top: 1px solid #e0e0e0; 82 border-top: 1px solid #e0e0e0;
83 83
  84 + .icon {
  85 + font-size: 45px;
  86 + }
  87 +
84 .type-item { 88 .type-item {
85 position: relative; 89 position: relative;
86 float: left; 90 float: left;
@@ -95,8 +99,8 @@ @@ -95,8 +99,8 @@
95 99
96 .num { 100 .num {
97 position: absolute; 101 position: absolute;
98 - top: -24px;  
99 - right: 36px; 102 + top: -35px;
  103 + right: 20px;
100 width: 72px; 104 width: 72px;
101 height: 72px; 105 height: 72px;
102 font-size: 34px; 106 font-size: 34px;