diff --git a/app/Http/Controllers/ComboItemController.php b/app/Http/Controllers/ComboItemController.php index f7df40e..6bd7c58 100644 --- a/app/Http/Controllers/ComboItemController.php +++ b/app/Http/Controllers/ComboItemController.php @@ -218,7 +218,7 @@ class ComboItemController extends Controller public function mp_buy_info(Request $request) { - Login::user(); + // Login::user(); $hospital = $request->post('hospital'); $combo = $request->post('combo'); $count = 0; diff --git a/菏泽颐圣体检中心小程序/lu/axios.js b/菏泽颐圣体检中心小程序/lu/axios.js index 591d908..03635ae 100644 --- a/菏泽颐圣体检中心小程序/lu/axios.js +++ b/菏泽颐圣体检中心小程序/lu/axios.js @@ -7,6 +7,7 @@ const noLogin = [ 'Config/get', 'Carousel/list', 'Hospital/info', + 'Combo/list', 'YO', ] diff --git a/菏泽颐圣体检中心小程序/pages/buy/info/info.vue b/菏泽颐圣体检中心小程序/pages/buy/info/info.vue index 13b4dc0..387019b 100644 --- a/菏泽颐圣体检中心小程序/pages/buy/info/info.vue +++ b/菏泽颐圣体检中心小程序/pages/buy/info/info.vue @@ -118,9 +118,18 @@ } } const toNext = () => { - uni.navigateTo({ - url: '/pages/buy/check/check' - }) + + if ($store.buy_info.person.length === 0) { + uni.navigateTo({ + url: '/pages/buy/person/person?type=combo_after' + + }) + }else{ + uni.navigateTo({ + url: '/pages/buy/check/check' + }) + } + } const user_info = ref(false) diff --git a/菏泽颐圣体检中心小程序/pages/buy/person/person.vue b/菏泽颐圣体检中心小程序/pages/buy/person/person.vue index 8348fec..a2e1d1d 100644 --- a/菏泽颐圣体检中心小程序/pages/buy/person/person.vue +++ b/菏泽颐圣体检中心小程序/pages/buy/person/person.vue @@ -73,6 +73,11 @@ const toPersonClick = (info) => { $store.buy_info.person = [info] switch ($props.type) { + case 'combo_after'://已经选完套餐 + uni.navigateTo({ + url: '/pages/buy/check/check' + }) + break; case 'choose': if (order_type_config.value.item === 1) { choose_type_show.value = true diff --git a/菏泽颐圣体检中心小程序/pages/main/combo/combo.vue b/菏泽颐圣体检中心小程序/pages/main/combo/combo.vue index 8d336b9..6e80e2e 100644 --- a/菏泽颐圣体检中心小程序/pages/main/combo/combo.vue +++ b/菏泽颐圣体检中心小程序/pages/main/combo/combo.vue @@ -22,6 +22,7 @@ useStore } from '@/store' const $store = useStore() + import CheckLogin from '@/components/check_login/check_login.vue' onShow(() => { setComboItemOpenFunc() getHospitalInfo() @@ -202,7 +203,8 @@ $store.buy_info.time = time if ($store.buy_info.person.length === 0) { uni.navigateTo({ - url: '/pages/buy/person/person?type=info' + //url: '/pages/buy/person/person?type=info' + url: '/pages/buy/info/info' }) } else { uni.navigateTo({ @@ -211,13 +213,16 @@ } } } - +const loginCallback=()=>{ + + } const comboClick = (id) => { uni.$lu.open.combo_item_open(id, '', '{"id":0,"date":null}') }