diff --git a/api/pagesB/Informationconfirmation/index.js b/api/pagesB/Informationconfirmation/index.js deleted file mode 100644 index 9e43439..0000000 --- a/api/pagesB/Informationconfirmation/index.js +++ /dev/null @@ -1,20 +0,0 @@ -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/api/pagesB/medicine/index.js b/api/pagesB/medicine/index.js index aa7ab34..9bb5076 100644 --- a/api/pagesB/medicine/index.js +++ b/api/pagesB/medicine/index.js @@ -4,7 +4,10 @@ import request from "../../request.js" export function selectDepartment(pageNum,pageSize) { return request({ url: `/nurseApp/healthConsultation/selectDepartment?pageNum=${pageNum}&pageSize=${pageSize}`, - method: 'GET' + method: 'GET', + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, }) } @@ -12,6 +15,9 @@ export function selectDepartment(pageNum,pageSize) { export function selectHospitalPerson(pageNum,pageSize,departmentId) { return request({ url: `/nurseApp/healthConsultation/selectHospitalPerson?pageNum=${pageNum}&pageSize=${pageSize}&departmentId=${departmentId}`, - method: 'GET' + method: 'GET', + header: { + Authorization: 'Bearer' + ' ' + uni.getStorageSync('token') + }, }) -} \ No newline at end of file +} diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue index 1cfabe3..5836f51 100644 --- a/pages/myinformation/myinformation.vue +++ b/pages/myinformation/myinformation.vue @@ -5,7 +5,7 @@ 我的 --> - @@ -14,7 +14,10 @@ {{appPersonallist.patientName}} - + + 请先登录! + + 未签约 @@ -148,21 +151,21 @@ - - - - - - - - 添加家庭成员 - - + + + + + + + + 添加家庭成员 + + @@ -188,7 +191,7 @@ appPersonallist: null, //获取个人信息 timer: null, list: {}, - showhome: false,//切换 + showhome: false, //切换 }; }, @@ -389,30 +392,30 @@ // 添加家庭成员 addFamilyItem() { uni.navigateTo({ - url:'/pagesB/AddMembers/AddMembers' + url: '/pagesB/AddMembers/AddMembers' }) - // if (!this.userInfo) { - // uni.showModal({ - // title: "提示", - // content: "您还未注册,是否去注册?", - // confirmText: '是', - // cancelText: '否', - // success(res) { - // if (res.confirm) { - // uni.redirectTo({ - // url: "/pages/login/login?mode=注册" - // }) - // } else { - // wx.exitMiniProgram() - // } - // }, - // }) - // } else { - // this.getSetting() - // uni.navigateTo({ - // url: '/pages/login/login' - // }); - // } + // if (!this.userInfo) { + // uni.showModal({ + // title: "提示", + // content: "您还未注册,是否去注册?", + // confirmText: '是', + // cancelText: '否', + // success(res) { + // if (res.confirm) { + // uni.redirectTo({ + // url: "/pages/login/login?mode=注册" + // }) + // } else { + // wx.exitMiniProgram() + // } + // }, + // }) + // } else { + // this.getSetting() + // uni.navigateTo({ + // url: '/pages/login/login' + // }); + // } }, //积分页面 ...mapActions(["integralopenPopup"]), diff --git a/pagesB/confirmation/confirmation.scss b/pagesB/confirmation/confirmation.scss new file mode 100644 index 0000000..f2409c2 --- /dev/null +++ b/pagesB/confirmation/confirmation.scss @@ -0,0 +1,178 @@ +.app { + padding-top: 10rpx; + width: 100%; + + .btns { + width: 100%; + display: flex; + font-size: 31rpx; + justify-content: space-around; + text-align: center; + font-weight: 500; + margin-top: 80rpx; + padding-bottom: 50rpx; + + .btnleft { + width: 290rpx; + height: 62rpx; + background: #FFFFFF; + border: 1px solid #26A888; + border-radius: 5rpx; + color: #26A888; + line-height: 62rpx + } + + .btnright { + width: 289rpx; + height: 62rpx; + background: #26A888; + border-radius: 5rpx; + color: #FFFFFF; + line-height: 62rpx; + } + } + + .item { + width: 96%; + margin: 20rpx auto; + background-color: #fff; + box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); + border-radius: 5rpx; + padding-bottom: 50rpx; + + .select { + width: 90%; + height: 80rpx; + background: #F6F6F6; + margin: 12rpx auto; + border-radius: 5rpx; + display: flex; + position: relative; + + text { + padding: 0 60rpx 0 20rpx; + line-height: 80rpx; + font-size: 22rpx; + font-weight: 400; + height: 80rpx; + color: #8E8E8E; + // text-overflow: -o-ellipsis-lastline; + // overflow: hidden; + // text-overflow: ellipsis; + // display: -webkit-box; + // -webkit-line-clamp: 1; + // line-clamp: 1; + // -webkit-box-orient: vertical; + // white-space:normal; + // word-break:break-all; + } + + image { + width: 9rpx; + height: 17rpx; + position: absolute; + right: 40rpx; + top: 50%; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); + } + } + + .textarea { + font-size: 18rpx; + font-weight: 400; + color: #8E8E8E; + line-height: 42rpx; + padding: 30rpx 0 0 40rpx; + } + + .text { + font-size: 30rpx; + font-weight: 400; + color: #333333; + padding: 30rpx 0 0 40rpx; + } + + ::v-deep .u-upload { + padding: 30rpx 30rpx 0 30rpx; + } + + .input { + width: 90%; + height: 80rpx; + border-radius: 5rpx; + background: #f6f6f6; + margin: 20rpx 0 0 40rpx; + position: relative; + padding-left: 10rpx; + + image { + width: 10rpx; + height: 20rpx; + position: absolute; + top: 50%; + right: 5%; + transform: translateY(-50%); + } + + .uni-textarea-placeholder { + padding-left: 12rpx; + font-size: 22rpx; + font-weight: 400; + color: #8E8E8E !important; + } + + .phsy { + padding-left: 12rpx; + font-size: 22rpx; + font-weight: 400; + color: #8E8E8E !important; + } + + .inputtext { + padding-left: 12rpx; + color: black; + font-size: 26rpx; + width: 90%; + height: 80rpx; + line-height: 80rpx; + } + + .uinput { + color: black; + font-size: 26rpx; + width: 90%; + height: 80rpx; + line-height: 80rpx; + } + + .noimageuinput { + width: 98% !important; + } + } + } + + .title { + width: 100%; + padding: 10rpx 0 10rpx 35rpx; + + .left { + vertical-align: middle; + display: inline-block; + width: 10rpx; + height: 30rpx; + background: #26A888; + border-radius: 1rpx; + } + + .right { + vertical-align: middle; + display: inline-block; + font-size: 30rpx; + font-weight: 500; + color: #26A888; + line-height: 30rpx; + margin-left: 20rpx; + } + } + } diff --git a/pagesB/confirmation/confirmation.vue b/pagesB/confirmation/confirmation.vue index ab2dfc1..3c64851 100644 --- a/pagesB/confirmation/confirmation.vue +++ b/pagesB/confirmation/confirmation.vue @@ -1,401 +1,251 @@ + + diff --git a/pagesB/medicine/medicine.vue b/pagesB/medicine/medicine.vue index 3146781..fc3ff42 100644 --- a/pagesB/medicine/medicine.vue +++ b/pagesB/medicine/medicine.vue @@ -221,35 +221,35 @@ }, // 跳转预约医生界面 goappointment(item) { - let that = this - const value = uni.getStorageSync('openid'); - const value2 = uni.getStorageSync('patientId'); - if (value && value2) { - AppIdentification(value2).then(res => { - if (res.code == 200) { - if (res.data.loginFlag) { - that.usershow = false - uni.navigateTo({ - url: `/pagesB/confirmation/confirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}&&personName=${item.personName}` - }) - } else { - that.usershow = true - } - } else if (res.code == 9999) {} else { - that.$refs.uToast.show({ - title: res.msg, - type: 'error', - url: '/pages/login/login' - }) - } - }) - } else { - that.$refs.uToast.show({ - title: '未登录,请先登录', - type: 'error', - url: '/pages/login/login' - }) - } + // let that = this + // const value = uni.getStorageSync('openid'); + // const value2 = uni.getStorageSync('patientId'); + // if (value && value2) { + // AppIdentification(value2).then(res => { + // if (res.code == 200) { + // if (res.data.loginFlag) { + // that.usershow = false + uni.navigateTo({ + url: `/pagesB/confirmation/confirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}&&personName=${item.personName}` + }) + // } else { + // that.usershow = true + // } + // } else if (res.code == 9999) {} else { + // that.$refs.uToast.show({ + // title: res.msg, + // type: 'error', + // url: '/pages/login/login' + // }) + // } + // }) + // } else { + // that.$refs.uToast.show({ + // title: '未登录,请先登录', + // type: 'error', + // url: '/pages/login/login' + // }) + // } }, //跳转完善页面 goinformation() { @@ -299,4 +299,4 @@ \ No newline at end of file +