diff --git a/.neoconf.json b/.neoconf.json new file mode 100644 index 0000000..437bfce --- /dev/null +++ b/.neoconf.json @@ -0,0 +1,10 @@ +{ + "emmet_language_server": { + "init_options": { + "preferences": { + "css.intUnit": "rpx", + "css.floatUnitr": "rpx" + } + } + } +} diff --git a/project.private.config.json b/project.private.config.json index 000d268..bb96467 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -23,11 +23,18 @@ "miniprogram": { "list": [ { - "name": "患者-首页", - "pathName": "pages/1/index", + "name": "pages/6/index", + "pathName": "pages/6/index", "query": "", "scene": null, "launchMode": "default" + }, + { + "name": "患者-首页", + "pathName": "pages/1/index", + "query": "", + "launchMode": "default", + "scene": null } ] } diff --git a/src/images/md/10.png b/src/images/md/10.png index ab9b357..22dcc32 100644 Binary files a/src/images/md/10.png and b/src/images/md/10.png differ diff --git a/src/images/md/12.png b/src/images/md/12.png index 6f8d7e9..971ccb6 100644 Binary files a/src/images/md/12.png and b/src/images/md/12.png differ diff --git a/src/images/md/13.png b/src/images/md/13.png index 28883b8..253eafe 100644 Binary files a/src/images/md/13.png and b/src/images/md/13.png differ diff --git a/src/images/md/14.png b/src/images/md/14.png index 0ae9e2d..a5f4b04 100644 Binary files a/src/images/md/14.png and b/src/images/md/14.png differ diff --git a/src/images/md/15.png b/src/images/md/15.png index 4cd21b7..097b666 100644 Binary files a/src/images/md/15.png and b/src/images/md/15.png differ diff --git a/src/images/md/16.png b/src/images/md/16.png index dac61a2..be63391 100644 Binary files a/src/images/md/16.png and b/src/images/md/16.png differ diff --git a/src/images/md/18.png b/src/images/md/18.png index 014c5e6..1e2378f 100644 Binary files a/src/images/md/18.png and b/src/images/md/18.png differ diff --git a/src/images/md/19.png b/src/images/md/19.png index f72a3cf..8440fac 100644 Binary files a/src/images/md/19.png and b/src/images/md/19.png differ diff --git a/src/images/md/2.png b/src/images/md/2.png index d4b07b0..4321610 100644 Binary files a/src/images/md/2.png and b/src/images/md/2.png differ diff --git a/src/images/md/20.png b/src/images/md/20.png index d378d03..a0fd736 100644 Binary files a/src/images/md/20.png and b/src/images/md/20.png differ diff --git a/src/images/md/21.png b/src/images/md/21.png index 172d0a4..5d603fe 100644 Binary files a/src/images/md/21.png and b/src/images/md/21.png differ diff --git a/src/images/md/22.png b/src/images/md/22.png index d61f376..b33c76a 100644 Binary files a/src/images/md/22.png and b/src/images/md/22.png differ diff --git a/src/images/md/23.png b/src/images/md/23.png index 682cc89..13f21a6 100644 Binary files a/src/images/md/23.png and b/src/images/md/23.png differ diff --git a/src/images/md/24.png b/src/images/md/24.png index 4ca1faf..0811570 100644 Binary files a/src/images/md/24.png and b/src/images/md/24.png differ diff --git a/src/images/md/25.png b/src/images/md/25.png index 3715e83..4d77550 100644 Binary files a/src/images/md/25.png and b/src/images/md/25.png differ diff --git a/src/images/md/3.png b/src/images/md/3.png index 456852e..26cf1cd 100644 Binary files a/src/images/md/3.png and b/src/images/md/3.png differ diff --git a/src/images/md/35.png b/src/images/md/35.png new file mode 100644 index 0000000..84c9cda Binary files /dev/null and b/src/images/md/35.png differ diff --git a/src/images/md/4.png b/src/images/md/4.png index 3c53401..fc4e101 100644 Binary files a/src/images/md/4.png and b/src/images/md/4.png differ diff --git a/src/images/md/8.png b/src/images/md/8.png index cd40f3e..656ab08 100644 Binary files a/src/images/md/8.png and b/src/images/md/8.png differ diff --git a/src/images/md/9.png b/src/images/md/9.png index efb5771..c52d5b8 100644 Binary files a/src/images/md/9.png and b/src/images/md/9.png differ diff --git a/src/images/md/popup1.png b/src/images/md/popup1.png new file mode 100644 index 0000000..3a59626 Binary files /dev/null and b/src/images/md/popup1.png differ diff --git a/src/images/md/status0.png b/src/images/md/status0.png new file mode 100644 index 0000000..2037e25 Binary files /dev/null and b/src/images/md/status0.png differ diff --git a/src/images/md/status1.png b/src/images/md/status1.png new file mode 100644 index 0000000..2037e25 Binary files /dev/null and b/src/images/md/status1.png differ diff --git a/src/images/md/status10.png b/src/images/md/status10.png new file mode 100644 index 0000000..fda9efc Binary files /dev/null and b/src/images/md/status10.png differ diff --git a/src/images/md/status2.png b/src/images/md/status2.png new file mode 100644 index 0000000..85a68b7 Binary files /dev/null and b/src/images/md/status2.png differ diff --git a/src/images/md/status3.png b/src/images/md/status3.png new file mode 100644 index 0000000..24fac2f Binary files /dev/null and b/src/images/md/status3.png differ diff --git a/src/images/md/status4.png b/src/images/md/status4.png new file mode 100644 index 0000000..a00c5fc Binary files /dev/null and b/src/images/md/status4.png differ diff --git a/src/images/md/status5.png b/src/images/md/status5.png new file mode 100644 index 0000000..a00c5fc Binary files /dev/null and b/src/images/md/status5.png differ diff --git a/src/images/md/status6.png b/src/images/md/status6.png new file mode 100644 index 0000000..905fc01 Binary files /dev/null and b/src/images/md/status6.png differ diff --git a/src/images/md/status7.png b/src/images/md/status7.png new file mode 100644 index 0000000..51947cc Binary files /dev/null and b/src/images/md/status7.png differ diff --git a/src/images/md/status8.png b/src/images/md/status8.png new file mode 100644 index 0000000..203203b Binary files /dev/null and b/src/images/md/status8.png differ diff --git a/src/images/md/status9.png b/src/images/md/status9.png new file mode 100644 index 0000000..821a1f3 Binary files /dev/null and b/src/images/md/status9.png differ diff --git a/src/pages/12/index.ts b/src/pages/12/index.ts index 4d08b69..9187270 100644 --- a/src/pages/12/index.ts +++ b/src/pages/12/index.ts @@ -5,7 +5,8 @@ Page({ onLoad() {}, handleTap1() { wx.navigateTo({ - url: "/pages/13/index", + // url: "/pages/13/index", + url: "/pages/26/index", }); }, handelTap1() { @@ -13,7 +14,8 @@ Page({ }, handelTap2() { wx.navigateTo({ - url: "/pages/13/index", + // url: "/pages/13/index", + url: "/pages/26/index", }); }, handelTap3() { diff --git a/src/pages/2/index.scss b/src/pages/2/index.scss index afaaaa9..cbd595e 100644 --- a/src/pages/2/index.scss +++ b/src/pages/2/index.scss @@ -1,3 +1,22 @@ -.page{ +.page { width: 100vw; } + +.page-click1 { + position: absolute; + top: 1406rpx; + left: 50vw; + z-index: 1; + width: 50vw; + height: 120rpx; + background-color: transparent; +} + +.float1 { + position: absolute; + top: 0; + left: 0; + z-index: 2; + width: 100vw; + height: 100vh; +} diff --git a/src/pages/2/index.ts b/src/pages/2/index.ts index 5d926b7..2453695 100644 --- a/src/pages/2/index.ts +++ b/src/pages/2/index.ts @@ -1,13 +1,25 @@ const _app = getApp(); Page({ - data: {}, + data: { + float1: false, + }, onLoad() {}, - handleTap1() { + handlePage() { wx.navigateTo({ url: "/pages/3/index", }); }, + handelTap1() { + this.setData({ + float1: true, + }); + }, + handleFloat1() { + this.setData({ + float1: false, + }); + }, }); export {}; diff --git a/src/pages/2/index.wxml b/src/pages/2/index.wxml index 8e1c0ff..bf29d96 100644 --- a/src/pages/2/index.wxml +++ b/src/pages/2/index.wxml @@ -1,2 +1,11 @@ - + + + + diff --git a/src/pages/26/index.scss b/src/pages/26/index.scss index e859566..c585623 100644 --- a/src/pages/26/index.scss +++ b/src/pages/26/index.scss @@ -1,3 +1,45 @@ .page { width: 100vw; + padding-bottom: 180rpx; +} + +.page-click1 { + position: fixed; + bottom: 20rpx; + left: 0; + z-index: 3; + width: 50vw; + height: 224rpx; + background-color: transparent; +} +.page-click2 { + position: fixed; + bottom: 20rpx; + left: 50vw; + z-index: 3; + width: 50vw; + height: 224rpx; + background-color: transparent; +} +.page-click3 { + position: absolute; + top: 320rpx; + left: 0; + z-index: 1; + width: 100vw; + height: 124rpx; + background-color: transparent; +} + +.tabbar { + position: fixed; + bottom: 0; + left: 0; + z-index: 2; + width: 100vw; + padding-bottom: 20rpx; + background-color: #fff; + .tabbar-img { + width: 100%; + } } diff --git a/src/pages/26/index.ts b/src/pages/26/index.ts index ad9a054..4d08b69 100644 --- a/src/pages/26/index.ts +++ b/src/pages/26/index.ts @@ -3,6 +3,24 @@ const _app = getApp(); Page({ data: {}, onLoad() {}, + handleTap1() { + wx.navigateTo({ + url: "/pages/13/index", + }); + }, + handelTap1() { + wx.navigateBack(); + }, + handelTap2() { + wx.navigateTo({ + url: "/pages/13/index", + }); + }, + handelTap3() { + wx.redirectTo({ + url: "/pages/19/index", + }); + }, }); export {}; diff --git a/src/pages/26/index.wxml b/src/pages/26/index.wxml index e69de29..0b9a526 100644 --- a/src/pages/26/index.wxml +++ b/src/pages/26/index.wxml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/pages/6/index.json b/src/pages/6/index.json index a97367d..f286f59 100644 --- a/src/pages/6/index.json +++ b/src/pages/6/index.json @@ -1,3 +1,5 @@ { - "usingComponents": {} + "usingComponents": { + "van-slider": "@vant/weapp/slider/index" + } } diff --git a/src/pages/6/index.scss b/src/pages/6/index.scss index d8a0901..30577b8 100644 --- a/src/pages/6/index.scss +++ b/src/pages/6/index.scss @@ -23,6 +23,117 @@ height: 120rpx; background-color: transparent; } + .status { + position: absolute; + top: 548rpx; + left: 50%; + transform: translateX(-50%); + width: 260rpx; + height: 260rpx; + } + .title { + position: absolute; + top: 826rpx; + left: 0; + width: 100%; + display: flex; + align-items: baseline; + justify-content: center; + font-size: 32rpx; + color: #29282c; + font-weight: bold; + .num { + font-size: 96rpx; + color: #88db93; + font-weight: bold; + } + } + .content { + position: absolute; + top: 936rpx; + left: 0; + width: 100%; + text-align: center; + font-size: 32rpx; + color: #6b7280; + } + .slider { + position: absolute; + top: 1160rpx; + left: 50rpx; + width: calc(100vw - 100rpx); + .slider-button { + width: 72rpx; + height: 72rpx; + border-radius: 50%; + background: linear-gradient(89deg, rgba(171, 198, 125, 1), rgba(205, 179, 105, 1)); + &::after { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + content: ""; + width: 64rpx; + height: 64rpx; + background-color: #fff; + border-radius: 50%; + } + .tip { + position: absolute; + top: -20rpx; + left: 50%; + transform: translate(-50%, -100%); + min-width: 110rpx; + padding: 10rpx 0; + background: #787878; + border-radius: 492rpx 492rpx 492rpx 492rpx; + display: flex; + align-items: baseline; + justify-content: center; + font-size: 26rpx; + color: rgba(255, 255, 255, 0.5); + line-height: 1; + .num { + font-size: 48rpx; + color: #ffffff; + font-weight: bold; + } + &::after { + position: absolute; + bottom: -10rpx; + content: ""; + width: 0; + height: 0; + border-style: solid; + border-width: 12rpx 6rpx 0 6rpx; + border-color: #787878 transparent transparent transparent; + } + } + } + } + } + .swiper-item2 { + position: relative; + height: 100vh; + overflow-y: scroll; + .page-click1 { + position: absolute; + top: 1386rpx; + left: 0; + z-index: 1; + width: 50vw; + height: 120rpx; + background-color: transparent; + } + .page-click2 { + position: absolute; + top: 1386rpx; + left: 50vw; + z-index: 1; + width: 50vw; + height: 120rpx; + background-color: transparent; + } } .page-img { width: 100vw; diff --git a/src/pages/6/index.ts b/src/pages/6/index.ts index dc23015..54e95e9 100644 --- a/src/pages/6/index.ts +++ b/src/pages/6/index.ts @@ -3,6 +3,53 @@ const _app = getApp(); Page({ data: { current: 0, + sliderValue: 0, + slider: { + 0: { + title: "完全不痛", + content: "无痛，舒适，不影响任何活动和睡眠", + }, + 1: { + title: "轻度疼痛", + content: "极轻微疼痛，几乎不觉，对生活无影响", + }, + 2: { + title: "轻度疼痛", + content: "轻微疼痛偶尔出现，不干扰睡眠和日常", + }, + 3: { + title: "轻度疼痛", + content: "轻度持续痛，可忍受，不影响生活", + }, + 4: { + title: "中度疼痛", + content: "疼痛明显，安静时察觉，睡眠略受扰", + }, + 5: { + title: "中度疼痛", + content: "中度痛，分散注意力，睡眠翻身增多", + }, + 6: { + title: "中度疼痛", + content: "中度痛加重，活动受限，睡眠偶醒", + }, + 7: { + title: "重度疼痛", + content: "重度痛，活动困难，睡眠严重受扰", + }, + 8: { + title: "重度疼痛", + content: "剧烈痛，几乎不能动，基本无法入睡", + }, + 9: { + title: "重度疼痛", + content: "极度剧痛，无法活动，毫无睡意", + }, + 10: { + title: "重度疼痛", + content: "最剧烈疼痛，难以忍受，意识可能模糊", + }, + }, }, onLoad() {}, handlePage1() { @@ -34,6 +81,12 @@ Page({ url: "/pages/7/index", }); }, + onChange(e: any) { + const value = Math.floor(e.detail.value); + this.setData({ + sliderValue: value, + }); + }, }); export {}; diff --git a/src/pages/6/index.wxml b/src/pages/6/index.wxml index 158511c..1c9e4e4 100644 --- a/src/pages/6/index.wxml +++ b/src/pages/6/index.wxml @@ -3,15 +3,48 @@ + + + + + + + + + + + + + {{sliderValue}} + 分-{{slider[sliderValue].title}} + + {{slider[sliderValue].content}} + + + + {{sliderValue}} + 分 + + + - + - +