From 073c3b4a7440bfe986796ac3bd40e5501ac9b428 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 7 Dec 2023 13:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E8=BE=B0=E5=8F=96=E7=A9=B4=EF=BC=9A?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E8=BE=B0+=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=97=B6=E8=BE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                   |   8 +
 pages/peanut/home.vue                        |   3 +-
 pages/timeAcupoint/timeAcupoint - 副本.vue | 528 +++++++++++++++++
 pages/timeAcupoint/timeAcupoint.vue          | 290 ++++-----
 pages/timeAcupoint/totalTable.vue            | 582 +++++++++++++++++++
 static/icon/change.png                       | Bin 0 -> 4812 bytes
 6 files changed, 1273 insertions(+), 138 deletions(-)
 create mode 100644 pages/timeAcupoint/timeAcupoint - 副本.vue
 create mode 100644 pages/timeAcupoint/totalTable.vue
 create mode 100644 static/icon/change.png

diff --git a/pages.json b/pages.json
index 7eddd94..061a446 100644
--- a/pages.json
+++ b/pages.json
@@ -543,6 +543,14 @@
         		"navigationBarTitleText" : "时辰取穴",
         		"enablePullDownRefresh" : false
         	}
+        },
+        {
+        	"path" : "pages/timeAcupoint/totalTable",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "全部穴位一览表",
+        		"enablePullDownRefresh" : false
+        	}
         }
     ],
 	"globalStyle": {
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index ff89918..5850292 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -336,7 +336,8 @@
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
-		    // this.requestIapOrder()			
+		    // this.requestIapOrder()		
+				
 		},
 		onHide() {
 			this.page = 1
diff --git a/pages/timeAcupoint/timeAcupoint - 副本.vue b/pages/timeAcupoint/timeAcupoint - 副本.vue
new file mode 100644
index 0000000..9115d5c
--- /dev/null
+++ b/pages/timeAcupoint/timeAcupoint - 副本.vue	
@@ -0,0 +1,528 @@
+<template>
+	<view class="container88">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="时辰取穴"></z-nav-bar>
+		<view>
+			<!-- {{date}}---{{timestamp}} -->
+			<!-- <uni-section :title="'date 对象用法：' + datetimesingle" type="line"></uni-section> -->
+			<view class="datetimeBox">
+				<uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" />
+			</view>
+			<view class="flexbox box1 grayBg">
+				<view class="">
+					<text style="color: #666;  line-height: 60rpx;">所查询时间：</text><br />
+					<text style="color: #666; white-space:nowrap;;">{{dateToString}}</text>
+				</view>
+				<view class="yunqi">
+					<text style="color: #666;  line-height: 50rpx; width: 100%; margin-right: 15rpx;">天干地支</text>
+					<view class="shu">
+						<text>{{tiangandizhi.hour}} - 时</text>
+						<text>{{tiangandizhi.day}} - 日</text>
+						<text>{{tiangandizhi.month}} - 月</text>
+						<text>{{tiangandizhi.year}} - 年</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 主体 -->
+		<view class="centerBox">
+			↓ 12时辰对应穴位图表 左滑查看全部
+		</view>
+		<view class="centerBox" style="text-align: right; padding-top: 0; font-size: 24rpx;">
+			注：表中带* 者是原穴
+		</view>
+		<view class="container" style="display: flex;">
+			<view class="d-table" style="width:15%;position: relative; z-index: 1;">
+				<view class="leftBar">
+					<!-- <view :class="i === 1 ? 'd-th' : 'd-td'">张三</view> -->
+					<table border cellspacing="0" style="width:100%; background-color:#fbd5ca;">
+						<tr>
+							<td class="oneHeight"></td>
+						</tr>
+						<tr>
+							<td class="" style="height: 100rpx;"></td>
+						</tr>
+						<tr :class="curIndex == 2 ? 'cur' :''">
+							<td class="shuHeight1">23~01</td>
+						</tr>
+						<tr :class="curIndex == 3 ? 'cur' :''">
+							<td class="shuHeight1">01~03</td>
+						</tr>
+						<tr :class="curIndex == 4 ? 'cur' :''">
+							<td class="shuHeight1">03~05</td>
+						</tr>
+						<tr :class="curIndex == 5 ? 'cur' :''">
+							<td class="shuHeight1">05~07</td>
+						</tr>
+						<tr :class="curIndex == 6 ? 'cur' :''">
+							<td class="shuHeight1">07~09</td>
+						</tr>
+						<tr :class="curIndex == 7 ? 'cur' :''">
+							<td class="shuHeight1">09~11</td>
+						</tr>
+						<tr :class="curIndex == 8 ? 'cur' :''">
+							<td class="shuHeight1">11~13</td>
+						</tr>
+						<tr :class="curIndex == 9 ? 'cur' :''">
+							<td class="shuHeight1">13~15</td>
+						</tr>
+						<tr :class="curIndex == 10 ? 'cur' :''">
+							<td class="shuHeight1">15~17</td>
+						</tr>
+						<tr :class="curIndex == 11 ? 'cur' :''">
+							<td class="shuHeight1">17~19</td>
+						</tr>
+						<tr :class="curIndex == 12 ? 'cur' :''">
+							<td class="shuHeight1">19~21</td>
+						</tr>
+						<tr :class="curIndex == 13 ? 'cur' :''">
+							<td class="shuHeight1">21~23</td>
+						</tr>
+					</table>
+				</view>
+			</view>
+			<scroll-view scroll-x class="border-right" style="width: 85%;">
+				<view class="d-table scroll-x">
+					<table border style="width: 600px; background-color: antiquewhite;" cellspacing="0">
+						<tr class="tableTh">
+							<!-- <td colspan="1" class=""></td> -->
+							<td class="oneHeight" colspan="2">灵龟八法</td>
+							<td class="oneHeight" colspan="2">飞腾八法</td>
+							<td class="oneHeight" colspan="5">子午流注</td>
+						</tr>
+						<tr class="tableTh">
+							<!-- <td colspan="1" rowspan="2" class=""></td> -->
+							<td class="" rowspan="2" style="height: 100rpx;">开穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">合穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">开穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">合穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">子午纳干</td>
+							<td colspan="4">子午纳子</td>
+						</tr>
+						<!-- </td>
+						</tr> -->
+						<tr class="tableTh">
+							<td class="">补法</td>
+							<td class="">泄法</td>
+							<td class="">过时泄本</td>
+							<td class="">过时补原</td>
+						</tr>
+						<tr v-for="(item,index) in quxue" :key="index" :class="item.now ? 'cur' : ''">
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.lgbf.KX)}">{{item.lgbf.KX}}</text></td>
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.lgbf.HX)}">{{item.lgbf.HX}}</text></td>
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.ftbf.KX)}">{{item.ftbf.KX}}</text></td>
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.ftbf.HX)}">{{item.ftbf.HX}}</text></td>
+							<td class="shuHeight ">
+								<view class="flexbox" v-if="item.zwlz.ngf.length > 0"
+									style="justify-content: space-evenly;align-items: center; align-content: center;">
+									<text class="verticalRl" :style="{color: getHightLightColor(item1)}"
+										v-for="(item1,index1) in item.zwlz.ngf" :key="index1">{{item1}}</text>
+
+								</view>
+							</td>
+
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.bf)}">{{item.zwlz.nzf.bf}}</text>
+							</td>
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.xf)}">{{item.zwlz.nzf.xf}}</text>
+							</td>
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.gsxb)}">{{item.zwlz.nzf.gsxb}}</text>
+							</td>
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.gsbf)}">{{item.zwlz.nzf.gsbf}}</text>
+							</td>
+						</tr>
+
+					</table>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="centerBox">
+			注：表中带* 者是原穴
+		</view>
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+
+	function formatDateTime(time) {
+		var date = new Date(time);
+		var y = date.getFullYear();
+		var m = date.getMonth() + 1;
+		m = m < 10 ? ('0' + m) : m;
+		var d = date.getDate();
+		d = d < 10 ? ('0' + d) : d;
+		var h = date.getHours();
+		h = h < 10 ? ('0' + h) : h;
+		var minute = date.getMinutes();
+		var second = date.getSeconds();
+		minute = minute < 10 ? ('0' + minute) : minute;
+		second = second < 10 ? ('0' + second) : second;
+
+		return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+	};
+
+	export default {
+		data() {
+			return {
+				playData: {},
+				curIndex: null,
+				pageWidth: uni.getSystemInfoSync().windowWidth,
+				pageHeight: uni.getSystemInfoSync().windowHeight - 200,
+				fiveYunNum: 5,
+				// date: new Date().toISOString().slice(0, 10),      // 只返回年月日
+				date: new Date().getTime(), // 返回年月日带时间
+				dateToString: formatDateTime(new Date()), // 字符串格式的日期
+				timestamp: Date.now() - 2 * 24 * 3600 * 1000, // 时间戳				
+				showCalendar: false,
+				quxue: [], // 时辰取穴
+				tiangandizhi: {},
+				yuanXue: [
+					'腕骨', '丘墟', '丘墟', '太溪', '大陵', '京骨', '阳池', '太渊', '合谷', '太白', '冲阳', '神门'
+				],
+			}
+		},
+		onLoad() {
+			let da = new Date().toISOString().slice(0, 10)
+			this.timestamp = new Date(da).getTime()
+			console.log('初始时间', this.dateToString, this.date)
+			this.getXueWei(this.dateToString)
+			this.getTGDZ(this.dateToString)
+		},
+
+		onHide() {
+
+		},
+		methods: {
+			scroll: function(e) {},
+			// 设置文字颜色
+			getHightLightColor(text) {
+				if (text.indexOf('*') != -1) {
+					return "#9c3211"
+				}
+			},
+			// 获取天干地支
+			getTGDZ(date) {
+				let that = this
+				$http.request({
+						url: "book/point/TGDZForYear",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							console.log('天干地支', res.tgdz)
+							this.tiangandizhi = res.tgdz
+						}
+
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			},
+			// 获取时辰取穴
+			getXueWei(date) {
+				let that = this
+				$http.request({
+						url: "book/point/SCQX",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0 && res.flag.length > 0) {
+							console.log('时辰取穴', res.flag)
+							this.quxue = res.flag
+							this.curIndex = res.flag.findIndex(function(item) {
+								return item.now == true
+							})
+							this.curIndex = this.curIndex + 2
+							console.log(this.curIndex, 'this.curIndex')
+						}
+
+					}).catch(e => {
+						this.curIndex = null
+						console.log(e, 'e')
+					});
+			},
+			// checkAdult(item) {
+			// 	return item.now == true
+			// },
+			changeLog(e) {
+				console.log('change事件:', e);
+				let ss = e.slice(0, 10)
+				this.timestamp = new Date(ss).getTime()
+				this.dateToString = e
+				this.getXueWei(e)
+				this.getTGDZ(e)
+			},
+		},
+
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import './scss/common.scss';
+
+	.leftBar {
+		td {
+			font-weight: bold;
+			color: #a84a2d;
+		}
+	}
+
+	tr.cur {
+		background-color: #e7a896;
+		color: #fff;
+
+		td {
+			color: #fff;
+		}
+	}
+
+	.tableTh {
+		background-color: #fbd5ca;
+		font-weight: bold;
+		color: #a84a2d;
+	}
+
+	.shuHeight {
+		height: 100rpx;
+	}
+
+	.shuHeight1 {
+		height: 100rpx;
+	}
+
+	.verticalRl {
+		writing-mode: vertical-rl;
+	}
+
+	.oneHeight {
+		height: 50rpx;
+	}
+
+	.twoHeight {
+		height: 94rpx;
+	}
+
+	table {
+		border-collapse: collapse;
+		font-size: 28rpx;
+	}
+
+	table td {
+		border-bottom: 1px solid #a84a2d;
+		border-right: 1px solid #a84a2d;
+	}
+
+	table tr:first-child td {
+		border-top: 1px solid #a84a2d;
+	}
+
+	table tr td:first-child {
+		border-left: 1px solid #a84a2d;
+	}
+
+	td {
+		padding: 8rpx 10rpx;
+	}
+
+	.oneWidth {
+		width: 124rpx;
+	}
+
+	/deep/ .uni-table-th {
+		padding: 14rpx 20rpx
+	}
+
+	* {
+		font-size: 28rpx;
+	}
+
+	.centerBox {
+		text-align: center;
+		padding: 20px;
+		color: #666;
+	}
+
+	.yinli {
+		line-height: 50rpx;
+
+		text {
+			writing-mode: vertical-rl;
+			letter-spacing: 20rpx;
+			color: #c06346;
+		}
+	}
+
+	.box1 {
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		justify-content: space-between; align-items: center;
+
+		.yunqi {
+			color: #c06346;
+			text-align: right;
+
+			.shu {
+				text {
+					writing-mode: vertical-rl;
+					line-height: 60rpx;
+					font-size: 30rpx;
+				}
+			}
+		}
+	}
+
+	.grayBg {
+		background-color: #eee;
+	}
+
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+
+		.leftone {
+
+			border-left: 1px solid #ddd;
+		}
+
+		.row {
+			display: inline-block;
+			text-align: center;
+			background-color: #fef9e4;
+			border-right: 1px solid #ddd;
+			border-bottom: 1px solid #ddd;
+		}
+
+		.row.cur {
+			background-color: #8d3d16;
+			color: #fff;
+			position: relative;
+			border-right: 0;
+			z-index: 5;
+			box-shadow: 0 0 10px #8d3d16;
+		}
+
+		.line {
+			padding: 20rpx;
+			border-top: 1px solid #ddd;
+
+			span {
+				font-size: 36rpx;
+			}
+		}
+
+		.line1 {
+			font-size: 24rpx;
+			height: 200rpx;
+			writing-mode: vertical-rl;
+			;
+		}
+
+		.zhuyun {
+			color: #8d3d16;
+			background-color: #faede7;
+			font-size: 30rpx;
+		}
+
+		.keyun {
+			color: #c06346;
+			background-color: #fceeed;
+			font-size: 30rpx;
+		}
+	}
+
+	.container88 {
+		padding: 10rpx;
+
+		background-color: #fff;
+		padding-bottom: 70rpx;
+	}
+
+	.datetimeBox {
+		width: 80%;
+		margin: 0 auto;
+		margin-bottom: 30rpx;
+	}
+
+	.liuqiBox {
+		.line.keyun {
+			padding: 60rpx 10rpx
+		}
+	}
+
+	.wuYunBox {
+		.row {
+			width: 20%;
+			box-sizing: border-box;
+		}
+	}
+
+	/deep/ .uni-calendar__content-mobile {
+		bottom: 100rpx !important;
+	}
+
+	.sizai {
+		.keyun {
+			position: relative;
+		}
+
+		.keyun::after {
+			position: absolute;
+			content: '';
+			top: 24rpx;
+			left: 0;
+			font-size: 24rpx;
+			display: block;
+			width: 100%;
+			color: #888;
+			text-align: center;
+		}
+
+	}
+
+	.sizai1 {
+		.keyun::after {
+			content: '（司天）';
+		}
+	}
+
+	.sizai2 {
+		.keyun::after {
+			content: '（在泉）';
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/timeAcupoint/timeAcupoint.vue b/pages/timeAcupoint/timeAcupoint.vue
index 9115d5c..094d0b3 100644
--- a/pages/timeAcupoint/timeAcupoint.vue
+++ b/pages/timeAcupoint/timeAcupoint.vue
@@ -4,18 +4,26 @@
 		<public-module></public-module>
 		<z-nav-bar title="时辰取穴"></z-nav-bar>
 		<view>
-			<!-- {{date}}---{{timestamp}} -->
 			<!-- <uni-section :title="'date 对象用法：' + datetimesingle" type="line"></uni-section> -->
-			<view class="datetimeBox">
+			<!-- <view class="datetimeBox">
 				<uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" />
-			</view>
-			<view class="flexbox box1 grayBg">
-				<view class="">
-					<text style="color: #666;  line-height: 60rpx;">所查询时间：</text><br />
-					<text style="color: #666; white-space:nowrap;;">{{dateToString}}</text>
+			</view> -->
+			<view class="box1 ">
+				<view class="" style="text-align: center; margin-top: 50rpx; align-items: center; margin-bottom: 30rpx;">
+					<!-- <text style="color: #666;  line-height: 60rpx;">所查询时间：</text><br /> -->
+					<view class="" style="margin-bottom: 10rpx; ">
+						<text style="color: #a84a2d; font-size: 50rpx; white-space:nowrap; font-weight: bold;">{{dateToString}}</text>
+					</view>
+					<view class="">
+						<uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" />
+					</view>
+					
+					<!-- <uni-datetime-picker style="color: #666; " v-model="single"
+						>切换时间</uni-datetime-picker> -->
+					<!-- <uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" /> -->
 				</view>
 				<view class="yunqi">
-					<text style="color: #666;  line-height: 50rpx; width: 100%; margin-right: 15rpx;">天干地支</text>
+					<!-- <text style="color: #666;  line-height: 50rpx; width: 100%; margin-right: 15rpx;">天干地支</text> -->
 					<view class="shu">
 						<text>{{tiangandizhi.hour}} - 时</text>
 						<text>{{tiangandizhi.day}} - 日</text>
@@ -25,133 +33,94 @@
 				</view>
 			</view>
 		</view>
-		<!-- 主体 -->
-		<view class="centerBox">
-			↓ 12时辰对应穴位图表 左滑查看全部
+		<!-- 当天 -->
+		<view class="curBox flexbox" style="justify-content: space-between;" v-if="showDetail">
+			<table border style=" text-align: center;;background-color: antiquewhite;" cellspacing="0">
+				<tr class="">
+					<!-- <td colspan="1" class=""></td> -->
+					<td class="" rowspan="2">灵龟八法</td>
+					<td class="">开穴</td>
+					<td class="curText" style="width: 130rpx"><text class="verticalRl" style="writing-mode: vertical-rl;">{{quxue[curIndex-2].lgbf.KX}}</text></td>
+				</tr>
+				<tr class="">
+					<td class="">合穴</td>
+					<td class="curText" v-if="quxue[curIndex-2].lgbf.HX != ''"><text class="verticalRl">{{quxue[curIndex-2].lgbf.HX}}</text></td>
+					<td class="curText" v-else> / </td>
+				</tr>
+			</table>
+			<table border style="text-align: center; margin-left: 10rpx;background-color: antiquewhite;"
+				cellspacing="0">
+				<tr class="">
+					<!-- <td colspan="1" class=""></td> -->
+					<td class="" rowspan="2">飞腾八法</td>
+					<td class="">开穴</td>
+					<td class="curText" style="width: 130rpx"><text class="">{{quxue[curIndex-2].ftbf.KX}}</text></td>
+				</tr>
+				<tr class="">
+					<td class="">合穴</td>
+					<td class="curText" v-if="quxue[curIndex-2].ftbf.HX != ''"><text class="">{{quxue[curIndex-2].ftbf.HX}}</text></td>
+					<td class="curText" v-else> / </td>
+				</tr>
+			</table>
+		</view>		
+		<view class="curBox" style="margin-top: 10rpx;" v-if="showDetail">
+			<table border style=" width: 100%; text-align: center;background-color: antiquewhite;" cellspacing="0">
+				<tr class="">
+					<!-- <td colspan="1" class=""></td> -->
+					<td class="" rowspan="5">子午流注</td>
+					<td class="shuHeight" colspan="2" rowspan="1">子午纳干</td>
+					<td class="curText" style=" border: none; text-align: center; vertical-align: middle;" v-if="quxue[curIndex-2].zwlz.ngf.length > 0">
+						<text class="" style="display: inline-block; height: 100%;" v-for="(item, index) in quxue[curIndex-2].zwlz.ngf"
+							:style="{color: getHightLightColor(item)}">{{item}}</text>
+					</td>
+					<td class="curText" v-else> / </td>
+				</tr>
+				<tr class="">
+					<td class="" rowspan="4">子午纳子</td>
+					<td class="">补法</td>
+					<td class="curText" style="width: 200rpx;" v-if="quxue[curIndex-2].zwlz.nzf.bf != ''">
+						<text class="verticalRl"
+							:style="{color: getHightLightColor(quxue[curIndex-2].zwlz.nzf.bf)}">{{quxue[curIndex-2].zwlz.nzf.bf}}</text>
+					</td>
+					<td class="curText" v-else> / </td>
+					<!-- <td class="" v-if="quxue[curIndex-2].ftbf.HX != ''">{{quxue[curIndex-2].ftbf.HX}}</td>
+					<td class="" v-else> / </td> -->
+				</tr>
+
+				<tr class="">
+					<td class="">泄法</td>
+					<td class="curText" style="width: 200rpx;" v-if="quxue[curIndex-2].zwlz.nzf.xf != ''">
+						<text class="verticalRl"
+							:style="{color: getHightLightColor(quxue[curIndex-2].zwlz.nzf.xf)}">{{quxue[curIndex-2].zwlz.nzf.xf}}</text>
+					</td>
+					<td class="curText" v-else> / </td>
+				</tr>
+				<tr class="">
+					<td class="">过时泄本</td>
+					<td class="curText" style="width: 200rpx;" v-if="quxue[curIndex-2].zwlz.nzf.gsxb != ''">
+						<text class="verticalRl"
+							:style="{color: getHightLightColor(quxue[curIndex-2].zwlz.nzf.gsxb)}">{{quxue[curIndex-2].zwlz.nzf.gsxb}}</text>
+					</td>
+					<td class="curText" v-else> / </td>
+				</tr>
+				<tr class="">
+					<td class="">过时补原</td>
+					<td class="curText" style="width: 200rpx;" v-if="quxue[curIndex-2].zwlz.nzf.gsbf != ''">
+						<text class="verticalRl"
+							:style="{color: getHightLightColor(quxue[curIndex-2].zwlz.nzf.gsbf)}">{{quxue[curIndex-2].zwlz.nzf.gsbf}}</text>
+					</td>
+					<td class="curText" v-else> / </td>
+				</tr>
+			</table>
 		</view>
-		<view class="centerBox" style="text-align: right; padding-top: 0; font-size: 24rpx;">
-			注：表中带* 者是原穴
-		</view>
-		<view class="container" style="display: flex;">
-			<view class="d-table" style="width:15%;position: relative; z-index: 1;">
-				<view class="leftBar">
-					<!-- <view :class="i === 1 ? 'd-th' : 'd-td'">张三</view> -->
-					<table border cellspacing="0" style="width:100%; background-color:#fbd5ca;">
-						<tr>
-							<td class="oneHeight"></td>
-						</tr>
-						<tr>
-							<td class="" style="height: 100rpx;"></td>
-						</tr>
-						<tr :class="curIndex == 2 ? 'cur' :''">
-							<td class="shuHeight1">23~01</td>
-						</tr>
-						<tr :class="curIndex == 3 ? 'cur' :''">
-							<td class="shuHeight1">01~03</td>
-						</tr>
-						<tr :class="curIndex == 4 ? 'cur' :''">
-							<td class="shuHeight1">03~05</td>
-						</tr>
-						<tr :class="curIndex == 5 ? 'cur' :''">
-							<td class="shuHeight1">05~07</td>
-						</tr>
-						<tr :class="curIndex == 6 ? 'cur' :''">
-							<td class="shuHeight1">07~09</td>
-						</tr>
-						<tr :class="curIndex == 7 ? 'cur' :''">
-							<td class="shuHeight1">09~11</td>
-						</tr>
-						<tr :class="curIndex == 8 ? 'cur' :''">
-							<td class="shuHeight1">11~13</td>
-						</tr>
-						<tr :class="curIndex == 9 ? 'cur' :''">
-							<td class="shuHeight1">13~15</td>
-						</tr>
-						<tr :class="curIndex == 10 ? 'cur' :''">
-							<td class="shuHeight1">15~17</td>
-						</tr>
-						<tr :class="curIndex == 11 ? 'cur' :''">
-							<td class="shuHeight1">17~19</td>
-						</tr>
-						<tr :class="curIndex == 12 ? 'cur' :''">
-							<td class="shuHeight1">19~21</td>
-						</tr>
-						<tr :class="curIndex == 13 ? 'cur' :''">
-							<td class="shuHeight1">21~23</td>
-						</tr>
-					</table>
-				</view>
-			</view>
-			<scroll-view scroll-x class="border-right" style="width: 85%;">
-				<view class="d-table scroll-x">
-					<table border style="width: 600px; background-color: antiquewhite;" cellspacing="0">
-						<tr class="tableTh">
-							<!-- <td colspan="1" class=""></td> -->
-							<td class="oneHeight" colspan="2">灵龟八法</td>
-							<td class="oneHeight" colspan="2">飞腾八法</td>
-							<td class="oneHeight" colspan="5">子午流注</td>
-						</tr>
-						<tr class="tableTh">
-							<!-- <td colspan="1" rowspan="2" class=""></td> -->
-							<td class="" rowspan="2" style="height: 100rpx;">开穴</td>
-							<td class="" rowspan="2" style="height: 100rpx;">合穴</td>
-							<td class="" rowspan="2" style="height: 100rpx;">开穴</td>
-							<td class="" rowspan="2" style="height: 100rpx;">合穴</td>
-							<td class="" rowspan="2" style="height: 100rpx;">子午纳干</td>
-							<td colspan="4">子午纳子</td>
-						</tr>
-						<!-- </td>
-						</tr> -->
-						<tr class="tableTh">
-							<td class="">补法</td>
-							<td class="">泄法</td>
-							<td class="">过时泄本</td>
-							<td class="">过时补原</td>
-						</tr>
-						<tr v-for="(item,index) in quxue" :key="index" :class="item.now ? 'cur' : ''">
-							<td class="shuHeight "><text class="verticalRl"
-									:style="{color: getHightLightColor(item.lgbf.KX)}">{{item.lgbf.KX}}</text></td>
-							<td class="shuHeight "><text class="verticalRl"
-									:style="{color: getHightLightColor(item.lgbf.HX)}">{{item.lgbf.HX}}</text></td>
-							<td class="shuHeight "><text class="verticalRl"
-									:style="{color: getHightLightColor(item.ftbf.KX)}">{{item.ftbf.KX}}</text></td>
-							<td class="shuHeight "><text class="verticalRl"
-									:style="{color: getHightLightColor(item.ftbf.HX)}">{{item.ftbf.HX}}</text></td>
-							<td class="shuHeight ">
-								<view class="flexbox" v-if="item.zwlz.ngf.length > 0"
-									style="justify-content: space-evenly;align-items: center; align-content: center;">
-									<text class="verticalRl" :style="{color: getHightLightColor(item1)}"
-										v-for="(item1,index1) in item.zwlz.ngf" :key="index1">{{item1}}</text>
-
-								</view>
-							</td>
-
-							<td class="shuHeight">
-								<text class="verticalRl"
-									:style="{color: getHightLightColor(item.zwlz.nzf.bf)}">{{item.zwlz.nzf.bf}}</text>
-							</td>
-							<td class="shuHeight">
-								<text class="verticalRl"
-									:style="{color: getHightLightColor(item.zwlz.nzf.xf)}">{{item.zwlz.nzf.xf}}</text>
-							</td>
-							<td class="shuHeight">
-								<text class="verticalRl"
-									:style="{color: getHightLightColor(item.zwlz.nzf.gsxb)}">{{item.zwlz.nzf.gsxb}}</text>
-							</td>
-							<td class="shuHeight">
-								<text class="verticalRl"
-									:style="{color: getHightLightColor(item.zwlz.nzf.gsbf)}">{{item.zwlz.nzf.gsbf}}</text>
-							</td>
-						</tr>
-
-					</table>
-				</view>
-			</scroll-view>
-		</view>
-
-		<view class="centerBox">
+		<view class="centerBox" style="text-align: right; padding-top:10rpx; font-size: 24rpx;">
 			注：表中带* 者是原穴
 		</view>
+		<!-- end -->
+		<view class="showBtn">
+			<text @click="showTotalFun" v-if="!showTotal">《 查看全部时辰对应穴位 》</text>
+			<!-- <text @click="showTotalFun" v-else>《 收起全部时辰 》</text> -->
+		</view>		
 		<music-play :playData="playData"></music-play>
 		<z-navigation></z-navigation>
 	</view>
@@ -181,6 +150,9 @@
 	export default {
 		data() {
 			return {
+				showDetail: true,
+				showTotal: false,
+				single: '',
 				playData: {},
 				curIndex: null,
 				pageWidth: uni.getSystemInfoSync().windowWidth,
@@ -198,7 +170,7 @@
 				],
 			}
 		},
-		onLoad() {
+		onLoad() {			
 			let da = new Date().toISOString().slice(0, 10)
 			this.timestamp = new Date(da).getTime()
 			console.log('初始时间', this.dateToString, this.date)
@@ -211,6 +183,12 @@
 		},
 		methods: {
 			scroll: function(e) {},
+			showTotalFun() {
+				uni.navigateTo({
+					url: "./totalTable"
+				})
+				// this.showTotal = !this.showTotal
+			},
 			// 设置文字颜色
 			getHightLightColor(text) {
 				if (text.indexOf('*') != -1) {
@@ -242,6 +220,7 @@
 			},
 			// 获取时辰取穴
 			getXueWei(date) {
+				this.showDetail = false
 				let that = this
 				$http.request({
 						url: "book/point/SCQX",
@@ -262,6 +241,7 @@
 							})
 							this.curIndex = this.curIndex + 2
 							console.log(this.curIndex, 'this.curIndex')
+							this.showDetail = true
 						}
 
 					}).catch(e => {
@@ -291,6 +271,37 @@
 <style lang="scss" scoped>
 	@import './scss/common.scss';
 
+	/deep/ .uni-date-editor { position: relative;
+		display: block; width:200rpx; height:34rpx;
+		background-image: url('@/static/icon/change.png');
+		background-size: contain; margin: 0 auto;
+		background-repeat: no-repeat;
+		padding-left: 50rpx;
+		background-position: left top;
+		.uni-date-editor--x{display: none;}
+	}
+	/deep/ .uni-date-editor::after{content: '切换时间'; font-size: 30rpx; position: absolute; top: -2px; left: 40rpx; top: 0; display: block;}
+
+	.showBtn {
+		text-align: center;
+
+		text {
+			color: #a84a2d;
+		}
+	}
+
+	.textBlock {
+		display: block
+	}
+
+	.curText { height: 90rpx;
+		background-color: #fbd5ca;
+		text{
+			writing-mode: vertical-rl !important;
+		}
+		
+	}
+
 	.leftBar {
 		td {
 			font-weight: bold;
@@ -386,17 +397,22 @@
 	.box1 {
 		padding: 20rpx;
 		margin-bottom: 20rpx;
-		justify-content: space-between; align-items: center;
+		justify-content: space-between;
+		align-items: center;
 
 		.yunqi {
 			color: #c06346;
-			text-align: right;
+			text-align: center;
+			margin-top: 20rpx;
 
 			.shu {
+				display: inline-block;
+				padding: 20rpx;
+
 				text {
 					writing-mode: vertical-rl;
-					line-height: 60rpx;
-					font-size: 30rpx;
+					line-height: 80rpx;
+					font-size:34rpx;
 				}
 			}
 		}
diff --git a/pages/timeAcupoint/totalTable.vue b/pages/timeAcupoint/totalTable.vue
new file mode 100644
index 0000000..a1a4b7e
--- /dev/null
+++ b/pages/timeAcupoint/totalTable.vue
@@ -0,0 +1,582 @@
+<template>
+	<view class="container88">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view class="whiteBg">
+		<z-nav-bar title="" ></z-nav-bar>	
+		</view>
+	    <!-- <view class="whiteBg"></view> -->
+	<view>		
+		<view class="box1 ">
+			<view class="" style="text-align: center; margin-top: 150rpx; align-items: center; margin-bottom: 10rpx;">
+				<!-- <text style="color: #666;  line-height: 60rpx;">所查询时间：</text><br /> -->
+				<view class="" style="margin-bottom: 10rpx; ">
+					<text style="color: #a84a2d; font-size: 50rpx; white-space:nowrap; font-weight: bold;">{{dateToString}}</text>
+				</view>
+				
+				<view class="">
+					<uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" />
+				</view>
+				<!-- <uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" /> -->
+			</view>			
+		</view>
+	</view>
+		
+		<view class="hole">
+			<!-- 全部表格 -->
+			<view class="centerBox" style="padding-top: 10rpx;">
+				↓ 12时辰对应穴位图表
+			</view>
+
+			<view class="container" style="display: flex;">
+				<view class="d-table" style="width:15%;position: relative; z-index: 1;">
+					<view class="leftBar">
+						<!-- <view :class="i === 1 ? 'd-th' : 'd-td'">张三</view> -->
+						<table border cellspacing="0" style="width:100%; background-color:#fbd5ca;">
+							<tr>
+								<td class="shuHeight1"></td>
+							</tr>
+							<tr>
+								<td  style="height: 150rpx;"></td>
+							</tr>
+							<tr :class="curIndex == 2 ? 'cur' :''">
+								<td class="shuHeight1">23~01</td>
+							</tr>
+							<tr :class="curIndex == 3 ? 'cur' :''">
+								<td class="shuHeight1">01~03</td>
+							</tr>
+							<tr :class="curIndex == 4 ? 'cur' :''">
+								<td class="shuHeight1">03~05</td>
+							</tr>
+							<tr :class="curIndex == 5 ? 'cur' :''">
+								<td class="shuHeight1">05~07</td>
+							</tr>
+							<tr :class="curIndex == 6 ? 'cur' :''">
+								<td class="shuHeight1">07~09</td>
+							</tr>
+							<tr :class="curIndex == 7 ? 'cur' :''">
+								<td class="shuHeight1">09~11</td>
+							</tr>
+							<tr :class="curIndex == 8 ? 'cur' :''">
+								<td class="shuHeight1">11~13</td>
+							</tr>
+							<tr :class="curIndex == 9 ? 'cur' :''">
+								<td class="shuHeight1">13~15</td>
+							</tr>
+							<tr :class="curIndex == 10 ? 'cur' :''">
+								<td class="shuHeight1">15~17</td>
+							</tr>
+							<tr :class="curIndex == 11 ? 'cur' :''">
+								<td class="shuHeight1">17~19</td>
+							</tr>
+							<tr :class="curIndex == 12 ? 'cur' :''">
+								<td class="shuHeight1">19~21</td>
+							</tr>
+							<tr :class="curIndex == 13 ? 'cur' :''">
+								<td class="shuHeight1">21~23</td>
+							</tr>
+						</table>
+					</view>
+				</view>
+				<scroll-view scroll-x class="border-right" style="width: 85%;">
+					<view class="d-table scroll-x">
+						<table border style="width: 84vw; background-color: antiquewhite;" cellspacing="0">
+							<tr class="tableTh">
+								<!-- <td colspan="1" class=""></td> -->
+								<td class="shuHeight" colspan="2">灵龟八法</td>
+								<td class="shuHeight" colspan="2">飞腾八法</td>
+								<td class="shuHeight" colspan="5">子午流注</td>
+							</tr>
+							<tr class="tableTh">
+								<!-- <td colspan="1" rowspan="2" class=""></td> -->
+								<td class="" rowspan="2" style="height: 150rpx;">开穴</td>
+								<td class="" rowspan="2" style="height: 150rpx;">合穴</td>
+								<td class="" rowspan="2" style="height: 150rpx;">开穴</td>
+								<td class="" rowspan="2" style="height: 150rpx;">合穴</td>
+								<td class="" rowspan="2" style="height: 150rpx;">子午纳干</td>
+								<td colspan="4">子午纳子</td>
+							</tr>
+							<!-- </td>
+						</tr> -->
+							<tr class="tableTh">
+								<td class="">补法</td>
+								<td class="">泄法</td>
+								<td class="">过时泄本</td>
+								<td class="">过时补原</td>
+							</tr>
+							<tr v-for="(item,index) in quxue" :key="index" :class="item.now ? 'cur' : ''">
+								<td class="shuHeight "><text class="verticalRl"
+										:style="{color: getHightLightColor(item.lgbf.KX)}">{{item.lgbf.KX}}</text></td>
+								<td class="shuHeight "><text class="verticalRl"
+										:style="{color: getHightLightColor(item.lgbf.HX)}">{{item.lgbf.HX}}</text></td>
+								<td class="shuHeight "><text class="verticalRl"
+										:style="{color: getHightLightColor(item.ftbf.KX)}">{{item.ftbf.KX}}</text></td>
+								<td class="shuHeight "><text class="verticalRl"
+										:style="{color: getHightLightColor(item.ftbf.HX)}">{{item.ftbf.HX}}</text></td>
+								<td class="shuHeight ">
+									<view class="flexbox" v-if="item.zwlz.ngf.length > 0"
+										style="justify-content: space-evenly;align-items: center; align-content: center;">
+										<text class="verticalRl" :style="{color: getHightLightColor(item1)}"
+											v-for="(item1,index1) in item.zwlz.ngf" :key="index1">{{item1}}</text>
+
+									</view>
+								</td>
+
+								<td class="shuHeight">
+									<text class="verticalRl"
+										:style="{color: getHightLightColor(item.zwlz.nzf.bf)}">{{item.zwlz.nzf.bf}}</text>
+								</td>
+								<td class="shuHeight">
+									<text class="verticalRl"
+										:style="{color: getHightLightColor(item.zwlz.nzf.xf)}">{{item.zwlz.nzf.xf}}</text>
+								</td>
+								<td class="shuHeight">
+									<text class="verticalRl"
+										:style="{color: getHightLightColor(item.zwlz.nzf.gsxb)}">{{item.zwlz.nzf.gsxb}}</text>
+								</td>
+								<td class="shuHeight">
+									<text class="verticalRl"
+										:style="{color: getHightLightColor(item.zwlz.nzf.gsbf)}">{{item.zwlz.nzf.gsbf}}</text>
+								</td>
+							</tr>
+
+						</table>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="centerBox" style="text-align: right; padding-top:10rpx; font-size: 24rpx;">
+				注：表中带* 者是原穴
+			</view>
+		</view>
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+
+	function formatDateTime(time) {
+		var date = new Date(time);
+		var y = date.getFullYear();
+		var m = date.getMonth() + 1;
+		m = m < 10 ? ('0' + m) : m;
+		var d = date.getDate();
+		d = d < 10 ? ('0' + d) : d;
+		var h = date.getHours();
+		h = h < 10 ? ('0' + h) : h;
+		var minute = date.getMinutes();
+		var second = date.getSeconds();
+		minute = minute < 10 ? ('0' + minute) : minute;
+		second = second < 10 ? ('0' + second) : second;
+
+		return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+	};
+
+	export default {
+		data() {
+			return {
+				showTotal: false,
+				single: '',
+				playData: {},
+				curIndex: null,
+				pageWidth: uni.getSystemInfoSync().windowWidth,
+				pageHeight: uni.getSystemInfoSync().windowHeight - 200,
+				fiveYunNum: 5,
+				// date: new Date().toISOString().slice(0, 10),      // 只返回年月日
+				date: new Date().getTime(), // 返回年月日带时间
+				dateToString: formatDateTime(new Date()), // 字符串格式的日期
+				timestamp: Date.now() - 2 * 24 * 3600 * 1000, // 时间戳				
+				showCalendar: false,
+				quxue: [], // 时辰取穴
+				tiangandizhi: {},
+				yuanXue: [
+					'腕骨', '丘墟', '丘墟', '太溪', '大陵', '京骨', '阳池', '太渊', '合谷', '太白', '冲阳', '神门'
+				],
+			}
+		},
+		onLoad() {
+			// 页面自动横屏
+			// #ifdef APP-PLUS
+			// plus.screen.lockOrientation("landscape-primary");
+				// uni.showLoading({
+				// 		title: "加载中..."
+				// 	})
+			 //    setTimeout(() => {
+			 //        plus.screen.unlockOrientation();
+			 //        plus.screen.lockOrientation('landscape-primary');
+			 //        uni.hideLoading();
+			 //    }, 1200)
+			// #endif
+			
+			let da = new Date().toISOString().slice(0, 10)
+			this.timestamp = new Date(da).getTime()
+			console.log('初始时间', this.dateToString, this.date)
+			this.getXueWei(this.dateToString)
+			this.getTGDZ(this.dateToString)
+		},
+		onUnload() {
+			// 退出当前页面时 自动切换成竖屏
+			// #ifdef APP-PLUS
+			// plus.screen.lockOrientation("portrait-primary");
+			// #endif
+		  },
+		onHide() {
+
+		},
+		methods: {
+			scroll: function(e) {},
+			showTotalFun() {
+				this.showTotal = !this.showTotal
+			},
+			// 设置文字颜色
+			getHightLightColor(text) {
+				if (text.indexOf('*') != -1) {
+					return "#9c3211"
+				}
+			},
+			// 获取天干地支
+			getTGDZ(date) {
+				let that = this
+				$http.request({
+						url: "book/point/TGDZForYear",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							console.log('天干地支', res.tgdz)
+							this.tiangandizhi = res.tgdz
+						}
+
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			},
+			// 获取时辰取穴
+			getXueWei(date) {
+				let that = this
+				$http.request({
+						url: "book/point/SCQX",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0 && res.flag.length > 0) {
+							console.log('时辰取穴', res.flag)
+							this.quxue = res.flag
+							this.curIndex = res.flag.findIndex(function(item) {
+								return item.now == true
+							})
+							this.curIndex = this.curIndex + 2
+							console.log(this.curIndex, 'this.curIndex')
+						}
+
+					}).catch(e => {
+						this.curIndex = null
+						console.log(e, 'e')
+					});
+			},
+			// checkAdult(item) {
+			// 	return item.now == true
+			// },
+			changeLog(e) {
+				console.log('change事件:', e);
+				let ss = e.slice(0, 10)
+				this.timestamp = new Date(ss).getTime()
+				this.dateToString = e
+				this.getXueWei(e)
+				this.getTGDZ(e)
+			},
+		},
+
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import './scss/common.scss';
+	.whiteBg{background-color: #fff; overflow: hidden; position: fixed; top: 0; width: 100vw; z-index: 5;}
+	/deep/ .uni-date-editor { position: relative;
+		display: block; width:200rpx; height:34rpx;
+		background-image: url('@/static/icon/change.png');
+		background-size: contain; margin: 0 auto;
+		background-repeat: no-repeat;
+		padding-left: 50rpx;
+		background-position: left top;
+		.uni-date-editor--x{display: none;}
+	}
+	/deep/ .uni-date-editor::after{content: '切换时间'; font-size: 30rpx; position: absolute; top: -2px; left: 40rpx; top: 0; display: block;}
+	
+
+	.showBtn {
+		text-align: center;
+
+		text {
+			color: #a84a2d;
+		}
+	}
+
+	.textBlock {
+		display: block
+	}
+
+	.curText {
+		background-color: #fbd5ca;
+		writing-mode: vertical-rl;
+	}
+
+	.leftBar {
+		td {
+			font-weight: bold;
+			color: #a84a2d;
+		}
+	}
+
+	tr.cur {
+		background-color: #e7a896;
+		color: #fff;
+
+		td {
+			color: #fff;
+		}
+	}
+
+	.tableTh {
+		background-color: #fbd5ca;
+		font-weight: bold;
+		color: #a84a2d;
+	}
+
+	.shuHeight {
+		height: 100rpx;
+	}
+
+	.shuHeight1 {
+		height: 100rpx;
+	}
+
+	.verticalRl {
+		writing-mode: vertical-rl;
+	}
+
+	.oneHeight {
+		height: 50rpx;
+	}
+
+	.twoHeight {
+		height: 94rpx;
+	}
+
+	table {
+		border-collapse: collapse;
+		font-size: 28rpx;
+	}
+
+	table td {
+		border-bottom: 1px solid #a84a2d;
+		border-right: 1px solid #a84a2d;
+	}
+
+	table tr:first-child td {
+		border-top: 1px solid #a84a2d;
+	}
+
+	table tr td:first-child {
+		border-left: 1px solid #a84a2d;
+	}
+
+	td {
+		padding: 8rpx 10rpx;
+	}
+
+	.oneWidth {
+		width: 124rpx;
+	}
+
+	/deep/ .uni-table-th {
+		padding: 14rpx 20rpx
+	}
+
+	* {
+		font-size: 28rpx;
+	}
+
+	.centerBox {
+		text-align: center;
+		padding: 20px;
+		color: #666;
+	}
+
+	.yinli {
+		line-height: 50rpx;
+
+		text {
+			writing-mode: vertical-rl;
+			letter-spacing: 20rpx;
+			color: #c06346;
+		}
+	}
+
+	.box1 {
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		justify-content: space-between;
+		align-items: center;
+
+		.yunqi {
+			color: #c06346;
+			text-align: center;
+			margin-top: 20rpx;
+
+			.shu {
+				display: inline-block;
+				padding: 20rpx;
+
+				text {
+					writing-mode: vertical-rl;
+					line-height: 80rpx;
+					font-size: 48rpx;
+				}
+			}
+		}
+	}
+
+	.grayBg {
+		background-color: #eee;
+	}
+
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+
+		.leftone {
+
+			border-left: 1px solid #ddd;
+		}
+
+		.row {
+			display: inline-block;
+			text-align: center;
+			background-color: #fef9e4;
+			border-right: 1px solid #ddd;
+			border-bottom: 1px solid #ddd;
+		}
+
+		.row.cur {
+			background-color: #8d3d16;
+			color: #fff;
+			position: relative;
+			border-right: 0;
+			z-index: 5;
+			box-shadow: 0 0 10px #8d3d16;
+		}
+
+		.line {
+			padding: 20rpx;
+			border-top: 1px solid #ddd;
+
+			span {
+				font-size: 36rpx;
+			}
+		}
+
+		.line1 {
+			font-size: 24rpx;
+			height: 200rpx;
+			writing-mode: vertical-rl;
+			;
+		}
+
+		.zhuyun {
+			color: #8d3d16;
+			background-color: #faede7;
+			font-size: 30rpx;
+		}
+
+		.keyun {
+			color: #c06346;
+			background-color: #fceeed;
+			font-size: 30rpx;
+		}
+	}
+
+	.container88 {
+		padding: 10rpx;
+
+		background-color: #fff;
+		padding-bottom: 70rpx;
+	}
+
+	.datetimeBox {
+		width: 80%;
+		margin: 0 auto;
+		margin-bottom: 30rpx;
+	}
+
+	.liuqiBox {
+		.line.keyun {
+			padding: 60rpx 10rpx
+		}
+	}
+
+	.wuYunBox {
+		.row {
+			width: 20%;
+			box-sizing: border-box;
+		}
+	}
+
+	/deep/ .uni-calendar__content-mobile {
+		bottom: 100rpx !important;
+	}
+
+	.sizai {
+		.keyun {
+			position: relative;
+		}
+
+		.keyun::after {
+			position: absolute;
+			content: '';
+			top: 24rpx;
+			left: 0;
+			font-size: 24rpx;
+			display: block;
+			width: 100%;
+			color: #888;
+			text-align: center;
+		}
+
+	}
+
+	.sizai1 {
+		.keyun::after {
+			content: '（司天）';
+		}
+	}
+
+	.sizai2 {
+		.keyun::after {
+			content: '（在泉）';
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+</style>
\ No newline at end of file
diff --git a/static/icon/change.png b/static/icon/change.png
new file mode 100644
index 0000000000000000000000000000000000000000..15be1adb6e339ed63b0afa4b9be0a80a72376789
GIT binary patch
literal 4812
zcmY*dc{CJU*uN;rJ}FBGgY3j8`&gPRlO;=*v5XpImn~#05h+{mSh9sMyp|#RlC^{w
zBpLf&gX~+D#5eEv*Z19X?tRX==Q+<g_gQ|=^Sdwa8R{_6U!?~CFzM+cOeiw^zfDI=
zIX}T4^ic$ruZfNpC?DWi0pL=!9zxSB&~Dw9DUR2|AHLMeA-Fy<m)2nLR$QRNnC3n&
zov^^UD~$hkbP_TmhR<<dom2@R8447-K6{Puci6d|N3Wo``WEIDz!1;YUFac{rCcmZ
zJCS_7rlugTpi1xM$cb5@VML3>NT{!of7$pGHI>~NVsJoc_Uwmm%Y>SP>{+i3;#Ba4
z5?v%|l)b%`6q>8b2)-`ya{_x14zJh9DOFFSq6N#o410~okzD`(l8?cCra5T-C7Vce
ziV1^T?Zo5iaU0Qz(bfG$O;&wwOoEK%d;6#E?rVW<mOtY%sp{Ovs{)@sJx1cc`(TKl
zV;Zv3js7}$i^KS|IwN;Vla-z0l;l-aPo~!=>)SG-3`hR_Rt4HRI)gOfeUbbPT4J@h
zbeX~7<(R`7S+WMfJeVG2U*qEo6EF%58s5+YF~jk)r4a9%u!@06UBa^90^Dh)D0yNu
z)_$1_lv!05);WB^acjMZ9e&a0hh^M!0b?TJicj~JKLsCbFo|DBmno)PXrHKcL#xZn
z*Ia`rfc95*H^hPJCt?x|1~dKeWc}DG#j#ux-13^idRC8LF6!GSGsh{?fI;X&;tz#p
zJA3jXvKUi~S|9s{znge*T2LoJl0L%zA6X{|wD--kW(ylA2dqu_B=}z%u24phwEr~3
zhvJ~0%w0?H0vvd38z2aqWd<A$@5A*Q!)U<lYc%vYG`iB`gDXLXCY%MdU-&eOn$$d-
zoex4xk%MLs(Xvr~gv-EYG{kNBaMjc`>@wtl8}l2st8g{GD-6#wdcXdkfBwnQ>0}Yd
zo6GKs14|rkZiAKXEVU|ZV_KXB5cZ3J#>TPlgflPyf~R+r4I3Mqj&HpQ11-0Lrwvqt
zu7khbLjiVj8Pq|B{yO%m^?mRI?o$okK`nM|N$C}CnAfAgzLyg=;w+zC9I>4z7Z(>-
zb`MFo02*h$BDE1y!|u1d-lnA~niWdpsqOvz{0OpSX`t8^1+jA^^X`~WJIkNu>tpag
z)#T)S-eGI`7dENd7uXk>CGc={IJ{Lt%46~`k|vyV+z0q+T}Q4tl2x#?XB?BSI5Y>n
zv+4yF_^8^wYUk@CW8hZL^^LFLLA(ESclyyU^8ht4rHPpAyYb2+8?`D0_%(F1m{_+j
z4(`GoG6PheM$u@vNd@fUrOvTEp88fA5Q4LtcYmw^YJ7HBVwOGDvz&I%qNpj>-lQE(
z37t<n@|-<T_cHA$8S>#-l14NO>q#T9<GamhQRK!)kXuV;N2<Mu$=O%kbh{&Fcb#w4
zU%i)zJ{KN~`@x^5g*ByP>-J`@8%sR92Cxw^4vlqQ86;F{MjJiYj59?ouwrN16ulyU
zFjJy}rV1}h{aj0f*gI`bDU%B!>?=^&J4VF)dAa;4s5eIf)R2OKy+H)EDME-_jf84Q
zmSjK*g7+Mt)c}!*!n|e^AnZFd1YYibAOoqj7FxBengU<RDra`kWA|>8ZbrtpGU0!I
zj)%c^>#?&&O&{E=HZxL5sF{oKBn{De{|FnvTE3;0w&k9=6@uQl=O#69<Qr4LpBGl!
zC8?v8uqe;!jp1Rye{WJXXC%;Qkbb+>X1MotNo~Tl5$3lWCKS&^5PlC5;MImGw-y#q
z{!##|NEg8}Hly;M8I1b#>5YvANz+A?dWe7RI(m59%3#WM`mWL?Mz36v1vtc!=F4vL
zY~`03aqv-UTKy#(D`a%+WWZ?tMCIl3t;{a*SLO|d{4$l^>rR>0Ur2ye`NyR9pQAd9
z!wDrcyA>rrY>b)vB8_6Ne9D0?1gi~JUov~h1W>ClsQ9IEOWsf<>OznEhbIFU!qu<m
zsrTqNM9|cb{;>UKe!@1ybPG{O9eyLa0wVZ&?Po<zZDrEOqXV{~{#%Tu=daGwetXtn
zi$L&HLNH@D!N=w4FkQO2lNy55^pgRdPT9d-&yt8m_g+>{;V`ji^6viAzqZrb+yP90
zP`frW%_TUOkMJWfVQPHgfEChsEAak5(WGM;wg{xBF!bfWzZ(3{1Em^SRaMFP(V>PA
zH`6fsC2O?F##n|Dll!*l;r8C%p5rtRe1#q)EKbG6?B+d5J7Q?vy!+g1)WEHU8{k?)
z_=NHj1NsXt&?zQVGeMR@NOHUEvj-UUmf?R#WWkTJnej(CQUPIm4J5a&wE9W9IUX*q
zpd6E5-XPF6PA-uX(={w=WtO9zzfEWk)XOb4`IUpoi_Z!AnPMTmx+nRt`#-GWg`HW&
zeVlx`JUq>*RTzRHdiWf30CxY|rE`^MLKhIbsF3fdzP{W}j%*U^_G0$Z=Z%({;Wi8q
z((ivJORn-<{9Q|`!b)f+w~YBrhS3f3_LOm}VRz^tcr^om<v``i$AR#(*?gTEi1(YN
zpjG8}N&#`JO{PRFrrxjjD!O!JrrCFCU}<M=vuPue*nCSX7$vrU_w5gnWoO#2s6LU=
z<|P?e#coL3>TPD!>H%n<B|m7Vc0N^tgviUl6Bf(vbT+JnCdV|FVO6NZSDVm@Ux?oF
zbP=&0Z%4R!d2K!78XtLv>zMyUF3Sk4qqjrQtu{U`KJ1m|rMz+1bW=JnXD|KLHZM%4
z%B@WeIbFioA<Fd6d{<lv!m7u7RQ6VJ57iN!tL`4J9B$gA|7E*I1O0X$;inkuo=!E_
zR9@f`B--0a+T+7dlB3?sXujU#)aXnM$`;A=DYkY3&V&G<;n%O`d@FOw$k4DgEyFiD
zp?uX7LoR6f+e*_B&BUELvg+SBoR6kqVKx4+n_6Vm$_6@l*N>SYEeerFuz(R%Uu8*w
z+G#7zGZN~dOsLeu9->a492Gy7>S!}<Wp?75mxMz@c`zSLWPShO3LP#rI+8ySlghEJ
z4<7S8x&rOhOdQUTCHHFQ3s`?_tS=aO|Jr*t+}^?Ahb^*rvui4j?{^5ATF<1GqHlYU
zMC38>kh_hDBComml5@Q@C~ld0UgRiqyVHpBtVWLi)#F(TMZ{f~JA^}81g|K>zO5l)
zz<aT04(M<S7zeZ9TGr04!otQ6LcY`|mpD>uOev{b_q7!l#QXW!zDXNjv0xP{yWpT~
zly(t#7hxgWPX>2ezrLjLh;#8RmmYPr;@%0k{mFlNGA+p3fwsr5M3D_F3>;1-9Bg*-
zm#>CKrK>{}e*gHAq^@xDrhfrj(|x`qzfk_Wp3lC6*AE%`op#M!M;e(Rv+F@K&Gkch
z@kO<%2LC4BIl7hEKT3(iK+*^2qn){>ri~Qh$${|%rH30&<Z%>J@sG=<n0Oy~O86ei
zku6c=luA{e6b=KzeueJCU!s)qXmqJAETj!5p{UiDgm0Q5Z5840)1>BPBGST5>WJ<K
z&Uat0yR-^Na5x(p8dBiGEcl2>i$L|vrt9#u?S%%J=I1oGB1Jz}4=Ar@UAPu#Kl97p
zdLWY7)_Sfm)AQ-#mn0G4{WTYYd8us^r7q0I%}i<9y|V%Y7m|#f`ckEWr%42BBR@ia
zxP}vh`*f3kN32Ziq59A>A~t37&+ZJ<0w*JQJ-#-=bx#z~CWik~3^m7T@lmzxTuOV9
z$<y6vF18QB5X&XGrGk3o-Z;IJdDgPUmG+{emUPLv_>l{2_uA|M!D(gLY(q<(rnHsy
zdojd1{=;?`HwR@DoJ&cAvp|gH<yBZ9sBe;f0=h!Qzf2z6r5e$PLqdrs_h%2n6l7*x
zmf4#wOH$wWhKa_%Yg!qGQd{&GUNUw^)q4gO@>+K}eQmC(aP+)Tbkj`XuL+NljFf^V
z*JMY^MY@%)Vyo^#&|wIj$V&07|I5HaSB%uPtdCxGz^br1#CNVBqL<U;v_3wJ)S{Z>
ztz)=3apSee)pZR3(9pcu`hJB3JIfvut&fIo#4Pl^<y0wa_CX@CGlV@PI%Y#cYr86_
z0Ca>Pl9TtwGY(O!>gU3P^UuAAjvkn44f#{*!iAq<NE2Re+Mobb(DM#7n{g@hp3Bdb
zm!V=Bk69qXsZo{h3P`ALUrvv0P?RBdDagX%T@KfOATIdR7OF2K+Zp5%$y!BcInuhW
zVGlDh`A$1uvc@o!|KP2IZa-r<B`MtEWy2u5Yn3?e+!E%*q*7kG9i;hNKSeXK{mI3}
zMVyJW|LQrg#DzJ9_0H>~S#+zMxmkN2jH89~-k1an-RUm)EQbFs<J5l%#|5Bh$VKSF
z8l_0-vwZ0M?eYpPKanWyV@WZ|;pXFeqYP~8zp)`=XoHGk^r~=+iWgY7Lu{=p&r!!T
z^zN$a1&!V>MZ8LDPC^Jz{jG$&x3#Js>oAwYT2L}pk)hLZs|I&n`il(8O^?I$Pzk}U
z_<+3Mx_RcJP$QmnT^h^MBW3Ks0CZ0^#v?*Z6`~~r*JPb$EJ{ZT^syH6yD7-aR)~@@
zAss#X@rbu$xVI**@&Y;A7cs<<TP8i`()Y_O3t}9G?)&&<NqQ`tZ#6`;x!iuyD;&#?
zf2GUe^(ioDh|&UJYGUF&sDy~#!dMnGt*;E{KW}J0yqhfP5d@aLq0Wo0>~XB~uf(~A
z<Ez~hM^JY&rV8kV>)y)5+KotYv4uk19mrF$+T%|gMD|`0jlQ$p$#;skG#hU)%yM$m
zAL8nLTIg=0$k3dU&LGC)()Z44*_j}Gs1<QzA!Ecv{p4d417z_beTkK#9M<ZeHM6MX
zg#LwQ&p)mNym&_Q8vDXYwj{5LTe|t@e7yKAh}tCK_A4H=UzICiUl?pz8nGv`ch`vV
zovA@zMJHWZ86-B>kS+z8S~fi;><@#j0Zz@}d~7ovTv@q^#F=E)xeOpJ>eV7h&i5|E
zg|QL*F?VYp{!QnDYqebj5{qW{kpxOyH=C~BO@5+7CE$V`BKsCUdZp${Xrl#u>G{5P
z13Bly_b=8>Ya)gi2`*D#>x?`B>p=M`@?uJX^L+42(W^ES=5u)}iV41I&|aU-Nvb&k
zg!@>zNnY(K6m&-81Q*z{mqJ8kT71uIC=x!8a46zgU`B_n>bN&PEgJRxI3M!KnU((l
zFPPWgx&+I~<e$Q5vbv|IrKP=zkS>*L`L2$&O0D`Z+W93uMkY90<YtnOM-<@Cy4VnP
zeejDF&EW2jpy00hEfsX(-&kC7KW?LzJMs!GfXGR=wcE_6|2Ls0vD-8aRm)*`yY*1>
znIV!+$lp_hhf&lNE99S?F`@!83H67qGMmhg^cfVM6l@rmay01|&v<YaJqFMD$Jh#e
z4ZdkIE6ivjc9FxA_nMrqqTI&6rJ#CZt+!IY*NtA0vK9k$n*5Fi6Df+p$?2QRBjfzd
ztDm=ha`E^3)>Ybgb18I%j=h|7<~%Tom-oJ9Pv#}6jyuaQToSAwuG~7i3q+uv8VIVu
z(hsNaO^|s}go-Wv{U$RI^Lj_gtYUQ2f&656)(zZnj7$Gjry7D<bXe!;TJLksw()Yl
zc@1(PpV@EScX}el3#zrhq58~s*1=;#?oStD8YVfb(dCjicdC@-4Z@U4i;_{o956JW
zX+I39T@~ylnCHA-E5BBDP|OGr)msIGa1F-vLf$)_rW$k+a~gJdxBLj*6%vY2C+Bxu
z;w-$$9<iz2=~4FvH_RzsY=j3lBnnoWE@4D98u%l9sDSDh;_L%*w>w8wvQ~UdAQKeX
zNGdg%TJgOT2KPHb(1y^jpeWRw{Geu=7QDV&lH%Y216z{NQ{B){tLL5I<;lwCr6UPa
zwoQ9xQt$pRUzR=>z6&&{VbTxC_0Pj{%yVV&H>y%pttv)Ey1Tj-de;ktlF;?N)b{3%
zN?17xW4D_rp|ZadTKFD$#C7DFPFWN#KRQ@uQm0?G1JXt;2B6YbRX=E*?3jSh6;%1H
zsA+uMDjYEtu(v$);$UN1BC(*iKAWoD=5F-SMRUQ0U#zTnE)<V+QCNz}pQ^$~Vg}1f
zalw~>FH=!1oDWigQ&s|7*Fb~(qff~BvbLmSJ>rQFgm)kvUH&8Z8ZcgcKKs)`6rakC
zk=E|~NyPqAh!svhVufByM&rM0Vu%75qN!trio=kA!7Plz`I1xfI7AGyIL(n#Wh1Vi
z`khQ?4&T{T@UcYLPjLETJ0i{xyOeqs%03?Xvv&oQY{bd^;0C#jr4}(u09^6W=E`FP
z_o7E6I(<Pny;44-F)a}N^y|uk63~dsGL9Cd0m%>c>9=`6uGWC)?PMy@`~GQE;Hivl
XN7_+|LgWzTdkW~?F+`MW*+={jnD7m9

literal 0
HcmV?d00001