diff --git a/api/pagesB/confirmation/index.js b/api/pagesB/confirmation/index.js
new file mode 100644
index 0000000..0ac681b
--- /dev/null
+++ b/api/pagesB/confirmation/index.js
@@ -0,0 +1,11 @@
+import request from "../../request.js"
+
+export function getListByDoctor(doctorId) {
+ return request({
+ url: `/nurseApplet/schedule/plan/getListByDoctor?doctorId=${doctorId}`,
+ method: 'get',
+ header: {
+ Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+ },
+ })
+}
\ No newline at end of file
diff --git a/pagesB/appointmenttime/appointmenttime.vue b/pagesB/appointmenttime/appointmenttime.vue
index f4f636b..3e925fa 100644
--- a/pagesB/appointmenttime/appointmenttime.vue
+++ b/pagesB/appointmenttime/appointmenttime.vue
@@ -192,7 +192,6 @@
onShow() {
let that = this
uni.$on('updata', function(data) {
- console.log(data.updata,'9')
if (data.updata) {
that.orderlist = JSON.parse(data.updata)
}
@@ -207,7 +206,6 @@
})
},
onLoad(options) {
- console.log(options,'89')
var that = this
const value = uni.getStorageSync('openid');
if (value) {
@@ -487,4 +485,4 @@
\ No newline at end of file
+
diff --git a/pagesB/confirmation/confirmation.scss b/pagesB/confirmation/confirmation.scss
index f2409c2..eebed28 100644
--- a/pagesB/confirmation/confirmation.scss
+++ b/pagesB/confirmation/confirmation.scss
@@ -79,11 +79,21 @@
}
.textarea {
- font-size: 18rpx;
+ font-size: 22rpx;
font-weight: 400;
color: #8E8E8E;
line-height: 42rpx;
- padding: 30rpx 0 0 40rpx;
+ margin: 30rpx 40rpx 0 40rpx;
+ padding: 30rpx;
+ height: 250rpx;
+ background: #FFFFFF;
+ border: 2rpx solid #26A888;
+ border-radius: 5rpx;
+ .title{
+ font-weight: 500;
+ color: #EE8F15;
+ margin-bottom: 20rpx;
+ }
}
.text {
@@ -91,6 +101,12 @@
font-weight: 400;
color: #333333;
padding: 30rpx 0 0 40rpx;
+ text{
+ padding-left: 20rpx;
+ font-size: 20rpx;
+ font-weight: 400;
+ color: #8E8E8E;
+ }
}
::v-deep .u-upload {
@@ -151,28 +167,4 @@
}
}
}
-
- .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 3c64851..5b2a0e5 100644
--- a/pagesB/confirmation/confirmation.vue
+++ b/pagesB/confirmation/confirmation.vue
@@ -1,12 +1,5 @@
-
-
-
-
- 第一步：填写个人信息
-
-
现住址所在区
@@ -40,22 +33,11 @@
placeholder-class="phsy" />
- 选择医生
+ 预约时间
+ 请选择时间
-
- {{formdata.doctorName}}
- 请选择医生
-
-
-
-
-
-
-
- 第二步：填写问诊信息
-
-
-
+
+
问题简述
@@ -84,29 +66,24 @@
-
-
-
-
-
- 第三步：上传附件文件
-
-
-
- 附件材料上传
+ 上传检查单/患处照片
+ （最多8张）
-
- 最多支持9个文件；
+
+ 温馨提示：
- 单个文件大小不允许超过10MB；
+ 1.下单后24h内我们会和您确认具体时间点
- 只支持上传照片图片、视频文件，后缀类型为：JPG.PNG.MP4
+ 2.请提前准备好健康资料，以备专家参考
+
+
+ 3.请提前下载“腾讯会议”APP
@@ -136,50 +113,57 @@
import {
consultationInfo
} from '@/api/pagesB/createnewconsultation/createnewconsultation.js'
+ import {
+ getListByDoctor
+ } from '@/api/pagesB/confirmation/index.js'
+ import tabs from '@/components/utabs/u-tabs.vue'
export default {
components: {
- "m-city": gkcity
+ "m-city": gkcity,
+ tabs
},
data() {
return {
- // 非真实地址
- uoloadaction: '',
+ uoloadaction: '', // 非真实地址
list: [],
addresslength: null,
imglistlength: null,
address: '请选择所属地区', //页面所属区域
+ timecurrent: 0, //时间下标
+ appointmentTimeList: [],
formdata: {
- address: '请选择所属地区', //页面所属区域
+ address: null, //页面所属区域
patientId: 1,
patientName: '李广君',
cardNo: '370882199909092123',
phone: '17615455437',
- address: '',
- doctorId: 1,
- doctorName: '李医生',
- consultationType: 'IMAGE_TEXT_CONSULTATION',
- problemDescription: '',
- situationDescription: '',
- problemStatement: '',
- medicalRecord: '',
- fileUrls: []
+ address: null,
+ doctorId: null,
+ doctorName: null,
+ consultationType: 'VIDEO_CONSULTATION',
+ problemDescription: null,
+ situationDescription: null,
+ problemStatement: null,
+ medicalRecord: null,
+ fileUrls: [],
+ appointmentDate: null,
+ appointmentStartTime: null,
+ appointmentEndTime: null,
}
};
},
onLoad(options) {
+ this.formdata.doctorName = options.doctorName
+ this.formdata.doctorId = options.doctorId
this.uoloadaction = baseurl + '/nurseApplet/consultationInfo/uploadConsultationFile'
- },
- onShow() {
this.areaInfo();
- let that = this
- uni.$on('doctordata', function(data) {
- let item = JSON.parse(data.data)
- that.formdata.doctorName = item.realname
- that.formdata.doctorId = item.userNo
- uni.$off('doctordata')
- })
+ this.getListByDoctorinfo();
},
+ onShow() {},
methods: {
+ timechange(index) {
+ this.timecurrent = index
+ },
updata() {
if (this.imglistlength > 0) {
this.$refs.uUpload.upload()
@@ -199,15 +183,25 @@
this.info();
},
info() {
- consultationInfo(this.formdata).then(res => {
- if (res.code == 200) {
- this.$refs.uToast.show({
- title: '新建图文问诊成功',
- type: 'success',
- duration: '1500',
- back: 1
- })
- }
+ console.log(this.formdata)
+ // consultationInfo(this.formdata).then(res => {
+ // if (res.code == 200) {
+ // this.$refs.uToast.show({
+ // title: '新建图文问诊成功',
+ // type: 'success',
+ // duration: '1500',
+ // back: 1
+ // })
+ // }
+ // })
+ },
+ getListByDoctorinfo() {
+ getListByDoctor(this.formdata.doctorId).then(res => {
+ res.data.forEach(e => {
+ e.dates = e.scheduleDate.slice(5, 10)
+ e.name = e.week
+ })
+ this.appointmentTimeList = res.data
})
},
// 显示三级地址联动
@@ -237,11 +231,6 @@
this.address = '请选择所属地区'
}
},
- gochoosedoctor() {
- uni.navigateTo({
- url: '/pagesC/choosedoctor/choosedoctor'
- })
- },
}
}
diff --git a/pagesB/medicine/medicine.vue b/pagesB/medicine/medicine.vue
index fc3ff42..ad95797 100644
--- a/pagesB/medicine/medicine.vue
+++ b/pagesB/medicine/medicine.vue
@@ -230,7 +230,7 @@
// if (res.data.loginFlag) {
// that.usershow = false
uni.navigateTo({
- url: `/pagesB/confirmation/confirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}&&personName=${item.personName}`
+ url: `/pagesB/confirmation/confirmation?price=${item.consultingFee}&doctorId=${item.id}&doctorName=${item.personName}`
})
// } else {
// that.usershow = true
diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue
index cdb48ca..a91494c 100644
--- a/pagesC/Onlinesigning/Onlinesigning.vue
+++ b/pagesC/Onlinesigning/Onlinesigning.vue
@@ -532,6 +532,10 @@
if (day < 10) {
day = '0' + day;
}
+ let userinfo = uni.getStorageSync('userinfo');
+ this.query.residentName = userinfo.patientName
+ this.query.identity = userinfo.cardNo
+ this.query.phone = userinfo.patientName
this.query.signTime = year + '-' + month + '-' + day;
},
onShow() {