From 45aa1c49e91641310f99cdab58501ce8086b51d6 Mon Sep 17 00:00:00 2001 From: YuanHuakk <1751826683@qq.com> Date: Wed, 31 Jan 2024 23:30:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(custom):=20=E6=96=B0=E5=A2=9E=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E5=86=85=E7=95=8C=E9=9D=A2=E8=A7=84=E5=88=99=E5=BC=B9?= =?UTF-8?q?=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.scss | 6 ++--- src/components/Popup.vue | 35 ++++++++++++++++++++++++++++ src/pages/aoshi/index/index.scss | 7 ++++++ src/pages/aoshi/index/index.vue | 16 ++++++++++++- src/pages/balloon/index/index.scss | 7 ++++++ src/pages/turntable/index/index.scss | 7 ++++++ src/pages/turntable/index/index.vue | 17 +++++++++++++- 7 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 src/components/Popup.vue diff --git a/src/app.scss b/src/app.scss index 4d0beeb..1c9f3cf 100644 --- a/src/app.scss +++ b/src/app.scss @@ -2,9 +2,9 @@ // background-color: #f5f5f5 !important; // } -body { - line-height: 1; -} +// body { +// line-height: 1; +// } .mt-15 { margin-top: 15px; diff --git a/src/components/Popup.vue b/src/components/Popup.vue new file mode 100644 index 0000000..305e1b4 --- /dev/null +++ b/src/components/Popup.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/pages/aoshi/index/index.scss b/src/pages/aoshi/index/index.scss index 87d56bf..cc324e6 100644 --- a/src/pages/aoshi/index/index.scss +++ b/src/pages/aoshi/index/index.scss @@ -555,3 +555,10 @@ body { width: 700px; } } + +.popup-content { + background-color: #fff; + width: 70%; + padding: 20px; + border-radius: 8px; +} \ No newline at end of file diff --git a/src/pages/aoshi/index/index.vue b/src/pages/aoshi/index/index.vue index 00ab079..dc1cda2 100644 --- a/src/pages/aoshi/index/index.vue +++ b/src/pages/aoshi/index/index.vue @@ -2,6 +2,7 @@ import { onBeforeUnmount, onMounted, ref } from 'vue' import Taro from '@tarojs/taro' import Lottie from 'lottie-web' +import HPopup from '../../../components/Popup.vue' import * as dayjs from 'dayjs' import dan from '../../../static/dan.png' import he from '../../../static/he.png' @@ -380,6 +381,13 @@ onBeforeUnmount(() => { clearInterval(time_i.value) innerAudioContext.stop() }) + +const showPopup = ref(false) +const game_info = ref({}) + +Taro.useDidShow(() => { + game_info.value = Taro.getStorageSync('gameItem') +}) diff --git a/src/pages/balloon/index/index.scss b/src/pages/balloon/index/index.scss index ff2c62a..90ba0f1 100644 --- a/src/pages/balloon/index/index.scss +++ b/src/pages/balloon/index/index.scss @@ -47,3 +47,10 @@ } } } + +.popup-content { + background-color: #fff; + width: 70%; + padding: 20px; + border-radius: 8px; +} \ No newline at end of file diff --git a/src/pages/turntable/index/index.scss b/src/pages/turntable/index/index.scss index 01cb2cf..87d9736 100644 --- a/src/pages/turntable/index/index.scss +++ b/src/pages/turntable/index/index.scss @@ -555,3 +555,10 @@ body { width: 700px; } } + +.popup-content { + background-color: #fff; + width: 70%; + padding: 20px; + border-radius: 8px; +} \ No newline at end of file diff --git a/src/pages/turntable/index/index.vue b/src/pages/turntable/index/index.vue index cd4cfec..88e6e94 100644 --- a/src/pages/turntable/index/index.vue +++ b/src/pages/turntable/index/index.vue @@ -3,6 +3,7 @@ import { onBeforeUnmount, onMounted, ref } from 'vue' import Taro from '@tarojs/taro' import Lottie from 'lottie-web' import * as dayjs from 'dayjs' +import HPopup from '../../../components/Popup.vue' import dan from '../../../static/dan.png' import he from '../../../static/he.png' import shuang from '../../../static/shuang.png' @@ -424,6 +425,13 @@ onBeforeUnmount(() => { ws.value?.close() innerAudioContext.stop() }) + +const showPopup = ref(false) +const game_info = ref({}) + +Taro.useDidShow(() => { + game_info.value = Taro.getStorageSync('gameItem') +})