Merge branch 'feature/yoluck' into 'release/6.8.3'
Feature/yoluck See merge request !1614
Showing
6 changed files
with
7 additions
and
25 deletions
@@ -26,7 +26,8 @@ function index(req, res, next) { | @@ -26,7 +26,8 @@ function index(req, res, next) { | ||
26 | page: 'yoluck-list', | 26 | page: 'yoluck-list', |
27 | tabpanel: result, | 27 | tabpanel: result, |
28 | localCss: true, | 28 | localCss: true, |
29 | - nodownload: true | 29 | + nodownload: true, |
30 | + width750: true | ||
30 | }); | 31 | }); |
31 | 32 | ||
32 | }).catch(next); | 33 | }).catch(next); |
@@ -75,7 +76,8 @@ function detail(req, res, next) { | @@ -75,7 +76,8 @@ function detail(req, res, next) { | ||
75 | page: 'yoluck-detail', | 76 | page: 'yoluck-detail', |
76 | result, | 77 | result, |
77 | localCss: true, | 78 | localCss: true, |
78 | - nodownload: true | 79 | + nodownload: true, |
80 | + width750: true | ||
79 | }); | 81 | }); |
80 | 82 | ||
81 | }).catch(next); | 83 | }).catch(next); |
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | </div> | 4 | </div> |
5 | {{/ifcond}} | 5 | {{/ifcond}} |
6 | 6 | ||
7 | -<img class="product_image" src="{{image2 cover_img q=60}}" alt=""> | 7 | +<img class="product_image" src="{{image2 cover_img w=760 h=470 q=60}}" alt=""> |
8 | <div class="product_name">{{name}}</div> | 8 | <div class="product_name">{{name}}</div> |
9 | 9 | ||
10 | <div class="product_lucky_bg"> | 10 | <div class="product_lucky_bg"> |
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | </div> | 6 | </div> |
7 | {{/ifcond}} | 7 | {{/ifcond}} |
8 | 8 | ||
9 | -<img class="product_image" src="{{cover_img}}" alt=""> | 9 | +<img class="product_image" src="{{image2 cover_img w=760 h=470 q=60}}" alt=""> |
10 | <div class="product_name">{{name}}</div> | 10 | <div class="product_name">{{name}}</div> |
11 | 11 | ||
12 | <div class="product_lucky_bg"> | 12 | <div class="product_lucky_bg"> |
@@ -110,7 +110,6 @@ clipboard.on('success', function(e) { | @@ -110,7 +110,6 @@ clipboard.on('success', function(e) { | ||
110 | }); | 110 | }); |
111 | 111 | ||
112 | luckAlert.init(); | 112 | luckAlert.init(); |
113 | -yoSdk.auth(); | ||
114 | 113 | ||
115 | setInterval(() => { | 114 | setInterval(() => { |
116 | let $countdown = $('.product_countdown'); | 115 | let $countdown = $('.product_countdown'); |
@@ -26,24 +26,5 @@ | @@ -26,24 +26,5 @@ | ||
26 | line-height: 40px; | 26 | line-height: 40px; |
27 | background-color: #d0021b; | 27 | background-color: #d0021b; |
28 | text-align: center; | 28 | text-align: center; |
29 | - animation: scaleDraw 3s ease-in-out infinite; | ||
30 | - } | ||
31 | - | ||
32 | - @keyframes scaleDraw { | ||
33 | - 0% { | ||
34 | - transform: scale(1); | ||
35 | - } | ||
36 | - | ||
37 | - 25% { | ||
38 | - transform: scale(1.2); | ||
39 | - } | ||
40 | - | ||
41 | - 50% { | ||
42 | - transform: scale(1); | ||
43 | - } | ||
44 | - | ||
45 | - 75% { | ||
46 | - transform: scale(1.2); | ||
47 | - } | ||
48 | } | 29 | } |
49 | } | 30 | } |
-
Please register or login to post a comment