fe / YOHOBUYWAP · Commits

Go to a project

Authored by liangxs
Commit 3f9ed8ce765ba79550ced0fc433ab1584afac42c 1 parent 3b0ce9a3

领券修改

Inline Side-by-side
Showing 3 changed files with 29 additions and 28 deletions
@@ -20,7 +20,7 @@ $receive.on('click', function() { @@ -20,7 +20,7 @@ $receive.on('click', function() {
20 if (data.noLogin === true) { 20 if (data.noLogin === true) {
21 location.href = data.url + '?contentCode=' + getUrlParam('contentCode'); 21 location.href = data.url + '?contentCode=' + getUrlParam('contentCode');
22 } else { 22 } else {
23 - if (!status) { 23 + if (status) {
24 $curDom.hide(); 24 $curDom.hide();
25 $curDom.next().show(); 25 $curDom.next().show();
26 $tooltip.show(); 26 $tooltip.show();
1 .coupon-floor { 1 .coupon-floor {
2 float: left; 2 float: left;
  3 + width:100%;
3 .floor-title { 4 .floor-title {
4 background-color: #fff; 5 background-color: #fff;
5 text-align: center; 6 text-align: center;
@@ -13,25 +14,24 @@ @@ -13,25 +14,24 @@
13 width: 100%; 14 width: 100%;
14 background-size: 100%; 15 background-size: 100%;
15 background-repeat: no-repeat; 16 background-repeat: no-repeat;
16 - background-color: #000;  
17 - padding: 0 30rem / $pxConvertRem; 17 + padding: 10rem / $pxConvertRem 30rem / $pxConvertRem;
18 box-sizing: border-box; 18 box-sizing: border-box;
19 float: left; 19 float: left;
20 20
21 .main-left { 21 .main-left {
22 float: left; 22 float: left;
23 width: 467rem / $pxConvertRem; 23 width: 467rem / $pxConvertRem;
24 - height: 180rem / $pxConvertRem; 24 + height: 160rem / $pxConvertRem;
25 } 25 }
26 26
27 - .main-right-receive, .main-right-use, .main-right-go { 27 + .main-right-receive, .main-right-use, .main-right-go {
28 float: right; 28 float: right;
29 width: 113rem / $pxConvertRem; 29 width: 113rem / $pxConvertRem;
30 - height: 180rem / $pxConvertRem; 30 + height: 160rem / $pxConvertRem;
31 position: relative; 31 position: relative;
32 32
33 span { 33 span {
34 - background-repeat:no-repeat; 34 + background-repeat: no-repeat;
35 background-size: contain; 35 background-size: contain;
36 36
37 &.on-receive { 37 &.on-receive {
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 display: inline-block; 42 display: inline-block;
43 width: 52rem / $pxConvertRem; 43 width: 52rem / $pxConvertRem;
44 height: 54rem / $pxConvertRem; 44 height: 54rem / $pxConvertRem;
45 - background-image:image-url('coupon/click-txt.png'); 45 + background-image: image-url('coupon/click-txt.png');
46 } 46 }
47 47
48 &.received { 48 &.received {
@@ -82,10 +82,10 @@ @@ -82,10 +82,10 @@
82 position: fixed; 82 position: fixed;
83 top: 50%; 83 top: 50%;
84 left: 50%; 84 left: 50%;
85 - width: 550rem / $pxConvertRem;  
86 - height: 250rem / $pxConvertRem;  
87 - margin-left: -275rem / $pxConvertRem;  
88 - margin-top: -125rem / $pxConvertRem; 85 + width: 550rem/$pxConvertRem;
  86 + height: 250rem/$pxConvertRem;
  87 + margin-left: -275rem/$pxConvertRem;
  88 + margin-top: -125rem/$pxConvertRem;
89 z-index: 10; 89 z-index: 10;
90 background-color: rgba(250, 250, 250, .92); 90 background-color: rgba(250, 250, 250, .92);
91 display: none; 91 display: none;
@@ -93,17 +93,17 @@ @@ -93,17 +93,17 @@
93 93
94 .coupon-message-content { 94 .coupon-message-content {
95 border-bottom: 1px solid rgb(197, 197, 197); 95 border-bottom: 1px solid rgb(197, 197, 197);
96 - height: 160rem / $pxConvertRem; 96 + height: 160rem/$pxConvertRem;
97 text-align: center; 97 text-align: center;
98 - line-height: 160rem / $pxConvertRem;  
99 - font-size: 28rem / $pxConvertRem; 98 + line-height: 160rem/$pxConvertRem;
  99 + font-size: 28rem/$pxConvertRem;
100 } 100 }
101 101
102 .coupon-message-op { 102 .coupon-message-op {
103 - height: 90rem / $pxConvertRem; 103 + height: 90rem/$pxConvertRem;
104 text-align: center; 104 text-align: center;
105 - line-height: 90rem / $pxConvertRem;  
106 - font-size: 32rem / $pxConvertRem; 105 + line-height: 90rem/$pxConvertRem;
  106 + font-size: 32rem/$pxConvertRem;
107 color: rgb(223, 98, 112); 107 color: rgb(223, 98, 112);
108 } 108 }
109 } 109 }
@@ -112,24 +112,24 @@ @@ -112,24 +112,24 @@
112 position: fixed; 112 position: fixed;
113 top: 50%; 113 top: 50%;
114 left: 50%; 114 left: 50%;
115 - width: 220rem / $pxConvertRem;  
116 - height: 140rem / $pxConvertRem;  
117 - margin-left: -110rem / $pxConvertRem;  
118 - margin-top: -70rem / $pxConvertRem; 115 + width: 220rem/$pxConvertRem;
  116 + height: 140rem/$pxConvertRem;
  117 + margin-left: -110rem/$pxConvertRem;
  118 + margin-top: -70rem/$pxConvertRem;
119 z-index: 11; 119 z-index: 11;
120 background-color: rgba(60, 60, 60, .7); 120 background-color: rgba(60, 60, 60, .7);
121 display: none; 121 display: none;
122 - border-radius: 8rem / $pxConvertRem; 122 + border-radius: 8rem/$pxConvertRem;
123 color: #fff; 123 color: #fff;
124 124
125 .icon-box{ 125 .icon-box{
126 - height: 84rem / $pxConvertRem;  
127 - line-height: 84rem / $pxConvertRem; 126 + height: 84rem/$pxConvertRem;
  127 + line-height: 84rem/$pxConvertRem;
128 text-align: center; 128 text-align: center;
129 } 129 }
130 130
131 .icon-msg{ 131 .icon-msg{
132 - height: 56rem / $pxConvertRem; 132 + height: 56rem/$pxConvertRem;
133 text-align: center; 133 text-align: center;
134 } 134 }
135 } 135 }
1 {{>layout/header}} 1 {{>layout/header}}
2 -{{# content}} 2 +{{>home/baner_top}}
  3 +{{# floor}}
3 {{#if isCoupon}} 4 {{#if isCoupon}}
4 <div class="coupon-floor"> 5 <div class="coupon-floor">
5 {{#if showFloorTitle}} 6 {{#if showFloorTitle}}
@@ -30,7 +31,7 @@ @@ -30,7 +31,7 @@
30 </div> 31 </div>
31 </div> 32 </div>
32 {{/if}} 33 {{/if}}
33 -{{/ content}} 34 +{{/ floor}}
34 <div class="floor-mask"></div> 35 <div class="floor-mask"></div>
35 <div class="floor-message"> 36 <div class="floor-message">
36 <div class="coupon-message-content"></div> 37 <div class="coupon-message-content"></div>