fe / yohobuywap-node · Commits

Go to a project

Authored by zhangxiaoru
Commit 84823cedbd9f4391be4f4116d39453a6c78122ba 2 parents bb5eeb3c 1e31d42f

冲突

Inline Side-by-side
Showing 16 changed files with 208 additions and 141 deletions
@@ -8,15 +8,32 @@ @@ -8,15 +8,32 @@
8 const service = global.yoho.ServiceAPI; 8 const service = global.yoho.ServiceAPI;
9 const helpers = global.yoho.helpers; 9 const helpers = global.yoho.helpers;
10 const _ = require('lodash'); 10 const _ = require('lodash');
11 -const index = () => {  
12 11
  12 +
  13 +const _indexBoys = () => {
  14 + return service.get('/operations/api/v5/resource/home', {
  15 + content_code: '797c299afc4170452cf7b2048806b6b8',
  16 + gender: 1,
  17 + limit: 1000,
  18 + page: 1
  19 + });
  20 +};
  21 +
  22 +const _index = () => {
13 return service.get('/operations/api/v5/resource/home', { 23 return service.get('/operations/api/v5/resource/home', {
14 - content_code: '5a9b5bcfd2e13d56c9ba6b867a325dc1', 24 + content_code: '8512bf0755cc549ac323f852c9fd945d',
15 gender: 1, 25 gender: 1,
16 limit: 1000, 26 limit: 1000,
17 - page: 1,  
18 - debug: 'XYZ'  
19 - }).then(result => { 27 + page: 1
  28 + });
  29 +};
  30 +
  31 +const index = () => {
  32 +
  33 + return service.all([
  34 + _indexBoys(),
  35 + _index()
  36 + ]).then(result => {
20 37
21 let resu = { 38 let resu = {
22 swiper: [], 39 swiper: [],
@@ -25,17 +42,17 @@ const index = () => { @@ -25,17 +42,17 @@ const index = () => {
25 download: [] 42 download: []
26 }; 43 };
27 44
28 - if (result.data.list[0]) { 45 + if (result[0].data.list[0] && result[0].data) {
29 46
30 - let headerTip = result.data.list[0].data.text; 47 + let headerTip = result[0].data.list[0].data.text;
31 48
32 resu = Object.assign(resu, { headerTip }); 49 resu = Object.assign(resu, { headerTip });
33 50
34 } 51 }
35 52
36 - if (result.data.list[1]) { 53 + if (result[1].data.list[0].data && result[1].data) {
37 54
38 - let adList = result.data.list[1].data.list; 55 + let adList = result[1].data.list[0].data;
39 56
40 let build = []; 57 let build = [];
41 58
@@ -48,9 +65,13 @@ const index = () => { @@ -48,9 +65,13 @@ const index = () => {
48 65
49 resu.swiper = build; 66 resu.swiper = build;
50 67
51 - let floorList = result.data.list[1].data.list; 68 + }
  69 +
  70 + if (result[0].data.list[1] && result[0].data) {
  71 +
  72 + let floorList = result[0].data.list[1].data.list;
52 73
53 - let floorAdListTitle = result.data.list[1].data.title.title; 74 + let floorAdListTitle = result[0].data.list[1].data.title.title;
54 75
55 resu = _.assign(resu, { floorAdListTitle }); 76 resu = _.assign(resu, { floorAdListTitle });
56 77
@@ -73,9 +94,9 @@ const index = () => { @@ -73,9 +94,9 @@ const index = () => {
73 94
74 } 95 }
75 96
76 - if (result.data.list[2]) { 97 + if (result[0].data.list[2] && result[0].data) {
77 98
78 - let newsList = result.data.list[2].data.list[0]; 99 + let newsList = result[0].data.list[2].data.list[0];
79 100
80 let news = [{ 101 let news = [{
81 img: helpers.image(newsList.src, 640, 370), 102 img: helpers.image(newsList.src, 640, 370),
@@ -88,9 +109,9 @@ const index = () => { @@ -88,9 +109,9 @@ const index = () => {
88 109
89 } 110 }
90 111
91 - if (result.data.list[3]) { 112 + if (result[0].data.list[3] && result[0].data) {
92 113
93 - let downlist = result.data.list[3].data[0]; 114 + let downlist = result[0].data.list[3].data[0];
94 115
95 let down = [{ 116 let down = [{
96 img: helpers.image(downlist.src, 640, 275), 117 img: helpers.image(downlist.src, 640, 275),
@@ -38,7 +38,7 @@ let _processCateData = (list, channel) => { @@ -38,7 +38,7 @@ let _processCateData = (list, channel) => {
38 secondItem.url = helpers.urlFormat('/', { 38 secondItem.url = helpers.urlFormat('/', {
39 sort: _.get(secondItem, 'relationParameter.sort'), 39 sort: _.get(secondItem, 'relationParameter.sort'),
40 sort_name: secondItem.categoryName, 40 sort_name: secondItem.categoryName,
41 - gender: genderMap[channel] || '' 41 + gender: genderMap[key] || ''
42 }, 'list'); 42 }, 'list');
43 }); 43 });
44 44
@@ -47,14 +47,14 @@ let _processCateData = (list, channel) => { @@ -47,14 +47,14 @@ let _processCateData = (list, channel) => {
47 url: helpers.urlFormat('/', { 47 url: helpers.urlFormat('/', {
48 sort: _.get(firstItem, 'relationParameter.sort'), 48 sort: _.get(firstItem, 'relationParameter.sort'),
49 sort_name: firstItem.categoryName, 49 sort_name: firstItem.categoryName,
50 - gender: genderMap[channel] || '' 50 + gender: genderMap[key] || ''
51 }, 'list') 51 }, 'list')
52 }); 52 });
53 } else { 53 } else {
54 firstItem.url = helpers.urlFormat('/', { 54 firstItem.url = helpers.urlFormat('/', {
55 sort: _.get(firstItem, 'relationParameter.sort'), 55 sort: _.get(firstItem, 'relationParameter.sort'),
56 sort_name: firstItem.categoryName, 56 sort_name: firstItem.categoryName,
57 - gender: genderMap[channel] || '' 57 + gender: genderMap[key] || ''
58 }, 'list'); 58 }, 'list');
59 } 59 }
60 }); 60 });
1 <div class="resources"> 1 <div class="resources">
2 <!--banner--> 2 <!--banner-->
3 {{#each result.focus1}} 3 {{#each result.focus1}}
4 - {{> resources/banner-top}} 4 + <div class="banner-top">
  5 + <div class="banner-swiper swiper-container">
  6 + <ul class="swiper-wrapper">
  7 + {{#each data}}
  8 + {{#if @first}}
  9 + <li class="swiper-slide">
  10 + <a href="{{url}}">
  11 + <img src="{{image src 750 364}}">
  12 + </a>
  13 + </li>
  14 + {{^}}
  15 + <li class="swiper-slide">
  16 + <a href="{{url}}">
  17 + <img class="swiper-lazy" data-src="{{image src 750 364}}">
  18 + </a>
  19 + <div class="swiper-lazy-preloader"></div>
  20 + </li>
  21 + {{/if}}
  22 + {{/each}}
  23 + </ul>
  24 + </div>
  25 + <div class="swiper-pagination">
  26 + <div class="pagination-inner">
  27 + </div>
  28 + </div>
  29 + </div>
5 {{/each}} 30 {{/each}}
6 31
7 {{#each result.title_image}} 32 {{#each result.title_image}}
This diff could not be displayed because it is too large.
@@ -920,6 +920,9 @@ const _detailDataPkg = (origin, uid, vipLevel, ua) => { @@ -920,6 +920,9 @@ const _detailDataPkg = (origin, uid, vipLevel, ua) => {
920 }; 920 };
921 921
922 let _getShopsInfo = (brandId) => { 922 let _getShopsInfo = (brandId) => {
  923 + if(!brandId) {
  924 + return Promise.resolve([]);
  925 + }
923 return api.get('', { 926 return api.get('', {
924 method: 'app.shop.queryShopsByBrandId', 927 method: 'app.shop.queryShopsByBrandId',
925 brand_id: _.toString(brandId) 928 brand_id: _.toString(brandId)
@@ -1005,7 +1008,7 @@ let getProductData = (data) => { @@ -1005,7 +1008,7 @@ let getProductData = (data) => {
1005 } 1008 }
1006 result = result.data; 1009 result = result.data;
1007 return Promise.all([ 1010 return Promise.all([
1008 - _getShopsInfo(result.brandInfo.brandId), 1011 + _getShopsInfo(_.get(result, 'brandInfo.brandId', 0)),
1009 _getPromotionInfo(result.productSkn), 1012 _getPromotionInfo(result.productSkn),
1010 comment.getCommentInfo({ 1013 comment.getCommentInfo({
1011 productId: result.productId 1014 productId: result.productId
@@ -16,9 +16,9 @@ module.exports = { @@ -16,9 +16,9 @@ module.exports = {
16 siteUrl: '//m.yohobuy.com', 16 siteUrl: '//m.yohobuy.com',
17 assetUrl: '//localhost:5001', 17 assetUrl: '//localhost:5001',
18 domains: { 18 domains: {
19 - api: 'http://api.yoho.cn/',  
20 - service: 'http://service.yoho.cn/',  
21 - liveApi: 'http://testapi.live.yohops.com:9999/' 19 + api: 'http://api.yoho.yohoops.org/',
  20 + service: 'http://service.yoho.yohoops.org/',
  21 + liveApi: 'http://api.live.yoho.cn/'
22 }, 22 },
23 subDomains: { 23 subDomains: {
24 host: '.m.yohobuy.com', 24 host: '.m.yohobuy.com',
1 { 1 {
2 "name": "m-yohobuy-node", 2 "name": "m-yohobuy-node",
3 - "version": "4.9.12", 3 + "version": "4.9.27",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -31,20 +31,20 @@ @@ -31,20 +31,20 @@
31 }, 31 },
32 "license": "MIT", 32 "license": "MIT",
33 "dependencies": { 33 "dependencies": {
34 - "bluebird": "^3.4.1", 34 + "bluebird": "^3.4.3",
35 "body-parser": "^1.15.2", 35 "body-parser": "^1.15.2",
  36 + "cheerio": "^0.22.0",
36 "connect-memcached": "^0.2.0", 37 "connect-memcached": "^0.2.0",
37 "cookie-parser": "^1.4.3", 38 "cookie-parser": "^1.4.3",
38 "express": "^4.14.0", 39 "express": "^4.14.0",
39 "express-handlebars": "^3.0.0", 40 "express-handlebars": "^3.0.0",
40 - "express-session": "^1.14.0", 41 + "express-session": "^1.14.1",
41 "influxdb-winston": "^1.0.1", 42 "influxdb-winston": "^1.0.1",
42 "lodash": "^4.15.0", 43 "lodash": "^4.15.0",
43 "md5": "^2.1.0", 44 "md5": "^2.1.0",
44 "memcached": "^2.2.1", 45 "memcached": "^2.2.1",
45 "moment": "^2.14.1", 46 "moment": "^2.14.1",
46 "morgan": "^1.7.0", 47 "morgan": "^1.7.0",
47 - "oneapm": "^1.2.20",  
48 "passport": "^0.3.2", 48 "passport": "^0.3.2",
49 "passport-local": "^1.0.0", 49 "passport-local": "^1.0.0",
50 "passport-qq": "0.0.3", 50 "passport-qq": "0.0.3",
@@ -55,15 +55,14 @@ @@ -55,15 +55,14 @@
55 "serve-favicon": "^2.3.0", 55 "serve-favicon": "^2.3.0",
56 "uuid": "^2.0.2", 56 "uuid": "^2.0.2",
57 "winston": "^2.2.0", 57 "winston": "^2.2.0",
58 - "winston-daily-rotate-file": "^1.2.0",  
59 - "yoho-node-lib": "0.0.43" 58 + "winston-daily-rotate-file": "^1.3.0",
  59 + "yoho-node-lib": "0.0.49"
60 }, 60 },
61 "devDependencies": { 61 "devDependencies": {
62 "autoprefixer": "^6.3.7", 62 "autoprefixer": "^6.3.7",
63 "ava": "^0.16.0", 63 "ava": "^0.16.0",
64 - "babel-preset-es2015": "^6.9.0",  
65 - "babel-register": "^6.9.0",  
66 - "cheerio": "^0.22.0", 64 + "babel-preset-es2015": "^6.14.0",
  65 + "babel-register": "^6.14.0",
67 "eslint": "^3.0.1", 66 "eslint": "^3.0.1",
68 "eslint-config-yoho": "^1.0.1", 67 "eslint-config-yoho": "^1.0.1",
69 "gulp": "^3.9.1", 68 "gulp": "^3.9.1",
@@ -73,11 +72,11 @@ @@ -73,11 +72,11 @@
73 "gulp-sourcemaps": "^2.0.0-alpha", 72 "gulp-sourcemaps": "^2.0.0-alpha",
74 "gulp-util": "^3.0.7", 73 "gulp-util": "^3.0.7",
75 "husky": "^0.11.4", 74 "husky": "^0.11.4",
76 - "nodemon": "^1.10.0", 75 + "nodemon": "^1.10.2",
77 "nyc": "^8.1.0", 76 "nyc": "^8.1.0",
78 "postcss-assets": "^4.0.1", 77 "postcss-assets": "^4.0.1",
79 "postcss-cachebuster": "^0.1.3", 78 "postcss-cachebuster": "^0.1.3",
80 - "postcss-calc": "^5.2.1", 79 + "postcss-calc": "^5.3.1",
81 "postcss-center": "^1.0.0", 80 "postcss-center": "^1.0.0",
82 "postcss-clearfix": "^1.0.0", 81 "postcss-clearfix": "^1.0.0",
83 "postcss-crip": "^2.0.0", 82 "postcss-crip": "^2.0.0",
@@ -91,8 +90,8 @@ @@ -91,8 +90,8 @@
91 "shelljs": "^0.7.0", 90 "shelljs": "^0.7.0",
92 "stylelint": "^7.1.0", 91 "stylelint": "^7.1.0",
93 "stylelint-config-yoho": "^1.2.7", 92 "stylelint-config-yoho": "^1.2.7",
94 - "webpack": "^1.13.1",  
95 - "webpack-dev-server": "^1.14.1", 93 + "webpack": "^1.13.2",
  94 + "webpack-dev-server": "^1.15.0",
96 "webpack-stream": "^3.1.0", 95 "webpack-stream": "^3.1.0",
97 "yoho-fastclick": "^1.0.6", 96 "yoho-fastclick": "^1.0.6",
98 "yoho-hammer": "^2.0.7", 97 "yoho-hammer": "^2.0.7",
@@ -14,16 +14,17 @@ var $nav = $('.category-nav'), @@ -14,16 +14,17 @@ var $nav = $('.category-nav'),
14 14
15 require('../common'); 15 require('../common');
16 16
17 -(function() { 17 +function resetHeight() {
18 var $header = $('.yoho-header'), 18 var $header = $('.yoho-header'),
19 $search = $('#search-input'); 19 $search = $('#search-input');
20 20
21 - var h = $(window).height() - $header.outerHeight() - $search.outerHeight() - $nav.outerHeight(); 21 + var h = document.body.scrollHeight - $header.outerHeight() - $search.outerHeight() - $nav.outerHeight();
22 22
23 $categoryContainer.css('min-height', h); 23 $categoryContainer.css('min-height', h);
24 24
25 $contents.height(h); 25 $contents.height(h);
26 -}()); 26 +}
  27 +resetHeight();
27 28
28 $('#search-input').focus(function() { 29 $('#search-input').focus(function() {
29 $(this).blur(); 30 $(this).blur();
@@ -39,6 +40,7 @@ $nav.on('touchend touchcancel', function(e) { @@ -39,6 +40,7 @@ $nav.on('touchend touchcancel', function(e) {
39 var $this = $(e.target).closest('li'), 40 var $this = $(e.target).closest('li'),
40 selector = '.' + $this.data('channel'); 41 selector = '.' + $this.data('channel');
41 42
  43 + resetHeight();
42 if ($this.hasClass('focus')) { 44 if ($this.hasClass('focus')) {
43 return; 45 return;
44 } 46 }
@@ -125,7 +125,7 @@ $(function() { @@ -125,7 +125,7 @@ $(function() {
125 125
126 if (!(window.queryString.app_version || window.queryString.appVersion)) { 126 if (!(window.queryString.app_version || window.queryString.appVersion)) {
127 $('.tab-nav').css({ 127 $('.tab-nav').css({
128 - position: 'absolute' 128 + position: 'relative'
129 }); 129 });
130 130
131 $footer.css({ 131 $footer.css({
@@ -33,6 +33,7 @@ $('.detail-tab span').on('click', function() { @@ -33,6 +33,7 @@ $('.detail-tab span').on('click', function() {
33 33
34 if ($(this).index() === 1) { 34 if ($(this).index() === 1) {
35 setDetailText(); 35 setDetailText();
  36 + lazyLoad($('img.lazy'));
36 } 37 }
37 }); 38 });
38 39
@@ -62,19 +62,18 @@ @@ -62,19 +62,18 @@
62 background: #f6f6f6; 62 background: #f6f6f6;
63 63
64 .title-image { 64 .title-image {
65 -  
66 a { 65 a {
67 display: block; 66 display: block;
68 } 67 }
69 68
70 .image { 69 .image {
71 width: 100%; 70 width: 100%;
72 - height: 364px; 71 + height: 310px;
73 } 72 }
74 73
75 img { 74 img {
76 width: 100%; 75 width: 100%;
77 - height: 100%; 76 + height: inherit;
78 } 77 }
79 } 78 }
80 79
@@ -104,20 +103,17 @@ @@ -104,20 +103,17 @@
104 } 103 }
105 104
106 .focus { 105 .focus {
107 -  
108 .swipe { 106 .swipe {
109 height: 100%; 107 height: 100%;
110 } 108 }
111 109
112 .swipe-1 { 110 .swipe-1 {
113 -  
114 .swipe-indicators { 111 .swipe-indicators {
115 display: none; 112 display: none;
116 } 113 }
117 } 114 }
118 115
119 .swipe-item { 116 .swipe-item {
120 -  
121 a { 117 a {
122 display: block; 118 display: block;
123 } 119 }
@@ -126,7 +122,6 @@ @@ -126,7 +122,6 @@
126 width: 100%; 122 width: 100%;
127 height: 100%; 123 height: 100%;
128 } 124 }
129 -  
130 } 125 }
131 126
132 .swipe-indicators { 127 .swipe-indicators {
@@ -168,8 +163,8 @@ @@ -168,8 +163,8 @@
168 a { 163 a {
169 display: inline-block; 164 display: inline-block;
170 margin: 0 15px; 165 margin: 0 15px;
171 - width: 250px;  
172 - height: 250px; 166 + width: 213px;
  167 + height: 213px;
173 } 168 }
174 169
175 img { 170 img {
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 } 4 }
5 5
6 li { 6 li {
7 - width: 580px; 7 + width: 100%;
8 height: 200px; 8 height: 200px;
9 margin-bottom: 30px; 9 margin-bottom: 30px;
10 position: relative; 10 position: relative;
1 -.installment-help {  
2 - padding: 30px;  
3 - margin: 0;  
4 - background-color: #fff;  
5 - font-family: "微软雅黑";  
6 - color: #444;  
7 - font-weight: 300;  
8 -  
9 - .help-title {  
10 - text-align: center;  
11 - font-size: 28px;  
12 - margin-top: 10px;  
13 - font-weight: bold;  
14 - }  
15 -  
16 - .help-group {  
17 - text-align: left;  
18 - margin: 0 5px 45px;  
19 -  
20 - h2 {  
21 - font-size: 26px;  
22 - font-weight: bold;  
23 - }  
24 -  
25 - p {  
26 - font-size: 26px;  
27 - line-height: 40px;  
28 - margin-top: 10px;  
29 - }  
30 -  
31 - .remind {  
32 - color: #f00;  
33 - }  
34 -  
35 - .underline {  
36 - text-decoration: underline;  
37 - }  
38 -  
39 - .bold {  
40 - font-weight: bold;  
41 - }  
42 -  
43 - ul {  
44 - list-style: disc;  
45 - list-style-position: inside;  
46 - margin-left: 22px;  
47 - }  
48 -  
49 - table {  
50 - width: 92%;  
51 - text-align: center;  
52 - margin: 0 4%;  
53 - border: 1px solid #000;  
54 - font-size: 22px;  
55 -  
56 - td {  
57 - text-align: center;  
58 - border-right: 1px solid #000;  
59 - }  
60 -  
61 - tr:last-child {  
62 - border-top: 1px solid #000;  
63 - }  
64 - }  
65 - }  
66 -}  
67 -  
68 -.installment-agreement {  
69 - p {  
70 - text-indent: 2em;  
71 - }  
72 -  
73 - ul {  
74 - list-style-type: none;  
75 -  
76 - li {  
77 -  
78 - display: inline-block;  
79 - }  
80 - }  
81 -  
82 - .indent2 {  
83 - text-indent: 2em;  
84 - display: inline-block;  
85 - }  
86 -} 1 +.installment-help {
  2 + padding: 30px;
  3 + margin: 0;
  4 + background-color: #fff;
  5 + font-family: "微软雅黑";
  6 + color: #444;
  7 + font-weight: 300;
  8 +
  9 + .help-title {
  10 + text-align: center;
  11 + font-size: 28px;
  12 + margin-top: 10px;
  13 + font-weight: bold;
  14 + }
  15 +
  16 + .help-group {
  17 + text-align: left;
  18 + margin: 0 5px 45px;
  19 +
  20 + h2 {
  21 + font-size: 26px;
  22 + font-weight: bold;
  23 + }
  24 +
  25 + p {
  26 + font-size: 26px;
  27 + line-height: 40px;
  28 + margin-top: 10px;
  29 + }
  30 +
  31 + .remind {
  32 + color: #f00;
  33 + }
  34 +
  35 + .underline {
  36 + text-decoration: underline;
  37 + }
  38 +
  39 + .bold {
  40 + font-weight: bold;
  41 + }
  42 +
  43 + ul {
  44 + list-style: disc;
  45 + list-style-position: inside;
  46 + margin-left: 22px;
  47 + }
  48 +
  49 + table {
  50 + width: 92%;
  51 + text-align: center;
  52 + margin: 0 4%;
  53 + border: 1px solid #000;
  54 + font-size: 22px;
  55 +
  56 + td {
  57 + text-align: center;
  58 + border-right: 1px solid #000;
  59 + }
  60 +
  61 + tr:last-child {
  62 + border-top: 1px solid #000;
  63 + }
  64 + }
  65 + }
  66 +}
  67 +
  68 +.installment-agreement {
  69 + p {
  70 + text-indent: 2em;
  71 + }
  72 +
  73 + ul {
  74 + list-style-type: none;
  75 +
  76 + li {
  77 +
  78 + display: inline-block;
  79 + }
  80 + }
  81 +
  82 + .indent2 {
  83 + text-indent: 2em;
  84 + display: inline-block;
  85 + }
  86 +}
@@ -88,7 +88,28 @@ @@ -88,7 +88,28 @@
88 } 88 }
89 89
90 #goods-list { 90 #goods-list {
91 - margin: 15px 0 0 15px; 91 + padding: 0 15px;
  92 + margin: 15px 0 0;
  93 + width: 100%;
  94 + box-sizing: border-box;
  95 + }
  96 +
  97 + .good-info {
  98 + float: left;
  99 + padding: 0 15px;
  100 + margin: 10px 0 40px;
  101 + box-sizing: border-box;
  102 + width: 50%;
  103 + height: auto;
  104 + }
  105 +
  106 + .good-detail-img {
  107 + height: auto;
  108 + background: #c3c3c3;
  109 +
  110 + img {
  111 + height: 100%;
  112 + }
92 } 113 }
93 } 114 }
94 115
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 82
83 .title-box { 83 .title-box {
84 margin-left: 22px; 84 margin-left: 22px;
85 - width: 240px; 85 + width: 210px;
86 86
87 .product-name { 87 .product-name {
88 overflow: hidden; 88 overflow: hidden;
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 .info-box { 126 .info-box {
127 margin-left: 22px; 127 margin-left: 22px;
128 float: left; 128 float: left;
129 - width: 452px; 129 + width: 402px;
130 } 130 }
131 131
132 h3 { 132 h3 {
@@ -154,7 +154,7 @@ @@ -154,7 +154,7 @@
154 .installment-box { 154 .installment-box {
155 text-align: center; 155 text-align: center;
156 float: left; 156 float: left;
157 - width: 213.333px; 157 + width: 33%;
158 font-size: 22px; 158 font-size: 22px;
159 } 159 }
160 160
@@ -294,7 +294,7 @@ @@ -294,7 +294,7 @@
294 border-top: 1px solid #e0e0e0; 294 border-top: 1px solid #e0e0e0;
295 295
296 label { 296 label {
297 - margin-left: 75px; 297 + margin-left: 60px;
298 width: 320px; 298 width: 320px;
299 height: 120px; 299 height: 120px;
300 float: left; 300 float: left;