diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php index 9d78e85..c05c05d 100644 --- a/Laravel/app/Http/Controllers/API/H5/HomeController.php +++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php @@ -41,12 +41,12 @@ class HomeController extends Controller 'order' => [[ 'message' => '', 'name' => '个人体检预约', - 'jump' => '/pages/main/order/order', + 'jump' => '/pages/buy/choose/choose?url=api://CheckUpTypeGetList', 'icon' => '/assets/h5/gejianyuyue.png' ], [ 'message' => '', 'name' => '单位体检预约', - 'jump' => '/pages/main/combo/combo', + 'jump' => '/pages/main/cjwt/cjwt', 'icon' => '/assets/h5/tuanjianyuyue.png' ]], 'button' => [[[ diff --git a/h5/pages.json b/h5/pages.json index d741b8f..bb825ed 100644 --- a/h5/pages.json +++ b/h5/pages.json @@ -33,12 +33,24 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } + }, + { + "path": "pages/user/choose/choose", + "style": { + "navigationBarTitleText": "就诊人列表" + } + }, + { + "path": "pages/buy/choose/choose", + "style": { + "navigationBarTitleText": "个检预约" + } } ], "globalStyle": { - "navigationBarTextStyle": "black", + "navigationBarTextStyle": "white", "navigationBarTitleText": "海南现代妇女儿童医院", - "navigationBarBackgroundColor": "#F8F8F8", + "navigationBarBackgroundColor": "#259EA3", "backgroundColor": "#F8F8F8", "app-plus": { "background": "#efeff4" diff --git a/h5/pages/buy/choose/choose.vue b/h5/pages/buy/choose/choose.vue new file mode 100644 index 0000000..f7b3ec6 --- /dev/null +++ b/h5/pages/buy/choose/choose.vue @@ -0,0 +1,135 @@ + + + \ No newline at end of file diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue index 3d2abfb..43ac990 100644 --- a/h5/pages/main/index/index.vue +++ b/h5/pages/main/index/index.vue @@ -21,12 +21,9 @@ const $store = useStore() const getUserInfo = async () => { - const openid = uni.getStorageSync('OPENID') - const response = await $api('UserInfo', { - openid: openid - }) - $response(response, () => { - $store.user = response.data.info + const response = await $api('UserInfo') + $response(response, () => { + $store.user = response.data.info }) } const switch_arr = [ @@ -172,6 +169,12 @@ } } + const toChooseUser = () => { + uni.navigateTo({ + url: '/pages/user/choose/choose' + }) + } + onShow(() => { if (!!user_box_ref.value) { getLong() @@ -206,7 +209,7 @@ {{ $store.config.tip }} - 切换 + 切换 @@ -474,8 +477,8 @@ margin: 15rpx auto 0; display: flex; align-items: center; - justify-content: space-around; - background: #FFFFFF; + justify-content: space-around; + background: #FFFFFF; border-radius: 9rpx; } diff --git a/h5/pages/tpl.vue b/h5/pages/tpl.vue new file mode 100644 index 0000000..dd2f9db --- /dev/null +++ b/h5/pages/tpl.vue @@ -0,0 +1,49 @@ + + + \ No newline at end of file diff --git a/h5/pages/user/choose/choose.vue b/h5/pages/user/choose/choose.vue new file mode 100644 index 0000000..6f3ac9d --- /dev/null +++ b/h5/pages/user/choose/choose.vue @@ -0,0 +1,172 @@ + + + \ No newline at end of file diff --git a/h5/static/assets/userm.png b/h5/static/assets/userm.png new file mode 100644 index 0000000..8f5db14 Binary files /dev/null and b/h5/static/assets/userm.png differ diff --git a/h5/static/assets/userw.png b/h5/static/assets/userw.png new file mode 100644 index 0000000..78dfabc Binary files /dev/null and b/h5/static/assets/userw.png differ