From c3bfb65096884bdb186eff36abe0849af572a4c1 Mon Sep 17 00:00:00 2001 From: dengtongyu Date: Sun, 23 Apr 2023 01:13:23 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.js | 8 ++++---- src/config/index.js | 7 +------ src/lib/tool.js | 6 +++--- src/router/index.js | 9 ++++++++- src/store/index.js | 14 +++++++++++--- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/proxy.config.js b/proxy.config.js index 0db4512..dafa536 100644 --- a/proxy.config.js +++ b/proxy.config.js @@ -7,13 +7,13 @@ let target = ""; switch (VUE_APP_PROXY) { case 1: - target = "http://im.haloapp.vip"; - break; - case 2: target = "http://apibeta.haloapp.vip"; break; + case 2: + target = "https://api.xingyuwenhua.com.cn"; + break; default: - target = "http://test.haloapp.vip"; + target = "https://api.xingyuwenhua.com.cn"; } let proxyTable = { diff --git a/src/config/index.js b/src/config/index.js index 36b106a..2fb2db2 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -18,10 +18,6 @@ const host = (PASSID, GATEWAY) => { const money = "金币"; const unit = "门票"; -const turntable = { - turntable1: 2, - turntable2: 5 -}; module.exports = { appName, @@ -29,6 +25,5 @@ module.exports = { VUE_APP_PROXY, host, money, - unit, - turntable + unit }; diff --git a/src/lib/tool.js b/src/lib/tool.js index 940bdaa..71bfefe 100644 --- a/src/lib/tool.js +++ b/src/lib/tool.js @@ -218,11 +218,11 @@ const getMsgFromDevice = function() { params.debug === "true" || location.hostname === "localhost" ) { - window.info.roomUid = 904860; - window.info.uid = 1000009; + window.info.roomUid = 90022; + window.info.uid = 90107; window.info.deviceId = "afhksafhksajhfs1kjahsfkjsf0000aaaaaaaacaa"; window.info.ticket = - "eyJhbGciOiJIUzI1NiJ9.eyJ0aWNrZXRfdHlwZSI6bnVsbCwidWlkIjo5MTMzOSwidGlja2V0X2lkIjoiOGJmMTdlYmQtMTY4ZC00NTliLWI0NzUtMDU3M2Y1ZmM4MDQzIiwiZXhwIjozNjAwLCJjbGllbnRfaWQiOiJlcmJhbi1jbGllbnQifQ.MnKGEc6bSkyOkCbx26lib6J0koFDA2uiKnbwkhdk3MU"; + "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0aWNrZXRfdHlwZSI6bnVsbCwidWlkIjo5MDEwNywidGlja2V0X2lkIjoiMmYxYWEyNjgtYjFjYS00ZDM1LTkxMTYtODg5NWI1NDFlMDE3IiwiZXhwIjozNjAwLCJjbGllbnRfaWQiOiJlcmJhbi1jbGllbnQifQ.Z0gZSGQyCHMX6OR_g_sH6JiCRZ8ete7S76ed4QIR2CU"; } } info = window.info; diff --git a/src/router/index.js b/src/router/index.js index 30bf6dd..2bf6622 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,7 +8,7 @@ const routes = [ path: "/", name: "Home", component: () => import(/* webpackChunkName: "Home" */ "../views/Home.vue") - } + }, // { // path: "/bobo", // name: "Bobo", @@ -20,6 +20,13 @@ const routes = [ // component: () => // import(/* webpackChunkName: "Wheel" */ "../views/wheel.vue") // } + + { + path: "/rank", + name: "rank", + component: () => + import(/* webpackChunkName: "rank" */ "../views/rankView.vue") + } ]; const router = new VueRouter({ diff --git a/src/store/index.js b/src/store/index.js index 6506326..9fd0d6c 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -11,7 +11,7 @@ import { buyPack } from "@/api"; import { getMsgFromDevice, getQueryString } from "@/lib/tool"; -import { unit, turntable } from "@/config"; +import { unit } from "@/config"; const info = getMsgFromDevice(); const locateObj = getQueryString(); @@ -29,6 +29,7 @@ export default new Vuex.Store({ ruleType: "one", remainTicketNum: 0, goldNum: 0, + turntable: {}, happyGiftList: [], ticketRule: null, canLottery: true, @@ -83,6 +84,9 @@ export default new Vuex.Store({ goldNum: state => { return state.goldNum; }, + turntable: state => { + return state.turntable; + }, happyGiftList: state => { return state.happyGiftList; }, @@ -115,8 +119,8 @@ export default new Vuex.Store({ ticketRuleConfig: state => { return state.ticketRuleConfig; }, - curLotteryPrize: state => { - return turntable[state.drawType]; + curLotteryPrize: (state, getters) => { + return getters.turntable[state.drawType]; }, curLotteryTimesPrize: (state, getters) => { return getters.curLotteryPrize * getters.curTicketRuleValue; @@ -208,6 +212,9 @@ export default new Vuex.Store({ SetGoldNum(state, payload) { state.goldNum = payload; }, + SetTurntable(state, payload) { + state.turntable = payload; + }, SetHappyGiftList(state, payload) { state.happyGiftList = payload; }, @@ -327,6 +334,7 @@ export default new Vuex.Store({ if (code === 200) { commit("SetRemainTicketNum", data.num || 0); commit("SetGoldNum", data.goldNum || 0); + commit("SetTurntable", data.ticketForOneTime); } else { Toast.fail(message); }