diff --git a/project.config.json b/project.config.json index 2c995fd..d105a55 100644 --- a/project.config.json +++ b/project.config.json @@ -66,7 +66,7 @@ ], "include": [] }, - "appid": "wxa4ece062e60e93a5", + "appid": "wxfc95e2961d481f58", "scripts": { "beforeCompile": "pnpm run beforeCompile", "beforePreview": "pnpm run beforeCompile", diff --git a/src/app.ts b/src/app.ts index 7a4d321..5d98d7d 100644 --- a/src/app.ts +++ b/src/app.ts @@ -25,16 +25,16 @@ App({ globalData: { // dev // appid:wxa4ece062e60e93a5 - url: 'https://m.wtx.hbraas.com', - upFileUrl: 'https://m.wtx.hbraas.com/', - imageUrl: 'https://m.wtx.hbraas.com/GeneB/', + // url: 'https://m.wtx.hbraas.com', + // upFileUrl: 'https://m.wtx.hbraas.com/', + // imageUrl: 'https://m.wtx.hbraas.com/GeneB/', // pro // appid:wx96104303877e3fd9 老的正式环境,已弃用 // appid:wxfc95e2961d481f58 - // url: 'https://m.hbgene.hbsaas.com', - // upFileUrl: 'https://m.hbgene.hbsaas.com/', - // imageUrl: 'https://m.hbgene.hbsaas.com/GeneB/', + url: 'https://m.hbgene.hbsaas.com', + upFileUrl: 'https://m.hbgene.hbsaas.com/', + imageUrl: 'https://m.hbgene.hbsaas.com/GeneB/', Timestamp: new Date().getTime(), diff --git a/src/components/popup/index.scss b/src/components/popup/index.scss index caf8149..7363368 100644 --- a/src/components/popup/index.scss +++ b/src/components/popup/index.scss @@ -1217,6 +1217,40 @@ } } +.popup20 { + .badge { + position: relative; + z-index: 1; + display: block; + margin: 0 auto; + width: 220rpx; + height: 278rpx; + } + .container { + margin-top: -150rpx; + padding: 166rpx 60rpx 48rpx; + background: linear-gradient(180deg, #ffe8e4 0%, #ffffff 56.28%, #ffffff 100%); + border-radius: 48rpx; + .title { + text-align: center; + font-size: 32rpx; + color: #010105; + } + .submit { + margin: 32rpx auto 0; + width: 440rpx; + height: 88rpx; + font-size: 32rpx; + color: #ffffff; + display: flex; + align-items: center; + justify-content: center; + background: linear-gradient(184deg, #f23a2f 0%, #fc684f 100%); + border-radius: 84rpx 84rpx 84rpx 84rpx; + } + } +} + .close { margin: 32rpx auto 0; display: block; diff --git a/src/components/popup/index.wxml b/src/components/popup/index.wxml index ba8338a..62210c1 100644 --- a/src/components/popup/index.wxml +++ b/src/components/popup/index.wxml @@ -380,6 +380,15 @@ + + + + + 请您扫描医生专属邀约码加入 + + 我知道了 + + + @@ -100,6 +102,10 @@ + + + 常见的问题正在更新中哦~ + @@ -127,7 +133,7 @@ > 发送消息 - + - 发送 + + + 常见的回答正在更新中哦~ + + 发送 diff --git a/src/images/icon124.png b/src/images/icon124.png new file mode 100644 index 0000000..e71b8e7 Binary files /dev/null and b/src/images/icon124.png differ diff --git a/src/images/icon125.png b/src/images/icon125.png new file mode 100644 index 0000000..daab910 Binary files /dev/null and b/src/images/icon125.png differ diff --git a/src/images/icon126.png b/src/images/icon126.png new file mode 100644 index 0000000..acec133 Binary files /dev/null and b/src/images/icon126.png differ diff --git a/src/pages/ask/index.scss b/src/pages/ask/index.scss index b98d201..6ab2426 100644 --- a/src/pages/ask/index.scss +++ b/src/pages/ask/index.scss @@ -67,6 +67,21 @@ page { } } } + .module-list-none { + margin-top: 156px; + .icon { + margin: 0 auto; + display: block; + width: 466rpx; + height: 276rpx; + } + .content { + margin: 38rpx 0 0; + text-align: center; + font-size: 32rpx; + color: #ABAEB4; + } + } .date { padding-top: 20rpx; font-size: 28rpx; @@ -550,11 +565,20 @@ page { color: rgba(40, 48, 49, 1); } } - .none { - display: block; - margin: 30rpx auto; - width: 344rpx; - max-height: 302rpx; + .list-none { + margin-top: 26px; + .icon { + margin: 0 auto; + display: block; + width: 310rpx; + height: 184rpx; + } + .content { + margin: 8rpx 0 0; + text-align: center; + font-size: 28rpx; + color: rgba(1, 1, 5, 0.4); + } } } } diff --git a/src/pages/ask/index.ts b/src/pages/ask/index.ts index 546ab3c..0824368 100644 --- a/src/pages/ask/index.ts +++ b/src/pages/ask/index.ts @@ -31,6 +31,7 @@ Page({ questionActiveList: [] as any[], headerQuestionList: [] as any, + isRequestEnd: false, isLoad: false, isFinish: false, messageList: [] as IMessageItem[], @@ -72,6 +73,7 @@ Page({ }).then((res) => { this.setData({ headerQuestionList: res.list, + isRequestEnd: true, }) }) }, diff --git a/src/pages/ask/index.wxml b/src/pages/ask/index.wxml index 0c9f3d7..8cdf8be 100644 --- a/src/pages/ask/index.wxml +++ b/src/pages/ask/index.wxml @@ -82,6 +82,10 @@ + + + 常见的问题正在更新中哦~ + @@ -114,7 +118,10 @@ {{item.Question}} - + + + 常见的问题正在更新中哦~ + diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss index 43330f2..3106cbd 100644 --- a/src/pages/index/index.scss +++ b/src/pages/index/index.scss @@ -31,7 +31,7 @@ z-index: 1; margin-top: -80rpx; padding: 42rpx 40rpx; - background: linear-gradient(346deg, #f7f7fa 0%, #ffe5dc 100%); + background: linear-gradient(14deg, #f7f7fa 0%,#f7f7fa 40%, #ffe5dc 100%); border-radius: 32rpx 32rpx 0 0; .apply { position: relative; @@ -247,6 +247,21 @@ } } } + .module-list-none { + margin-top: 26px; + .icon { + margin: 0 auto; + display: block; + width: 310rpx; + height: 184rpx; + } + .content { + margin: 8rpx 0 0; + text-align: center; + font-size: 28rpx; + color: rgba(1, 1, 5, 0.4); + } + } } } } diff --git a/src/pages/index/index.wxml b/src/pages/index/index.wxml index dbe3089..5dd18d8 100644 --- a/src/pages/index/index.wxml +++ b/src/pages/index/index.wxml @@ -23,7 +23,7 @@ {{applyWord.ApplyButtonWordOne}} - {{applyWord.ApplyButtonWordTwo}} + {{applyWord.ApplyButtonWordTwo}} - + @@ -77,6 +77,10 @@ + + + 常见的问题正在更新中哦~ + diff --git a/src/pages/my/index.ts b/src/pages/my/index.ts index 33bc444..df737e8 100644 --- a/src/pages/my/index.ts +++ b/src/pages/my/index.ts @@ -3,9 +3,12 @@ const app = getApp() Page({ data: { popupShow: false, - popupType: 'stayTuned', + // popupType: 'stayTuned', + popupType: 'touristsInviteCode', popupParams: {}, + userInfo: {} as any, + showPatient: false, applyWord: { ApplyButtonWordOne: '', @@ -91,6 +94,28 @@ Page({ popupShow: false, }) }, + handlePopupOk() { + this.setData({ + popupShow: false, + }) + }, + handlePatient(e) { + const { url, pname } = e.currentTarget.dataset + const { userInfo } = this.data + if (pname) { + app.mpBehavior({ PageName: pname }) + } + if (userInfo.PatientId <= 0) { + this.setData({ + popupShow: true, + popupType: 'touristsInviteCode', + }) + return + } + wx.navigateTo({ + url, + }) + }, routerTo(e: any) { const { url, pname } = e.currentTarget.dataset if (pname) { diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index a759a73..be53e6e 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -37,7 +37,7 @@ 切换身份 - + 我已开启基因治疗 @@ -56,4 +56,4 @@ - + diff --git a/src/patient/pages/askPatient/index.scss b/src/patient/pages/askPatient/index.scss index c855cb6..4ed9fb1 100644 --- a/src/patient/pages/askPatient/index.scss +++ b/src/patient/pages/askPatient/index.scss @@ -307,6 +307,21 @@ page { } } } + .module-list-none { + margin-top: 156px; + .icon { + margin: 0 auto; + display: block; + width: 466rpx; + height: 276rpx; + } + .content { + margin: 38rpx 0 0; + text-align: center; + font-size: 32rpx; + color: #ABAEB4; + } + } .place { height: 15vh; } @@ -433,11 +448,20 @@ page { color: rgba(40, 48, 49, 1); } } - .none { - display: block; - margin: 30rpx auto; - width: 344rpx; - max-height: 302rpx; + .list-none { + margin-top: 26px; + .icon { + margin: 0 auto; + display: block; + width: 310rpx; + height: 184rpx; + } + .content { + margin: 8rpx 0 0; + text-align: center; + font-size: 28rpx; + color: rgba(1, 1, 5, 0.4); + } } } } diff --git a/src/patient/pages/askPatient/index.ts b/src/patient/pages/askPatient/index.ts index 2d2c9fa..82373a4 100644 --- a/src/patient/pages/askPatient/index.ts +++ b/src/patient/pages/askPatient/index.ts @@ -35,6 +35,7 @@ Page({ questionActiveList: [] as any[], headerQuestionList: [] as any, + isRequestEnd: false, isLoad: false, isFinish: false, messageList: [ @@ -131,6 +132,7 @@ Page({ adlMsgId: res.adlMsgId, isLoad: false, isFinish: nextMsgId === res.nextMsgId, + isRequestEnd: true, }) this.filterCreateTime() if (!nextMsgId) { diff --git a/src/patient/pages/askPatient/index.wxml b/src/patient/pages/askPatient/index.wxml index cd19aa1..112755d 100644 --- a/src/patient/pages/askPatient/index.wxml +++ b/src/patient/pages/askPatient/index.wxml @@ -108,6 +108,10 @@ + + + 常见的问题正在更新中哦~ + @@ -148,7 +152,10 @@ {{item.question}} - + + + 常见的问题正在更新中哦~ +