From 798f2cde34f72a12f6246a3ff04aab51b7fafe73 Mon Sep 17 00:00:00 2001 From: kola-web Date: Sat, 16 May 2026 18:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E7=AB=AF=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.ts | 5 +- src/pages/index/index.scss | 2 +- src/pages/interactivePatient/index.scss | 1 + src/pages/myLive/index.json | 2 - src/pages/myLive/index.scss | 288 +++++--------------------------- src/pages/myLive/index.ts | 6 +- src/pages/myLive/index.wxml | 167 ++---------------- src/pages/mySave/index.wxml | 2 +- src/pages/repository/index.ts | 16 +- 9 files changed, 83 insertions(+), 406 deletions(-) diff --git a/src/app.ts b/src/app.ts index f8ffea4..d3c155f 100644 --- a/src/app.ts +++ b/src/app.ts @@ -361,7 +361,8 @@ App({ self?.setData({ userInfo: res, }) - const { doctorId, inviteChan, recDoctorId: recommendDoctorId } = this.globalData.scene + // this.globalData.scene.doctorId = 3 + const { doctorId, recDoctorId: recommendDoctorId } = this.globalData.scene if ( doctorId && res.InviteDoctorId != doctorId && @@ -374,7 +375,7 @@ App({ url: '?r=igg4/account/update-doctor', data: { inviteDoctorId: doctorId, - inviteChannel: inviteChan, + inviteChannel: 1, }, }) } diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss index a782760..49f814b 100644 --- a/src/pages/index/index.scss +++ b/src/pages/index/index.scss @@ -275,7 +275,7 @@ page { } } .book { - margin: $page-margin; + margin: 8rpx $page-margin 0; .swiper { margin: 0 -40rpx; height: 700rpx; diff --git a/src/pages/interactivePatient/index.scss b/src/pages/interactivePatient/index.scss index deae6ed..d340755 100644 --- a/src/pages/interactivePatient/index.scss +++ b/src/pages/interactivePatient/index.scss @@ -2,6 +2,7 @@ page { background-color: rgba(242, 244, 245, 1); } .page { + padding-top: 40rpx; height: 100vh; overflow: hidden; display: flex; diff --git a/src/pages/myLive/index.json b/src/pages/myLive/index.json index ea644da..a81fb7a 100644 --- a/src/pages/myLive/index.json +++ b/src/pages/myLive/index.json @@ -1,8 +1,6 @@ { "navigationBarTitleText": "我报名的活动", "usingComponents": { - "van-tab": "@vant/weapp/tab/index", - "van-tabs": "@vant/weapp/tabs/index", "van-icon": "@vant/weapp/icon/index" } } diff --git a/src/pages/myLive/index.scss b/src/pages/myLive/index.scss index ddbcf98..16f89d1 100644 --- a/src/pages/myLive/index.scss +++ b/src/pages/myLive/index.scss @@ -1,5 +1,9 @@ .page { + overflow: hidden; padding-bottom: 120rpx; + min-height: 100vh; + background-color: #f7f7f7; + position: relative; .sticky { position: sticky; top: 0; @@ -17,11 +21,10 @@ color: #484848; } } - - .allin-list { - margin: 32rpx 30rpx; - .on-list-item { - margin-bottom: 20rpx; + .info-list { + padding: 32rpx 30rpx; + .list-item { + margin-bottom: 32rpx; background: #ffffff; box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); border-radius: 24rpx; @@ -33,57 +36,29 @@ border-radius: 24rpx 24rpx 0 0; display: block; width: 100%; - height: 388rpx; + height: 344rpx; } .status { - padding: 6rpx 32rpx; + padding: 8rpx 20rpx; position: absolute; top: 0; - left: 0; + right: 0; display: flex; align-items: center; - background: linear-gradient(90deg, #e5e9f5 0%, #fde4ec 100%); - border-radius: 24rpx 0rpx 24rpx 0rpx; - font-size: 28rpx; - color: #e04775; + background: linear-gradient(270deg, #ffd454 0%, #ffa851 100%); + border-radius: 0 24rpx 0 24rpx; + font-size: 24rpx; + color: rgba(255, 255, 255, 1); .dot { margin-right: 8rpx; width: 13rpx; height: 13rpx; border-radius: 50%; - background-color: #e04775; + background-color: #fff; } - &.bad { - color: #484848; - background: #e6e6e6; - .dot { - display: none; - } - } - } - .date { - padding: 18rpx 18rpx 8rpx; - position: absolute; - left: 40rpx; - bottom: 0; - background: #e04775; - border-radius: 11rpx 11rpx 0rpx 0rpx; - text-align: center; - .d-title { - font-size: 22rpx; - color: #ffffff; - font-weight: bold; - } - .ymd { - font-size: 18rpx; - color: #fff; - line-height: 28rpx; - border-bottom: 2rpx solid rgba(255, 255, 255, 0.34); - } - .hm { - font-size: 18rpx; - color: #fff; - line-height: 28rpx; + &.unsigned { + color: rgba(34, 34, 34, 0.5); + background: rgba(246, 246, 246, 1); } } } @@ -91,220 +66,49 @@ padding: 32rpx 34rpx; background-color: #fff; border-radius: 0 0 24rpx 24rpx; - .tag { - margin-bottom: 16rpx; - width: 112rpx; - height: 36rpx; - font-size: 22rpx; - color: #ffffff; - line-height: 36rpx; - text-align: center; - background: #ffc137; - border-radius: 8rpx; - } .title { - font-size: 32rpx; - color: #252525; + font-size: 36rpx; + color: #222222; font-weight: bold; - .t-tag { - display: inline-block; - width: 112rpx; - height: 36rpx; - font-size: 22rpx; - color: #ffffff; - line-height: 36rpx; - text-align: center; - background: #e04775; - border-radius: 8rpx; - margin-right: 1em; - } } - .content { - margin-top: 20rpx; - display: flex; - justify-content: space-between; - align-items: center; - .labels { - display: flex; - align-items: center; - flex-wrap: wrap; - .label { - margin-right: 16rpx; - margin-bottom: 16rpx; - padding: 2rpx 20rpx; - font-size: 22rpx; - color: #e04775; - border-radius: 18rpx; - background-color: rgba(224, 71, 117, 0.13); - word-break: break-all; - } - } - .people { - color: #9e9e9e; - font-size: 22rpx; - } + .site { + margin-top: 16rpx; + font-size: 32rpx; + color: rgba(34, 34, 34, 0.7); } .footer { margin-top: 32rpx; + padding-top: 24rpx; display: flex; align-items: center; justify-content: space-between; - .site { - font-size: 22rpx; - color: #bebebe; - } - .btn { - margin-left: 10rpx; - flex-shrink: 0; - padding: 4rpx 36rpx; - font-size: 28rpx; - color: #ffffff; - background: #e04775; - border-radius: 24rpx; - &.active { - color: #484848; - background-color: #e7e7e7; - } - .icon { - width: 24rpx; - height: 24rpx; - } - } - } - } - } - .off-list-item { - margin-bottom: 20rpx; - background: #ffffff; - box-shadow: 0rpx 4rpx 20rpx 0rpx rgba(0, 0, 0, 0.05); - border-radius: 24rpx; - border: 2rpx solid #ebecee; - - .photo-wrap { - position: relative; - .photo { - border-radius: 24rpx 24rpx 0 0; - display: block; - width: 100%; - height: 388rpx; - } - .status { - padding: 6rpx 32rpx; - position: absolute; - top: 0; - left: 0; - display: flex; - align-items: center; - background: linear-gradient(90deg, #e5e9f5 0%, #fde4ec 100%); - border-radius: 24rpx 0rpx 24rpx 0rpx; - font-size: 28rpx; - color: #e04775; - .dot { - margin-right: 8rpx; - width: 13rpx; - height: 13rpx; - border-radius: 50%; - background-color: #e04775; - } - &.bad { - color: #484848; - background: #e6e6e6; - .dot { - display: none; - } - } - } - .date { - padding: 18rpx 18rpx 8rpx; - position: absolute; - left: 40rpx; - bottom: 0; - background: #e04775; - border-radius: 11rpx 11rpx 0rpx 0rpx; - text-align: center; - .d-title { - font-size: 22rpx; - color: #ffffff; - font-weight: bold; - } - .ymd { - font-size: 18rpx; - color: #fff; - line-height: 28rpx; - border-bottom: 2rpx solid rgba(255, 255, 255, 0.34); - } - .hm { - font-size: 18rpx; - color: #fff; - line-height: 28rpx; - } - } - } - .inner { - padding: 32rpx 34rpx; - background-color: #fff; - border-radius: 0 0 24rpx 24rpx; - .tag { - margin-bottom: 16rpx; - width: 112rpx; - height: 36rpx; - font-size: 22rpx; - color: #ffffff; - line-height: 36rpx; - text-align: center; - background: #ffc137; - border-radius: 8rpx; - } - .title { - font-size: 32rpx; - color: #252525; - font-weight: bold; - } - .content { - margin-top: 20rpx; - display: flex; - justify-content: space-between; - align-items: center; - .labels { + border-top: 1px solid rgba(0, 0, 0, 0.04); + .content { + margin-top: 20rpx; display: flex; - align-items: center; - flex-wrap: wrap; - .label { - margin-right: 16rpx; - margin-bottom: 16rpx; - padding: 2rpx 20rpx; - font-size: 22rpx; - color: #e04775; - border-radius: 18rpx; - background-color: rgba(224, 71, 117, 0.13); - word-break: break-all; + justify-content: space-between; + align-items: flex-start; + .people { + flex-shrink: 0; + color: rgba(34, 34, 34, 0.3); + font-size: 32rpx; } } - .people { - color: #9e9e9e; - font-size: 22rpx; - } - } - .footer { - margin-top: 32rpx; - display: flex; - align-items: center; - justify-content: space-between; - .site { - font-size: 22rpx; - color: #bebebe; - } .btn { margin-left: 10rpx; flex-shrink: 0; - padding: 4rpx 36rpx; - font-size: 28rpx; + padding: 10rpx 46rpx; + font-size: 36rpx; color: #ffffff; - background: #e04775; - border-radius: 24rpx; - &.active { - color: #484848; - background-color: #e7e7e7; + background: linear-gradient(94deg, #0eb66d 0%, #00d277 100%); + border-radius: 66rpx; + &.signed { + color: rgba(14, 182, 109, 1); + background: rgba(205, 248, 229, 1); + } + &.ended { + color: rgba(34, 34, 34, 0.7); + background: rgba(246, 246, 246, 1); } .icon { width: 24rpx; diff --git a/src/pages/myLive/index.ts b/src/pages/myLive/index.ts index d533024..aeaeb61 100644 --- a/src/pages/myLive/index.ts +++ b/src/pages/myLive/index.ts @@ -13,9 +13,7 @@ Page({ }, online_open_status: 1, // 线上 offline_open_status: 1, // 线下 - liveStatus: app.globalData.liveStatus, - activityStatus: app.globalData.activityStatus, - userInfo: {}, + dateValue: 0, }, onLoad() { this.setData({ @@ -103,7 +101,7 @@ Page({ }, handleDetail(e) { const { id } = e.currentTarget.dataset - const {active} = this.data + const { active } = this.data if (active == 0) { app.mpBehavior({ PageName: 'BTN_PATIENTSIGNEDUPACTIVITIESALLLIST' }) } diff --git a/src/pages/myLive/index.wxml b/src/pages/myLive/index.wxml index 6bbfc47..a1e6097 100644 --- a/src/pages/myLive/index.wxml +++ b/src/pages/myLive/index.wxml @@ -1,158 +1,27 @@ - - - - - - - - - - - - - - - - {{liveStatus[item.Status]}} - - - - - - - - - - - - - - - - - - 线上活动 - {{item.Name}} - - - {{label}} - - {{item.SignUpPeopleNum}}人已报名 - - - {{item.MasterName}} {{item.MasterTitle}} - 已取消 - 已删除 - 看回放 - 回放生成中 - - 审核中 - - 参会 - 已报名 - - - - 已满额 - - - - - - 已满额 - - 报名已截止 - 报名 - - + + + + + + + + {{item.IsSignUp==1 ? '已报名' : '未报名'}} - - - - - - {{activityStatus[item.Status]}} - - - - - - - - - - - - - - - - - - 线下活动 - {{item.Name}} + + {{item.Name}} + {{item.MasterName}} {{item.MasterTitle}} + - - {{label}} - - {{item.SignUpPeopleNum}}人已报名 - - - - {{item.Location}} - {{item.Distance}} - - 已结束 - 已取消 - 已删除 - - 审核中 - - 已报名 - 已报名 - - - - 已满额 - - - - - - 已满额 - - 报名已截止 - 报名 - + {{item.SignUpPeopleNum}}人已报名 + 已结束 + 立即参与 + 已报名 + 立即报名 - + diff --git a/src/pages/mySave/index.wxml b/src/pages/mySave/index.wxml index d80e1a2..fd17c46 100644 --- a/src/pages/mySave/index.wxml +++ b/src/pages/mySave/index.wxml @@ -1,4 +1,4 @@ - + { - const storyCate = res.find((item: any) => item.CateName === '患者故事') - const storyCateId = storyCate ? storyCate.CateId : '' const infoCateList = res.filter((item: any) => item.CateName !== '患者故事') this.setData({ infoCateList, - storyCateId, }) - if (this.data.active == 1 && storyCateId) { - this.setData({ CateId: storyCateId }) + }) + wx.ajax({ + method: 'GET', + url: '?r=igg4/pic-text/story-cate-id', + data: {}, + }).then((res) => { + this.setData({ + storyCateId: res, + }) + if (this.data.active == 1 && res) { + this.setData({ CateId: res }) } this.getList() })