Showing
12 changed files
with
18 additions
and
47 deletions
@@ -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}} |
@@ -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 |
@@ -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,10 +145,10 @@ | @@ -145,10 +145,10 @@ | ||
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 | - color: #ac8412; | ||
151 | - } | 150 | + &:last-child span { |
151 | + color: #ac8412; | ||
152 | } | 152 | } |
153 | } | 153 | } |
154 | } | 154 | } |
@@ -354,4 +354,4 @@ | @@ -354,4 +354,4 @@ | ||
354 | position: relative; | 354 | position: relative; |
355 | } | 355 | } |
356 | } | 356 | } |
357 | -} | ||
357 | +} |
@@ -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 |
@@ -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 |
@@ -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; |
@@ -868,10 +867,7 @@ $basicBtnC: #eb0313; | @@ -868,10 +867,7 @@ $basicBtnC: #eb0313; | ||
868 | } | 867 | } |
869 | 868 | ||
870 | .content-main.consult-content-main { | 869 | .content-main.consult-content-main { |
871 | - padding-right: 28px; | ||
872 | - padding-left: 28px; | ||
873 | - padding-top: 20px; | ||
874 | - padding-bottom: 20px; | 870 | + padding: 20px 28px; |
875 | 871 | ||
876 | .question { | 872 | .question { |
877 | font-size: 24px; | 873 | font-size: 24px; |
@@ -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 | } |
@@ -332,7 +332,6 @@ | @@ -332,7 +332,6 @@ | ||
332 | bottom: 258px; | 332 | bottom: 258px; |
333 | } | 333 | } |
334 | 334 | ||
335 | - /*搜索分割*/ | ||
336 | .search-divide { | 335 | .search-divide { |
337 | float: left; | 336 | float: left; |
338 | height: 50px; | 337 | height: 50px; |
@@ -341,4 +340,4 @@ | @@ -341,4 +340,4 @@ | ||
341 | color: #ccc; | 340 | color: #ccc; |
342 | text-align: center; | 341 | text-align: center; |
343 | } | 342 | } |
344 | -} | ||
343 | +} |
@@ -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 { |
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; |
-
Please register or login to post a comment