fe / yohoblk-wap · Commits

Go to a project

Authored by ccbikai
Commit 6ed87238c9df986fa2be940091141baf9f3fd8fa 2 parents 7ab3fb38 e94d623b

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

Inline Side-by-side
Showing 9 changed files with 52 additions and 45 deletions
... ... @@ -78,8 +78,11 @@ const getCateListData = params => {
let item = {};
let oneClass = [];
let subitem = {};
let genderArr = {boy: '1,3', girl: '2,3', kids: '1,2,3', lifestyle: '1,2,3'};
let nameArr = {boy: 'MEN男士', girl: 'WOMEN女士', kids: 'TIDE潮童', lifestyle: 'LIFESTYLE生活'};
let genderArr = {
MEN男士: '1,3',
WOMEN女士: '2,3',
LIFESTYLE生活: '1,2,3'
};
return brandApi.getCateListData(params).then(result => {
... ... @@ -88,10 +91,7 @@ const getCateListData = params => {
}
_.forEach(result.data, (category, categorykey) => {
if (categorykey === 'kids') {
return true;
}
oneClass = {name: nameArr[categorykey], ca: []};
oneClass = {name: categorykey, ca: []};
_.forEach(category, (cate) => {
item = {
... ...
... ... @@ -17,8 +17,7 @@ module.exports = {
gender: params.gender,
uid: params.uid || '0',
page: params.page,
limit: '10',
app_type: '1'
limit: '10'
});
}
};
... ...
... ... @@ -14,9 +14,12 @@ module.exports = {
appVersion: '4.6.0', // 调用api的版本
port: 6004,
siteUrl: '//m.yohoblk.com',
signExtend: {
app_type: 1
},
domains: {
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/'
api: 'http://devapi.yoho.cn:58078/',
service: 'http://devservice.yoho.cn:58077/'
},
subDomains: {
host: '.m.yohoblk.com',
... ...
... ... @@ -40,7 +40,7 @@
"winston": "^2.2.0",
"winston-daily-rotate-file": "^1.1.4",
"yoho-md5": "^2.0.0",
"yoho-node-lib": "0.0.28"
"yoho-node-lib": "0.0.30"
},
"devDependencies": {
"autoprefixer": "^6.3.7",
... ...
No preview for this file type
... ... @@ -17,14 +17,12 @@
<glyph unicode="&#xe607;" glyph-name="right" d="M785 384l13 13-488 487-84-84 416-416-416-416 84-84 488 487z" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<glyph unicode="&#xe900;" 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" />
... ... @@ -40,4 +38,7 @@
<glyph unicode="&#xe90a;" glyph-name="edit-del" d="M874.044 746.014c-96.708 96.708-225.28 149.986-362.044 149.986s-265.336-53.278-362.014-149.956c-96.708-96.708-149.986-225.28-149.986-362.014 0-136.794 53.278-265.367 149.956-362.044 96.708-96.678 225.28-149.956 362.044-149.956s265.336 53.278 362.044 149.956c96.678 96.678 149.956 225.25 149.956 362.044 0 136.734-53.278 265.306-149.956 361.984v0zM210.824 444.235h602.353v-120.471h-602.353v120.471z" />
<glyph unicode="&#xe90b;" glyph-name="close-round" d="M512 896c-282.77 0-512-229.23-512-512 0-282.746 229.23-511.976 512-511.976s511.976 229.23 511.976 511.976c0 282.77-229.205 512-511.976 512v0zM683.447 252.123c10.923-10.923 10.923-28.623 0-39.57-5.461-5.461-12.629-8.192-19.797-8.192-7.144 0-14.312 2.731-19.773 8.192l-131.877 131.901-131.901-131.901c-5.461-5.461-12.629-8.192-19.773-8.192-7.168 0-14.312 2.731-19.797 8.192-10.923 10.947-10.923 28.648 0 39.57l131.901 131.877-131.901 131.901c-10.923 10.923-10.923 28.623 0 39.546 10.947 10.947 28.648 10.947 39.57 0l131.901-131.877 131.877 131.877c10.923 10.947 28.648 10.947 39.57 0 10.923-10.923 10.923-28.623 0-39.546l-131.901-131.901 131.901-131.877z" />
<glyph unicode="&#xe90c;" glyph-name="help" d="M851.264 733.92c-94.176 94.208-219.392 146.080-352.608 146.080-133.184 0-258.432-51.872-352.576-146.080-94.208-94.176-146.080-219.392-146.080-352.576s51.872-258.4 146.080-352.608c94.144-94.208 219.392-146.080 352.576-146.080 133.216 0 258.432 51.872 352.608 146.080s146.048 219.424 146.048 352.608c0 133.184-51.872 258.4-146.048 352.576v0zM783.392 96.64c-76.064-76.064-177.184-117.984-284.736-117.984s-208.64 41.92-284.704 117.984c-76.064 76.032-117.952 177.184-117.952 284.704s41.888 208.608 117.984 284.704c76.032 76.032 177.12 117.952 284.672 117.952s208.672-41.92 284.736-117.952c76.032-76.032 117.92-177.184 117.92-284.704 0-107.552-41.888-208.672-117.92-284.704v0zM521.216 658.048c-77.824 0-141.152-63.296-141.152-141.12h96c0 24.896 20.256 45.12 45.152 45.12 24.864 0 45.12-20.224 45.12-45.12v-5.248c0-20.256-33.44-32.384-33.408-32.384l-7.136-2.88c-26.432-13.248-71.2-56.032-71.2-132.384v-11.168h96v11.168c0 29.76 13.248 42.528 17.12 45.728 37.792 13.824 94.624 52.736 94.624 121.92v5.248c0 77.824-63.296 141.12-141.12 141.12zM450.656 234.88h96v-112.672h-96v112.672z" />
<glyph unicode="&#xe90d;" glyph-name="like" horiz-adv-x="999" d="M957.265 520.242c-23.127 27.298-57.094 42.958-93.184 42.958h-228.202l31.944 63.888c28.647 58.618 25.225 126.501-9.191 181.623-34.117 54.647-93.259 87.29-158.245 87.29h-13.836l-246.434-394.29v13.961h-240.116v-620.469h797.521c60.541 0 110.917 42.933 119.783 101.975l66.485 427.582c5.694 34.092-3.971 68.858-26.524 95.482v0zM97.48 418.167h45.131v-425.46h-45.131v425.46zM240.116 465.72h93.534l201.578 325.807c17.508-7.168 30.22-18.507 37.913-33.892l1.324-2.348c16.809-26.124 18.232-59.242 3.422-87.040l-50.226-100.502-47.379-102.025h383.8c7.543 0 11.913-1.973 16.134-7.268l1.873-2.073c1.973-1.998 4.321-6.818 4.546-18.532l-66.060-424.81c-2.473-12.363-11.514-20.33-23.052-20.33h-557.406v473.013z" />
<glyph unicode="&#xe90e;" glyph-name="read" horiz-adv-x="1650" d="M837.803 737.621c280.121 0 524.857-150.983 657.636-375.922-132.779-224.939-377.515-375.922-657.636-375.922s-524.857 150.983-657.636 375.922c132.779 224.939 377.515 375.922 657.636 375.922zM837.803 851.399c-308.85 0-598.414-165.49-755.655-431.844l-34.133-57.856 34.133-57.799c157.241-266.411 446.805-431.9 755.655-431.9 308.793 0 598.357 165.49 755.598 431.9l34.133 57.799-34.133 57.856c-157.241 266.354-446.805 431.844-755.598 431.844zM837.803 144.384c-120.775 0-219.022 98.247-219.022 219.022s98.247 219.022 219.022 219.022c120.775 0 219.022-98.247 219.022-219.022s-98.247-219.022-219.022-219.022v0zM837.803 468.651c-58.084 0-105.244-47.218-105.244-105.244s47.161-105.244 105.244-105.244c58.027 0 105.244 47.218 105.244 105.244s-47.218 105.244-105.244 105.244v0z" />
<glyph unicode="&#xe90f;" glyph-name="back" horiz-adv-x="595" d="M510.071-122.475l-510.071 508.476 510.023 510 67.346-67.346-442.559-442.559 442.511-441.106-67.251-67.465z" />
</font></defs></svg>
\ No newline at end of file
... ...
No preview for this file type
No preview for this file type
... ... @@ -20,30 +20,6 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-refund-exchange:before {
content: "\e900";
}
.icon-wait-cargo:before {
content: "\e901";
}
.icon-wait-pay:before {
content: "\e902";
}
.icon-send-cargo:before {
content: "\e903";
}
.icon-msg:before {
content: "\e904";
}
.icon-setting:before {
content: "\e905";
}
.icon-delete:before {
content: "\e600";
}
... ... @@ -84,10 +60,6 @@
content: "\e609";
}
.icon-yoho-share:before {
content: "\e60a";
}
.icon-filter:before {
content: "\e60b";
}
... ... @@ -112,10 +84,6 @@
content: "\e610";
}
.icon-sharenews:before {
content: "\e611";
}
.icon-timeshare:before {
content: "\e612";
}
... ... @@ -124,6 +92,30 @@
content: "\e617";
}
.icon-refund-exchange:before {
content: "\e900";
}
.icon-wait-cargo:before {
content: "\e901";
}
.icon-wait-pay:before {
content: "\e902";
}
.icon-send-cargo:before {
content: "\e903";
}
.icon-msg:before {
content: "\e904";
}
.icon-setting:before {
content: "\e905";
}
.icon-notdef:before {
content: "\e906";
}
... ... @@ -151,3 +143,15 @@
.icon-help:before {
content: "\e90c";
}
.icon-like:before {
content: "\e90d";
}
.icon-read:before {
content: "\e90e";
}
.icon-back:before {
content: "\e90f";
}
... ...