fe / yoho-blk · Commits

Go to a project

Authored by 姜枫
Commit c0d0128a30639f7269fc74f510c918980082f978 2 parents 62deb03e 33e2e3fa

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

Inline Side-by-side
Showing 9 changed files with 33 additions and 17 deletions
1 {{# classicBrands}} 1 {{# classicBrands}}
2 <div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}"> 2 <div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
3 - <a href="{{url}}" target="_blank">  
4 {{# big}} 3 {{# big}}
5 - <img class="big-img" src="{{image src 565 340}}" alt="big-img"> 4 + <a href="{{url}}" target="_blank">
  5 + <img class="big-img" src="{{image src 565 340}}">
  6 + </a>
6 {{/ big}} 7 {{/ big}}
  8 +
7 {{# small}} 9 {{# small}}
8 - <img class="small-img {{#if @first}}first{{/if}}" src="{{image src 281 285}}" alt="big-img">  
9 - {{/ small}} 10 + <a href="{{url}}" target="_blank">
  11 + <img class="small-img {{#if @first}}first{{/if}}" src="{{image src 281 285}}">
10 </a> 12 </a>
  13 + {{/ small}}
11 </div> 14 </div>
12 {{/ classicBrands}} 15 {{/ classicBrands}}
@@ -15,9 +15,11 @@ @@ -15,9 +15,11 @@
15 {{/each}} 15 {{/each}}
16 </ul> 16 </ul>
17 {{#banner}} 17 {{#banner}}
  18 + {{#if image}}
18 <a href="{{url}}"> 19 <a href="{{url}}">
19 <img class="banner-img" data-original="{{image banner 150 120}}"> 20 <img class="banner-img" data-original="{{image banner 150 120}}">
20 </a> 21 </a>
  22 + {{/if}}
21 {{/banner}} 23 {{/banner}}
22 </div> 24 </div>
23 25
@@ -23,7 +23,7 @@ module.exports = { @@ -23,7 +23,7 @@ module.exports = {
23 }, 23 },
24 cookieDomain: 'yohoblk.com', 24 cookieDomain: 'yohoblk.com',
25 domains: { 25 domains: {
26 - singleApi: 'http://192.168.102.31:8092/brower', 26 + singleApi: 'http://192.168.102.31:8092/',
27 api: 'http://api-test1.yohops.com:9999/', 27 api: 'http://api-test1.yohops.com:9999/',
28 service: 'http://service-test1.yohops.com:9999/', 28 service: 'http://service-test1.yohops.com:9999/',
29 search: 'http://192.168.102.216:8080/yohosearch/' 29 search: 'http://192.168.102.216:8080/yohosearch/'
@@ -111,7 +111,7 @@ if (isProduction) { @@ -111,7 +111,7 @@ if (isProduction) {
111 Object.assign(module.exports, { 111 Object.assign(module.exports, {
112 appName: 'www.yohoblk.com for test', 112 appName: 'www.yohoblk.com for test',
113 domains: { 113 domains: {
114 - singleApi: process.env.TEST_SINGLEAPI || 'http://192.168.102.31:8092/brower', 114 + singleApi: process.env.TEST_SINGLEAPI || 'http://192.168.102.31:8092/',
115 api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/', 115 api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
116 service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/', 116 service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
117 search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/' 117 search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/'
No preview for this file type
@@ -78,15 +78,16 @@ @@ -78,15 +78,16 @@
78 text-align: center; 78 text-align: center;
79 color: #222; 79 color: #222;
80 cursor: pointer; 80 cursor: pointer;
  81 + font-size: 14px;
81 } 82 }
82 } 83 }
83 84
84 .brands-list { 85 .brands-list {
85 dt { 86 dt {
86 - height: 70px;  
87 - line-height: 70px; 87 + height: 58px;
  88 + line-height: 58px;
88 font-weight: bold; 89 font-weight: bold;
89 - font-size: 24px; 90 + font-size: 16px;
90 } 91 }
91 92
92 dd { 93 dd {
@@ -102,10 +103,6 @@ @@ -102,10 +103,6 @@
102 margin-top: 20px; 103 margin-top: 20px;
103 } 104 }
104 105
105 - /* li:nth-child(4n) {  
106 - margin-right: 0;  
107 - }*/  
108 -  
109 li:nth-child(-n+4) { 106 li:nth-child(-n+4) {
110 margin-top: 0; 107 margin-top: 0;
111 } 108 }
@@ -231,7 +231,7 @@ @@ -231,7 +231,7 @@
231 } 231 }
232 232
233 .brands { 233 .brands {
234 - width: 960px; 234 + width: 975px;
235 padding: 30px 0 0 30px; 235 padding: 30px 0 0 30px;
236 overflow: hidden; 236 overflow: hidden;
237 } 237 }
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
13 text-align: center; 13 text-align: center;
14 background: #fff; 14 background: #fff;
15 } 15 }
  16 +
16 .nav { 17 .nav {
17 li { 18 li {
18 cursor: pointer; 19 cursor: pointer;
@@ -26,8 +27,10 @@ @@ -26,8 +27,10 @@
26 height: 14px; 27 height: 14px;
27 width: 14px; 28 width: 14px;
28 background-repeat: no-repeat; 29 background-repeat: no-repeat;
29 - background-image: resolve('help/plus.png'); 30 + background-image: resolve("help/plus.png");
30 background-size: 14px 14px; 31 background-size: 14px 14px;
  32 + position: relative;
  33 + top: 3px;
31 } 34 }
32 35
33 .mult { 36 .mult {
@@ -51,6 +54,7 @@ @@ -51,6 +54,7 @@
51 width: 990px; 54 width: 990px;
52 padding: 35px 30px; 55 padding: 35px 30px;
53 background-color: #fff; 56 background-color: #fff;
  57 + font-size: 14px;
54 58
55 .normal-data, 59 .normal-data,
56 .step-data { 60 .step-data {
@@ -61,13 +65,14 @@ @@ -61,13 +65,14 @@
61 .big-title { 65 .big-title {
62 font-size: 20px; 66 font-size: 20px;
63 } 67 }
  68 +
64 .step-title { 69 .step-title {
65 font-weight: bolder; 70 font-weight: bolder;
66 padding-bottom: 5px; 71 padding-bottom: 5px;
67 } 72 }
  73 +
68 .step { 74 .step {
69 list-style: disc; 75 list-style: disc;
70 } 76 }
71 } 77 }
72 -  
73 } 78 }
@@ -125,6 +125,15 @@ @@ -125,6 +125,15 @@
125 padding: 5px; 125 padding: 5px;
126 margin-top: 8px; 126 margin-top: 8px;
127 } 127 }
  128 +
  129 + .consignee {
  130 + display: block;
  131 + float: left;
  132 + max-width: 140px;
  133 + overflow: hidden;
  134 + white-space: nowrap;
  135 + text-overflow: ellipsis;
  136 + }
128 } 137 }
129 138
130 .address-chosed { 139 .address-chosed {
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </p> 10 </p>
11 11
12 <p class="name-and-phone"> 12 <p class="name-and-phone">
13 - {{consignee}} 13 + <em class="consignee">{{consignee}}</em>
14 <span class="phone bold">{{mobile}}</span> 14 <span class="phone bold">{{mobile}}</span>
15 </p> 15 </p>
16 16