From 864c7de42377cddae350b4a2e500c970a523d6f6 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 8 May 2021 23:27:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E7=BB=B3=E6=AF=94=E8=B5=9Bbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 2 +- api/getUserId.js | 5 ++ manifest.json | 4 +- pages/Athletes/AthAdd.vue | 100 ++++++++++++----------- pages/Athletes/Athletes.vue | 4 +- pages/Basics/Basics.vue | 8 +- pages/Choice/Choice.vue | 5 +- pages/Coach/Coach.vue | 4 +- pages/First/Choose.vue | 6 +- pages/First/First.vue | 15 +++- pages/Leader/Leader.vue | 83 +++++++++++++++++-- pages/Login/Login.vue | 37 +++++++-- pages/Login/Register.vue | 7 +- pages/Project/MatchDetail/TeamDetail.vue | 24 ++++-- pages/Project/NumMatch.vue | 3 + pages/Project/Project.vue | 20 ++--- pages/read/read.vue | 4 +- static/item00.png | Bin 0 -> 112849 bytes static/item04.jpg | Bin 0 -> 95433 bytes 19 files changed, 229 insertions(+), 102 deletions(-) create mode 100644 api/getUserId.js create mode 100644 static/item00.png create mode 100644 static/item04.jpg diff --git a/App.vue b/App.vue index 51c760c..31ce357 100644 --- a/App.vue +++ b/App.vue @@ -17,7 +17,7 @@ export default { }, created () { //在页面加载时读取sessionStorage里的状态信息 - if (sessionStorage.getItem("store") ) { + if (sessionStorage.getItem("store")) { this.$store.replaceState(Object.assign({}, this.$store.state,JSON.parse(sessionStorage.getItem("store")))) } //在页面刷新时将vuex里的信息保存到sessionStorage里 diff --git a/api/getUserId.js b/api/getUserId.js new file mode 100644 index 0000000..976f326 --- /dev/null +++ b/api/getUserId.js @@ -0,0 +1,5 @@ +const proxyUrl = '/tall/v1.0'; +import { http } from 'plugins/request/index'; + +// 检查是当前token是否过期 +export const getUserId = params => http.get(`${proxyUrl}/users/token`, params); diff --git a/manifest.json b/manifest.json index 8bc15c2..ead3b56 100644 --- a/manifest.json +++ b/manifest.json @@ -101,9 +101,9 @@ "port" : 30022 }, "router" : { - "base" : "" + "base" : "/compete-province" }, - "domain" : "https://test.tall.wiki", + "domain" : "https://www.tall.wiki", "async" : { //页面js异步加载配置 "loading" : "AsyncLoading", //页面js加载时使用的组件（需注册为全局组件） diff --git a/pages/Athletes/AthAdd.vue b/pages/Athletes/AthAdd.vue index de5c5a0..d7ceafc 100644 --- a/pages/Athletes/AthAdd.vue +++ b/pages/Athletes/AthAdd.vue @@ -9,8 +9,8 @@ - - {{ item }} + + {{ item.text }} @@ -74,7 +74,7 @@ - + @@ -128,13 +128,13 @@ import { mapState } from 'vuex' that.studentRecordId = data.studentRecordId that.healthRecord = data.healthRecord that.healthRecordId = data.healthRecordId - that.insuranceRecord = data.insuranceRecord - that.insuranceRecordId = data.insuranceRecordId + that.responsibilityRiskFile = data.responsibilityRiskFile + that.responsibilityRiskFileId = data.responsibilityRiskFileId // for( var i=0; i { - // let base64 = wx.arrayBufferToBase64(res.data); //把arraybuffer转成base64 - // base64 = 'data:image/jpeg;base64,' + base64; //不加上这串字符，在页面无法显示 - // // console.log(base64); - - // try{ - // const params = { - // fileBase64: base64 - // } - // const data = await photoBase64(params) - // // console.log(data) - - // // console.log(that[`${type}Id`]) - // // console.log(that.idCardFrontId) - // // console.log(`${type}Id`) - // }catch(e){ - // //TODO handle the exception - // // console.log(e) - // } - // } - // }); - // }, showBox() { const that = this if (that.showview === 0) { @@ -341,7 +347,7 @@ import { mapState } from 'vuex' }, choice(index) { const that = this - that.list[2].content = that.groupList[`${index}`] + that.list[2].content = that.groupList[`${index}`].text that.groupRemark = index - 0 + 1 that.showview = 0 }, @@ -395,9 +401,9 @@ import { mapState } from 'vuex' icon: 'none', duration: 1500 }) - } else if (that.insuranceRecordId === '') { + } else if (that.responsibilityRiskFileId === '') { uni.showToast({ - title: '请上传保险证明', + title: '自愿参赛责任及风险告知书', icon: 'none', duration: 1500 }) @@ -415,7 +421,7 @@ import { mapState } from 'vuex' idPhone: that.idPhoneId,//一寸证件照（文件类型） studentRecord: that.studentRecordId,//学籍证明（文件类型） healthRecord: that.healthRecordId,//体检证明（文件类型） - insuranceRecord: that.insuranceRecordId//保险证明（文件类型） + responsibilityRiskFile: that.responsibilityRiskFileId//保险证明（文件类型） } } const data = await saveplayer(params) @@ -502,9 +508,9 @@ import { mapState } from 'vuex' icon: 'none', duration: 1500 }) - } else if (that.insuranceRecordId === '') { + } else if (that.responsibilityRiskFileId === '') { uni.showToast({ - title: '请上传保险证明', + title: '自愿参赛责任及风险告知书', icon: 'none', duration: 1500 }) @@ -523,7 +529,7 @@ import { mapState } from 'vuex' idPhone: that.idPhoneId,//一寸证件照（文件类型） studentRecord: that.studentRecordId,//学籍证明（文件类型） healthRecord: that.healthRecordId,//体检证明（文件类型） - insuranceRecord: that.insuranceRecordId//保险证明（文件类型） + responsibilityRiskFile: that.responsibilityRiskFileId//保险证明（文件类型） } } const data = await saveplayer(params) diff --git a/pages/Athletes/Athletes.vue b/pages/Athletes/Athletes.vue index e94a2cb..98b59f9 100644 --- a/pages/Athletes/Athletes.vue +++ b/pages/Athletes/Athletes.vue @@ -30,7 +30,7 @@ import { mapState } from 'vuex' import { groupplayer } from 'api/groupplayer' import { delplayer } from 'api/delplayer' export default { - async onLoad () { + onLoad () { this.add() }, data() { @@ -70,7 +70,7 @@ import { delplayer } from 'api/delplayer' url:`./AthAdd` }) }, - async Del(num) { + Del(num) { const that = this uni.showModal({ title: '提示', diff --git a/pages/Basics/Basics.vue b/pages/Basics/Basics.vue index a2e1739..bae6293 100644 --- a/pages/Basics/Basics.vue +++ b/pages/Basics/Basics.vue @@ -21,6 +21,7 @@ diff --git a/pages/Login/Login.vue b/pages/Login/Login.vue index 6fec701..c4bc7bd 100644 --- a/pages/Login/Login.vue +++ b/pages/Login/Login.vue @@ -33,13 +33,13 @@