diff --git a/.env.development b/.env.development
index f09897e..34c8454 100644
--- a/.env.development
+++ b/.env.development
@@ -1,19 +1,24 @@
-# 配置文档参考 https://taro-docs.jd.com/docs/next/env-mode-config
-# TARO_APP_ID="开发环境下的小程序appid"
-
-
-TARO_APP_API = 'https://game.wanzhuanyongcheng.cn'
-
-TARO_APP_WS = 'wss://game.wanzhuanyongcheng.cn/dice/home'
-
-TARO_APP_HOME = 'https://test.wanzhuanyongcheng.cn/app/game'
-
-TARO_APP_BALLOON_WS = 'wss://balloon.wanzhuanyongcheng.cn/balloon/home'
-
-TARO_APP_BALLOON_API = 'https://balloon.wanzhuanyongcheng.cn/balloon'
-
-
-# 大转盘
-TARO_APP_TURNTABLE_WS = 'wss://game2.wanzhuanyongcheng.cn/turntable/home'
-
-TARO_APP_TURNTABLE_API = 'https://game2.wanzhuanyongcheng.cn/turntable'
+# 配置文档参考 https://taro-docs.jd.com/docs/next/env-mode-config
+# TARO_APP_ID="开发环境下的小程序appid"
+
+
+TARO_APP_API = 'https://game.wanzhuanyongcheng.cn'
+
+TARO_APP_WS = 'wss://game.wanzhuanyongcheng.cn/dice/home'
+
+TARO_APP_HOME = 'https://test.wanzhuanyongcheng.cn/app/game'
+
+# 气球
+
+TARO_APP_BALLOON_WS = 'wss://balloon.wanzhuanyongcheng.cn/balloon/home'
+
+TARO_APP_BALLOON_API = 'https://balloon.wanzhuanyongcheng.cn/balloon'
+
+
+# 大转盘
+TARO_APP_TURNTABLE_WS = 'wss://game2.wanzhuanyongcheng.cn/turntable/home'
+
+TARO_APP_TURNTABLE_API = 'https://game2.wanzhuanyongcheng.cn/turntable'
+
+# 澳拾
+TARO_APP_AOSHI_API = 'https://game3.wanzhuanyongcheng.cn'
diff --git a/src/pages/aoshi/index/index copy.vue b/src/pages/aoshi/index/index copy.vue
new file mode 100644
index 0000000..0d129fe
--- /dev/null
+++ b/src/pages/aoshi/index/index copy.vue
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+
+
+ {{ userInfo.nickName || '用户' }}
+
+ 积分: {{ `${jfStr}w` || 0 }}
+
+
+
+
+
+ {{ userInfo.pulse || 0 }}
+
+
+
+
+
+ 第
+ {{ kjData.nowPeriods || 0 }}
+ 期已开奖:
+
+
+
+ {{ item }}
+
+
+
+
+
+
+ {{ item.value }}
+
+
+
+ 点击
+ 投注
+
+
+
+ 正在开奖中,已停止投注!!!
+
+ {{ Number(kjData.nowPeriods) + 1 || 0 }}期开奖还剩: {{ timeStr || '0分0秒' }}
+
+
+
+
+ {{ item.value }}豆子
+
+
+
+
+
+
+
+
diff --git a/src/pages/aoshi/index/index.scss b/src/pages/aoshi/index/index.scss
index 6e7b3c3..3cede73 100644
--- a/src/pages/aoshi/index/index.scss
+++ b/src/pages/aoshi/index/index.scss
@@ -1,212 +1,556 @@
-.container {
- font-size: 30px;
- padding: 20px;
- box-sizing: border-box;
- background-image: url('../static/bj.png');
- background-size: 100% 100%;
- width: 100vw;
- height: 100vh;
+body {
+ line-height: 1;
+}
- .header {
- display: flex;
- justify-content: space-between;
- align-items: center;
- color: #fff;
-
- .right {
- display: flex;
-
- .btn {
- padding: 5px 10px;
- border: 1px solid #fff;
- border-radius: 10px;
-
- &:active {
- color: #a6a6a6;
- }
- }
- .btn:nth-child(2) {
- margin-left: 10px;
- }
- }
- }
-
- .user-info {
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin-top: 15px;
- padding: 20px;
- background-color: #ff0606;
- color: #fff;
- border-radius: 26px;
-
- .left {
- display: flex;
- align-items: center;
-
- .avatar {
- margin-right: 20px;
- width: 100px;
- height: 100px;
- image {
- border-radius: 50%;
- }
- }
- }
-
- .right {
- // width: 200px;
- // height: 80px;
- background-color: rgba(255, 255, 255, 0.4);
- border-radius: 40px;
- text-align: center;
- line-height: 80px;
- font-size: 40px;
- display: flex;
- align-items: center;
- justify-content: space-around;
- padding: 0 20px;
-
- .image {
- width: 50px;
- height: 50px;
- background-image: url('../../../static/dz.png');
- background-size: 100% 100%;
- }
- }
-
- .game_btn {
- padding: 10px;
- background: linear-gradient(0deg, #ff9600, #feec89);
- border-radius: 34px;
- color: #ff0606;
- font-weight: bold;
- text-align: center;
- }
- }
-
- .turntable {
- margin: 30px auto;
- background-image: url('../static/zpbj.png');
+.page {
+ background-image: url('../../../static/bg.png');
background-size: 100% 100%;
+ background-repeat: no-repeat;
+ height: 100dvh;
+ overflow: hidden;
position: relative;
- .num-box {
- display: flex;
- flex-wrap: wrap;
- align-items: center;
- padding: 80px;
- margin: auto;
+ .header {
+ margin-top: 30px;
+ display: flex;
+ justify-content: space-between;
- .item {
- width: 200px;
- height: 220px;
+ .left-box {
+ width: 378px;
+ height: 40px;
+ background: linear-gradient(90deg, #d19116 65%, #330706 95%);
+
+ .text {
+ background: linear-gradient(180deg, #fffccd 0%, #ffe08e 100%);
+ -webkit-background-clip: text;
+ color: transparent;
+ font-size: 25px;
+ font-weight: bold;
+ }
+ }
+
+ .right-box {
+ display: flex;
+
+ .btn {
+ background-size: 100% 100%;
+ width: 149px;
+ height: 46px;
+
+ &:active {
+ animation: btnClick 0.1s ease-in-out;
+ }
+ }
+
+ .tz-btn {
+ background-image: url('../../../static/tz_btn.png');
+ transform-origin: center center;
+ }
+
+ .kj-btn {
+ background-image: url('../../../static/kj_btn.png');
+ transform-origin: center center;
+ margin-left: 10px;
+ }
+ }
+ }
+
+ .user-box {
+ width: 646px;
+ height: 115px;
+ background: rgba(98, 98, 98, 0.3);
+ border-radius: 30px;
+ margin: 35px auto;
+ position: relative;
+ backdrop-filter: blur(10px);
+
+ .avatar-box {
+ position: absolute;
+ left: -5%;
+ top: 50%;
+ transform: translateY(-50%);
+ width: 120px;
+ height: 120px;
+
+ .bg {
+ background-image: url('../../../static/avatar_border.png');
+ background-size: 100% 100%;
+ border-radius: 50%;
+ width: 120px;
+ height: 120px;
+ animation: bgRevolve 10s linear infinite;
+ transform-origin: center;
+ }
+
+ .avatar {
+ position: absolute;
+ width: 92px;
+ height: 92px;
+ border-radius: 50%;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ }
+ }
+
+ .user-info {
+ position: absolute;
+ left: 100px;
+ top: 50%;
+ transform: translateY(-50%);
+ background: linear-gradient(180deg, #fffccd 0%, #ffe08e 100%);
+ -webkit-background-clip: text;
+ color: transparent;
+
+ .name {
+ font-size: 30px;
+ font-weight: bold;
+ }
+
+ .jf {
+ margin-top: 20px;
+ font-size: 28px;
+ }
+ }
+
+ .dz-box {
+ position: absolute;
+ right: 160px;
+ top: 50%;
+ transform: translateY(-50%);
+ display: flex;
+ align-items: center;
+
+ .dz-bg {
+ background-image: url('../../../static/dz.png');
+ background-size: 100% 100%;
+ width: 55px;
+ height: 55px;
+ }
+
+ .text {
+ background: linear-gradient(180deg, #fffccd 0%, #ffe08e 100%);
+ -webkit-background-clip: text;
+ color: transparent;
+ font-weight: bold;
+ }
+ }
+
+ .rule-btn {
+ position: absolute;
+ right: -8%;
+ top: 45%;
+ transform: translateY(-50%);
+ background-image: url('../../../static/rule_btn.png');
+ background-size: 100% 100%;
+ width: 173px;
+ height: 176px;
+ transform-origin: center center;
+
+ &:active {
+ animation: ruleBtnClick 0.1s ease-in-out;
+ }
+ }
+ }
+
+ .kj-box {
text-align: center;
- line-height: 240px;
- font-size: 80px;
- font-weight: bold;
- border: 5px solid #833e16;
- }
- .item:nth-child(1) {
- width: 48%;
- border-radius: 100px 30px 30px 30px;
- }
- .item:nth-child(2) {
- width: 48%;
- border-radius: 30px 100px 30px 30px;
- }
- .item:nth-child(3) {
- flex: 1;
- border-radius: 30px 30px 100px 100px;
- }
+ margin-top: -10px;
+
+ .title {
+ background: linear-gradient(180deg, #fffccd 0%, #ffe08e 100%);
+ -webkit-background-clip: text;
+ color: transparent;
+ font-size: 40px;
+ font-weight: bold;
+ }
+
+ .num-box {
+ display: flex;
+ justify-content: space-between;
+ margin-top: 10px;
+
+ .item {
+ background-image: url('../../../static/num.png');
+ background-size: 100% 100%;
+ width: 72px;
+ height: 72px;
+ text-align: center;
+ line-height: 72px;
+ font-weight: bold;
+ color: #b2150b;
+ }
+
+ .item:nth-child(1) {
+ color: #000;
+ }
+
+ .item:nth-child(2) {
+ color: #000;
+ }
+ }
}
- .bet-btn {
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- width: 170px;
- height: 170px;
- background: #fbdd36;
- border: 5px solid #b72100;
- border-radius: 57px;
- color: #ff0606;
- font-size: 60px;
- font-weight: bold;
- text-align: center;
- line-height: 1.4;
- }
- }
+ .turntable-box {
+ position: relative;
+ height: 670px;
+ overflow: hidden;
- .kj-box {
- background-color: #ff0606;
- border-radius: 26px;
- padding: 20px 30px;
- margin-top: 15px;
- color: #fff;
- .title {
- font-size: 35px;
- font-weight: bold;
+ .star {
+ position: absolute;
+ animation: starFlashing 1s ease-in-out infinite alternate;
+ }
- .num {
- color: #fbdd36;
- }
+ .star-1 {
+ left: 100px;
+ width: 139px;
+ height: 171px;
+ background-image: url('../../../static/1-1.png');
+ background-size: 100% 100%;
+ }
+
+ .star-2 {
+ top: 100px;
+ width: 205px;
+ height: 251px;
+ background-image: url('../../../static/1-2.png');
+ background-size: 100% 100%;
+ }
+
+ .star-3 {
+ right: 50px;
+ width: 205px;
+ height: 251px;
+ background-image: url('../../../static/2-2.png');
+ background-size: 100% 100%;
+ }
+
+ .star-4 {
+ top: 200px;
+ right: 0;
+ width: 140px;
+ height: 171px;
+ background-image: url('../../../static/2-1.png');
+ background-size: 100% 100%;
+ }
+
+ .turntable-wrap {
+ background-image: url('../../../static/turntable_bg.png');
+ background-size: 100% 100%;
+ width: 650px;
+ height: 650px;
+ position: relative;
+ border-radius: 50%;
+ transform-origin: center center;
+ left: 50%;
+ top: 20px;
+ transform: translateX(-50%);
+ overflow: hidden;
+ //animation: turntableRevolve 5s linear infinite;
+
+ .light {
+ .lightItem {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ margin: 0 auto;
+ width: 10px;
+ height: 100%;
+ border-radius: 50%;
+ transform-origin: center center;
+
+ &::before {
+ content: '';
+ position: absolute;
+ top: 4px;
+ left: 0;
+ right: 0;
+ margin: 0 auto;
+ width: 15px;
+ height: 15px;
+ border-radius: 50%;
+ box-sizing: border-box;
+ }
+ }
+
+ .lightItem:nth-of-type(even):before {
+ background: transparent;
+ animation: white-to-yellow 1.5s linear infinite;
+ }
+
+ .lightItem:nth-of-type(odd):before {
+ background: #fefc87;
+ animation: white-to-yellow 1.5s linear reverse infinite;
+ }
+ }
+
+ .turntable {
+ position: absolute;
+ width: 530px;
+ height: 530px;
+ border-radius: 50%;
+ // background: url('../../../static/wu.png') no-repeat;
+ // background-size: contain;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%) rotate(-0.8deg);
+
+ .prize {
+ position: absolute;
+ width: 300px;
+ height: 300px;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%) rotate(-200deg);
+
+ .item {
+ position: absolute;
+ width: 150px;
+ height: 150px;
+ border-radius: 50%;
+ color: #000;
+ text-align: center;
+ transform-origin: right bottom;
+
+ &:nth-child(1) {
+ top: -10px;
+ transform: rotate(70deg);
+ }
+
+ &:nth-child(2) {
+ top: -10px;
+ left: -10px;
+ transform: rotate(-60deg);
+ }
+
+ &:nth-child(3) {
+ top: 10px;
+ left: 10px;
+ transform: rotate(190deg);
+ }
+
+ .img {
+ display: block;
+ width: 100px;
+ height: 100px;
+ transform: rotate(-45deg) scale(1.1);
+ }
+
+ .icon {
+ position: absolute;
+ background-image: url('../../../static/dz.png');
+ background-size: 100% 100%;
+ width: 50px;
+ height: 50px;
+ transform: rotate(-45deg) scale(1.6);
+ top: -10px;
+ }
+ }
+ }
+ }
+ }
+
+ .bet-btn {
+ position: absolute;
+ background-image: url('../../../static/bet_btn.png');
+ background-size: 100% 100%;
+ width: 150px;
+ height: 150px;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+
+ //&:active {
+ // animation: betBtnClick .1s ease-in-out;
+ //}
+ }
+
+ .pointer {
+ position: absolute;
+ background-image: url('../../../static/pointer.png');
+ background-size: 100% 100%;
+ width: 47px;
+ height: 111px;
+ top: 15px;
+ left: 50%;
+ transform: translateX(-50%);
+ }
}
- .title-sub {
- text-align: center;
- margin-top: 10px;
- font-size: 40px;
- display: flex;
+ .countdown-box {
+ margin-top: 30px;
+ background-image: url('../../../static/countdown_bg.png');
+ background-size: 100% 100%;
+ width: 750px;
+ height: 96px;
+ text-align: center;
+ line-height: 96px;
- .item {
- width: 50px;
- height: 50px;
- line-height: 50px;
- margin-right: 20px;
- }
-
- .item:nth-child(1) {
- font-weight: bold;
- color: #fbdd36;
- }
- .item:nth-child(2) {
- font-weight: bold;
- color: #fbdd36;
- }
+ .title {
+ font-size: 38px;
+ font-weight: bold;
+ color: #b81801;
+ text-shadow: -2px -2px 0 #fff, 2px -2px 0 #fff, -2px 2px 0 #fff, 2px 2px 0 #fff;
+ }
}
- }
- .countdown {
- margin: 30px auto;
- width: 100%;
- height: 100px;
- background-color: #fbdd36;
- text-align: center;
- line-height: 100px;
- border-radius: 38px;
- border: #ff0606 5px solid;
- color: #ff0606;
- font-size: 40px;
- font-weight: bold;
- }
+ .footer-box {
+ width: 100%;
+ margin-top: 5%;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-evenly;
- .bet-opt {
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
+ .item {
+ background-size: 100% 100%;
+ width: 240px;
+ height: 100px;
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
- .item {
- width: 200px;
- height: 100px;
- // border: 1px solid #ff0000;
- border-radius: 26px;
- margin-bottom: 20px;
- text-align: center;
- line-height: 100px;
- color: #843e16;
+ .icon {
+ background-image: url('../../../static/dz.png');
+ background-size: 100% 100%;
+ width: 70px;
+ height: 70px;
+ margin: auto 15px;
+ }
+
+ .name {
+ background: linear-gradient(180deg, #fffccd 0%, #ffe08e 100%);
+ -webkit-background-clip: text;
+ -webkit-text-stroke: 2px #000;
+ color: transparent;
+ font-size: 50px;
+ font-weight: bold;
+ }
+ }
+
+ .item-active {
+ background-image: url('../../../static/dz_active.png');
+ }
+
+ .item-no-active {
+ background-image: url('../../../static/dz_opt.png');
+ }
+ }
+
+ #lottie {
+ position: fixed;
+ inset: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.8);
+
+ .lottie-text {
+ position: absolute;
+ top: 59%;
+ left: 50%;
+ transform: translateX(-50%);
+ color: #b81801;
+ text-shadow: -2px -2px 0 #fff, 2px -2px 0 #fff, -2px 2px 0 #fff, 2px 2px 0 #fff;
+ font-size: 80px;
+ font-weight: bold;
+ }
+
+ .lottie-bg {
+ position: absolute;
+ left: 50%;
+ bottom: 5%;
+ transform: translateX(-50%);
+ background-image: url('../../../static/img_0.png');
+ background-size: 100% 100%;
+ // width: 700px;
+ height: 300px;
+ animation: lottie 0.3s linear forwards;
+ text-align: center;
+ line-height: 310px;
+ overflow: hidden;
+
+ .lottie-num {
+ color: #b81801;
+ text-shadow: -2px -2px 0 #fff, 2px -2px 0 #fff, -2px 2px 0 #fff, 2px 2px 0 #fff;
+ font-size: 60px;
+ font-weight: bold;
+ }
+ }
+ }
+}
+
+@keyframes btnClick {
+ from {
+ transform: scale(1);
+ }
+
+ to {
+ transform: scale(1.1);
+ }
+}
+
+@keyframes betBtnClick {
+ from {
+ transform: translate(-50%, -50%) scale(1);
+ }
+
+ to {
+ transform: translate(-50%, -50%) scale(1.1);
+ }
+}
+
+@keyframes ruleBtnClick {
+ from {
+ transform: scale(1) translateY(-50%);
+ }
+
+ to {
+ transform: scale(1.1) translateY(-50%);
+ }
+}
+
+@keyframes bgRevolve {
+ from {
+ transform: rotate(0deg);
+ }
+ to {
+ transform: rotate(360deg);
+ }
+}
+
+@keyframes starFlashing {
+ from {
+ transform: scale(1);
+ }
+
+ to {
+ transform: scale(1.1);
+ }
+}
+
+@keyframes turntableRevolve {
+ from {
+ transform: translateX(-50%) rotate(0deg);
+ }
+ to {
+ transform: translateX(-50%) rotate(360deg);
+ }
+}
+
+@keyframes white-to-yellow {
+ 0% {
+ background: transparent;
+ }
+ 100% {
+ background: #fefc87;
+ }
+}
+
+@keyframes lottie {
+ 0% {
+ width: 0;
+ }
+ 100% {
+ width: 700px;
}
- }
}
diff --git a/src/pages/aoshi/index/index.vue b/src/pages/aoshi/index/index.vue
index 0c1d6aa..e8e68a6 100644
--- a/src/pages/aoshi/index/index.vue
+++ b/src/pages/aoshi/index/index.vue
@@ -1,287 +1,455 @@
-
-
-
-
-
-
-
-
-
- {{ userInfo.nickName || '用户' }}
-
- 积分: {{ `${jfStr}w` || 0 }}
-
-
-
-
-
- {{ userInfo.pulse || 0 }}
-
-
-
-
-
- 第
- {{ kjData.nowPeriods || 0 }}
- 期已开奖:
-
-
-
- {{ item }}
-
-
-
-
-
-
- {{ item.value }}
-
-
-
- 点击
- 投注
-
-
-
- 正在开奖中,已停止投注!!!
-
- {{ Number(kjData.nowPeriods) + 1 || 0 }}期开奖还剩: {{ timeStr || '0分0秒' }}
-
-
-
-
- {{ item.value }}豆子
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ user_info.nickName }}
+ 积分: {{ user_info.integral || 0 }}
+
+
+
+ {{ user_info.pulse || 0 }}
+
+
+
+
+ 第{{ list[0]?.preDrawIssue || 0 }}期已开奖
+
+
+ {{ Number(item) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 第{{ newKjNum }}期开奖还剩:{{ timeStr || '00' }}
+
+ 正在开奖中...
+
+
+
+
+
diff --git a/src/pages/aoshi/records/index.vue b/src/pages/aoshi/records/index.vue
index af2a96a..b579a96 100644
--- a/src/pages/aoshi/records/index.vue
+++ b/src/pages/aoshi/records/index.vue
@@ -1,135 +1,143 @@
-
-
-
-
-
- 第{{ item.preDrawIssue }}期开奖:
-
- {{ num }}
-
-
- 开奖时间: {{ item.preDrawTime }}
- 开奖数字: {{ item.drawName }}
-
-
-
-
-
-
-
- 第{{ item.Periods }}期投注:
-
- 点数:
- {{ item.Name }}
+
+
+
+
+
+ 第{{ item.preDrawIssue }}期开奖:
+
+ {{ item.name }}
+
+
+ {{ item.preDrawCode }}
+
+
+ 开奖时间: {{ item.preDrawTime }}
+
-
- 投注时间:
- {{ item.DrawTime }}
+
+
+
+
+
+ 第{{ item.Periods }}期投注:
+
+ 点数:
+ {{ item.Name }}
+
+
+ 投注时间:
+ {{ item.DrawTime }}
+
+
+
+
+ +{{ item.DrawNum }}积分
+
+ -{{ item.Number }}豆子
+
+
-
-
- +{{ item.DrawNum }}积分
- -{{ item.Number }}豆子
-
-
-
-
- 暂无记录.....
-
-
-
+
+ 暂无记录.....
+
+
+
-
diff --git a/src/pages/aoshi/static/bj.png b/src/pages/aoshi/static/bj.png
deleted file mode 100644
index 3e9f830..0000000
Binary files a/src/pages/aoshi/static/bj.png and /dev/null differ
diff --git a/src/pages/aoshi/static/zpbj.png b/src/pages/aoshi/static/zpbj.png
deleted file mode 100644
index 4c59eb4..0000000
Binary files a/src/pages/aoshi/static/zpbj.png and /dev/null differ
diff --git a/src/pages/game_detail/index.vue b/src/pages/game_detail/index.vue
index a8bab31..281e066 100644
--- a/src/pages/game_detail/index.vue
+++ b/src/pages/game_detail/index.vue
@@ -1,17 +1,17 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
- 开始游戏
+
+ 开始游戏
+
-
diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss
index 71239dc..a816815 100644
--- a/src/pages/index/index.scss
+++ b/src/pages/index/index.scss
@@ -19,7 +19,7 @@
border-radius: 20px;
text-align: center;
line-height: 300px;
- background-image: url('../../static/qietu.png');
+ // background-image: url('../../static/qietu.png');
background-size: 100% 100%;
position: relative;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index c3678c8..db49688 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,13 +1,17 @@
-
- 游戏大厅
+
+ 游戏大厅
-
-
-
-
+
+
+
-
diff --git a/src/pages/turntable/index/index.scss b/src/pages/turntable/index/index.scss
index 08bd859..fe41670 100644
--- a/src/pages/turntable/index/index.scss
+++ b/src/pages/turntable/index/index.scss
@@ -3,7 +3,7 @@ body {
}
.page {
- background-image: url('../static/bg.png');
+ background-image: url('../../../static/bg.png');
background-size: 100% 100%;
background-repeat: no-repeat;
height: 100dvh;
@@ -43,12 +43,12 @@ body {
}
.tz-btn {
- background-image: url('../static/tz_btn.png');
+ background-image: url('../../../static/tz_btn.png');
transform-origin: center center;
}
.kj-btn {
- background-image: url('../static/kj_btn.png');
+ background-image: url('../../../static/kj_btn.png');
transform-origin: center center;
margin-left: 10px;
}
@@ -73,7 +73,7 @@ body {
height: 120px;
.bg {
- background-image: url('../static/avatar_border.png');
+ background-image: url('../../../static/avatar_border.png');
background-size: 100% 100%;
border-radius: 50%;
width: 120px;
@@ -122,7 +122,7 @@ body {
align-items: center;
.dz-bg {
- background-image: url('../static/dz.png');
+ background-image: url('../../../static/dz.png');
background-size: 100% 100%;
width: 55px;
height: 55px;
@@ -141,7 +141,7 @@ body {
right: -8%;
top: 45%;
transform: translateY(-50%);
- background-image: url('../static/rule_btn.png');
+ background-image: url('../../../static/rule_btn.png');
background-size: 100% 100%;
width: 173px;
height: 176px;
@@ -171,7 +171,7 @@ body {
margin-top: 10px;
.item {
- background-image: url('../static/num.png');
+ background-image: url('../../../static/num.png');
background-size: 100% 100%;
width: 72px;
height: 72px;
@@ -205,7 +205,7 @@ body {
left: 100px;
width: 139px;
height: 171px;
- background-image: url('../static/1-1.png');
+ background-image: url('../../../static/1-1.png');
background-size: 100% 100%;
}
@@ -213,7 +213,7 @@ body {
top: 100px;
width: 205px;
height: 251px;
- background-image: url('../static/1-2.png');
+ background-image: url('../../../static/1-2.png');
background-size: 100% 100%;
}
@@ -221,7 +221,7 @@ body {
right: 50px;
width: 205px;
height: 251px;
- background-image: url('../static/2-2.png');
+ background-image: url('../../../static/2-2.png');
background-size: 100% 100%;
}
@@ -230,12 +230,12 @@ body {
right: 0;
width: 140px;
height: 171px;
- background-image: url('../static/2-1.png');
+ background-image: url('../../../static/2-1.png');
background-size: 100% 100%;
}
.turntable-wrap {
- background-image: url('../static/turntable_bg.png');
+ background-image: url('../../../static/turntable_bg.png');
background-size: 100% 100%;
width: 650px;
height: 650px;
@@ -339,7 +339,7 @@ body {
.icon {
position: absolute;
- background-image: url('../static/dz.png');
+ background-image: url('../../../static/dz.png');
background-size: 100% 100%;
width: 50px;
height: 50px;
@@ -353,7 +353,7 @@ body {
.bet-btn {
position: absolute;
- background-image: url('../static/bet_btn.png');
+ background-image: url('../../../static/bet_btn.png');
background-size: 100% 100%;
width: 150px;
height: 150px;
@@ -368,7 +368,7 @@ body {
.pointer {
position: absolute;
- background-image: url('../static/pointer.png');
+ background-image: url('../../../static/pointer.png');
background-size: 100% 100%;
width: 47px;
height: 111px;
@@ -380,7 +380,7 @@ body {
.countdown-box {
margin-top: 30px;
- background-image: url('../static/countdown_bg.png');
+ background-image: url('../../../static/countdown_bg.png');
background-size: 100% 100%;
width: 750px;
height: 96px;
@@ -411,7 +411,7 @@ body {
margin-bottom: 20px;
.icon {
- background-image: url('../static/dz.png');
+ background-image: url('../../../static/dz.png');
background-size: 100% 100%;
width: 70px;
height: 70px;
@@ -429,11 +429,11 @@ body {
}
.item-active {
- background-image: url('../static/dz_active.png');
+ background-image: url('../../../static/dz_active.png');
}
.item-no-active {
- background-image: url('../static/dz_opt.png');
+ background-image: url('../../../static/dz_opt.png');
}
}
@@ -460,7 +460,7 @@ body {
left: 50%;
bottom: 5%;
transform: translateX(-50%);
- background-image: url('../static/img_0.png');
+ background-image: url('../../../static/img_0.png');
background-size: 100% 100%;
// width: 700px;
height: 300px;
diff --git a/src/pages/turntable/index/index.vue b/src/pages/turntable/index/index.vue
index b7a6f02..a9bfe6b 100644
--- a/src/pages/turntable/index/index.vue
+++ b/src/pages/turntable/index/index.vue
@@ -3,18 +3,19 @@ import { onBeforeUnmount, onMounted, ref } from 'vue'
import Taro from '@tarojs/taro'
import Lottie from 'lottie-web'
import * as dayjs from 'dayjs'
-import dan from '../static/dan.png'
-import he from '../static/he.png'
-import shuang from '../static/shuang.png'
+import dan from '../../../static/dan.png'
+import he from '../../../static/he.png'
+import shuang from '../../../static/shuang.png'
import kd from '../../../static/kd.png'
import kh from '../../../static/kh.png'
import ks from '../../../static/ks.png'
import wu from '../../../static/wu.png'
-import wzj from '../static/wzj.json'
-import zj from '../static/zj.json'
+import wzj from '../../../static/wzj.json'
+import zj from '../../../static/zj.json'
import './index.scss'
Taro.useDidShow(() => {
+ // startMusic('https://files.wanzhuanyongcheng.com/file/music/yaotouzi/3.mp3', true)
getUserInfo()
getBetList()
getList()
@@ -67,6 +68,21 @@ const bet_index = ref(null)
const timeStr = ref('')
+const innerAudioContext = Taro.createInnerAudioContext()
+
+const startMusic = (path: string, loop: boolean = false) => {
+ // const innerAudioContext = Taro.createInnerAudioContext()
+ innerAudioContext.autoplay = true
+ innerAudioContext.src = path
+ innerAudioContext.loop = loop
+ innerAudioContext.onPlay(() => {
+ console.log('开始播放')
+ })
+ innerAudioContext.onError(() => {
+ console.log('播放失败')
+ })
+}
+
const initWs = () => {
ws.value = new WebSocket(
`${process.env.TARO_APP_TURNTABLE_WS}?uid=${Taro.getStorageSync('uid')}&game_id=${
@@ -129,7 +145,7 @@ const initWs = () => {
duration: 1000,
})
initWs()
- }, 3000)
+ }, 5000)
}
}
@@ -246,6 +262,10 @@ const startRun = (name: string) => {
})
isRunning.value = true
+ innerAudioContext.stop()
+
+ startMusic('https://files.wanzhuanyongcheng.com/file/music/yaotouzi/1.mp3', false)
+
turntable_list.value.forEach((item) => {
item.isActive = false
})
@@ -274,6 +294,8 @@ const startRun = (name: string) => {
turntable.value.removeAttribute('style')
setTimeout(() => {
+ turntable.value.style.background = `url(${bgUrl.value}) no-repeat`
+ turntable.value.style.backgroundSize = 'contain'
turntable.value.style.transform = `translate(-50%, -50%) rotate(${rotate}deg)`
turntable.value.style.transition = `transform ${rotateSpeed}s ease-out`
}, 10)
diff --git a/src/pages/turntable/static/dz.png b/src/pages/turntable/static/dz.png
deleted file mode 100644
index 6ff558b..0000000
Binary files a/src/pages/turntable/static/dz.png and /dev/null differ
diff --git a/src/pages/turntable/static/1-1.png b/src/static/1-1.png
similarity index 100%
rename from src/pages/turntable/static/1-1.png
rename to src/static/1-1.png
diff --git a/src/pages/turntable/static/1-2.png b/src/static/1-2.png
similarity index 100%
rename from src/pages/turntable/static/1-2.png
rename to src/static/1-2.png
diff --git a/src/pages/turntable/static/2-1.png b/src/static/2-1.png
similarity index 100%
rename from src/pages/turntable/static/2-1.png
rename to src/static/2-1.png
diff --git a/src/pages/turntable/static/2-2.png b/src/static/2-2.png
similarity index 100%
rename from src/pages/turntable/static/2-2.png
rename to src/static/2-2.png
diff --git a/src/static/3.mp3 b/src/static/3.mp3
new file mode 100644
index 0000000..51af3ba
Binary files /dev/null and b/src/static/3.mp3 differ
diff --git a/src/pages/turntable/static/avatar_border.png b/src/static/avatar_border.png
similarity index 100%
rename from src/pages/turntable/static/avatar_border.png
rename to src/static/avatar_border.png
diff --git a/src/pages/turntable/static/bet_btn.png b/src/static/bet_btn.png
similarity index 100%
rename from src/pages/turntable/static/bet_btn.png
rename to src/static/bet_btn.png
diff --git a/src/pages/turntable/static/bg.png b/src/static/bg.png
similarity index 100%
rename from src/pages/turntable/static/bg.png
rename to src/static/bg.png
diff --git a/src/pages/turntable/static/countdown_bg.png b/src/static/countdown_bg.png
similarity index 100%
rename from src/pages/turntable/static/countdown_bg.png
rename to src/static/countdown_bg.png
diff --git a/src/pages/turntable/static/dan.png b/src/static/dan.png
similarity index 100%
rename from src/pages/turntable/static/dan.png
rename to src/static/dan.png
diff --git a/src/pages/turntable/static/default_avatar.png b/src/static/default_avatar.png
similarity index 100%
rename from src/pages/turntable/static/default_avatar.png
rename to src/static/default_avatar.png
diff --git a/src/static/dz.png b/src/static/dz.png
index f889a83..6ff558b 100644
Binary files a/src/static/dz.png and b/src/static/dz.png differ
diff --git a/src/pages/turntable/static/dz_active.png b/src/static/dz_active.png
similarity index 100%
rename from src/pages/turntable/static/dz_active.png
rename to src/static/dz_active.png
diff --git a/src/pages/turntable/static/dz_opt.png b/src/static/dz_opt.png
similarity index 100%
rename from src/pages/turntable/static/dz_opt.png
rename to src/static/dz_opt.png
diff --git a/src/pages/turntable/static/he.png b/src/static/he.png
similarity index 100%
rename from src/pages/turntable/static/he.png
rename to src/static/he.png
diff --git a/src/pages/turntable/static/img_0.png b/src/static/img_0.png
similarity index 100%
rename from src/pages/turntable/static/img_0.png
rename to src/static/img_0.png
diff --git a/src/pages/turntable/static/kj_btn.png b/src/static/kj_btn.png
similarity index 100%
rename from src/pages/turntable/static/kj_btn.png
rename to src/static/kj_btn.png
diff --git a/src/pages/turntable/static/num.png b/src/static/num.png
similarity index 100%
rename from src/pages/turntable/static/num.png
rename to src/static/num.png
diff --git a/src/pages/turntable/static/pointer.png b/src/static/pointer.png
similarity index 100%
rename from src/pages/turntable/static/pointer.png
rename to src/static/pointer.png
diff --git a/src/pages/turntable/static/rule_btn.png b/src/static/rule_btn.png
similarity index 100%
rename from src/pages/turntable/static/rule_btn.png
rename to src/static/rule_btn.png
diff --git a/src/pages/turntable/static/shuang.png b/src/static/shuang.png
similarity index 100%
rename from src/pages/turntable/static/shuang.png
rename to src/static/shuang.png
diff --git a/src/pages/turntable/static/turntable_bg.png b/src/static/turntable_bg.png
similarity index 100%
rename from src/pages/turntable/static/turntable_bg.png
rename to src/static/turntable_bg.png
diff --git a/src/pages/turntable/static/turntable_bg_1.png b/src/static/turntable_bg_1.png
similarity index 100%
rename from src/pages/turntable/static/turntable_bg_1.png
rename to src/static/turntable_bg_1.png
diff --git a/src/pages/turntable/static/tz_btn.png b/src/static/tz_btn.png
similarity index 100%
rename from src/pages/turntable/static/tz_btn.png
rename to src/static/tz_btn.png
diff --git a/src/pages/turntable/static/wzj.json b/src/static/wzj.json
similarity index 100%
rename from src/pages/turntable/static/wzj.json
rename to src/static/wzj.json
diff --git a/src/pages/turntable/static/zj.json b/src/static/zj.json
similarity index 100%
rename from src/pages/turntable/static/zj.json
rename to src/static/zj.json