From 61eba0f41507399637500e6f4ad42c1b909cd793 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Thu, 12 Jun 2025 14:12:41 +0800 Subject: [PATCH 01/30] =?UTF-8?q?=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/bookBox.vue | 4 ++-- components/userCard.vue | 2 +- components/visitorList.vue | 2 +- pages.json | 14 +++++++------- pages/book_detail/book_detail.vue | 10 +++++----- pages/index/index.vue | 22 +++++++++++++--------- pages/modify_visitor/modify_visitor.vue | 4 ++-- pages/prebook/prebook.vue | 8 ++++---- pages/usercenter/usercenter.vue | 4 ++-- pages/visit_detail/visit_detail.vue | 15 ++++++++++----- pages/visitors/visitors.vue | 23 +++++++++++------------ pages/waiting_method/waiting_method.vue | 6 +++--- 中医针灸改版2.0_2025_03_06/需求拆分.txt | 12 ++++++------ 针灸挂号系统功能拆分.txt | 22 +++++++++++----------- 14 files changed, 78 insertions(+), 70 deletions(-) diff --git a/components/bookBox.vue b/components/bookBox.vue index 87f7190..445cee9 100644 --- a/components/bookBox.vue +++ b/components/bookBox.vue @@ -6,7 +6,7 @@ {{item.month}}.{{ item.day }} {{item.week_desc}} - + {{item.work_desc}} @@ -27,7 +27,7 @@ 当前时间段不可预约 - + 下午预约 diff --git a/components/userCard.vue b/components/userCard.vue index 716e456..4f3e70c 100644 --- a/components/userCard.vue +++ b/components/userCard.vue @@ -13,7 +13,7 @@ - 首次就诊，建议等待医生叫号 + 首次预约，建议等待医生叫号 diff --git a/components/visitorList.vue b/components/visitorList.vue index d31eeb6..7334f84 100644 --- a/components/visitorList.vue +++ b/components/visitorList.vue @@ -3,7 +3,7 @@ - 增加就诊人 + 增加预约人 全部 - 就诊提醒 + 预约提醒 @@ -55,12 +55,12 @@ list:[ {'leftTitle':'候诊状态','custom':"",show:true,edit:true}, {'leftTitle':'所在床位','rightTitle':'',show:true,edit:true}, - {'leftTitle':'就诊人','rightTitle':'',show:true,edit:false}, - {'leftTitle':'就诊医院','rightTitle':'',show:true,edit:false}, - {'leftTitle':'就诊科室','rightTitle':'',show:true,edit:false}, + {'leftTitle':'预约人','rightTitle':'',show:true,edit:false}, + {'leftTitle':'服务机构','rightTitle':'',show:true,edit:false}, + {'leftTitle':'预约科室','rightTitle':'',show:true,edit:false}, {'leftTitle':'医生','rightTitle':'',show:true,edit:false}, {'leftTitle':'排队情况','custom':"",show:true,edit:false}, - {'leftTitle':'就诊时间','custom':"",show:true,edit:false} + {'leftTitle':'预约时间','custom':"",show:true,edit:false} ], showCancelBook:false, bookId:false, diff --git a/pages/index/index.vue b/pages/index/index.vue index c5c409f..519f15f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -29,13 +29,12 @@ - - + @@ -59,12 +58,12 @@ - + 出诊：{{ item.workdate_desc }} - + @@ -72,7 +71,7 @@ - 预约看病 + 开始预约 @@ -81,7 +80,7 @@ - 最近就诊 + 最近预约 @@ -142,7 +141,7 @@ this.doctor_id = getApp().globalData.doctorId if(!this.doctor_id) return - var title = '预约就诊' + var title = '' if(this.code) title = '登录' uni.setNavigationBarTitle({ title:title @@ -243,6 +242,11 @@ this.doctorInfo = data; this.user_type = this.doctorInfo.user_type; + var title = this.doctorInfo.doctor_info.doctor_name+'主页' + uni.setNavigationBarTitle({ + title:title + }) + if(this.doctorInfo.doctor_info && this.doctorInfo.doctor_info.depart_name && this.doctorInfo.doctor_info.depart_name.length>0){ this.doctor_dept = this.doctorInfo.doctor_info.depart_name; } @@ -267,7 +271,7 @@ } this.hospital_departs = this.doctorInfo.hospital_departs.map((item,index)=>{ - item.workdate_desc = this.doctorInfo.workdate_desc[item.depart_id] + if(this.doctorInfo.workdate_desc) item.workdate_desc = this.doctorInfo.workdate_desc[item.depart_id] return item }) }); diff --git a/pages/modify_visitor/modify_visitor.vue b/pages/modify_visitor/modify_visitor.vue index 82885db..af9a779 100644 --- a/pages/modify_visitor/modify_visitor.vue +++ b/pages/modify_visitor/modify_visitor.vue @@ -50,11 +50,11 @@ if(option.vid) { this.vid = option.vid uni.setNavigationBarTitle({ - title: '修改就诊人' + title: '修改预约人' }); }else{ uni.setNavigationBarTitle({ - title: '新增就诊人' + title: '新增预约人' }); } }, diff --git a/pages/prebook/prebook.vue b/pages/prebook/prebook.vue index a39f5f2..13e4c09 100644 --- a/pages/prebook/prebook.vue +++ b/pages/prebook/prebook.vue @@ -18,7 +18,7 @@ - 就诊人： + 预约人： {{nums[key]}}n.{{item.name}} @@ -30,7 +30,7 @@ {{doctor_name}} - 就诊医院： + 服务机构： {{depart.hospital_name}} {{depart.depart_name}} @@ -98,7 +98,7 @@ this.doctor_name = this.doctorInfo.doctor_info.doctor_name if(!this.departId && this.depart) { - this.$pop.modelShow('请先选择要预约的医院科室', redi_path) + this.$pop.modelShow('请先选择要预约的服务机构科室', redi_path) return } this.depart = JSON.parse(this.depart) @@ -182,7 +182,7 @@ } if(uids.length <= 0){ - this.$pop.modelShow('请选择预约就诊人') + this.$pop.modelShow('请选择预约预约人') console.log(88888); return } diff --git a/pages/usercenter/usercenter.vue b/pages/usercenter/usercenter.vue index b0f5810..f5a4f7c 100644 --- a/pages/usercenter/usercenter.vue +++ b/pages/usercenter/usercenter.vue @@ -9,12 +9,12 @@ - 就诊人 + 预约人 - 就诊记录 + 预约记录 diff --git a/pages/visit_detail/visit_detail.vue b/pages/visit_detail/visit_detail.vue index be655f1..84b2a60 100644 --- a/pages/visit_detail/visit_detail.vue +++ b/pages/visit_detail/visit_detail.vue @@ -16,7 +16,7 @@ - 就诊提醒 + 预约提醒 @@ -64,12 +64,12 @@ list:[ {'leftTitle':'候诊状态','custom':"",show:true,edit:false}, {'leftTitle':'所在床位','rightTitle':'',show:false,edit:false}, - {'leftTitle':'就诊人','rightTitle':'',show:true,edit:false}, - {'leftTitle':'就诊医院','rightTitle':'',show:true,edit:false}, - {'leftTitle':'就诊科室','rightTitle':'',show:true,edit:false}, + {'leftTitle':'预约人','rightTitle':'',show:true,edit:false}, + {'leftTitle':'服务机构','rightTitle':'',show:true,edit:false}, + {'leftTitle':'预约科室','rightTitle':'',show:true,edit:false}, {'leftTitle':'医生','rightTitle':'',show:true,edit:false}, {'leftTitle':'排队情况','custom':"",show:true,edit:false}, - {'leftTitle':'就诊时间','custom':"",show:true,edit:false} + {'leftTitle':'预约时间','custom':"",show:true,edit:false} ], showCancelBook:false, bookId:false, @@ -323,7 +323,12 @@ this.list[2].rightTitle = bookInfo.name this.list[3].rightTitle = bookInfo.hospital_name + this.list[4].rightTitle = bookInfo.depart_name + if(!bookInfo.depart_name) { + this.list[4].show = false + } + this.list[5].rightTitle = bookInfo.doctor_name ? bookInfo.doctor_name : '无' this.list[6].show = false diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index 1aa3c85..0229499 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -5,14 +5,14 @@ - 增加就诊人 + 增加预约人 {{item.name}} - 已预约今日 {{ item.visit_time.split('-')[0] }} 就诊 + 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 身份证号：{{item.idcard_txt}} @@ -35,7 +35,6 @@ 确认预约（已选{{selectCount}}位） - 请确保预约就诊前在门诊先挂号 @@ -97,7 +96,7 @@ data() { return { cssUrl:this.cssUrl, - popContent:'删除张杨明后，就诊记录还可以查到，确定删除吗？', + popContent:'删除张杨明后，预约记录还可以查到，确定删除吗？', popTitle:'确认删除', popShowCancel:true, visitUsers:false, @@ -153,7 +152,7 @@ this.depart_id = uni.getStorageSync('depart_id') if(!this.depart_id && this.type == 1) { - this.$pop.modelShow('请先选择要预约的医院科室!', '/pages/index/index') + this.$pop.modelShow('请先选择要预约的服务机构科室!', '/pages/index/index') return } @@ -167,7 +166,7 @@ if(this.type == 2){ uni.setNavigationBarTitle({ - title:'就诊人' + title:'预约人' }) }if(this.type == 3){ uni.setNavigationBarTitle({ @@ -175,7 +174,7 @@ }) }else{ uni.setNavigationBarTitle({ - title:'请选择就诊人' + title:'请选择预约人' }) } }, @@ -193,7 +192,7 @@ reback(){ this.$nav.navToPath('/pages/index/index') }, - // 预约时间 -跳转就诊人页面-预约时间 + // 预约时间 -跳转预约人页面-预约时间 getDoctorInfo() { this.$http.req('api/user/index_info', {}, 'GET').then(data=>{ if(data == -1) return @@ -207,7 +206,7 @@ }) if(!hospital || Object.keys(hospital).length === 0) { - this.$pop.modelShow('请先选择要预约的医院科室~', '/pages/index/index') + this.$pop.modelShow('请先选择要预约的服务机构科室~', '/pages/index/index') return } @@ -236,7 +235,7 @@ var that = this uni.showModal({ title:'删除', - content:'删除'+visitor.name+'后，就诊记录还可以查到，确定删除吗？', + content:'删除'+visitor.name+'后，预约记录还可以查到，确定删除吗？', success(res) { if(!res.confirm) return that.$http.req('api/user/del_visitor', {id:visitor.id},'POST').then(data=>{ @@ -248,7 +247,7 @@ vistorOption(visitor){ var that = this uni.showActionSheet({ - itemList: ['修改就诊人信息', '删除就诊人'], + itemList: ['修改预约人信息', '删除预约人'], success: function (res) { if(res.tapIndex == 0){ that.modifyVistor(visitor) @@ -328,7 +327,7 @@ }, toPrebook(){ if(this.selectCount <= 0){ - this.$pop.modelShow('请选择就诊人') + this.$pop.modelShow('请选择预约人') return } diff --git a/pages/waiting_method/waiting_method.vue b/pages/waiting_method/waiting_method.vue index 941a9f8..08996a8 100644 --- a/pages/waiting_method/waiting_method.vue +++ b/pages/waiting_method/waiting_method.vue @@ -34,7 +34,7 @@ userCard }, onLoad(option) { - // 来自 确认报道页面选中的就诊人 + // 来自 确认报道页面选中的预约人 var active_visitors = JSON.parse(uni.getStorageSync('active_visitors')); this.active_visitors = active_visitors; var depart_info = uni.getStorageSync('depart'); @@ -44,7 +44,7 @@ } this.depart_id = uni.getStorageSync('depart_id') if(!this.depart_id) { - this.$pop.modelShow('请先选择要预约的医院科室', '/pages/index/index') + this.$pop.modelShow('请先选择要预约的服务机构科室', '/pages/index/index') return } }, @@ -79,7 +79,7 @@ this.$http.req('api/user/checkin', obj, 'POST').then(data => { - // 成功后跳转到就诊记录页面 + // 成功后跳转到预约记录页面 if(data == -1) return this.$nav.navToPath('/pages/prebook_list/prebook_list') }).catch(err => { diff --git a/中医针灸改版2.0_2025_03_06/需求拆分.txt b/中医针灸改版2.0_2025_03_06/需求拆分.txt index 9b27b73..8d867ae 100644 --- a/中医针灸改版2.0_2025_03_06/需求拆分.txt +++ b/中医针灸改版2.0_2025_03_06/需求拆分.txt @@ -1,23 +1,23 @@ 中医针灸患者端静态页面及样式改造 1.首页调整 （1）首页医院地址导航在小程序中打开样式 -（2）增加就诊须知折叠面板 +（2）增加预约须知折叠面板 （3）增加医保定点标签 （4）出诊医院列表样式调整 2.底部公共菜单增加“现场报道”入口 3.首页医院列表部分样式调整 -4.选择就诊人列表页面调整 +4.选择预约人列表页面调整 进行中 -4.新增就诊人页面样式改造 +4.新增预约人页面样式改造 5.扫码报道页面 6.确认报道页面 7.确认报道空页面 8.候诊方式页面 9.个人中心页面样式改造 -11.就诊人列表页面 -12.就诊记录页面 -13.就诊详情页面样式改造 +11.预约人列表页面 +12.预约记录页面 +13.预约详情页面样式改造 14.候诊状态，所在床位弹窗 1.首页医院地址导航在小程序中打开调整 diff --git a/针灸挂号系统功能拆分.txt b/针灸挂号系统功能拆分.txt index a44a189..9e611f3 100644 --- a/针灸挂号系统功能拆分.txt +++ b/针灸挂号系统功能拆分.txt @@ -14,23 +14,23 @@ 2.用户端首页样式调整 已完成 -1.挂号就诊人页面 -2.新增就诊人信息页面 +1.挂号预约人页面 +2.新增预约人信息页面 已完成 -1.针灸挂号系统选择就诊人页面 -2.修改就诊人信息页面 -3.就诊人信息页面 +1.针灸挂号系统选择预约人页面 +2.修改预约人信息页面 +3.预约人信息页面 待完成 一、患者端 静态页面 -2.就诊人预约挂号页面 +2.预约人预约挂号页面 预计完成 2024-03-11 09:30~2024-03-11 19:00 3.个人中心页面 4.修改个人资料页面 预计完成 2024-03-12 09:30~2024-03-12 19:00 -5.就诊人列表页面 +5.预约人列表页面 预计完成 2024-03-13 09:30~2024-03-13 19:00 6.预约列表页面 @@ -108,11 +108,11 @@ （1）选择医院使用腾讯位置服务接口 https://lbs.qq.com/service/webService/webServiceGuide/search/webServiceSuggestion -已完成 -1.快乐论文ai论文提交页面增加学历/专业选项 +已完成 +1.快乐论文ai论文提交页面增加学历/专业选项 2.快乐论文ai青色主题模板提交页面顶部公告样式调整 - -进行中 + +进行中 1.AI论文增加公式 进行中 From 374a112da60acfea23aea3bb61f83a49f212bd25 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Fri, 13 Jun 2025 09:59:16 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8D=E5=AD=98=E5=9C=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 6 ++++++ pages/index/index.vue | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/main.js b/main.js index 3ba6261..a2ad206 100644 --- a/main.js +++ b/main.js @@ -285,6 +285,12 @@ function req(url, data={}, method = 'POST', header={}) { } return; } + + if (rs.confirm && rdata.code!=CODE_LOGIN_EXIPRE && rdata.msg && rdata.msg.indexOf('用户信息不存在') > -1) { + removeLogin(); + navToPath('/pages/index/index') + return; + } } }); diff --git a/pages/index/index.vue b/pages/index/index.vue index 519f15f..2ff528f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -16,12 +16,12 @@ - + {{doctorInfo.doctor_info.doctor_detail}} @@ -121,7 +121,8 @@ loginToken:false, state:'', workdate:[], - user_type:-1 + user_type:-1, + show_info:false, } }, components:{ From d00442ca362c5eb5e0abe569580be71e2cd5208a Mon Sep 17 00:00:00 2001 From: zq <136432190602163.com> Date: Fri, 13 Jun 2025 16:55:04 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=80=A7=E5=88=AB?= =?UTF-8?q?=E3=80=81=E5=87=BA=E7=94=9F=E5=B9=B4=E4=BB=BD=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/FormItem.vue | 119 ++++ components/SelectYear.vue | 167 +++++ components/SexPop.vue | 264 +++++++ components/inputBox.vue | 9 + pages/index/index.vue | 1143 ++++++++++++++++++------------- pages/modify_visitor/modify_visitor.vue | 381 ++++++----- pages/usercenter/usercenter.vue | 4 +- pages/visitors/visitors.vue | 13 +- 8 files changed, 1474 insertions(+), 626 deletions(-) create mode 100644 components/FormItem.vue create mode 100644 components/SelectYear.vue create mode 100644 components/SexPop.vue diff --git a/components/FormItem.vue b/components/FormItem.vue new file mode 100644 index 0000000..a0f35a1 --- /dev/null +++ b/components/FormItem.vue @@ -0,0 +1,119 @@ + + + + + \ No newline at end of file diff --git a/components/SelectYear.vue b/components/SelectYear.vue new file mode 100644 index 0000000..9508378 --- /dev/null +++ b/components/SelectYear.vue @@ -0,0 +1,167 @@ + + + + \ No newline at end of file diff --git a/components/SexPop.vue b/components/SexPop.vue new file mode 100644 index 0000000..d519601 --- /dev/null +++ b/components/SexPop.vue @@ -0,0 +1,264 @@ + + + + + \ No newline at end of file diff --git a/components/inputBox.vue b/components/inputBox.vue index 6bb1b49..14e0b10 100644 --- a/components/inputBox.vue +++ b/components/inputBox.vue @@ -5,6 +5,7 @@ {{label}} + @@ -157,6 +158,7 @@ export default { } .left{ display: flex; + align-items: center; min-width: 158rpx; max-width: 238rpx; text{ @@ -209,6 +211,13 @@ export default { } } } + .required { + margin-left: 8rpx; + color: #f56c6c; + font-size: 12px; + width: 16rpx; + height: 16rpx; + } .errmsg{ margin: 0 auto; width: 100%; diff --git a/pages/index/index.vue b/pages/index/index.vue index 2ff528f..f343a9e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -3,16 +3,17 @@ - {{doctorInfo.doctor_info.doctor_name}} + {{ doctorInfo.doctor_info.doctor_name }} - {{doctor_dept}} + {{ doctor_dept }} - {{doctorInfo.doctor_info.doctor_desc}} + {{ doctorInfo.doctor_info.doctor_desc }} - + @@ -24,7 +25,7 @@ --> - {{doctorInfo.doctor_info.doctor_detail}} + {{ doctorInfo.doctor_info.doctor_detail }} @@ -36,21 +37,21 @@ --> - + - {{item.hospital_name}} + {{ item.hospital_name }} 医保定点 - {{item.address}} + {{ item.address }} - + 导航 @@ -64,13 +65,13 @@ - + - + 开始预约 @@ -82,532 +83,754 @@ 最近预约 - + - 查看全部 + 查看全部 - + + + + + + + + 需要填写真实姓名，来确保您账号的唯一性 + + 真实姓名 + + + + + 完成 + + + + + diff --git a/pages/modify_visitor/modify_visitor.vue b/pages/modify_visitor/modify_visitor.vue index af9a779..4d76245 100644 --- a/pages/modify_visitor/modify_visitor.vue +++ b/pages/modify_visitor/modify_visitor.vue @@ -1,16 +1,26 @@ diff --git a/pages/usercenter/usercenter.vue b/pages/usercenter/usercenter.vue index f5a4f7c..b0f5810 100644 --- a/pages/usercenter/usercenter.vue +++ b/pages/usercenter/usercenter.vue @@ -9,12 +9,12 @@ - 预约人 + 就诊人 - 预约记录 + 就诊记录 diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index 0229499..b398368 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -14,8 +14,11 @@ {{item.name}} 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 - - 身份证号：{{item.idcard_txt}} + + + {{item.sex}}| {{ item.age }} + |手机号：{{ item.phone }} @@ -427,7 +430,11 @@ .bot{ margin-top: 32rpx; font-size: 30rpx; - color: #949699; + color: #333333; + } + .gap{ + margin: 0 23rpx; + color: #DBDBDB; } img{ position: absolute; From 8490f40fc48a4a348c840f209754fd1a5c16e556 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Fri, 13 Jun 2025 17:11:43 +0800 Subject: [PATCH 04/30] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9C=9F=E5=AE=9E?= =?UTF-8?q?=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index f343a9e..25c3892 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -118,6 +118,7 @@ + @@ -332,15 +333,17 @@ export default { this.pageShow = true; - this.$nextTick(() => { - console.log(this.$refs, 'this.$refs.nameWrap'); - this.$refs.nameWrap.open('bottom') - }) let visitFlag = true; this.doctorInfo = data; this.user_type = this.doctorInfo.user_type; + if(!data.realname) { + this.$nextTick(() => { + this.$refs.nameWrap.open('bottom') + }) + } + var title = this.doctorInfo.doctor_info.doctor_name + '主页' uni.setNavigationBarTitle({ title: title @@ -748,7 +751,15 @@ export default { margin: 0 auto; } - + .getphone-box{ + position: fixed; + left: 0; + top: 0; + width: 100vw; + height: 100vh; + z-index: 8999999999; + opacity: 0; + } } .popup-container { @@ -831,6 +842,5 @@ export default { font-size: 26rpx; font-family: PingFang SC; } - } From 568b2111e56b9890cc45b4b28f020984e3e7d5ab Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Fri, 13 Jun 2025 17:27:05 +0800 Subject: [PATCH 05/30] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index 25c3892..12a11bf 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -98,10 +98,6 @@ - - - @@ -117,8 +113,7 @@ - - + @@ -227,7 +222,6 @@ export default { onGetPhoneNumber(e) { if (e.detail.errMsg === "getPhoneNumber:ok") { const { code } = e.detail; - // 发送 code 到后端解密手机号 wx.login({ success: (loginRes) => { wx.request({ From 93a650a03bc4382db44cded7b60dad71dcb566dd Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Fri, 13 Jun 2025 17:29:37 +0800 Subject: [PATCH 06/30] =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 4 ++-- pages/index/index.vue | 26 +++++++------------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/main.js b/main.js index a2ad206..329477d 100644 --- a/main.js +++ b/main.js @@ -152,8 +152,8 @@ try{ Vue.prototype.isMobile = isMobile(); } -// const NODE_ENV = 'development'; -const NODE_ENV = 'production'; +const NODE_ENV = 'development'; +// const NODE_ENV = 'production'; if(Vue.prototype.provider == Vue.prototype.provider_weixin){ if (NODE_ENV == "development") { Vue.prototype.request_domain = 'http://jasonyizherenxin.checkcopy.com/'; diff --git a/pages/index/index.vue b/pages/index/index.vue index 12a11bf..f54c6a5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -113,7 +113,7 @@ - + @@ -220,26 +220,14 @@ export default { }, // 手机号授权回调 onGetPhoneNumber(e) { - if (e.detail.errMsg === "getPhoneNumber:ok") { - const { code } = e.detail; - wx.login({ - success: (loginRes) => { - wx.request({ - url: '/api/user/bind_phone', - data: { wxCode: loginRes.code, phoneCode: code }, - success: (res) => { - const phone = res.data.phone; - this.setData({ phone }); - // 手机号获取成功后，弹出姓名填写 - this.setData({ showNameDialog: true }); - }, - }); - }, + if (e.detail.errMsg === 'getPhoneNumber:ok') { + console.log(e.detail.code) + this.$http.req('api/user/bind_phone', {phonecode:e.detail.code}, 'POST').then(data=>{ + if(data == -1) return + }); } else { - // 用户拒绝，记录状态 - this.setData({ hasRejectedPhone: true }); - wx.showToast({ title: "需要手机号才能继续", icon: "none" }); + } }, toLocation(hospital) { From 2c87374500c24446d42d58d65c84348e2da5f570 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Fri, 13 Jun 2025 18:14:17 +0800 Subject: [PATCH 07/30] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/FormItem.vue | 18 +++++++-------- components/SelectYear.vue | 17 +++++++------- main.js | 4 ++-- pages/index/index.vue | 40 +++++---------------------------- pages/modify_visitor/modify_visitor.vue | 2 +- 5 files changed, 26 insertions(+), 55 deletions(-) diff --git a/components/FormItem.vue b/components/FormItem.vue index a0f35a1..ff9fb45 100644 --- a/components/FormItem.vue +++ b/components/FormItem.vue @@ -6,7 +6,7 @@ {{ label }} - + - + - + - + From 20ed17d5d2ba8cb49fced264ece46138ba250704 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Fri, 20 Jun 2025 11:19:32 +0800 Subject: [PATCH 12/30] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index 329477d..a2ad206 100644 --- a/main.js +++ b/main.js @@ -152,8 +152,8 @@ try{ Vue.prototype.isMobile = isMobile(); } -const NODE_ENV = 'development'; -// const NODE_ENV = 'production'; +// const NODE_ENV = 'development'; +const NODE_ENV = 'production'; if(Vue.prototype.provider == Vue.prototype.provider_weixin){ if (NODE_ENV == "development") { Vue.prototype.request_domain = 'http://jasonyizherenxin.checkcopy.com/'; From c446194f1bc54d3b9b20fa65fa17694ef14c1acf Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Fri, 20 Jun 2025 18:07:21 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E6=96=87=E6=A1=88?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/visitors/visitors.vue | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/pages/visitors/visitors.vue b/pages/visitors/visitors.vue index 94129ae..297300a 100644 --- a/pages/visitors/visitors.vue +++ b/pages/visitors/visitors.vue @@ -13,7 +13,7 @@ {{item.name}} 已预约今日 {{ item.visit_time.split('-')[0] }} 预约 - 初诊/初访 + 新 - @@ -96,8 +85,8 @@ - 初诊/初访咨询 - 首次到访，请向工作人员说明个人情况 + 预约咨询 + 首次预约前，请先与工作人员沟通 联系电话 @@ -113,7 +102,7 @@ 联系微信 - 长按识别或保存到相册，微信扫一扫二维码添加微信 + 长按二维码添加微信沟通 @@ -471,7 +460,7 @@ flex-shrink: 0; } .book-date-first{ - width: 160rpx; + width: 100rpx; height: 40rpx; line-height: 40rpx; box-sizing: border-box; From be4932df1241c86ca1876d39fa766399d927ce00 Mon Sep 17 00:00:00 2001 From: kuaileWu <1432334894@qq.com> Date: Tue, 24 Jun 2025 18:37:50 +0800 Subject: [PATCH 14/30] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=85=BC=E5=AE=B9pad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 1 + components/FormItem.vue | 245 ++++++++++++++------------ components/SelectYear.vue | 170 ------------------ components/customeDatePicker.vue | 293 ++++++++++++++++++++++++++++++++ components/inputBox.vue | 28 +-- components/preBookList.vue | 7 +- pages/index/index.vue | 1 + pages/modify_visitor/modify_visitor.vue | 42 ++--- pages/visit_detail/visit_detail.vue | 6 +- pages/visitors/visitors.vue | 4 +- 10 files changed, 472 insertions(+), 325 deletions(-) delete mode 100644 components/SelectYear.vue create mode 100644 components/customeDatePicker.vue diff --git a/App.vue b/App.vue index 9d7a82b..d4f6022 100644 --- a/App.vue +++ b/App.vue @@ -242,6 +242,7 @@ } .btn{ text-align: center; + font-size: 32rpx; } .primary.btn{ background-color: #39D067; diff --git a/components/FormItem.vue b/components/FormItem.vue index ff9fb45..3b2ab6f 100644 --- a/components/FormItem.vue +++ b/components/FormItem.vue @@ -1,119 +1,152 @@ + + - + handleClick() { + if (!this.disabled) { + this.$emit('click'); // 触发父组件的选择逻辑 + } + }, + }, +}; + + + \ No newline at end of file +.placeholder { + font-family: PingFang SC; + font-size: 32rpx; + font-weight: normal; + line-height: 44rpx; + text-align: right; + letter-spacing: 0.24rpx; + color: #000; +} +/deep/ .formItemPlaceholderStyle { + font-size: 32rpx; + color: #999999; + line-height: 44rpx; +} + \ No newline at end of file diff --git a/components/SelectYear.vue b/components/SelectYear.vue deleted file mode 100644 index 0b08fcb..0000000 --- a/components/SelectYear.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - - \ No newline at end of file diff --git a/components/customeDatePicker.vue b/components/customeDatePicker.vue new file mode 100644 index 0000000..e3d53b6 --- /dev/null +++ b/components/customeDatePicker.vue @@ -0,0 +1,293 @@ + + + + + + \ No newline at end of file diff --git a/components/inputBox.vue b/components/inputBox.vue index 14e0b10..da1fdcb 100644 --- a/components/inputBox.vue +++ b/components/inputBox.vue @@ -1,10 +1,10 @@ @@ -37,6 +37,10 @@ export default { type: String, default: "" }, + inputstyle: { + type: String, + default: "" + }, holder: { type: String, default: '' @@ -82,12 +86,12 @@ export default { this.errormsg = this.label+'不能为空' return false } - + if(this.rule == 'phone' && !/^1[3-9]\d{9}$/.test(noEmptyVal)){ this.errormsg = '手机号格式不正确' return false } - + if(this.rule == 'idcardext' && (!/[a-z0-9A-Z]{4}/.test(noEmptyVal) || noEmptyVal.length!=4)){ this.errormsg = this.label+'格式不正确' return false @@ -126,7 +130,7 @@ export default {