From e0b56dfa8499eb2ec729533427ba6b4dba88a7da Mon Sep 17 00:00:00 2001 From: kola-web Date: Fri, 26 Jun 2026 15:01:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83,=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E4=B9=9F=E5=BC=80=E5=8F=91=EF=BC=8C=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request.ts | 3 ++ src/app.ts | 1 + src/components/popup/index.json | 3 +- src/components/popup/index.scss | 70 +++++++++++++++++++++++++++++++ src/components/popup/index.wxml | 48 ++++++++++++++++++++++ src/images/icon96.png | Bin 0 -> 3634 bytes src/images/icon97.png | Bin 0 -> 4078 bytes src/images/icon98.png | Bin 0 -> 3074 bytes src/images/icon99.png | Bin 0 -> 3788 bytes src/pages/login/index.ts | 4 +- src/pages/schedule/index.json | 3 +- src/pages/schedule/index.ts | 19 +++++++++ src/pages/schedule/index.wxml | 8 ++++ src/pages/search/index.json | 9 +++- src/pages/search/index.scss | 89 +++++++++++++++++++++++++++++++++++++++- src/pages/search/index.wxml | 36 ++++++++++++++++ 16 files changed, 286 insertions(+), 7 deletions(-) create mode 100644 src/images/icon96.png create mode 100644 src/images/icon97.png create mode 100644 src/images/icon98.png create mode 100644 src/images/icon99.png diff --git a/src/api/request.ts b/src/api/request.ts index bfc395d..054248c 100644 --- a/src/api/request.ts +++ b/src/api/request.ts @@ -46,6 +46,9 @@ export const request = function ( resolve(res.data) } else if (code === 0) { resolve(data) + } else if (code === 40100) { + //登录过期 + getApp().redirectToLogin() } else if (showMsg) { const msg = errPicker(res.data) if (loading) { diff --git a/src/app.ts b/src/app.ts index 2a13cbe..8f2049a 100644 --- a/src/app.ts +++ b/src/app.ts @@ -110,6 +110,7 @@ App({ if (currentUrl && currentUrl !== 'pages/login/index') { this.globalData.loginRedirectUrl = currentUrl } + if (currentUrl.includes('login/index')) return wx.reLaunch({ url: '/pages/login/index', diff --git a/src/components/popup/index.json b/src/components/popup/index.json index 074f50b..cf286db 100644 --- a/src/components/popup/index.json +++ b/src/components/popup/index.json @@ -1,6 +1,7 @@ { "component": true, "usingComponents": { - "van-popup": "@vant/weapp/popup/index" + "van-popup": "@vant/weapp/popup/index", + "van-icon": "@vant/weapp/icon/index" } } diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss index 1e503af..bbf1ab1 100644 --- a/src/components/popup/index.scss +++ b/src/components/popup/index.scss @@ -96,6 +96,76 @@ } } +.popup4 { + padding: 32rpx; + background-color: #fff; + border-radius: 24rpx; + width: 688rpx; + box-sizing: border-box; + background: #ffffff; + border-radius: 24rpx 24rpx 24rpx 24rpx; + .cross { + position: absolute; + top: 32rpx; + right: 32rpx; + font-size: 40rpx; + color: rgba(203, 213, 225, 1); + } + .title { + font-size: 40rpx; + color: rgba(17, 24, 39, 1); + font-weight: bold; + padding-bottom: 32rpx; + } + .row { + margin-top: 32rpx; + display: flex; + .r-icon { + flex-shrink: 0; + margin-top: 4rpx; + width: 78rpx; + height: 78rpx; + } + .wrap { + padding-left: 24rpx; + .w-title { + font-size: 28rpx; + color: rgba(148, 163, 184, 1); + line-height: 32rpx; + } + .w-content { + margin-top: 16rpx; + font-size: 32rpx; + line-height: 42rpx; + color: rgba(17, 24, 39, 1); + font-weight: bold; + } + } + } + .row-wrap { + display: flex; + .row { + flex: 1; + } + } + .block { + margin-top: 32rpx; + padding: 24rpx; + border-radius: 24rpx; + background-color: rgba(247, 248, 250, 1); + .b-title { + font-size: 28rpx; + color: rgba(148, 163, 184, 1); + } + .b-content { + margin-top: 16rpx; + font-size: 32rpx; + color: rgba(17, 24, 39, 1); + line-height: 48rpx; + } + } +} + .close { margin: 32rpx auto 0; display: block; diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml index 94bbf1c..8d880d4 100644 --- a/src/components/popup/index.wxml +++ b/src/components/popup/index.wxml @@ -30,6 +30,54 @@ 复制 + + + + 通识基础 创新思维 + + + + + 授课老师 + 丁蔚健 + + + + + + 授课地点 + 西丽湖园区 日新楼北406 + + + + + + + 绩点 + 2 + + + + + + 课时 + 32 + + + + + 备注 + 4-7周,11-13周,18周 星期五 1-4节 日新楼北406 1500061102 + + + 课程备注 + 暂无课程备注 + + + 课程查询来源学号 + 251000487 + + H_G#Fn6Di`Et) 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 literal 0 HcmV?d00001 diff --git a/src/images/icon97.png b/src/images/icon97.png new file mode 100644 index 0000000000000000000000000000000000000000..5ab699373cdad2378cfeab668e9fdab8cfc9d46b GIT binary patch literal 4078 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 literal 0 HcmV?d00001 diff --git a/src/images/icon98.png b/src/images/icon98.png new file mode 100644 index 0000000000000000000000000000000000000000..df84f0acbf65dffa40a94d97c25c8a1d76f1d2a1 GIT binary patch literal 3074 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 Qng9R*07*qoM6N<$g7^X64FCWD literal 0 HcmV?d00001 diff --git a/src/images/icon99.png b/src/images/icon99.png new file mode 100644 index 0000000000000000000000000000000000000000..f08e35ce04affd1ed625d1b7f9a24fb19fb65665 GIT binary patch literal 3788 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 {}) + app.waitLogin({ type: 0 }).then(() => { + console.log(22222222) + }) }, /** diff --git a/src/pages/schedule/index.json b/src/pages/schedule/index.json index 52e5e1d..e2d744d 100644 --- a/src/pages/schedule/index.json +++ b/src/pages/schedule/index.json @@ -2,6 +2,7 @@ "navigationBarTitleText": "课表", "usingComponents": { "van-icon": "@vant/weapp/icon/index", - "svg-icon": "/components/svg-icon/index" + "svg-icon": "/components/svg-icon/index", + "popup": "/components/popup/index" } } diff --git a/src/pages/schedule/index.ts b/src/pages/schedule/index.ts index a01b057..ac0845d 100644 --- a/src/pages/schedule/index.ts +++ b/src/pages/schedule/index.ts @@ -2,6 +2,11 @@ const _app = getApp() Page({ data: { + // 弹窗 + popupShow: false, + popupType: 'popup4', + popupParams: {} as any, + todayIndex: 1, // 今天对应的索引（周二=1） // 左侧9节课时间段 sectionList: [ @@ -118,6 +123,20 @@ Page({ ], }, onLoad() {}, + + // 弹窗确认 + handlePopupOk() { + this.setData({ + popupShow: false, + }) + }, + + // 弹窗取消 + handlePopupCancel() { + this.setData({ + popupShow: false, + }) + }, }) export {} diff --git a/src/pages/schedule/index.wxml b/src/pages/schedule/index.wxml index e52d284..7831b0e 100644 --- a/src/pages/schedule/index.wxml +++ b/src/pages/schedule/index.wxml @@ -103,3 +103,11 @@ + + diff --git a/src/pages/search/index.json b/src/pages/search/index.json index 5db80a6..805e58c 100644 --- a/src/pages/search/index.json +++ b/src/pages/search/index.json @@ -1,5 +1,10 @@ { "navigationStyle": "default", - "navigationBarBackgroundColor": "#F7F8FA", - "usingComponents": {} + "navigationBarTitleText": "搜索", + "usingComponents": { + "van-tab": "@vant/weapp/tab/index", + "van-tabs": "@vant/weapp/tabs/index", + "van-icon": "@vant/weapp/icon/index", + "pagination": "/components/pagination/index" + } } diff --git a/src/pages/search/index.scss b/src/pages/search/index.scss index 01a9044..08193e5 100644 --- a/src/pages/search/index.scss +++ b/src/pages/search/index.scss @@ -1,3 +1,88 @@ -page { - background-color: #f7f8fa; +.page { + .header { + position: sticky; + top: 0; + left: 0; + padding: 32rpx; + background-color: #fff; + .search { + display: flex; + align-items: center; + .input-wrap { + flex: 1; + padding: 0 24rpx; + display: flex; + align-items: center; + background-color: rgba(247, 248, 250, 1); + border-radius: 68rpx; + .icon { + width: 48rpx; + height: 48rpx; + } + .input { + margin-left: 8rpx; + flex: 1; + font-size: 32rpx; + color: rgba(71, 85, 105, 1); + height: 80rpx; + } + .input-place { + color: rgba(148, 163, 184, 0.7); + } + } + .btn { + padding: 16rpx 0 16rpx 32rpx; + font-size: 32rpx; + color: rgba(74, 184, 253, 1); + } + } + .history { + margin-top: 48rpx; + .h-header { + display: flex; + align-items: center; + justify-content: space-between; + .title { + font-size: 36rpx; + color: rgba(17, 24, 39, 1); + font-weight: bold; + } + .clear { + padding: 10rpx; + width: 40rpx; + height: 40rpx; + } + } + .h-container { + margin-top: 32rpx; + display: flex; + flex-wrap: wrap; + gap: 20rpx 16rpx; + .tag { + padding: 4rpx 16rpx; + background-color: rgba(247, 248, 250, 1); + border-radius: 8rpx; + font-size: 24rpx; + line-height: 40rpx; + color: rgba(71, 85, 105, 1); + } + } + } + } + .tabs { + .van-tabs__line { + width: 42rpx !important; + } + .van-tab--active { + --tab-font-size: 32rpx; + } + } + .page0 { + min-height: 100vh; + background-color: rgba(247, 248, 250, 1); + } + .page1 { + min-height: 100vh; + background-color: rgba(247, 248, 250, 1); + } } diff --git a/src/pages/search/index.wxml b/src/pages/search/index.wxml index e69de29..bb35e4a 100644 --- a/src/pages/search/index.wxml +++ b/src/pages/search/index.wxml @@ -0,0 +1,36 @@ + + + + + + + + 搜索 + + + + 历史记录 + + + + 暑假活动 + + + + + + + + + + + +