Merge branch 'feature/3158-revise' into 'release/6.8.7'
样式调整以及定时器销毁处理 问题修改 See merge request !18
Showing
2 changed files
with
13 additions
and
2 deletions
1 | import router from '../router/router'; | 1 | import router from '../router/router'; |
2 | 2 | ||
3 | +let timer; | ||
4 | + | ||
3 | Component({ | 5 | Component({ |
4 | properties: { | 6 | properties: { |
5 | product: { | 7 | product: { |
@@ -17,7 +19,7 @@ Component({ | @@ -17,7 +19,7 @@ Component({ | ||
17 | }); | 19 | }); |
18 | //放大缩小循环动画 | 20 | //放大缩小循环动画 |
19 | var next = true; | 21 | var next = true; |
20 | - setInterval(function () { | 22 | + timer = setInterval(function () { |
21 | if (next) { | 23 | if (next) { |
22 | animation.scale(1.05).step() | 24 | animation.scale(1.05).step() |
23 | next = !next; | 25 | next = !next; |
@@ -30,6 +32,10 @@ Component({ | @@ -30,6 +32,10 @@ Component({ | ||
30 | }) | 32 | }) |
31 | }.bind(this), 400) | 33 | }.bind(this), 400) |
32 | }, | 34 | }, |
35 | + detached: function() { | ||
36 | + clearInterval(timer); | ||
37 | + }, | ||
38 | + | ||
33 | methods: { | 39 | methods: { |
34 | onClick() { | 40 | onClick() { |
35 | router.go('detail', { | 41 | router.go('detail', { |
@@ -107,5 +107,10 @@ page { | @@ -107,5 +107,10 @@ page { | ||
107 | } | 107 | } |
108 | 108 | ||
109 | .my-draw-code-text { | 109 | .my-draw-code-text { |
110 | - font-size: 26rpx; | 110 | + font-family: PingFangSC-Medium; |
111 | + font-weight: bold; | ||
112 | + font-size: 28rpx; | ||
113 | + color: #444444; | ||
114 | + letter-spacing: 0; | ||
115 | + text-align: center; | ||
111 | } | 116 | } |
-
Please register or login to post a comment