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 + + {}) + 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 @@ + + + + + + + + 搜索 + + + + 历史记录 + + + + 暑假活动 + + + + + + + + + + + +