Hooke / xyxBooking-weapp

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
b08cf0b5 1 parent 1f4f60f3

refactor: 将px单位转换为rpx并优化样式结构 

style: 统一组件样式和布局规范

chore: 移除未使用的navBar组件

fix: 修复样式细节和布局问题

docs: 更新文件描述和注释信息
Inline Side-by-side
Showing 25 changed files with 403 additions and 647 deletions
...@@ -7,7 +7,6 @@ export {} ...@@ -7,7 +7,6 @@ export {}
7 7
8 declare module 'vue' { 8 declare module 'vue' {
9 export interface GlobalComponents { 9 export interface GlobalComponents {
10 - NavBar: typeof import('./src/components/navBar.vue')['default']
11 NutButton: typeof import('@nutui/nutui-taro')['Button'] 10 NutButton: typeof import('@nutui/nutui-taro')['Button']
12 NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox'] 11 NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox']
13 NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup'] 12 NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup']
......
1 { 1 {
2 - "name": "myApp", 2 + "name": "xyxBooking",
3 "version": "1.0.0", 3 "version": "1.0.0",
4 "private": true, 4 "private": true,
5 - "description": "myApp", 5 + "description": "西园寺预约",
6 "templateInfo": { 6 "templateInfo": {
7 "name": "vue3-NutUI", 7 "name": "vue3-NutUI",
8 "typescript": false, 8 "typescript": false,
......
1 { 1 {
2 "miniprogramRoot": "./dist", 2 "miniprogramRoot": "./dist",
3 - "projectname": "myApp", 3 + "projectname": "xyxBooking",
4 - "description": "myApp", 4 + "description": "西园寺预约",
5 - "appid": "touristappid", 5 + "appid": "wxbf875033c6115304",
6 "setting": { 6 "setting": {
7 "urlCheck": true, 7 "urlCheck": true,
8 "es6": false, 8 "es6": false,
......
1 { 1 {
2 "miniprogramRoot": "./", 2 "miniprogramRoot": "./",
3 - "projectname": "myApp", 3 + "projectname": "xyxBooking",
4 - "description": "myApp", 4 + "description": "西园寺预约",
5 - "appid": "touristappid", 5 + "appid": "wxbf875033c6115304",
6 "setting": { 6 "setting": {
7 "urlCheck": true, 7 "urlCheck": true,
8 "es6": false, 8 "es6": false,
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 left: 0; 5 left: 0;
6 top: 0; 6 top: 0;
7 width: 100%; 7 width: 100%;
8 - height: 10px; 8 + height: 20rpx;
9 background-image: url('http://gyzs.onwall.cn/top-xian%402x.png'); 9 background-image: url('http://gyzs.onwall.cn/top-xian%402x.png');
10 background-size: contain; 10 background-size: contain;
11 } 11 }
......
1 -<!--
2 - * @Date: 2022-09-21 11:59:20
3 - * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-09-13 10:52:42
5 - * @FilePath: /meihuaApp/src/components/navBar.vue
6 - * @Description: 底部导航栏
7 --->
8 -<template>
9 - <view id="navbar-page" class="navbar-page">
10 - <view @tap="goTo('index')" class="home">
11 - <view style="height: 1.5rem;">
12 - <IconFont :name="icon_home" size="1.5rem" color="" />
13 - </view>
14 - <view><text :style="homeStyle">首页</text></view>
15 - </view>
16 - <view @tap="goTo('book')" class="book">
17 - <view style="height: 1.5rem;">
18 - <IconFont :name="icon_book" size="1.5rem" color="" />
19 - </view>
20 - <view><text :style="bookStyle">订房</text></view>
21 - </view>
22 - <view @tap="goTo('serverInfo')" class="server">
23 - <view style="height: 1.5rem;">
24 - <IconFont :name="icon_server" size="1.5rem" color="" />
25 - </view>
26 - <view><text :style="serverStyle">服务</text></view>
27 - </view>
28 - <view @tap="goTo('my')" class="my">
29 - <view style="height: 1.5rem;">
30 - <IconFont :name="icon_my" size="1.5rem" color="" />
31 - </view>
32 - <view><text :style="myStyle">我的</text></view>
33 - </view>
34 - </view>
35 -</template>
36 -
37 -<script setup>
38 -import Taro from '@tarojs/taro'
39 -import { ref, defineProps, computed, onMounted } from 'vue'
40 -import icon_home1 from '@/images/icon/icon_home1@2x.png'
41 -import icon_home2 from '@/images/icon/icon_home2@2x.png'
42 -import icon_my1 from '@/images/icon/icon_my1@2x.png'
43 -import icon_my2 from '@/images/icon/icon_my2@2x.png'
44 -import icon_book1 from '@/images/icon/icon_book1@2x.png'
45 -import icon_book2 from '@/images/icon/icon_book2@2x.png'
46 -import icon_server1 from '@/images/icon/icon_server1.png'
47 -import icon_server2 from '@/images/icon/icon_server2.png'
48 -// import { hostListAPI } from '@/api/Host/index'
49 -import { IconFont } from '@nutui/icons-vue-taro';
50 -
51 -const goTo = (page) => {
52 - if (props.activated === page) {
53 - return;
54 - }
55 - wx.redirectTo({
56 - url: `../${page}/index`
57 - });
58 -}
59 -
60 -// const createActivity = async () => {
61 -// // 获取主办方列表信息
62 -// const { code, data } = await hostListAPI();
63 -// if (code) {
64 -// if (!data.my_hosts.length) { // 主办方为空
65 -// Taro.showModal({
66 -// title: '温馨提示',
67 -// content: '请先创建主办方后新建活动',
68 -// success: function (res) {
69 -// if (res.confirm) {
70 -// Taro.navigateTo({
71 -// url: '../createProject/index'
72 -// });
73 -// }
74 -// }
75 -// });
76 -// } else {
77 -// Taro.navigateTo({
78 -// url: '../createActivity/index'
79 -// })
80 -// }
81 -// }
82 -// }
83 -
84 -const currentPage = ref('');
85 -
86 -onMounted(() => {
87 - let pages = getCurrentPages();
88 - let current_page = pages[pages.length - 1];
89 - let url = current_page.route;
90 - if (url == 'pages/index/index') {
91 - currentPage.value = 'index'
92 - } else {
93 - currentPage.value = 'my'
94 - }
95 -})
96 -
97 -const props = defineProps({
98 - activated: String,
99 -})
100 -
101 -const homeStyle = ref({})
102 -const myStyle = ref({})
103 -const bookStyle = ref({})
104 -const serverStyle = ref({})
105 -
106 -const icon_home = computed(() => {
107 - if (props.activated === 'index') {
108 - return icon_home1
109 - } else {
110 - return icon_home2
111 - }
112 -})
113 -const icon_my = computed(() => {
114 - if (props.activated === 'my') {
115 - return icon_my1
116 - } else {
117 - return icon_my2
118 - }
119 -})
120 -const icon_book = computed(() => {
121 - if (props.activated === 'book') {
122 - return icon_book1
123 - } else {
124 - return icon_book2
125 - }
126 -})
127 -const icon_server= computed(() => {
128 - if (props.activated === 'serverInfo') {
129 - return icon_server1
130 - } else {
131 - return icon_server2
132 - }
133 -})
134 -
135 -if (props.activated === 'index') {
136 - homeStyle.value = {
137 - color: '#6A4925',
138 - fontSize: '0.9rem'
139 - }
140 - myStyle.value = {
141 - color: '#999999',
142 - fontSize: '0.9rem'
143 - }
144 - bookStyle.value = {
145 - color: '#999999',
146 - fontSize: '0.9rem'
147 - }
148 - serverStyle.value = {
149 - color: '#999999',
150 - fontSize: '0.9rem'
151 - }
152 -} else if (props.activated === 'my') {
153 - homeStyle.value = {
154 - color: '#999999',
155 - fontSize: '0.9rem'
156 - }
157 - myStyle.value = {
158 - color: '#6A4925',
159 - fontSize: '0.9rem'
160 - }
161 - bookStyle.value = {
162 - color: '#999999',
163 - fontSize: '0.9rem'
164 - }
165 - serverStyle.value = {
166 - color: '#999999',
167 - fontSize: '0.9rem'
168 - }
169 -} else if (props.activated === 'book') {
170 - homeStyle.value = {
171 - color: '#999999',
172 - fontSize: '0.9rem'
173 - }
174 - myStyle.value = {
175 - color: '#999999',
176 - fontSize: '0.9rem'
177 - }
178 - bookStyle.value = {
179 - color: '#6A4925',
180 - fontSize: '0.9rem'
181 - }
182 - serverStyle.value = {
183 - color: '#999999',
184 - fontSize: '0.9rem'
185 - }
186 -} else if (props.activated === 'serverInfo') {
187 - homeStyle.value = {
188 - color: '#999999',
189 - fontSize: '0.9rem'
190 - }
191 - myStyle.value = {
192 - color: '#999999',
193 - fontSize: '0.9rem'
194 - }
195 - bookStyle.value = {
196 - color: '#999999',
197 - fontSize: '0.9rem'
198 - }
199 - serverStyle.value = {
200 - color: '#6A4925',
201 - fontSize: '0.9rem'
202 - }
203 -}
204 -
205 -</script>
206 -
207 -<style lang="less">
208 -.navbar-page {
209 - position: fixed;
210 - bottom: 0;
211 - background-color: #FFFFFF;
212 - padding-top: 0.5rem;
213 - height: 5rem;
214 - width: 100%;
215 -
216 - .home {
217 - position: absolute;
218 - left: 10%;
219 - transform: translateX(-15%);
220 - text-align: center;
221 - }
222 -
223 - .book {
224 - position: absolute;
225 - left: 35%;
226 - transform: translateX(-50%);
227 - text-align: center;
228 - }
229 -
230 - .server {
231 - position: absolute;
232 - left: 60%;
233 - transform: translateX(-50%);
234 - text-align: center;
235 - }
236 -
237 - .my {
238 - position: absolute;
239 - left: 85%;
240 - transform: translateX(-85%);
241 - text-align: center;
242 - }
243 -}
244 -</style>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <image src="https://cdn.ipadbiz.cn/xys/booking/%E5%8F%B3@2x.png" /> 25 <image src="https://cdn.ipadbiz.cn/xys/booking/%E5%8F%B3@2x.png" />
26 </view> 26 </view>
27 </view> 27 </view>
28 - <view style="color: red; margin-top: 1rem;">{{ userinfo.datetime }}</view> 28 + <view style="color: red; margin-top: 32rpx;">{{ userinfo.datetime }}</view>
29 </view> 29 </view>
30 <view class="user-list"> 30 <view class="user-list">
31 <view 31 <view
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
42 </view> 42 </view>
43 </view> 43 </view>
44 <view v-else class="no-qrcode"> 44 <view v-else class="no-qrcode">
45 - <image src="https://cdn.ipadbiz.cn/xys/booking/%E6%9A%82%E6%97%A0@2x.png" style="width: 10rem; height: 10rem;" /> 45 + <image src="https://cdn.ipadbiz.cn/xys/booking/%E6%9A%82%E6%97%A0@2x.png" style="width: 320rpx; height: 320rpx;" />
46 <view class="no-qrcode-title">今天没有预约记录</view> 46 <view class="no-qrcode-title">今天没有预约记录</view>
47 - <view style="text-align: center; color: #A67939; margin-top: 0.5rem;">查看我的“<text @tap="toRecord" style="text-decoration: underline; color: #ED9820;">预约记录</text>”</view> 47 + <view style="text-align: center; color: #A67939; margin-top: 16rpx;">查看我的“<text @tap="toRecord" style="text-decoration: underline; color: #ED9820;">预约记录</text>”</view>
48 </view> 48 </view>
49 </view> 49 </view>
50 </template> 50 </template>
...@@ -177,7 +177,7 @@ const init = async () => { ...@@ -177,7 +177,7 @@ const init = async () => {
177 }); 177 });
178 // 剔除qr_code为空的二维码 178 // 剔除qr_code为空的二维码
179 const validData = data.filter(item => item.qr_code !== ''); 179 const validData = data.filter(item => item.qr_code !== '');
180 - 180 +
181 if (validData.length > 0) { 181 if (validData.length > 0) {
182 userList.value = formatGroup(validData); 182 userList.value = formatGroup(validData);
183 refreshBtn(); 183 refreshBtn();
...@@ -238,36 +238,36 @@ const toRecord = () => { ...@@ -238,36 +238,36 @@ const toRecord = () => {
238 <style lang="less"> 238 <style lang="less">
239 .qr-code-page { 239 .qr-code-page {
240 .qrcode-content { 240 .qrcode-content {
241 - padding: 1rem 0; 241 + padding: 32rpx 0;
242 display: flex; 242 display: flex;
243 flex-direction: column; 243 flex-direction: column;
244 justify-content: center; 244 justify-content: center;
245 align-items: center; 245 align-items: center;
246 background-color: #FFF; 246 background-color: #FFF;
247 - border-radius: 8px; 247 + border-radius: 16rpx;
248 - box-shadow: 0rem 0rem 0.92rem 0rem rgba(106,106,106,0.27); 248 + box-shadow: 0 0 29rpx 0 rgba(106,106,106,0.27);
249 - 249 +
250 .user-info { 250 .user-info {
251 color: #A6A6A6; 251 color: #A6A6A6;
252 - font-size: 1.15rem; 252 + font-size: 37rpx;
253 - margin-top: 0.5rem; 253 + margin-top: 16rpx;
254 - margin-bottom: 0.5rem; 254 + margin-bottom: 16rpx;
255 } 255 }
256 .user-qrcode { 256 .user-qrcode {
257 display: flex; 257 display: flex;
258 align-items: center; 258 align-items: center;
259 .left { 259 .left {
260 image { 260 image {
261 - width: 1.75rem; height: 1.75rem; margin-right: 0.5rem; 261 + width: 56rpx; height: 56rpx; margin-right: 16rpx;
262 } 262 }
263 } 263 }
264 .center { 264 .center {
265 - border: 1px solid #D1D1D1; 265 + border: 2rpx solid #D1D1D1;
266 - border-radius: 20px; 266 + border-radius: 40rpx;
267 - padding: 0.5rem; 267 + padding: 16rpx;
268 position: relative; 268 position: relative;
269 image { 269 image {
270 - width: 15rem; height: 15rem; 270 + width: 480rpx; height: 480rpx;
271 } 271 }
272 .qrcode-used { 272 .qrcode-used {
273 position: absolute; 273 position: absolute;
...@@ -275,9 +275,9 @@ const toRecord = () => { ...@@ -275,9 +275,9 @@ const toRecord = () => {
275 left: 0; 275 left: 0;
276 right: 0; 276 right: 0;
277 bottom: 0; 277 bottom: 0;
278 - border-radius: 20px; 278 + border-radius: 40rpx;
279 overflow: hidden; 279 overflow: hidden;
280 - 280 +
281 .overlay { 281 .overlay {
282 width: 100%; 282 width: 100%;
283 height: 100%; 283 height: 100%;
...@@ -285,14 +285,14 @@ const toRecord = () => { ...@@ -285,14 +285,14 @@ const toRecord = () => {
285 background-size: contain; 285 background-size: contain;
286 opacity: 0.9; 286 opacity: 0.9;
287 } 287 }
288 - 288 +
289 .status-text { 289 .status-text {
290 color: #A67939; 290 color: #A67939;
291 position: absolute; 291 position: absolute;
292 top: 50%; 292 top: 50%;
293 left: 50%; 293 left: 50%;
294 transform: translate(-50%, -50%); 294 transform: translate(-50%, -50%);
295 - font-size: 1.2rem; 295 + font-size: 38rpx;
296 white-space: nowrap; 296 white-space: nowrap;
297 font-weight: bold; 297 font-weight: bold;
298 z-index: 10; 298 z-index: 10;
...@@ -301,37 +301,37 @@ const toRecord = () => { ...@@ -301,37 +301,37 @@ const toRecord = () => {
301 } 301 }
302 .right { 302 .right {
303 image { 303 image {
304 - width: 1.75rem; height: 1.75rem; 304 + width: 56rpx; height: 56rpx;
305 - margin-left: 0.5rem; 305 + margin-left: 16rpx;
306 } 306 }
307 } 307 }
308 } 308 }
309 } 309 }
310 .user-list { 310 .user-list {
311 display: flex; 311 display: flex;
312 - padding: 1rem; 312 + padding: 32rpx;
313 align-items: center; 313 align-items: center;
314 flex-wrap: wrap; 314 flex-wrap: wrap;
315 .user-item { 315 .user-item {
316 position: relative; 316 position: relative;
317 - padding: 0.25rem 0.5rem; 317 + padding: 8rpx 16rpx;
318 - border: 1px solid #A67939; 318 + border: 2rpx solid #A67939;
319 - margin: 0.25rem; 319 + margin: 8rpx;
320 - border-radius: 5px; 320 + border-radius: 10rpx;
321 color: #A67939; 321 color: #A67939;
322 &.checked { 322 &.checked {
323 color: #FFF; 323 color: #FFF;
324 background-color: #A67939; 324 background-color: #A67939;
325 } 325 }
326 &.border { 326 &.border {
327 - margin-right: 0.5rem; 327 + margin-right: 16rpx;
328 &::after { 328 &::after {
329 position: absolute; 329 position: absolute;
330 - right: -0.5rem; 330 + right: -16rpx;
331 - top: calc(50% - 0.5rem); 331 + top: calc(50% - 16rpx);
332 content: ''; 332 content: '';
333 - height: 1rem; 333 + height: 32rpx;
334 - border-right: 1px solid #A67939; 334 + border-right: 2rpx solid #A67939;
335 } 335 }
336 } 336 }
337 } 337 }
...@@ -342,11 +342,11 @@ const toRecord = () => { ...@@ -342,11 +342,11 @@ const toRecord = () => {
342 justify-content: center; 342 justify-content: center;
343 align-items: center; 343 align-items: center;
344 flex-direction: column; 344 flex-direction: column;
345 - margin-bottom: 1rem; 345 + margin-bottom: 32rpx;
346 - 346 +
347 .no-qrcode-title { 347 .no-qrcode-title {
348 color: #A67939; 348 color: #A67939;
349 - font-size: 1.05rem; 349 + font-size: 34rpx;
350 } 350 }
351 } 351 }
352 } 352 }
......
1 <!-- 1 <!--
2 * @Date: 2024-01-16 10:06:47 2 * @Date: 2024-01-16 10:06:47
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-12-26 12:35:01 4 + * @LastEditTime: 2026-01-06 23:06:49
5 * @FilePath: /xyxBooking-weapp/src/components/qrCodeSearch.vue 5 * @FilePath: /xyxBooking-weapp/src/components/qrCodeSearch.vue
6 * @Description: 预约码卡组件 6 * @Description: 预约码卡组件
7 --> 7 -->
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
25 <!-- <image src="https://cdn.ipadbiz.cn/xys/booking/%E5%8F%B3@2x.png"> --> 25 <!-- <image src="https://cdn.ipadbiz.cn/xys/booking/%E5%8F%B3@2x.png"> -->
26 </view> 26 </view>
27 </view> 27 </view>
28 - <view style="color: red; margin-top: 1rem;">{{ userinfo.datetime }}</view> 28 + <view style="color: red; margin-top: 32rpx;">{{ userinfo.datetime }}</view>
29 </view> 29 </view>
30 </view> 30 </view>
31 <view v-else class="no-qrcode"> 31 <view v-else class="no-qrcode">
32 - <image src="https://cdn.ipadbiz.cn/xys/booking/%E6%9A%82%E6%97%A0@2x.png" style="width: 10rem; height: 10rem;" /> 32 + <image src="https://cdn.ipadbiz.cn/xys/booking/%E6%9A%82%E6%97%A0@2x.png" style="width: 320rpx; height: 320rpx;" />
33 <view class="no-qrcode-title">您还没有预约过今天参观</view> 33 <view class="no-qrcode-title">您还没有预约过今天参观</view>
34 </view> 34 </view>
35 </view> 35 </view>
...@@ -88,7 +88,7 @@ onMounted(async () => { ...@@ -88,7 +88,7 @@ onMounted(async () => {
88 item.datetime = formatDatetime({ begin_time: item.begin_time, end_time: item.end_time }); 88 item.datetime = formatDatetime({ begin_time: item.begin_time, end_time: item.end_time });
89 item.id = formatId(item.id_number); 89 item.id = formatId(item.id_number);
90 userinfo.value = item; 90 userinfo.value = item;
91 - 91 +
92 const { code: status_code, data: status_data } = await qrcodeStatusAPI({ qr_code: item.qr_code }); 92 const { code: status_code, data: status_data } = await qrcodeStatusAPI({ qr_code: item.qr_code });
93 if (status_code) { 93 if (status_code) {
94 useStatus.value = status_data.status; 94 useStatus.value = status_data.status;
...@@ -101,31 +101,31 @@ onMounted(async () => { ...@@ -101,31 +101,31 @@ onMounted(async () => {
101 <style lang="less"> 101 <style lang="less">
102 .qr-code-page { 102 .qr-code-page {
103 .qrcode-content { 103 .qrcode-content {
104 - padding: 1rem 0; 104 + padding: 32rpx 0;
105 display: flex; 105 display: flex;
106 flex-direction: column; 106 flex-direction: column;
107 justify-content: center; 107 justify-content: center;
108 align-items: center; 108 align-items: center;
109 background-color: #FFF; 109 background-color: #FFF;
110 - border-radius: 8px; 110 + border-radius: 16rpx;
111 - box-shadow: 0rem 0rem 0.92rem 0rem rgba(106,106,106,0.27); 111 + box-shadow: 0 0 29rpx 0 rgba(106,106,106,0.27);
112 - 112 +
113 .user-info { 113 .user-info {
114 color: #A6A6A6; 114 color: #A6A6A6;
115 - font-size: 1.15rem; 115 + font-size: 37rpx;
116 - margin-top: 0.5rem; 116 + margin-top: 16rpx;
117 - margin-bottom: 0.5rem; 117 + margin-bottom: 16rpx;
118 } 118 }
119 .user-qrcode { 119 .user-qrcode {
120 display: flex; 120 display: flex;
121 align-items: center; 121 align-items: center;
122 .center { 122 .center {
123 - border: 1px solid #D1D1D1; 123 + border: 2rpx solid #D1D1D1;
124 - border-radius: 20px; 124 + border-radius: 40rpx;
125 - padding: 0.5rem; 125 + padding: 16rpx;
126 position: relative; 126 position: relative;
127 image { 127 image {
128 - width: 15rem; height: 15rem; 128 + width: 480rpx; height: 480rpx;
129 } 129 }
130 .qrcode-used { 130 .qrcode-used {
131 position: absolute; 131 position: absolute;
...@@ -133,9 +133,9 @@ onMounted(async () => { ...@@ -133,9 +133,9 @@ onMounted(async () => {
133 left: 0; 133 left: 0;
134 right: 0; 134 right: 0;
135 bottom: 0; 135 bottom: 0;
136 - border-radius: 20px; 136 + border-radius: 40rpx;
137 overflow: hidden; 137 overflow: hidden;
138 - 138 +
139 .overlay { 139 .overlay {
140 width: 100%; 140 width: 100%;
141 height: 100%; 141 height: 100%;
...@@ -143,14 +143,14 @@ onMounted(async () => { ...@@ -143,14 +143,14 @@ onMounted(async () => {
143 background-size: contain; 143 background-size: contain;
144 opacity: 0.9; 144 opacity: 0.9;
145 } 145 }
146 - 146 +
147 .status-text { 147 .status-text {
148 color: #A67939; 148 color: #A67939;
149 position: absolute; 149 position: absolute;
150 top: 50%; 150 top: 50%;
151 left: 50%; 151 left: 50%;
152 transform: translate(-50%, -50%); 152 transform: translate(-50%, -50%);
153 - font-size: 1.2rem; 153 + font-size: 38rpx;
154 white-space: nowrap; 154 white-space: nowrap;
155 font-weight: bold; 155 font-weight: bold;
156 z-index: 10; 156 z-index: 10;
...@@ -165,11 +165,11 @@ onMounted(async () => { ...@@ -165,11 +165,11 @@ onMounted(async () => {
165 justify-content: center; 165 justify-content: center;
166 align-items: center; 166 align-items: center;
167 flex-direction: column; 167 flex-direction: column;
168 - margin-bottom: 1rem; 168 + margin-bottom: 32rpx;
169 - 169 +
170 .no-qrcode-title { 170 .no-qrcode-title {
171 color: #A67939; 171 color: #A67939;
172 - font-size: 1.05rem; 172 + font-size: 34rpx;
173 } 173 }
174 } 174 }
175 } 175 }
......
...@@ -106,27 +106,27 @@ const goToDetail = (item) => { ...@@ -106,27 +106,27 @@ const goToDetail = (item) => {
106 <style lang="less"> 106 <style lang="less">
107 .booking-list-item { 107 .booking-list-item {
108 background-color: #FFF; 108 background-color: #FFF;
109 - border-radius: 8px; 109 + border-radius: 16rpx;
110 - padding: 1rem; 110 + padding: 32rpx;
111 - margin-bottom: 1rem; 111 + margin-bottom: 32rpx;
112 - box-shadow: 0rem 0rem 0.92rem 0rem rgba(106,106,106,0.1); 112 + box-shadow: 0 0 30rpx 0 rgba(106,106,106,0.1);
113 113
114 .booking-list-item-header { 114 .booking-list-item-header {
115 display: flex; 115 display: flex;
116 justify-content: space-between; 116 justify-content: space-between;
117 align-items: center; 117 align-items: center;
118 - padding-bottom: 0.5rem; 118 + padding-bottom: 16rpx;
119 - border-bottom: 1px dashed #E6E6E6; 119 + border-bottom: 2rpx dashed #E6E6E6;
120 - margin-bottom: 0.5rem; 120 + margin-bottom: 16rpx;
121 - font-size: 1rem; 121 + font-size: 32rpx;
122 font-weight: bold; 122 font-weight: bold;
123 color: #333; 123 color: #333;
124 124
125 .status { 125 .status {
126 - font-size: 0.85rem; 126 + font-size: 27rpx;
127 font-weight: normal; 127 font-weight: normal;
128 - padding: 2px 6px; 128 + padding: 4rpx 12rpx;
129 - border-radius: 4px; 129 + border-radius: 8rpx;
130 130
131 &.success { 131 &.success {
132 color: #A67939; 132 color: #A67939;
...@@ -148,7 +148,7 @@ const goToDetail = (item) => { ...@@ -148,7 +148,7 @@ const goToDetail = (item) => {
148 display: flex; 148 display: flex;
149 justify-content: space-between; 149 justify-content: space-between;
150 align-items: center; 150 align-items: center;
151 - margin-bottom: 0.5rem; 151 + margin-bottom: 16rpx;
152 color: #666; 152 color: #666;
153 153
154 .num-body { 154 .num-body {
...@@ -160,8 +160,8 @@ const goToDetail = (item) => { ...@@ -160,8 +160,8 @@ const goToDetail = (item) => {
160 } 160 }
161 .booking-price, .booking-time { 161 .booking-price, .booking-time {
162 color: #999; 162 color: #999;
163 - font-size: 0.9rem; 163 + font-size: 29rpx;
164 - margin-bottom: 0.3rem; 164 + margin-bottom: 10rpx;
165 text { 165 text {
166 color: #333; 166 color: #333;
167 } 167 }
......
1 <!-- 1 <!--
2 * @Date: 2024-01-15 16:35:10 2 * @Date: 2024-01-15 16:35:10
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-01-29 17:35:19 4 + * @LastEditTime: 2026-01-06 23:28:40
5 * @FilePath: /xyxBooking-weapp/src/pages/addVisitor/index.vue 5 * @FilePath: /xyxBooking-weapp/src/pages/addVisitor/index.vue
6 * @Description: 添加参观者 6 * @Description: 添加参观者
7 --> 7 -->
8 <template> 8 <template>
9 - <view class="add-visitor-page"> 9 + <view class="add-visitor-page">
10 - <nut-form> 10 + <nut-form>
11 - <nut-form-item label="姓名"> 11 + <nut-form-item label="姓名">
12 - <nut-input v-model="name" placeholder="请输入参观者姓名" type="text" /> 12 + <nut-input v-model="name" placeholder="请输入参观者姓名" type="text" />
13 - </nut-form-item> 13 + </nut-form-item>
14 - <nut-form-item label="证件类型"> 14 + <nut-form-item label="证件类型">
15 - <view style="padding: 10px 0;">身份证</view> 15 + <view style="padding: 20rpx 0;">身份证</view>
16 - </nut-form-item> 16 + </nut-form-item>
17 - <nut-form-item label="证件号"> 17 + <nut-form-item label="证件号">
18 - <nut-input v-model="id_number" placeholder="请输入参观者证件号" type="idcard" /> 18 + <nut-input v-model="id_number" placeholder="请输入参观者证件号" type="idcard" />
19 - </nut-form-item> 19 + </nut-form-item>
20 - </nut-form> 20 + </nut-form>
21 - 21 +
22 - <view style="padding: 1rem;"> 22 + <view style="padding: 32rpx;">
23 - <nut-button type="primary" block color="#A67939" @click="save">保存</nut-button> 23 + <nut-button type="primary" block color="#A67939" @click="save">保存</nut-button>
24 - </view> 24 + </view>
25 25
26 - <view v-if="visitorList.length" class="history-list"> 26 + <view v-if="visitorList.length" class="history-list">
27 - <view class="title">历史参观者</view> 27 + <view class="title">历史参观者</view>
28 - <view v-for="(item, index) in visitorList" :key="index" class="item"> 28 + <view v-for="(item, index) in visitorList" :key="index" class="item">
29 - <view class="info"> 29 + <view class="info">
30 - <view class="name">{{ item.name }}</view> 30 + <view class="name">{{ item.name }}</view>
31 - <view class="id">{{ formatId(item.id_number) }}</view> 31 + <view class="id">{{ formatId(item.id_number) }}</view>
32 + </view>
33 + <view class="action" @tap="delVisitor(item.id)">删除</view>
32 </view> 34 </view>
33 - <view class="action" @tap="delVisitor(item.id)">删除</view>
34 </view> 35 </view>
35 </view> 36 </view>
36 - </view>
37 </template> 37 </template>
38 38
39 <script setup> 39 <script setup>
...@@ -52,13 +52,13 @@ const checkIDCard = (idcode) => { ...@@ -52,13 +52,13 @@ const checkIDCard = (idcode) => {
52 } 52 }
53 53
54 function replaceMiddleCharacters(inputString) { 54 function replaceMiddleCharacters(inputString) {
55 - if (!inputString || inputString.length < 15) { 55 + if (!inputString || inputString.length < 15) {
56 - return inputString; 56 + return inputString;
57 - } 57 + }
58 - const start = Math.floor((inputString.length - 8) / 2); 58 + const start = Math.floor((inputString.length - 8) / 2);
59 - const end = start + 8; 59 + const end = start + 8;
60 - const replacement = '*'.repeat(8); 60 + const replacement = '*'.repeat(8);
61 - return inputString.substring(0, start) + replacement + inputString.substring(end); 61 + return inputString.substring(0, start) + replacement + inputString.substring(end);
62 } 62 }
63 63
64 const formatId = (id) => replaceMiddleCharacters(id); 64 const formatId = (id) => replaceMiddleCharacters(id);
...@@ -122,27 +122,27 @@ useDidShow(() => { ...@@ -122,27 +122,27 @@ useDidShow(() => {
122 .add-visitor-page { 122 .add-visitor-page {
123 min-height: 100vh; 123 min-height: 100vh;
124 background-color: #F6F6F6; 124 background-color: #F6F6F6;
125 - padding-top: 1px; 125 + padding-top: 2rpx;
126 126
127 .history-list { 127 .history-list {
128 - margin-top: 1rem; 128 + margin-top: 32rpx;
129 background-color: #FFF; 129 background-color: #FFF;
130 - padding: 1rem; 130 + padding: 32rpx;
131 131
132 .title { 132 .title {
133 - font-size: 1rem; 133 + font-size: 32rpx;
134 color: #333; 134 color: #333;
135 - margin-bottom: 1rem; 135 + margin-bottom: 32rpx;
136 - border-left: 3px solid #A67939; 136 + border-left: 6rpx solid #A67939;
137 - padding-left: 0.5rem; 137 + padding-left: 16rpx;
138 } 138 }
139 139
140 .item { 140 .item {
141 display: flex; 141 display: flex;
142 justify-content: space-between; 142 justify-content: space-between;
143 align-items: center; 143 align-items: center;
144 - padding: 1rem 0; 144 + padding: 32rpx 0;
145 - border-bottom: 1px solid #EEE; 145 + border-bottom: 2rpx solid #EEE;
146 146
147 &:last-child { 147 &:last-child {
148 border-bottom: none; 148 border-bottom: none;
...@@ -150,19 +150,20 @@ useDidShow(() => { ...@@ -150,19 +150,20 @@ useDidShow(() => {
150 150
151 .info { 151 .info {
152 .name { 152 .name {
153 - font-size: 1rem; 153 + font-size: 32rpx;
154 color: #333; 154 color: #333;
155 - margin-bottom: 0.3rem; 155 + margin-bottom: 10rpx;
156 } 156 }
157 +
157 .id { 158 .id {
158 - font-size: 0.9rem; 159 + font-size: 29rpx;
159 color: #999; 160 color: #999;
160 } 161 }
161 } 162 }
162 163
163 .action { 164 .action {
164 color: #FF0000; 165 color: #FF0000;
165 - font-size: 0.9rem; 166 + font-size: 29rpx;
166 } 167 }
167 } 168 }
168 } 169 }
......
...@@ -28,7 +28,7 @@ useDidShow(() => { ...@@ -28,7 +28,7 @@ useDidShow(() => {
28 28
29 <style lang="less"> 29 <style lang="less">
30 .auth-page { 30 .auth-page {
31 - height: 100vh; 31 + min-height: 100vh;
32 display: flex; 32 display: flex;
33 align-items: center; 33 align-items: center;
34 justify-content: center; 34 justify-content: center;
......
1 <!-- 1 <!--
2 * @Date: 2024-01-15 13:35:51 2 * @Date: 2024-01-15 13:35:51
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-02-05 16:57:15 4 + * @LastEditTime: 2026-01-06 23:00:39
5 * @FilePath: /xyxBooking-weapp/src/pages/booking/index.vue 5 * @FilePath: /xyxBooking-weapp/src/pages/booking/index.vue
6 * @Description: 预约页面 6 * @Description: 预约页面
7 --> 7 -->
...@@ -64,12 +64,12 @@ ...@@ -64,12 +64,12 @@
64 <view class="title"> 64 <view class="title">
65 <view class="text">选择参访时间段</view> 65 <view class="text">选择参访时间段</view>
66 </view> 66 </view>
67 - <view style="padding: 1.5rem 0.75rem; color: #A67939; text-align: center;"> 67 + <view style="padding: 48rpx 24rpx; color: #A67939; text-align: center;">
68 暂未开启预约 68 暂未开启预约
69 </view> 69 </view>
70 </view> 70 </view>
71 </view> 71 </view>
72 - <view style="height: 5rem;"></view> 72 + <view style="height: 160rpx;"></view>
73 <view v-if="checked_day && checked_day_reserve_full === ReserveStatus.AVAILABLE" class="next"> 73 <view v-if="checked_day && checked_day_reserve_full === ReserveStatus.AVAILABLE" class="next">
74 <view @tap="nextBtn" class="button" style="background-color: #A67939;">下一步</view> 74 <view @tap="nextBtn" class="button" style="background-color: #A67939;">下一步</view>
75 </view> 75 </view>
...@@ -292,44 +292,44 @@ const nextBtn = () => { ...@@ -292,44 +292,44 @@ const nextBtn = () => {
292 .booking-page { 292 .booking-page {
293 position: relative; 293 position: relative;
294 .calendar { 294 .calendar {
295 - padding: 1rem 0.5rem; 295 + padding: 32rpx 16rpx;
296 .choose-date { 296 .choose-date {
297 - border-radius: 5px; 297 + border-radius: 10rpx;
298 background-color: #FFFFFF; 298 background-color: #FFFFFF;
299 299
300 300
301 .title { 301 .title {
302 - padding: 0.5rem 0.75rem; 302 + padding: 16rpx 24rpx;
303 display: flex; 303 display: flex;
304 justify-content: space-between; 304 justify-content: space-between;
305 align-items: center; 305 align-items: center;
306 .text { 306 .text {
307 &::before { 307 &::before {
308 content: ''; 308 content: '';
309 - border: 2px solid #A67939; 309 + border: 4rpx solid #A67939;
310 - margin-right: 0.5rem; 310 + margin-right: 16rpx;
311 } 311 }
312 } 312 }
313 .day { 313 .day {
314 background-color: #FFFBF3; 314 background-color: #FFFBF3;
315 - border-radius: 7px; 315 + border-radius: 14rpx;
316 - border: 1px solid #A67939; 316 + border: 2rpx solid #A67939;
317 - padding: 0.2rem 0.5rem; 317 + padding: 6rpx 16rpx;
318 color: #A67939; 318 color: #A67939;
319 } 319 }
320 } 320 }
321 .days-of-week { 321 .days-of-week {
322 background-color: #EAEAEA; 322 background-color: #EAEAEA;
323 display: flex; 323 display: flex;
324 - padding: 0.75em 1%; 324 + padding: 24rpx 1%;
325 - font-size: 0.85rem; 325 + font-size: 27rpx;
326 .item { 326 .item {
327 width: 14.5%; 327 width: 14.5%;
328 text-align: center; 328 text-align: center;
329 } 329 }
330 } 330 }
331 .weeks-wrapper { 331 .weeks-wrapper {
332 - padding: 0.5rem 0; 332 + padding: 16rpx 0;
333 } 333 }
334 .weeks { 334 .weeks {
335 display: flex; 335 display: flex;
...@@ -338,32 +338,32 @@ const nextBtn = () => { ...@@ -338,32 +338,32 @@ const nextBtn = () => {
338 width: 14.28%; // 100 / 7 338 width: 14.28%; // 100 / 7
339 // width: 11.5%; 339 // width: 11.5%;
340 text-align: center; 340 text-align: center;
341 - margin: 0 0.3rem; 341 + margin: 0 10rpx;
342 - padding: 0.5rem 0; 342 + padding: 16rpx 0;
343 - border: 1px solid #FFF; 343 + border: 2rpx solid #FFF;
344 .day-lunar { 344 .day-lunar {
345 color: #1E1E1E; 345 color: #1E1E1E;
346 - font-size: 0.85rem; 346 + font-size: 27rpx;
347 - margin-bottom: 5px; 347 + margin-bottom: 10rpx;
348 } 348 }
349 .day-text { 349 .day-text {
350 color: #1E1E1E; 350 color: #1E1E1E;
351 font-weight: bold; 351 font-weight: bold;
352 - font-size: 1.05rem; 352 + font-size: 34rpx;
353 } 353 }
354 .day-price { 354 .day-price {
355 color: #A67939; 355 color: #A67939;
356 - font-size: 0.85rem; 356 + font-size: 27rpx;
357 } 357 }
358 &.checked { 358 &.checked {
359 - border: 1px solid #A67939; 359 + border: 2rpx solid #A67939;
360 - border-radius: 5px; 360 + border-radius: 10rpx;
361 background-color: #FFFBF3; 361 background-color: #FFFBF3;
362 } 362 }
363 &.disabled { 363 &.disabled {
364 .day-lunar { 364 .day-lunar {
365 color: #C7C7C7; 365 color: #C7C7C7;
366 - margin-bottom: 5px; 366 + margin-bottom: 10rpx;
367 } 367 }
368 .day-text { 368 .day-text {
369 color: #C7C7C7; 369 color: #C7C7C7;
...@@ -373,24 +373,24 @@ const nextBtn = () => { ...@@ -373,24 +373,24 @@ const nextBtn = () => {
373 } 373 }
374 .day-no-booking { 374 .day-no-booking {
375 color: #C7C7C7; 375 color: #C7C7C7;
376 - font-size: 0.75rem; 376 + font-size: 24rpx;
377 } 377 }
378 } 378 }
379 } 379 }
380 } 380 }
381 } 381 }
382 .choose-time { 382 .choose-time {
383 - margin-top: 1rem; 383 + margin-top: 32rpx;
384 .title { 384 .title {
385 - padding: 0.5rem 0.75rem; 385 + padding: 16rpx 24rpx;
386 display: flex; 386 display: flex;
387 justify-content: space-between; 387 justify-content: space-between;
388 align-items: center; 388 align-items: center;
389 .text { 389 .text {
390 &::before { 390 &::before {
391 content: ''; 391 content: '';
392 - border: 2px solid #A67939; 392 + border: 4rpx solid #A67939;
393 - margin-right: 0.5rem; 393 + margin-right: 16rpx;
394 } 394 }
395 } 395 }
396 } 396 }
...@@ -400,21 +400,21 @@ const nextBtn = () => { ...@@ -400,21 +400,21 @@ const nextBtn = () => {
400 align-items: center; 400 align-items: center;
401 justify-content: space-between; 401 justify-content: space-between;
402 background-color: #FFF; 402 background-color: #FFF;
403 - border-radius: 5px; 403 + border-radius: 10rpx;
404 - padding: 0.85rem; 404 + padding: 27rpx;
405 - margin: 1rem 0; 405 + margin: 32rpx 0;
406 .left { 406 .left {
407 display: flex; 407 display: flex;
408 align-items: center; 408 align-items: center;
409 color: #1E1E1E; 409 color: #1E1E1E;
410 .icon { 410 .icon {
411 - width: 1.2rem; 411 + width: 38rpx;
412 - height: 1.2rem; 412 + height: 38rpx;
413 - margin-right: 0.5rem; 413 + margin-right: 16rpx;
414 } 414 }
415 .price { 415 .price {
416 color:#A67939; 416 color:#A67939;
417 - margin-left: 0.5rem; 417 + margin-left: 16rpx;
418 } 418 }
419 } 419 }
420 .right { 420 .right {
...@@ -439,22 +439,22 @@ const nextBtn = () => { ...@@ -439,22 +439,22 @@ const nextBtn = () => {
439 .next { 439 .next {
440 position: fixed; 440 position: fixed;
441 bottom: 0; 441 bottom: 0;
442 - height: 5rem; 442 + height: 160rpx;
443 - width: 100vw; 443 + width: 750rpx;
444 display: flex; 444 display: flex;
445 left: 0; 445 left: 0;
446 background-color: #FFF; 446 background-color: #FFF;
447 align-items: center; 447 align-items: center;
448 justify-content: center; 448 justify-content: center;
449 - box-shadow: 0rem -0.33rem 0.25rem 0rem rgba(0,0,0,0.12); 449 + box-shadow: 0 -10rpx 8rpx 0 rgba(0,0,0,0.12);
450 .button { 450 .button {
451 color: #FFF; 451 color: #FFF;
452 - padding: 0.85rem 0; 452 + padding: 27rpx 0;
453 - border-radius: 8px; 453 + border-radius: 16rpx;
454 - font-size: 1.1rem; 454 + font-size: 35rpx;
455 text-align: center; 455 text-align: center;
456 flex-grow: 1; 456 flex-grow: 1;
457 - margin: 1rem; 457 + margin: 32rpx;
458 } 458 }
459 } 459 }
460 } 460 }
......
...@@ -7,25 +7,25 @@ ...@@ -7,25 +7,25 @@
7 --> 7 -->
8 <template> 8 <template>
9 <view class="booking-code-page"> 9 <view class="booking-code-page">
10 - <view style="padding: 1rem;"> 10 + <view style="padding: 32rpx;">
11 <qrCode></qrCode> 11 <qrCode></qrCode>
12 <view class="warning"> 12 <view class="warning">
13 <view><IconFont name="tips" />&nbsp;温馨提示</view> 13 <view><IconFont name="tips" />&nbsp;温馨提示</view>
14 - <view style="margin-top: 0.5rem;">一人一码，扫码或识别身份证成功后进入</view> 14 + <view style="margin-top: 16rpx;">一人一码，扫码或识别身份证成功后进入</view>
15 - <view style="height: 8rem;"></view> 15 + <view style="height: 256rpx;"></view>
16 </view> 16 </view>
17 </view> 17 </view>
18 <view class="index-nav"> 18 <view class="index-nav">
19 <view class="nav-logo" @tap="toHome"> 19 <view class="nav-logo" @tap="toHome">
20 - <image :src="icon_3" style="width: 1.5rem; height: 1.5rem;" /> 20 + <image :src="icon_3" style="width: 48rpx; height: 48rpx;" />
21 首页 21 首页
22 </view> 22 </view>
23 <view class="nav-logo"> 23 <view class="nav-logo">
24 - <image :src="icon_4" style="width: 1.5rem; height: 1.5rem; margin-bottom: 0.1rem;" /> 24 + <image :src="icon_4" style="width: 48rpx; height: 48rpx; margin-bottom: 3rpx;" />
25 预约码 25 预约码
26 </view> 26 </view>
27 <view class="nav-logo" @tap="toMy"> 27 <view class="nav-logo" @tap="toMy">
28 - <image :src="icon_5" style="width: 1.5rem; height: 1.5rem;" /> 28 + <image :src="icon_5" style="width: 48rpx; height: 48rpx;" />
29 我的 29 我的
30 </view> 30 </view>
31 </view> 31 </view>
...@@ -62,17 +62,17 @@ const toHome = () => { // 跳转到首页 ...@@ -62,17 +62,17 @@ const toHome = () => { // 跳转到首页
62 .warning { 62 .warning {
63 text-align: center; 63 text-align: center;
64 color: #A67939; 64 color: #A67939;
65 - margin-top: 1rem; 65 + margin-top: 32rpx;
66 } 66 }
67 67
68 .index-nav { 68 .index-nav {
69 position: fixed; 69 position: fixed;
70 bottom: 0; 70 bottom: 0;
71 left: 0; 71 left: 0;
72 - width: 100vw; 72 + width: 750rpx;
73 - height: 10vh; 73 + height: 134rpx;
74 background: #FFFFFF; 74 background: #FFFFFF;
75 - box-shadow: 0rem -0.33rem 0.25rem 0rem rgba(0,0,0,0.12); 75 + box-shadow: 0 -10rpx 8rpx 0 rgba(0,0,0,0.12);
76 display: flex; 76 display: flex;
77 align-items: center; 77 align-items: center;
78 justify-content: space-around; 78 justify-content: space-around;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 <view>{{ qrCodeStatusText }}</view> 34 <view>{{ qrCodeStatusText }}</view>
35 </view> 35 </view>
36 </view> 36 </view>
37 - <view style="height: 5rem;"></view> 37 + <view style="height: 160rpx;"></view>
38 <view v-if="billInfo.status === CodeStatus.SUCCESS && billInfo.show_cancel_reserve === 1" class="cancel-wrapper"> 38 <view v-if="billInfo.status === CodeStatus.SUCCESS && billInfo.show_cancel_reserve === 1" class="cancel-wrapper">
39 <view @tap="cancelBooking" class="cancel-btn ">取消预约</view> 39 <view @tap="cancelBooking" class="cancel-btn ">取消预约</view>
40 </view> 40 </view>
...@@ -83,7 +83,7 @@ const cancelBooking = async () => { ...@@ -83,7 +83,7 @@ const cancelBooking = async () => {
83 content: '是否取消预约？', 83 content: '是否取消预约？',
84 confirmColor: '#A67939' 84 confirmColor: '#A67939'
85 }); 85 });
86 - 86 +
87 if (confirm) { 87 if (confirm) {
88 Taro.showLoading({ title: '取消中...' }); 88 Taro.showLoading({ title: '取消中...' });
89 const { code, data } = await icbcRefundAPI({ pay_id: pay_id.value }); 89 const { code, data } = await icbcRefundAPI({ pay_id: pay_id.value });
...@@ -114,29 +114,29 @@ useDidShow(async () => { ...@@ -114,29 +114,29 @@ useDidShow(async () => {
114 .booking-detail-page { 114 .booking-detail-page {
115 min-height: 100vh; 115 min-height: 100vh;
116 background-color: #F6F6F6; 116 background-color: #F6F6F6;
117 - padding: 1rem; 117 + padding: 32rpx;
118 - 118 +
119 .detail-wrapper { 119 .detail-wrapper {
120 background-color: #FFF; 120 background-color: #FFF;
121 - border-radius: 8px; 121 + border-radius: 16rpx;
122 - padding: 1rem; 122 + padding: 32rpx;
123 - margin-top: 1rem; 123 + margin-top: 32rpx;
124 - box-shadow: 0rem 0rem 0.92rem 0rem rgba(106,106,106,0.1); 124 + box-shadow: 0 0 29rpx 0 rgba(106,106,106,0.1);
125 - 125 +
126 .detail-item { 126 .detail-item {
127 display: flex; 127 display: flex;
128 justify-content: space-between; 128 justify-content: space-between;
129 - margin-bottom: 0.8rem; 129 + margin-bottom: 26rpx;
130 color: #333; 130 color: #333;
131 - font-size: 0.95rem; 131 + font-size: 30rpx;
132 - 132 +
133 &:last-child { 133 &:last-child {
134 margin-bottom: 0; 134 margin-bottom: 0;
135 } 135 }
136 - 136 +
137 view:first-child { 137 view:first-child {
138 color: #999; 138 color: #999;
139 - width: 5rem; 139 + width: 160rpx;
140 } 140 }
141 view:last-child { 141 view:last-child {
142 flex: 1; 142 flex: 1;
...@@ -144,24 +144,24 @@ useDidShow(async () => { ...@@ -144,24 +144,24 @@ useDidShow(async () => {
144 } 144 }
145 } 145 }
146 } 146 }
147 - 147 +
148 .cancel-wrapper { 148 .cancel-wrapper {
149 position: fixed; 149 position: fixed;
150 bottom: 0; 150 bottom: 0;
151 left: 0; 151 left: 0;
152 - width: 100vw; 152 + width: 750rpx;
153 background-color: #FFF; 153 background-color: #FFF;
154 - padding: 1rem; 154 + padding: 32rpx;
155 box-sizing: border-box; 155 box-sizing: border-box;
156 - 156 +
157 .cancel-btn { 157 .cancel-btn {
158 background-color: #FFF; 158 background-color: #FFF;
159 color: #A67939; 159 color: #A67939;
160 - border: 1px solid #A67939; 160 + border: 2rpx solid #A67939;
161 text-align: center; 161 text-align: center;
162 - padding: 0.8rem 0; 162 + padding: 26rpx 0;
163 - border-radius: 8px; 163 + border-radius: 16rpx;
164 - font-size: 1.1rem; 164 + font-size: 35rpx;
165 } 165 }
166 } 166 }
167 } 167 }
......
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
11 <reserveCard :data="item" /> 11 <reserveCard :data="item" />
12 </view> 12 </view>
13 13
14 - <view v-if="loading" style="text-align: center; color: #999; padding: 10px;">加载中...</view> 14 + <view v-if="loading" style="text-align: center; color: #999; padding: 20rpx;">加载中...</view>
15 - <view v-if="finished && bookingList.length > 0" style="text-align: center; color: #999; padding: 10px;">没有更多了</view> 15 + <view v-if="finished && bookingList.length > 0" style="text-align: center; color: #999; padding: 20rpx;">没有更多了</view>
16 16
17 <view v-if="!bookingList.length && finished" class="no-qrcode"> 17 <view v-if="!bookingList.length && finished" class="no-qrcode">
18 - <image src="https://cdn.ipadbiz.cn/xys/booking/%E6%9A%82%E6%97%A0@2x.png" style="width: 10rem; height: 10rem;" /> 18 + <image src="https://cdn.ipadbiz.cn/xys/booking/%E6%9A%82%E6%97%A0@2x.png" style="width: 320rpx; height: 320rpx;" />
19 <view class="no-qrcode-title">您还没有预约过参观</view> 19 <view class="no-qrcode-title">您还没有预约过参观</view>
20 </view> 20 </view>
21 </view> 21 </view>
...@@ -78,7 +78,7 @@ useReachBottom(() => { ...@@ -78,7 +78,7 @@ useReachBottom(() => {
78 78
79 <style lang="less"> 79 <style lang="less">
80 .booking-list-page { 80 .booking-list-page {
81 - padding: 1rem; 81 + padding: 32rpx;
82 min-height: 100vh; 82 min-height: 100vh;
83 background-color: #F6F6F6; 83 background-color: #F6F6F6;
84 84
...@@ -87,12 +87,12 @@ useReachBottom(() => { ...@@ -87,12 +87,12 @@ useReachBottom(() => {
87 justify-content: center; 87 justify-content: center;
88 align-items: center; 88 align-items: center;
89 flex-direction: column; 89 flex-direction: column;
90 - padding-top: 5rem; 90 + padding-top: 160rpx;
91 91
92 .no-qrcode-title { 92 .no-qrcode-title {
93 color: #A67939; 93 color: #A67939;
94 - font-size: 1.05rem; 94 + font-size: 34rpx;
95 - margin-top: 1rem; 95 + margin-top: 32rpx;
96 } 96 }
97 } 97 }
98 } 98 }
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <view class="info-item">参访时间：<text>{{ billInfo?.datetime || '--' }}</text></view> 14 <view class="info-item">参访时间：<text>{{ billInfo?.datetime || '--' }}</text></view>
15 <view class="info-item">支付金额：<text>¥ {{ billInfo?.total_amt || 0 }}</text></view> 15 <view class="info-item">支付金额：<text>¥ {{ billInfo?.total_amt || 0 }}</text></view>
16 </view> 16 </view>
17 - <view style="padding: 0.5rem; display: flex; justify-content: center; margin-top: 1rem;"> 17 + <view style="padding: 16rpx; display: flex; justify-content: center; margin-top: 32rpx;">
18 <nut-button color="#A67939" size="small" @click="returnMerchant">返回首页</nut-button> 18 <nut-button color="#A67939" size="small" @click="returnMerchant">返回首页</nut-button>
19 </view> 19 </view>
20 </view> 20 </view>
...@@ -43,7 +43,7 @@ const out_trade_no = router.params.out_trade_no ...@@ -43,7 +43,7 @@ const out_trade_no = router.params.out_trade_no
43 43
44 const getBillInfo = async () => { 44 const getBillInfo = async () => {
45 if (!out_trade_no) return 45 if (!out_trade_no) return
46 - 46 +
47 try { 47 try {
48 // Get order details 48 // Get order details
49 const { code, data } = await onAuthBillInfoAPI({ order_id: out_trade_no }) 49 const { code, data } = await onAuthBillInfoAPI({ order_id: out_trade_no })
...@@ -69,43 +69,43 @@ onMounted(() => { ...@@ -69,43 +69,43 @@ onMounted(() => {
69 69
70 <style lang="less"> 70 <style lang="less">
71 .callback-page { 71 .callback-page {
72 - padding: 1rem; 72 + padding: 32rpx;
73 background: #fff; 73 background: #fff;
74 min-height: 100vh; 74 min-height: 100vh;
75 - 75 +
76 .text-prompts { 76 .text-prompts {
77 display: flex; 77 display: flex;
78 flex-direction: column; 78 flex-direction: column;
79 align-items: center; 79 align-items: center;
80 - margin-bottom: 2rem; 80 + margin-bottom: 64rpx;
81 - padding-top: 2rem; 81 + padding-top: 64rpx;
82 - 82 +
83 .status-icon { 83 .status-icon {
84 - width: 100px; 84 + width: 200rpx;
85 - height: 100px; 85 + height: 200rpx;
86 } 86 }
87 - 87 +
88 .text { 88 .text {
89 - margin-top: 1rem; 89 + margin-top: 32rpx;
90 - font-size: 1.2rem; 90 + font-size: 38rpx;
91 color: #333; 91 color: #333;
92 } 92 }
93 } 93 }
94 - 94 +
95 .appointment-information { 95 .appointment-information {
96 background: #f8f8f8; 96 background: #f8f8f8;
97 - padding: 1rem; 97 + padding: 32rpx;
98 - border-radius: 8px; 98 + border-radius: 16rpx;
99 - 99 +
100 .info-item { 100 .info-item {
101 - margin-bottom: 0.5rem; 101 + margin-bottom: 16rpx;
102 - font-size: 0.9rem; 102 + font-size: 29rpx;
103 color: #666; 103 color: #666;
104 - 104 +
105 text { 105 text {
106 color: #333; 106 color: #333;
107 font-weight: 500; 107 font-weight: 500;
108 - margin-left: 0.5rem; 108 + margin-left: 16rpx;
109 } 109 }
110 } 110 }
111 } 111 }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
2 * index页面样式 2 * index页面样式
3 */ 3 */
4 .index { 4 .index {
5 - padding: 20px; 5 + padding: 40rpx;
6 6
7 .nut-button { 7 .nut-button {
8 - margin-bottom: 20px; 8 + margin-bottom: 40rpx;
9 } 9 }
10 -}
...\ No newline at end of file ...\ No newline at end of file
10 +}
......
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-02-05 18:36:21 4 + * @LastEditTime: 2026-01-06 23:01:43
5 - * @FilePath: /xysBooking/src/views/index.vue 5 + * @FilePath: /xyxBooking-weapp/src/pages/index/index.vue
6 * @Description: 预约页首页 6 * @Description: 预约页首页
7 --> 7 -->
8 <template> 8 <template>
9 <view class="index-page"> 9 <view class="index-page">
10 <view class="index-content"> 10 <view class="index-content">
11 - <view style="height: 30vh;"> 11 + <view style="height: 400rpx;">
12 <swiper class="my-swipe" :autoplay="true" :interval="3000" indicator-dots indicator-color="white" :circular="true"> 12 <swiper class="my-swipe" :autoplay="true" :interval="3000" indicator-dots indicator-color="white" :circular="true">
13 <swiper-item> 13 <swiper-item>
14 - <image style="height: 30vh; width: 100vw;" src="https://cdn.ipadbiz.cn/xys/booking/banner.jpg" mode="aspectFill" /> 14 + <image style="height: 400rpx; width: 750rpx;" src="https://cdn.ipadbiz.cn/xys/booking/banner.jpg" mode="aspectFill" />
15 </swiper-item> 15 </swiper-item>
16 </swiper> 16 </swiper>
17 </view> 17 </view>
18 - 18 +
19 <view ref="root" class="index-circular"> 19 <view ref="root" class="index-circular">
20 <view class="booking-wrapper"> 20 <view class="booking-wrapper">
21 <view class="booking" @tap="toBooking"> 21 <view class="booking" @tap="toBooking">
22 - <view><image :src="icon_1" style="width: 3rem; height: 3rem;" /></view> 22 + <view><image :src="icon_1" style="width: 96rpx; height: 96rpx;" /></view>
23 <view style="color: #FFF;">开始预约</view> 23 <view style="color: #FFF;">开始预约</view>
24 </view> 24 </view>
25 </view> 25 </view>
...@@ -28,16 +28,16 @@ ...@@ -28,16 +28,16 @@
28 </view> 28 </view>
29 <view class="index-nav"> 29 <view class="index-nav">
30 <view class="nav-logo"> 30 <view class="nav-logo">
31 - <image :src="icon_3" style="width: 1.5rem; height: 1.5rem;" /> 31 + <image :src="icon_3" style="width: 48rpx; height: 48rpx;" />
32 首页 32 首页
33 </view> 33 </view>
34 <view class="nav-logo" @tap="toCode"> 34 <view class="nav-logo" @tap="toCode">
35 - <image :src="icon_4" style="width: 5rem; height: 5rem; position: absolute; top: -4rem;" /> 35 + <image :src="icon_4" style="width: 160rpx; height: 160rpx; position: absolute; top: -170rpx;" />
36 - <!-- <van-icon size="1.5rem" name="wap-home" color="#FFF" style="opacity: 0;" /> --> 36 + <!-- <van-icon size="48rpx" name="wap-home" color="#FFF" style="opacity: 0;" /> -->
37 预约码 37 预约码
38 </view> 38 </view>
39 <view class="nav-logo" @tap="toMy"> 39 <view class="nav-logo" @tap="toMy">
40 - <image :src="icon_5" style="width: 1.5rem; height: 1.5rem;" /> 40 + <image :src="icon_5" style="width: 48rpx; height: 48rpx;" />
41 我的 41 我的
42 </view> 42 </view>
43 </view> 43 </view>
...@@ -93,51 +93,51 @@ useShareAppMessage(() => { ...@@ -93,51 +93,51 @@ useShareAppMessage(() => {
93 <style lang="less"> 93 <style lang="less">
94 .index-page { 94 .index-page {
95 position: relative; 95 position: relative;
96 - height: 100vh; 96 + min-height: 100vh;
97 background-image: url('https://cdn.ipadbiz.cn/xys/booking/bg.jpg'); 97 background-image: url('https://cdn.ipadbiz.cn/xys/booking/bg.jpg');
98 background-repeat: no-repeat; 98 background-repeat: no-repeat;
99 background-position: center; 99 background-position: center;
100 background-size: cover; /* 确保背景覆盖 */ 100 background-size: cover; /* 确保背景覆盖 */
101 .index-content { 101 .index-content {
102 - height: 90vh; 102 + height: calc(100vh - 134rpx);
103 .index-control { 103 .index-control {
104 position: relative; 104 position: relative;
105 display: flex; 105 display: flex;
106 flex-direction: column; 106 flex-direction: column;
107 align-items: center; 107 align-items: center;
108 justify-content: center; 108 justify-content: center;
109 - margin-top: 10vh; 109 + margin-top: 130rpx;
110 // font-weight: bold; 110 // font-weight: bold;
111 - font-size: 1.15rem; 111 + font-size: 37rpx;
112 .booking { 112 .booking {
113 display: flex; 113 display: flex;
114 justify-content: center; 114 justify-content: center;
115 align-items: center; 115 align-items: center;
116 background-color: #A67939; 116 background-color: #A67939;
117 - border-radius: 7px; 117 + border-radius: 14rpx;
118 color: #FFFFFF; 118 color: #FFFFFF;
119 - padding: 0.7rem 4rem; 119 + padding: 22rpx 128rpx;
120 - border: 1px solid #A67939; 120 + border: 2rpx solid #A67939;
121 } 121 }
122 .record { 122 .record {
123 display: flex; 123 display: flex;
124 justify-content: center; 124 justify-content: center;
125 align-items: center; 125 align-items: center;
126 color: #A67939; 126 color: #A67939;
127 - border-radius: 7px; 127 + border-radius: 14rpx;
128 - padding: 0.7rem 4rem; 128 + padding: 22rpx 128rpx;
129 - border: 1px solid #A67939; 129 + border: 2rpx solid #A67939;
130 - margin-top: 1.5rem; 130 + margin-top: 48rpx;
131 } 131 }
132 .search { 132 .search {
133 display: flex; 133 display: flex;
134 justify-content: center; 134 justify-content: center;
135 align-items: center; 135 align-items: center;
136 color: #A67939; 136 color: #A67939;
137 - border-radius: 7px; 137 + border-radius: 14rpx;
138 - padding: 0.7rem 4rem; 138 + padding: 22rpx 128rpx;
139 - border: 1px solid #A67939; 139 + border: 2rpx solid #A67939;
140 - margin-top: 1.5rem; 140 + margin-top: 48rpx;
141 } 141 }
142 } 142 }
143 .index-circular { 143 .index-circular {
...@@ -145,21 +145,21 @@ useShareAppMessage(() => { ...@@ -145,21 +145,21 @@ useShareAppMessage(() => {
145 display: flex; 145 display: flex;
146 align-items: center; 146 align-items: center;
147 justify-content: center; 147 justify-content: center;
148 - margin-top: 10vh; 148 + margin-top: 130rpx;
149 // font-weight: bold; 149 // font-weight: bold;
150 - font-size: 1.1rem; 150 + font-size: 35rpx;
151 151
152 .booking-wrapper { 152 .booking-wrapper {
153 - height: 19vh; 153 + height: 260rpx;
154 - width: 19vh; 154 + width: 260rpx;
155 border-radius: 50%; 155 border-radius: 50%;
156 background-color: rgba(166, 121, 57, 0.26); 156 background-color: rgba(166, 121, 57, 0.26);
157 display: flex; 157 display: flex;
158 align-items: center; 158 align-items: center;
159 justify-content: center; 159 justify-content: center;
160 .booking { 160 .booking {
161 - height: 17vh; 161 + height: 230rpx;
162 - width: 17vh; 162 + width: 230rpx;
163 border-radius: 50%; 163 border-radius: 50%;
164 background-color: #A67939; 164 background-color: #A67939;
165 display: flex; 165 display: flex;
...@@ -172,9 +172,9 @@ useShareAppMessage(() => { ...@@ -172,9 +172,9 @@ useShareAppMessage(() => {
172 .logo { 172 .logo {
173 position: absolute; 173 position: absolute;
174 right: 0; 174 right: 0;
175 - bottom: calc(15vh); 175 + bottom: 200rpx;
176 - height: 30vh; 176 + height: 400rpx;
177 - width: 20vw; 177 + width: 150rpx;
178 background-image: url('https://cdn.ipadbiz.cn/xys/booking/logo.png'); 178 background-image: url('https://cdn.ipadbiz.cn/xys/booking/logo.png');
179 background-repeat: no-repeat; 179 background-repeat: no-repeat;
180 background-size: contain; 180 background-size: contain;
...@@ -182,10 +182,10 @@ useShareAppMessage(() => { ...@@ -182,10 +182,10 @@ useShareAppMessage(() => {
182 } 182 }
183 } 183 }
184 .my-swipe { 184 .my-swipe {
185 - height: 30vh; 185 + height: 400rpx;
186 swiper-item { /* Taro swiper-item 编译后 */ 186 swiper-item { /* Taro swiper-item 编译后 */
187 - height: 30vh; 187 + height: 400rpx;
188 - width: 100vw; 188 + width: 750rpx;
189 background-size: cover; 189 background-size: cover;
190 background-repeat: no-repeat; 190 background-repeat: no-repeat;
191 background-position: center; 191 background-position: center;
...@@ -195,10 +195,10 @@ useShareAppMessage(() => { ...@@ -195,10 +195,10 @@ useShareAppMessage(() => {
195 position: absolute; 195 position: absolute;
196 bottom: 0; 196 bottom: 0;
197 left: 0; 197 left: 0;
198 - width: 100vw; 198 + width: 750rpx;
199 - height: 10vh; 199 + height: 134rpx;
200 background: #FFFFFF; 200 background: #FFFFFF;
201 - box-shadow: 0rem -0.33rem 0.25rem 0rem rgba(0,0,0,0.12); 201 + box-shadow: 0 -10rpx 8rpx 0 rgba(0,0,0,0.12);
202 display: flex; 202 display: flex;
203 align-items: center; 203 align-items: center;
204 justify-content: space-around; 204 justify-content: space-around;
......
...@@ -2,24 +2,24 @@ ...@@ -2,24 +2,24 @@
2 <view class="my-page"> 2 <view class="my-page">
3 <view v-for="(item, index) in menu_list" :key="index" class="my-item" @tap="go(item.to)"> 3 <view v-for="(item, index) in menu_list" :key="index" class="my-item" @tap="go(item.to)">
4 <view class="left"> 4 <view class="left">
5 - <image :src="item.icon" style="width: 1.2rem; height: 1.2rem; margin-right: 0.5rem;" /> 5 + <image :src="item.icon" style="width: 38rpx; height: 38rpx; margin-right: 16rpx;" />
6 {{ item.name }} 6 {{ item.name }}
7 </view> 7 </view>
8 <view> 8 <view>
9 - <IconFont name="rect-right" size="1.2rem" /> 9 + <IconFont name="rect-right" size="38rpx" />
10 </view> 10 </view>
11 </view> 11 </view>
12 <view class="index-nav"> 12 <view class="index-nav">
13 <view class="nav-logo" @tap="toHome"> 13 <view class="nav-logo" @tap="toHome">
14 - <image :src="icon_3" style="width: 1.5rem; height: 1.5rem;" /> 14 + <image :src="icon_3" style="width: 48rpx; height: 48rpx;" />
15 首页 15 首页
16 </view> 16 </view>
17 <view class="nav-logo" @tap="toCode"> 17 <view class="nav-logo" @tap="toCode">
18 - <image :src="icon_4" style="width: 1.5rem; height: 1.5rem; margin-bottom: 0.1rem;" /> 18 + <image :src="icon_4" style="width: 48rpx; height: 48rpx; margin-bottom: 3rpx;" />
19 预约码 19 预约码
20 </view> 20 </view>
21 <view class="nav-logo"> 21 <view class="nav-logo">
22 - <image :src="icon_5" style="width: 1.5rem; height: 1.5rem;" /> 22 + <image :src="icon_5" style="width: 48rpx; height: 48rpx;" />
23 我的 23 我的
24 </view> 24 </view>
25 </view> 25 </view>
...@@ -68,16 +68,16 @@ const menu_list = [{ ...@@ -68,16 +68,16 @@ const menu_list = [{
68 position: relative; 68 position: relative;
69 min-height: 100vh; 69 min-height: 100vh;
70 background-color: #F6F6F6; 70 background-color: #F6F6F6;
71 - padding: 1rem; 71 + padding: 32rpx;
72 72
73 .my-item { 73 .my-item {
74 - padding: 1rem; 74 + padding: 32rpx;
75 display: flex; 75 display: flex;
76 justify-content:space-between; 76 justify-content:space-between;
77 align-items: center; 77 align-items: center;
78 - margin-bottom: 1rem; 78 + margin-bottom: 32rpx;
79 background-color: #FFF; 79 background-color: #FFF;
80 - border-radius: 5px; 80 + border-radius: 10rpx;
81 .left { 81 .left {
82 color: #A67939; 82 color: #A67939;
83 display: flex; 83 display: flex;
...@@ -88,10 +88,10 @@ const menu_list = [{ ...@@ -88,10 +88,10 @@ const menu_list = [{
88 position: fixed; 88 position: fixed;
89 bottom: 0; 89 bottom: 0;
90 left: 0; 90 left: 0;
91 - width: 100vw; 91 + width: 750rpx;
92 - height: 10vh; 92 + height: 134rpx;
93 background: #FFFFFF; 93 background: #FFFFFF;
94 - box-shadow: 0rem -0.33rem 0.25rem 0rem rgba(0,0,0,0.12); 94 + box-shadow: 0 -10rpx 8rpx 0 rgba(0,0,0,0.12);
95 display: flex; 95 display: flex;
96 align-items: center; 96 align-items: center;
97 justify-content: space-around; 97 justify-content: space-around;
......
...@@ -8,18 +8,18 @@ ...@@ -8,18 +8,18 @@
8 <template> 8 <template>
9 <view class="notice-page"> 9 <view class="notice-page">
10 <view class="content"> 10 <view class="content">
11 - <view style="text-align: center; font-size: 1.1rem; margin-bottom: 0.5rem;">温馨提示</view> 11 + <view style="text-align: center; font-size: 35rpx; margin-bottom: 16rpx;">温馨提示</view>
12 <view> 12 <view>
13 为了您和他人的健康与安全，维护清净庄严的寺院环境，营造一个喜悦而祥和的节日氛围，请您留意并遵守以下注意事项： 13 为了您和他人的健康与安全，维护清净庄严的寺院环境，营造一个喜悦而祥和的节日氛围，请您留意并遵守以下注意事项：
14 </view> 14 </view>
15 - <view v-for="(item, index) in note_text" :key="index" style="margin-top: 0.5rem;">{{ item }}</view> 15 + <view v-for="(item, index) in note_text" :key="index" style="margin-top: 16rpx;">{{ item }}</view>
16 - <view style="margin-top: 0.5rem;">谢谢您的支持与配合。祝您新春吉祥、万事如意。</view> 16 + <view style="margin-top: 16rpx;">谢谢您的支持与配合。祝您新春吉祥、万事如意。</view>
17 </view> 17 </view>
18 - <view style="height: 8rem"></view> 18 + <view style="height: 256rpx"></view>
19 <view class="footer"> 19 <view class="footer">
20 <nut-checkbox-group v-model="checked"> 20 <nut-checkbox-group v-model="checked">
21 - <nut-checkbox label="1" icon-size="1rem"> 21 + <nut-checkbox label="1" icon-size="32rpx">
22 - <text style="color: #a67939; font-size: 1rem">我已阅读并同意以上内容</text> 22 + <text style="color: #a67939; font-size: 32rpx">我已阅读并同意以上内容</text>
23 </nut-checkbox> 23 </nut-checkbox>
24 </nut-checkbox-group> 24 </nut-checkbox-group>
25 <view @tap="confirmBtn" class="confirm-btn">确认，下一步</view> 25 <view @tap="confirmBtn" class="confirm-btn">确认，下一步</view>
...@@ -60,35 +60,35 @@ const confirmBtn = () => { ...@@ -60,35 +60,35 @@ const confirmBtn = () => {
60 position: relative; 60 position: relative;
61 min-height: 100vh; 61 min-height: 100vh;
62 background-color: #F6F6F6; 62 background-color: #F6F6F6;
63 - padding-top: 1px; // 防止 margin collapse 63 + padding-top: 2rpx; // 防止 margin collapse
64 .content { 64 .content {
65 - margin: 1rem; 65 + margin: 32rpx;
66 background-color: #ffffff; 66 background-color: #ffffff;
67 - border-radius: 8px; 67 + border-radius: 16rpx;
68 - padding: 1rem; 68 + padding: 32rpx;
69 color: #333; 69 color: #333;
70 - font-size: 0.9rem; 70 + font-size: 29rpx;
71 line-height: 1.5; 71 line-height: 1.5;
72 } 72 }
73 .footer { 73 .footer {
74 position: fixed; 74 position: fixed;
75 bottom: 0; 75 bottom: 0;
76 - width: 100vw; 76 + width: 750rpx;
77 background-color: #FFF; 77 background-color: #FFF;
78 display: flex; 78 display: flex;
79 flex-direction: column; 79 flex-direction: column;
80 - padding: 1rem; 80 + padding: 32rpx;
81 box-sizing: border-box; 81 box-sizing: border-box;
82 - box-shadow: 0rem -0.33rem 0.25rem 0rem rgba(0,0,0,0.12); 82 + box-shadow: 0 -10rpx 8rpx 0 rgba(0,0,0,0.12);
83 - 83 +
84 .confirm-btn { 84 .confirm-btn {
85 background-color: #A67939; 85 background-color: #A67939;
86 color: #FFF; 86 color: #FFF;
87 text-align: center; 87 text-align: center;
88 - padding: 0.8rem 0; 88 + padding: 26rpx 0;
89 - border-radius: 8px; 89 + border-radius: 16rpx;
90 - margin-top: 1rem; 90 + margin-top: 32rpx;
91 - font-size: 1.1rem; 91 + font-size: 35rpx;
92 } 92 }
93 } 93 }
94 } 94 }
......
1 <!-- 1 <!--
2 * @Date: 2024-01-26 13:08:09 2 * @Date: 2024-01-26 13:08:09
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-01-30 17:51:11 4 + * @LastEditTime: 2026-01-06 23:23:30
5 * @FilePath: /xyxBooking-weapp/src/pages/search/index.vue 5 * @FilePath: /xyxBooking-weapp/src/pages/search/index.vue
6 * @Description: 文件描述 6 * @Description: 文件描述
7 --> 7 -->
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
15 <input type="text" v-model="idCode" placeholder="请输入证件号码" @blur="checkIdCode" maxlength="18" style="width: 100%;"> 15 <input type="text" v-model="idCode" placeholder="请输入证件号码" @blur="checkIdCode" maxlength="18" style="width: 100%;">
16 </view> 16 </view>
17 </view> 17 </view>
18 - <view style="color:#A67939; font-size: 0.95rem; text-align: center;"> 18 + <view style="color:#A67939; font-size: 30rpx; text-align: center;">
19 <view> 19 <view>
20 <IconFont name="tips" />&nbsp;温馨提示 20 <IconFont name="tips" />&nbsp;温馨提示
21 </view> 21 </view>
22 - <view style="margin-top: 0.5rem;">获取参观码，扫码或识别身份证成功进闸机</view> 22 + <view style="margin-top: 16rpx;">获取参观码，扫码或识别身份证成功进闸机</view>
23 </view> 23 </view>
24 </view> 24 </view>
25 <view v-else> 25 <view v-else>
...@@ -85,42 +85,42 @@ const goToHome = () => { ...@@ -85,42 +85,42 @@ const goToHome = () => {
85 85
86 <style lang="less"> 86 <style lang="less">
87 .search-page { 87 .search-page {
88 - padding: 1rem; 88 + padding: 32rpx;
89 min-height: 100vh; 89 min-height: 100vh;
90 background-color: #F6F6F6; 90 background-color: #F6F6F6;
91 91
92 .input-item { 92 .input-item {
93 background-color: #FFF; 93 background-color: #FFF;
94 - padding: 1rem; 94 + padding: 32rpx;
95 - border-radius: 8px; 95 + border-radius: 16rpx;
96 - margin-bottom: 1rem; 96 + margin-bottom: 32rpx;
97 97
98 view:first-child { 98 view:first-child {
99 - margin-bottom: 0.5rem; 99 + margin-bottom: 16rpx;
100 font-weight: bold; 100 font-weight: bold;
101 } 101 }
102 input { 102 input {
103 - border-bottom: 1px solid #EEE; 103 + border-bottom: 2rpx solid #EEE;
104 - padding: 0.5rem 0; 104 + padding: 16rpx 0;
105 } 105 }
106 } 106 }
107 107
108 .save-wrapper { 108 .save-wrapper {
109 - margin-top: 2rem; 109 + margin-top: 64rpx;
110 .save-btn { 110 .save-btn {
111 background-color: #A67939; 111 background-color: #A67939;
112 color: #FFF; 112 color: #FFF;
113 text-align: center; 113 text-align: center;
114 - padding: 0.8rem 0; 114 + padding: 26rpx 0;
115 - border-radius: 8px; 115 + border-radius: 16rpx;
116 - font-size: 1.1rem; 116 + font-size: 35rpx;
117 } 117 }
118 } 118 }
119 119
120 .success-btn { 120 .success-btn {
121 position: fixed; 121 position: fixed;
122 - bottom: 2rem; 122 + bottom: 64rpx;
123 - width: 100vw; 123 + width: 750rpx;
124 left: 0; 124 left: 0;
125 display: flex; 125 display: flex;
126 justify-content: space-around; 126 justify-content: space-around;
...@@ -128,13 +128,13 @@ const goToHome = () => { ...@@ -128,13 +128,13 @@ const goToHome = () => {
128 .btn-item { 128 .btn-item {
129 width: 40%; 129 width: 40%;
130 text-align: center; 130 text-align: center;
131 - padding: 0.8rem 0; 131 + padding: 26rpx 0;
132 - border-radius: 8px; 132 + border-radius: 16rpx;
133 - font-size: 1.1rem; 133 + font-size: 35rpx;
134 } 134 }
135 135
136 .btn-left { 136 .btn-left {
137 - border: 1px solid #A67939; 137 + border: 2rpx solid #A67939;
138 color: #A67939; 138 color: #A67939;
139 background-color: #FFF; 139 background-color: #FFF;
140 } 140 }
...@@ -148,9 +148,9 @@ const goToHome = () => { ...@@ -148,9 +148,9 @@ const goToHome = () => {
148 .logo { 148 .logo {
149 position: absolute; 149 position: absolute;
150 right: 0; 150 right: 0;
151 - bottom: 15vh; 151 + bottom: 200rpx;
152 - height: 30vh; 152 + height: 400rpx;
153 - width: 20vw; 153 + width: 150rpx;
154 background-image: url('https://cdn.ipadbiz.cn/xys/booking/logo.png'); 154 background-image: url('https://cdn.ipadbiz.cn/xys/booking/logo.png');
155 background-repeat: no-repeat; 155 background-repeat: no-repeat;
156 background-size: contain; 156 background-size: contain;
......
...@@ -9,39 +9,39 @@ ...@@ -9,39 +9,39 @@
9 <view class="submit-page"> 9 <view class="submit-page">
10 <view @tap="goToBooking" class="visit-time"> 10 <view @tap="goToBooking" class="visit-time">
11 <view>参访时间</view> 11 <view>参访时间</view>
12 - <view><text style="font-size: 0.95rem;">{{ date }} {{ time }}</text>&nbsp;<IconFont name="rect-right" /></view> 12 + <view><text style="font-size: 30rpx;">{{ date }} {{ time }}</text>&nbsp;<IconFont name="rect-right" /></view>
13 </view> 13 </view>
14 <view @tap="goToVisitor" class="add-visitors"> 14 <view @tap="goToVisitor" class="add-visitors">
15 <view><IconFont name="plus" /> 添加参观者</view> 15 <view><IconFont name="plus" /> 添加参观者</view>
16 </view> 16 </view>
17 <view v-if="visitorList.length" class="visitors-list"> 17 <view v-if="visitorList.length" class="visitors-list">
18 <view v-for="(item, index) in visitorList" :key="index" @tap="addVisitor(item)" class="visitor-item"> 18 <view v-for="(item, index) in visitorList" :key="index" @tap="addVisitor(item)" class="visitor-item">
19 - <view style="margin-right: 1rem;"> 19 + <view style="margin-right: 32rpx;">
20 - <image v-if="!checked_visitors.includes(item.id)" :src="icon_check1" style="width: 1.2rem; height: 1.2rem;" /> 20 + <image v-if="!checked_visitors.includes(item.id)" :src="icon_check1" style="width: 38rpx; height: 38rpx;" />
21 - <image v-else :src="icon_check2" style="width: 1.2rem; height: 1.2rem;" /> 21 + <image v-else :src="icon_check2" style="width: 38rpx; height: 38rpx;" />
22 </view> 22 </view>
23 <view> 23 <view>
24 <view style="color: #A67939;">{{ item.name }}</view> 24 <view style="color: #A67939;">{{ item.name }}</view>
25 <view>证件号：{{ formatId(item.id_number) }}</view> 25 <view>证件号：{{ formatId(item.id_number) }}</view>
26 - <view v-if="item.is_reserve === RESERVE_STATUS.ENABLE" style="color: #9C9A9A; font-size: 0.8rem;">*已预约过{{ date }}参观，请不要重复预约</view> 26 + <view v-if="item.is_reserve === RESERVE_STATUS.ENABLE" style="color: #9C9A9A; font-size: 26rpx;">*已预约过{{ date }}参观，请不要重复预约</view>
27 </view> 27 </view>
28 </view> 28 </view>
29 </view> 29 </view>
30 <view v-else class="no-visitors-list"> 30 <view v-else class="no-visitors-list">
31 - <image src="https://cdn.ipadbiz.cn/xys/booking/%E6%9A%82%E6%97%A0@2x.png" style="width: 10rem; height: 10rem;" /> 31 + <image src="https://cdn.ipadbiz.cn/xys/booking/%E6%9A%82%E6%97%A0@2x.png" style="width: 320rpx; height: 320rpx;" />
32 <view class="no-visitors-list-title">您还没有添加过参观者</view> 32 <view class="no-visitors-list-title">您还没有添加过参观者</view>
33 </view> 33 </view>
34 - <view style="height: 5rem;"></view> 34 + <view style="height: 160rpx;"></view>
35 <view class="submit-wrapper"> 35 <view class="submit-wrapper">
36 <view class="control-wrapper"> 36 <view class="control-wrapper">
37 <view class="left"> 37 <view class="left">
38 - <view style="margin-left: 1rem; display: flex;align-items: center;"> 38 + <view style="margin-left: 32rpx; display: flex;align-items: center;">
39 - 订单金额&nbsp;&nbsp;<view style="color: #FF1919;display: inline-block;">¥<view style="font-size: 1.5rem;display: inline-block;">&nbsp;{{ total }}</view></view> 39 + 订单金额&nbsp;&nbsp;<view style="color: #FF1919;display: inline-block;">¥<view style="font-size: 48rpx;display: inline-block;">&nbsp;{{ total }}</view></view>
40 </view> 40 </view>
41 </view> 41 </view>
42 <view @tap="submitBtn" class="right">提交订单</view> 42 <view @tap="submitBtn" class="right">提交订单</view>
43 </view> 43 </view>
44 - <view style="font-size: 0.85rem;margin-left: 1rem;color: #FF1919; margin-bottom: 1rem;">提交后请在10分钟内完成支付</view> 44 + <view style="font-size: 27rpx;margin-left: 32rpx;color: #FF1919; margin-bottom: 32rpx;">提交后请在10分钟内完成支付</view>
45 </view> 45 </view>
46 </view> 46 </view>
47 </template> 47 </template>
...@@ -181,31 +181,31 @@ useDidShow(async () => { ...@@ -181,31 +181,31 @@ useDidShow(async () => {
181 181
182 <style lang="less"> 182 <style lang="less">
183 .submit-page { 183 .submit-page {
184 - margin: 1rem; 184 + margin: 32rpx;
185 position: relative; 185 position: relative;
186 .visit-time { 186 .visit-time {
187 background-color: #FFF; 187 background-color: #FFF;
188 display: flex; 188 display: flex;
189 align-items: center; 189 align-items: center;
190 justify-content: space-between; 190 justify-content: space-between;
191 - padding: 0.75rem; 191 + padding: 24rpx;
192 - border-radius: 8px; 192 + border-radius: 16rpx;
193 } 193 }
194 .add-visitors { 194 .add-visitors {
195 - border: 1px dashed #A67939; 195 + border: 2rpx dashed #A67939;
196 color: #A67939; 196 color: #A67939;
197 - border-radius: 5px; 197 + border-radius: 10rpx;
198 text-align: center; 198 text-align: center;
199 - padding: .65rem 0; 199 + padding: 21rpx 0;
200 - margin: 1rem 0; 200 + margin: 32rpx 0;
201 - font-size: 1.15rem; 201 + font-size: 37rpx;
202 } 202 }
203 .visitors-list { 203 .visitors-list {
204 .visitor-item { 204 .visitor-item {
205 background-color: #FFF; 205 background-color: #FFF;
206 - border-radius: 8px; 206 + border-radius: 16rpx;
207 - padding: 1rem; 207 + padding: 32rpx;
208 - margin-bottom: 1rem; 208 + margin-bottom: 32rpx;
209 display: flex; 209 display: flex;
210 align-items: center; 210 align-items: center;
211 } 211 }
...@@ -216,26 +216,26 @@ useDidShow(async () => { ...@@ -216,26 +216,26 @@ useDidShow(async () => {
216 align-items: center; 216 align-items: center;
217 flex-direction: column; 217 flex-direction: column;
218 img { 218 img {
219 - margin-top: 1rem; 219 + margin-top: 32rpx;
220 - margin-bottom: 1rem; 220 + margin-bottom: 32rpx;
221 - width: 10rem; 221 + width: 320rpx;
222 } 222 }
223 .no-visitors-list-title { 223 .no-visitors-list-title {
224 color: #A67939; 224 color: #A67939;
225 - font-size: 1.05rem; 225 + font-size: 34rpx;
226 } 226 }
227 } 227 }
228 .submit-wrapper { 228 .submit-wrapper {
229 position: fixed; 229 position: fixed;
230 bottom: 0; 230 bottom: 0;
231 left: 0; 231 left: 0;
232 - width: 100vw; 232 + width: 750rpx;
233 display: flex; 233 display: flex;
234 background-color: #FFF; 234 background-color: #FFF;
235 - // padding: 1rem; 235 + // padding: 32rpx;
236 justify-content: space-between; 236 justify-content: space-between;
237 flex-direction: column; 237 flex-direction: column;
238 - box-shadow: 0rem -0.33rem 0.25rem 0rem rgba(0,0,0,0.12); 238 + box-shadow: 0 -10rpx 8rpx 0 rgba(0,0,0,0.12);
239 239
240 .control-wrapper { 240 .control-wrapper {
241 display: flex; 241 display: flex;
...@@ -251,10 +251,10 @@ useDidShow(async () => { ...@@ -251,10 +251,10 @@ useDidShow(async () => {
251 .right { 251 .right {
252 background-color: #A67939; 252 background-color: #A67939;
253 color: #FFF; 253 color: #FFF;
254 - margin: 1rem; 254 + margin: 32rpx;
255 - padding: 0.8rem 3rem; 255 + padding: 26rpx 96rpx;
256 border-radius: 5px; 256 border-radius: 5px;
257 - font-size: 1.1rem; 257 + font-size: 35rpx;
258 margin-bottom: 0; 258 margin-bottom: 0;
259 } 259 }
260 } 260 }
......
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
18 <view class="payment-amount">支付金额：<text>¥ {{ billInfo?.total_amt }}</text></view> 18 <view class="payment-amount">支付金额：<text>¥ {{ billInfo?.total_amt }}</text></view>
19 </view> 19 </view>
20 <view class="appointment-notice"> 20 <view class="appointment-notice">
21 - <view style="margin-bottom: 0.25rem;"><IconFont name="tips" />&nbsp;温馨提示</view> 21 + <view style="margin-bottom: 8rpx;"><IconFont name="tips" />&nbsp;温馨提示</view>
22 - <view style="font-size: 0.85rem;">1. 一人一码，或拿身份证，扫码或识别身份证成功后进入</view> 22 + <view style="font-size: 27rpx;">1. 一人一码，或拿身份证，扫码或识别身份证成功后进入</view>
23 - <view style="font-size: 0.85rem;">2. 若您无法按时参观，请提前在预约记录中取消您的预约</view> 23 + <view style="font-size: 27rpx;">2. 若您无法按时参观，请提前在预约记录中取消您的预约</view>
24 </view> 24 </view>
25 </view> 25 </view>
26 <view class="success-btn"> 26 <view class="success-btn">
...@@ -77,13 +77,13 @@ useDidShow(async () => { ...@@ -77,13 +77,13 @@ useDidShow(async () => {
77 } 77 }
78 .text { 78 .text {
79 color: #A67939; 79 color: #A67939;
80 - font-size: 1.25rem; 80 + font-size: 40rpx;
81 - margin-top: 1rem; 81 + margin-top: 32rpx;
82 } 82 }
83 } 83 }
84 .appointment-information { 84 .appointment-information {
85 - padding: 2rem 1rem; 85 + padding: 64rpx 32rpx;
86 - border-bottom: 1px dashed #A67939; 86 + border-bottom: 2rpx dashed #A67939;
87 line-height: 2; 87 line-height: 2;
88 .number-of-visitors { 88 .number-of-visitors {
89 text { 89 text {
...@@ -103,27 +103,27 @@ useDidShow(async () => { ...@@ -103,27 +103,27 @@ useDidShow(async () => {
103 } 103 }
104 104
105 .appointment-notice { 105 .appointment-notice {
106 - padding: 1rem; 106 + padding: 32rpx;
107 color: #666; 107 color: #666;
108 } 108 }
109 109
110 .success-btn { 110 .success-btn {
111 position: fixed; 111 position: fixed;
112 - bottom: 2rem; 112 + bottom: 64rpx;
113 - width: 100vw; 113 + width: 750rpx;
114 display: flex; 114 display: flex;
115 justify-content: space-around; 115 justify-content: space-around;
116 116
117 .btn-item { 117 .btn-item {
118 width: 40%; 118 width: 40%;
119 text-align: center; 119 text-align: center;
120 - padding: 0.8rem 0; 120 + padding: 26rpx 0;
121 - border-radius: 8px; 121 + border-radius: 16rpx;
122 - font-size: 1.1rem; 122 + font-size: 35rpx;
123 } 123 }
124 124
125 .btn-left { 125 .btn-left {
126 - border: 1px solid #A67939; 126 + border: 2rpx solid #A67939;
127 color: #A67939; 127 color: #A67939;
128 } 128 }
129 129
......
...@@ -13,28 +13,28 @@ ...@@ -13,28 +13,28 @@
13 <view style="color: #A67939;">{{ item.name }}</view> 13 <view style="color: #A67939;">{{ item.name }}</view>
14 <view>证件号：{{ formatId(item.id_number) }}</view> 14 <view>证件号：{{ formatId(item.id_number) }}</view>
15 </view> 15 </view>
16 - <view @tap="removeItem(item)" style="margin-left: 1rem;"> 16 + <view @tap="removeItem(item)" style="margin-left: 32rpx;">
17 - <image src="https://cdn.ipadbiz.cn/xys/booking/%E5%88%A0%E9%99%A4@2x.png" style="width: 1.2rem; height: 1.2rem;" /> 17 + <image src="https://cdn.ipadbiz.cn/xys/booking/%E5%88%A0%E9%99%A4@2x.png" style="width: 38rpx; height: 38rpx;" />
18 </view> 18 </view>
19 </view> 19 </view>
20 </view> 20 </view>
21 <view v-else class="no-visitors-list"> 21 <view v-else class="no-visitors-list">
22 - <image src="https://cdn.ipadbiz.cn/xys/booking/%E6%9A%82%E6%97%A0@2x.png" style="width: 10rem; height: 10rem;" /> 22 + <image src="https://cdn.ipadbiz.cn/xys/booking/%E6%9A%82%E6%97%A0@2x.png" style="width: 320rpx; height: 320rpx;" />
23 <view class="no-visitors-list-title">您还没有添加过参观者</view> 23 <view class="no-visitors-list-title">您还没有添加过参观者</view>
24 </view> 24 </view>
25 </view> 25 </view>
26 - <view style="height: 8rem;"></view> 26 + <view style="height: 256rpx;"></view>
27 <view class="index-nav"> 27 <view class="index-nav">
28 <view class="nav-logo" @tap="toHome"> 28 <view class="nav-logo" @tap="toHome">
29 - <image :src="icon_3" style="width: 1.5rem; height: 1.5rem;" /> 29 + <image :src="icon_3" style="width: 48rpx; height: 48rpx;" />
30 首页 30 首页
31 </view> 31 </view>
32 <view class="nav-logo" @tap="toCode"> 32 <view class="nav-logo" @tap="toCode">
33 - <image :src="icon_4" style="width: 1.5rem; height: 1.5rem; margin-bottom: 0.1rem;" /> 33 + <image :src="icon_4" style="width: 48rpx; height: 48rpx; margin-bottom: 3rpx;" />
34 预约码 34 预约码
35 </view> 35 </view>
36 <view class="nav-logo" @tap="toMy"> 36 <view class="nav-logo" @tap="toMy">
37 - <image :src="icon_5" style="width: 1.5rem; height: 1.5rem;" /> 37 + <image :src="icon_5" style="width: 48rpx; height: 48rpx;" />
38 我的 38 我的
39 </view> 39 </view>
40 </view> 40 </view>
...@@ -116,27 +116,27 @@ useDidShow(() => { ...@@ -116,27 +116,27 @@ useDidShow(() => {
116 .visitor-list-page { 116 .visitor-list-page {
117 min-height: 100vh; 117 min-height: 100vh;
118 background-color: #F6F6F6; 118 background-color: #F6F6F6;
119 - padding: 1rem; 119 + padding: 32rpx;
120 120
121 .visitor-content { 121 .visitor-content {
122 .title { 122 .title {
123 .text { 123 .text {
124 - font-size: 1.1rem; 124 + font-size: 35rpx;
125 font-weight: bold; 125 font-weight: bold;
126 - margin-bottom: 1rem; 126 + margin-bottom: 32rpx;
127 - border-left: 3px solid #A67939; 127 + border-left: 6rpx solid #A67939;
128 - padding-left: 0.5rem; 128 + padding-left: 16rpx;
129 } 129 }
130 } 130 }
131 131
132 .add-visitors { 132 .add-visitors {
133 - border: 1px dashed #A67939; 133 + border: 2rpx dashed #A67939;
134 color: #A67939; 134 color: #A67939;
135 - border-radius: 5px; 135 + border-radius: 10rpx;
136 text-align: center; 136 text-align: center;
137 - padding: .65rem 0; 137 + padding: 21rpx 0;
138 - margin: 1rem 0; 138 + margin: 32rpx 0;
139 - font-size: 1.15rem; 139 + font-size: 37rpx;
140 .add-btn { 140 .add-btn {
141 display: flex; 141 display: flex;
142 align-items: center; 142 align-items: center;
...@@ -147,9 +147,9 @@ useDidShow(() => { ...@@ -147,9 +147,9 @@ useDidShow(() => {
147 .visitors-list { 147 .visitors-list {
148 .visitor-item { 148 .visitor-item {
149 background-color: #FFF; 149 background-color: #FFF;
150 - border-radius: 8px; 150 + border-radius: 16rpx;
151 - padding: 1rem; 151 + padding: 32rpx;
152 - margin-bottom: 1rem; 152 + margin-bottom: 32rpx;
153 display: flex; 153 display: flex;
154 align-items: center; 154 align-items: center;
155 justify-content: space-between; 155 justify-content: space-between;
...@@ -164,8 +164,8 @@ useDidShow(() => { ...@@ -164,8 +164,8 @@ useDidShow(() => {
164 164
165 .no-visitors-list-title { 165 .no-visitors-list-title {
166 color: #A67939; 166 color: #A67939;
167 - font-size: 1.05rem; 167 + font-size: 34rpx;
168 - margin-top: 1rem; 168 + margin-top: 32rpx;
169 } 169 }
170 } 170 }
171 } 171 }
...@@ -174,10 +174,10 @@ useDidShow(() => { ...@@ -174,10 +174,10 @@ useDidShow(() => {
174 position: fixed; 174 position: fixed;
175 bottom: 0; 175 bottom: 0;
176 left: 0; 176 left: 0;
177 - width: 100vw; 177 + width: 750rpx;
178 - height: 10vh; 178 + height: 134rpx;
179 background: #FFFFFF; 179 background: #FFFFFF;
180 - box-shadow: 0rem -0.33rem 0.25rem 0rem rgba(0,0,0,0.12); 180 + box-shadow: 0 -10rpx 8rpx 0 rgba(0,0,0,0.12);
181 display: flex; 181 display: flex;
182 align-items: center; 182 align-items: center;
183 justify-content: space-around; 183 justify-content: space-around;
...@@ -187,7 +187,7 @@ useDidShow(() => { ...@@ -187,7 +187,7 @@ useDidShow(() => {
187 display: flex; 187 display: flex;
188 flex-direction: column; 188 flex-direction: column;
189 align-items: center; 189 align-items: center;
190 - font-size: 0.8rem; 190 + font-size: 26rpx;
191 } 191 }
192 } 192 }
193 } 193 }
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
2 <view class="waiting-page"> 2 <view class="waiting-page">
3 <view class="waiting-content"> 3 <view class="waiting-content">
4 <view> 4 <view>
5 - <IconFont name="clock" size="40" color="#A67939" /> 5 + <IconFont name="clock" size="80rpx" color="#A67939" />
6 </view> 6 </view>
7 - <view style="margin: 1rem 0;">支付中</view> 7 + <view style="margin: 32rpx 0;">支付中</view>
8 <view>{{ current.seconds }} s</view> 8 <view>{{ current.seconds }} s</view>
9 - <view style="margin: 1.5rem 0; font-size: 0.85rem; color: #A67939; text-align: center; line-height: 2;"> 9 + <view style="margin: 48rpx 0; font-size: 27rpx; color: #A67939; text-align: center; line-height: 2;">
10 温馨提示：{{ pay_msg }}<br /> 10 温馨提示：{{ pay_msg }}<br />
11 </view> 11 </view>
12 </view> 12 </view>
...@@ -112,19 +112,19 @@ const goBackBtn = () => { ...@@ -112,19 +112,19 @@ const goBackBtn = () => {
112 height: 100vh; 112 height: 100vh;
113 background-color: #fff; 113 background-color: #fff;
114 align-items: center; 114 align-items: center;
115 - padding-top: 3rem; 115 + padding-top: 96rpx;
116 116
117 .waiting-content { 117 .waiting-content {
118 display: flex; 118 display: flex;
119 flex-direction: column; 119 flex-direction: column;
120 align-items: center; 120 align-items: center;
121 - font-size: 1rem; 121 + font-size: 32rpx;
122 color: #333; 122 color: #333;
123 } 123 }
124 124
125 .go-back-wrapper { 125 .go-back-wrapper {
126 width: 80%; 126 width: 80%;
127 - margin-top: 2rem; 127 + margin-top: 64rpx;
128 } 128 }
129 } 129 }
130 </style> 130 </style>
......