diff --git a/README.md b/README.md index 9dcb3b2..491e20f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ images svn 地址 svn://39.106.86.127:28386/projects/xd/proj_src/shop/frontend/web/xd svn://39.106.86.127:28386/projects/xd/proj_src/branches/dev_v2.0/shop/frontend/web/xd/ -(/images/)(\S*(?=["|'])) +(/images/)(\S\*(?=["|'])) {{imageUrl}}$2?t={{Timestamp}} ui问题 @@ -24,7 +24,7 @@ showModel颜色统一 wx.showModal({ confirmColor: '#8c75d0', cancelColor: '#141515', -}); +}) ``` 审核账号 diff --git a/project.private.config.json b/project.private.config.json index 269ed1a..ed437cb 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -23,11 +23,18 @@ "miniprogram": { "list": [ { + "name": "patient/pages/liveResult/index", + "pathName": "patient/pages/liveResult/index", + "query": "id=30&rewardScore=undefined", + "scene": null, + "launchMode": "default" + }, + { "name": "医生-患者详情", "pathName": "pages/d_patientDetail/index", "query": "id=21", - "scene": null, - "launchMode": "default" + "launchMode": "default", + "scene": null }, { "name": "患者-qol结果", diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss index 8ac8569..11aeb13 100644 --- a/src/components/popup/index.scss +++ b/src/components/popup/index.scss @@ -126,6 +126,15 @@ } } +.popup6 { + width: 590rpx; + height: 880rpx; + .p-img { + width: 100%; + height: 100%; + } +} + .close { margin: 48rpx auto 0; display: block; diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml index 43e1272..69b3503 100644 --- a/src/components/popup/index.wxml +++ b/src/components/popup/index.wxml @@ -23,7 +23,9 @@ {{params.Name}}医生 {{params.HospitalName}} - {{params.HospitalClassificationName}}{{params.HospitalLevel}} + + {{params.HospitalClassificationName}}{{params.HospitalLevel}} + @@ -52,6 +54,9 @@ 继续 + + + { - app.mpBehavior({ doctor:true, PageName: 'PG_DoctorLogin' }) + app.mpBehavior({ doctor: true, PageName: 'PG_DoctorLogin' }) }) }, getCode() { @@ -73,7 +73,7 @@ Page({ }) }, handleCheck() { - app.mpBehavior({ doctor:true, PageName: 'BTN_DoctorPrivacyAgree' }) + app.mpBehavior({ doctor: true, PageName: 'BTN_DoctorPrivacyAgree' }) this.setData({ check1: !this.data.check1, }) @@ -91,7 +91,7 @@ Page({ }) }, async handleSubmit() { - app.mpBehavior({ doctor:true, PageName: 'BTN_DoctorLogin' }) + app.mpBehavior({ doctor: true, PageName: 'BTN_DoctorLogin' }) await this.handleDocRule() const { mobile, code } = this.data if (!mobile) { @@ -132,11 +132,11 @@ Page({ }) }, handleNoDoc() { - app.mpBehavior({ doctor:true, PageName: 'BTN_DoctorQuickLogin' }) + app.mpBehavior({ doctor: true, PageName: 'BTN_DoctorQuickLogin' }) this.handleDocRule() }, handleWxSubmit(e: WechatMiniprogram.CustomEvent) { - app.mpBehavior({ doctor:true, PageName: 'BTN_DoctorQuickLogin' }) + app.mpBehavior({ doctor: true, PageName: 'BTN_DoctorQuickLogin' }) const { iv, encryptedData } = e.detail if (iv && encryptedData) { wx.ajax({ @@ -191,7 +191,7 @@ Page({ }) }, handleShowPopup() { - app.mpBehavior({ doctor:true, PageName: 'PG_DoctorLoginFail' }) + app.mpBehavior({ doctor: true, PageName: 'PG_DoctorLoginFail' }) this.setData({ popupShow: true, popupType: 'popup4', diff --git a/src/patient/pages/liveDetail/index.json b/src/patient/pages/liveDetail/index.json index 9aeb26d..56166e3 100644 --- a/src/patient/pages/liveDetail/index.json +++ b/src/patient/pages/liveDetail/index.json @@ -7,6 +7,7 @@ "van-icon": "@vant/weapp/icon/index", "customPoster": "/components/customPoster/index", "navbar": "/components/navbar/index", - "van-popup": "@vant/weapp/popup/index" + "van-popup": "@vant/weapp/popup/index", + "popup": "/components/popup/index" } } diff --git a/src/patient/pages/liveDetail/index.scss b/src/patient/pages/liveDetail/index.scss index 444682a..cf15bc1 100644 --- a/src/patient/pages/liveDetail/index.scss +++ b/src/patient/pages/liveDetail/index.scss @@ -116,6 +116,14 @@ z-index: 1; } } + .answer { + margin-top: 32rpx; + .a-img { + display: block; + width: 100%; + height: 230rpx; + } + } .content { margin-top: 24rpx; .c-title { @@ -138,7 +146,31 @@ box-sizing: border-box; background-color: #fff; box-shadow: 0rpx 8rpx 48rpx 0rpx rgba(0, 0, 0, 0.19); + .btn-wrap { + display: flex; + align-items: center; + justify-content: space-between; + gap: 22rpx; + .office { + width: 220rpx; + height: 88rpx; + border: 1px solid #b982ff; + display: flex; + align-items: center; + justify-content: center; + gap: 14rpx; + font-size: 32rpx; + color: #b982ff; + box-sizing: border-box; + border-radius: 100rpx; + .icon { + width: 40rpx; + height: 40rpx; + } + } + } .btn { + flex: 1; height: 88rpx; background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); border-radius: 44rpx; @@ -150,9 +182,9 @@ color: #484848; background: #e7e7e7; } - &.active1{ - color: #B982FF; - background: #F2E8FF; + &.active1 { + color: #b982ff; + background: #f2e8ff; } } } diff --git a/src/patient/pages/liveDetail/index.ts b/src/patient/pages/liveDetail/index.ts index 824c710..c2799ea 100644 --- a/src/patient/pages/liveDetail/index.ts +++ b/src/patient/pages/liveDetail/index.ts @@ -11,6 +11,12 @@ Page({ posterUrl: '', params: {}, play: false, + + popupShow: false, + popupType: 'popup6', // 登录失败弹窗 + popupParams: { + close: true, + } as any, }, videoContext: {} as WechatMiniprogram.VideoContext, onLoad(options) { @@ -302,6 +308,25 @@ Page({ }, }) }, + handleOffice() { + this.setData({ + popupShow: true, + popupType: 'popup6', + popupParams: { + close: true, + }, + }) + }, + handlePopupCancel() { + this.setData({ + popupShow: false, + }) + }, + handleAnswer() { + wx.navigateTo({ + url: `/pages/webview/index?url=${encodeURIComponent('https://shop.show.hbsaas.com/statics/#/?nId=bz56')}`, + }) + }, onShareAppMessage() { this.saveShare() return { diff --git a/src/patient/pages/liveDetail/index.wxml b/src/patient/pages/liveDetail/index.wxml index c5ef372..1e7a9c2 100644 --- a/src/patient/pages/liveDetail/index.wxml +++ b/src/patient/pages/liveDetail/index.wxml @@ -55,6 +55,9 @@ + + + 详情介绍 @@ -71,7 +74,13 @@ 点此参加 - 已报名,查看活动码 + + + + 提醒我 + + 已报名,查看活动码 + 长按图片保存或分享 + + + diff --git a/src/patient/pages/liveResult/index.scss b/src/patient/pages/liveResult/index.scss index 5c46a27..86af2d9 100644 --- a/src/patient/pages/liveResult/index.scss +++ b/src/patient/pages/liveResult/index.scss @@ -2,13 +2,20 @@ page { background: linear-gradient(180deg, #f9f9f9 0%, #f9f9f9 100%); } .page { - min-height: 100vh; + width: 100vw; + overflow-x: hidden; + min-height: 120vh; position: relative; padding-bottom: 100rpx; .bg { + position: absolute; + left: 50%; + top: 0; + transform: translateX(-50%); background: linear-gradient(197deg, #ffbcf9 0%, #b982ff 100%); - height: 776rpx; - border-radius: 0 0 100rpx 100rpx; + width: 120vw; + height: 656rpx; + border-radius: 0 0 140rpx 140rpx; } .page-container { position: absolute; @@ -47,17 +54,44 @@ page { color: #484848; } } + .office { + margin: 24rpx 40rpx 0; + padding: 48rpx 0 32rpx; + background: #ffffff; + border-radius: 24rpx 24rpx 24rpx 24rpx; + .o-title { + font-size: 32rpx; + color: #211d2e; + text-align: center; + } + .code { + margin: 24rpx auto 0; + display: block; + width: 284rpx; + height: 284rpx; + } + .btn { + margin: 24rpx auto 0; + width: 286rpx; + height: 56rpx; + text-align: center; + line-height: 56rpx; + background: #b982ff; + border-radius: 74rpx 74rpx 74rpx 74rpx; + font-size: 32rpx; + color: #ffffff; + } + } .container { position: relative; - margin: 64rpx 40rpx 0; + margin: 12rpx 40rpx 0; width: calc(100% - 80rpx); .c-content { padding: 40rpx; position: relative; top: 20rpx; - left: 20rpx; - width: calc(100% - 40rpx); + left: 0; background: #fff; box-shadow: 0rpx 4rpx 40rpx 0rpx rgba(0, 0, 0, 0.06); border-radius: 24rpx; diff --git a/src/patient/pages/liveResult/index.wxml b/src/patient/pages/liveResult/index.wxml index c6ed294..e132ee3 100644 --- a/src/patient/pages/liveResult/index.wxml +++ b/src/patient/pages/liveResult/index.wxml @@ -1,5 +1,11 @@ - + @@ -8,6 +14,11 @@ 报名成功 欢迎您参与此次活动 + + 关注公众号，活动提醒不错过 + + 长按识别二维码 +