diff --git a/pages.json b/pages.json index 92acebe..cfcaa42 100644 --- a/pages.json +++ b/pages.json @@ -248,6 +248,13 @@ { "navigationBarTitleText" : "体检预约" } + }, + { + "path" : "pages/HealthExaminationApp/myAppointment/healthExamDetails", + "style" : + { + "navigationBarTitleText" : "体检预约单" + } } ], "globalStyle": { diff --git a/pages/HealthExaminationApp/appointment/appointment.vue b/pages/HealthExaminationApp/appointment/appointment.vue index 2512f06..d5772a5 100644 --- a/pages/HealthExaminationApp/appointment/appointment.vue +++ b/pages/HealthExaminationApp/appointment/appointment.vue @@ -158,7 +158,7 @@ export default { this.getCheckType() }, methods: { - // 获取医院列表 app/getCareerHospital + // 获取医院列表 app/gethospital getHospitalList() { const params = { token: this.token, @@ -166,7 +166,7 @@ export default { } console.log('🚀 ~ getHospitalList ~ params:', params) uni.request({ - url: config.tjBaseUrl + '/app/getCareerHospital', + url: config.tjBaseUrl + '/app/gethospital', method: 'post', data: params, header: { @@ -356,7 +356,7 @@ export default { icon: 'success' }) uni.reLaunch({ - // url: '/pages/HealthExaminationApp/index/index' + url: '/pages/HealthExaminationApp/myAppointment/bookSuccessfully' }) } }, diff --git a/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue b/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue index 8dd0490..3fe727b 100644 --- a/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue +++ b/pages/HealthExaminationApp/jobAppointment/jobAppointment.vue @@ -1,19 +1,512 @@ - - 职业预约 - + + + 选择医院 + + 点击选择医院 + {{ hospital }} + + + + 职工套餐 + + + {{ checkType }} + + + + 体检时间 + + 点击选择时间 + {{ healthTime }} + + + + + + + + + + + 请选择套餐 + + + 请选择 + + + + {{ checkType }} + + + + + + + + + + + + {{ checkTypeContent }} + + 展开 + + + + + + 收起 + + + + + + + + + + {{ item.combinName }} + 项目内容:{{ item.combinContent }} + + 项目价格: + {{ item.combinPrice }}元 + + + + + + + + + + + + + + 当天剩余可预约人数:{{ reservationNumber }}人 + + + 医院信息 + {{ hospitalInfo.hospitalName }} + 地址: {{ hospitalInfo.address }} + 营业时间: 周一至周五 {{ hospitalInfo.businessEnd }}-{{ hospitalInfo.businessHours }} + 负责人: {{ hospitalInfo.responsible }} + 联系方式: {{ hospitalInfo.telPhone }} + + + + + + diff --git a/pages/HealthExaminationApp/myAppointment/healthExamDetails.vue b/pages/HealthExaminationApp/myAppointment/healthExamDetails.vue new file mode 100644 index 0000000..fb53fe7 --- /dev/null +++ b/pages/HealthExaminationApp/myAppointment/healthExamDetails.vue @@ -0,0 +1,123 @@ + + + + 体检单据 + 套餐名称: + {{ combName }} + + 体检项目: + {{ combItem }} + + 体检内容: + + + {{ item.mealName }}:{{ item.mealContent }} + {{ item.mealPrice }} 元 + + + + + 体检总价:{{ totalPrice }} 元 + + + + + + + diff --git a/pages/HealthExaminationApp/myAppointment/myAppointment.vue b/pages/HealthExaminationApp/myAppointment/myAppointment.vue index a5a662f..a8593fe 100644 --- a/pages/HealthExaminationApp/myAppointment/myAppointment.vue +++ b/pages/HealthExaminationApp/myAppointment/myAppointment.vue @@ -1,20 +1,194 @@ - + + + + 请选择体检状态 + {{ makeStatus }} + + + + + + + - + 提示:向左滑动,取消预约 + + + + + + + + + + + {{ item.hospitalName }} + + {{ item.combName }} + ¥{{ item.setMealPrice || '0.0' }} + + 预约时间:{{ item.phyAppontTime }} + + + + + \ No newline at end of file + .swipe-action { + padding: 10px; + border-radius: 5px; + word-break: break-all; + + .item-icon { + //定位 移到左上角 + position: absolute; + top: -42px; + left: -36px; + } + + .item-cont { + margin-left: 50px; + + .hospital-name { + font-size: 15px; + font-weight: bold; + line-height: 1.5; + } + + .combName { + display: flex; + justify-content: space-between; + } + } + } +} + diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue index 6211a52..75259dd 100644 --- a/pages/gzt/index.vue +++ b/pages/gzt/index.vue @@ -197,7 +197,7 @@ jwtToken: uni.getStorageSync('App-Token') } const tjparams = { - username: '13708411772', + username: '13708411772', // 15912575796 password: 'YNsbd@123456' } console.log('🚀 ~ gotoYy ~ tjparams:', tjparams) diff --git a/static/images-tijian/isCanceled.png b/static/images-tijian/isCanceled.png new file mode 100644 index 0000000..06bc797 Binary files /dev/null and b/static/images-tijian/isCanceled.png differ diff --git a/static/images-tijian/isExamed.png b/static/images-tijian/isExamed.png new file mode 100644 index 0000000..61d17e0 Binary files /dev/null and b/static/images-tijian/isExamed.png differ diff --git a/static/images-tijian/readyExam.png b/static/images-tijian/readyExam.png new file mode 100644 index 0000000..a30ba70 Binary files /dev/null and b/static/images-tijian/readyExam.png differ