diff --git a/src/assets/images/enter_btn_bg.png b/src/assets/images/enter_btn_bg.png index 39511f8..61258ef 100644 Binary files a/src/assets/images/enter_btn_bg.png and b/src/assets/images/enter_btn_bg.png differ diff --git a/src/assets/images/enter_btn_bg_a.png b/src/assets/images/enter_btn_bg_a.png new file mode 100644 index 0000000..39511f8 Binary files /dev/null and b/src/assets/images/enter_btn_bg_a.png differ diff --git a/src/assets/images/enter_btn_bg_g.png b/src/assets/images/enter_btn_bg_g.png index 91fdbcf..b462119 100644 Binary files a/src/assets/images/enter_btn_bg_g.png and b/src/assets/images/enter_btn_bg_g.png differ diff --git a/src/assets/images/enter_btn_bg_g_a.png b/src/assets/images/enter_btn_bg_g_a.png new file mode 100644 index 0000000..91fdbcf Binary files /dev/null and b/src/assets/images/enter_btn_bg_g_a.png differ diff --git a/src/components/ballContent/notice.vue b/src/components/ballContent/notice.vue index a7a6e1f..2745ef3 100644 --- a/src/components/ballContent/notice.vue +++ b/src/components/ballContent/notice.vue @@ -3,8 +3,8 @@
diff --git a/src/components/enterView/btnView.vue b/src/components/enterView/btnView.vue index d6c69af..11bafb6 100644 --- a/src/components/enterView/btnView.vue +++ b/src/components/enterView/btnView.vue @@ -1,5 +1,5 @@ @@ -22,6 +22,9 @@ export default { if (this.mode === "blue") return "btn-view-xy"; return "btn-view-hh"; } + }, + methods: { + clickEntryBtn() {} } }; @@ -33,6 +36,7 @@ export default { background-repeat: no-repeat; background-size: cover; padding-top: 8px; + cursor: pointer; &-touch { width: 100%; height: 100%; @@ -43,11 +47,22 @@ export default { font-size: 28px; font-weight: 600; } + &:active { + .btn-view-touch { + opacity: 0.65; + } + } } .btn-view-xy { background-image: url(../../assets/images/enter_btn_bg.png); + &:active { + background-image: url(../../assets/images/enter_btn_bg_a.png); + } } .btn-view-hh { background-image: url(../../assets/images/enter_btn_bg_g.png); + &:active { + background-image: url(../../assets/images/enter_btn_bg_g_a.png); + } } diff --git a/src/components/luckyGridView/main.vue b/src/components/luckyGridView/main.vue index 6689c04..8a3b630 100644 --- a/src/components/luckyGridView/main.vue +++ b/src/components/luckyGridView/main.vue @@ -57,9 +57,11 @@ export default { // { padding: "4px", background: "#ff4a4c", borderRadius: 23 }, // { padding: "4px", background: "#ff625b", borderRadius: 20 } ], - defaultConfig: { - gutter: 5 - }, + // defaultConfig: { + // gutter: 5, + // accelerationTime: 1000, + // decelerationTime: 1000 + // }, defaultStyle: {}, activeStyle: { background: "none", @@ -137,6 +139,38 @@ export default { }, maxVauePrizeIndex() { return this.getPrizeIndex(this.maxVauePrizeId); + }, + runTime() { + if (this.ruleType === "one") return 1000; + if (this.ruleType === "ten") return 2000; + if (this.ruleType === "hundred") return 3000; + return 1000; + }, + defaultConfig() { + const gutter = 5; + if (this.ruleType === "one") + return { + gutter, + accelerationTime: 1000, + decelerationTime: 1000 + }; + if (this.ruleType === "ten") + return { + gutter, + accelerationTime: 1500, + decelerationTime: 1500 + }; + if (this.ruleType === "hundred") + return { + gutter, + accelerationTime: 2000, + decelerationTime: 2000 + }; + return { + gutter, + accelerationTime: 1000, + decelerationTime: 1000 + }; } }, watch: { @@ -208,11 +242,13 @@ export default { } }); + console.log("runTime", this.runTime); + setTimeout(() => { this.timeout = true; if (this.timeout && this.request) this.stopLuckDraw(this.maxVauePrizeIndex); - }, 2000); + }, this.runTime); }, postSaveLog() { saveLog({