diff --git a/.env.development b/.env.development
index 396513a..746b2bd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,3 @@
BASE_URL= "https://vue3.go-admin.dev"
-VITE_BASE_URL= "https://dev.hospital.admin.api.igandanyiyuan.com"
+VITE_BASE_URL= "http://dev.hospital.admin.api.igandanyiyuan.com"
VITE_IMG_URL="https://img.applets.igandanyiyuan.com"
\ No newline at end of file
diff --git a/.env.test b/.env.test
index 396513a..746b2bd 100644
--- a/.env.test
+++ b/.env.test
@@ -1,3 +1,3 @@
BASE_URL= "https://vue3.go-admin.dev"
-VITE_BASE_URL= "https://dev.hospital.admin.api.igandanyiyuan.com"
+VITE_BASE_URL= "http://dev.hospital.admin.api.igandanyiyuan.com"
VITE_IMG_URL="https://img.applets.igandanyiyuan.com"
\ No newline at end of file
diff --git a/components.d.ts b/components.d.ts
index 514bb9b..4c957bf 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -16,6 +16,8 @@ declare module '@vue/runtime-core' {
ConfirmModal: typeof import('./src/components/confirmModal.vue')['default']
DeleteModal: typeof import('./src/components/DeleteModal.vue')['default']
DoctorModal: typeof import('./src/components/doctorModal.vue')['default']
+ ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+ ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
FamilyModal: typeof import('./src/components/familyModal.vue')['default']
InquiryDetailModal: typeof import('./src/components/inquiryDetailModal.vue')['default']
InquiryDetailMoneyModal: typeof import('./src/components/inquiryDetailMoneyModal.vue')['default']
diff --git a/src/api/doctor/introduction.js b/src/api/doctor/introduction.js
new file mode 100644
index 0000000..9bea295
--- /dev/null
+++ b/src/api/doctor/introduction.js
@@ -0,0 +1,24 @@
+import request from '../../utils/request'
+
+const url = '/admin/doctor/introduction';
+
+export function getDoctorList(params){
+ return request({
+ url:'/admin/doctor/introduction',
+ method: 'get',
+ params
+ })
+}
+export function getDoctorDetail(id){
+ return request({
+ url:'/admin/doctor/introduction/'+id,
+ method: 'get'
+ })
+ }
+ export function checkDoctor(data,id){
+ return request({
+ url:'/admin/doctor/introduction/'+id,
+ method: 'put',
+ data
+ })
+ }
\ No newline at end of file
diff --git a/src/components/addInquiryConfigModal.vue b/src/components/addInquiryConfigModal.vue
index 976cbb2..bf1c7cc 100644
--- a/src/components/addInquiryConfigModal.vue
+++ b/src/components/addInquiryConfigModal.vue
@@ -34,6 +34,32 @@
+
+
+
+
+
+
+ 图文问诊
+ 视频问诊
+ 语音问诊
+ 电话购药
+ 会员
+ 疑难会诊
+
+
+
+
+
添加医生
diff --git a/src/components/addSysconfigModal.vue b/src/components/addSysconfigModal.vue
index ee9b372..b9eae74 100644
--- a/src/components/addSysconfigModal.vue
+++ b/src/components/addSysconfigModal.vue
@@ -220,6 +220,27 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -397,8 +418,10 @@ const handleSubmit = () => {
if(modalForm.inquiry_type==3){
modalForm.inquiry_price=modalForm.temp_free_price.join(',')
}else if(modalForm.inquiry_type==2 || modalForm.inquiry_type==4){
- modalForm.inquiry_price=String(modalForm.inquiry_price)
+ modalForm.inquiry_price=String(modalForm.inquiry_price);
+
}
+ console.log(modalForm)
const {data,code}=await editSysconfig(modalForm, props.inquiry_config_id);
if (code == 200) {
proxy.$message.success('修改成功')
diff --git a/src/components/confirmModal.vue b/src/components/confirmModal.vue
index 2c68974..b134f7f 100644
--- a/src/components/confirmModal.vue
+++ b/src/components/confirmModal.vue
@@ -5,9 +5,12 @@
提示
-
-
-
+
+
+
+
+
+
取消
@@ -17,11 +20,12 @@
+
+
\ No newline at end of file
diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue
index 4a3b8e1..d32addc 100644
--- a/src/views/doctor/doctor-list/index.vue
+++ b/src/views/doctor/doctor-list/index.vue
@@ -303,6 +303,13 @@
-->
+
+
+
+
+
+
+
@@ -895,6 +902,7 @@ const showCheckedAll=ref(true);
}
}
}],
+
'hospital.address': [{ required: true, message: '请输入医院地址' }],
'hospital_id': [{ required: true, message: '请选择医院名称' }],
'department_custom_mobile': [{
@@ -903,7 +911,16 @@ const showCheckedAll=ref(true);
department_custom_id: [{ required: true, message: '请选择所在科室' }],
department_custom_name: [{ required: true, message: '请输入科室名称' }],
doctor_title: [{ required: true, message: '请选择职称' }],
- // 'user_doctor_info.qualification_cert_num': [{ required: true, message: '请输入资格证编码' }],
+ 'user.email': [
+ { required: true, message: '请输入邮箱' },
+ {
+ validator: (value, cb) => {
+ let reg = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
+ if (!reg.test(value)) {
+ cb('邮箱格式不正确');
+ }
+ }
+ }],
cur_doctor_expertise: [
{ type: 'array', required: true, message: '请选择专长' },
{
@@ -1283,7 +1300,7 @@ const showCheckedAll=ref(true);
let modalData = {
card_name: modalForm.user_name,
mobile: modalForm.user.mobile,
- mobile: modalForm.user.mobile,
+
is_recommend: modalForm.is_recommend,
avatar: modalForm.avatar,
doctor_title: modalForm.doctor_title,
diff --git a/src/views/inquiry/inquiry-list/index.vue b/src/views/inquiry/inquiry-list/index.vue
index 93caae5..b59978b 100644
--- a/src/views/inquiry/inquiry-list/index.vue
+++ b/src/views/inquiry/inquiry-list/index.vue
@@ -16,16 +16,27 @@
公益问诊
问诊购药
+
+
+
+
+
+ 图文
+ 视频
+ 语音
+ 电话
+ 会员
+ 疑难会诊
+ 附赠沟通
+
关闭
开启
-
-
搜索
@@ -46,7 +57,7 @@
{deleteData = selection;console.log(selection)}"
@@ -64,6 +75,9 @@
{{ formatInquiryType(record.inquiry_type) }}
+
+ {{ formatMode(record.inquiry_mode) }}
+
自己
后台
@@ -108,7 +122,7 @@