diff --git a/src/components/agreed-comp/agreed-comp.vue b/src/components/agreed-comp/agreed-comp.vue
index 397112d..08b677f 100755
--- a/src/components/agreed-comp/agreed-comp.vue
+++ b/src/components/agreed-comp/agreed-comp.vue
@@ -10,7 +10,8 @@
@change="handleChange"
:disabled="disabled"
>
-
+
+
{
emit('update:agreed', !!checked.value[0])
}
const handleChange = () => {
+ checked.value[0] = checked.value[0] === '1' ? '' : '1'
emit('update:agreed', !!checked.value[0])
}
diff --git a/src/configs/index.js b/src/configs/index.js
index a17d776..345c538 100755
--- a/src/configs/index.js
+++ b/src/configs/index.js
@@ -10,7 +10,7 @@ export const primaryColor = '#FF8CA6'
// 项目基础路径
export const appBasePath = isProduction ? './' : './'
// 请求地址
-// export const requestURL = 'http://192.168.2.155:7788/hospital/app'
+// export const requestURL = 'http://192.168.2.121:7788/hospital/app'
export const requestURL = 'https://peizhen.flameby.com/hospital/app'
export const requestPath = ''
export const requestFilePath = '/file'
diff --git a/src/pages/form/complete.vue b/src/pages/form/complete.vue
index 1f045f6..bae0fe9 100755
--- a/src/pages/form/complete.vue
+++ b/src/pages/form/complete.vue
@@ -27,7 +27,7 @@
:disabled="roleName !== 'common' || isView"
count
/>
-
+
{{ roleName !== 'common' && !isView ? '为' : '' }}陪诊师打分
@@ -94,10 +94,10 @@ const handleSubmit = () => {
$toast('请填写备注')
return
} else if (rate.value === 0) {
- $toast('请为陪诊师打分')
- return
+ // $toast('请为陪诊师打分')
+ // return
}
- $dialog(isCommon ? '确认提交工作记录?' : '确认为陪诊师打分?', {
+ $dialog(isCommon ? '确认提交工作记录?' : '确认提交?', {
showCancelButton: true,
confirmButtonText: '确定',
cancelButtonText: '取消',
diff --git a/src/pages/form/index.vue b/src/pages/form/index.vue
index 56808e7..a798662 100755
--- a/src/pages/form/index.vue
+++ b/src/pages/form/index.vue
@@ -1,11 +1,11 @@
- 预估收入
+ 预估收入
¥
{{ orderInfo.doctorPrice }}
@@ -265,7 +269,7 @@
orderInfo.status === 3
? '订单已提交,请耐心等待'
: orderInfo.isEvaluate === 0
- ? '查看评价'
+ ? '查看记录'
: '服务完成,请评价'
}}
@@ -287,6 +291,7 @@ const list = ref([
])
const current = ref(1)
const show = ref(false)
+const showFlag = ref(false)
const fileList = ref([])
// 半天陪诊 全天陪诊 代办约号 取送报告 代取送药 上门护理
const columns = reactive([
@@ -302,13 +307,13 @@ const columns = reactive([
// 就诊医院 请输入, 预约就诊日期 请选择就诊日期,预约就诊时间 请选择就诊时间,就诊人,请填写就诊人,联系人 请填写就诊联系人,联系人手机号 请填写就诊联系人 ,挂号科室
const formItems = [
{
- label: '收货地址',
- placeholder: '请输入收货地址',
+ label: '收件地址',
+ placeholder: '请输入收件地址',
key: 'deliveryAddress',
required: true,
type: 'string',
trigger: ['blur', 'change'],
- message: '请填写收货地址',
+ message: '请填写收件地址',
show: true,
cur: [4, 5],
sort: 1
@@ -327,14 +332,14 @@ const formItems = [
sort: 2
},
{
- label: '上门护理',
- placeholder: '请选择上门护理类型',
+ label: '护理项目',
+ placeholder: '请选择护理项目',
key: 'typeId',
keyName: 'typeName',
required: true,
type: 'select',
trigger: ['blur', 'change'],
- message: '请选择上门护理类型',
+ message: '请选择护理项目',
show: false,
options: [],
cur: [6],
@@ -375,7 +380,7 @@ const formItems = [
message: '请选择预约就诊日期',
show: false,
sort: 3,
- cur: [1, 2]
+ cur: [1, 2, 3]
},
{
label: '预约就诊时间',
@@ -387,7 +392,7 @@ const formItems = [
trigger: ['blur', 'change'],
show: false,
sort: 4,
- cur: [1, 2]
+ cur: [1, 2, 3]
},
{
label: '上门日期',
@@ -423,7 +428,7 @@ const formItems = [
message: '请填写就诊人',
show: true,
sort: 5,
- cur: [1, 2, 5]
+ cur: [1, 2, 3, 5]
},
{
label: '联系人',
@@ -435,7 +440,7 @@ const formItems = [
message: '请填写联系人',
show: true,
sort: 6,
- cur: [1, 2, 6]
+ cur: [1, 2, 3, 4, 6]
},
{
label: '联系人手机号',
@@ -447,7 +452,7 @@ const formItems = [
message: '请填写联系人手机号',
show: true,
sort: 7,
- cur: [1, 2, 4, 5, 6]
+ cur: [1, 2, 3, 4, 5, 6]
},
{
label: '挂号科室',
@@ -459,7 +464,7 @@ const formItems = [
message: '请选择挂号科室',
show: true,
sort: 8,
- cur: [1, 2]
+ cur: [1, 2, 3]
}
// {
// label: '备注',
@@ -516,7 +521,7 @@ const getReportTypelList = async () => {
}))
}
const getOrderInfo = async () => {
- if (!orderId.value) return
+ if (!orderId.value) return (showFlag.value = true)
$loading(true)
const res = await $api.orderInfo({ id: orderId.value })
if (res.success) {
@@ -526,6 +531,7 @@ const getOrderInfo = async () => {
current.value = order.status || 1
agreed.value = true
}
+ showFlag.value = true
$loading(false)
}
@@ -570,7 +576,7 @@ const orderPay = async () => {
// console.log(res)
$toast('支付成功!', {
icon: 'success',
- mask: true,
+ mask: true,
duration: 3 * 1000
})
getOrderInfo()
diff --git a/src/pages/index/order/index.vue b/src/pages/index/order/index.vue
index 6f99d28..904c9e6 100755
--- a/src/pages/index/order/index.vue
+++ b/src/pages/index/order/index.vue
@@ -67,7 +67,7 @@
>订单号:{{ item.outTradeNo }}
申请退款 handleClick(item, 'end'), 800)"
class="btn text-30rpx px-30rpx py-14rpx ml-30rpx border-#40A0E4 text-#40A0E4"
- >{{ item.isEvaluate !== 0 ? '去评价' : '查看评价' }}{{ item.isEvaluate !== 0 ? '去评价' : '查看记录' }}
handleClick(item, 'detail'), 800)"
@@ -301,11 +305,13 @@ onShow(() => {
// $Router.push('/personal')
$store.user.login().then((user) => {
// $store.user.setUserInfo(user)
- !user.nickName
- ? $Router.push({
- path: '/pages/other/edit-userinfo'
- })
- : userStore.setUserInfo(user) && dataList.value[current.value].show && paging.value[current.value]?.reload()
+ !user.nickName
+ ? $Router.push({
+ path: '/pages/other/edit-userinfo'
+ })
+ : userStore.setUserInfo(user) &&
+ dataList.value[current.value].show &&
+ paging.value[current.value]?.reload()
})
})
.catch(() => '')