Hooke / xysBooking

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
18339415 1 parent b5e0398e

新增首页

Inline Side-by-side
Showing 8 changed files with 122 additions and 55 deletions
...@@ -19,5 +19,7 @@ declare module '@vue/runtime-core' { ...@@ -19,5 +19,7 @@ declare module '@vue/runtime-core' {
19 VanRadio: typeof import('vant/es')['Radio'] 19 VanRadio: typeof import('vant/es')['Radio']
20 VanRadioGroup: typeof import('vant/es')['RadioGroup'] 20 VanRadioGroup: typeof import('vant/es')['RadioGroup']
21 VanRow: typeof import('vant/es')['Row'] 21 VanRow: typeof import('vant/es')['Row']
22 + VanSwipe: typeof import('vant/es')['Swipe']
23 + VanSwipeItem: typeof import('vant/es')['SwipeItem']
22 } 24 }
23 } 25 }
......
...@@ -33,7 +33,7 @@ mv "${output:?}/static" $path"/${output:?}" ...@@ -33,7 +33,7 @@ mv "${output:?}/static" $path"/${output:?}"
33 cd $path"/${output:?}" 33 cd $path"/${output:?}"
34 git pull 34 git pull
35 git add -A 35 git add -A
36 -git commit -m '别院预约前端网页更新' 36 +git commit -m '西园寺预约前端网页更新'
37 git push 37 git push
38 38
39 # 更新SSH服务器上文件 39 # 更新SSH服务器上文件
......
1 <!-- 1 <!--
2 * @Date: 2023-06-13 13:26:46 2 * @Date: 2023-06-13 13:26:46
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-01-15 10:04:45 4 + * @LastEditTime: 2024-01-15 10:24:37
5 * @FilePath: /xysBooking/src/App.vue 5 * @FilePath: /xysBooking/src/App.vue
6 * @Description: 启动页 6 * @Description: 启动页
7 --> 7 -->
8 <template> 8 <template>
9 - <div class="bg-wrapper"> 9 + <div>
10 - <div class="box-wrapper"> 10 + <router-view></router-view>
11 - <div class="box-top"></div>
12 - <router-view></router-view>
13 - </div>
14 </div> 11 </div>
15 </template> 12 </template>
16 13
...@@ -27,8 +24,6 @@ import wx from 'weixin-js-sdk' ...@@ -27,8 +24,6 @@ import wx from 'weixin-js-sdk'
27 import { wxJsAPI } from '@/api/wx/config' 24 import { wxJsAPI } from '@/api/wx/config'
28 import { apiList } from '@/api/wx/jsApiList.js'*/ 25 import { apiList } from '@/api/wx/jsApiList.js'*/
29 26
30 -import { orderInfoAPI } from '@/api/index'
31 -
32 // 使用 include + pinia 状态管理动态缓存页面 27 // 使用 include + pinia 状态管理动态缓存页面
33 const store = mainStore() 28 const store = mainStore()
34 const keepPages = computed(() => store.getKeepPages) 29 const keepPages = computed(() => store.getKeepPages)
...@@ -56,27 +51,17 @@ onMounted(async () => { ...@@ -56,27 +51,17 @@ onMounted(async () => {
56 wx.error((err) => { 51 wx.error((err) => {
57 console.warn(err); 52 console.warn(err);
58 });*/ 53 });*/
59 - // 进入后先查询有没有订单，有订单直接跳转最终页面
60 - const { data } = await orderInfoAPI();
61 - if (data?.id) {
62 - $router.replace({
63 - path: '/result',
64 - query: {
65 - id: data.id
66 - }
67 - })
68 - }
69 }) 54 })
70 </script> 55 </script>
71 56
72 <style lang="less"> 57 <style lang="less">
73 @prefix: ~'@{namespace}-x'; 58 @prefix: ~'@{namespace}-x';
74 59
75 -// html, 60 +html,
76 -// body { 61 +body {
77 -// width: 100%; 62 +width: 100%;
78 -// height: 100%; 63 +height: 100%;
79 -// } 64 +}
80 65
81 body { 66 body {
82 position: relative; 67 position: relative;
...@@ -87,7 +72,7 @@ body { ...@@ -87,7 +72,7 @@ body {
87 /* 全局修改主色调 */ 72 /* 全局修改主色调 */
88 // --van-blue: #F9D95C; 73 // --van-blue: #F9D95C;
89 74
90 - background-color: #F7EFEB; 75 + // background-color: #F7EFEB;
91 76
92 p { 77 p {
93 margin: 0; 78 margin: 0;
...@@ -108,30 +93,4 @@ body { ...@@ -108,30 +93,4 @@ body {
108 .zIndex { 93 .zIndex {
109 z-index: 4500 !important; 94 z-index: 4500 !important;
110 } 95 }
111 -
112 -.bg-wrapper {
113 - padding: 1rem;
114 - padding-bottom: 0;
115 - background-image: url('https://cdn.ipadbiz.cn/bieyuan/bg@2x~1.png');
116 - background-repeat: no-repeat;
117 -}
118 -
119 -.box-wrapper {
120 - background: #FFFFFF;
121 - box-shadow: 0px 0px 13px 0px rgba(95, 69, 54, 0.25);
122 - border-radius: 10px;
123 - border-bottom-right-radius: 0;
124 - border-bottom-left-radius: 0;
125 - min-height: calc(100vh - 1rem);
126 -
127 - .box-top {
128 - padding: 0 1rem 1rem;
129 - height: 1rem;
130 - background-image: url('https://cdn.ipadbiz.cn/bieyuan/top@2x~1.png');
131 - background-repeat: no-repeat;
132 - background-size: calc(100% - 2rem);
133 - background-position: 1rem 0;
134 - /* 向右位移 1rem */
135 - }
136 -}
137 </style> 96 </style>
......
...@@ -10,7 +10,7 @@ export default [ ...@@ -10,7 +10,7 @@ export default [
10 path: '/', 10 path: '/',
11 component: () => import('@/views/index.vue'), 11 component: () => import('@/views/index.vue'),
12 meta: { 12 meta: {
13 - title: '别院预约', 13 + title: '西园寺预约',
14 }, 14 },
15 }, 15 },
16 { 16 {
......
1 <!-- 1 <!--
2 * @Date: 2023-06-21 10:23:09 2 * @Date: 2023-06-21 10:23:09
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-01-15 10:07:06 4 + * @LastEditTime: 2024-01-15 11:37:41
5 * @FilePath: /xysBooking/src/views/index.vue 5 * @FilePath: /xysBooking/src/views/index.vue
6 * @Description: 预约页首页 6 * @Description: 预约页首页
7 --> 7 -->
8 <template> 8 <template>
9 <div class="index-page"> 9 <div class="index-page">
10 + <div class="index-content">
11 + <div style="height: 30vh;">
12 + <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
13 + <van-swipe-item>
14 + <img style="height: 30vh; width: 100vw;" src="https://cdn.ipadbiz.cn/xys/booking/banner.jpg" />
15 + </van-swipe-item>
16 + </van-swipe>
17 + </div>
18 + <div class="index-control">
19 + <div class="booking">
20 + <van-icon size="1.5rem" color="#FFFFFF" name="todo-list" />
21 + 立即预约
22 + </div>
23 + <div class="record">
24 + <van-icon size="1.5rem" color="#A67939" name="todo-list" />
25 + 预约记录
26 + </div>
27 + </div>
28 + <div class="logo"></div>
29 + </div>
30 + <div class="index-nav">
31 + <div class="nav-logo">
32 + <van-icon size="1.5rem" name="wap-home" color="#A67939" />
33 + 首页
34 + </div>
35 + <div class="nav-logo">
36 + <van-icon size="5rem" name="wap-home" color="#A67939" style="position: absolute; top: -4rem;" />
37 + <van-icon size="1.5rem" name="wap-home" color="#FFF" />
38 + 预约码
39 + </div>
40 + <div class="nav-logo">
41 + <van-icon size="1.5rem" name="manager-o" color="#A67939" />
42 + 我的
43 + </div>
44 + </div>
10 </div> 45 </div>
11 </template> 46 </template>
12 47
...@@ -19,7 +54,7 @@ import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@ ...@@ -19,7 +54,7 @@ import { Cookies, $, _, axios, storeToRefs, mainStore, Toast, useTitle } from '@
19 //import { } from '@/utils/generateIcons.js' 54 //import { } from '@/utils/generateIcons.js'
20 //import { } from '@/composables' 55 //import { } from '@/composables'
21 import { showSuccessToast, showFailToast } from 'vant'; 56 import { showSuccessToast, showFailToast } from 'vant';
22 -import { orderRestCountAPI } from '@/api/index' 57 +
23 const $route = useRoute(); 58 const $route = useRoute();
24 const $router = useRouter(); 59 const $router = useRouter();
25 useTitle($route.meta.title); 60 useTitle($route.meta.title);
...@@ -31,6 +66,77 @@ onMounted(async () => { ...@@ -31,6 +66,77 @@ onMounted(async () => {
31 66
32 <style lang="less" scoped> 67 <style lang="less" scoped>
33 .index-page { 68 .index-page {
34 - padding: 1rem 1rem 0; 69 + position: relative;
70 + height: 100vh;
71 + background-image: url('https://cdn.ipadbiz.cn/xys/booking/bg.jpg');
72 + background-repeat: no-repeat;
73 + background-position: center;
74 + .index-content {
75 + height: 90vh;
76 + .index-control {
77 + position: relative;
78 + display: flex;
79 + flex-direction: column;
80 + align-items: center;
81 + justify-content: center;
82 + margin-top: 10vh;
83 + // font-weight: bold;
84 + font-size: 1.15rem;
85 + .booking {
86 + background-color: #A67939;
87 + border-radius: 7px;
88 + color: #FFFFFF;
89 + padding: 0.7rem 4rem;
90 + border: 1px solid #A67939;
91 + }
92 + .record {
93 + color: #A67939;
94 + border-radius: 7px;
95 + padding: 0.7rem 4rem;
96 + border: 1px solid #A67939;
97 + margin-top: 1.5rem;
98 + }
99 + }
100 + .logo {
101 + position: absolute;
102 + right: 0;
103 + bottom: calc(15vh);
104 + height: 30vh;
105 + width: 20vw;
106 + background-image: url('https://cdn.ipadbiz.cn/xys/booking/logo.png');
107 + background-repeat: no-repeat;
108 + background-size: contain;
109 + background-position: center;
110 + }
111 + }
112 + .my-swipe {
113 + height: 30vh;
114 + .van-swipe-item {
115 + height: 30vh;
116 + width: 100vw;
117 + background-size: cover;
118 + background-repeat: no-repeat;
119 + background-position: center;
120 + }
121 + }
122 + .index-nav {
123 + position: absolute;
124 + bottom: 0;
125 + left: 0;
126 + width: 100vw;
127 + height: 10vh;
128 + background: #FFFFFF;
129 + box-shadow: 0rem -0.33rem 0.25rem 0rem rgba(0,0,0,0.12);
130 + display: flex;
131 + align-items: center;
132 + justify-content: space-around;
133 + color: #A67939;
134 + .nav-logo {
135 + position: relative;
136 + display: flex;
137 + flex-direction: column;
138 + align-items: center;
139 + }
140 + }
35 } 141 }
36 </style> 142 </style>
......