Browse Source

UI调整

dev
wangmingyong@163.com 2 months ago
parent
commit
1a75d8decb
  1. 110
      zdxt-web-client/zdxt-efcode-enforcement-app/src/util/lunar.js
  2. 11
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_list.vue
  3. 4
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_manual.vue
  4. 4
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_system.vue

110
zdxt-web-client/zdxt-efcode-enforcement-app/src/util/lunar.js

@ -0,0 +1,110 @@
const lunarMonths = ['', '正月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '冬月', '腊月'];
const lunarDays = ['', '初一', '初二', '初三', '初四', '初五', '初六', '初七', '初八', '初九', '初十',
'十一', '十二', '十三', '十四', '十五', '十六', '十七', '十八', '十九', '二十',
'廿一', '廿二', '廿三', '廿四', '廿五', '廿六', '廿七', '廿八', '廿九', '三十',
];
const lunarInfo = [
0x04bd8, 0x04ae0, 0x0a570, 0x054d5, 0x0d260, 0x0d950, 0x16554, 0x056a0, 0x09ad0, 0x055d2,
0x04ae0, 0x0a5b6, 0x0a4d0, 0x0d250, 0x1d255, 0x0b540, 0x0d6a0, 0x0ada2, 0x095b0, 0x14977,
0x04970, 0x0a4b0, 0x0b4b5, 0x06a50, 0x06d40, 0x1ab54, 0x02b60, 0x09570, 0x052f2, 0x04970,
0x06566, 0x0d4a0, 0x0ea50, 0x06e95, 0x05ad0, 0x02b60, 0x186e3, 0x092e0, 0x1c8d7, 0x0c950,
0x0d4a0, 0x1d8a6, 0x0b550, 0x056a0, 0x1a5b4, 0x025d0, 0x092d0, 0x0d2b2, 0x0a950, 0x0b557,
0x06ca0, 0x0b550, 0x15355, 0x04da0, 0x0a5d0, 0x14573, 0x052d0, 0x0a9a8, 0x0e950, 0x06aa0,
0x0aea6, 0x0ab50, 0x04b60, 0x0aae4, 0x0a570, 0x05260, 0x0f263, 0x0d950, 0x05b57, 0x056a0,
0x096d0, 0x04dd5, 0x04ad0, 0x0a4d0, 0x0d4d4, 0x0d250, 0x0d558, 0x0b540, 0x0b5a0, 0x195a6,
0x095b0, 0x049b0, 0x0a974, 0x0a4b0, 0x0b27a, 0x06a50, 0x06d40, 0x0af46, 0x0ab60, 0x09570,
0x04af5, 0x04970, 0x064b0, 0x074a3, 0x0ea50, 0x06b58, 0x055c0, 0x0ab60, 0x096d5, 0x092e0,
0x0c960, 0x0d954, 0x0d4a0, 0x0da50, 0x07552, 0x056a0, 0x0abb7, 0x025d0, 0x092d0, 0x0cab5,
0x0a950, 0x0b4a0, 0x0baa4, 0x0ad50, 0x055d9, 0x04ba0, 0x0a5b0, 0x15176, 0x052b0, 0x0a930,
0x07954, 0x06aa0, 0x0ad50, 0x05b52, 0x04b60, 0x0a6e6, 0x0a4e0, 0x0d260, 0x0ea65, 0x0d530,
0x05aa0, 0x076a3, 0x096d0, 0x04bd7, 0x04ad0, 0x0a4d0, 0x1d0b6, 0x0d250, 0x0d520, 0x0dd45,
0x0b5a0, 0x056d0, 0x055b2, 0x049b0, 0x0a577, 0x0a4b0, 0x0aa50, 0x1b255, 0x06d20, 0x0ada0
];
const lYearDays = (y) => {
let i, sum = 348;
for (i = 0x8000; i > 0x8; i >>= 1) {
sum += (lunarInfo[y - 1900] & i) ? 1 : 0;
}
return (sum + leapDays(y));
};
const leapMonth = (y) => {
return (lunarInfo[y - 1900] & 0xf);
};
const leapDays = (y) => {
if (leapMonth(y)) {
return ((lunarInfo[y - 1900] & 0x10000) ? 30 : 29);
}
return (0);
};
const monthDays = (y, m) => {
return ((lunarInfo[y - 1900] & (0x10000 >> m)) ? 30 : 29);
};
export const getLunarDay = (date) => {
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
if (year < 1900 || year > 2100) return '';
let i, leap = 0, temp = 0;
let offset = (Date.UTC(year, month - 1, day) - Date.UTC(1900, 0, 31)) / 86400000;
for (i = 1900; i < 2101 && offset > 0; i++) {
temp = lYearDays(i);
offset -= temp;
}
if (offset < 0) {
offset += temp;
i--;
}
const lunarYear = i;
leap = leapMonth(i);
let isLeap = false;
for (i = 1; i < 13 && offset > 0; i++) {
if (leap > 0 && i === leap + 1 && isLeap === false) {
--i;
isLeap = true;
temp = leapDays(lunarYear);
} else {
temp = monthDays(lunarYear, i);
}
if (isLeap === true && i === leap + 1) {
isLeap = false;
}
offset -= temp;
}
if (offset === 0 && leap > 0 && i === leap + 1) {
if (isLeap) {
isLeap = false;
} else {
isLeap = true;
--i;
}
}
if (offset < 0) {
offset += temp;
--i;
}
const lunarMonth = i;
const lunarDay = Math.floor(offset) + 1;
if (lunarDay === 1) {
return lunarMonths[lunarMonth] || '';
}
return lunarDays[lunarDay] || '';
};

11
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_list.vue

@ -1,12 +1,12 @@
<template>
<div class="reserve-page app_content">
<!-- 顶部导航 -->
<van-nav-bar
<!-- <van-nav-bar
title="预约处理"
left-arrow
@click-left="onBack"
>
</van-nav-bar>
</van-nav-bar> -->
<!-- Tab 切换 -->
<van-tabs
@ -14,8 +14,6 @@
title-active-color="#111"
title-inactive-color="#666"
color="#2f8bd3"
line-width="36px"
line-height="2px"
:border="false"
>
<van-tab title="手动预约" name="manual">
@ -67,15 +65,14 @@ const onAutoMatch = () => {
display: flex;
flex-direction: column;
height: 100%;
background: #fff;
background: #EBF4FB;
position: relative;
overflow: hidden;
}
:deep(.van-nav-bar) {
background: #347bc3;
flex-shrink: 0;
// flex-shrink: 0;
.van-nav-bar__title {
color: #fff;
font-size: 18px;

4
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_manual.vue

@ -1,7 +1,7 @@
<template>
<div class="reserve-tab">
<!-- 状态过滤 -->
<div class="filter-bar">
<!-- <div class="filter-bar">
<div
v-for="opt in filterOptions"
:key="opt.value"
@ -11,7 +11,7 @@
>
{{ opt.label }}
</div>
</div>
</div> -->
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list

4
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/reserve/cp_reserve_system.vue

@ -1,7 +1,7 @@
<template>
<div class="reserve-tab">
<!-- 状态过滤 -->
<div class="filter-bar">
<!-- <div class="filter-bar">
<div
v-for="opt in filterOptions"
:key="opt.value"
@ -11,7 +11,7 @@
>
{{ opt.label }}
</div>
</div>
</div> -->
<van-pull-refresh v-model="refreshing" @refresh="onRefresh">
<van-list

Loading…
Cancel
Save