diff --git a/src/app.ts b/src/app.ts index aada87e..bd21151 100644 --- a/src/app.ts +++ b/src/app.ts @@ -56,7 +56,6 @@ App({ onShow(options) { if (options.query.scene) { this.globalData.scene = parseScene(options.query.scene) as { workerId: string } - console.log(this.globalData.scene) } this.startLogin() }, diff --git a/src/components/popup/index.ts b/src/components/popup/index.ts index b4ee759..5b03073 100644 --- a/src/components/popup/index.ts +++ b/src/components/popup/index.ts @@ -42,5 +42,10 @@ Component({ url, }) }, + handlePopup1Check1() { + if (this.data.popup1Check1) { + app.mpBehavior({ PageName: 'BTN_PATIENTPRIVACY' }) + } + }, }, }) diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml index 530bc98..be87ddf 100644 --- a/src/components/popup/index.wxml +++ b/src/components/popup/index.wxml @@ -15,7 +15,7 @@ ,请您仔细阅读。一旦您开始使用,即表示您已充分理解并同意协议内容。 - + 我特此同意 《个人信息及隐私政策》 diff --git a/src/doc/pages/doc1/index.json b/src/doc/pages/doc1/index.json index e77ef99..2be56ec 100644 --- a/src/doc/pages/doc1/index.json +++ b/src/doc/pages/doc1/index.json @@ -1,4 +1,5 @@ { + "navigationBarTitleText": "个人信息及隐私政策", "usingComponents": { "mp-html": "mp-html" } diff --git a/src/images/bg6.png b/src/images/bg6.png new file mode 100644 index 0000000..8f76d58 Binary files /dev/null and b/src/images/bg6.png differ diff --git a/src/images/icon22.png b/src/images/icon22.png new file mode 100644 index 0000000..a4ac5fa Binary files /dev/null and b/src/images/icon22.png differ diff --git a/src/pages/applyFrom/index.wxml b/src/pages/applyFrom/index.wxml index 3340fd2..fabe2fe 100644 --- a/src/pages/applyFrom/index.wxml +++ b/src/pages/applyFrom/index.wxml @@ -17,7 +17,7 @@ - 您的姓名 + {{Relation == 1 ? '您的' : '患者'}}姓名 - 您的出生年月 + {{Relation == 1 ? '您的' : '患者'}}出生年月 diff --git a/src/pages/applyFromResult/index.wxml b/src/pages/applyFromResult/index.wxml index 98e268c..c2e24bd 100644 --- a/src/pages/applyFromResult/index.wxml +++ b/src/pages/applyFromResult/index.wxml @@ -1,7 +1,7 @@ - + 您已成功提交筛查申请 diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss index ddd6ab4..2526605 100644 --- a/src/pages/index/index.scss +++ b/src/pages/index/index.scss @@ -79,6 +79,7 @@ display: none; } .module-item { + position: relative; border-radius: 24rpx; background: #ffffff; position: relative; @@ -103,6 +104,14 @@ background-color: #fff; border-radius: 0 0 24rpx 24rpx; } + .play { + position: absolute; + top: 84rpx; + left: 50%; + transform: translateX(-50%); + width: 56rpx; + height: 56rpx; + } } } } diff --git a/src/pages/index/index.ts b/src/pages/index/index.ts index d6b3c02..97e4cbc 100644 --- a/src/pages/index/index.ts +++ b/src/pages/index/index.ts @@ -24,6 +24,9 @@ Page({ userInfo, popupShow: !userInfo.guestPrivacyAgree, }) + if (!userInfo.guestPrivacyAgree) { + app.mpBehavior({ PageName: 'PG_PATIENTLOGIN' }) + } }) this.getBanner() this.getKnowledgeList() @@ -119,6 +122,7 @@ Page({ handlePopupOk() { const { popupType } = this.data if (popupType === 'argument') { + app.mpBehavior({ PageName: 'BTN_PATIENTLOG' }) wx.ajax({ method: 'POST', url: '?r=wtx/user/agree-guest-privacy', diff --git a/src/pages/index/index.wxml b/src/pages/index/index.wxml index baac476..d471113 100644 --- a/src/pages/index/index.wxml +++ b/src/pages/index/index.wxml @@ -44,6 +44,7 @@ data-index="{{index}}" > + {{item.Title}} @@ -57,13 +58,7 @@ - + {{item.Question}} diff --git a/src/pages/knowledge/index.scss b/src/pages/knowledge/index.scss index f91aafc..363b677 100644 --- a/src/pages/knowledge/index.scss +++ b/src/pages/knowledge/index.scss @@ -12,6 +12,7 @@ page { display: flex; background-color: #fff; .photo { + position: relative; flex-shrink: 0; width: 208rpx; height: 156rpx; @@ -20,6 +21,14 @@ page { height: 100%; border-radius: 12rpx; } + .play { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 56rpx; + height: 56rpx; + } } .wrap { flex: 1; diff --git a/src/pages/knowledge/index.wxml b/src/pages/knowledge/index.wxml index 72d3eb3..f7f6004 100644 --- a/src/pages/knowledge/index.wxml +++ b/src/pages/knowledge/index.wxml @@ -8,6 +8,7 @@ + {{item.Title}} diff --git a/src/patient/pages/home/index.wxml b/src/patient/pages/home/index.wxml index 7922b3a..0f622cb 100644 --- a/src/patient/pages/home/index.wxml +++ b/src/patient/pages/home/index.wxml @@ -1,7 +1,10 @@ - +