From 6fb394ef186ff885f3c38629a90cd78249a0e248 Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Thu, 17 Apr 2025 10:01:13 +0800 Subject: [PATCH] 0417-1 --- newPages/messageCenter/index.vue | 515 ++++++++++++++++--------------- newPages/newIndex/index.vue | 5 + pages.json | 2 +- pagesA/courseDetail/index.vue | 310 ++++++++++--------- 4 files changed, 434 insertions(+), 398 deletions(-) diff --git a/newPages/messageCenter/index.vue b/newPages/messageCenter/index.vue index 7ac05ae..aac607e 100644 --- a/newPages/messageCenter/index.vue +++ b/newPages/messageCenter/index.vue @@ -1,272 +1,289 @@ + } + } + + .messageItem { + padding: 30rpx 0; + display: flex; + align-items: center; + column-gap: 20rpx; + border-bottom: 1rpx solid #EEEEEE; + + .messageIcon { + width: 80rpx; + height: 80rpx; + } + + .noReadTitle { + font-weight: bold; + font-size: 32rpx; + color: #333333; + } + + .noReadTitle:after { + content: "*"; + color: red; + display: block; + /* 或者其他的块级显示类型,比如 inline-block, table 等 */ + position: absolute; + /* 或者 absolute 或者 fixed,取决于你的布局需求 */ + z-index: 1; + /* 确保它在元素的上方 */ + right: 0; + } + + .messageContent { + flex: 1; + width: 0; + } + + .messageTitle { + font-size: 32rpx; + color: #333333; + } + + .messageContent_content { + font-weight: 500; + font-size: 28rpx; + color: #858BA0; + + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + margin-top: 20rpx; + } + } + + .popup-content { + padding: 15px; + height: auto; + margin: auto; + width: 80%; + background-color: #fff; + } + + .popup-content-text { + display: flex; + align-items: center; + justify-content: center; + } + + .text { + color: #333; + } + + .popup-info { + margin-top: 30rpx; + color: #fff; + background-color: #f2f6fc; + } + + .info-text { + color: #909399; + } + } + \ No newline at end of file diff --git a/newPages/newIndex/index.vue b/newPages/newIndex/index.vue index 3c5cb17..01812a7 100644 --- a/newPages/newIndex/index.vue +++ b/newPages/newIndex/index.vue @@ -55,6 +55,7 @@ getCoachId, getInviteId, getLocalUserInfo, + getStaffType, getToken, removeCoachId, removeInviteId, @@ -150,6 +151,8 @@ if (res.data != null) { this.qTenantId = res.data.tenantId this.qCoachId = res.data.userId + console.log('tenantId', this.qTenantId) + console.log('coachId', this.qCoachId) setTenantId(res.data.tenantId) this.getList() if (res.data.type == 'jl') { @@ -160,6 +163,8 @@ setCoachId(res.data.userId) setStaffType('01') } + console.log('getCoachId', getCoachId()) + console.log('getStaffType', getStaffType()) } }) }, diff --git a/pages.json b/pages.json index e97db4a..9582b5c 100644 --- a/pages.json +++ b/pages.json @@ -3,7 +3,7 @@ { "path": "newPages/newIndex/index", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarTitleText": "首页", "navigationStyle": "custom" } diff --git a/pagesA/courseDetail/index.vue b/pagesA/courseDetail/index.vue index 1912d1b..018acec 100644 --- a/pagesA/courseDetail/index.vue +++ b/pagesA/courseDetail/index.vue @@ -1,157 +1,171 @@ + @import '../common/common.scss'; + @import './assets/style/index.rpx.scss'; + + .u-content { + margin-top: 20rpx; + padding: 10rpx; + } + \ No newline at end of file