diff --git a/.env.development b/.env.development index 381159f..cdaf96b 100644 --- a/.env.development +++ b/.env.development @@ -3,6 +3,11 @@ TARO_APP_API = 'https://game.wanzhuanyongcheng.cn/dice' + TARO_APP_WS = 'wss://game.wanzhuanyongcheng.cn/dice/home' -TARO_APP_HOME= 'https://test.wanzhuanyongcheng.cn/app/game' +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' diff --git a/.env.production b/.env.production index 1c3e68b..061431a 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,11 @@ # TARO_APP_ID="生产环境下的小程序appid" TARO_APP_API = 'https://www.jdt168.com/dice' + TARO_APP_WS = 'wss://www.jdt168.com/dice/home' +TARO_APP_HOME = 'https://www.wanzhuanyongcheng.cn/app/game' -TARO_APP_HOME= 'https://www.wanzhuanyongcheng.cn/app/game' +TARO_APP_BALLOON_WS = 'wss://balloon.wanzhuanyongcheng.cn/balloon/home' + +TARO_APP_BALLOON_API = 'https://balloon.wanzhuanyongcheng.cn/balloon' diff --git a/.env.test b/.env.test index 9191f29..8746753 100644 --- a/.env.test +++ b/.env.test @@ -2,7 +2,11 @@ TARO_APP_API = 'https://game.wanzhuanyongcheng.cn/dice' + TARO_APP_WS = 'wss://game.wanzhuanyongcheng.cn/dice/home' +TARO_APP_HOME = 'https://test.wanzhuanyongcheng.cn/app/game' -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' diff --git a/src/app.config.ts b/src/app.config.ts index 8afabc4..943c59b 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -3,7 +3,9 @@ export default defineAppConfig({ 'pages/index/index', 'pages/yaotouzi/index/index', 'pages/game_detail/index', - 'pages/yaotouzi/records/index' + 'pages/yaotouzi/records/index', + 'pages/balloon/index/index', + '/pages/balloon/records/index' ], window: { backgroundTextStyle: 'light', diff --git a/src/app.scss b/src/app.scss index 080a2c9..3a575bd 100644 --- a/src/app.scss +++ b/src/app.scss @@ -1,5 +1,7 @@ .taro_page { - background-color: #f5f5f5!important; + background-color: #f5f5f5 !important; + // width: 100vw !important; + // height: 100vh !important; } .mt-15 { diff --git a/src/pages/balloon/index/index.config.ts b/src/pages/balloon/index/index.config.ts index e69de29..6a05b7c 100644 --- a/src/pages/balloon/index/index.config.ts +++ b/src/pages/balloon/index/index.config.ts @@ -0,0 +1,3 @@ +export default definePageConfig({ + navigationBarTitleText: '吹气球' +}) diff --git a/src/pages/balloon/index/index.scss b/src/pages/balloon/index/index.scss new file mode 100644 index 0000000..d1161ee --- /dev/null +++ b/src/pages/balloon/index/index.scss @@ -0,0 +1,49 @@ +.container { + box-sizing: border-box; + height: 100vh; + position: relative; + display: flex; + flex-direction: column; + align-items: center; + + .header { + display: flex; + justify-content: space-between; + width: 100%; + padding: 0 10px; + } + + .time { + margin: 100px; + } + + .balloon-box { + background-image: url("../../../static/balloon.png"); + background-size: cover; + width: 200px; + height: 300px; + margin: 100px; + } + + .bottom-box { + position: fixed; + bottom: 0; + margin: 10px; + width: 80%; + + .input { + padding: 10px; + border-radius: 10px; + border: 1px solid grey; + } + + .box { + display: flex; + justify-content: space-between; + .btn { + margin: 10px 0; + width: 45%; + } + } + } +} diff --git a/src/pages/balloon/index/index.vue b/src/pages/balloon/index/index.vue index 6fb5af7..a67f0e2 100644 --- a/src/pages/balloon/index/index.vue +++ b/src/pages/balloon/index/index.vue @@ -1,11 +1,192 @@ diff --git a/src/pages/balloon/records/index.config.ts b/src/pages/balloon/records/index.config.ts new file mode 100644 index 0000000..6ec8e4e --- /dev/null +++ b/src/pages/balloon/records/index.config.ts @@ -0,0 +1,4 @@ +export default definePageConfig({ + navigationBarBackgroundColor: '#23684B', + enablePullDownRefresh: true +}) diff --git a/src/pages/balloon/records/index.vue b/src/pages/balloon/records/index.vue new file mode 100644 index 0000000..29b5772 --- /dev/null +++ b/src/pages/balloon/records/index.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/src/pages/game_detail/index.vue b/src/pages/game_detail/index.vue index d64e0ba..f4b3fa3 100644 --- a/src/pages/game_detail/index.vue +++ b/src/pages/game_detail/index.vue @@ -19,7 +19,7 @@ import { ref } from "vue"; import Taro from "@tarojs/taro"; import "./index.scss"; -const info = ref({}); +const info = ref({}); Taro.useLoad(() => { info.value = Taro.getStorageSync("gameItem"); @@ -30,8 +30,9 @@ const list = ref([ ]); const startGame = () => { + console.log(info.value); Taro.navigateTo({ - url: "/pages/yaotouzi/index/index", + url: info.value.url, }); }; diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 52958b8..4c917c8 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -3,7 +3,7 @@ 游戏大厅 - + @@ -35,10 +35,9 @@ const list = ref([]); const getList = async () => { Taro.request({ - url: process.env.TARO_APP_HOME, + url: `${process.env.TARO_APP_HOME}`, method: "POST", success: ({ data: res }) => { - console.log(res); list.value = res.data.data || []; }, }); diff --git a/src/pages/yaotouzi/records/index.vue b/src/pages/yaotouzi/records/index.vue index 5bcff0f..dd94653 100644 --- a/src/pages/yaotouzi/records/index.vue +++ b/src/pages/yaotouzi/records/index.vue @@ -5,7 +5,6 @@ 第{{ item.Periods }}期开奖: - {{ num }}, - - - - - - @@ -44,9 +37,6 @@ +{{ item.DrawNum }}积分 - -{{ item.Number }}豆子 diff --git a/src/static/balloon.png b/src/static/balloon.png new file mode 100644 index 0000000..7529c72 Binary files /dev/null and b/src/static/balloon.png differ