diff --git a/api/Informationconfirmation/index.js b/api/Informationconfirmation/index.js new file mode 100644 index 0000000..177a225 --- /dev/null +++ b/api/Informationconfirmation/index.js @@ -0,0 +1,20 @@ +import request from "../request.js" + +//咨询预约时间 +export function informationConfirmation(patientId) { + return request({ + url: `/nurseApp/healthConsultation/informationConfirmation?patientId=${patientId}`, + method: 'GET' + }) +} + + +//提交 +export function addHealthConsultationOrder(data) { + return request({ + url: `/nurseApp/healthConsultation/addHealthConsultationOrder`, + method: 'POST', + data + }) +} + diff --git a/pages/Informationconfirmation/Informationconfirmation.vue b/pages/Informationconfirmation/Informationconfirmation.vue index 6953b1e..e91ed8e 100644 --- a/pages/Informationconfirmation/Informationconfirmation.vue +++ b/pages/Informationconfirmation/Informationconfirmation.vue @@ -3,106 +3,96 @@ 姓名： - 111 + {{userlist.patientName}} 电话： - 111 - - - 地址： - 111 + {{userlist.phone}} 时间： 请选择 - - 今天 + + + {{item.week}} - 02-10 - - - 今天 - - 02-10 - - - 今天 - - 02-10 - - - 今天 - - 02-10 - - - - - 今天 - - 02-10 - - - 今天 - - 02-10 - - - 今天 - - 02-10 - - - 今天 - - 02-10 + {{item.healthConsultationDate}} 咨询内容： - - + - 298￥ - 确认 + ￥{{updata.totalPrice}} + 确认 - - - - 请选择支付方式 - - - - - - - 微信支付 - - - 确认支付￥298 - - - + + + 请选择支付方式 + + + + 微信支付 + + + 确认支付￥{{updata.totalPrice}} + + @@ -169,30 +159,31 @@ .worditem { display: flex; - justify-content: space-around; + width: 100%; + justify-content: flex-start; + flex-wrap: wrap; .today { - - width: 147rpx; + width: 20%; + margin: 0 2.5% 0 2.5%; + margin-top: 20rpx; height: 90rpx; text-align: center; font-size: 26rpx; - background: #FEF9F8; - border: 1rpx solid #F44B2F; + border: 1px solid #DADADA; border-radius: 5rpx; - .time { font-size: 26rpx; display: block; - line-height: 55rpx; + line-height: 40rpx; } .todaytime { + padding-top: 5rpx; font-size: 26rpx; display: block; - height: 30rpx; - line-height: 55rpx; + line-height: 40rpx; } } } @@ -205,92 +196,67 @@ height: 440rpx; background: #FFFFFF; border-radius: 20rpx; - - position: relative; - padding: 3%; - - input { - position: absolute; - top: 25%; - width: 77%; - transform: translateY(-50%); - } + padding: 30rpx 0 0 30rpx; } .bottomitem { - width: 750rpx; - height: 132rpx; + width: 100%; + height: 120rpx; background: #FFFFFF; - bottom: 0%; + bottom: 0; position: fixed; - padding: 5%; span { - // margin-left: 3%; - // margin-top: 3%; font-size: 48rpx; + line-height: 120rpx; color: #F44B2F; - // line-height: 75rpx; + margin: 0 0 0 30rpx; } .submit { width: 186rpx; - height: 61rpx; + height: 70rpx; background: #F44B2F; color: #FFFFFF; border-radius: 30rpx; - line-height: 61rpx; + line-height: 70rpx; text-align: center; font-size: 32rpx; float: right; + margin: 25rpx 30rpx 0 0; } } // 弹框支付 .payment { - width: 390px; + width: 100%; height: 130rpx; font-size: 42rpx; color: #000000; line-height: 130rpx; text-align: center; - // margin: 0 auto; - border-bottom: 1rpx solid #D8D4D4; - display: flex; - - span { - margin-left: 30%; - } - - .cencel { - margin-left: 20%; - - image { - width: 31rpx; - height: 31rpx; - } - } - - } .chat { + position: relative; + height: 200rpx; + span { - display: block; - height: 68rpx; + position: absolute; + top: 50rpx; + left: 180rpx; + line-height: 70rpx; font-size: 42rpx; color: #000000; - line-height: 68rpx; - margin-left: 25%; - margin-top: -10%; } image { - width: 79rpx; - height: 69rpx; - margin-top: 7%; - padding-left: 10%; + position: absolute; + top: 50rpx; + left: 70rpx; + width: 80rpx; + height: 70rpx; } } @@ -299,13 +265,14 @@ width: 501rpx; height: 71rpx; line-height: 71rpx; - // background: #4C7BC9; border-radius: 36rpx; font-size: 34rpx; color: #FFFFFF; text-align: center; - margin: 0 auto; - margin-top: 25%; + position: fixed; + bottom: 50rpx; + left: 50%; + transform: translateX(-50%); } } diff --git a/pages/classification/classification.vue b/pages/classification/classification.vue index 71c8b27..8717395 100644 --- a/pages/classification/classification.vue +++ b/pages/classification/classification.vue @@ -146,7 +146,6 @@ } }, move(event) { //@touchmove触摸移动 - console.log(event, 2) let touch = event.touches[0]; //滑动过程中，手指滑动的坐标信息 返回的是Objcet对象 this.touch = touch; }, diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue index dec483d..a529965 100644 --- a/pages/homepage/homepage.vue +++ b/pages/homepage/homepage.vue @@ -8,7 +8,7 @@ --> - + diff --git a/pages/medicine/medicine.vue b/pages/medicine/medicine.vue index b395253..c412198 100644 --- a/pages/medicine/medicine.vue +++ b/pages/medicine/medicine.vue @@ -1,17 +1,6 @@ @@ -72,38 +61,85 @@ export default { data() { return { + baseurl: '', swiperImgUrls: [], autoplay: true, //自动切换轮播图 hospitalDepartmentList: [], //科室 + hospitalDepartmenttotal: 0, HospitalPersonlist: [], //人员 + HospitalPersontotal: 0, tabIndex: 0, departmentId: null, //人员所属科室id + DepartmentpageNum: 1, + DepartmentpageSize: 100, + personpageNum: 1, + pageSize: 10, + startData: { + clientX: '', + clientY: '', + }, + touch: {}, }; }, methods: { + move(event) { //@touchmove触摸移动 + let touch = event.touches[0]; //滑动过程中，手指滑动的坐标信息 返回的是Objcet对象 + this.touch = touch; + }, + // 触摸touch事件 + start(e) { //@touchstart 触摸开始 + this.startData.pageY = e.changedTouches[0].pageY; //手指按下时的Y坐标 + }, + end(e) { //@touchend触摸结束 + if ((this.startData.pageY - this.touch.pageY) > 100) { //在事件结束时，判断滑动的距离是否达到出发需要执行事件的要求 + if (this.hospitalDepartmentList.length >= this.hospitalDepartmenttotal) {} else { + this.DepartmentpageNum++; + //科室 + selectDepartment(this.DepartmentpageNum, this.DepartmentpageSize).then(res => { + res.rows.forEach(e => { + this.hospitalDepartmentList.push(e) + }) + }) + } + if (this.HospitalPersonlist.length >= this.HospitalPersontotal) {} else { + this.personpageNum++; + //人员 + selectHospitalPerson(this.personpageNum, this.pageSize, this.departmentId).then(res => { + res.rows.forEach(e => { + this.HospitalPersonlist.push(e) + }) + }) + } + } else { + // this.touch = {}; + } + }, //人员 selectHospitalPersonInfo() { - selectHospitalPerson(this.departmentId).then(res => { + selectHospitalPerson(this.personpageNum, this.pageSize, this.departmentId).then(res => { this.HospitalPersonlist = res.rows + this.HospitalPersontotal = res.total }) }, //tap科室 taptabindex(item, index) { this.tabIndex = index - if (this.departmentId != item.id) { - this.departmentId = item.id + if (this.departmentId != item.departmentId) { + this.departmentId = item.departmentId this.selectHospitalPersonInfo(); } }, //健康咨询科室 selectDepartmentinfo() { - selectDepartment().then(res => { - this.hospitalDepartmentList = res.data.hospitalDepartmentList - res.data.poserInfoList.forEach(e => { + this.swiperImgUrls = [] + selectDepartment(this.DepartmentpageNum, this.DepartmentpageSize).then(res => { + this.hospitalDepartmentList = res.rows + this.hospitalDepartmenttotal = res.total + res.rows[0].poserInfoList.forEach(e => { e.image = baseurl + e.posterPictureUrl this.swiperImgUrls.push(e.image) }) - this.departmentId = this.hospitalDepartmentList[0].id + this.departmentId = this.hospitalDepartmentList[0].departmentId this.selectHospitalPersonInfo(); }) }, @@ -142,21 +178,17 @@ ended() { this.autoplay = true }, - goappointment() { - uni.navigateTo({ - url: '/pages/Informationconfirmation/Informationconfirmation' - }) - }, // 跳转预约医生界面 - godoctorslist() { - // uni.navigateTo({ - // url: '/pages/doctorslist/doctorslist' - // }) + goappointment(item) { + uni.navigateTo({ + url: `/pages/Informationconfirmation/Informationconfirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}` + }) }, }, onLoad() { + this.pageNum = 1 this.baseurl = baseurl - // this.selectDepartmentinfo() + this.selectDepartmentinfo() }, //1.分享给朋友 onShareAppMessage(res) { @@ -180,43 +212,5 @@ diff --git a/static/header .png b/static/header .png deleted file mode 100644 index 8c47c50..0000000 Binary files a/static/header .png and /dev/null differ diff --git a/static/poserhealth .png b/static/poserhealth .png deleted file mode 100644 index 4ab9b2d..0000000 Binary files a/static/poserhealth .png and /dev/null differ