Merge remote-tracking branch 'origin/release/app-download' into release/app-download
Showing
6 changed files
with
15 additions
and
12 deletions
@@ -32,9 +32,9 @@ if ($('#float-layer-btn') && $('#float-layer-btn')[0]) { | @@ -32,9 +32,9 @@ if ($('#float-layer-btn') && $('#float-layer-btn')[0]) { | ||
32 | e.srcEvent.stopPropagation(); | 32 | e.srcEvent.stopPropagation(); |
33 | }); | 33 | }); |
34 | 34 | ||
35 | - if (typeof window.cookie === 'function' && !window.cookie('_float-layer-app')) { | ||
36 | - $('#float-layer-app').show(); | ||
37 | - } else { | ||
38 | - $('#float-layer-app').hide(); | ||
39 | - } | 35 | + // if (typeof window.cookie === 'function' && !window.cookie('_float-layer-app')) { |
36 | + // $('#float-layer-app').show(); | ||
37 | + // } else { | ||
38 | + // $('#float-layer-app').hide(); | ||
39 | + // } | ||
40 | } | 40 | } |
@@ -45,9 +45,9 @@ if ($('#float-layer-btn') && $('#float-layer-btn')[0]) { | @@ -45,9 +45,9 @@ if ($('#float-layer-btn') && $('#float-layer-btn')[0]) { | ||
45 | e.srcEvent.stopPropagation(); | 45 | e.srcEvent.stopPropagation(); |
46 | }); | 46 | }); |
47 | 47 | ||
48 | - if (typeof window.cookie === 'function' && !window.cookie('_float-layer-app')) { | ||
49 | - $('#float-layer-app').show(); | ||
50 | - } else { | ||
51 | - $('#float-layer-app').hide(); | ||
52 | - } | 48 | + // if (typeof window.cookie === 'function' && !window.cookie('_float-layer-app')) { |
49 | + // $('#float-layer-app').show(); | ||
50 | + // } else { | ||
51 | + // $('#float-layer-app').hide(); | ||
52 | + // } | ||
53 | } | 53 | } |
@@ -334,10 +334,10 @@ $('.wei-share').on('touchend', function(e) { | @@ -334,10 +334,10 @@ $('.wei-share').on('touchend', function(e) { | ||
334 | }); | 334 | }); |
335 | 335 | ||
336 | if (typeof window.cookie === 'function' && parseInt(window.cookie('_float-layer-app-close')) != 2) { | 336 | if (typeof window.cookie === 'function' && parseInt(window.cookie('_float-layer-app-close')) != 2) { |
337 | - $('#float-layer-app').show(); | 337 | + //$('#float-layer-app').show(); |
338 | $('.down-bottom').show(); | 338 | $('.down-bottom').show(); |
339 | } else { | 339 | } else { |
340 | - $('#float-layer-app').hide(); | 340 | + //$('#float-layer-app').hide(); |
341 | $('.down-bottom').hide(); | 341 | $('.down-bottom').hide(); |
342 | } | 342 | } |
343 | } | 343 | } |
@@ -153,6 +153,7 @@ | @@ -153,6 +153,7 @@ | ||
153 | background-size: contain; | 153 | background-size: contain; |
154 | } | 154 | } |
155 | .float-layer { | 155 | .float-layer { |
156 | + opacity: 0; | ||
156 | height: 128px; | 157 | height: 128px; |
157 | background: rgba(68, 68, 68, 0.95); | 158 | background: rgba(68, 68, 68, 0.95); |
158 | position: fixed; | 159 | position: fixed; |
@@ -539,6 +539,7 @@ | @@ -539,6 +539,7 @@ | ||
539 | line-height: 90px; | 539 | line-height: 90px; |
540 | background-image: linear-gradient(#323232, #414141); | 540 | background-image: linear-gradient(#323232, #414141); |
541 | overflow: hidden; | 541 | overflow: hidden; |
542 | + position: relative; | ||
542 | 543 | ||
543 | .iconfont { | 544 | .iconfont { |
544 | color: #fff; | 545 | color: #fff; |
-
Please register or login to post a comment