fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 2ed1d0d6a77106c1c220e504b578a139e281ad43 2 parents 6ae28e0b 1e8501b4

format-sass

Inline Side-by-side
Showing 46 changed files with 84 additions and 123 deletions
1 **/css/**/*.css 1 **/css/**/*.css
2 **/dist/**/*.css 2 **/dist/**/*.css
3 **/scss/activity/_aslider.css 3 **/scss/activity/_aslider.css
  4 +**/scss/activity/trend/map.css
  5 +**/scss/activity/live/*.css
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <span>{{this}}</span> 6 <span>{{this}}</span>
7 {{/ studentArr}} 7 {{/ studentArr}}
8 </span> 8 </span>
9 - <a class="checkMySchool"></a> 9 + <a class="check-my-school"></a>
10 </div> 10 </div>
11 <div class="privilege clearfix"> 11 <div class="privilege clearfix">
12 <a class="privilege-item open-dia" href="javascript:void(0);"> 12 <a class="privilege-item open-dia" href="javascript:void(0);">
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </div> 21 </div>
22 <div class="item-content"> 22 <div class="item-content">
23 <i class="rank-icon top">{{rank}}</i> 23 <i class="rank-icon top">{{rank}}</i>
24 - <h2 {{# sales_phrase}}class="hasActive"{{/ sales_phrase}}>{{name}}</h2> 24 + <h2 {{# sales_phrase}}class="has-active"{{/ sales_phrase}}>{{name}}</h2>
25 {{# active}} 25 {{# active}}
26 <p>{{.}}</p> 26 <p>{{.}}</p>
27 {{/ active}} 27 {{/ active}}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 <div id="allproduct" class="allproduct"> 3 <div id="allproduct" class="allproduct">
4 <a href={{allProduct}}> 4 <a href={{allProduct}}>
5 - <p class="allproductParagaraph buriedpoint" data-bp-id ="shop_category_all_1">全部商品</p> 5 + <p class="all-product-paragaraph buriedpoint" data-bp-id ="shop_category_all_1">全部商品</p>
6 <i class="arrow-icon iconfont">&#xe614;</i> 6 <i class="arrow-icon iconfont">&#xe614;</i>
7 </a> 7 </a>
8 </div> 8 </div>
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 "build": "webpack --config ./public/build/webpack.prod.config.js", 14 "build": "webpack --config ./public/build/webpack.prod.config.js",
15 "debug": "DEBUG=\"express:*\" nodemon -e js,hbs -i public/ app.js", 15 "debug": "DEBUG=\"express:*\" nodemon -e js,hbs -i public/ app.js",
16 "lint-js": "eslint -c .eslintrc --cache .", 16 "lint-js": "eslint -c .eslintrc --cache .",
17 - "lint-css": "stylelint --syntax scss --config .stylelintrc public/scss/**/*.css", 17 + "lint-css": "stylelint --syntax scss --config .stylelintrc 'public/scss/**/*.css'",
18 "lint-vue-js": "eslint -c .eslintrc --cache public/vue/**/*.vue", 18 "lint-vue-js": "eslint -c .eslintrc --cache public/vue/**/*.vue",
19 "lint-vue-css": "stylelint --syntax scss --extract --config .stylelintrc public/vue/**/*.vue", 19 "lint-vue-css": "stylelint --syntax scss --extract --config .stylelintrc public/vue/**/*.vue",
20 "precommit": "node lint.js" 20 "precommit": "node lint.js"
@@ -346,7 +346,7 @@ $( @@ -346,7 +346,7 @@ $(
346 default: 346 default:
347 } 347 }
348 348
349 - $('.checkMySchool').on('click', function() { 349 + $('.check-my-school').on('click', function() {
350 var sTop = $('#university').offset().top; 350 var sTop = $('#university').offset().top;
351 351
352 $(window).scrollTop(sTop); 352 $(window).scrollTop(sTop);
@@ -119,9 +119,9 @@ $('#hotRank').on('touchstart', function(e) { @@ -119,9 +119,9 @@ $('#hotRank').on('touchstart', function(e) {
119 var target = ev.target || ev.srcElement; 119 var target = ev.target || ev.srcElement;
120 120
121 if (target.nodeName.toLowerCase() === 'span') { 121 if (target.nodeName.toLowerCase() === 'span') {
122 - target.parentNode.className = 'bgActive ' + target.parentNode.className; 122 + target.parentNode.className = 'bg-active ' + target.parentNode.className;
123 } 123 }
124 }).on('touchend touchcancel', function() { 124 }).on('touchend touchcancel', function() {
125 - $('.s-goods-nav .nav-item').removeClass('bgActive'); 125 + $('.s-goods-nav .nav-item').removeClass('bg-active');
126 }); 126 });
127 127
@@ -713,7 +713,6 @@ @@ -713,7 +713,6 @@
713 .name { 713 .name {
714 font-size: 50px; 714 font-size: 50px;
715 margin-top: 50px; 715 margin-top: 50px;
716 - display: inline-block;  
717 max-height: 120px; 716 max-height: 120px;
718 overflow: hidden; 717 overflow: hidden;
719 text-overflow: ellipsis; 718 text-overflow: ellipsis;
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 } 41 }
42 } 42 }
43 43
44 - .checkMySchool { 44 + .check-my-school {
45 width: 150px; 45 width: 150px;
46 height: 30px; 46 height: 30px;
47 position: absolute; 47 position: absolute;
@@ -145,14 +145,14 @@ @@ -145,14 +145,14 @@
145 &:last-child { 145 &:last-child {
146 font-size: 27px; 146 font-size: 27px;
147 text-align: right; 147 text-align: right;
  148 + }
148 149
149 - span { 150 + &:last-child span {
150 color: #ac8412; 151 color: #ac8412;
151 } 152 }
152 } 153 }
153 } 154 }
154 } 155 }
155 - }  
156 156
157 .university { 157 .university {
158 padding: 0 30px; 158 padding: 0 30px;
@@ -100,7 +100,6 @@ @@ -100,7 +100,6 @@
100 display: inline-block; 100 display: inline-block;
101 height: 35px; 101 height: 35px;
102 line-height: 35px; 102 line-height: 35px;
103 - overflow: hidden;  
104 white-space: nowrap; 103 white-space: nowrap;
105 overflow: hidden; 104 overflow: hidden;
106 text-overflow: ellipsis; 105 text-overflow: ellipsis;
@@ -353,8 +353,7 @@ @@ -353,8 +353,7 @@
353 } 353 }
354 } 354 }
355 355
356 - .class {  
357 - .class-item { 356 + .class .class-item {
358 border-top: solid 1px #e0e0e0; 357 border-top: solid 1px #e0e0e0;
359 border-bottom: solid 1px #e0e0e0; 358 border-bottom: solid 1px #e0e0e0;
360 padding: 30px; 359 padding: 30px;
@@ -448,7 +447,6 @@ @@ -448,7 +447,6 @@
448 } 447 }
449 } 448 }
450 } 449 }
451 - }  
452 450
453 .foot-btn { 451 .foot-btn {
454 width: 100%; 452 width: 100%;
@@ -667,8 +665,9 @@ @@ -667,8 +665,9 @@
667 background-color: #fff; 665 background-color: #fff;
668 height: 100px; 666 height: 100px;
669 overflow: hidden; 667 overflow: hidden;
  668 + }
670 669
671 - ul { 670 + .time-nav ul {
672 float: left; 671 float: left;
673 width: auto; 672 width: auto;
674 673
@@ -692,7 +691,6 @@ @@ -692,7 +691,6 @@
692 } 691 }
693 } 692 }
694 } 693 }
695 - }  
696 694
697 .adviser { 695 .adviser {
698 background-color: #fff; 696 background-color: #fff;
@@ -856,8 +854,9 @@ @@ -856,8 +854,9 @@
856 .chosen-list { 854 .chosen-list {
857 border-top: solid 1px #e0e0e0; 855 border-top: solid 1px #e0e0e0;
858 background-color: #fff; 856 background-color: #fff;
  857 + }
859 858
860 - .item { 859 + .chosen-list .item {
861 padding: 30px; 860 padding: 30px;
862 border-bottom: solid 1px #e0e0e0; 861 border-bottom: solid 1px #e0e0e0;
863 display: block; 862 display: block;
@@ -902,7 +901,6 @@ @@ -902,7 +901,6 @@
902 } 901 }
903 } 902 }
904 } 903 }
905 - }  
906 904
907 .kids-pic { 905 .kids-pic {
908 padding: 30px; 906 padding: 30px;
@@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
6 background: resolve("activity/vip-day/activity.jpg"); 6 background: resolve("activity/vip-day/activity.jpg");
7 background-size: 100% 100%; 7 background-size: 100% 100%;
8 height: 363px; 8 height: 363px;
9 - /*box-shadow: inset -6px -6px 7px rgba(15, 5, 10, 0.32);*/  
10 } 9 }
11 10
12 .vip-day-footer { 11 .vip-day-footer {
@@ -310,7 +309,7 @@ @@ -310,7 +309,7 @@
310 .vip-good-name { 309 .vip-good-name {
311 font-size: 20px; 310 font-size: 20px;
312 color: #fff; 311 color: #fff;
313 - height: calc(2*20*1.4px); 312 + height: 56px;
314 margin-bottom: 10px; 313 margin-bottom: 10px;
315 margin-left: 5px; 314 margin-left: 5px;
316 margin-right: 5px; 315 margin-right: 5px;
@@ -101,8 +101,8 @@ $border-radius: 8px; @@ -101,8 +101,8 @@ $border-radius: 8px;
101 101
102 .game-item { 102 .game-item {
103 float: left; 103 float: left;
104 - width: calc((586-4) / 3px);  
105 - height: calc((406-4) / 3px); 104 + width: 194px;
  105 + height: 134px;
106 margin-right: 2px; 106 margin-right: 2px;
107 margin-bottom: 2px; 107 margin-bottom: 2px;
108 108
1 -.vip-day10.entry { 1 +.vip-day10 .entry {
2 background: resolve("activity/vip-day/vip-day1028/bg.jpg"); 2 background: resolve("activity/vip-day/vip-day1028/bg.jpg");
3 background-size: 100% 100%; 3 background-size: 100% 100%;
4 } 4 }
@@ -7,7 +7,6 @@ @@ -7,7 +7,6 @@
7 background: resolve("activity/vip-day/vip-day1028/head.gif"); 7 background: resolve("activity/vip-day/vip-day1028/head.gif");
8 background-size: 100% 100%; 8 background-size: 100% 100%;
9 height: 486px; 9 height: 486px;
10 - /*box-shadow: inset -6px -6px 7px rgba(15, 5, 10, 0.32);*/  
11 } 10 }
12 11
13 .vip-day10-slogan { 12 .vip-day10-slogan {
@@ -101,8 +101,8 @@ $border-radius: 8px; @@ -101,8 +101,8 @@ $border-radius: 8px;
101 101
102 .game-item { 102 .game-item {
103 float: left; 103 float: left;
104 - width: calc((586-4) / 3px);  
105 - height: calc((406-4) / 3px); 104 + width: 194px;
  105 + height: 134px;
106 margin-right: 2px; 106 margin-right: 2px;
107 margin-bottom: 2px; 107 margin-bottom: 2px;
108 108
@@ -215,7 +215,6 @@ @@ -215,7 +215,6 @@
215 215
216 .pagination-inner { 216 .pagination-inner {
217 left: auto; 217 left: auto;
218 - right: 30px;  
219 -webkit-transform: none; 218 -webkit-transform: none;
220 transform: none; 219 transform: none;
221 position: absolute; 220 position: absolute;
1 @import "layout/swiper"; 1 @import "layout/swiper";
2 @import "channel/banner-top"; 2 @import "channel/banner-top";
3 @import "common/good"; 3 @import "common/good";
4 -@import './index'; 4 +@import "./index";
@@ -47,9 +47,6 @@ @@ -47,9 +47,6 @@
47 } 47 }
48 } 48 }
49 49
50 - /*-------------------------------------*\  
51 - .coupon 单个优惠券  
52 - \*-------------------------------------*/  
53 .coupon { 50 .coupon {
54 min-height: 165px; 51 min-height: 165px;
55 margin-left: 30px; 52 margin-left: 30px;
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
57 &.highlight { 57 &.highlight {
58 color: $basicBtnC; 58 color: $basicBtnC;
59 } 59 }
  60 +
60 font-size: 28px; 61 font-size: 28px;
61 float: left; 62 float: left;
62 width: 50%; 63 width: 50%;
@@ -68,6 +69,7 @@ @@ -68,6 +69,7 @@
68 padding-right: 5PX; 69 padding-right: 5PX;
69 font-size: inherit; 70 font-size: inherit;
70 } 71 }
  72 +
71 position: relative; 73 position: relative;
72 74
73 .animate-count { 75 .animate-count {
@@ -198,20 +200,19 @@ @@ -198,20 +200,19 @@
198 } 200 }
199 } 201 }
200 202
201 - .goods-consults.customer-consults {  
202 - .consult-item {  
203 - @mixin consult-item ;  
204 - margin-top: 0;  
205 - margin-bottom: 15px;  
206 - }  
207 - }  
208 -  
209 .goods-consults { 203 .goods-consults {
210 overflow: hidden; 204 overflow: hidden;
211 padding: 0; 205 padding: 0;
212 background: none; 206 background: none;
213 } 207 }
214 208
  209 + .goods-consults .customer-consults .consult-item {
  210 + @mixin consult-item ;
  211 +
  212 + margin-top: 0;
  213 + margin-bottom: 15px;
  214 + }
  215 +
215 .readmore { 216 .readmore {
216 display: block; 217 display: block;
217 height: 88px; 218 height: 88px;
@@ -238,6 +239,7 @@ @@ -238,6 +239,7 @@
238 239
239 .goods-consults .faq-item { 240 .goods-consults .faq-item {
240 @mixin consult-item ; 241 @mixin consult-item ;
  242 +
241 margin-top: 0; 243 margin-top: 0;
242 margin-bottom: 15px; 244 margin-bottom: 15px;
243 245
@@ -89,7 +89,6 @@ $basicBtnC: #eb0313; @@ -89,7 +89,6 @@ $basicBtnC: #eb0313;
89 box-sizing: border-box; 89 box-sizing: border-box;
90 padding: 6px 3%; 90 padding: 6px 3%;
91 width: 49.9%; 91 width: 49.9%;
92 - width: 49.9%;  
93 height: 100%; 92 height: 100%;
94 border: 1px solid #fff; 93 border: 1px solid #fff;
95 background-color: $tableCellC; 94 background-color: $tableCellC;
@@ -891,10 +890,7 @@ $basicBtnC: #eb0313; @@ -891,10 +890,7 @@ $basicBtnC: #eb0313;
891 } 890 }
892 891
893 .content-main.consult-content-main { 892 .content-main.consult-content-main {
894 - padding-right: 28px;  
895 - padding-left: 28px;  
896 - padding-top: 20px;  
897 - padding-bottom: 20px; 893 + padding: 20px 28px;
898 894
899 .question { 895 .question {
900 font-size: 24px; 896 font-size: 24px;
@@ -33,43 +33,43 @@ @@ -33,43 +33,43 @@
33 33
34 .method-1 { 34 .method-1 {
35 li:nth-child(1) .intro-img { 35 li:nth-child(1) .intro-img {
36 - background-image: resolve(product/help/1.png); 36 + background-image: resolve("product/help/1.png");
37 } 37 }
38 38
39 li:nth-child(2) .intro-img { 39 li:nth-child(2) .intro-img {
40 - background-image: resolve(product/help/2.png); 40 + background-image: resolve("product/help/2.png");
41 } 41 }
42 42
43 li:nth-child(3) .intro-img { 43 li:nth-child(3) .intro-img {
44 - background-image: resolve(product/help/3.png); 44 + background-image: resolve("product/help/3.png");
45 } 45 }
46 } 46 }
47 47
48 .method-2 { 48 .method-2 {
49 li:nth-child(1) .intro-img { 49 li:nth-child(1) .intro-img {
50 - background-image: resolve(product/help/4.png); 50 + background-image: resolve("product/help/4.png");
51 } 51 }
52 52
53 li:nth-child(2) .intro-img { 53 li:nth-child(2) .intro-img {
54 - background-image: resolve(product/help/5.png); 54 + background-image: resolve("product/help/5.png");
55 } 55 }
56 56
57 li:nth-child(3) .intro-img { 57 li:nth-child(3) .intro-img {
58 - background-image: resolve(product/help/6.png); 58 + background-image: resolve("product/help/6.png");
59 } 59 }
60 60
61 li:nth-child(4) .intro-img { 61 li:nth-child(4) .intro-img {
62 - background-image: resolve(product/help/7.png); 62 + background-image: resolve("product/help/7.png");
63 } 63 }
64 } 64 }
65 65
66 .how { 66 .how {
67 li:nth-child(1) .intro-img { 67 li:nth-child(1) .intro-img {
68 - background-image: resolve(product/help/8.png); 68 + background-image: resolve("product/help/8.png");
69 } 69 }
70 70
71 li:nth-child(2) .intro-img { 71 li:nth-child(2) .intro-img {
72 - background-image: resolve(product/help/9.png); 72 + background-image: resolve("product/help/9.png");
73 margin-bottom: 0; 73 margin-bottom: 0;
74 } 74 }
75 } 75 }
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 color: #444; 60 color: #444;
61 font-size: 28px; 61 font-size: 28px;
62 62
63 - &.hasActive { 63 + &.has-active {
64 margin: 5px 0 0 !important; 64 margin: 5px 0 0 !important;
65 } 65 }
66 } 66 }
@@ -99,7 +99,6 @@ @@ -99,7 +99,6 @@
99 99
100 li { 100 li {
101 float: left; 101 float: left;
102 - width: auto;  
103 height: 67px; 102 height: 67px;
104 line-height: 67px; 103 line-height: 67px;
105 width: 145px; 104 width: 145px;
@@ -143,7 +142,7 @@ @@ -143,7 +142,7 @@
143 color: #000; 142 color: #000;
144 } 143 }
145 144
146 - &.bgActive { 145 + &.bg-active {
147 color: #000; 146 color: #000;
148 background-color: #e0e0e0; 147 background-color: #e0e0e0;
149 } 148 }
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 box-sizing: border-box; 14 box-sizing: border-box;
15 padding: 0 22px; 15 padding: 0 22px;
16 width: 100%; 16 width: 100%;
17 - height: 70px; /**父元素hidden 隐藏滚动条**/ 17 + height: 70px;
18 border-bottom: 1px solid #e6e6e6; 18 border-bottom: 1px solid #e6e6e6;
19 background: #f0f0f0; 19 background: #f0f0f0;
20 color: #999; 20 color: #999;
@@ -333,7 +333,6 @@ @@ -333,7 +333,6 @@
333 bottom: 258px; 333 bottom: 258px;
334 } 334 }
335 335
336 - /* 搜索分割 */  
337 .intro-text, 336 .intro-text,
338 .word-content { 337 .word-content {
339 margin-left: -0.375rem; 338 margin-left: -0.375rem;
@@ -397,4 +396,6 @@ @@ -397,4 +396,6 @@
397 margin-top: 0; 396 margin-top: 0;
398 border-top: none; 397 border-top: none;
399 } 398 }
  399 +=======
  400 +>>>>>>> feature/indexcss
400 } 401 }
@@ -70,7 +70,6 @@ @@ -70,7 +70,6 @@
70 height: 62px; 70 height: 62px;
71 line-height: 62px; 71 line-height: 62px;
72 padding: 0 20px; 72 padding: 0 20px;
73 - font-size: 28px;  
74 color: #000; 73 color: #000;
75 overflow: hidden; 74 overflow: hidden;
76 text-overflow: ellipsis; 75 text-overflow: ellipsis;
@@ -6,7 +6,18 @@ @@ -6,7 +6,18 @@
6 height: 119px; 6 height: 119px;
7 overflow: hidden; 7 overflow: hidden;
8 8
9 - ul { 9 + &.fix-top {
  10 + position: fixed;
  11 + top: 0;
  12 + right: 0;
  13 + left: 0;
  14 + z-index: 100;
  15 + box-shadow: 0 1px 0 0 #e1e1e1;
  16 + }
  17 + }
  18 +}
  19 +
  20 +.seckill-list .nav-list ul {
10 width: auto; 21 width: auto;
11 overflow: hidden; 22 overflow: hidden;
12 height: 100%; 23 height: 100%;
@@ -100,15 +111,4 @@ @@ -100,15 +111,4 @@
100 padding-right: 5px; 111 padding-right: 5px;
101 } 112 }
102 } 113 }
103 - }  
104 -  
105 - &.fix-top {  
106 - position: fixed;  
107 - top: 0;  
108 - right: 0;  
109 - left: 0;  
110 - z-index: 100;  
111 - box-shadow: 0 1px 0 0 #e1e1e1;  
112 - }  
113 - }  
114 } 114 }
1 -.seckill-list {  
2 - .product-list { 1 +.seckill-list .product-list {
3 background-color: #fff; 2 background-color: #fff;
4 margin-top: 1px; 3 margin-top: 1px;
5 4
6 - .item { 5 + .item-link {
  6 + position: absolute;
  7 + top: 0;
  8 + right: 0;
  9 + bottom: 0;
  10 + left: 0;
  11 + z-index: 1;
  12 + }
  13 +}
  14 +
  15 +.seckill-list .product-list .item {
7 position: relative; 16 position: relative;
8 padding: 20px 30px; 17 padding: 20px 30px;
9 display: -webkit-box; 18 display: -webkit-box;
@@ -21,8 +30,9 @@ @@ -21,8 +30,9 @@
21 width: 100%; 30 width: 100%;
22 } 31 }
23 } 32 }
  33 +}
24 34
25 - .item-info { 35 +.seckill-list .product-list .item .item-info {
26 -webkit-box-flex: 1; 36 -webkit-box-flex: 1;
27 position: relative; 37 position: relative;
28 min-height: 202px; 38 min-height: 202px;
@@ -128,16 +138,4 @@ @@ -128,16 +138,4 @@
128 } 138 }
129 } 139 }
130 } 140 }
131 - }  
132 - }  
133 -  
134 - .item-link {  
135 - position: absolute;  
136 - top: 0;  
137 - right: 0;  
138 - bottom: 0;  
139 - left: 0;  
140 - z-index: 1;  
141 - }  
142 - }  
143 } 141 }
@@ -32,8 +32,7 @@ @@ -32,8 +32,7 @@
32 padding: 0 10px; 32 padding: 0 10px;
33 } 33 }
34 34
35 - .allproductParagaraph {  
36 - /* font-size: 18px; */ 35 + .all-product-paragaraph {
37 left: 20px; 36 left: 20px;
38 } 37 }
39 38
@@ -43,12 +43,10 @@ @@ -43,12 +43,10 @@
43 } 43 }
44 } 44 }
45 45
46 - li:first-child {  
47 - .text { 46 + &:first-child .text {
48 border-left: none; 47 border-left: none;
49 } 48 }
50 } 49 }
51 - }  
52 50
53 .shop-foot-wrapper { 51 .shop-foot-wrapper {
54 position: fixed; 52 position: fixed;
@@ -129,7 +127,7 @@ @@ -129,7 +127,7 @@
129 font-size: 28px; 127 font-size: 28px;
130 background: #fff; 128 background: #fff;
131 overflow: hidden; 129 overflow: hidden;
132 - border-sizing: border-box; 130 + box-sizing: border-box;
133 border-bottom: 1px solid #e0e0e0; 131 border-bottom: 1px solid #e0e0e0;
134 z-index: 2; 132 z-index: 2;
135 133
@@ -142,7 +140,7 @@ @@ -142,7 +140,7 @@
142 text-align: center; 140 text-align: center;
143 border-left: 1px solid #e0e0e0; 141 border-left: 1px solid #e0e0e0;
144 margin-top: 30px; 142 margin-top: 30px;
145 - border-sizing: border-box; 143 + box-sizing: border-box;
146 color: #b0b0b0; 144 color: #b0b0b0;
147 145
148 &:first-child { 146 &:first-child {
@@ -167,6 +165,7 @@ @@ -167,6 +165,7 @@
167 165
168 .banner-area { 166 .banner-area {
169 @extend .banner-top; 167 @extend .banner-top;
  168 +
170 margin-bottom: 30px; 169 margin-bottom: 30px;
171 } 170 }
172 171
@@ -401,7 +400,7 @@ @@ -401,7 +400,7 @@
401 line-height: 40PX; 400 line-height: 40PX;
402 width: 20%; 401 width: 20%;
403 text-align: center; 402 text-align: center;
404 - border-sizing: border-box; 403 + box-sizing: border-box;
405 position: relative; 404 position: relative;
406 405
407 span { 406 span {
@@ -525,6 +524,7 @@ @@ -525,6 +524,7 @@
525 524
526 .pos-list { 525 .pos-list {
527 @extend .sale-page; 526 @extend .sale-page;
  527 +
528 background: #fff; 528 background: #fff;
529 width: 100%; 529 width: 100%;
530 overflow: hidden; 530 overflow: hidden;
@@ -536,7 +536,7 @@ @@ -536,7 +536,7 @@
536 line-height: 40PX; 536 line-height: 40PX;
537 width: 20%; 537 width: 20%;
538 text-align: center; 538 text-align: center;
539 - border-sizing: border-box; 539 + box-sizing: border-box;
540 540
541 span { 541 span {
542 font-size: 14PX; 542 font-size: 14PX;
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 } 12 }
13 13
14 .descripition { 14 .descripition {
15 - margin: 0 20px 0px; 15 + margin: 0 20px;
16 font-size: 22px; 16 font-size: 22px;
17 line-height: 36px; 17 line-height: 36px;
18 padding: 60px 20px 40px; 18 padding: 60px 20px 40px;
@@ -24,19 +24,7 @@ @@ -24,19 +24,7 @@
24 } 24 }
25 25
26 .shop-coupon { 26 .shop-coupon {
27 - // padding-right: 30px;  
28 background-color: #f0f0f0; 27 background-color: #f0f0f0;
29 - // white-space: nowrap;  
30 -  
31 - /*.coupon-small {  
32 - float: none;  
33 - display: inline-block !important;  
34 - white-space: normal;  
35 - }  
36 -  
37 - &::-webkit-scrollbar {  
38 - display: none;  
39 - }*/  
40 } 28 }
41 29
42 .shop-swiper { 30 .shop-swiper {
@@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
5 @import "layout/swiper"; 5 @import "layout/swiper";
6 6
7 /* page */ 7 /* page */
8 -/* @import "channel/index"; */  
9 @import "channel/banner-top"; 8 @import "channel/banner-top";
10 @import "channel/floor-header"; 9 @import "channel/floor-header";
11 @import "channel/search"; 10 @import "channel/search";
@@ -155,7 +155,6 @@ body { @@ -155,7 +155,6 @@ body {
155 } 155 }
156 } 156 }
157 157
158 - /* menu open*/  
159 .menu-open { 158 .menu-open {
160 .menu { 159 .menu {
161 display: block; 160 display: block;
1 .service-chat { 1 .service-chat {
2 - /* 聊天气泡 */  
3 .head-icon { 2 .head-icon {
4 height: 90px; 3 height: 90px;
5 width: 90px; 4 width: 90px;
@@ -26,12 +25,6 @@ @@ -26,12 +25,6 @@
26 font-size: 28px; 25 font-size: 28px;
27 word-break: break-all; 26 word-break: break-all;
28 border-radius: 10px; 27 border-radius: 10px;
29 -  
30 - &.msg-pic {  
31 - }  
32 -  
33 - &.msg-order {  
34 - }  
35 } 28 }
36 29
37 .msg-txt { 30 .msg-txt {
@@ -125,10 +118,6 @@ @@ -125,10 +118,6 @@
125 } 118 }
126 } 119 }
127 120
128 - /*.send-msg-status {  
129 -  
130 - }*/  
131 -  
132 .recevied-msg { 121 .recevied-msg {
133 .head-icon { 122 .head-icon {
134 float: left; 123 float: left;