diff --git a/project.private.config.json b/project.private.config.json index ba50025..eabb21b 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -23,13 +23,20 @@ "miniprogram": { "list": [ { - "name": "start", - "pathName": "pages/start/index", + "name": "患者-录入个人信息", + "pathName": "patient/pages/enterInfo/index", "query": "", "scene": null, "launchMode": "default" }, { + "name": "start", + "pathName": "pages/start/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { "name": "医生-患者列表", "pathName": "pages/d_patient/index", "query": "", diff --git a/src/app.json b/src/app.json index b10c04e..74a0052 100644 --- a/src/app.json +++ b/src/app.json @@ -116,8 +116,8 @@ }, "tabBar": { "custom": false, - "color": "rgba(105, 104, 110, 1)", - "selectedColor": "rgba(33, 29, 46, 1)", + "color": "#69686E", + "selectedColor": "#211D2E", "borderStyle": "white", "list": [ { diff --git a/src/app.ts b/src/app.ts index 0ca31f0..64b167e 100644 --- a/src/app.ts +++ b/src/app.ts @@ -169,7 +169,7 @@ App({ }, checkLoginType(type, backPath = '') { const { loginType, isLogin, isNewReg } = this.globalData - if(backPath){ + if (backPath) { app.globalData.backPath = backPath } @@ -178,7 +178,7 @@ App({ } if (isLogin !== 1) { - if (type.includes(0) && [0, 1].includes(loginType)) { + if (type.includes(0) && [0, 1, 2].includes(loginType)) { return true } if ([0, 1].includes(loginType)) { @@ -524,6 +524,9 @@ App({ inviteDoctorId: doctorId, inviteChannel: inviteChan, }, + }).then(() => { + this.globalData.scene = {} + this.getZdUserInfo(self, update, callback) }) } callback(res) diff --git a/src/components/pagination/index.js b/src/components/pagination/index.js index c1a789f..5e4732e 100644 --- a/src/components/pagination/index.js +++ b/src/components/pagination/index.js @@ -1,11 +1,12 @@ -const app = getApp(); +const app = getApp() Component({ + externalClasses: ['external-class'], properties: { pagination: { type: Object, value() { - return {}; + return {} }, }, }, @@ -14,7 +15,7 @@ Component({ }, methods: { handleTouchmove() { - return false; + return false }, }, -}); +}) diff --git a/src/components/pagination/index.wxml b/src/components/pagination/index.wxml index 3f1150d..816f343 100644 --- a/src/components/pagination/index.wxml +++ b/src/components/pagination/index.wxml @@ -1,4 +1,4 @@ - + 加载中... diff --git a/src/components/toast/index.scss b/src/components/toast/index.scss index bc2557c..48c5490 100644 --- a/src/components/toast/index.scss +++ b/src/components/toast/index.scss @@ -2326,32 +2326,44 @@ .popup-dedicated-doctor { .popup-container { position: relative; - padding: 392rpx 40rpx 0; - width: 670rpx; - height: 496rpx; + padding: 100rpx 32rpx 32rpx; + width: 630rpx; + height: 516rpx; box-sizing: border-box; + .title { + font-size: 40rpx; + color: #ffffff; + font-weight: bold; + } .content { - position: absolute; - top: 78rpx; - right: 20rpx; - width: 462rpx; - height: 122rpx; - animation: hu__hu__ infinite 2s ease-in-out; - @keyframes hu__hu__ { - 50% { - transform: translateY(20rpx); - } + font-size: 32rpx; + color: #ffffff; + } + .container { + margin-top: 60rpx; + font-size: 32rpx; + color: #211d2e; + text-align: center; + line-height: 48rpx; + .line { + display: flex; + align-items: center; + justify-content: center; + } + .high { + color: #b982ff; + font-weight: bold; } } .btn { - width: 610rpx; - height: 80rpx; + margin-top: 32rpx; + height: 88rpx; font-size: 32rpx; color: rgba(255, 255, 255, 1); text-align: center; - line-height: 80rpx; - background: #cf5375; - border-radius: 24rpx 24rpx 24rpx 24rpx; + line-height: 88rpx; + background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); + border-radius: 100rpx; } } .close { diff --git a/src/components/toast/index.wxml b/src/components/toast/index.wxml index ea03240..2de7cfb 100644 --- a/src/components/toast/index.wxml +++ b/src/components/toast/index.wxml @@ -680,18 +680,21 @@ - + - + 感谢您的信任 + 医生可远程关注您的健康状况啦 + + + 您的 + 【专属医生互动】 + 上线啦 + + 随时咨询共同做好居家管理 + 立即体验 - + {{detail.HasTedSurgeryName}} - + 备注 - {{detail.remark}} + {{detail.DoctorRemark}} diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss index d82a375..fe1aac4 100644 --- a/src/pages/home/index.scss +++ b/src/pages/home/index.scss @@ -64,6 +64,14 @@ page { font-size: 32rpx; color: rgba(33, 29, 46, 1); font-weight: bold; + display: flex; + align-items: baseline; + gap: 16rpx; + .sub { + font-size: 28rpx; + color: #adacb2; + font-weight: normal; + } } } .s-container { @@ -76,6 +84,7 @@ page { background-color: #fff; border-radius: 24rpx; display: flex; + align-items: center; gap: 22rpx; .icon { width: 84rpx; @@ -95,17 +104,20 @@ page { } } .num { - margin-top: 16rpx; + margin-top: 12rpx; font-size: 48rpx; color: rgba(33, 29, 46, 1); font-weight: bold; + display: flex; + align-items: baseline; .sub { + margin-left: 8rpx; font-size: 24rpx; color: rgba(173, 172, 178, 1); } } - .content{ - margin-top: 16rpx; + .content { + margin-top: 28rpx; font-size: 28rpx; color: rgba(173, 172, 178, 1); } diff --git a/src/pages/home/index.wxml b/src/pages/home/index.wxml index f08299b..a4565a9 100644 --- a/src/pages/home/index.wxml +++ b/src/pages/home/index.wxml @@ -145,7 +145,7 @@ - 统计数据截止到昨天 + 统计数据截止到昨天 每天00:05更新 diff --git a/src/pages/information/index.scss b/src/pages/information/index.scss index 8b8423d..069e569 100644 --- a/src/pages/information/index.scss +++ b/src/pages/information/index.scss @@ -28,7 +28,7 @@ page { } .card { margin: 0 40rpx 24rpx; - padding: 12rpx; + padding: 32rpx; background-color: #fff; border-radius: 24rpx; display: flex; @@ -36,7 +36,7 @@ page { position: relative; width: 176rpx; height: 176rpx; - border-radius: 24rpx; + border-radius: 16rpx; .photo { flex-shrink: 0; width: 100%; diff --git a/src/pages/information/index.wxml b/src/pages/information/index.wxml index 4655c70..4fac1e7 100644 --- a/src/pages/information/index.wxml +++ b/src/pages/information/index.wxml @@ -2,7 +2,7 @@ diff --git a/src/pages/login/index.wxml b/src/pages/login/index.wxml index 82c5afd..804f019 100644 --- a/src/pages/login/index.wxml +++ b/src/pages/login/index.wxml @@ -1,5 +1,5 @@ - + - + 切换到患者端 diff --git a/src/pages/my/index.scss b/src/pages/my/index.scss index ebf1ab7..08ec67e 100644 --- a/src/pages/my/index.scss +++ b/src/pages/my/index.scss @@ -42,8 +42,9 @@ page { margin-left: 10rpx; display: inline-block; font-size: 24rpx; + line-height: 28rpx; color: rgba(255, 255, 255, 1); - padding: 2rpx 10rpx; + padding: 2rpx 8rpx; background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%); border-radius: 8rpx 8rpx 8rpx 8rpx; } @@ -102,3 +103,7 @@ page { background-color: #fff; } } + +.van-popup--center { + top: 55% !important; +} diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index 97a54e9..8c54cef 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -16,7 +16,12 @@ - + diff --git a/src/patient/pages/doctorDetail/index.scss b/src/patient/pages/doctorDetail/index.scss index 98eacd0..a5592bb 100644 --- a/src/patient/pages/doctorDetail/index.scss +++ b/src/patient/pages/doctorDetail/index.scss @@ -47,12 +47,12 @@ page { .tag { margin-right: 12rpx; display: inline-block; - flex-shrink: 0; - padding: 2rpx 12rpx; - font-size: 22rpx; - color: #fff; - border-radius: 8rpx; + font-size: 24rpx; + line-height: 28rpx; + color: rgba(255, 255, 255, 1); + padding: 2rpx 8rpx; background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%); + border-radius: 8rpx 8rpx 8rpx 8rpx; } } .card { diff --git a/src/patient/pages/enterInfo/index.scss b/src/patient/pages/enterInfo/index.scss index 22fb025..3866173 100644 --- a/src/patient/pages/enterInfo/index.scss +++ b/src/patient/pages/enterInfo/index.scss @@ -118,7 +118,7 @@ .input-required { display: flex; justify-content: space-between; - align-items: flex-end; + align-items: center; &::after { flex-shrink: 0; margin-right: 60rpx; @@ -147,7 +147,7 @@ } &.active { color: rgba(185, 130, 255, 1); - background: #fff; + background: #FAF6FF; border-color: rgba(185, 130, 255, 1); } } @@ -168,7 +168,7 @@ &.active { color: rgba(185, 130, 255, 1); border-color: rgba(185, 130, 255, 1); - background-color: transparent; + background-color: #FAF6FF; } } } @@ -189,7 +189,7 @@ width: 100%; box-sizing: border-box; background-color: #fff; - box-shadow: 0 -10rpx 10rpx rgba(204,204,204, 0.1); + box-shadow: 0 -10rpx 10rpx rgba(204, 204, 204, 0.1); .next { flex: 1; text-align: center; diff --git a/src/patient/pages/index/index.scss b/src/patient/pages/index/index.scss index 37d8e42..5cc5b68 100644 --- a/src/patient/pages/index/index.scss +++ b/src/patient/pages/index/index.scss @@ -16,21 +16,12 @@ page { padding-bottom: 180rpx; .doctor { margin: $page-margin $page-margin 0; - padding: 16rpx 10rpx 10rpx; + padding: 32rpx; border-radius: 24rpx; background: linear-gradient(195deg, #ffe3fc 0%, #ecddff 100%); - .title { - padding-left: 16rpx; - font-size: 32rpx; - color: rgba(185, 130, 255, 1); - font-weight: bold; - } .container { - margin-top: 16rpx; - padding: 27rpx 0 27rpx 27rpx; display: flex; justify-content: space-between; - background: linear-gradient(351deg, #ffffff 0%, rgba(255, 255, 255, 0.78) 100%); border-radius: 21rpx; .avatar { width: 104rpx; @@ -122,26 +113,16 @@ page { } } } - .btn { - align-self: center; - width: 128rpx; - height: 44rpx; - font-size: 28rpx; - color: #fff; - background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); - border-radius: 420rpx 0 0 420rpx; - display: flex; - align-items: center; - justify-content: center; - } } - &.doctor-drugs { - .container { - .btn { - color: #ffffff; - background: rgba(37, 217, 200, 1); - } - } + .btn { + margin-top: 32rpx; + height: 64rpx; + font-size: 28rpx; + color: #ffffff; + text-align: center; + line-height: 64rpx; + background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); + border-radius: 64rpx 64rpx 64rpx 64rpx; } } .banner { @@ -209,7 +190,7 @@ page { padding: 32rpx 0; background: #ffffff; display: flex; - border-bottom: 1px dotted rgba(39, 58, 101, 0.2); + border-bottom: 1px dotted rgba(39, 58, 101, 0.1); &:last-of-type { border: none; } @@ -271,7 +252,7 @@ page { text-overflow: ellipsis; overflow: hidden; .line { - margin: 0 4rpx; + margin: 0 8rpx; vertical-align: baseline; display: inline-block; width: 1px; @@ -290,7 +271,8 @@ page { color: rgba(105, 104, 110, 1); } .btn { - width: 128rpx; + min-width: 128rpx; + padding: 0 18rpx; height: 48rpx; display: flex; align-items: center; @@ -328,12 +310,13 @@ page { } .swiper { margin: 0 -40rpx; - height: 700rpx; + height: 780rpx; .swiper-item { padding: 32rpx 40rpx; box-sizing: border-box; .book-list { padding: 0 32rpx; + height: 100%; border-radius: 32rpx; background-color: #fff; box-shadow: 0 0 32rpx 1rpx rgba(0, 0, 0, 0.08); @@ -341,6 +324,7 @@ page { .card { padding: 32rpx 0; display: flex; + border-bottom: 1px dotted rgba(39, 58, 101, 0.1); > view:not(:last-of-type), > image { margin-right: 24rpx; @@ -383,8 +367,18 @@ page { } } - .card:not(:last-of-type) { - border-bottom: 1rpx dotted rgba(39, 58, 101, 0.2); + .card:nth-of-type(3) { + border: none; + } + .more { + height: 72rpx; + font-size: 28rpx; + color: #b982ff; + display: flex; + align-items: center; + justify-content: center; + background: #f2e8ff; + border-radius: 100rpx 100rpx 100rpx 100rpx; } } } @@ -406,7 +400,7 @@ page { left: 64rpx; bottom: calc(env(safe-area-inset-bottom) + 120rpx); width: 622rpx; - background-color: rgba(39, 58, 101, 0.8); + background-color: rgba(33, 29, 46, 0.62); box-shadow: 0 8rpx 24rpx rgba(92, 144, 220, 0.25); height: 84rpx; line-height: 84rpx; diff --git a/src/patient/pages/index/index.ts b/src/patient/pages/index/index.ts index 032684c..fd27820 100644 --- a/src/patient/pages/index/index.ts +++ b/src/patient/pages/index/index.ts @@ -80,6 +80,7 @@ Page({ zdUserInfo, publicCard: zdUserInfo.isShowFollowGuide == 1, }) + this.getPopup() this.getConfig(zdUserInfo) this.getSystemConfig() if (zdUserInfo.ExclusiveDoctorId > 0) { @@ -92,6 +93,22 @@ Page({ }) }) }, + async getPopup() { + const data3 = await wx.ajax({ + method: 'GET', + url: '?r=zd/popup/info', + data: { + Type: 6, + }, + }) + if (data3.showAlert) { + this.setData({ + toastShow: data3.showAlert, + toastType: 'dedicatedDoctor', + toastParams: {}, + }) + } + }, getUnreadCount() { wx.ajax({ method: 'GET', diff --git a/src/patient/pages/index/index.wxml b/src/patient/pages/index/index.wxml index 0a1f363..9d1f49b 100644 --- a/src/patient/pages/index/index.wxml +++ b/src/patient/pages/index/index.wxml @@ -6,14 +6,13 @@ style="background: url('{{imageUrl}}bg10.png?t={{Timestamp}}') no-repeat top center/100% 610rpx;padding-top:{{pageTop}}px;" > - - 我的专属医生 @@ -36,8 +35,8 @@ - {{unreadCount ? '去看看':'去咨询'}} + {{unreadCount ? '去看看':'去咨询'}} {{item.BeginTime}} - {{item.Status==2?'参会':'查看'}} + {{item.Status==2?'点此参加':'查看'}} @@ -124,10 +123,6 @@ {{card.name}} - - 查看全部 - - {{item.Title}} + + 查看全部 + diff --git a/src/patient/pages/interactivePatient/index.scss b/src/patient/pages/interactivePatient/index.scss index 4f7df34..cf89770 100644 --- a/src/patient/pages/interactivePatient/index.scss +++ b/src/patient/pages/interactivePatient/index.scss @@ -36,19 +36,16 @@ page { color: rgba(173, 172, 178, 1); display: flex; gap: 8rpx; - align-items: start; + align-items: center; .tag { - margin-top: 7rpx; - padding: 0 10rpx; - flex-shrink: 0; - height: 28rpx; - font-size: 22rpx; - color: #fff; - line-height: 1; - text-align: center; + margin-left: 10rpx; + display: inline-block; + font-size: 24rpx; line-height: 28rpx; + color: rgba(255, 255, 255, 1); + padding: 2rpx 8rpx; background: linear-gradient(90deg, #ffd650 0%, #f8a61a 100%); - border-radius: 4rpx; + border-radius: 8rpx 8rpx 8rpx 8rpx; } } } @@ -449,7 +446,7 @@ page { .page-footer { position: relative; flex-shrink: 0; - padding: 18rpx 30rpx calc(env(safe-area-inset-bottom) + 30rpx); + padding: 18rpx 30rpx 30rpx; border-radius: 24rpx 24rpx 0 0; background-color: #fff; transition: all 0.3s; @@ -467,7 +464,7 @@ page { background-color: #fff; } &.expend { - height: 50vh; + height: 45vh; } .line { margin: 0 auto; diff --git a/src/patient/pages/live/index.scss b/src/patient/pages/live/index.scss index 11d6462..c6c331a 100644 --- a/src/patient/pages/live/index.scss +++ b/src/patient/pages/live/index.scss @@ -131,7 +131,7 @@ page { text-overflow: ellipsis; overflow: hidden; .line { - margin: 0 4rpx; + margin: 0 8rpx; vertical-align: baseline; display: inline-block; width: 1px; diff --git a/src/patient/pages/liveDetail/index.scss b/src/patient/pages/liveDetail/index.scss index 7ea524e..444682a 100644 --- a/src/patient/pages/liveDetail/index.scss +++ b/src/patient/pages/liveDetail/index.scss @@ -7,10 +7,10 @@ height: 334rpx; border-radius: 24rpx; border: 2rpx solid #ffffff; - box-shadow: 0 10rpx 10rpx #ccc; + box-shadow: 0 10rpx 16rpx #dcdcdc; } .page-container { - padding: 18rpx 30rpx 160rpx; + padding: 30rpx 40rpx 160rpx; .title { font-size: 40rpx; color: #333333; @@ -64,10 +64,10 @@ .screen { position: relative; margin-top: 30rpx; - padding: 32rpx 32rpx 0; + padding: 16rpx 32rpx 16rpx; background: rgba(246, 248, 249, 1); - border-radius: 24rpx; box-sizing: border-box; + border-radius: 24rpx; .screen-list { max-height: 268rpx; .s-item { @@ -93,14 +93,27 @@ } } } + &::before { + position: absolute; + top: 0; + left: 0; + content: ''; + width: 100%; + height: 84rpx; + border-radius: 24rpx; + background: linear-gradient(to top, rgba(246, 248, 249, 0) 0%, rgba(246, 248, 249, 0.68) 36%, #f6f8f9 100%); + z-index: 1; + } &::after { position: absolute; bottom: 0; left: 0; content: ''; width: 100%; - height: 32rpx; - background: linear-gradient(180deg, rgba(251, 252, 252, 0.49) 0%, #fcfdfd 100%); + height: 84rpx; + border-radius: 24rpx; + background: linear-gradient(to bottom, rgba(246, 248, 249, 0) 0%, rgba(246, 248, 249, 0.68) 36%, #f6f8f9 100%); + z-index: 1; } } .content { @@ -137,6 +150,10 @@ color: #484848; background: #e7e7e7; } + &.active1{ + color: #B982FF; + background: #F2E8FF; + } } } .video { @@ -156,6 +173,7 @@ .fixed-share { position: fixed; + z-index: 2; right: 14rpx; bottom: 264rpx; width: 84rpx; @@ -168,11 +186,11 @@ background-color: transparent !important; } .p-share { - width: 622rpx; + width: 705rpx; .photo { display: block; width: 100%; - height: 964rpx; + height: 1111rpx; border-radius: 24rpx; } .tip { @@ -182,4 +200,3 @@ text-align: center; } } - diff --git a/src/patient/pages/liveDetail/index.wxml b/src/patient/pages/liveDetail/index.wxml index 18a08d4..c5ef372 100644 --- a/src/patient/pages/liveDetail/index.wxml +++ b/src/patient/pages/liveDetail/index.wxml @@ -1,5 +1,5 @@ - + {{detail.BeginTime}} - - - {{detail.ActivityBasicNum * 1 + detail.OpenNum * 1}}次 - - {{detail.ShareNum}}次 + {{detail.ShareNum}} + + + + {{detail.ActivityBasicNum * 1 + detail.OpenNum * 1}} @@ -69,8 +69,9 @@ 审核中 - 参会 - 已报名,查看活动码 + 点此参加 + + 已报名,查看活动码 - 点击下载到手机 + 长按图片保存或分享 diff --git a/src/patient/pages/liveResult/index.wxml b/src/patient/pages/liveResult/index.wxml index ed13453..c6ed294 100644 --- a/src/patient/pages/liveResult/index.wxml +++ b/src/patient/pages/liveResult/index.wxml @@ -1,5 +1,5 @@ - + diff --git a/src/patient/pages/login/index.scss b/src/patient/pages/login/index.scss index 3c9c32e..ced6b6d 100644 --- a/src/patient/pages/login/index.scss +++ b/src/patient/pages/login/index.scss @@ -41,7 +41,7 @@ pgae { text-align: center; font-size: 32rpx; color: rgba(255, 255, 255, 1); - background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 30%, #b982ff 100%); + background: linear-gradient( 197deg, #FFBCF9 0%, #B982FF 100%); border-radius: 100rpx; &::after { border: none; diff --git a/src/patient/pages/myLive/index.wxml b/src/patient/pages/myLive/index.wxml index bd85d5d..661995e 100644 --- a/src/patient/pages/myLive/index.wxml +++ b/src/patient/pages/myLive/index.wxml @@ -1,5 +1,5 @@ - + { wx.ajax({ method: 'GET', @@ -301,6 +301,45 @@ Page({ }) this.getList() }, + handleToggleSave(e) { + const { index } = e.currentTarget.dataset + const { Id, IsCollect } = this.data.list[index] + if (IsCollect == 1) { + wx.ajax({ + method: 'POST', + url: '?r=zd/pic-text/cancel-collection', + data: { + ContentId: Id, + }, + loading: true, + }).then(() => { + wx.showToast({ + title: '取消收藏', + icon: 'none', + }) + this.setData({ + [`list[${index}].IsCollect`]: 0, + }) + }) + } else { + wx.ajax({ + method: 'POST', + url: '?r=zd/pic-text/collection', + data: { + ContentId: Id, + }, + loading: true, + }).then(() => { + wx.showToast({ + title: '收藏成功', + icon: 'none', + }) + this.setData({ + [`list[${index}].IsCollect`]: 1, + }) + }) + } + }, handleBack() { wx.navigateBack({ fail() { diff --git a/src/patient/pages/mySave/index.wxml b/src/patient/pages/mySave/index.wxml index a5aa6ec..c992a7d 100644 --- a/src/patient/pages/mySave/index.wxml +++ b/src/patient/pages/mySave/index.wxml @@ -1,5 +1,5 @@ - + {{item.Title}} {{item.UpdatedAt}} + + + + {{~~item.CollectionPeopleNum}} + + - + {{~~item.OpenNum + ~~item.BasicNum}} @@ -33,5 +39,5 @@ - + diff --git a/src/patient/pages/personalInformation/index.scss b/src/patient/pages/personalInformation/index.scss index dc15b08..3ca16fc 100644 --- a/src/patient/pages/personalInformation/index.scss +++ b/src/patient/pages/personalInformation/index.scss @@ -60,7 +60,7 @@ &.active { color: rgba(185, 130, 255, 1); border-color: rgba(185, 130, 255, 1); - background-color: transparent; + background-color: #FAF6FF; } } } diff --git a/src/patient/pages/repository/index.scss b/src/patient/pages/repository/index.scss index 505b8e0..e875fe2 100644 --- a/src/patient/pages/repository/index.scss +++ b/src/patient/pages/repository/index.scss @@ -19,6 +19,7 @@ page { z-index: 20; padding-bottom: 10rpx; .tags { + position: relative; overflow-y: hidden; overflow-x: auto; padding-bottom: 8rpx; @@ -30,17 +31,18 @@ page { display: flex; flex-wrap: nowrap; .tag { - padding: 8rpx 24rpx; margin-right: 16rpx; flex-shrink: 0; - font-size: 24rpx; + font-size: 28rpx; color: rgba(33, 29, 46, 1); - line-height: 34rpx; - border-radius: 8rpx; background-color: rgba(255, 255, 255, 1); + border-radius: 8rpx; + padding: 8rpx 24rpx; + line-height: 1.2; &.active { + position: relative; color: #fff; - background-color: var(--name); + background-color: rgba(185, 130, 255, 1); } } } diff --git a/src/patient/pages/repositoryDetail/index.json b/src/patient/pages/repositoryDetail/index.json index 3489731..354dd68 100644 --- a/src/patient/pages/repositoryDetail/index.json +++ b/src/patient/pages/repositoryDetail/index.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "资料详情页", + "navigationBarTitleText": "详情页", "navigationStyle": "default", "usingComponents": { "mp-html": "mp-html", diff --git a/src/patient/pages/repositoryDetail/index.scss b/src/patient/pages/repositoryDetail/index.scss index dc3d3e2..d026262 100644 --- a/src/patient/pages/repositoryDetail/index.scss +++ b/src/patient/pages/repositoryDetail/index.scss @@ -202,8 +202,8 @@ display: flex; align-items: center; justify-content: center; - font-size: 30rpx; - color: rgba(33, 29, 46, 1); + font-size: 32rpx; + color: #211D2E; margin: 0; background: transparent; &::after { @@ -212,15 +212,15 @@ } .icon { margin-right: 6rpx; - width: 44rpx; - height: 44rpx; + width: 56rpx; + height: 56rpx; } .icon-active { @extend .icon; display: none; } &.active { - color: rgba(33, 29, 46, 1); + color: #B982FF; .icon { display: none; } diff --git a/src/patient/pages/repositoryDetail/index.wxml b/src/patient/pages/repositoryDetail/index.wxml index 8eb50e0..b0ac708 100644 --- a/src/patient/pages/repositoryDetail/index.wxml +++ b/src/patient/pages/repositoryDetail/index.wxml @@ -4,52 +4,11 @@ {{detail.Title}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -62,7 +21,7 @@ {{detail.CollectionPeopleNum}} -