fe / yohoblk-wap · Commits

Go to a project

Authored by ccbikai
Commit ae3a9db5a060650b5d4e005692b43739c8d6659f 2 parents 227e69fe ad2d4a17

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

Inline Side-by-side
Showing 23 changed files with 510 additions and 458 deletions
@@ -9,3 +9,15 @@ Name | Path | Note @@ -9,3 +9,15 @@ Name | Path | Note
9 品牌店铺分享页面 | /product/brand-share?domain=colormad | 9 品牌店铺分享页面 | /product/brand-share?domain=colormad |
10 商品详情 | /product/{productId} | 10 商品详情 | /product/{productId} |
11 资讯列表 | /news | 11 资讯列表 | /news |
  12 +
  13 +----
  14 +### order 常亮
  15 +Name | Note
  16 +---------|--------
  17 +s_t_desc | 默认(最新)
  18 +s_p_asc | 价格升序
  19 +s_p_desc | 价格降序
  20 +p_d_asc | 折扣升序
  21 +p_d_desc | 折扣降序
  22 +s_n_asc | 销量升序
  23 +s_n_desc | 销量降序
@@ -6,11 +6,22 @@ @@ -6,11 +6,22 @@
6 */ 6 */
7 'use strict'; 7 'use strict';
8 8
  9 +const mRoot = '../models';
  10 +const listModel = require(`${mRoot}/list`);
  11 +
9 module.exports = { 12 module.exports = {
  13 +
  14 + /* 资讯首页 */
10 index: (req, res) => { 15 index: (req, res) => {
11 res.render('index', { 16 res.render('index', {
12 module: 'news', 17 module: 'news',
13 page: 'index' 18 page: 'index'
14 }); 19 });
  20 + },
  21 +
  22 + getNewsList: (req, res, next) => {
  23 + listModel.newsList().then(result => {
  24 + res.json(result);
  25 + }).catch(next);
15 } 26 }
16 }; 27 };
1 -/**  
2 - * Created by PhpStorm.  
3 - * User: Targaryen  
4 - * Date: 2016/7/27  
5 - * Time: 10:11  
6 - */  
7 -'use strict';  
8 -  
  1 +/**
  2 + * Created by PhpStorm.
  3 + * User: Targaryen
  4 + * Date: 2016/7/27
  5 + * Time: 11:42
  6 + */
  7 +
  8 +'use strict';
  9 +const serviceAPI = global.yoho.ServiceAPI;
  10 +
  11 +module.exports = {
  12 +
  13 + /* 资讯列表页数据获取 */
  14 + getNewsListData(params) {
  15 + return serviceAPI.get('/guang/api/v2/article/getList', {
  16 + sort_id: params.sortId,
  17 + gender: params.gender,
  18 + author_id: params.authorId,
  19 + tag: params.tag,
  20 + uid: params.uid,
  21 + udid: params.udid,
  22 + page: params.page,
  23 + limit: params.limit,
  24 + app_type: '1'
  25 + });
  26 + }
  27 +};
  1 +/**
  2 + * Created by PhpStorm.
  3 + * User: Targaryen
  4 + * Date: 2016/7/27
  5 + * Time: 10:11
  6 + */
  7 +'use strict';
  8 +
  9 +const logger = global.yoho.logger;
  10 +const api = global.yoho.API;
  11 +const newsListApi = require('./list-api');
  12 +
  13 +const newsList = params => {
  14 + let finalResult = {};
  15 +
  16 + return api.all([
  17 + newsListApi.getNewsListData(params)
  18 + ]).then(result => {
  19 + if (result.code === 200) {
  20 + Object.assign(finalResult, result.data);
  21 + } else {
  22 + logger.error('getNewsListData api code no 200 or allList is null');
  23 + }
  24 +
  25 + return finalResult;
  26 + });
  27 +};
  28 +
  29 +module.exports = {
  30 + newsList
  31 +};
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 Wed Jul 27 10:16:29 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.75 -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="uniE60F" unicode="&#xe60f;"  
78 -d="M337 406.5q7 6.5 7 20.5q0 13 -7 20q-7 6 -22 6h-6v-53h5q16 0 23 6.5zM320 360h-11v-56h15q21 0 30 7q9 8 9 21q0 12 -9 20t-34 8zM811 890h-598q-86 0 -146.5 -60.5t-60.5 -146.5v-598q0 -86 60.5 -146.5t146.5 -60.5h598q86 0 146.5 60.5t60.5 146.5v598  
79 -q0 86 -60.5 146.5t-146.5 60.5zM388 282q-12 -12 -28 -17t-39 -5h-57v236h39q23 0 37 -4q15 -4 25 -13q11 -9 17 -23t6 -28q0 -23 -14 -39q14 -7 23 -20q11 -17 11 -39q0 -28 -20 -48zM556 260h-111v236h46v-192h65v-44zM767 260h-60l-78 97h-1v-97h-45v236h45v-81l79 81h62  
80 -l-108 -108z" />  
81 - <glyph glyph-name="uniE610" unicode="&#xe610;"  
82 -d="M0 896v-1024q139 0 272 37t245 103t206.5 160.5t160.5 206.5t103 245t37 272h-1024zM657 281l-44 -43l-201 201l-201 -201l-43 43l201 201l-201 201l43 43l201 -201l201 201l44 -43l-201 -201z" />  
83 - <glyph glyph-name="uniE611" unicode="&#xe611;" horiz-adv-x="1313"  
84 -d="M1303 363l-599 533v-330q-159 -4 -283.5 -41t-196.5 -93t-122 -124t-69.5 -134t-27 -121.5t-6 -89t2.5 -34.5q65 83 120.5 131t136 82.5t184 47.5t261.5 15v-330z" />  
85 - <glyph glyph-name="uniE612" unicode="&#xe612;"  
86 -d="M490 406h-223v-44h267v356h-44v-312zM512 874q-100 0 -190.5 -39t-156 -104.5t-104.5 -156t-39 -190.5t39 -190.5t104.5 -156t156 -104.5t190.5 -39t190.5 39t156 104.5t104.5 156t39 190.5t-39 190.5t-104.5 156t-156 104.5t-190.5 39zM512 -54q-89 0 -170 34.5  
87 -t-140 93.5t-93.5 140t-34.5 170t34.5 170t93.5 140t140 93.5t170 34.5t170 -34.5t140 -93.5t93.5 -140t34.5 -170t-34.5 -170t-93.5 -140t-140 -93.5t-170 -34.5z" />  
88 - <glyph glyph-name="uniE617" unicode="&#xe617;"  
89 -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" />  
90 - </font>  
91 -</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;" d="" />
  10 +<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" />
  11 +<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" />
  12 +<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" />
  13 +<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" />
  14 +<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" />
  15 +<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" />
  16 +<glyph unicode="&#xe606;" glyph-name="left" d="M245 384l-9 9 472 472 80-80-400-401 400-401-80-80-472 472z" />
  17 +<glyph unicode="&#xe607;" glyph-name="right" d="M785 384l13 13-488 487-84-84 416-416-416-416 84-84 488 487z" />
  18 +<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" />
  19 +<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" />
  20 +<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" />
  21 +<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" />
  22 +<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" />
  23 +<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" />
  24 +<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" />
  25 +<glyph unicode="&#xe60f;" glyph-name="blk" d="M337 406.5q7 6.5 7 20.5 0 13-7 20-7 6-22 6h-6v-53h5q16 0 23 6.5zM320 360h-11v-56h15q21 0 30 7 9 8 9 21 0 12-9 20t-34 8zM811 890h-598q-86 0-146.5-60.5t-60.5-146.5v-598q0-86 60.5-146.5t146.5-60.5h598q86 0 146.5 60.5t60.5 146.5v598q0 86-60.5 146.5t-146.5 60.5zM388 282q-12-12-28-17t-39-5h-57v236h39q23 0 37-4 15-4 25-13 11-9 17-23t6-28q0-23-14-39 14-7 23-20 11-17 11-39 0-28-20-48zM556 260h-111v236h46v-192h65v-44zM767 260h-60l-78 97h-1v-97h-45v236h45v-81l79 81h62l-108-108z" />
  26 +<glyph unicode="&#xe610;" glyph-name="importedlayers" d="M0 896v-1024q139 0 272 37t245 103 206.5 160.5 160.5 206.5 103 245 37 272h-1024zM657 281l-44-43-201 201-201-201-43 43 201 201-201 201 43 43 201-201 201 201 44-43-201-201z" />
  27 +<glyph unicode="&#xe611;" glyph-name="sharenews" horiz-adv-x="1313" d="M1303 363l-599 533v-330q-159-4-283.5-41t-196.5-93-122-124-69.5-134-27-121.5-6-89 2.5-34.5q65 83 120.5 131t136 82.5 184 47.5 261.5 15v-330z" />
  28 +<glyph unicode="&#xe612;" glyph-name="timeshare" d="M490 406h-223v-44h267v356h-44v-312zM512 874q-100 0-190.5-39t-156-104.5-104.5-156-39-190.5 39-190.5 104.5-156 156-104.5 190.5-39 190.5 39 156 104.5 104.5 156 39 190.5-39 190.5-104.5 156-156 104.5-190.5 39zM512-54q-89 0-170 34.5t-140 93.5-93.5 140-34.5 170 34.5 170 93.5 140 140 93.5 170 34.5 170-34.5 140-93.5 93.5-140 34.5-170-34.5-170-93.5-140-140-93.5-170-34.5z" />
  29 +<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" />
  30 +<glyph unicode="&#xe900;" glyph-name="notdef" horiz-adv-x="374" d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
  31 +<glyph unicode="&#xe905;" glyph-name="sort-asc" horiz-adv-x="585" d="M585.143 475.428q0-14.857-10.857-25.714t-25.714-10.857h-512q-14.857 0-25.714 10.857t-10.857 25.714 10.857 25.714l256 256q10.857 10.857 25.714 10.857t25.714-10.857l256-256q10.857-10.857 10.857-25.714z" />
  32 +<glyph unicode="&#xe906;" glyph-name="sort-desc" horiz-adv-x="585" d="M585.143 256q0-14.857-10.857-25.714l-256-256q-10.857-10.857-25.714-10.857t-25.714 10.857l-256 256q-10.857 10.857-10.857 25.714t10.857 25.714 25.714 10.857h512q14.857 0 25.714-10.857t10.857-25.714z" />
  33 +<glyph unicode="&#xe909;" 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" />
  34 +</font></defs></svg>
No preview for this file type
No preview for this file type
@@ -55,6 +55,13 @@ Vue.filter('brandUrl', (value)=> { @@ -55,6 +55,13 @@ Vue.filter('brandUrl', (value)=> {
55 }); 55 });
56 56
57 /** 57 /**
  58 + * 产品 URL
  59 + */
  60 +Vue.filter('goodsUrl', productId => {
  61 + return `/product/${productId}`;
  62 +});
  63 +
  64 +/**
58 * 订单状态 65 * 订单状态
59 * @example 66 * @example
60 * {value | order} 67 * {value | order}
@@ -7,19 +7,19 @@ $(function() { @@ -7,19 +7,19 @@ $(function() {
7 return [ 7 return [
8 { 8 {
9 txt: '默认', 9 txt: '默认',
10 - val: 1 10 + val: ''
11 }, { 11 }, {
12 txt: '最新', 12 txt: '最新',
13 - val: 2 13 + val: 's_t_desc'
14 }, { 14 }, {
15 type: 'updown', 15 type: 'updown',
16 txt: '价格', 16 txt: '价格',
17 - val: [3, 4] // [up, down] 17 + val: ['s_p_asc', 's_p_desc'] // [up, down]
18 }, 18 },
19 { 19 {
20 type: 'updown', 20 type: 'updown',
21 txt: '折扣', 21 txt: '折扣',
22 - val: [5, 6] 22 + val: ['p_d_asc', 'p_d_desc']
23 } 23 }
24 ]; 24 ];
25 }; 25 };
@@ -11,6 +11,12 @@ @@ -11,6 +11,12 @@
11 11
12 const tip = require('common/tip'); 12 const tip = require('common/tip');
13 13
  14 +/* 空方法 */
  15 +const nullFun = () =>{};
  16 +
  17 +/* 提示信息 */
  18 +const tipInfo = '暂不支持，请在BLK应用中打开';
  19 +
14 const yoho = { 20 const yoho = {
15 /** 21 /**
16 * 判断是否是 APP 22 * 判断是否是 APP
@@ -30,12 +36,12 @@ const yoho = { @@ -30,12 +36,12 @@ const yoho = {
30 */ 36 */
31 goTap(args, success, fail) { 37 goTap(args, success, fail) {
32 if (this.isApp) { 38 if (this.isApp) {
33 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 39 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
34 method: 'go.tab', 40 method: 'go.tab',
35 arguments: args 41 arguments: args
36 }); 42 });
37 } else { 43 } else {
38 - tip('暂不支持，请在BLK应用中打开'); 44 + tip(tipInfo);
39 } 45 }
40 }, 46 },
41 47
@@ -47,12 +53,12 @@ const yoho = { @@ -47,12 +53,12 @@ const yoho = {
47 */ 53 */
48 goLogin(args, success, fail) { 54 goLogin(args, success, fail) {
49 if (this.isApp) { 55 if (this.isApp) {
50 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 56 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
51 method: 'go.login', 57 method: 'go.login',
52 arguments: args 58 arguments: args
53 }); 59 });
54 } else { 60 } else {
55 - tip('暂不支持，请在BLK应用中打开'); 61 + tip(tipInfo);
56 } 62 }
57 }, 63 },
58 64
@@ -64,12 +70,12 @@ const yoho = { @@ -64,12 +70,12 @@ const yoho = {
64 */ 70 */
65 goLogout(args, success, fail) { 71 goLogout(args, success, fail) {
66 if (this.isApp) { 72 if (this.isApp) {
67 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 73 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
68 method: 'go.loginout', 74 method: 'go.loginout',
69 arguments: args 75 arguments: args
70 }); 76 });
71 } else { 77 } else {
72 - tip('暂不支持，请在BLK应用中打开'); 78 + tip(tipInfo);
73 } 79 }
74 }, 80 },
75 81
@@ -81,12 +87,12 @@ const yoho = { @@ -81,12 +87,12 @@ const yoho = {
81 */ 87 */
82 goShopingKey(args, success, fail) { 88 goShopingKey(args, success, fail) {
83 if (this.isApp) { 89 if (this.isApp) {
84 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 90 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
85 method: 'go.shoppingkey', 91 method: 'go.shoppingkey',
86 arguments: args 92 arguments: args
87 }); 93 });
88 } else { 94 } else {
89 - tip('暂不支持，请在BLK应用中打开'); 95 + tip(tipInfo);
90 } 96 }
91 }, 97 },
92 98
@@ -98,12 +104,12 @@ const yoho = { @@ -98,12 +104,12 @@ const yoho = {
98 */ 104 */
99 goShopingCart(args, success, fail) { 105 goShopingCart(args, success, fail) {
100 if (this.isApp) { 106 if (this.isApp) {
101 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 107 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
102 method: 'go.shopingCart', 108 method: 'go.shopingCart',
103 arguments: args 109 arguments: args
104 }); 110 });
105 } else { 111 } else {
106 - tip('暂不支持，请在BLK应用中打开'); 112 + tip(tipInfo);
107 } 113 }
108 }, 114 },
109 115
@@ -115,12 +121,12 @@ const yoho = { @@ -115,12 +121,12 @@ const yoho = {
115 */ 121 */
116 goAddress(args, success, fail) { 122 goAddress(args, success, fail) {
117 if (this.isApp) { 123 if (this.isApp) {
118 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 124 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
119 method: 'go.address', 125 method: 'go.address',
120 arguments: args 126 arguments: args
121 }); 127 });
122 } else { 128 } else {
123 - tip('暂不支持，请在BLK应用中打开'); 129 + tip(tipInfo);
124 } 130 }
125 }, 131 },
126 132
@@ -132,12 +138,12 @@ const yoho = { @@ -132,12 +138,12 @@ const yoho = {
132 */ 138 */
133 goImageBrowser(args, success, fail) { 139 goImageBrowser(args, success, fail) {
134 if (this.isApp) { 140 if (this.isApp) {
135 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 141 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
136 method: 'go.imageBrowser', 142 method: 'go.imageBrowser',
137 arguments: args 143 arguments: args
138 }); 144 });
139 } else { 145 } else {
140 - tip('暂不支持，请在BLK应用中打开'); 146 + tip(tipInfo);
141 } 147 }
142 }, 148 },
143 149
@@ -149,12 +155,12 @@ const yoho = { @@ -149,12 +155,12 @@ const yoho = {
149 */ 155 */
150 goNewPage(args, success, fail) { 156 goNewPage(args, success, fail) {
151 if (this.isApp) { 157 if (this.isApp) {
152 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 158 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
153 method: 'go.newPage', 159 method: 'go.newPage',
154 arguments: args 160 arguments: args
155 }); 161 });
156 } else { 162 } else {
157 - tip('暂不支持，请在BLK应用中打开'); 163 + tip(tipInfo);
158 } 164 }
159 }, 165 },
160 166
@@ -166,29 +172,29 @@ const yoho = { @@ -166,29 +172,29 @@ const yoho = {
166 */ 172 */
167 goPay(args, success, fail) { 173 goPay(args, success, fail) {
168 if (this.isApp) { 174 if (this.isApp) {
169 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 175 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
170 method: 'go.pay', 176 method: 'go.pay',
171 arguments: args 177 arguments: args
172 }); 178 });
173 } else { 179 } else {
174 - tip('暂不支持，请在BLK应用中打开'); 180 + tip(tipInfo);
175 } 181 }
176 }, 182 },
177 183
178 /** 184 /**
179 * 返回上一级页面 185 * 返回上一级页面
180 - * @param args {} 186 + * @param args {""}
181 * @param success 187 * @param success
182 * @param fail 188 * @param fail
183 */ 189 */
184 goBack(args, success, fail) { 190 goBack(args, success, fail) {
185 if (this.isApp) { 191 if (this.isApp) {
186 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 192 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
187 method: 'go.back', 193 method: 'go.back',
188 arguments: args 194 arguments: args
189 }); 195 });
190 } else { 196 } else {
191 - tip('暂不支持，请在BLK应用中打开'); 197 + tip(tipInfo);
192 } 198 }
193 }, 199 },
194 200
@@ -200,18 +206,18 @@ const yoho = { @@ -200,18 +206,18 @@ const yoho = {
200 */ 206 */
201 goShare(args, success, fail) { 207 goShare(args, success, fail) {
202 if (this.isApp) { 208 if (this.isApp) {
203 - window.yohoInterface.triggerEvent(success || function() {}, fail || function() {}, { 209 + window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
204 method: 'go.share', 210 method: 'go.share',
205 arguments: args 211 arguments: args
206 }); 212 });
207 } else { 213 } else {
208 - tip('暂不支持，请在BLK应用中打开'); 214 + tip(tipInfo);
209 } 215 }
210 }, 216 },
211 217
212 /** 218 /**
213 * 跳转到搜索页面 219 * 跳转到搜索页面
214 - * @param args {} 220 + * @param args {""}
215 * @param success 221 * @param success
216 * @param fail 222 * @param fail
217 */ 223 */
@@ -222,13 +228,13 @@ const yoho = { @@ -222,13 +228,13 @@ const yoho = {
222 arguments: args 228 arguments: args
223 }); 229 });
224 } else { 230 } else {
225 - tip('暂不支持，请在BLK应用中打开'); 231 + tip(tipInfo);
226 } 232 }
227 }, 233 },
228 234
229 /** 235 /**
230 * 跳转到设置页面 236 * 跳转到设置页面
231 - * @param args {} 237 + * @param args {""}
232 * @param success 238 * @param success
233 * @param fail 239 * @param fail
234 */ 240 */
@@ -239,7 +245,7 @@ const yoho = { @@ -239,7 +245,7 @@ const yoho = {
239 arguments: args 245 arguments: args
240 }); 246 });
241 } else { 247 } else {
242 - tip('暂不支持，请在BLK应用中打开'); 248 + tip(tipInfo);
243 } 249 }
244 }, 250 },
245 251
@@ -15,22 +15,37 @@ @@ -15,22 +15,37 @@
15 font-variant: normal; 15 font-variant: normal;
16 text-transform: none; 16 text-transform: none;
17 line-height: 1; 17 line-height: 1;
18 -  
19 /* Better Font Rendering =========== */ 18 /* Better Font Rendering =========== */
20 -webkit-font-smoothing: antialiased; 19 -webkit-font-smoothing: antialiased;
21 -moz-osx-font-smoothing: grayscale; 20 -moz-osx-font-smoothing: grayscale;
22 } 21 }
23 22
  23 +.icon-notdef:before {
  24 + content: "\e900";
  25 +}
  26 +
  27 +.icon-x:before {
  28 + content: "\e909";
  29 +}
  30 +
  31 +.icon-delete:before {
  32 + content: "\e600";
  33 +}
  34 +
24 .icon-bag:before { 35 .icon-bag:before {
25 content: "\e601"; 36 content: "\e601";
26 } 37 }
27 38
  39 +.icon-down:before {
  40 + content: "\e602";
  41 +}
  42 +
28 .icon-check:before { 43 .icon-check:before {
29 content: "\e603"; 44 content: "\e603";
30 } 45 }
31 46
32 -.icon-yoho-share:before {  
33 - content: "\e60a"; 47 +.icon-love:before {
  48 + content: "\e604";
34 } 49 }
35 50
36 .icon-close:before { 51 .icon-close:before {
@@ -49,26 +64,14 @@ @@ -49,26 +64,14 @@
49 content: "\e608"; 64 content: "\e608";
50 } 65 }
51 66
52 -.icon-down:before {  
53 - content: "\e602";  
54 -}  
55 -  
56 -.icon-up:before {  
57 - content: "\e617";  
58 -}  
59 -  
60 -.icon-delete:before {  
61 - content: "\e600";  
62 -}  
63 -  
64 -.icon-love:before {  
65 - content: "\e604";  
66 -}  
67 -  
68 .icon-love-solid:before { 67 .icon-love-solid:before {
69 content: "\e609"; 68 content: "\e609";
70 } 69 }
71 70
  71 +.icon-yoho-share:before {
  72 + content: "\e60a";
  73 +}
  74 +
72 .icon-filter:before { 75 .icon-filter:before {
73 content: "\e60b"; 76 content: "\e60b";
74 } 77 }
@@ -100,3 +103,15 @@ @@ -100,3 +103,15 @@
100 .icon-timeshare:before { 103 .icon-timeshare:before {
101 content: "\e612"; 104 content: "\e612";
102 } 105 }
  106 +
  107 +.icon-up:before {
  108 + content: "\e617";
  109 +}
  110 +
  111 +.icon-sort-asc:before {
  112 + content: "\e905";
  113 +}
  114 +
  115 +.icon-sort-desc:before {
  116 + content: "\e906";
  117 +}
1 -.yoho-favorite-page {  
2 - width: 100%;  
3 - height: auto;  
4 -  
5 - .fav-content {  
6 - .fav-type {  
7 - display: block;  
8 - }  
9 -  
10 - .fav-product-list {  
11 - padding-left: 20px;  
12 - list-style: none;  
13 -  
14 - li {  
15 - height: 205px;  
16 - overflow: hidden;  
17 - margin-top: 20px;  
18 - }  
19 -  
20 - .fav-del-left {  
21 - display: none;  
22 - float: left;  
23 - width: 50px;  
24 - height: 100%;  
25 -  
26 - .fav-del-span {  
27 - display: inline-block;  
28 - width: 35px;  
29 - height: 35px;  
30 - margin-right: 15px;  
31 - margin-top: 80px;  
32 - background: resolve("home/fav/fav-del.png");  
33 - background-size: 100%;  
34 - }  
35 - }  
36 -  
37 - .delshow {  
38 - display: block;  
39 - }  
40 -  
41 - .fav-del-right {  
42 - position: absolute;  
43 - top: 0;  
44 - right: -126px;  
45 - background: #ff3b30;  
46 - width: 126px;  
47 - height: 200px;  
48 - text-align: center;  
49 -  
50 - .fav-del-btn {  
51 - display: inline-block;  
52 - width: 35px;  
53 - height: 43px;  
54 - margin-top: 50px;  
55 - background: resolve("home/fav/fav-del-btn.png");  
56 - background-size: 100%;  
57 - }  
58 -  
59 - .fav-del-txt {  
60 - font-size: 24px;  
61 - color: #fff;  
62 - }  
63 - }  
64 -  
65 - .fav-img-box {  
66 - width: 152px;  
67 - height: 203px;  
68 - float: left;  
69 - margin-right: 24px;  
70 -  
71 - img {  
72 - display: block;  
73 - overflow: hidden;  
74 - width: 100%;  
75 - height: 100%;  
76 - }  
77 - }  
78 -  
79 - .fav-info-list {  
80 - color: #444;  
81 - font-size: 24px;  
82 - border-bottom: 1px solid #e0e0e0;  
83 - padding-bottom: 20px;  
84 - margin-right: 5px;  
85 - height: 203px;  
86 - overflow: hidden;  
87 - position: relative;  
88 -  
89 - .title {  
90 - width: 430px;  
91 - text-overflow: ellipsis;  
92 - font-size: 28px;  
93 - margin: 0;  
94 - }  
95 -  
96 - .fav-price {  
97 - margin-top: 20px;  
98 - }  
99 -  
100 - .new-price {  
101 - color: #d1021c;  
102 - font-size: 24px;  
103 - }  
104 -  
105 - .price-underline {  
106 - text-decoration: line-through;  
107 - margin-left: 15px;  
108 - color: #b0b0b0;  
109 - font-size: 24px;  
110 - }  
111 -  
112 - .save-price {  
113 - position: absolute;  
114 - bottom: 20px;  
115 - left: 0;  
116 - width: 100%;  
117 - min-height: 24px;  
118 - }  
119 -  
120 - .sell-out {  
121 - float: right;  
122 - padding: 5px 18px;  
123 - color: #b0b0b0;  
124 - border-radius: 20px;  
125 - font-size: 22px;  
126 - }  
127 - }  
128 - }  
129 -  
130 - .fav-null {  
131 - font-size: 22px;  
132 - color: #444;  
133 - display: block;  
134 - margin-top: 100px;  
135 - text-align: center;  
136 -  
137 - &:before {  
138 - content: "";  
139 - display: block;  
140 - width: 188px;  
141 - height: 171px;  
142 - background: resolve("home/fav/fav-null.png");  
143 - background-size: 100% 100%;  
144 - margin: 0 auto 45px;  
145 - }  
146 - }  
147 -  
148 - .go-shopping {  
149 - width: 472px;  
150 - height: 88px;  
151 - line-height: 88px;  
152 - margin: 80px auto 0;  
153 - background: #444;  
154 - text-align: center;  
155 - color: #fff;  
156 - display: block;  
157 - font-size: 26px;  
158 - border-radius: 0.2rem;  
159 - }  
160 - }  
161 -}  
162 -  
163 -.yoho-favorite-brand-page {  
164 - width: 100%;  
165 - height: auto;  
166 -  
167 - .fav-content {  
168 - .fav-type {  
169 - display: block;  
170 - }  
171 -  
172 - .fav-brand-list {  
173 - padding-left: 20px;  
174 - list-style: none;  
175 -  
176 - li {  
177 - height: 135px;  
178 - overflow: hidden;  
179 - margin-top: 20px;  
180 - border-bottom: 1px solid #e0e0e0;  
181 - }  
182 -  
183 - .fav-del-left {  
184 - display: none;  
185 - float: left;  
186 - width: 50px;  
187 - height: 100%;  
188 -  
189 - .fav-del-span {  
190 - display: inline-block;  
191 - width: 35px;  
192 - height: 35px;  
193 - margin-right: 15px;  
194 - margin-top: 50px;  
195 - background: resolve("home/fav/fav-del.png");  
196 - background-size: 100%;  
197 - }  
198 - }  
199 -  
200 - .delshow {  
201 - display: block;  
202 - }  
203 -  
204 - .fav-del-right {  
205 - position: absolute;  
206 - top: 0;  
207 - right: -126px;  
208 - background: #ff3b30;  
209 - width: 126px;  
210 - height: 125px;  
211 - text-align: center;  
212 -  
213 - .fav-del-btn {  
214 - display: inline-block;  
215 - width: 35px;  
216 - height: 43px;  
217 - margin-top: 30px;  
218 - background: resolve("home/fav/fav-del-btn.png");  
219 - background-size: 100%;  
220 - }  
221 -  
222 - .fav-del-txt {  
223 - font-size: 24px;  
224 - color: #fff;  
225 - }  
226 - }  
227 -  
228 - .fav-img-box {  
229 - width: 160px;  
230 - height: 125px;  
231 - float: left;  
232 - margin-right: 24px;  
233 -  
234 - img {  
235 - display: block;  
236 - overflow: hidden;  
237 - width: 100%;  
238 - height: 100%;  
239 - }  
240 - }  
241 -  
242 - .fav-info-list {  
243 - color: #444;  
244 - font-size: 24px;  
245 - padding-bottom: 10px;  
246 - margin-right: 10px;  
247 - margin-top: 35px;  
248 - height: 100px;  
249 - overflow: hidden;  
250 - position: relative;  
251 -  
252 - .title {  
253 - width: 430px;  
254 - color: #b0b0b0;  
255 - text-overflow: ellipsis;  
256 - font-size: 34px;  
257 - margin: 0;  
258 - }  
259 - }  
260 -  
261 - span {  
262 - &.down {  
263 - float: right;  
264 - padding: 5px 18px;  
265 - color: #fffefe;  
266 - background: #b0b0b0;  
267 - border-radius: 20px;  
268 - font-size: 22px;  
269 - }  
270 - }  
271 - }  
272 -  
273 - .fav-null {  
274 - font-size: 22px;  
275 - color: #444;  
276 - display: block;  
277 - margin-top: 100px;  
278 - text-align: center;  
279 -  
280 - &:before {  
281 - content: "";  
282 - display: block;  
283 - width: 188px;  
284 - height: 171px;  
285 - background: resolve("home/fav/fav-null.png");  
286 - background-size: 100% 100%;  
287 - margin: 0 auto 45px;  
288 - }  
289 - }  
290 -  
291 - .go-shopping {  
292 - width: 472px;  
293 - height: 88px;  
294 - line-height: 88px;  
295 - margin: 80px auto 0;  
296 - background: #444;  
297 - text-align: center;  
298 - color: #fff;  
299 - display: block;  
300 - font-size: 26px;  
301 - border-radius: 0.2rem;  
302 - }  
303 - }  
304 -}  
1 @import "home"; 1 @import "home";
2 @import "help"; 2 @import "help";
3 @import "feedback"; 3 @import "feedback";
4 -@import "fav";  
5 -@import "details";  
6 @import "about-us"; 4 @import "about-us";
7 @import "coin"; 5 @import "coin";
8 -@import "logistics";  
9 -@import "exchange-status";  
  6 +@import "exchange-status";
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <ul class="cardlist card-large clearfix"> 3 <ul class="cardlist card-large clearfix">
4 <li class="card" v-for="item in data"> 4 <li class="card" v-for="item in data">
5 <div class="card-pic"> 5 <div class="card-pic">
6 - <a href="/product/{{item.productId}}"> 6 + <a href="{{item.productId | goodsUrl}}">
7 <img v-lazy="item.goodsList[0].imagesUrl | resize 372 499" alt="{{item.productName}}"> 7 <img v-lazy="item.goodsList[0].imagesUrl | resize 372 499" alt="{{item.productName}}">
8 </a> 8 </a>
9 </div> 9 </div>
@@ -91,6 +91,7 @@ @@ -91,6 +91,7 @@
91 .card-label { 91 .card-label {
92 margin: 0 0 10px; 92 margin: 0 0 10px;
93 font-size: 24px; 93 font-size: 24px;
  94 + height: 65px;
94 font-weight: normal; 95 font-weight: normal;
95 } 96 }
96 } 97 }
@@ -26,7 +26,7 @@ module.exports = { @@ -26,7 +26,7 @@ module.exports = {
26 config: Array, 26 config: Array,
27 27
28 // 初始值 可以进行双向绑定 28 // 初始值 可以进行双向绑定
29 - val: Number 29 + val: String
30 }, 30 },
31 components: { 31 components: {
32 simple, 32 simple,
@@ -117,3 +117,147 @@ @@ -117,3 +117,147 @@
117 }; 117 };
118 </script> 118 </script>
119 119
  120 +<style>
  121 + .yoho-favorite-brand-page {
  122 + width: 100%;
  123 + height: auto;
  124 +
  125 + .fav-content {
  126 + .fav-type {
  127 + display: block;
  128 + }
  129 +
  130 + .fav-brand-list {
  131 + padding-left: 20px;
  132 + list-style: none;
  133 +
  134 + li {
  135 + height: 135px;
  136 + overflow: hidden;
  137 + margin-top: 20px;
  138 + border-bottom: 1px solid #e0e0e0;
  139 + }
  140 +
  141 + .fav-del-left {
  142 + display: none;
  143 + float: left;
  144 + width: 50px;
  145 + height: 100%;
  146 +
  147 + .fav-del-span {
  148 + display: inline-block;
  149 + width: 35px;
  150 + height: 35px;
  151 + margin-right: 15px;
  152 + margin-top: 50px;
  153 + background: resolve("home/fav/fav-del.png");
  154 + background-size: 100%;
  155 + }
  156 + }
  157 +
  158 + .delshow {
  159 + display: block;
  160 + }
  161 +
  162 + .fav-del-right {
  163 + position: absolute;
  164 + top: 0;
  165 + right: -126px;
  166 + background: #ff3b30;
  167 + width: 126px;
  168 + height: 125px;
  169 + text-align: center;
  170 +
  171 + .fav-del-btn {
  172 + display: inline-block;
  173 + width: 35px;
  174 + height: 43px;
  175 + margin-top: 30px;
  176 + background: resolve("home/fav/fav-del-btn.png");
  177 + background-size: 100%;
  178 + }
  179 +
  180 + .fav-del-txt {
  181 + font-size: 24px;
  182 + color: #fff;
  183 + }
  184 + }
  185 +
  186 + .fav-img-box {
  187 + width: 160px;
  188 + height: 125px;
  189 + float: left;
  190 + margin-right: 24px;
  191 +
  192 + img {
  193 + display: block;
  194 + overflow: hidden;
  195 + width: 100%;
  196 + height: 100%;
  197 + }
  198 + }
  199 +
  200 + .fav-info-list {
  201 + color: #444;
  202 + font-size: 24px;
  203 + padding-bottom: 10px;
  204 + margin-right: 10px;
  205 + margin-top: 35px;
  206 + height: 100px;
  207 + overflow: hidden;
  208 + position: relative;
  209 +
  210 + .title {
  211 + width: 430px;
  212 + color: #b0b0b0;
  213 + text-overflow: ellipsis;
  214 + font-size: 34px;
  215 + margin: 0;
  216 + }
  217 + }
  218 +
  219 + span {
  220 + &.down {
  221 + float: right;
  222 + padding: 5px 18px;
  223 + color: #fffefe;
  224 + background: #b0b0b0;
  225 + border-radius: 20px;
  226 + font-size: 22px;
  227 + }
  228 + }
  229 + }
  230 +
  231 + .fav-null {
  232 + font-size: 22px;
  233 + color: #444;
  234 + display: block;
  235 + margin-top: 100px;
  236 + text-align: center;
  237 +
  238 + &:before {
  239 + content: "";
  240 + display: block;
  241 + width: 188px;
  242 + height: 171px;
  243 + background: resolve("home/fav/fav-null.png");
  244 + background-size: 100% 100%;
  245 + margin: 0 auto 45px;
  246 + }
  247 + }
  248 +
  249 + .go-shopping {
  250 + width: 472px;
  251 + height: 88px;
  252 + line-height: 88px;
  253 + margin: 80px auto 0;
  254 + background: #444;
  255 + text-align: center;
  256 + color: #fff;
  257 + display: block;
  258 + font-size: 26px;
  259 + border-radius: 0.2rem;
  260 + }
  261 + }
  262 + }
  263 +</style>
@@ -124,3 +124,166 @@ @@ -124,3 +124,166 @@
124 }; 124 };
125 </script> 125 </script>
126 126
  127 +<style>
  128 + .yoho-favorite-page {
  129 + width: 100%;
  130 + height: auto;
  131 +
  132 + .fav-content {
  133 + .fav-type {
  134 + display: block;
  135 + }
  136 +
  137 + .fav-product-list {
  138 + padding-left: 20px;
  139 + list-style: none;
  140 +
  141 + li {
  142 + height: 205px;
  143 + overflow: hidden;
  144 + margin-top: 20px;
  145 + }
  146 +
  147 + .fav-del-left {
  148 + display: none;
  149 + float: left;
  150 + width: 50px;
  151 + height: 100%;
  152 +
  153 + .fav-del-span {
  154 + display: inline-block;
  155 + width: 35px;
  156 + height: 35px;
  157 + margin-right: 15px;
  158 + margin-top: 80px;
  159 + background: resolve("home/fav/fav-del.png");
  160 + background-size: 100%;
  161 + }
  162 + }
  163 +
  164 + .delshow {
  165 + display: block;
  166 + }
  167 +
  168 + .fav-del-right {
  169 + position: absolute;
  170 + top: 0;
  171 + right: -126px;
  172 + background: #ff3b30;
  173 + width: 126px;
  174 + height: 200px;
  175 + text-align: center;
  176 +
  177 + .fav-del-btn {
  178 + display: inline-block;
  179 + width: 35px;
  180 + height: 43px;
  181 + margin-top: 50px;
  182 + background: resolve("home/fav/fav-del-btn.png");
  183 + background-size: 100%;
  184 + }
  185 +
  186 + .fav-del-txt {
  187 + font-size: 24px;
  188 + color: #fff;
  189 + }
  190 + }
  191 +
  192 + .fav-img-box {
  193 + width: 152px;
  194 + height: 203px;
  195 + float: left;
  196 + margin-right: 24px;
  197 +
  198 + img {
  199 + display: block;
  200 + overflow: hidden;
  201 + width: 100%;
  202 + height: 100%;
  203 + }
  204 + }
  205 +
  206 + .fav-info-list {
  207 + color: #444;
  208 + font-size: 24px;
  209 + border-bottom: 1px solid #e0e0e0;
  210 + padding-bottom: 20px;
  211 + margin-right: 5px;
  212 + height: 203px;
  213 + overflow: hidden;
  214 + position: relative;
  215 +
  216 + .title {
  217 + width: 430px;
  218 + text-overflow: ellipsis;
  219 + font-size: 28px;
  220 + margin: 0;
  221 + }
  222 +
  223 + .fav-price {
  224 + margin-top: 20px;
  225 + }
  226 +
  227 + .new-price {
  228 + color: #d1021c;
  229 + font-size: 24px;
  230 + }
  231 +
  232 + .price-underline {
  233 + text-decoration: line-through;
  234 + margin-left: 15px;
  235 + color: #b0b0b0;
  236 + font-size: 24px;
  237 + }
  238 +
  239 + .save-price {
  240 + position: absolute;
  241 + bottom: 20px;
  242 + left: 0;
  243 + width: 100%;
  244 + min-height: 24px;
  245 + }
  246 +
  247 + .sell-out {
  248 + float: right;
  249 + padding: 5px 18px;
  250 + color: #b0b0b0;
  251 + border-radius: 20px;
  252 + font-size: 22px;
  253 + }
  254 + }
  255 + }
  256 +
  257 + .fav-null {
  258 + font-size: 22px;
  259 + color: #444;
  260 + display: block;
  261 + margin-top: 100px;
  262 + text-align: center;
  263 +
  264 + &:before {
  265 + content: "";
  266 + display: block;
  267 + width: 188px;
  268 + height: 171px;
  269 + background: resolve("home/fav/fav-null.png");
  270 + background-size: 100% 100%;
  271 + margin: 0 auto 45px;
  272 + }
  273 + }
  274 +
  275 + .go-shopping {
  276 + width: 472px;
  277 + height: 88px;
  278 + line-height: 88px;
  279 + margin: 80px auto 0;
  280 + background: #444;
  281 + text-align: center;
  282 + color: #fff;
  283 + display: block;
  284 + font-size: 26px;
  285 + border-radius: 0.2rem;
  286 + }
  287 + }
  288 + }
  289 +</style>
@@ -64,3 +64,7 @@ @@ -64,3 +64,7 @@
64 64
65 }; 65 };
66 </script> 66 </script>
  67 +
  68 +<style>
  69 + @import "../../scss/home/_details.css";
  70 +</style>
@@ -66,5 +66,8 @@ @@ -66,5 +66,8 @@
66 } 66 }
67 } 67 }
68 }; 68 };
69 -  
70 </script> 69 </script>
  70 +
  71 +<style>
  72 + @import "../../scss/home/_logistics.css";
  73 +</style>
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 38
39 // query 39 // query
40 url: '/product/search.json', 40 url: '/product/search.json',
41 - sort: null, 41 + sort: '',
42 query: qs.query, 42 query: qs.query,
43 page: 0, // 未搜索 page=0; 全部加载完 page = totalPage; 无数据: page !=0 && productList.length=0 43 page: 0, // 未搜索 page=0; 全部加载完 page = totalPage; 无数据: page !=0 && productList.length=0
44 totalPage: null, 44 totalPage: null,
1 <template> 1 <template>
2 <div v-if="shopInfo.isBlkShop" class="brand-top-box" v-bind:style="{ 'background-image': `url(${shopInfo.brandBg})` }"> 2 <div v-if="shopInfo.isBlkShop" class="brand-top-box" v-bind:style="{ 'background-image': `url(${shopInfo.brandBg})` }">
3 <div class="brand-bottom"> 3 <div class="brand-bottom">
4 - <img v-if="shopInfo.showBrandLogo" v-lazy="brandIntro.brandLogo" alt="{{ shopInfo.brandName }}"> 4 + <img v-if="shopInfo.brandLogo" v-lazy="brandIntro.brandLogo" alt="{{ shopInfo.brandName }}">
5 <div v-else class="brand-title">{{ shopInfo.brandName }}</div> 5 <div v-else class="brand-title">{{ shopInfo.brandName }}</div>
6 <hr> 6 <hr>
7 <div v-show="showMore" transition="brand-intro" v-bind:class="{ 'brand-short': !showMore }">{{ shopInfo.brandIntro }}</div> 7 <div v-show="showMore" transition="brand-intro" v-bind:class="{ 'brand-short': !showMore }">{{ shopInfo.brandIntro }}</div>