diff --git a/README.md b/README.md index 491e20f..03c5787 100644 --- a/README.md +++ b/README.md @@ -29,3 +29,5 @@ wx.showModal({ 审核账号 18910233000 1111 + + diff --git a/src/components/toast/index.scss b/src/components/toast/index.scss index bfc34fd..51d2ee6 100644 --- a/src/components/toast/index.scss +++ b/src/components/toast/index.scss @@ -2339,7 +2339,7 @@ .container { margin-top: 76rpx; font-size: 40rpx; - color: #211D2E; + color: #211d2e; text-align: center; line-height: 68rpx; .line { @@ -2348,7 +2348,7 @@ justify-content: center; } .high { - color: #B982FF; + color: #b982ff; font-weight: bold; } } @@ -2585,3 +2585,49 @@ } } } + +.popup-drug-guide { + .popup-container { + .badge { + position: relative; + z-index: 1; + display: block; + margin: 0 auto; + width: 302rpx; + height: 316rpx; + } + .container { + margin-top: -168rpx; + padding: 148rpx 0 0; + width: 630rpx; + height: 512rpx; + box-sizing: border-box; + .title { + font-size: 36rpx; + color: #211d2e; + text-align: center; + line-height: 52rpx; + font-weight: bold; + } + .content { + margin-top: 30rpx; + font-size: 32rpx; + color: #adacb2; + text-align: center; + } + .btn { + margin: 38rpx auto 0; + width: 364rpx; + height: 84rpx; + font-size: 36rpx; + color: #FFFFFF; + display: flex; + align-items: center; + justify-content: center; + line-height: 1; + background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); + border-radius: 98rpx 98rpx 98rpx 98rpx; + } + } + } +} diff --git a/src/components/toast/index.wxml b/src/components/toast/index.wxml index ae81f3e..2115ce9 100644 --- a/src/components/toast/index.wxml +++ b/src/components/toast/index.wxml @@ -776,4 +776,18 @@ + + + + + + 为更好地为您提供健康管理服务 + + 需您补充完善个人信息 + + 信息仅用于您的专属健康档案 + 去完善 + + + diff --git a/src/images/bg24.png b/src/images/bg24.png new file mode 100644 index 0000000..fa751f1 Binary files /dev/null and b/src/images/bg24.png differ diff --git a/src/images/bg31.png b/src/images/bg31.png new file mode 100644 index 0000000..a163794 Binary files /dev/null and b/src/images/bg31.png differ diff --git a/src/images/icon80.png b/src/images/icon80.png new file mode 100644 index 0000000..5d6ca68 Binary files /dev/null and b/src/images/icon80.png differ diff --git a/src/patient/pages/index/index.ts b/src/patient/pages/index/index.ts index c96d350..5cddf25 100644 --- a/src/patient/pages/index/index.ts +++ b/src/patient/pages/index/index.ts @@ -38,6 +38,7 @@ Page({ // toastType:"dedicatedDoctor", // toastType: 'referral-toast', // toastType: 'public-toast', + // toastType: 'drug-guide', toastShow: false, toastType: '', diff --git a/src/patient/pages/live/index.ts b/src/patient/pages/live/index.ts index 328b146..a774d49 100644 --- a/src/patient/pages/live/index.ts +++ b/src/patient/pages/live/index.ts @@ -230,9 +230,6 @@ Page({ handleDetail(e) { app.mpBehavior({ PageName: 'BTN_PatientLiveList' }) const { id } = e.currentTarget.dataset - if (this.data.active == 0) { - } else if (this.data.active == 1) { - } wx.navigateTo({ url: `/patient/pages/liveDetail/index?id=${id}`, }) @@ -246,7 +243,7 @@ Page({ onShareAppMessage() { return { title: '周三大咖说', - path: 'pages/live/index', + path: '/patient/pages/live/index', } }, }) diff --git a/src/patient/pages/liveDetail/index.scss b/src/patient/pages/liveDetail/index.scss index a6b9cfc..b1dc07e 100644 --- a/src/patient/pages/liveDetail/index.scss +++ b/src/patient/pages/liveDetail/index.scss @@ -124,6 +124,57 @@ height: 230rpx; } } + .lightspot { + margin-top: 32rpx; + .l-title { + font-size: 36rpx; + color: #333333; + font-weight: bold; + } + .l-list { + .l-item { + padding: 16rpx 0; + display: flex; + border-bottom: 1px dashed rgba(159, 168, 172, 0.1); + &:last-of-type { + border: none; + } + .photo { + flex-shrink: 0; + width: 290rpx; + height: 164rpx; + border-radius: 10rpx; + } + .wrap { + flex: 1; + padding-left: 24rpx; + display: flex; + flex-direction: column; + justify-content: space-between; + .w-title { + font-size: 32rpx; + color: #211d2e; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + } + .time { + margin-top: 20rpx; + font-size: 32rpx; + color: #adacb2; + } + } + } + } + } + .public { + margin-top: 32rpx; + display: block; + height: 270rpx; + border-radius: 24rpx; + } .content { margin-top: 24rpx; .c-title { diff --git a/src/patient/pages/liveDetail/index.ts b/src/patient/pages/liveDetail/index.ts index c2799ea..08f44c4 100644 --- a/src/patient/pages/liveDetail/index.ts +++ b/src/patient/pages/liveDetail/index.ts @@ -12,6 +12,8 @@ Page({ params: {}, play: false, + currentVideoSrc: '', + popupShow: false, popupType: 'popup6', // 登录失败弹窗 popupParams: { @@ -109,11 +111,15 @@ Page({ }), BeginTime: dayjs(res.BeginTime).format('YYYY-MM-DD HH:mm'), }, + currentVideoSrc: res.ReplayVideoUrl, }) }) }, handleReplay() { app.mpBehavior({ PageName: 'BTN_PatientLiveReview' }) + this.setData({ + currentVideoSrc: this.data.detail.ReplayVideoUrl, + }) this.videoContext.requestFullScreen({}) this.videoContext.seek(0) this.videoContext.play() @@ -327,6 +333,17 @@ Page({ url: `/pages/webview/index?url=${encodeURIComponent('https://shop.show.hbsaas.com/statics/#/?nId=bz56')}`, }) }, + hadnleMessage() { + wx.requestSubscribeMessage({ + tmplIds: ['IMF4HFzZaKG13H3yjFyna23g0ZuIHcVND6dUGqhr8IA'], + success(res) { + console.log(res) + }, + fail(err) { + console.log(err) + }, + }) + }, onShareAppMessage() { this.saveShare() return { diff --git a/src/patient/pages/liveDetail/index.wxml b/src/patient/pages/liveDetail/index.wxml index ce93235..74bb2aa 100644 --- a/src/patient/pages/liveDetail/index.wxml +++ b/src/patient/pages/liveDetail/index.wxml @@ -6,6 +6,7 @@ class="page" style="background: url('{{imageUrl}}bg10.png?t={{Timestamp}}') no-repeat top center/100% 610rpx;padding-top:{{pageTop+22}}px;" > + {{detail.Name}} @@ -58,6 +59,19 @@ + + 直播亮点 + + + + + 视频标题显示视频标题显示 + 02:12 + + + + + 详情介绍 @@ -114,7 +128,7 @@ show-progress enable-play-gesture bindfullscreenchange="handleFullscreenExit" - src="{{detail.ReplayVideoUrl}}" + src="{{currentVideoSrc}}" bindplay="handleVideoPlay" bindpause="handleVideoPause" >