diff --git a/src/api/index.js b/src/api/index.js index 364f10a..209f49a 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -9,3 +9,6 @@ export const GetBetRecord = async (uid) => export const GetLotteryRecord = async (uid) => await alovaInst.Get(`/dice/draw?uid=${uid}`); export const GetPeriod = async () => await alovaInst.Get(`/dice/periods`); + +export const GetIsWin = async (uid) => + await alovaInst.Get(`/dice/user/win?uid=${uid}`); diff --git a/src/pages/bet_record/index.vue b/src/pages/bet_record/index.vue index 4775238..a62445e 100644 --- a/src/pages/bet_record/index.vue +++ b/src/pages/bet_record/index.vue @@ -1,6 +1,6 @@ @@ -99,6 +100,9 @@ const data = ref([]); Taro.useLoad((opt) => { uid.value = opt.uid; +}); + +Taro.useDidShow(() => { getList(); }); @@ -111,6 +115,9 @@ const getList = async () => { hm: [item.Name], t: item.DrawTime, j: item.Number, + draw_num: item.DrawNumber, + state: item.State, + periods_num: item.PeriodsNum, })); }; diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index f18e4d5..ac78149 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -162,7 +162,7 @@ : getTextColor(item.label), }" >{{ item.label }} - {{ + {{ item.odds }} @@ -188,7 +188,7 @@ }} 豆子 - 单注最多可赢 100 积分 + { ws.value = new WebSocket( - `wss://${process.env.TARO_APP_WS}/dice/home?uid=${options.uid}&game_id=${options.game_id}` + `wss://${process.env.TARO_APP_WS}/dice/home?uid=${options.uid}&game_id=4` ); ws.value.onopen = () => { @@ -293,21 +294,23 @@ const initWs = (options) => { case 400: case 302: case 301: + case 401: + case 400: + case 402: Taro.showToast({ title: res.msg, icon: "none", }); break; case 200: - if (Number(res.data) === 1) { + if (Number(res.data) === 0 || Number(res.data) === 1) { tStr.value = "开奖中"; return; } tStr.value = `${res.data}秒`; break; case 201: - await getNum(); - await getBetJl(); + await getWin(); break; } }; @@ -353,6 +356,16 @@ const getRecord = async () => { numList.value = data.value[0].hm; }; +const getWin = async () => { + await getNum(); + await getRecord(); + const res = await GetIsWin(uid.value); + if (res.number > 0) { + console.log(res.number); + lottieFn(1, res.number); + } +}; + const getNum = async () => { const res = await GetPeriod(); pStr.value = res.periods; @@ -801,8 +814,8 @@ const submit = async () => { data: arr, }) ); + await getUserInfo(); isBet.value = true; - getUserInfo(); clearbet(); }; diff --git a/src/utils/request.js b/src/utils/request.js index b65b0e1..053a2bd 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,11 +4,12 @@ import AdapterTaroVue from "@alova/adapter-taro/vue"; const alovaInst = createAlova({ baseURL: process.env.TARO_APP_API, + localCache: null, ...AdapterTaroVue(), beforeRequest: (instance) => { instance.config.headers = { "Content-Type": "application/json", - token: getStorageSync("token"), + // token: getStorageSync("token"), }; }, responded: {