diff --git a/admin/src/pages/order/order.vue b/admin/src/pages/order/order.vue index 3c10158..b0fc826 100644 --- a/admin/src/pages/order/order.vue +++ b/admin/src/pages/order/order.vue @@ -344,9 +344,11 @@ const user_order_columns = [{ ]), h('div', null, [ h('b', '各方应收: '), - //h('span', !!row.appointment_number ? row.appointment_number : '-'), h('div', !!s_info ? s_info.map((item) => { - return item.account + ' ¥'+(item.amount/100) + if(item.account!='代理'){ + return item.account + ' ¥'+(item.amount/100) + } + }).join('\r\n') : ''), ]), h('div', null, [ diff --git a/思信体检小程序/lu/hospital.js b/思信体检小程序/lu/hospital.js index 6e5bd8f..89f7fd1 100644 --- a/思信体检小程序/lu/hospital.js +++ b/思信体检小程序/lu/hospital.js @@ -25,7 +25,13 @@ const HospitalInfo = async (latitude, longitude, cb) => { cb(response.data.info) }) } -const hospital = (cb = () => {}) => { - getFuzzyLocation(cb) +const hospital = (cb = () => {},status=false) => { + if(status){ + getFuzzyLocation(cb) + }else{ + HospitalInfo(26.536252, 101.715271, cb) + } + + } export default hospital \ No newline at end of file diff --git a/思信体检小程序/pages/main/home/home.vue b/思信体检小程序/pages/main/home/home.vue index 219ef24..04f55cc 100644 --- a/思信体检小程序/pages/main/home/home.vue +++ b/思信体检小程序/pages/main/home/home.vue @@ -51,9 +51,9 @@ } }) } - + const hospital_info = ref(false) - const getHospitalInfo = () => { + const getHospitalInfo = (status=false) => { uni.$lu.hospital((info) => { hospital_info.value = info uni.setNavigationBarTitle({ @@ -63,7 +63,7 @@ CarouselList(2) CarouselList(3) CarouselList(4) - }) + },status) } const choose_type_show = ref(false) const setOrderChooseTypeFunc = () => { @@ -154,7 +154,7 @@ } const loginCallback = () => { - getHospitalInfo() + getHospitalInfo(true) getUserInfo() } diff --git a/思信体检小程序/pages/user/edit/edit.vue b/思信体检小程序/pages/user/edit/edit.vue index 5757418..5a74de5 100644 --- a/思信体检小程序/pages/user/edit/edit.vue +++ b/思信体检小程序/pages/user/edit/edit.vue @@ -198,6 +198,13 @@ } const saveClick = async () => { + if(tongyi.value!='tongyi'){ + uni.showToast({ + title: "请阅读并同意用户协议", + icon:'none' + }) + return false; + } const response = !user_person_info.value.id ? await UserPersonCreateAction(user_person_info.value) : await UserPersonUpdateAction(user_person_info.value) @@ -207,6 +214,10 @@ }) }) } + let tongyi=ref(false) + const tongyiclick=(e)=>{ + tongyi.value=e.detail.value + }