diff --git a/app/Http/Controllers/AppointmentController.php b/app/Http/Controllers/AppointmentController.php index 4409ccd..51e4c65 100644 --- a/app/Http/Controllers/AppointmentController.php +++ b/app/Http/Controllers/AppointmentController.php @@ -309,12 +309,18 @@ class AppointmentController extends Controller $appointment->used_count = $appointment->max_count; } else { $list[$date]['info'] += max($appointment->max_count - $appointment->used_count, 0); + } $list[$date]['data']['list'][] = $appointment; } $l = []; foreach ($list as $item) { + if($item['info']==0){ + $item['info']='已满'; + } $l[] = $item; + + } return Yo::echo([ 'list' => $l, diff --git a/北京仁仁体检小程序/api/api.js b/北京仁仁体检小程序/api/api.js index c6701b0..810c645 100644 --- a/北京仁仁体检小程序/api/api.js +++ b/北京仁仁体检小程序/api/api.js @@ -1,7 +1,7 @@ let url_ = "https://bjrrtj-api.sixinyun.com"; let report_url_ = "https://bjrrtj-api.sixinyun.com"; let h5_url_ = "https://bjrrtj-api.sixinyun.com"; -const dev = 0; +const dev = 1; if (dev === 1) { url_ = "http://localbeijingrenren"; report_url_ = "http://192.168.31.106:5173"; diff --git a/北京仁仁体检小程序/api/index.js b/北京仁仁体检小程序/api/index.js index f90115e..8e19466 100644 --- a/北京仁仁体检小程序/api/index.js +++ b/北京仁仁体检小程序/api/index.js @@ -3,7 +3,7 @@ import { } from '@/lu/axios.js' import $api from './api.js' let url_ = "https://bjrrtj-api.sixinyun.com"; -const dev =0 +const dev =1 if (dev === 1) { url_ = "http://localbeijingrenren" } diff --git a/北京仁仁体检小程序/lu/axios.js b/北京仁仁体检小程序/lu/axios.js index 441a195..2e7743f 100644 --- a/北京仁仁体检小程序/lu/axios.js +++ b/北京仁仁体检小程序/lu/axios.js @@ -15,9 +15,11 @@ export const $post = async ({ url, data = {} }) => { + let token = getToken() ? getToken() : ''; if (noLogin.indexOf(url) === -1 && token === '') { uni.$lu.toast("请登录") + return false } let res = await uni.request({ @@ -28,6 +30,7 @@ export const $post = async ({ Authorization: 'Bearer ' + token } }); + if (!!res && res.data != '') { return res.data } else { diff --git a/北京仁仁体检小程序/pages/main/combo/combo.vue b/北京仁仁体检小程序/pages/main/combo/combo.vue index 6544947..80c7494 100644 --- a/北京仁仁体检小程序/pages/main/combo/combo.vue +++ b/北京仁仁体检小程序/pages/main/combo/combo.vue @@ -94,9 +94,11 @@ value: 0 }]) const HospitalActivityPackageList = async () => { + const response = await HospitalActivityPackageListAction({ hospital: hospital_info.value.id }) + $response(response, () => { package_list.value = [{ label: '全部', @@ -154,7 +156,6 @@ const max_count = ref(0) const combo_list = ref([]) const ComboList = async () => { - console.log('--------------') uni.showLoading() const response = await ComboListAction({ hospital: hospital_info.value.id