diff --git a/App.vue b/App.vue index eb1fc67..5c197ab 100644 --- a/App.vue +++ b/App.vue @@ -1,264 +1,268 @@ \ No newline at end of file diff --git a/common/audio.js b/common/audio.js new file mode 100644 index 0000000..559feb7 --- /dev/null +++ b/common/audio.js @@ -0,0 +1,40 @@ +class AudioManager { + constructor(openBgm, slotBgm, csBgm, baoXiangBgm) { + this.openBgm = openBgm; + this.slotBgm = slotBgm; + this.csBgm = csBgm; + this.baoXiangBgm = baoXiangBgm; + } + stop() { + this.baoXiangBgm.stop(); + this.csBgm.stop(); + this.slotBgm.stop(); + this.openBgm.stop(); + } + + playOpenBgm() { + this.stop(); + this.openBgm.seek(0); + this.openBgm.play(); + } + + playSlotBgm() { + this.stop(); + this.slotBgm.seek(0); + this.slotBgm.play(); + } + + playCsBgm() { + this.stop(); + this.csBgm.seek(0); + this.csBgm.play(); + } + + playBaoXiangBgm() { + this.stop(); + this.baoXiangBgm.seek(0); + this.baoXiangBgm.play(); + } +} + +export default AudioManager; diff --git a/common/config.js b/common/config.js index 28313d7..6e2db42 100644 --- a/common/config.js +++ b/common/config.js @@ -8,7 +8,7 @@ import RequestManager from '@/common/request.js' let configData = null; let isLoading = false; let loadPromise = null; -const wx_version = "111"; +const wx_version = "114"; // 白名单页面(不需要登录即可访问) export const whiteList = [ diff --git a/common/platform/AppPlatform.js b/common/platform/AppPlatform.js index b8d0bff..5f2dd76 100644 --- a/common/platform/AppPlatform.js +++ b/common/platform/AppPlatform.js @@ -20,41 +20,9 @@ class AppPlatform extends BasePlatform { getPayData(url, data) { return data; } - // async getPlatformConfig() { - // console.log("开启动态获取数据。。。。。。。。"); - // const res = await getPlatform(); - // if (this.config != null) { - // if (this.config.isCheck != res.isCheck) { - // uni.setStorageSync('platformConfig', res); - // plus.runtime.restart(); - // } - // } - // this.config = res; - // uni.setStorageSync('platformConfig', res); - // } - // async getConfig() { - // // return new Promise((resolve, reject) => { - // if (this.config) { - // return this.config; - // } - // if (uni.getStorageSync('platformConfig')) { - // this.config = uni.getStorageSync('platformConfig'); - // this.getPlatformConfig(); - // return this.config; - // } - // this.config = { - // isCheck: true, - // isWebPay: false, - // version: '1.0.0', - // }; - // this.getPlatformConfig(); - // // const res = await getPlatform(); - // // this.config = res; - // return this.config; - // } AppLaunch(options) { console.log("AppLaunch", options); - // uni.hideTabBar({}) + this.getConfig().then(res => { console.log("AppLaunch", res); if (res.isCheck) { @@ -96,7 +64,6 @@ class AppPlatform extends BasePlatform { getOrderNo(event) { return new Promise((resolve, reject) => { - resolve(null); }); } diff --git a/common/platform/BasePlatform.js b/common/platform/BasePlatform.js index 0c8313a..0a4579c 100644 --- a/common/platform/BasePlatform.js +++ b/common/platform/BasePlatform.js @@ -19,7 +19,8 @@ class BasePlatform { } async getConfig() { // return new Promise((resolve, reject) => { - if (this.config) { + console.log("获取配置", this.config); + if (this.config != null) { return this.config; } const res = await getPlatform(); diff --git a/common/platform/H5Platform.js b/common/platform/H5Platform.js index 27e647c..7a87c7d 100644 --- a/common/platform/H5Platform.js +++ b/common/platform/H5Platform.js @@ -2,7 +2,7 @@ import BasePlatform from './BasePlatform'; import eruda from 'eruda'; import { parseQueryString } from '@/common/util'; - + class H5Platform extends BasePlatform { constructor() { @@ -14,6 +14,7 @@ class H5Platform extends BasePlatform { if (erudaInstance != null && erudaInstance != "") { this.startDeb(); } + // eruda.init(); } getPayData(url, data) { @@ -144,7 +145,6 @@ class H5Platform extends BasePlatform { if (query['version'] != null) { uni.setStorageSync('version', query['version']); } - // if(){} if (query['method'] != null && query['method'] == "alipay.trade.wap.pay.return" && query[ 'out_trade_no'] != null) { //支付宝跳转过来的 @@ -169,6 +169,12 @@ class H5Platform extends BasePlatform { window.location.href = url; } } + + if (window.location.pathname == "/" || window.location.pathname == "/pages/index/index") { + uni.switchTab({ + url: '/pages/shouye/index' + }); + } } getOrderNo(event) { return new Promise((resolve, reject) => { diff --git a/common/platform/MiniProgramPlatform.js b/common/platform/MiniProgramPlatform.js index ccd2ce2..b1a884d 100644 --- a/common/platform/MiniProgramPlatform.js +++ b/common/platform/MiniProgramPlatform.js @@ -15,7 +15,7 @@ class MiniProgramPlatform extends BasePlatform { super(); this.code = 'MP-WEIXIN'; this.env = 'miniProgram'; - + } getPayData(url, data) { @@ -212,6 +212,16 @@ class MiniProgramPlatform extends BasePlatform { updateManager.onUpdateFailed(function (res) { // 新的版本下载失败 }); + // setTimeout(() => { + // const currentPage = getCurrentPages().pop(); + // console.log('currentPagecurrentPagecurrentPage', currentPage); + // }, 300); + + // if (options != null && options.path == "pages/index/index") { + // uni.switchTab({ + // url: '/pages/shouye/index' + // }); + // } } async getOrderNo(event) { return new Promise(async (resolve, reject) => { diff --git a/common/platform/WebAppPlatform.js b/common/platform/WebAppPlatform.js index aae59e5..4e2b8ce 100644 --- a/common/platform/WebAppPlatform.js +++ b/common/platform/WebAppPlatform.js @@ -36,7 +36,6 @@ class WebAppPlatform extends H5Platform { // alert(`请手动分享:${url}`); } - downloadFile(url) { return new Promise((resolve, reject) => { try { diff --git a/components/detail-lucky/detail-bao-xiang.vue b/components/detail-lucky/detail-bao-xiang.vue new file mode 100644 index 0000000..96a9ed6 --- /dev/null +++ b/components/detail-lucky/detail-bao-xiang.vue @@ -0,0 +1,106 @@ + + + + + \ No newline at end of file diff --git a/components/detail-lucky/detail-grand-prize.vue b/components/detail-lucky/detail-grand-prize.vue index 50bf40f..5e89ab2 100644 --- a/components/detail-lucky/detail-grand-prize.vue +++ b/components/detail-lucky/detail-grand-prize.vue @@ -55,25 +55,14 @@ export default { this.isFadingOut = false; // 重置淡出状态 this.webpUrl = "https://image.zfunbox.cn/static/image/lucky/grand.webp?v=" + new Date().getTime(); - - if (this.bgmCtx && this.bgmCtx.csBgm) { - console.log('播放超神音乐'); - this.bgmCtx.slotBgm.stop(); - this.bgmCtx.csBgm.stop(); - this.bgmCtx.csBgm.seek(0); - this.bgmCtx.csBgm.play(); - } - + this.audioManager.playCsBgm(); // 设置动画结束后的淡出效果 setTimeout(() => { // 开始淡出动画 this.isFadingOut = true; - // 等待淡出动画完成后再隐藏组件 setTimeout(() => { - if (this.bgmCtx && this.bgmCtx.csBgm) { - this.bgmCtx.csBgm.pause(); - } + this.audioManager.stop(); this.isVisible = false; this.$emit("end"); }, 400); // 淡出动画持续800ms diff --git a/components/detail-lucky/detail-lucky-canvas.vue b/components/detail-lucky/detail-lucky-canvas.vue index b212858..04ab6b9 100644 --- a/components/detail-lucky/detail-lucky-canvas.vue +++ b/components/detail-lucky/detail-lucky-canvas.vue @@ -7,24 +7,22 @@ - + 动画结果因设备差异可能会显示异常,获得赏品以(恭喜获得)结果为准 跳过动画 - - + + diff --git a/pages.json b/pages.json index df8391e..c727979 100644 --- a/pages.json +++ b/pages.json @@ -116,14 +116,6 @@ "navigationStyle": "custom" } }, - { - "path": "pages/user/bi_jl", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "星钻记录", - "navigationBarTextStyle": "black" - } - }, { "path": "pages/user/jf_jl", "style": { @@ -132,16 +124,6 @@ "navigationBarTextStyle": "black" } }, - { - "path": "pages/user/sy_jl", - "style": { - "navigationBarBackgroundColor": "#222222", - "navigationBarTitleText": "奖励明细", - "navigationBarTextStyle": "black", - "navigationStyle": "custom" - } - }, - { "path": "pages/user/vip", "style": { diff --git a/pages/hegui/hegui.vue b/pages/hegui/hegui.vue index 603a9ce..b51d3f9 100644 --- a/pages/hegui/hegui.vue +++ b/pages/hegui/hegui.vue @@ -187,7 +187,6 @@ 发货确认单 - diff --git a/pages/index/index.vue b/pages/index/index.vue index 3c51af4..9ee8dd9 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -10,155 +10,164 @@ \ No newline at end of file diff --git a/pages/mall/goods_info.vue b/pages/mall/goods_info.vue deleted file mode 100644 index 2b49cfd..0000000 --- a/pages/mall/goods_info.vue +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 79f7f94..5e3b4a2 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -69,7 +69,8 @@ - + 微信支付 @@ -79,7 +80,8 @@ - + {{ $config.getAppSetting('currency2_name') }} @@ -134,10 +136,6 @@ - - - - + + \ No newline at end of file diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue index 3959fa5..4baf1e6 100644 --- a/pages/shouye/index.vue +++ b/pages/shouye/index.vue @@ -120,13 +120,9 @@ - - - - diff --git a/pages/user/my_coupon copy.vue b/pages/user/my_coupon copy.vue deleted file mode 100644 index 76e00c7..0000000 --- a/pages/user/my_coupon copy.vue +++ /dev/null @@ -1,475 +0,0 @@ - - - - - diff --git a/pages/user/sy_jl.vue b/pages/user/sy_jl.vue deleted file mode 100644 index ad9ad0c..0000000 --- a/pages/user/sy_jl.vue +++ /dev/null @@ -1,223 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/user/tui-guang-old.vue b/pages/user/tui-guang-old.vue deleted file mode 100644 index 4aba6a1..0000000 --- a/pages/user/tui-guang-old.vue +++ /dev/null @@ -1,539 +0,0 @@ - - - - - diff --git a/pages/user/tui-guang.vue b/pages/user/tui-guang.vue index 2481a9c..73ca99c 100644 --- a/pages/user/tui-guang.vue +++ b/pages/user/tui-guang.vue @@ -32,7 +32,7 @@ - + 奖励总额 {{ commission }}