diff --git a/README.md b/README.md index 8fd6f19..a0d0d50 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ### 文档 -需要获取使用帮助请[前往文档主页](https://ham.nowcent.cn) +需要获取使用帮助请[前往文档主页](https://orangeboychen.github.io/whu-ham/) ### 下载安装 @@ -34,7 +34,7 @@ - 每日自动预约图书馆 - 更改图书馆预约时间 -#### 体育场馆预定(暂限iOS) +#### 体育场馆预定 - 预约体育场馆(可使用Siri捷径) #### E卡，校巴 @@ -44,7 +44,7 @@ - 记录你的日程信息 #### 其它 -- 课程表、图书馆预约小组件支持（Android、iOS均可） +- 课程表、图书馆预约小组件支持 ### 它安全吗 diff --git a/docs/.vuepress/components/AndroidDownloadLink.vue b/docs/.vuepress/components/AndroidDownloadLink.vue index eeea1b0..c42a9bf 100644 --- a/docs/.vuepress/components/AndroidDownloadLink.vue +++ b/docs/.vuepress/components/AndroidDownloadLink.vue @@ -104,12 +104,12 @@ export default { this.finalRelease.apkUrl = finalRelease.assets[0]['browser_download_url'] } - this.betaRelease.name = betaRelease.name; - this.betaRelease.updateLog = betaRelease.body; - this.betaRelease.publishDate = new Date(betaRelease['published_at']); - if(betaRelease.assets.length > 0 && betaRelease.assets[0]['browser_download_url'].indexOf('apk') !== -1) { - this.betaRelease.apkUrl = betaRelease.assets[0]['browser_download_url'] - } + // this.betaRelease.name = betaRelease.name; + // this.betaRelease.updateLog = betaRelease.body; + // this.betaRelease.publishDate = new Date(betaRelease['published_at']); + // if(betaRelease.assets.length > 0 && betaRelease.assets[0]['browser_download_url'].indexOf('apk') !== -1) { + // this.betaRelease.apkUrl = betaRelease.assets[0]['browser_download_url'] + // } } } } diff --git a/docs/.vuepress/components/CourseScoreShareResultView.vue b/docs/.vuepress/components/CourseScoreShareResultView.vue index e736466..67740ab 100644 --- a/docs/.vuepress/components/CourseScoreShareResultView.vue +++ b/docs/.vuepress/components/CourseScoreShareResultView.vue @@ -7,58 +7,17 @@
-
-
90-100
-
+
{{ info.from }}-{{ info.to }}
+
- {{ scoreInfo.a }} -
- -
-
85-90
-
- {{ scoreInfo.b }} -
- -
-
80-85
-
- {{ scoreInfo.c }} -
- -
-
70-80
-
- {{ scoreInfo.d }} -
- -
-
60-70
-
- {{ scoreInfo.e }} -
- -
-
0-60
-
- {{ scoreInfo.f }} + v-if="info.total > 0">
+ {{ info.total }}
@@ -87,30 +46,41 @@ export default { instructor: '' }, scoreInfo: { - a: 0, - b: 0, - c: 0, - d: 0, - e: 0, - f: 0, total: 0, - average: 0.0 + average: 0.0, + data: [] }, - dataTime: '' + dataTime: '', + colorArr: [ + '#4CAF50', + '#8BC34A', + '#FFEB3B', + '#FFC107', + '#FF9800', + '#FF5722', + ] } }, created() { - const { name, instructor, sign, data, dataTime } = this.$route.query + const { name, instructor, sign, data, dataTime, v } = this.$route.query + if (v !== '2') { + this.pushToHome() + return + } this.courseInfo.name = decodeURI(name) this.courseInfo.instructor = decodeURI(instructor) this.dataTime = dataTime - const correctSign = md5(`${name}${instructor}${data}${dataTime}uTYbpYG7YSVzncQZ`) + const correctSign = md5(`v2${name}${instructor}${data}${dataTime}uTYbpYG7YSVzncQZ`) if (correctSign !== sign) { - this.$router.push('/') + this.pushToHome() return } this.scoreInfo = JSON.parse(data) + console.log(this.scoreInfo) + }, + pushToHome() { + this.$router.push('/') } } diff --git a/docs/.vuepress/components/iOSDownloadLink.vue b/docs/.vuepress/components/iOSDownloadLink.vue index 3a0fcd9..2e2f475 100644 --- a/docs/.vuepress/components/iOSDownloadLink.vue +++ b/docs/.vuepress/components/iOSDownloadLink.vue @@ -190,11 +190,12 @@ export default { let that = this; window.jsonpCallback = function (data) { let releaseReleaseInfo = data.results[0]; + console.log(releaseReleaseInfo) //组装数据 that.finalRelease.name = releaseReleaseInfo.version; that.finalRelease.updateLog = releaseReleaseInfo.releaseNotes; - that.finalRelease.publishDate = new Date(releaseReleaseInfo.releaseDate); + that.finalRelease.publishDate = new Date(releaseReleaseInfo.currentVersionReleaseDate); }; let url = "https://itunes.apple.com/lookup?id=1577896044&callback=jsonpCallback"; @@ -203,15 +204,15 @@ export default { document.getElementsByTagName("head")[0].appendChild(script); }, getIOSBetaVersionInfo: async function () { - let res = await axios.get('https://api.ham.nowcent.cn/version'); - if(res.status !== 200) { - return; - } - - let betaReleaseInfo = res.data.data.iosVersion; - this.betaRelease.name = `${betaReleaseInfo.versionName}(${betaReleaseInfo.versionCode})` - this.betaRelease.updateLog = betaReleaseInfo.versionDescription ?? ''; - this.betaRelease.publishDate = betaReleaseInfo.betaUpdateTime ?? null; + // let res = await axios.get('https://api.ham.nowcent.cn/version'); + // if(res.status !== 200) { + // return; + // } + // + // let betaReleaseInfo = res.data.data.iosVersion; + // this.betaRelease.name = `${betaReleaseInfo.versionName}(${betaReleaseInfo.versionCode})` + // this.betaRelease.updateLog = betaReleaseInfo.versionDescription ?? ''; + // this.betaRelease.publishDate = betaReleaseInfo.betaUpdateTime ?? null; } } } diff --git a/docs/.vuepress/config.ts b/docs/.vuepress/config.ts index cb106fc..a189b73 100644 --- a/docs/.vuepress/config.ts +++ b/docs/.vuepress/config.ts @@ -14,7 +14,7 @@ export default defineUserConfig({ title: 'Ham', base: '/whu-ham/', head: [ - ['link', { rel: 'icon', href: 'icon-1024.png' }], + ['link', { rel: 'icon', href: 'icon-1024 2.png' }], ['link', { rel: 'manifest', href: 'https://orangeboychen.github.io/whu-ham/manifest.webmanifest' }] ], plugins: [ diff --git a/docs/handbook/bus.md b/docs/handbook/bus.md index 154e55b..f19703c 100644 --- a/docs/handbook/bus.md +++ b/docs/handbook/bus.md @@ -3,7 +3,7 @@ ::: tip 版本要求 iOS: 1.3.2 (build >= 96) -Android: 暂未支持 +Android: 1.4.3 ::: 你可以通过Ham查看校巴信息。 diff --git a/docs/handbook/pay.md b/docs/handbook/pay.md index 1c318c5..18bef8f 100644 --- a/docs/handbook/pay.md +++ b/docs/handbook/pay.md @@ -3,7 +3,7 @@ ::: tip 版本要求 iOS: 1.3.2 (build >= 96) -Android: 暂未支持 +Android: 1.4.3 ::: 你可以通过Ham使用珞珈E卡 diff --git a/docs/handbook/schedule.md b/docs/handbook/schedule.md index 037aeec..d85cfda 100644 --- a/docs/handbook/schedule.md +++ b/docs/handbook/schedule.md @@ -1,4 +1,4 @@ # 日程 在日程页上下拉进入图片详情页，在点击下方"日程"按钮进入日程页。在日程页中，你可以查看所有日程、添加或删除日程。 -日程支持到期前提醒，并自动导入iOS日历。 +日程支持到期前提醒，并自动导入日历。 diff --git a/docs/handbook/sport.md b/docs/handbook/sport.md index 50269f4..ad02530 100644 --- a/docs/handbook/sport.md +++ b/docs/handbook/sport.md @@ -3,7 +3,7 @@ ::: tip 版本要求 iOS: 1.3.2 (build >= 96) -Android: 暂未支持 +Android: 1.4.3 ::: 你可以通过Ham预定运动场馆