fe / yohoblk-wap · Commits

Go to a project

Authored by ccbikai
Commit b5ad7296409e99bbad169de247486d6b4aff2909 2 parents 862417b0 07b3503c

Merge branch 'master' into develop

Inline Side-by-side
Showing 5 changed files with 27 additions and 40 deletions
@@ -54,13 +54,15 @@ module.exports = { @@ -54,13 +54,15 @@ module.exports = {
54 infoFile: { 54 infoFile: {
55 name: 'info', 55 name: 'info',
56 level: 'info', 56 level: 'info',
57 - filename: 'logs/info.log' 57 + filename: 'logs/info.log',
  58 + maxFiles: 7
58 }, 59 },
59 errorFile: { 60 errorFile: {
60 name: 'error', 61 name: 'error',
61 level: 'error', 62 level: 'error',
62 filename: 'logs/error.log', 63 filename: 'logs/error.log',
63 - handleExceptions: true 64 + handleExceptions: true,
  65 + maxFiles: 7
64 }, 66 },
65 udp: { // send by udp 67 udp: { // send by udp
66 level: 'debug', // logger level 68 level: 'debug', // logger level
@@ -99,7 +101,7 @@ if (isProduction) { @@ -99,7 +101,7 @@ if (isProduction) {
99 useOneapm: true, 101 useOneapm: true,
100 useCache: true, 102 useCache: true,
101 interfaceShunt: { 103 interfaceShunt: {
102 - useInterfaceShunt: true, 104 + useInterfaceShunt: false,
103 tencentServers: { 105 tencentServers: {
104 api: ['123.206.1.98', '123.206.2.80'], 106 api: ['123.206.1.98', '123.206.2.80'],
105 service: ['123.206.1.98', '123.206.2.80'] 107 service: ['123.206.1.98', '123.206.2.80']
1 -/**  
2 - * 内容码配置文件  
3 - * @author: 赵彪<bill.zhao@yoho.cn>  
4 - * @date: 2016/06/23  
5 - */  
6 -  
7 -'use strict';  
8 -  
9 -const channel = {  
10 - men: '9ee58aadd9559d07207fe4a98843eaac',  
11 - women: '3ad8826fc89fb0d023a4cd06a6991219',  
12 - lifestyle: 'aa8d34c85934c2ccc16e2babd3eb5e47'  
13 -};  
14 -  
15 -const brand = {  
16 - men: '9ee58aadd9559d07207fe4a98843eaac',  
17 - women: 'aa8d34c85934c2ccc16e2babd3eb5e47',  
18 - lifestyle: '3ad8826fc89fb0d023a4cd06a6991219'  
19 -};  
20 -  
21 -const cate = {  
22 - men: '9ee58aadd9559d07207fe4a98843eaac',  
23 - women: 'aa8d34c85934c2ccc16e2babd3eb5e47',  
24 - lifestyle: '3ad8826fc89fb0d023a4cd06a6991219'  
25 -};  
26 -  
27 -module.exports = {  
28 - channel,  
29 - brand,  
30 - cate  
31 -};  
@@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
6 6
7 const channel = { 7 const channel = {
8 men: '9ee58aadd9559d07207fe4a98843eaac', 8 men: '9ee58aadd9559d07207fe4a98843eaac',
9 - women: 'aa8d34c85934c2ccc16e2babd3eb5e47',  
10 - lifestyle: '3ad8826fc89fb0d023a4cd06a6991219' 9 + women: '3ad8826fc89fb0d023a4cd06a6991219',
  10 + lifestyle: 'aa8d34c85934c2ccc16e2babd3eb5e47'
11 }; 11 };
12 12
13 /* 品牌一览资源位 */ 13 /* 品牌一览资源位 */
@@ -97,7 +97,7 @@ ul { @@ -97,7 +97,7 @@ ul {
97 } 97 }
98 98
99 img[lazy] { 99 img[lazy] {
100 - transition: all 200ms; 100 + transition: all 100ms;
101 } 101 }
102 102
103 img[lazy=loading] { 103 img[lazy=loading] {
@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@
7 </div> 7 </div>
8 </template> 8 </template>
9 <a class="item ellipsis" href="{{item.sortUrl}}"> 9 <a class="item ellipsis" href="{{item.sortUrl}}">
10 - {{(item.sortNameEn || '').trim()}}{{item.sortName}} 10 + <span class="en">{{(item.sortNameEn || '').trim()}}</span>
  11 + <span class="cn">{{item.sortName}}</span>
11 </a> 12 </a>
12 </template> 13 </template>
13 </div> 14 </div>
@@ -54,6 +55,7 @@ @@ -54,6 +55,7 @@
54 left: 0; 55 left: 0;
55 overflow-x: hidden; 56 overflow-x: hidden;
56 overflow-y: auto; 57 overflow-y: auto;
  58 + background: #f6f6f6;
57 } 59 }
58 60
59 .sidebar { 61 .sidebar {
@@ -65,11 +67,20 @@ @@ -65,11 +67,20 @@
65 padding: 0 30px; 67 padding: 0 30px;
66 height: 124px; 68 height: 124px;
67 line-height: 124px; 69 line-height: 124px;
68 - font-size: 36px; 70 + font-size: 30px;
69 font-weight: bold; 71 font-weight: bold;
70 font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial; 72 font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial;
71 73
  74 + .en {
  75 + font-size: 36px;
  76 + }
  77 +
  78 + .cn {
  79 + margin-left: -6px;
  80 + }
  81 +
72 &:first-child { 82 &:first-child {
  83 + font-size: 36px;
73 height: 142px; 84 height: 142px;
74 line-height: 142px; 85 line-height: 142px;
75 font-family: "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial; 86 font-family: "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial;
@@ -85,10 +96,14 @@ @@ -85,10 +96,14 @@
85 border-bottom: 1px solid #eee; 96 border-bottom: 1px solid #eee;
86 } 97 }
87 98
88 - &:last-child:after { 99 + &:last-child {
  100 + border-bottom: 1px solid #eee;
  101 +
  102 + &:after {
89 content: none; 103 content: none;
90 } 104 }
91 } 105 }
  106 + }
92 107
93 .sep { 108 .sep {
94 margin-top: -1px; 109 margin-top: -1px;
@@ -99,6 +114,7 @@ @@ -99,6 +114,7 @@
99 border-bottom: 1px solid #eee; 114 border-bottom: 1px solid #eee;
100 115
101 & + .item { 116 & + .item {
  117 + font-size: 36px;
102 height: 142px; 118 height: 142px;
103 line-height: 142px; 119 line-height: 142px;
104 font-family: "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial; 120 font-family: "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial;