From 3615bd71c9aee4b78de0bb55bb73df910cc585d4 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Sat, 31 Aug 2024 21:45:51 +0800 Subject: [PATCH] 240831-01 --- .gitignore | 1 + src/config/index.ts | 4 +- src/pages/match/ing.vue | 23 ++- src/pages/promote/learn.vue | 273 +++++++++++++++++++--------------- src/pages/promote/promote.vue | 10 +- 5 files changed, 183 insertions(+), 128 deletions(-) diff --git a/.gitignore b/.gitignore index bcafc07..fa080ac 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /.idea/inspectionProfiles/Project_Default.xml /.idea/.gitignore /.idea/vcs.xml +/src/debugApk/ diff --git a/src/config/index.ts b/src/config/index.ts index d7aa855..432f4ae 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -10,7 +10,7 @@ export const SERVER_API_URL = 'https://server.gxwebsoft.com/api'; // 模块接口地址 // export const MODULES_API_URL = 'https://modules.gxwebsoft.com/api'; // export const MODULES_API_URL = 'http://192.168.50.71:9099/api'; -// export const MODULES_API_URL = 'http://127.0.0.1:9099/api'; -export const MODULES_API_URL = 'http://120.78.78.131:9335/api'; +export const MODULES_API_URL = 'http://127.0.0.1:9099/api'; +// export const MODULES_API_URL = 'http://120.78.78.131:9335/api'; export const apiUrl = MODULES_API_URL; diff --git a/src/pages/match/ing.vue b/src/pages/match/ing.vue index d6ffb95..fa1f6ab 100644 --- a/src/pages/match/ing.vue +++ b/src/pages/match/ing.vue @@ -91,6 +91,7 @@ export default { data() { return { tabIndex: 1, + matchId: null, tabList: [ {name: '报名'}, {name: '进行中'}, @@ -169,12 +170,16 @@ export default { text } }) + if (this.matchId) { + this.matchIndex = this.matchList.findIndex(item => item.id === this.matchId) + uni.setStorageSync('matchIndex', this.matchIndex) + } + console.log(this.matchIndex, this.matchId) this.matchInfo = data[this.matchIndex] this.raceList = [] this.resetRaceList() }, async toSingleMatch() { - console.log(this.matchInfo.id) const checkRes = await this.checkHasData(0) if (!checkRes) return const {data} = await matchSingleRuleGetRuleByMatchReq({matchId: this.matchInfo.id}) @@ -199,7 +204,7 @@ export default { // url // }) console.log(data.peopleInfo.teamIndex) - if (!data.peopleInfo || data.peopleInfo.teamIndex === null){ + if (!data.peopleInfo || data.peopleInfo.teamIndex === null) { return toast("未分组,无法参与") } uni.navigateTo({ @@ -283,14 +288,19 @@ export default { type: 'risk' }) }, - toHome(){ + toHome() { uni.switchTab({url: '/pages/promote/promote'}) } }, + onLoad(option) { + if (option.matchId) this.matchId = parseInt(option.matchId) + }, onShow() { - if (uni.getStorageSync('matchIndex')) this.matchIndex = parseInt(uni.getStorageSync('matchIndex')) - else this.matchIndex = 0 - this.getMatching() + setTimeout(() => { + if (uni.getStorageSync('matchIndex')) this.matchIndex = parseInt(uni.getStorageSync('matchIndex')) + else this.matchIndex = 0 + this.getMatching() + }, 100) }, } @@ -553,6 +563,7 @@ export default { display: flex; align-items: center; justify-content: center; + z-index: 100; } diff --git a/src/pages/promote/learn.vue b/src/pages/promote/learn.vue index cdc722f..e83557c 100644 --- a/src/pages/promote/learn.vue +++ b/src/pages/promote/learn.vue @@ -6,11 +6,10 @@ :enable-progress-gesture="false" :poster="`${video}?x-oss-async-process=video/snapshots,ss_1100,f_jpg`"> - - - 继续学习 - - + + + + @@ -38,121 +37,153 @@ - - - - + + + - + @@ -176,6 +207,7 @@ - - {{ item.title }} + + {{ item.title }} {{ item.createTime }} @@ -227,7 +228,8 @@ - + @@ -626,7 +628,7 @@ page { align-items: center; .text { - flex: 1; + //flex: 1; font-size: 28rpx; line-height: 40rpx; color: $dark-color;