diff --git a/project.config.json b/project.config.json index 5f59496..2c995fd 100644 --- a/project.config.json +++ b/project.config.json @@ -66,7 +66,7 @@ ], "include": [] }, - "appid": "wx96104303877e3fd9", + "appid": "wxa4ece062e60e93a5", "scripts": { "beforeCompile": "pnpm run beforeCompile", "beforePreview": "pnpm run beforeCompile", diff --git a/src/app.ts b/src/app.ts index 9dbaf83..7a4d321 100644 --- a/src/app.ts +++ b/src/app.ts @@ -25,15 +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 - url: 'https://m.gene.hbsaas.com', - upFileUrl: 'https://m.gene.hbsaas.com/', - imageUrl: 'https://m.gene.hbsaas.com/GeneB/', + // appid:wx96104303877e3fd9 老的正式环境,已弃用 + // appid:wxfc95e2961d481f58 + // 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/doctor/pages/patientDetail/index.scss b/src/doctor/pages/patientDetail/index.scss index 6778d6d..271d4a0 100644 --- a/src/doctor/pages/patientDetail/index.scss +++ b/src/doctor/pages/patientDetail/index.scss @@ -236,8 +236,46 @@ page { align-items: center; justify-content: space-between; .status { - width: 154rpx; + width: 144rpx; height: 40rpx; + font-size: 26rpx; + box-sizing: border-box; + display: flex; + align-items: center; + .icon { + position: relative; + z-index: 1; + width: 40rpx; + height: 40rpx; + } + .content { + margin-left: -24rpx; + padding-right: 20rpx; + height: 32rpx; + border-radius: 50rpx; + line-height: 32rpx; + flex: 1; + text-align: right; + border: 1px solid #a1a4ac; + } + &.status1 { + color: #0ed1a7; + .content { + border-color: #0ed1a7; + } + } + &.status2 { + color: #1c6bff; + .content { + border-color: #1c6bff; + } + } + &.status3 { + color: #a1a4ac; + .content { + border-color: #a1a4ac; + } + } } .detail { font-size: 28rpx; @@ -281,7 +319,6 @@ page { } .m-body { .status { - color: rgba(14, 209, 167, 1); .icon { opacity: 1; } @@ -310,9 +347,6 @@ page { } } .m-body { - .status { - color: rgba(34, 34, 34, 1); - } .detail { color: rgba(28, 107, 255, 1); } diff --git a/src/doctor/pages/patientDetail/index.wxml b/src/doctor/pages/patientDetail/index.wxml index 0fbe229..9207596 100644 --- a/src/doctor/pages/patientDetail/index.wxml +++ b/src/doctor/pages/patientDetail/index.wxml @@ -92,21 +92,18 @@ - - - + + + 待启动 + + + + 进行中 + + + + 已完成 + 查看详情 @@ -139,21 +136,18 @@ - - - + + + 待启动 + + + + 进行中 + + + + 已完成 + 查看详情 @@ -175,24 +169,23 @@ 注射日 还未确定注射日 -
{{patientArchiveInfo.injectionDate}}
+ + {{patientArchiveInfo.injectionDate}} + - - - + + + 待启动 + + + + 进行中 + + + + 已完成 + 查看详情 @@ -213,21 +206,18 @@ 随访计划 - - - + + + 待启动 + + + + 进行中 + + + + 已完成 + 查看详情 diff --git a/src/images/icon121.png b/src/images/icon121.png new file mode 100644 index 0000000..18a0ff0 Binary files /dev/null and b/src/images/icon121.png differ diff --git a/src/images/icon122.png b/src/images/icon122.png new file mode 100644 index 0000000..de29b7c Binary files /dev/null and b/src/images/icon122.png differ diff --git a/src/images/icon123.png b/src/images/icon123.png new file mode 100644 index 0000000..410538f Binary files /dev/null and b/src/images/icon123.png differ diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index 6740ece..a759a73 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -33,17 +33,11 @@ src="{{imageUrl}}index-apply-label.png?t={{Timestamp}}" > - + 切换身份 - + 我已开启基因治疗 diff --git a/src/patient/pages/askPatient/index.scss b/src/patient/pages/askPatient/index.scss index 42cb540..c855cb6 100644 --- a/src/patient/pages/askPatient/index.scss +++ b/src/patient/pages/askPatient/index.scss @@ -106,7 +106,7 @@ page { line-height: 48rxp; padding: 20rpx 32rpx; background-color: #fff; - border-radius: 84rpx; + border-radius: 24rpx; } } .doctor { diff --git a/src/patient/pages/casesAdd/index.scss b/src/patient/pages/casesAdd/index.scss index d64e3d2..66e4639 100644 --- a/src/patient/pages/casesAdd/index.scss +++ b/src/patient/pages/casesAdd/index.scss @@ -197,7 +197,6 @@ page { border-radius: 24rpx 24rpx 24rpx 24rpx; .row { display: flex; - align-items: center; border-bottom: 1px solid rgba(247, 247, 250, 1); flex-wrap: wrap; line-height: 1.4; @@ -415,6 +414,7 @@ page { } } .footer { + margin-top: 20rpx; flex-shrink: 0; display: flex; align-items: center;