From 8a25e05183c9037391080afe916eaa1441fb3071 Mon Sep 17 00:00:00 2001 From: xixiibn5100 <1584914306@qq.com> Date: Fri, 20 Sep 2024 18:14:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=AD=A3?= =?UTF-8?q?=E6=96=B9=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=9A=84200506=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/bind/index.vue | 8 ++++---- src/services/api/codes.ts | 3 ++- src/services/services/userService.ts | 1 + src/services/utils/errHandler.ts | 10 ++++++++-- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/pages/bind/index.vue b/src/pages/bind/index.vue index 4d787076..1e0a840b 100644 --- a/src/pages/bind/index.vue +++ b/src/pages/bind/index.vue @@ -16,16 +16,16 @@ - - 图书馆账号 + + + + 图书馆账号(暂不可用) 一卡通账号 - 测试 diff --git a/src/services/api/codes.ts b/src/services/api/codes.ts index 0b4d6093..c5ff1e4a 100644 --- a/src/services/api/codes.ts +++ b/src/services/api/codes.ts @@ -6,7 +6,8 @@ export const ServerCode = { UsernamePasswordUnmatched: 200504, UserNotLogin: 200503, - SystemError: 200500, + SystemError_1: 200500, + SystemError_2: 200506, activation: { schoolIdOrIdNotExistNotMatch: 200510, diff --git a/src/services/services/userService.ts b/src/services/services/userService.ts index 94928687..89a8c6bb 100644 --- a/src/services/services/userService.ts +++ b/src/services/services/userService.ts @@ -109,6 +109,7 @@ export default class UserService { } return true; } + Taro.hideLoading(); await errCodeHandler(res.data.code, true); return false; diff --git a/src/services/utils/errHandler.ts b/src/services/utils/errHandler.ts index 5448730e..15481e96 100644 --- a/src/services/utils/errHandler.ts +++ b/src/services/utils/errHandler.ts @@ -22,10 +22,16 @@ export default async function errCodeHandler(code: number, showModal = true) { }); } break; - case ServerCode.SystemError: + case ServerCode.SystemError_1: await Taro.showToast({ icon: "none", - title: "服务器暂不可用" + title: "请求超时,请重试" + }); + break; + case ServerCode.SystemError_2: + await Taro.showToast({ + icon: "none", + title: "请求超时,请重试" }); break; case ServerCode.UserAlreadyExisted: From 6694c5fe21efd434e43c6988088654922b511976 Mon Sep 17 00:00:00 2001 From: xixiibn5100 <1584914306@qq.com> Date: Mon, 23 Sep 2024 22:05:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?perf:=E5=A2=9E=E5=BC=BA=E4=BA=86=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=8D=A1=E7=89=87=E5=AF=B9=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Alarm/index.module.scss | 3 +-- src/components/Home/edit-panel/index.vue | 6 ++++++ src/components/Home/index.module.scss | 4 ++-- src/components/Home/index.vue | 4 +++- src/components/NavBar/index.scss | 12 ++++++++++++ src/components/NavBar/index.vue | 3 +++ src/pages/bind/Oauth/index.vue | 8 ++++++-- src/pages/bind/YXY/index.vue | 5 ++++- src/pages/bind/ZF/index.vue | 7 +++++-- src/store/service/homecard.ts | 4 +++- src/style/icons.scss | 6 +++++- 11 files changed, 50 insertions(+), 12 deletions(-) diff --git a/src/components/Alarm/index.module.scss b/src/components/Alarm/index.module.scss index 03b6f1ed..fa53fac2 100644 --- a/src/components/Alarm/index.module.scss +++ b/src/components/Alarm/index.module.scss @@ -15,5 +15,4 @@ left: .7rem; position: absolute; display: inline-flex; - border-radius: 1000Px; -} + } diff --git a/src/components/Home/edit-panel/index.vue b/src/components/Home/edit-panel/index.vue index 47f05a07..290214ef 100644 --- a/src/components/Home/edit-panel/index.vue +++ b/src/components/Home/edit-panel/index.vue @@ -27,7 +27,13 @@ const validList = computed(() => { }); const selectedList = computed(() => { + if(serviceStore.homecard.selected.length === 0 && serviceStore.homecard.initialization) { + store.commit("addHomeCardItem", "lessons-table-quick-view"); + serviceStore.homecard.initialization = false + } + const list = serviceStore.homecard.selected; + console.log(list) return list.filter(item => homeCards[item]).map(item => homeCards[item]); }); diff --git a/src/components/Home/index.module.scss b/src/components/Home/index.module.scss index b74d344b..87be68a0 100644 --- a/src/components/Home/index.module.scss +++ b/src/components/Home/index.module.scss @@ -1,8 +1,8 @@ @import "@/style/theme.scss"; .edit-button { - width: 80rpx; - height: 80rpx; + width: 70rpx; + height: 70rpx; display: flex; background-color: var(--wjh-color-primary); margin: 0 auto; diff --git a/src/components/Home/index.vue b/src/components/Home/index.vue index f8be3e47..2dbecbf6 100644 --- a/src/components/Home/index.vue +++ b/src/components/Home/index.vue @@ -14,8 +14,9 @@ 还没有绑定任何服务，请到我的页面绑定 + - + @@ -46,6 +47,7 @@ import FixedQuickView from "../FixedQuickView/index.vue"; import EditPanel from "./edit-panel/index.vue"; import styles from "./index.module.scss"; import { onMounted } from "vue"; +import {WBadge} from "@/components"; const questionnairePath = questionnaireInfo.path; // 获取最新的问卷地址 diff --git a/src/components/NavBar/index.scss b/src/components/NavBar/index.scss index b82bcc38..d425612a 100644 --- a/src/components/NavBar/index.scss +++ b/src/components/NavBar/index.scss @@ -1,4 +1,16 @@ @import "@/style/theme.scss"; +.sub-text-container { + display: flex; + align-items: center; + justify-content: center; + margin-top: 20px; + .sub-text { + font-size: 0.8rem; + line-height: 1.2rem; + color: var(--wjh-color-text-secondary); + } +} + .nav-bar-icon-wrapper { padding: 0 16Px; diff --git a/src/components/NavBar/index.vue b/src/components/NavBar/index.vue index 9a780730..e70b9c53 100644 --- a/src/components/NavBar/index.vue +++ b/src/components/NavBar/index.vue @@ -25,6 +25,9 @@ + + 部分功能卡片可通过点击首页下方的加号添加 + diff --git a/src/pages/bind/Oauth/index.vue b/src/pages/bind/Oauth/index.vue index 73ac5913..21eba028 100644 --- a/src/pages/bind/Oauth/index.vue +++ b/src/pages/bind/Oauth/index.vue @@ -2,7 +2,7 @@ import { Card, WButton, WModal } from "@/components"; import { helpText } from "@/constants/copywriting"; import { UserService } from "@/services"; -import { serviceStore } from "@/store"; +import store, { serviceStore } from "@/store"; import Taro from "@tarojs/taro"; import { ref, computed } from "vue"; @@ -32,6 +32,10 @@ async function bindOauthClick() { icon: "success", title: "绑定成功" }); + if(serviceStore.homecard.selected.length === 0 && serviceStore.homecard.initialization) { + store.commit("addHomeCardItem", "lessons-table-quick-view"); + serviceStore.homecard.initialization = false + } } } @@ -49,7 +53,7 @@ async function bindOauthClick() { 统一验证系统 - + 正方教务系统 - +