diff --git a/iconfont.less b/iconfont.less index a638b37..d028e8d 100644 --- a/iconfont.less +++ b/iconfont.less @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4945922 */ - src: url('//at.alicdn.com/t/c/font_4945922_cpk575emof.woff2?t=1749563774878') format('woff2'), - url('//at.alicdn.com/t/c/font_4945922_cpk575emof.woff?t=1749563774878') format('woff'), - url('//at.alicdn.com/t/c/font_4945922_cpk575emof.ttf?t=1749563774878') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4945922_srge2kps8c.woff2?t=1749628761058') format('woff2'), + url('//at.alicdn.com/t/c/font_4945922_srge2kps8c.woff?t=1749628761058') format('woff'), + url('//at.alicdn.com/t/c/font_4945922_srge2kps8c.ttf?t=1749628761058') format('truetype'); } .iconfont { @@ -13,6 +13,22 @@ -moz-osx-font-smoothing: grayscale; } +.icon-jiahao1:before { + content: "\e727"; +} + +.icon-jiahao:before { + content: "\e783"; +} + +.icon-dianzan:before { + content: "\e694"; +} + +.icon-bianji:before { + content: "\e67b"; +} + .icon-shanchu1:before { content: "\e67d"; } @@ -20,3 +36,5 @@ .icon-xiangji:before { content: "\e609"; } + + diff --git a/pages/AddTherapeuticRegimen/index.js b/pages/AddTherapeuticRegimen/index.js index e33dd30..4580209 100644 --- a/pages/AddTherapeuticRegimen/index.js +++ b/pages/AddTherapeuticRegimen/index.js @@ -15,8 +15,8 @@ Page({ "name": "", "dose": "", "frequency": "", - "time": "" - }], + "time": "饭前" + }], end_date: '', reminder: { "morning": "08:00", @@ -41,7 +41,8 @@ Page({ label: '每日3次', value: '3' }], - + minute: '', + startMinute: '2025-04-29 00:00:00', dateVisible: false, minuteVisible: false, date: new Date('2021-12-23').getTime(), // 支持时间戳传入 @@ -158,15 +159,27 @@ Page({ mode2 = mode; this.setData({ minuteVisible: true, - timeData2: this.data.reminder[mode] + timeData2: this.data.reminder[mode], + minute: this.data.reminder[mode] }); }, onConfirm(e){ this.setData({ + minuteVisible: false, [`reminder.${mode2}`]: e.detail.value, }); }, - + hidePickerMinute(){ + this.setData({ + minuteVisible: false, + }); + }, + onRadioChange(e){ + const { index } = e.currentTarget.dataset; + this.setData({ + [`detail[${index}].time`]: e.detail.value + }) + }, handleSuccess(e) { console.log(e.detail) const { files } = e.detail; @@ -187,7 +200,12 @@ Page({ console.log(e.detail.file); }, - + deleteItem(e){ + const { index } = e.currentTarget.dataset; + this.setData({ + detail: this.data.detail.filter((item, i) => i !== index) + }) + }, async addData(){ const res = await request('/api/v1/patient/add_therapeutic_regimen','post',{ diff --git a/pages/AddTherapeuticRegimen/index.json b/pages/AddTherapeuticRegimen/index.json index 840d8ab..805b883 100644 --- a/pages/AddTherapeuticRegimen/index.json +++ b/pages/AddTherapeuticRegimen/index.json @@ -13,5 +13,6 @@ "t-picker": "tdesign-miniprogram/picker/picker", "t-picker-item": "tdesign-miniprogram/picker-item/picker-item" }, - "navigationBarTitleText": "用药方案" + "navigationBarTitleText": "用药方案", + "styleIsolation": "apply-shared" } \ No newline at end of file diff --git a/pages/AddTherapeuticRegimen/index.less b/pages/AddTherapeuticRegimen/index.less index c9659aa..d9aa029 100644 --- a/pages/AddTherapeuticRegimen/index.less +++ b/pages/AddTherapeuticRegimen/index.less @@ -90,6 +90,11 @@ .add-btn{ margin-top: 40rpx; } + .add-btn-yp{ + text-align: center; + color: var(--td-brand-color); + font-size: 28rpx; + } .delete-btn{ text-align: right; margin-bottom: 10rpx; @@ -103,5 +108,23 @@ line-height: 130rpx; } } - + .day-time{ + padding: 24rpx; + padding-right: 0; + } + .day-time-item{ + height: 72rpx; + background: rgba(0,91,162,0.1); + border-radius: 12rpx; + border: 2rpx solid rgba(0,91,162,0.2); + line-height: 72rpx; + padding: 0 24rpx; + position: relative; + .iconfont{ + font-size: 36rpx; + position: absolute; + right: 20rpx; + color: var(--td-brand-color); + } + } } \ No newline at end of file diff --git a/pages/AddTherapeuticRegimen/index.wxml b/pages/AddTherapeuticRegimen/index.wxml index fad7ecd..d7e5c4b 100644 --- a/pages/AddTherapeuticRegimen/index.wxml +++ b/pages/AddTherapeuticRegimen/index.wxml @@ -29,7 +29,7 @@ 药品信息 - + @@ -37,40 +37,76 @@ - + + + + + + + {{reminder.morning}} + + + + + + {{reminder.noon}} + + + + + + + {{reminder.evening}} + + + + + + + 饭前/饭后 - - - + + + - - +添加用药 - - - 用药时间提醒 - - 早上 - - - - 中午 - - - - 晚上 - - + 添加用药 + + 保存 - + - + b.value - a.value); + } + return options; + }, + popupProps: { + usingCustomNavbar: true, + }, + + formatter(item, index) { + if (index === 1) { + const label = item.label.slice(0, -1); + return { + value: item.value, + label: calendarMonth[Number(label) - 1], + }; + } + if (index === 2) { + const [dateValue, weekValue] = item.label.split(' '); + const dateSuffixes = { + 1: 'st', + 2: 'nd', + 3: 'rd', + }; + const weekMap = { + 周一: 'Mon.', + 周二: 'Tues.', + 周三: 'Wed.', + 周四: 'Thurs.', + 周五: 'Fri.', + 周六: 'Sat.', + 周日: 'Sun.', + }; + const label = dateValue.slice(0, -1); + + return { + value: item.value, + label: `${label}${dateSuffixes[label] || 'th'} ${weekMap[weekValue]}`, + }; + } + + return { + value: item.value, + label: item.label.slice(0, -1), + }; + }, + + originFiles: [ + { + url: 'https://tdesign.gtimg.com/mobile/demos/example4.png', + name: 'uploaded1.png', + type: 'image', + removeBtn: true, + }, + { + url: 'https://tdesign.gtimg.com/mobile/demos/example6.png', + name: 'uploaded2.png', + type: 'image', + removeBtn: true, + }, + { + url: 'https://tdesign.gtimg.com/mobile/demos/example5.png', + name: 'uploaded3.png', + type: 'image', + removeBtn: true, + }, + ], + gridConfig: { + column: 1, + width: 160, + height: 160, + }, + config: { + count: 1, + }, + + + }, + showPicker(e) { + const { mode } = e.currentTarget.dataset; + this.setData({ + [`${mode}Visible`]: true, + }); + + + + }, + + handleSuccess(e) { + console.log(e.detail) + const { files } = e.detail; + this.setData({ + originFiles: files, + }); + }, + handleRemove(e) { + console.log(e.detail.file); + const { index } = e.detail; + const { originFiles } = this.data; + originFiles.splice(index, 1); + this.setData({ + originFiles, + }); + }, + handleClick(e) { + console.log(e.detail.file); + }, + + + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/followUp copy/index.json b/pages/followUp copy/index.json new file mode 100644 index 0000000..6d9dd9c --- /dev/null +++ b/pages/followUp copy/index.json @@ -0,0 +1,15 @@ +{ + "usingComponents": { + "t-cell": "tdesign-miniprogram/cell/cell", + "t-input": "tdesign-miniprogram/input/input", + "t-date-time-picker": "tdesign-miniprogram/date-time-picker/date-time-picker", + "t-row": "tdesign-miniprogram/row/row", + "t-col": "tdesign-miniprogram/col/col", + "t-button": "tdesign-miniprogram/button/button", + "t-upload": "tdesign-miniprogram/upload/upload", + "t-radio": "tdesign-miniprogram/radio/radio", + "t-radio-group": "tdesign-miniprogram/radio-group/radio-group" + }, + "navigationStyle": "default", + "navigationBarTitleText": "诊断信息录入" +} \ No newline at end of file diff --git a/pages/followUp copy/index.less b/pages/followUp copy/index.less new file mode 100644 index 0000000..ef35ab7 --- /dev/null +++ b/pages/followUp copy/index.less @@ -0,0 +1,42 @@ +/* pages/followUp/index.wxss */ +.follow-up{ + padding: 28rpx; + padding-bottom: 56rpx; + .follow-item{ + background-color: #fff; + padding: 28rpx; + margin-bottom: 28rpx; + border-radius: 20rpx; + padding-bottom: 20rpx; + } + .custom-label { + display: inline-flex; + } + + .custom-label::after, .input-example__label::after { + content: '*'; + color: red; + font-size: 32rpx; + margin-left: 4rpx; + } + .t-overlay{ + top: 0!important; + } + .input-example { + // background-color: var(--bg-color-demo); + padding: 10rpx 0; + } + + .input-example__label { + color: var(--td-text-color-primary); + font-size: 24rpx; + line-height: 40rpx; + margin: 0 8rpx 16rpx; + } + .box{ + display: flex; + justify-content: space-between; + flex-wrap: wrap; + padding-right: 60rpx; + } +} \ No newline at end of file diff --git a/pages/followUp copy/index.wxml b/pages/followUp copy/index.wxml new file mode 100644 index 0000000..1b712ac --- /dev/null +++ b/pages/followUp copy/index.wxml @@ -0,0 +1,47 @@ + + \ No newline at end of file