微调-引入全局获取时间小时数据

修改配色
时辰取穴：当前时辰+全部时辰
2023-12-08 09:41:21 +08:00 · 2023-12-07 18:04:11 +08:00 · 2023-12-07 13:47:28 +08:00 · 2023-12-06 15:18:20 +08:00 · 2023-12-06 13:05:23 +08:00 · 2023-12-05 17:58:30 +08:00
24 changed files with 2915 additions and 1308 deletions
--- a/components/z-navigation/z-navigation.vue
+++ b/components/z-navigation/z-navigation.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="footer_box" :class="{ footer_bg: bg }">
 			<view v-for="(item, index) of navigationList" :key="index" class="footer_item">
-				<view class="footer_nav_item" @click="onPageJump(item.pagePath,index+1)">
+				<view class="footer_nav_item" @click="onPageJump(item.pagePath)">
 					<image v-if="item.pagePath == path" class="footer_nav_item_image footer_nav_item_image_scale"
 						:src="'/' + item.selectedIconPath" mode="aspectFit"></image>
 					<image v-else class="footer_nav_item_image" :src="'/' + item.iconPath" mode="aspectFit"></image>
@@ -49,7 +49,7 @@
 						iconPath: 'static/tab/icon2_n.png',
 						selectedIconPath: 'static/tab/icon2_y.png',
 						text: '我的订单'
-
+						
 					},
 					{
 						pagePath: 'pages/peanut/mine',
@@ -69,23 +69,11 @@
 		},
 		//方法
 		methods: {
-			onPageJump(url,num) {
-				if (uni.getStorageSync("anonymous") == '0000000000' && (num == 2 || num == 3)) {
-					uni.showToast({
-						icon: 'none',
-						title: '请先登录'
-					})
-					// setTimeout(() => {
-					// 	uni.navigateTo({
-					// 		url: "/pages/user/login"
-					// 	});
-					// }, 1000)
-				} else {
-					if (this.path !== url) {
-						uni.switchTab({
-							url: '/' + url
-						});
-					}
+			onPageJump(url) {
+				if (this.path !== url) {
+					uni.switchTab({
+						url: '/' + url
+					});
 				}
 			},
 		}
@@ -171,10 +159,10 @@
 		}
 	}

-
+	

 	.footer_item_text_active {
 		color: #079307;
 		font-weight: bold;
 	}
-</style>
+</style>
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -6,10 +6,10 @@ if (process.env.NODE_ENV === 'development') {
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "http://59.110.212.44:9200/pb/";
-	baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
+	// baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
 	 // baseUrl = "https://api.nuttyreading.com/";   // 线上正式
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
-	// baseUrl = "http://192.168.110.110:9200/pb/";
+	baseUrl = "http://192.168.110.110:9200/pb/";
 	  // baseUrl = "http://192.168.110.38:9200/pb/";        // 吴春磊笔记本1
 	// socketUrl = "ws://8.129.186.35:6001/";
 } else if (process.env.NODE_ENV === 'production') {
--- a/config/html5Utils.js
+++ b/config/html5Utils.js
@@ -240,13 +240,13 @@ export const h5Login = function(type = "judge", callback) {
 			appMutual("jumpLogin", null, function() {
 				if (type == "force") {
 					// 没登录跳转回登录页
-					// uni.showToast({
-					// 	icon: 'none',
-					// 	title: '用户信息失效，请重新登陆。'
-					// })
-					// uni.navigateTo({
-					// 	url: "/pages/user/login"
-					// });
+					uni.showToast({
+						icon: 'none',
+						title: '用户信息失效，请重新登陆。'
+					})
+					uni.navigateTo({
+						url: "/pages/user/login"
+					});
 				}else{
 					uni.showModal({
 						title:"提示",
--- a/config/requestConfig.js
+++ b/config/requestConfig.js
@@ -125,11 +125,9 @@ $http.requestStart = function(options) {
 	let storeUserInfo = store.state.userInfo;
 	if (!storeUserInfo.token) { // nvue页面读取不到vuex里面数据，将取缓存
 		storeUserInfo = uni.getStorageSync("userInfo");
-		uni.setStorageSync('anonymous', '0000000000');
 	}
 	if (storeUserInfo.token) {
 		options.header['token'] = storeUserInfo.token;
-		uni.setStorageSync('anonymous', storeUserInfo.token);
 	};
 	return options;
 }
@@ -163,9 +161,8 @@ $http.dataFactory = async function(res) {
 			// 返回正确的结果(then接受数据)
 			return Promise.resolve(httpData);
 		} else if (httpData.code == "401") {
-			console.log(uni.getStorageSync("anonymous"))
 			// token失效
-			if (uni.getStorageSync('guidePages') == 2 && uni.getStorageSync("anonymous") != '0000000000') {
+			if (uni.getStorageSync('guidePages') == 2) {
 				uni.showToast({
 					title: '登录失效，请重新登录',
 					icon: 'none'
@@ -298,7 +295,7 @@ $http.dataFactory = async function(res) {
 			});
 		} else { //其他错误提示   
 			console.log(httpData.info || httpData.msg)
-			if (res.isPrompt && res.data.loadAnimate != 'none') {
+			if (res.isPrompt && res.data.loadAnimate != 'none') {	
 				uni.showToast({
 					title: httpData.info || httpData.msg,
 					icon: "none",
@@ -337,4 +334,4 @@ $http.requestError = function(e) {
 		// });
 	}
 }
-export default $http;
+export default $http;
--- a/main.js
+++ b/main.js
@@ -6,6 +6,10 @@ import {music, bgm} from '@/utils/music.js'
 Vue.prototype.$music = music
 Vue.prototype.$bgm = bgm

+
+import {nowHour} from '@/utils/getHours.js'
+Vue.prototype.$getHours = nowHour
+
 // 地址
 // Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/"
 // Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/"
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
 				"epubjs": "^0.3.93",
 				"jquery": "^2.2.4",
 				"qs": "^6.11.0",
+				"quill-image-resize-module": "^3.0.0",
 				"uview-ui": "^2.0.35"
 			}
 		},
@@ -50,6 +51,14 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/clone": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/core-js": {
 			"version": "3.24.1",
 			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
@@ -74,6 +83,54 @@
 				"type": "^1.0.1"
 			}
 		},
+		"node_modules/deep-equal": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
+			"integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
+			"dependencies": {
+				"is-arguments": "^1.1.1",
+				"is-date-object": "^1.0.5",
+				"is-regex": "^1.1.4",
+				"object-is": "^1.1.5",
+				"object-keys": "^1.1.1",
+				"regexp.prototype.flags": "^1.5.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/define-data-property": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+			"integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+			"dependencies": {
+				"get-intrinsic": "^1.2.1",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/define-properties": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+			"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+			"dependencies": {
+				"define-data-property": "^1.0.1",
+				"has-property-descriptors": "^1.0.0",
+				"object-keys": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/epubjs": {
 			"version": "0.3.93",
 			"resolved": "https://registry.npmjs.org/epubjs/-/epubjs-0.3.93.tgz",
@@ -132,6 +189,11 @@
 				"es5-ext": "~0.10.14"
 			}
 		},
+		"node_modules/eventemitter3": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+			"integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+		},
 		"node_modules/ext": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
@@ -145,33 +207,77 @@
 			"resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
 			"integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
 		},
+		"node_modules/extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+		},
+		"node_modules/fast-diff": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
+			"integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+		},
 		"node_modules/function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/functions-have-names": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/get-intrinsic": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-			"integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+			"integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.3"
+				"function-bind": "^1.1.2",
+				"has-proto": "^1.0.1",
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+		"node_modules/gopd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
 			"dependencies": {
-				"function-bind": "^1.1.1"
+				"get-intrinsic": "^1.1.3"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-property-descriptors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+			"integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+			"dependencies": {
+				"get-intrinsic": "^1.2.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
 			"engines": {
-				"node": ">= 0.4.0"
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/has-symbols": {
@@ -185,6 +291,31 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/has-tostringtag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+			"dependencies": {
+				"has-symbols": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/hasown": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+			"integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/immediate": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
@@ -195,6 +326,50 @@
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
 			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
 		},
+		"node_modules/is-arguments": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-date-object": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+			"dependencies": {
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-regex": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -263,11 +438,39 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/object-is": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/object-keys": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/pako": {
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
 			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
 		},
+		"node_modules/parchment": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
+			"integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+		},
 		"node_modules/path-webpack": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/path-webpack/-/path-webpack-0.0.3.tgz",
@@ -292,6 +495,47 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/quill": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
+			"integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+			"dependencies": {
+				"clone": "^2.1.1",
+				"deep-equal": "^1.0.1",
+				"eventemitter3": "^2.0.3",
+				"extend": "^3.0.2",
+				"parchment": "^1.1.4",
+				"quill-delta": "^3.6.2"
+			}
+		},
+		"node_modules/quill-delta": {
+			"version": "3.6.3",
+			"resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
+			"integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+			"dependencies": {
+				"deep-equal": "^1.0.1",
+				"extend": "^3.0.2",
+				"fast-diff": "1.1.2"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/quill-image-resize-module": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/quill-image-resize-module/-/quill-image-resize-module-3.0.0.tgz",
+			"integrity": "sha512-1TZBnUxU/WIx5dPyVjQ9yN7C6mLZSp04HyWBEMqT320DIq4MW4JgzlOPDZX5ZpBM3bU6sacU4kTLUc8VgYQZYw==",
+			"dependencies": {
+				"lodash": "^4.17.4",
+				"quill": "^1.2.2",
+				"raw-loader": "^0.5.1"
+			}
+		},
+		"node_modules/raw-loader": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+			"integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
+		},
 		"node_modules/readable-stream": {
 			"version": "2.3.7",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -306,11 +550,40 @@
 				"util-deprecate": "~1.0.1"
 			}
 		},
+		"node_modules/regexp.prototype.flags": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+			"integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.2.0",
+				"set-function-name": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/safe-buffer": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
 			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
+		"node_modules/set-function-name": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+			"integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+			"dependencies": {
+				"define-data-property": "^1.0.1",
+				"functions-have-names": "^1.2.3",
+				"has-property-descriptors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/setimmediate": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
@@ -384,6 +657,11 @@
 				"get-intrinsic": "^1.0.2"
 			}
 		},
+		"clone": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
+		},
 		"core-js": {
 			"version": "3.24.1",
 			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
@@ -403,6 +681,39 @@
 				"type": "^1.0.1"
 			}
 		},
+		"deep-equal": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
+			"integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
+			"requires": {
+				"is-arguments": "^1.1.1",
+				"is-date-object": "^1.0.5",
+				"is-regex": "^1.1.4",
+				"object-is": "^1.1.5",
+				"object-keys": "^1.1.1",
+				"regexp.prototype.flags": "^1.5.1"
+			}
+		},
+		"define-data-property": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+			"integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+			"requires": {
+				"get-intrinsic": "^1.2.1",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.0"
+			}
+		},
+		"define-properties": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+			"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+			"requires": {
+				"define-data-property": "^1.0.1",
+				"has-property-descriptors": "^1.0.0",
+				"object-keys": "^1.1.1"
+			}
+		},
 		"epubjs": {
 			"version": "0.3.93",
 			"resolved": "https://registry.npmjs.org/epubjs/-/epubjs-0.3.93.tgz",
@@ -457,6 +768,11 @@
 				"es5-ext": "~0.10.14"
 			}
 		},
+		"eventemitter3": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+			"integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+		},
 		"ext": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
@@ -472,34 +788,79 @@
 				}
 			}
 		},
+		"extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+		},
+		"fast-diff": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
+			"integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+		},
 		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+		},
+		"functions-have-names": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
 		},
 		"get-intrinsic": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-			"integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+			"integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
 			"requires": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.3"
+				"function-bind": "^1.1.2",
+				"has-proto": "^1.0.1",
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
 			}
 		},
-		"has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+		"gopd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
 			"requires": {
-				"function-bind": "^1.1.1"
+				"get-intrinsic": "^1.1.3"
 			}
 		},
+		"has-property-descriptors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+			"integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+			"requires": {
+				"get-intrinsic": "^1.2.2"
+			}
+		},
+		"has-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
+		},
 		"has-symbols": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
 			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
 		},
+		"has-tostringtag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+			"requires": {
+				"has-symbols": "^1.0.2"
+			}
+		},
+		"hasown": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+			"integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+			"requires": {
+				"function-bind": "^1.1.2"
+			}
+		},
 		"immediate": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
@@ -510,6 +871,32 @@
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
 			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
 		},
+		"is-arguments": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+			"requires": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			}
+		},
+		"is-date-object": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+			"requires": {
+				"has-tostringtag": "^1.0.0"
+			}
+		},
+		"is-regex": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+			"requires": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			}
+		},
 		"isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -577,11 +964,30 @@
 			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
 			"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
 		},
+		"object-is": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+			"requires": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.3"
+			}
+		},
+		"object-keys": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+		},
 		"pako": {
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
 			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
 		},
+		"parchment": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
+			"integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+		},
 		"path-webpack": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/path-webpack/-/path-webpack-0.0.3.tgz",
@@ -600,6 +1006,44 @@
 				"side-channel": "^1.0.4"
 			}
 		},
+		"quill": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
+			"integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+			"requires": {
+				"clone": "^2.1.1",
+				"deep-equal": "^1.0.1",
+				"eventemitter3": "^2.0.3",
+				"extend": "^3.0.2",
+				"parchment": "^1.1.4",
+				"quill-delta": "^3.6.2"
+			}
+		},
+		"quill-delta": {
+			"version": "3.6.3",
+			"resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
+			"integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+			"requires": {
+				"deep-equal": "^1.0.1",
+				"extend": "^3.0.2",
+				"fast-diff": "1.1.2"
+			}
+		},
+		"quill-image-resize-module": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/quill-image-resize-module/-/quill-image-resize-module-3.0.0.tgz",
+			"integrity": "sha512-1TZBnUxU/WIx5dPyVjQ9yN7C6mLZSp04HyWBEMqT320DIq4MW4JgzlOPDZX5ZpBM3bU6sacU4kTLUc8VgYQZYw==",
+			"requires": {
+				"lodash": "^4.17.4",
+				"quill": "^1.2.2",
+				"raw-loader": "^0.5.1"
+			}
+		},
+		"raw-loader": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+			"integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
+		},
 		"readable-stream": {
 			"version": "2.3.7",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -614,11 +1058,31 @@
 				"util-deprecate": "~1.0.1"
 			}
 		},
+		"regexp.prototype.flags": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+			"integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+			"requires": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.2.0",
+				"set-function-name": "^2.0.0"
+			}
+		},
 		"safe-buffer": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
 			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
+		"set-function-name": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+			"integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+			"requires": {
+				"define-data-property": "^1.0.1",
+				"functions-have-names": "^1.2.3",
+				"has-property-descriptors": "^1.0.0"
+			}
+		},
 		"setimmediate": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
 		"epubjs": "^0.3.93",
 		"jquery": "^2.2.4",
 		"qs": "^6.11.0",
+		"quill-image-resize-module": "^3.0.0",
 		"uview-ui": "^2.0.35"
 	},
 	"name": "e-peanut",
--- a/pages.json
+++ b/pages.json
@@ -535,6 +535,22 @@
        		"navigationBarTitleText" : "脉穴详情",
        		"enablePullDownRefresh" : false
        	}
+        },
+        {
+        	"path" : "pages/timeAcupoint/timeAcupoint",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "时辰取穴",
+        		"enablePullDownRefresh" : false
+        	}
+        },
+        {
+        	"path" : "pages/timeAcupoint/totalTable",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "全部穴位一览表",
+        		"enablePullDownRefresh" : false
+        	}
        }
    ],
 	"globalStyle": {
--- a/pages/acupoint/acupoint.vue
+++ b/pages/acupoint/acupoint.vue
@@ -174,6 +174,12 @@
 				this.getTitles(id)
 			},
 			setOneCateIndex(item, index) {
+				if(item.title == "时辰取穴"){					
+					uni.navigateTo({
+						url: "../timeAcupoint/timeAcupoint"
+					})
+					return 
+				}				
 				let id = item.id
 				this.curOneCateIndex = index
 				this.curTwoCateIndex = 0
--- a/pages/bookShop/commodityDetail.vue
+++ b/pages/bookShop/commodityDetail.vue
@@ -110,7 +110,7 @@
 						</u-row>
 					</view>
 					<!-- <view class="commodityIntroduce" v-html="productInfo.productDetails"> -->
-					<view class="commodityIntroduce">
+					<view class="commodityIntroduce">						
 						<view v-if="productInfo.productDetails">
 							<rich-text v-if="productInfo.productDetails" class="xiangqing" @itemclick="showImg"
 								:nodes="productInfo.productDetails|formatRichText"></rich-text>
@@ -225,7 +225,7 @@
 				options: [{
 					icon: 'cart',
 					text: '购物车'
-				}],
+				}],				
 				buttonGroup: [{
 						text: '加入购物车',
 						backgroundColor: 'linear-gradient(90deg, #FFCD1E, #FF8A18)',
@@ -448,18 +448,8 @@
 					url: '../peanut/shopping'
 				});
 			},
-			
 			// 关联商品点击按钮组件
 			buttonClickLink(e) {
-				// 游客跳转
-				if (uni.getStorageSync("anonymous") == '0000000000') {
-					uni.showToast({
-						icon: 'none',
-						title: '请先登录'
-					})
-					return
-				}
-
 				console.log('点击的是关联商品的组件')
 				if (e.index == 0) {
 					// 点击的是加入购物车
@@ -494,14 +484,6 @@
 			},
 			// 点击按钮组间
 			buttonClick(e) {
-				// 游客跳转
-				if (uni.getStorageSync("anonymous") == '0000000000') {
-					uni.showToast({
-						icon: 'none',
-						title: '请先登录'
-					})
-					return
-				}
 				//	console.log(e)	
 				if (e.index == 0) {
 					// 点击的是加入购物车
--- a/pages/library/library.vue
+++ b/pages/library/library.vue
@@ -67,7 +67,6 @@
 												<view v-if="item.clockIn != null && item.clockIn != 2" @click="goDaKa(item)">
 													<image src="../../static/icon/home1.png" mode="aspectFit"></image>
 												</view>
-												
 												<view v-else @click="noOp()">
 													<image class="gray" src="../../static/icon/home1.png" mode="aspectFit"></image>
 												</view>											
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
--- a/pages/peanut/mine.vue
+++ b/pages/peanut/mine.vue
@@ -5,12 +5,12 @@
 		<view style="height: 50rpx;"></view>
 		<view class="per_mes">
 			<image :src="userMes.avatar" v-if="userMes.avatar!=null" class="per_mes_img"></image>
-			<image src="../../static/icon/home_icon_1.png" v-if="userMes.avatar==null" class="per_mes_img" @click="signOut()"></image>
+			<image src="../../static/icon/home_icon_1.png" v-if="userMes.avatar==null" class="per_mes_img"></image>
 			<view>
 				<text class="name" v-if="userMes.nickname!=null">{{userMes.nickname}}</text>
-				<text class="name" v-if="userMes.nickname==null" @click="signOut()">未登录</text>
+				<text class="name" v-if="userMes.nickname==null">未设置</text>
 				<!-- <image v-if="userMes.vip==1" src="../../static/icon/mine_v.png" alt="" class="per_user_img"></image> -->
-				<text style="margin-left: 20rpx;font-size: 22rpx;color: #888;" v-if="userMes.tel">({{userMes.tel}})</text>
+				<text style="margin-left: 20rpx;font-size: 22rpx;color: #888;">({{userMes.tel}})</text>

 				<!-- <text class="tong">累计读书5本
 					<span style="margin: 0 20upx;">|</span> 今日读50分钟
@@ -35,7 +35,7 @@
 			<b class="kt_btn" @click="onPageJump('./opeVip')">立即续费</b>
 		</view> -->

-		<view class="chong_zhi" v-if="!anonymous">
+		<view class="chong_zhi">
 			<view class="zhanghu" @click="onPageJump('../user/persCount')">
 				我的账户
 				<text style="float: right;line-height: 85rpx;"> > </text>
@@ -55,64 +55,54 @@
 		</view>

 		<view class="xiugai">
-			<view v-if="!anonymous">
-				<view class="nav_list" @click="switchTab('../bookShop/orderList')">
-					<text>我的订单</text>
-				</view>
-				<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
+			<view class="nav_list" @click="switchTab('../bookShop/orderList')">
+				<text>我的订单</text>
+			</view>			
+			<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
 				<text>我的打卡</text>
 			</view> -->
-				<view class="nav_list" @click="onPageJump('../listen/home')">
-					<text>我的听书</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../listen/setListen')">
-					<text>听书设置</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../peanut/myComments')">
-					<text>我的评价</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../peanut/shopping')">
-					<text>购物车</text>
-				</view>
-				<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookBuy')">
+			<view class="nav_list" @click="onPageJump('../listen/home')">
+				<text>我的听书</text>
+			</view>
+			<view class="nav_list" @click="onPageJump('../listen/setListen')">
+				<text>听书设置</text>
+			</view>
+			<view class="nav_list" @click="onPageJump('../peanut/myComments')">
+				<text>我的评价</text>
+			</view>
+			<view class="nav_list" @click="onPageJump('../peanut/shopping')">
+				<text>购物车</text>
+			</view>
+			<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookBuy')">
 				<text>电子书购买记录</text>
 			</view> -->
-				<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookRecord')">
+			<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookRecord')">
 				<text>阅读记录</text>
 			</view> -->
-				<view class="nav_list" @click="onPageJump('../user/persData')">
-					<text>修改个人资料</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../user/address')">
-					<text>地址管理</text>
-				</view>
-
-				<!-- <view class="nav_list" @click="onGoing()">
+			<view class="nav_list" @click="onPageJump('../user/persData')">
+				<text>修改个人资料</text>
+			</view>
+			<view class="nav_list" @click="onPageJump('../user/address')">
+				<text>地址管理</text>
+			</view>
+			
+			<!-- <view class="nav_list" @click="onGoing()">
 				<text>帮助与反馈11111</text>
-			</view> -->
-				<!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
-				<view class="nav_list" @click="newOnShare">
-					<text>分享App</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
-					<text>关于我们</text>
-				</view>
-				<view class="nav_list" @click="signShow=true">
-					<text>退出登录</text>
-				</view>
-				<view class="nav_list" @click="logout">
-					<text>注销帐号</text>
-				</view>
+			</view> -->			
+			<!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
+			<view class="nav_list" @click="newOnShare">
+				<text>分享App</text>
 			</view>
-
-			<view v-if="anonymous">
-				<view class="nav_list" @click="newOnShare">
-					<text>分享App</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
-					<text>关于我们</text>
-				</view>
+			<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
+				<text>关于我们</text>
 			</view>
+			<view class="nav_list" @click="signShow=true">
+				<text>退出登录</text>
+			</view>
+			<view class="nav_list" @click="logout">
+				<text>注销帐号</text>
+			</view>
+			
 		</view>

 		<u-modal :show="signShow" :content="signContent" :showCancelButton="true" @cancel="signShow=false"
@@ -122,10 +112,9 @@
 		<uni-popup ref="share" type="share" safeArea backgroundColor="#fff">
 			<uni-popup-share @select="haveSelected"></uni-popup-share>
 		</uni-popup>
-
+		
 		<music-play :playData="playData"></music-play>
 		<z-navigation></z-navigation>
-		
 	</view>
 </template>

@@ -134,28 +123,26 @@
 	import $http from '@/config/requestConfig.js';
 	// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
 	import {
-		mapState,
-		mapMutations
+		mapState,mapMutations
 	} from 'vuex';
 	export default {
 		data() {
 			return {
-				showEbook: false, // 显示电子书相关
+				showEbook:false,    // 显示电子书相关
 				userMes: {},
 				signShow: false,
 				signContent: '是否要退出登录？',
-				playData: {},
-				isAndorid: true,
-				platform: null, // 设备系统
-				anonymous: false, //游客
+				playData:{},
+				isAndorid:true,	
+				platform : null, // 设备系统
 			};
 		},
 		//第一次加载
 		onLoad(e) {
 			// 隐藏原生的tabbar
-			uni.hideTabBar();
+			uni.hideTabBar();			
 			// #ifdef APP-PLUS
-			this.getOS()
+			this.getOS()			
 			this.platform = uni.getSystemInfoSync().platform
 			// console.log('操纵系统',this.platform)
 			// #endif
@@ -168,28 +155,27 @@
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			this.getData();
-			this.anonyMo();
 		},
-		components: {
+		components: {			
 			musicPlay
 		},
 		//方法
 		methods: {
 			...mapMutations(['setUserInfo']),
 			// 获得操作系统
-			getOS() {
-				let oprateOs = ''
+			getOS(){
+				let oprateOs = ''				
 				oprateOs = uni.getSystemInfoSync().platform
 				// console.log(oprateOs)
-				if (oprateOs == 'android') {
+				if(oprateOs == 'android'){
 					this.isAndorid = true
-				} else {
+				}else{
 					this.isAndorid = false
 				}
 			},
-			haveSelected(data) {
-				console.log(data, ' 选择的是')
-				if (data.index == 0) {
+			haveSelected(data){
+				console.log(data,' 选择的是')
+				if(data.index == 0){    
 					// 分享到好友
 					uni.share({
 						provider: "weixin",
@@ -199,14 +185,14 @@
 						title: "疯子读书",
 						summary: "我正在使用疯子读书提升自己，赶紧跟我一起来体验吧！",
 						imageUrl: "static/fengziIcon.jpg",
-						success: function(res) {
+						success: function (res) {
 							console.log("success:" + JSON.stringify(res));
 						},
-						fail: function(err) {
+						fail: function (err) {
 							console.log("fail:" + JSON.stringify(err));
 						}
 					});
-				} else if (data.index == 1) {
+				}else if(data.index == 1){
 					// 分享到朋友圈
 					uni.share({
 						provider: "weixin",
@@ -216,32 +202,20 @@
 						title: "疯子读书",
 						summary: "我正在使用疯子读书提升自己，赶紧跟我一起来体验吧！",
 						imageUrl: "static/fengziIcon.jpg",
-						success: function(res) {
+						success: function (res) {
 							console.log("success:" + JSON.stringify(res));
 						},
-						fail: function(err) {
+						fail: function (err) {
 							console.log("fail:" + JSON.stringify(err));
 						}
 					});
 				}
 			},
-			switchTab(url) {
+			switchTab(url){
 				uni.switchTab({
 					url: url
 				});
 			},
-
-			// 游客模式
-			anonyMo() {
-				if (uni.getStorageSync("anonymous") == '0000000000') {
-					this.anonymous = true
-				} else {
-					this.anonymous = false
-				}
-
-			},
-
-
 			getData() {
 				// 获取个人信息
 				if (this.userInfo.id != undefined) {
@@ -258,25 +232,25 @@
 				}

 			},
-
+			
 			// 新写分享
-			newOnShare() {
+			newOnShare(){
 				this.$refs.share.open()
-			},
-
+			},			
+			
 			// 注销账户
-			logout() {
+			logout(){
 				let that = this
 				uni.showModal({
 					title: '提示',
 					content: '确定要注销当前账户吗？',
-					success: function(res) {
+					success: function (res) {
 						if (res.confirm) {
 							uni.showModal({
 								title: '提示',
-								showCancel: false,
+								showCancel:false,
 								content: `注销申请已提交成功,请联系客服进行后续操作：022-24142321`,
-								success: function(res1) {
+								success: function (res1) {
 									if (res1.confirm) {
 										that.signOut()
 									}
@@ -296,7 +270,7 @@
 				})
 			},
 			onPageJump(url) {
-				console.log(url, 'url')
+				console.log(url,'url')
 				uni.navigateTo({
 					url: url
 				});
@@ -306,9 +280,7 @@
 			// 退出登录
 			signOut() {
 				this.signShow = false
-				this.setUserInfo({
-					'token': null
-				})
+				this.setUserInfo({'token': null})
 				uni.reLaunch({
 					url: '../user/login'
 				});
@@ -475,4 +447,4 @@
 			border-bottom: 0;
 		}
 	}
-</style>
+</style>
--- a/pages/talkBook/talkBookDetail.vue
+++ b/pages/talkBook/talkBookDetail.vue
@@ -11,16 +11,13 @@
 				<view class="audiobox">
 					<view class="audioinfo">
 						<image class="audioimg" :src="bookInfo.images" mode="aspectFit"></image>
-						<image class="audioimgstart" v-if="!this.paused" mode="aspectFit"
-							src="../../static/audiostart.png" @click="start"></image>
-						<image class="audioimgstart" v-else mode="aspectFit" src="../../static/audiostop.png"
-							@click="start"></image>
+						<image class="audioimgstart" v-if="!this.paused" mode="aspectFit" src="../../static/audiostart.png" @click="start"></image>
+						<image class="audioimgstart" v-else mode="aspectFit" src="../../static/audiostop.png" @click="start"></image>
 						<view>
 							<view class="audiotitle">{{talkBookDetail.title}}</view>
 							<view class="audioauthor">{{bookInfo.author.authorName}}</view>
 							<view class="audioauthor">{{currentTime+'/'+duration}}秒</view>
-							<slider class="audioslider" block-size="12" v-model="currentTime" :max="duration"
-								@change="changeTime"></slider>
+							<slider class="audioslider" block-size="12" v-model="currentTime" :max="duration" @change="changeTime"></slider>
 							<!-- <view @click="start">点击播放/暂停</view> -->
 						</view>
 					</view>
@@ -28,21 +25,8 @@
 			</view>
 			<view class="content" v-if="talkBookDetail.content != ''" v-html="talkBookDetail.content"></view>
 			<view class="content" v-else></view>
-			<!-- 	<view class="time">
+			<view class="time">
 				<text>{{talkBookDetail.createTime}}</text>
-			</view> -->
-			<view class="zanche flexbox" style="margin-top:15rpx;">
-				<span class="left">{{talkBookDetail.createTime}}</span>
-				<span class="right flexbox opbtns">
-					<image class="gzicon" v-if="contlikeYN" src="../../static/icon/gz2.png" mode="aspectFill"
-						@click.stop="clickLike(talkBookDetail)"></image>
-					<image class="gzicon" v-else src="../../static/icon/gz.png" mode="aspectFill"
-						@click.stop="clickLike(talkBookDetail)"></image>
-					<view style="color: #C0C4CC;">{{contlike}}</view>
-					<image class="gzicon" v-if="1" src="../../static/icon/pinglun.png" mode="aspectFill"
-						@click="pinglun()"></image>
-					<view style="color: #C0C4CC;" @click="pinglun()">{{pTotal}}</view>
-				</span>
 			</view>
 			<view class="tuijin" v-if="!isBuy && bookInfo.productId != null">
 				<p>觉得这本书还不错？</p>
@@ -68,99 +52,14 @@
 				<view class="">下一章</view>
 			</view> -->
 		</view>
-
-		<view class="pinglunMain">
-			<!-- <u-button class="addPl" type='success' plain @click="pinglun()">添加评论</u-button>
-			<view class="">
-				<view style="font-weight: 700;margin:30rpx 0rpx 30rpx;font-size: 30rpx;color:#55aa00;">精彩热评</view>
-			</view> -->
-			<!-- <h4>~ 精彩热评 ~</h4> -->
-			<view v-if="plList.length > 0">
-				<view class="pl-item" v-for="item in plList" :key="item.id">
-					<view class="plusername">
-						<image :src="item.user.avatar"></image>
-						<span v-if="item.user.nickname!=null">{{item.user.nickname}}</span>
-						<span v-if="item.user.nickname==null">匿名用户</span>
-					</view>
-					<view class="content" v-html="item.content"></view>
-					<view class="btns flexbox" style="margin-top:10rpx;">
-						<span class="left" style="color: #C0C4CC;">{{formatTimeDifferenceFromT(item.createTime)}}</span>
-						<span class="condelt" @click="deleteCont(item)" v-if="item.deletUse">删除</span>
-						<!-- <span class="conhuif" @click="pinglun(item)">回复</span> -->
-					</view>
-					<!-- <view class="pl-son" v-if="item.comments.length > 0">
-						<view class="pl-son-item" v-for="(item1,index) in item.comments" :key="index">
-							<view class="pl-son-item-content">
-								<text class="pl-son-atob">
-									<text v-if="item1.user.nickname!=null">{{item1.user.nickname}}</text>
-									<text v-if="item1.user.nickname==null">匿名用户</text>
-									<text style="margin: 0 10rpx;">回复</text>  
-									<text v-if="item.user.nickname!=null">{{item.user.nickname}}</text>
-									<text v-if="item.user.nickname==null">匿名用户</text>：
-								</text>
-								<text v-html="item1.content"></text>
-							</view>
-							<view class="btns flexbox" style="margin-top:10rpx;">
-								<span class="left"
-									style="color: #C0C4CC;">{{formatTimeDifferenceFromT(item1.createTime)}}</span>
-								<span class="condelt" @click="deleteCont(item)" v-if="item.deletUse">删除</span>
-								<span class="conhuif" @click="pinglun(item)">回复</span>
-							</view>
-							<view style="border-bottom:2rpx solid #e9e9e9;height:20rpx;"
-								v-if="index<item.comments.length-1"></view>
-						</view>
-					</view> -->
-					<!-- </view> -->
-				</view>
-			</view>
-			<view class="quesheng" v-else>
-				<text>暂无评论内容~</text>
-			</view>
-		</view>
-		<view v-if="status==0" style="text-align: center;">
-			<u-loading-icon style="display: inline-block;"></u-loading-icon>
-			<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
-		</view>
-		<u-divider v-if="status == 1" text="已加载全部评论"></u-divider>
-		<!-- 评论书评对话框 -->
-		<!-- 回复评论对话框 -->
-		<u-popup :show="pingjiaShow" :round="10" @close="closePingjia">
-			<view class="tanchu">
-				<view class="dp_title">添加评论</view>
-				<view style="max-height: 1000rpx;overflow-y: scroll;">
-					<view class="padding-bottom-sm flex padding-lr-sm" style="border-bottom: 1px solid #EEEEEE;">
-
-						<view class="flex-sub flexbox">
-							<i @click="showEmj()" :class="emojiIcon"></i>
-							<textarea class="textarea" v-model="Pform.comment" @focus="InputFocus" @blur="InputBlur"
-								@input="textareaBInput" placeholder-style="font-size:24rpx;color:#aaaaaa;"
-								placeholder="请输入您要发送的内容"></textarea>
-						</view>
-						<view class="">
-							<u-button type="success" @click="submitPJ">提交</u-button>
-						</view>
-					</view>
-
-					<view style="position: relative;">
-						<emotion @emotion="handleEmj" :height="220" v-if="isShowEmj" :windowWidth="windowWidth">
-						</emotion>
-					</view>
-				</view>
-			</view>
-		</u-popup>
-
 		<music-play :playData="playData"></music-play>
 		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
+		<public-module></public-module>		
 	</view>
 </template>

 <script>
-	import $http from '@/config/requestConfig.js';
-	import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
-	import emojiList1 from '../../bkhumor-emojiplus/emoji/biaoqin.js'
 	import musicPlay from '@/components/music.vue'
-
 	import {
 		mapState,
 		mapMutations
@@ -172,10 +71,6 @@
 					method: 'pause'
 				},
 				audioShow: false,
-				isShowEmj: false,
-				emojiIcon: 'cuIcon-emoji',
-				emoji: [],
-				windowWidth: 0,
 				voicesImg: '',
 				isBuy: false,
 				playData: {},
@@ -191,22 +86,7 @@
 				audio: null,
 				duration: 10,
 				currentTime: 0,
-				paused: false,
-				emojiIcon: 'cuIcon-emoji',
-				isShowEmj: false,
-				status: 3,
-				pingjiaShow: false, //添加评价
-				Pform: { // 评价表单
-					//star:0,
-					comment: '',
-					//img:[],
-					html: ''
-				},
-				contlike: 0,
-				contlikeYN: false,
-				pPage: 1,
-				pTotal: 0, // 评论的总条数
-				plList: [], // 书评的评论list
+				paused: false
 			}
 		},
 		onLoad(e) {
@@ -221,8 +101,6 @@
 		onShow() {
 			this.getBookInfo()
 			this.getTalkBookDetail()
-			this.getCommPL()
-			this.getGoodNum()
 		},
 		onHide() {
 			// console.log('onHide----',this.paused)
@@ -238,68 +116,37 @@
 		},
 		methods: {
 			...mapMutations(['setUserInfo']),
-			start() {
+			start(){
 				this.initAudio() // 开始播放
 			},
-			formatTimeDifferenceFromT(dateTimeT) {
-				const now = new Date();
-				const t = new Date(dateTimeT);
-				const differenceInSeconds = Math.floor((now - t) / 1000);
-
-				if (differenceInSeconds <= 3600) {
-					const minutes = Math.floor(differenceInSeconds / 60);
-					return `${minutes} 分钟前`;
-				} else if (differenceInSeconds <= 86400) {
-					const hours = Math.floor(differenceInSeconds / 3600);
-					return `${hours} 小时前`;
-				} else if (differenceInSeconds <= 2592000) {
-					const days = Math.floor(differenceInSeconds / 86400);
-					return `${days} 天前`;
-				} else {
-					const currentYear = now.getFullYear();
-					const tYear = t.getFullYear();
-					if (currentYear === tYear) {
-						const month = t.getMonth() + 1;
-						const day = t.getDate();
-						return `${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
-					} else {
-						const year = t.getFullYear();
-						const month = t.getMonth() + 1;
-						const day = t.getDate();
-						return `${year}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
-					}
-				}
-			},
-			initAudio() {
-				this.audio.onTimeUpdate(() => {
+			initAudio(){
+				this.audio.onTimeUpdate(()=>{
 					this.duration = this.audio.duration.toFixed()
 					this.currentTime = this.audio.currentTime.toFixed()
 				})
-				this.audio.onPause(() => { // 用于被听书组件打断时，设置播放icon状态
+				this.audio.onPause(()=>{ // 用于被听书组件打断时，设置播放icon状态
 					this.paused = false
 					// console.log('onPause----------',this.paused)
 				})
 				this.paused = this.audio.paused
 				// console.log('paused',this.paused)
-				if (this.paused) {
+				if(this.paused){
 					this.audio.play()
-				} else {
+				}else{
 					this.audio.pause()
 				}
 			},
-			updateTime(e) {
+			updateTime(e){
 				this.currentTime = e.detail.currentTime.toFixed()
 				this.duration = e.detail.duration.toFixed()
 			},
-			changeTime(e) {
+			changeTime(e){
 				this.audio.seek(e.detail.value) // 设置播放位置
 			},
-			audioPlay() {
-				console.log('播放讲书', this.$music)
-				this.$music.setCloseBgm() // 关闭听书音频
-				this.setUserInfo({
-					'playFlag': false
-				})
+			audioPlay(){
+				console.log('播放讲书',this.$music)				
+				this.$music.setCloseBgm()	 // 关闭听书音频
+				this.setUserInfo({'playFlag': false})				
 			},
 			// 购买
 			gotoBuy() {
@@ -352,13 +199,12 @@
 							this.talkBookDetail = res.bookTeach

 							this.audio.src = this.talkBookDetail.voices // 设置播放资源路径
-							this.audio.onCanplay((e) => {
+							this.audio.onCanplay((e)=>{
 								this.duration = this.audio.duration.toFixed() // 初始化进度条和音频秒数
 							})

 							// this.isBuy = res.book.isBuy
 							// this.freeChapterCount = res.book.freeChapterCount
-
 						} else {
 							console.log(res.msg)
 						}
@@ -369,291 +215,9 @@
 						this.audioShow = true
 					})
 			},
-
-			// 表情
-			showEmj() {
-				let bool = !this.isShowEmj;
-				if (bool) {
-					this.emojiIcon = 'cuIcon-keyboard';
-				} else {
-					this.emojiIcon = 'cuIcon-emoji';
-				}
-
-				this.isShowEmj = bool;
-				this.$emit('show')
-			},
-			InputBlur(e) {
-
-			},
-			InputFocus(e) {
-				this.isShowEmj = false;
-				this.emojiIcon = 'cuIcon-emoji';
-				this.$emit('foc')
-			},
-
-			// 获取点赞数和是否点赞
-			getGoodNum() {
-
-				this.$http
-					.post("book/teach/getLikeCount?teachId=" + this.teachId)
-					.then(res => {
-						if (res.code == 0) {
-							this.contlike = res.count
-						}
-					}).catch((e) => {
-						console.log(e, 'e')
-					})
-
-				this.$http
-					.post("book/teach/ifLike?teachId=" + this.teachId)
-					.then(res => {
-						if (res.code == 0) {
-							this.contlikeYN = res.flag
-						}
-					})
-					.catch((e) => {
-						console.log(e, 'e')
-					})
-
-
-			},
-
-			// 获得书评回复列表
-			getCommPL() {
-
-				$http.request({
-						url: "book/teach/getCommentList",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-						data: {
-							'teachId': this.teachId,
-							'limit': 5,
-							'page': this.pPage,
-						},
-						header: { //默认 无 说明：请求头
-							'Content-Type': 'application/json'
-						},
-					})
-					.then(res => {
-						console.log(res, '书评评论')
-						// this.plList = this.plList.concat(res.page.list)
-						let plList1 = res.page.records
-						this.pTotal = res.page.total
-						this.status = 3
-						// 评论格式化
-						var newarr = []
-						plList1.forEach((item1) => {
-							item1.content = this.getHtmlComment(item1.content)
-							if (item1.userId == this.userInfo.id) {
-								item1.deletUse = true
-							} else {
-								item1.deletUse = false
-							}
-							newarr.push(item1)
-						})
-						this.plList = this.plList.concat(newarr)
-						console.log('改变格式后', this.plList)
-
-					}).catch(e => {
-						console.log(e, 'e')
-					});
-
-			},
-
-			// 获取html格式的评论1
-			getHtmlComment(comment) {
-				// 格式化html
-				//	 console.log(comment,'comment')
-				// 这里处理 链接   换行符
-				let replacedStr = comment.replace(/\[([^(\]|\[)]*)\]/g, (item, index) => {
-					// console.log(item, index)
-					var indexss = emojiList1.findIndex(item1 => item1.alt === item)
-					// console.log(indexss, 'indexss')
-					return '<img src="https://www.nuttyreading.com/emojis/emojis/qq/' + emojiList1[indexss].url +
-						'" width="18rpx">';
-				});
-				// console.log(replacedStr,'replacedStr')
-				return replacedStr.replace(/(\r\n)|(\n)/g, '<br>');
-			},
-
-			// 点赞
-			clickLike(item) {
-				this.$http
-					.post("book/teach/addOrCancelLike?teachId=" + this.teachId)
-					.then(res => {
-						if (res.code == 0) {
-							uni.showToast({
-								title: res.msg,
-								icon: 'success'
-							})
-							this.getGoodNum()
-						}
-					}).catch((e) => {
-						console.log(e, 'e')
-					})
-			},
-
-			// 显示评论框
-			pinglun(val) {
-				console.log('pinglun-val', val)
-				if (val && val.user && val.user.id && val.puser && val.puser.id) {
-					this.Pform.name = val.user.name || ''
-					this.Pform.pid = val.pid
-					this.Pform.puserId = val.user.id || ''
-				} else if (val && val.user && val.user.id) {
-					this.Pform.name = val.user.name || ''
-					this.Pform.pid = val.id
-					this.Pform.puserId = val.user.id || ''
-				} else {
-					// this.pinglunId = val || null
-					this.Pform.pid = ''
-					this.Pform.puserId = ''
-				}
-				this.pingjiaShow = true
-			},
-			// 提交评论
-			submitPJ() {
-				if (this.Pform.comment != '') {
-					$http.request({
-							url: "book/teach/addComment",
-							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-							data: {
-								teachId: this.teachId,
-								content: this.Pform.comment,
-								puserId: 0,
-							},
-							header: { //默认 无 说明：请求头
-								'Content-Type': 'application/json'
-							},
-						})
-						.then(res => {
-							uni.showToast({
-								title: '评论成功！',
-								icon: 'success'
-							})
-							// this.getCommPL()
-							this.pingjiaShow = false
-							this.Pform.comment = ''
-							this.Pform.name = ''
-							this.Pform.pid = ''
-							this.Pform.puserId = ''
-							// this.pinglunId = null
-
-							this.plList = []
-							this.pPage = 1
-							this.getCommPL()
-
-						}).catch(e => {
-							console.log(e, 'e')
-						});
-
-				} else {
-					uni.showToast({
-						title: '请先输入您的评价内容!',
-						icon: 'none'
-					})
-				}
-			},
-
-
-			// 删除评论
-			deleteCont(item) {
-				uni.showModal({
-					title: '提示',
-					content: '确定要删除评论吗？',
-					confirmText: "确定",
-					cancelText: "取消",
-					success: function(res) {
-						let _this = this
-						if (res.confirm) {
-							_this.$http
-								.post("book/teach/delComment?commentId=" + item.id)
-								.then(res => {
-									if (res.code == 0) {
-										uni.showToast({
-											title: '删除成功',
-											icon: 'success'
-										})
-										_this.plList = []
-										_this.pPage = 1
-										_this.getCommPL()
-									}
-								}).catch((e) => {
-									console.log(e, 'e')
-								})
-						}
-					}.bind(this)
-				});
-			},
-
-			closePingjia() {
-				this.pingjiaShow = false
-				this.Pform.comment = ''
-				this.Pform.html = ''
-				this.emoji = []
-			},
-
-			// 获得输入的表情数组
-			handleEmj(i) {
-				console.log(i, 'i---------');
-				this.inputValue = i
-				// console.log(this.inputValue);
-				if (i.emotioni == '[em_98]') {
-					//匹配最后一个表情符号并删除11。
-					this.Pform.comment = this.Pform.comment.replace(/(\[[^\]]+\]|[\s\S])$/, '');
-					if (this.emoji.length > 0) {
-						this.emoji = this.emoji.slice(0, -1)
-					}
-				} else {
-					this.emoji.push({
-						'tag': i.emotion,
-						'name': i.emotioni
-					})
-					// console.log(this.emoji,'this.emoji')
-					this.Pform.comment += i.emotioni;
-					/// this.Pform.html += i.emotion
-				}
-			},
-
-			textareaBInput(e) {
-				console.log(e, 'e')
-				this.Pform.comment = e.detail.value
-				/// this.Pform.html = e.detail.value
-			},
-			showEmj() {
-				let bool = !this.isShowEmj;
-				if (bool) {
-					this.emojiIcon = 'cuIcon-keyboard';
-				} else {
-					this.emojiIcon = 'cuIcon-emoji';
-				}
-
-				this.isShowEmj = bool;
-				this.$emit('show')
-			},
-
-			InputBlur(e) {
-
-			},
-			InputFocus(e) {
-				this.isShowEmj = false;
-				this.emojiIcon = 'cuIcon-emoji';
-				this.$emit('foc')
-			},
-
-			onReachBottom() {
-				console.log('到底了')
-				if (this.pPage + 1 <= this.pTotal) {
-					this.status = 0
-					this.pPage++
-					this.getCommPL()
-				} else {
-					this.status = 3
-				}
-			},
 		},
 		components: {
-			musicPlay,
-			emotion
+			musicPlay
 		},
 	}
 </script>
@@ -727,9 +291,6 @@

 	.btn {
 		margin-right: 20rpx;
-		font-size: 22rpx;
-		justify-content: space-between;
-		align-items: center;

 		text {
 			display: inline-block;
@@ -741,237 +302,43 @@
 			border-radius: 5px;
 		}
 	}
-
-
-	.zanche {
-		font-size: 22rpx;
-		justify-content: space-between;
-		align-items: center;
-
-		.left {
-			width: 300rpx;
-			color: #999;
-			font-size: 24rpx;
-		}
-
-		.right {
-			width: 300rpx;
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
-		}
-
-		.gzicon {
-			margin: 0 0 0 20rpx;
-			height: 40rpx;
-			width: 40rpx;
-			// float:left;
-			// border-radius: 20rpx;
-			// border:1rpx solid #e9e9e9;
-		}
-
-		.opbtns {
-			.pingjia {
-				margin-left: 10px;
-			}
-		}
-	}
-
 	// 自定义播放器样式
-	.audiobox {
-		border: 2rpx solid #d6d5d5;
+	.audiobox{
+		border:  2rpx solid #d6d5d5;
 		border-radius: 8px;
-
-		.audioinfo {
+		.audioinfo{
 			display: flex;
-
-			.audioimg {
+			.audioimg{
 				padding: 10rpx;
 				width: 180rpx;
 				height: 220rpx;
 				border-radius: 5px;
 			}
-
-			.audioimgstart {
+			.audioimgstart{
 				position: absolute;
 				padding: 20rpx;
 				width: 180rpx;
 				height: 220rpx;
 				border-radius: 5px;
 			}
-
-			.audiotitle {
+			.audiotitle{
 				padding: 10rpx;
 				font-size: 28rpx;
 				text-align: left;
 			}
-
-			.audioauthor {
+			.audioauthor{
 				padding: 4rpx;
 				font-size: 24rpx;
 				text-align: left;
 				color: #999;
 			}
-
-			.audioslider {
+			.audioslider{
 				width: 400rpx;
 			}
 		}
-
-
+		
+		
 	}

 	// .opbtn{font-size: 14rpx;}
-	.pinglunMain {
-		.pl-item {
-			margin: 0 0 14rpx 0;
-			padding: 0 0 14rpx 0;
-			border-bottom: 1px solid #f0f0f0;
-
-			.condelt {
-				color: #fd6004;	
-					margin-right: 20rpx;
-			}
-
-			.conhuif {
-		
-				color: #4185c1;
-			}
-
-			.pl-son {
-				margin: 14rpx 0 14rpx 60rpx;
-				padding: 0 14rpx 14rpx 14rpx;
-				background-color: #f0f0f0;
-				border-radius: 10rpx;
-
-				.pl-son-item {
-					font-size: 26rpx;
-					padding-top: 28rpx;
-
-					.pl-son-item-content {}
-
-					.pl-son-atob {
-						color: #a1a1a1;
-					}
-				}
-			}
-		}
-
-		.plusername {
-			font-size: 26rpx;
-			color: #a1a1a1;
-
-			image {
-				width: 40rpx;
-				height: 40rpx;
-				border-radius: 20rpx;
-				display: inline-block;
-				margin-right: 15rpx;
-				vertical-align: sub;
-			}
-		}
-
-		.content {
-			margin: 30rpx 0rpx;
-			line-height: 40rpx;
-			color: #000;
-			font-size: 30rpx;
-		}
-
-		background-color: #fff;
-		padding: 10px;
-
-		// h4{color: #55aa00; font-size: 40rpx;  margin:30rpx 0 ; text-align: center;}
-		.time {
-			color: #888;
-			font-size: 24rpx;
-		}
-
-		.btns {
-			font-size: 22rpx;
-			// justify-content: space-between;
-			align-items: center;
-
-			.left {
-				// width: 300rpx;
-				margin-right: 20rpx;
-				color: #a1a1a1;
-			}
-
-			.right {
-				width: 300rpx;
-				display: flex;
-				justify-content: flex-end;
-				align-items: center;
-			}
-
-			.gzicon {
-				margin: 0 0 0 20rpx;
-				height: 40rpx;
-				width: 40rpx;
-				// float:left;
-				// border-radius: 20rpx;
-				// border:1rpx solid #e9e9e9;
-			}
-
-			.opbtns {
-				.pingjia {
-					margin-left: 10px;
-				}
-			}
-		}
-
-	}
-
-	.quesheng {
-		text-align: center;
-		color: #8b8a91;
-		padding-bottom: 20rpx;
-		padding-top: 20rpx;
-	}
-
-	.tanchu {
-		padding: 40rpx 30rpx 40rpx 30rpx;
-		position: relative;
-
-
-		.dp_title {
-			font-size: 32rpx;
-			margin-bottom: 50rpx;
-			color: #555;
-			text-align: center;
-			font-weight: bold;
-		}
-
-		.dp_add {
-			position: absolute;
-			top: 40rpx;
-			right: 30rpx;
-			font-size: 22rpx;
-			background-color: #fd6004;
-			color: #fff;
-			border-radius: 10rpx;
-			padding: 5rpx 10rpx;
-
-			.u-icon {
-				display: inline-block;
-				margin-right: 5rpx;
-			}
-		}
-	}
-
-	.cuIcon-emoji {
-		background: url(../../static/biaoqing.png) no-repeat;
-		background-size: contain;
-		display: block;
-		margin-right: 20rpx;
-		width: 30px;
-	}
-
-	.cuIcon-keyboard {
-		background: url(../../static/biaoqing.png) no-repeat;
-		background-size: contain;
-		display: block;
-		width: 30px;
-	}
 </style>
--- a/pages/timeAcupoint/scss/common.scss
+++ b/pages/timeAcupoint/scss/common.scss
@@ -0,0 +1,297 @@
+page {
+	font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
+}
+@for $i from 0 through 100 {
+	.w-#{$i} {
+		width: $i + '%';
+	}
+	.h-#{$i} {
+		height: $i + '%';
+	}
+	.padding-#{$i} {
+		padding: $i + rpx;
+	}
+	.padding-left-#{$i} {
+		padding-left: $i + rpx;
+	}
+	.padding-right-#{$i} {
+		padding-right: $i + rpx;
+	}
+	.padding-top-#{$i} {
+		padding-top: $i + rpx;
+	}
+	.padding-bottom-#{$i} {
+		padding-bottom: $i + rpx;
+	}
+	.margin-#{$i} {
+		margin: $i + rpx;
+	}
+	.margin-left-#{$i} {
+		margin-left: $i + rpx;
+	}
+	.margin-right-#{$i} {
+		margin-right: $i + rpx;
+	}
+	.margin-top-#{$i} {
+		margin-top: $i + rpx;
+	}
+	.margin-bottom-#{$i} {
+		margin-bottom: $i + rpx;
+	}
+}
+.d-table {
+	display: table;
+	width: 100%;
+	vertical-align: middle;
+	text-align: center;
+	table-layout: fixed;
+	font-size: 28rpx;
+	word-break: break-all;
+	background-color: white;
+	border-collapse: collapse;
+	&.primary {
+		&.dark {
+			.d-thead {
+				background-color: #2b85e4;
+			}
+		}
+		&.disabled {
+			.d-thead {
+				background-color: #a0cfff;
+			}
+		}
+		&.light {
+			.d-thead {
+				background-color: #ecf5ff;
+			}
+		}
+		.d-thead {
+			background-color: #2979ff;
+			color: #fff;
+		}
+	}
+	&.success {
+		&.dark {
+			.d-thead {
+				background-color: #18b566;
+			}
+		}
+		&.disabled {
+			.d-thead {
+				background-color: #71d5a1;
+			}
+		}
+		&.light {
+			.d-thead {
+				background-color: #dbf1e1;
+			}
+		}
+		.d-thead {
+			background-color: #19be6b;
+			color: #fff;
+		}
+	}
+	&.warning {
+		&.dark {
+			.d-thead {
+				background-color: #f29100;
+			}
+		}
+		&.disabled {
+			.d-thead {
+				background-color: #fcbd71;
+			}
+		}
+		&.light {
+			.d-thead {
+				background-color: #fdf6ec;
+			}
+		}
+		.d-thead {
+			background-color: #ff9900;
+			color: #fff;
+		}
+	}
+	&.danger {
+		&.dark {
+			.d-thead {
+				background-color: #dd6161;
+			}
+		}
+		&.disabled {
+			.d-thead {
+				background-color: #fab6b6;
+			}
+		}
+		&.light {
+			.d-thead {
+				background-color: #fef0f0;
+			}
+		}
+		.d-thead {
+			background-color: #fa3534;
+			color: #fff;
+		}
+	}
+	&.info {
+		&.dark {
+			.d-thead {
+				background-color: #82848a;
+			}
+		}
+		&.disabled {
+			.d-thead {
+				background-color: #c8c9cc;
+			}
+		}
+		&.light {
+			.d-thead {
+				background-color: #f4f4f5;
+			}
+		}
+		.d-thead {
+			background-color: #909399;
+			color: #fff;
+		}
+	}
+	&.gray {
+		.d-thead {
+			background-color: #aaa;
+			color: #fff;
+		}
+	}
+	&.border-under {
+		.d-td,
+		.d-th {
+			@extend .noBorder;
+		}
+		.d-tr {
+			@extend .border-bottom;
+		}
+		.d-table {
+			.d-tr {
+				@extend .noBorder;
+			}
+		}
+	}
+	&.large {
+		.d-td,
+		.d-th {
+			height: 80rpx;
+		}
+	}
+	&.middle {
+		.d-td,
+		.d-th {
+			height: 60rpx;
+		}
+	}
+	.d-td,
+	.d-th {
+		@extend .border;
+	}
+	.d-table {
+		height: 100%;
+		.d-td,
+		.d-th {
+			@extend .noBorder;
+		}
+		// .d-tr {
+		// 	&:first-child {
+		// 		.d-td{
+		// 			&.border-bottom {
+		// 				border-bottom: none;
+		// 			}
+		// 			&.border-top {
+		// 				border-top: none;
+		// 			}
+		// 		}
+		// 	}
+		// }
+	}
+	input.borderInput {
+		border: 1px solid #ccc;
+		border-radius: 6rpx;
+		width: 80%;
+		height: 80%;
+		display: inline-flex;
+	}
+}
+.d-caption {
+	display: table-caption;
+	background-color: inherit;
+}
+.d-thead {
+	display: table-header-group;
+	font-weight: 600;
+}
+.d-tbody {
+	display: table-row-group;
+}
+.d-tfoot {
+	display: table-footer-group;
+}
+.d-tr {
+	display: table-row;
+	width: 100%;
+}
+.d-td,
+.d-th {
+	display: table-cell;
+	vertical-align: middle;
+	height: 50rpx;
+	font-size: 28rpx;
+}
+.d-th {
+	font-weight: 600;
+}
+.border-top {
+	border-top: 1px solid #efefef !important;
+}
+.border-left {
+	border-left: 1px solid #efefef !important;
+}
+.border-bottom {
+	border-bottom: 1px solid #efefef !important;
+}
+.border-right {
+	border-right: 1px solid #efefef !important;
+}
+.border {
+	border: 1px solid #efefef;
+}
+.noBorder {
+	border: 0;
+}
+
+.flex {
+	display: flex;
+	align-items: center;
+	&-wrap {
+		flex-wrap: wrap;
+	}
+	&-nowrap {
+		flex-wrap: nowrap;
+	}
+	&-direction {
+		flex-direction: column;
+	}
+}
+
+@each $type in center, space-between, space-around, flex-start, flex-end {
+	.row-#{$type} {
+		justify-content: $type;
+	}
+}
+
+@each $type in center, stretch, flex-start, flex-end {
+	.col-#{$type} {
+		align-items: $type;
+	}
+}
+
+@each $type in center, left, right {
+	.text-#{$type} {
+		text-align: $type!important;
+	}
+}
--- a/pages/timeAcupoint/timeAcupoint
+++ b/pages/timeAcupoint/timeAcupoint
@@ -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>
--- a/pages/timeAcupoint/timeAcupoint.vue
+++ b/pages/timeAcupoint/timeAcupoint.vue
@@ -0,0 +1,545 @@
+<template>
+	<view class="container88">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="时辰取穴"></z-nav-bar>
+		<view>
+			<!-- <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="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> -->
+					<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="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: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>
+</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 {
+				showDetail: true,
+				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() {			
+			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)
+			// console.log('全局hours',this.$getHours.hourNumber)
+		},
+
+		onHide() {
+
+		},
+		methods: {
+			scroll: function(e) {},
+			showTotalFun() {
+				uni.navigateTo({
+					url: "./totalTable"
+				})
+				// 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) {
+				this.showDetail = false
+				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')
+							this.showDetail = true
+						}
+
+					}).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';
+
+	/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;
+			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:34rpx;
+				}
+			}
+		}
+	}
+
+	.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>
--- a/pages/timeAcupoint/totalTable.vue
+++ b/pages/timeAcupoint/totalTable.vue
@@ -0,0 +1,583 @@
+<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: 20rpx; 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:antiquewhite;">
+							<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:#fbd5ca;" 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;
+		background-color: antiquewhite;
+		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>
--- a/pages/yian/yian.vue
+++ b/pages/yian/yian.vue
@@ -150,7 +150,7 @@ import { data } from 'jquery';
 					this.booksetpage = 1
 					this.yianList = []
 				}
-				if(this.contentShow == 1){
+				if(this.contentShow == 2){
 					httpurl = "book/bookMedicalRecords/userEbookBuyList"
 				} else {
 					httpurl = "book/bookMedicalRecords/recommendBookList"
--- a/pages/yian/yianDetail.vue
+++ b/pages/yian/yianDetail.vue
@@ -150,16 +150,8 @@
 				this.$http
 					.post('book/bookMedicalRecords/getById?medicalRecordsId=' + this.medicalRecordsId )
 					.then(res => {	
-						// console.log(res,'res')
+						console.log(res,'res')
 						this.productInfo = res.entity
-						// console.log('cursor: nwse-resize', this.productInfo.content.includes('cursor: nwse-resize'))
-						// if(this.productInfo.content.includes('cursor: nwse-resize')){
-						// 	// this.productInfo.content = this.productInfo.content.replaceAll('cursor: nwse-resize;', 'cursor: nwse-resize;max-width:100%;')
-						// }else{
-						this.productInfo.content = this.productInfo.content.replaceAll('img src', 'img style="max-width:100%;" src')
-						// }
-						
-						// console.log(this.productInfo.content,'res')
 						uni.hideLoading();
 					}).catch((e)=>{
 						console.log(e,'e')
@@ -313,9 +305,6 @@
 </script>

 <style lang="scss" scoped>
-	/deep/.ql-align-center{
-		text-align: center;
-	}
 	.addPl{padding-top: 0rpx; margin-bottom: 0rpx;}
 	.pinglunMain{
 		.pl-item{
--- a/static/icon/change.png
+++ b/static/icon/change.png
--- a/static/icon/five6.png
+++ b/static/icon/five6.png
--- a/static/播放
+++ b/static/播放
--- a/static/暂停
+++ b/static/暂停
Author	SHA1	Message	Date
@fawn-nine	ea98643858	微调-引入全局获取时间小时数据	2023-12-08 09:41:21 +08:00
@fawn-nine	bda49ff7c8	修改配色	2023-12-07 18:04:11 +08:00
@fawn-nine	073c3b4a74	时辰取穴：当前时辰+全部时辰	2023-12-07 13:47:28 +08:00
@fawn-nine	fdd19cc195	对应时辰高亮，效果美化	2023-12-06 15:18:20 +08:00
@fawn-nine	3c83081ad5	接口对接+效果美化	2023-12-06 13:05:23 +08:00
@fawn-nine	8506d8a7dc	修改表格颜色	2023-12-05 17:58:30 +08:00
@fawn-nine	f494d89eeb	时辰取穴	2023-12-05 15:12:13 +08:00