添加轮询定时

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>
@@ -69,23 +69,11 @@
 		},
 		//方法
 		methods: {
-			onPageJump(url,num) {
+			onPageJump(url) {
-				if (uni.getStorageSync("anonymous") == '0000000000' && (num == 2 || num == 3)) {
+				if (this.path !== url) {
-					uni.showToast({
+					uni.switchTab({
-						icon: 'none',
+						url: '/' + url
-						title: '请先登录'
+					});
-					})
-					// setTimeout(() => {
-					// 	uni.navigateTo({
-					// 		url: "/pages/user/login"
-					// 	});
-					// }, 1000)
-				} else {
-					if (this.path !== url) {
-						uni.switchTab({
-							url: '/' + url
-						});
-					}
 				}
 			},
 		}

config/baseUrl.js

@@ -5,9 +5,10 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "http://localhost:7001/";
 	// 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://api.nuttyreading.com/";   // 线上正式
+		 // baseUrl = "https://api.nuttyreading.com/";   // 线上正式
+		// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
+	// baseUrl = "http://59.110.212.44:9200/pb/";
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
 	// baseUrl = "http://192.168.110.110:9200/pb/";
 	  // baseUrl = "http://192.168.110.38:9200/pb/";        // 吴春磊笔记本1

config/html5Utils.js

@@ -240,13 +240,13 @@ export const h5Login = function(type = "judge", callback) {
 			appMutual("jumpLogin", null, function() {
 				if (type == "force") {
 					// 没登录跳转回登录页
-					// uni.showToast({
+					uni.showToast({
-					// 	icon: 'none',
+						icon: 'none',
-					// 	title: '用户信息失效，请重新登陆。'
+						title: '用户信息失效，请重新登陆。'
-					// })
+					})
-					// uni.navigateTo({
+					uni.navigateTo({
-					// 	url: "/pages/user/login"
+						url: "/pages/user/login"
-					// });
+					});
 				}else{
 					uni.showModal({
 						title:"提示",

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'

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/"

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",
+			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"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",
+			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-			"integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+			"integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
 			"dependencies": {
-				"function-bind": "^1.1.1",
+				"function-bind": "^1.1.2",
-				"has": "^1.0.3",
+				"has-proto": "^1.0.1",
-				"has-symbols": "^1.0.3"
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/has": {
+		"node_modules/gopd": {
-			"version": "1.0.3",
+			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"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",
+			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"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",
+			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-			"integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+			"integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
 			"requires": {
-				"function-bind": "^1.1.1",
+				"function-bind": "^1.1.2",
-				"has": "^1.0.3",
+				"has-proto": "^1.0.1",
-				"has-symbols": "^1.0.3"
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
 			}
 		},
-		"has": {
+		"gopd": {
-			"version": "1.0.3",
+			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+			"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",

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",

pages.json

@@ -12,28 +12,28 @@
 			"path": "pages/peanut/shopping",
 			"style": {
 				"navigationBarTitleText": "购物车",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/peanut/bookshelf",
 			"style": {
 				"navigationBarTitleText": "我的书架",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/peanut/mine",
 			"style": {
 				"navigationBarTitleText": "我的",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/peanut/searchFor",
 			"style": {
 				"navigationBarTitleText": "搜索",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -64,14 +64,14 @@
 			"path": "pages/yRead/angbook",
 			"style": {
 				"navigationBarTitleText": "小说3",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/yRead/cus-audio-play",
 			"style": {
 				"navigationBarTitleText": "小说3-1",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -90,14 +90,14 @@
 			"path": "pages/eBook/bookContent",
 			"style": {
 				"navigationBarTitleText": "小说详情",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/eBook/bookMessage",
 			"style": {
 				"navigationBarTitleText": "小说简介",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -116,28 +116,28 @@
 			"path": "pages/peanut/opeVip",
 			"style": {
 				"navigationBarTitleText": "开通Vip",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/peanut/reCharge",
 			"style": {
 				"navigationBarTitleText": "充值",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/user/persData",
 			"style": {
 				"navigationBarTitleText": "个人资料",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/user/persCount",
 			"style": {
 				"navigationBarTitleText": "个人账户",
-				"enablePullDownRefresh":false
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -168,7 +168,7 @@
 			"path": "pages/user/login",
 			"style": {
 				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh":false        // 禁止下拉刷新
+				"enablePullDownRefresh": false // 禁止下拉刷新
 			}
 		},
 		{
@@ -253,290 +253,257 @@
 			}
 		}
 
-    ,{
+		, {
-            "path" : "pages/peanut/aboutUs",
+			"path": "pages/peanut/aboutUs",
-            "style" :                                                                                    
+			"style": {
-            {
+				"navigationBarTitleText": "关于我们",
-                "navigationBarTitleText": "关于我们",
+				"enablePullDownRefresh": false
-                "enablePullDownRefresh": false
+			}
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/listen/listen",
-            "path" : "pages/listen/listen",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "悦耳列表",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "悦耳列表",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }        
+		}, {
-        ,{
+			"path": "pages/listen/home",
-            "path" : "pages/listen/home",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "悦耳听书",
-            {
+				"enablePullDownRefresh": true
-                "navigationBarTitleText": "悦耳听书",
+			}
-                "enablePullDownRefresh": true
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/listen/search",
-            "path" : "pages/listen/search",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "搜索听书",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "搜索听书",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/listen/bgMusix",
-            "path" : "pages/listen/bgMusix",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "背景音乐模式",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "背景音乐模式",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/listen/bgMusic",
-            "path" : "pages/listen/bgMusic",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "背景音乐启用",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "背景音乐启用",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/listen/bgMusic",
-            "path" : "pages/listen/bgMusic",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "背景音乐启用",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "背景音乐启用",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/listen/musicbg",
-            "path" : "pages/listen/musicbg",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "音乐1",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "音乐1",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/peanut/myComments",
-            "path" : "pages/peanut/myComments",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "我的评价",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "我的评价",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/listen/setListen",
-            "path" : "pages/listen/setListen",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "听书设置11",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "听书设置11",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/listen/bigListen",
-            "path" : "pages/listen/bigListen",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "听书页面",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "听书页面",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/listen/listenNotBuy",
-            "path" : "pages/listen/listenNotBuy",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "未购买的详情",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "未购买的详情",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/comments/comments",
-            "path" : "pages/comments/comments",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "书评1",
-            {
+				"enablePullDownRefresh": true
-                "navigationBarTitleText": "书评1",
+			}
-                "enablePullDownRefresh": true
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/comments/commentsDetail",
-            "path" : "pages/comments/commentsDetail",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "书评详情1",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "书评详情1",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/comments/commentsList",
-            "path" : "pages/comments/commentsList",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "书评",
-            {
+				"enablePullDownRefresh": true
-                "navigationBarTitleText": "书评",
+			}
-                "enablePullDownRefresh": true
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/bookShop/settlementBook",
-            "path" : "pages/bookShop/settlementBook",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "book购买1",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "book购买1",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/library/library",
-            "path" : "pages/library/library",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "我的图书",
-            {
+				"enablePullDownRefresh": true
-                "navigationBarTitleText": "我的图书",
+			}
-                "enablePullDownRefresh": true
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/clock/clock",
-            "path" : "pages/clock/clock",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "读书打卡",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "读书打卡",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/clock/index",
-            "path" : "pages/clock/index",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "读书打卡列表",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "读书打卡列表",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/clock/clockList",
-            "path" : "pages/clock/clockList",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "打卡记录1",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "打卡记录1",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/talkBook/talkBook",
-            "path" : "pages/talkBook/talkBook",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "讲书",
-            {
+				"enablePullDownRefresh": true
-                "navigationBarTitleText": "讲书",
+			}
-                "enablePullDownRefresh": true
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/talkBook/talkBookML",
-            "path" : "pages/talkBook/talkBookML",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "讲书书籍页面",
-            {
+				"enablePullDownRefresh": true
-                "navigationBarTitleText": "讲书书籍页面",
+			}
-                "enablePullDownRefresh": true
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/talkBook/talkBookDetail",
-            "path" : "pages/talkBook/talkBookDetail",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "讲书详情",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "讲书详情",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        },
+		},
-        {
+		{
-            "path" : "pages/yian/yian",
+			"path": "pages/yian/yian",
-            "style" :                                                                                    
+			"style": {
-            {
+				"navigationBarTitleText": "医案",
-                "navigationBarTitleText": "医案",
+				"enablePullDownRefresh": true
-                "enablePullDownRefresh": true
+			}
-            }
 
-        },
+		},
-        {
+		{
-            "path" : "pages/yian/yianList",
+			"path": "pages/yian/yianList",
-            "style" :                                                                                    
+			"style": {
-            {
+				"navigationBarTitleText": "医案列表",
-                "navigationBarTitleText": "医案列表",
+				"enablePullDownRefresh": true
-                "enablePullDownRefresh": true
+			}
-            }
 
-        }
+		}, {
-        ,{
+			"path": "pages/yian/yianDetail",
-            "path" : "pages/yian/yianDetail",
+			"style": {
-            "style" :                                                                                    
+				"navigationBarTitleText": "医案详情",
-            {
+				"enablePullDownRefresh": false
-                "navigationBarTitleText": "医案详情",
+			}
-                "enablePullDownRefresh": false
-            }
 
-        },
+		},
-		{           // 更新版本
+		{ // 更新版本
-					"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
+			"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
-					"style": {
+			"style": {
-						"disableScroll": true,
+				"disableScroll": true,
-						"app-plus": {
+				"app-plus": {
-							"backgroundColorTop": "transparent",
+					"backgroundColorTop": "transparent",
-							"background": "transparent",
+					"background": "transparent",
-							"titleNView": false,
+					"titleNView": false,
-							"scrollIndicator": false,
+					"scrollIndicator": false,
-							"popGesture": "none",
+					"popGesture": "none",
-							"animationType": "fade-in",
+					"animationType": "fade-in",
-							"animationDuration": 200
+					"animationDuration": 200
 
-						}
-					}
 				}
-        ,{
+			}
-            "path" : "pages/bookShop/deliverLIst",
+		},
-            "style" :                                                                                    
+		{
-            {
+			"path": "pages/bookShop/deliverLIst",
-                "navigationBarTitleText": "快递列表",
+			"style": {
-                "enablePullDownRefresh": false
+				"navigationBarTitleText": "快递列表",
-            }
+				"enablePullDownRefresh": false
+			}
 
-        },
+		},
-        {
+		{
-        	"path" : "pages/peanut/chargeDetaill",
+			"path": "pages/peanut/chargeDetaill",
-        	"style" : 
+			"style": {
-        	{
+				"navigationBarTitleText": "充值详情1",
-        		"navigationBarTitleText" : "充值详情1",
+				"enablePullDownRefresh": false
-        		"enablePullDownRefresh" : false
+			}
-        	}
+		},
-        },
+		{
-        {
+			"path": "pages/acupoint/acupoint",
-        	"path" : "pages/acupoint/acupoint",
+			"style": {
-        	"style" : 
+				"navigationBarTitleText": "穴位检索",
-        	{
+				"enablePullDownRefresh": false
-        		"navigationBarTitleText" : "穴位检索",
+			}
-        		"enablePullDownRefresh" : false
+		},
-        	}
+		{
-        },
+			"path": "pages/acupoint/acupointDetail",
-        {
+			"style": {
-        	"path" : "pages/acupoint/acupointDetail",
+				"navigationBarTitleText": "脉穴详情",
-        	"style" : 
+				"enablePullDownRefresh": false
-        	{
+			}
-        		"navigationBarTitleText" : "脉穴详情",
+		},{
-        		"enablePullDownRefresh" : false
+			"path": "pages/timeAcupoint/timeAcupoint",
-        	}
+			"style": {
-        }
+				"navigationBarTitleText": "时辰取穴",
-    ],
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/timeAcupoint/totalTable",
+			"style": {
+				"navigationBarTitleText": "全部穴位一览表",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/luck/luck",
+			"style": {
+				"navigationBarTitleText": "五运六气",
+				"enablePullDownRefresh": false
+			}
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
@@ -544,7 +511,7 @@
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF",
 		"navigationStyle": "custom",
-		"enablePullDownRefresh":true
+		"enablePullDownRefresh": true
 	},
 	"tabBar": {
 		"color": "#444444",

pages/acupoint/acupoint.vue

@@ -174,6 +174,26 @@
 				this.getTitles(id)
 			},
 			setOneCateIndex(item, index) {
+				if(this.userMes.tgdzPower == 0){
+					let that = this
+					uni.showModal({
+						content: "购买 针灸六经法要上册和下册 后方可使用此功能",
+						confirmText: '好的',
+						showCancel: false,
+						success: function(res) {
+							if (res.confirm) {
+								// console.log('用户点击确定');								
+							}
+						}
+					})
+					return
+				}
+				if(item.title == "时辰取穴"){					
+					uni.navigateTo({
+						url: "../timeAcupoint/timeAcupoint"
+					})
+					return 
+				}				
 				let id = item.id
 				this.curOneCateIndex = index
 				this.curTwoCateIndex = 0

pages/bookShop/commodityDetail.vue

@@ -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) {
 					// 点击的是加入购物车

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>											

pages/luck/luck - 副本.vue

@@ -0,0 +1,287 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module> -->
+		<z-nav-bar title="五运六气"></z-nav-bar>
+		<view class="">
+			<canvas style="width: 100%; height:100vh;" canvas-id="firstCanvas" id="firstCanvas"></canvas>
+		</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';
+	export default {
+		data() {
+			return {
+				playData: {},
+				pageWidth: uni.getSystemInfoSync().windowWidth,
+				pageHeight: uni.getSystemInfoSync().windowHeight - 200,
+				fiveYunNum: 5,
+				zhuyun: [],
+				keyun: [],
+				nianyun: '',
+				fiveTimes: []
+			}
+		},
+		onLoad() {
+			this.getYun()
+		},
+		onReady: function(e) {
+
+		},
+		onHide() {
+
+		},
+		methods: {
+			getpanOne() {
+				console.log(this.nianyun, 'nuanyun')
+				var myCanvas = uni.createCanvasContext('firstCanvas')
+				//将原点设置100,100位置
+				myCanvas.translate(0, 0);
+				//原点在100,100，则圆心设为0,0 ——> 100,100的位置
+				myCanvas.setStrokeStyle("#00ff00")
+				myCanvas.setLineWidth(1)
+				// myCanvas.fillStyle = "#f3b2a7"
+				// myCanvas.rect(0, 0, 200, 200)
+				// myCanvas.stroke()			
+				myCanvas.setLineWidth(1)
+				//	console.log(-Math.PI/5,'-Math.PI/2')
+				let yunNum = 360 / 5
+				var angle = Math.PI * 2 / 5;
+				// let startAng = 0
+				// console.log(angle,'angle')
+				var deg = Math.PI / 180
+				// 最大圈
+				for (var i = 0; i < this.fiveYunNum; i++) {
+					myCanvas.setStrokeStyle("#000")
+					let n = i + 1
+					myCanvas.beginPath();
+					myCanvas.moveTo(this.pageWidth / 2, this.pageHeight / 2)
+					myCanvas.arc(this.pageWidth / 2, this.pageHeight / 2, 160, -deg * i * yunNum, -deg * yunNum * n, true)
+
+					myCanvas.font = 'normal 16px Arial'
+					myCanvas.fillStyle = "#f3b2a7"
+					myCanvas.fill();
+					myCanvas.closePath();
+					myCanvas.stroke()
+				}
+				for (var i = 0; i < this.fiveYunNum; i++) {
+					myCanvas.setStrokeStyle("#000")
+					let n = i + 1
+					myCanvas.beginPath();
+					myCanvas.moveTo(this.pageWidth / 2, this.pageHeight / 2)
+					myCanvas.arc(this.pageWidth / 2, this.pageHeight / 2, 90, -deg * i * yunNum, -deg * yunNum * n, true)
+					myCanvas.closePath();
+					myCanvas.fillStyle = "#fef9e4"
+					myCanvas.fill();
+					myCanvas.stroke()
+				}
+				// 中间的主运					
+				myCanvas.beginPath();
+				myCanvas.arc(this.pageWidth / 2, this.pageHeight / 2, 30, 0, 2 * Math.PI, true)
+				myCanvas.fillStyle = "#f8d8d5"
+				myCanvas.fill();
+				myCanvas.fillStyle = "#000"
+				myCanvas.fillText(this.nianyun, this.pageWidth / 2 - 9, this.pageHeight / 2 + 6)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+
+				// 绘制文字(主运)		
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.zhuyun[0], this.pageWidth / 2 + 90, this.pageHeight / 2 + 70)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.zhuyun[1], this.pageWidth / 2 - 30, this.pageHeight / 2 + 120)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.zhuyun[2], this.pageWidth / 2 - 140, this.pageHeight / 2)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.zhuyun[3], this.pageWidth / 2 - 50, this.pageHeight / 2 - 120)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.zhuyun[4], this.pageWidth / 2 + 90, this.pageHeight / 2 - 70)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+				// 结束
+				// 绘制文字（客运）
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.keyun[0], this.pageWidth / 2 + 40, this.pageHeight / 2 + 40)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.keyun[1], this.pageWidth / 2 - 20, this.pageHeight / 2 + 60)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+
+				 myCanvas.beginPath();				
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.keyun[2], this.pageWidth / 2 - 70, this.pageHeight / 2)
+				myCanvas.closePath();				
+				 myCanvas.stroke()
+
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.keyun[3], this.pageWidth / 2 - 30, this.pageHeight / 2 - 50)
+				myCanvas.closePath();
+				myCanvas.stroke()
+
+				myCanvas.beginPath();
+				myCanvas.fillStyle = "#000"
+				myCanvas.font = 'normal 16px Arial'
+				// myCanvas.rotate((Math.PI/180)*5)
+				myCanvas.fillText(this.keyun[4], this.pageWidth / 2 + 30, this.pageHeight / 2 - 20)
+				myCanvas.closePath();
+				myCanvas.stroke()
+				// 结束	
+							
+				// 绘制时间
+				 // myCanvas.beginPath();
+				myCanvas.save();
+				 myCanvas.translate(this.pageWidth / 2 + 170, this.pageHeight / 2 - 30);
+				myCanvas.rotate(90 * Math.PI / 180 );
+				// console.log(30 * Math.PI / 180 )
+				myCanvas.fillStyle = "#000"
+				// myCanvas.textBaseline = 'middle'
+				myCanvas.font = 'normal 12px Arial'				
+				myCanvas.fillText(this.fiveTimes[0],  0,  0)
+				 // myCanvas.closePath();
+				myCanvas.restore()				
+				
+				
+				// myCanvas.beginPath();
+				myCanvas.save();
+				 myCanvas.translate(this.pageWidth / 2 + 80, this.pageHeight / 2 + 150);
+				myCanvas.rotate((90+yunNum) * Math.PI / 180 );
+				// console.log(30 * Math.PI / 180 )
+				myCanvas.fillStyle = "#000"
+				// myCanvas.textBaseline = 'middle'
+				myCanvas.font = 'normal 12px Arial'				
+				myCanvas.fillText(this.fiveTimes[1],  0,  0)
+				 // myCanvas.closePath();
+				myCanvas.restore()
+				
+				
+				myCanvas.save();
+				 myCanvas.translate(this.pageWidth / 2 - 120, this.pageHeight / 2  + 120);
+				myCanvas.rotate((90+yunNum*2) * Math.PI / 180 );			
+				myCanvas.fillStyle = "#000"			
+				myCanvas.font = 'normal 12px Arial'				
+				myCanvas.fillText(this.fiveTimes[2],  0,  0)				
+				myCanvas.restore()
+				
+				myCanvas.save();
+				 myCanvas.translate(this.pageWidth / 2 - 160, this.pageHeight / 2  - 70);
+				myCanvas.rotate((90+yunNum*3) * Math.PI / 180 );			
+				myCanvas.fillStyle = "#000"			
+				myCanvas.font = 'normal 12px Arial'				
+				myCanvas.fillText(this.fiveTimes[3],  0,  0)				
+				myCanvas.restore()
+				
+				myCanvas.save();
+				myCanvas.translate(this.pageWidth / 2 + 20, this.pageHeight / 2  - 170);
+				myCanvas.rotate((90+yunNum*4) * Math.PI / 180 );			
+				myCanvas.fillStyle = "#000"			
+				myCanvas.font = 'normal 12px Arial'				
+				myCanvas.fillText(this.fiveTimes[4],  0,  0)				
+				myCanvas.restore()
+
+				myCanvas.draw()
+			},
+			getYun() {
+				$http.request({
+						url: "book/point/TGDZForYear",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": "2023-11-16 13:25:15"
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+
+						if (res.code == 0 && res.tgdz) {
+							console.log('获取成功', res.tgdz)
+							this.zhuyun = res.tgdz.wy.zhuYun
+							this.keyun = res.tgdz.wy.keYun
+							this.nianyun = res.tgdz.wy.nianYun
+							this.fiveTimes = res.tgdz.wy.time
+							// console.log(this.nianyun,'this.nianyun')
+							this.getpanOne()
+						} else {
+
+						}
+
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			}
+		},
+
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding: 10rpx;
+		height: 100vh;
+		background-color: #fff;
+	}
+
+
+	.flexbox {
+		display: flex;
+	}
+</style>

pages/luck/luck.vue

@@ -0,0 +1,363 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<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="yunqi">
+					<view class="">
+						<text>五运：{{wy.zhuyun[wy.now]}}(主运) &nbsp; {{wy.keyun[wy.now]}}(客运) &nbsp; {{wy.nianyun}}(年运)</text>
+					</view>
+					<view class="">
+						<text>六气：{{lq.zhuqi[lq.now]}}(主气) &nbsp; {{lq.keqi[lq.now]}}(客气)</text>
+					</view>
+				</view>
+				<!-- <view class="yinli">
+					<text>{{yinli.year}}</text>
+					<text>{{yinli.month}}</text>
+					<text>{{yinli.day}}</text>
+					<text>{{yinli.hour}}</text>
+				</view> -->
+			</view>
+		</view>
+
+		<view class="centerBox">《 ↓ 五运图 》</view>
+		<!-- <scroll-view class="scroll-view_H flexbox" scroll-x="true" @scroll="scroll" > -->
+			<view class="flexbox scroll-view_H wuYunBox">
+				<view class="leftone row" id="text">
+					<view class="line line1">开始时间<br /><span>运数</span></view>
+					<!-- <view class="">*节</view> -->
+					<view class="line zhuyun">主运</view>
+					<view class="line keyun">客运</view>
+				</view>
+				<view :class="['row', wy.now == 0 ? 'cur' : '']" id="text0">
+					<view class="line line1">{{wy.fiveTimes[0]}}起<br /><span>初之运</span></view>
+					<view class="line zhuyun">{{wy.zhuyun[0]}}</view>
+					<view class="line  keyun">{{wy.keyun[0]}}</view>
+				</view>
+				<view :class="['row', wy.now == 1 ? 'cur' : '']" id="text1">
+					<view class="line line1">{{wy.fiveTimes[1]}}起<br /><span>二之运</span></view>
+					<view class="line zhuyun">{{wy.zhuyun[1]}}</view>
+					<view class="line keyun">{{wy.keyun[1]}}</view>
+				</view>
+				<view :class="['row', wy.now == 2 ? 'cur' : '']" id="text2">
+					<view class="line line1">{{wy.fiveTimes[2]}}起<br /><span>三之运</span></view>
+					<view class="line zhuyun">{{wy.zhuyun[2]}}</view>
+					<view class="line keyun">{{wy.keyun[2]}}</view>
+				</view>
+				<view :class="['row', wy.now == 3 ? 'cur' : '']" id="text3">
+					<view class="line line1">{{wy.fiveTimes[3]}}起<br /><span>四之运</span></view>
+					<view class="line zhuyun">{{wy.zhuyun[3]}}</view>
+					<view class="line keyun">{{wy.keyun[3]}}</view>
+				</view>
+				<view :class="['row',wy.now == 4 ? 'cur' : '']" id="text4">
+					<view class="line line1">{{wy.fiveTimes[4]}}起<br /><span>终之运</span></view>
+					<view class="line zhuyun">{{wy.zhuyun[4]}}</view>
+					<view class="line keyun">{{wy.keyun[4]}}</view>
+				</view>
+			</view>
+		<!-- </scroll-view> -->
+		<view class="centerBox">《 ↓ 六气图，左滑查看全年气数 》</view>		
+		<scroll-view class="scroll-view_H flexbox liuqiBox" scroll-x="true" @scroll="scroll" :scroll-left="200">
+			<!-- <view class="flexbox scroll-view_H"> -->
+				<view class="leftone row">
+					<view class="line line1">开始时间<br /><span>气数</span></view>
+					<!-- <view class="">*节</view> -->
+					<view class="line zhuyun">主气</view>
+					<view class="line keyun">客气</view>
+				</view>
+				<view :class="['row', lq.now == 0 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[0]}}起<br /><span>初之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[0]}}</view>
+					<view class="line  keyun">{{lq.keqi[0]}}</view>
+				</view>
+				<view :class="['row', lq.now == 1 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[1]}}起<br /><span>二之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[1]}}</view>
+					<view class="line keyun">{{lq.keqi[1]}}</view>
+				</view>
+				<view :class="['row', 'sizai', 'sizai1', lq.now == 2 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[2]}}起<br /><span>三之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[2]}}</view>
+					<view class="line keyun">{{lq.keqi[2]}}</view>
+				</view>
+				<view :class="['row', lq.now == 3 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[3]}}起<br /><span>四之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[3]}}</view>
+					<view class="line keyun">{{lq.keqi[3]}}</view>
+				</view>
+				<view :class="['row', lq.now == 4 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[4]}}起<br /><span>五之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[4]}}</view>
+					<view class="line keyun">{{lq.keqi[4]}}</view>
+				</view>
+				<view :class="['row', 'sizai', 'sizai2', lq.now == 5 ? 'cur' : '']">
+					<view class="line line1">{{lq.time[5]}}起<br /><span>终之气</span></view>
+					<view class="line zhuyun">{{lq.zhuqi[5]}}</view>
+					<view class="line keyun">{{lq.keqi[5]}}</view>
+				</view>
+			<!-- </view> -->
+		</scroll-view>
+		<!-- <image src="../../static/icon/leftFrag.gif" mode="scaleToFill"></image> -->
+		<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: {},
+				pageWidth: uni.getSystemInfoSync().windowWidth,
+				pageHeight: uni.getSystemInfoSync().windowHeight - 200,
+				fiveYunNum: 5,
+				// date: new Date().toISOString().slice(0, 10),      // 只返回年月日
+				date: Date.now() - 2 * 24 * 3600 * 1000, // 返回年月日带时间
+				dateToString: formatDateTime(new Date()), // 字符串格式的日期
+				timestamp: Date.now() - 2 * 24 * 3600 * 1000,      // 时间戳
+				wy: {
+					curTime:0,
+					zhuyun: [],
+					keyun: [],
+					nianyun: '',
+					fiveTimes: []
+				},
+				showCalendar: false,
+				info: {
+					lunar: true,
+					range: true,
+					insert: false,
+					selected: []
+				},
+				lq: {
+					curTime:0,
+					zhuqi: [],
+					keqi: [],
+					time: []
+				},
+				yinli: {
+					year: '',
+					month: '',
+					day: '',
+					hour: ''
+				},
+				wYScrollLeft:0,
+				lQScrollLeft:0,
+wytext:'',
+			}
+		},
+		onLoad() {
+			let da = new Date().toISOString().slice(0, 10)
+			this.timestamp = new Date(da).getTime()
+			this.getYun(this.dateToString)
+			
+		},
+		
+		onHide() {
+
+		},
+		methods: {
+			scroll: function(e) {},
+			// 获取五运六气
+			getYun(date) {
+				let that = this
+				$http.request({
+						url: "book/point/WYLQForYear",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0 && res.wylq) {
+							console.log('获取成功', res.wylq)
+							this.wy.zhuyun = res.wylq.wy.zhuYun
+							this.wy.keyun = res.wylq.wy.keYun
+							this.wy.nianyun = res.wylq.wy.nianYun
+							this.wy.fiveTimes = res.wylq.wy.time
+							this.wy.now = res.wylq.wy.now
+							this.wytext = 'text'+this.wy.now
+							// this.wy.timestampList = res.wylq.wy.time.map( item => {
+							// 	return new Date(item).getTime()
+							// })
+							// this.wy.curTime = this.wy.timestampList.find(function(elem){							     
+							// 		 return elem > that.timestamp								 
+							//  });
+							//  console.log(this.wy,'this.wy.curTime',this.timestamp)
+							// this.yinli.month = res.wylq.month
+							// this.yinli.day = res.wylq.day
+							// this.yinli.hour = res.wylq.hour
+							// this.yinli.year = res.wylq.year
+
+							this.lq = res.wylq.lq
+							// this.wy.now >= 2 ? this.wYScrollLeft = 1800 : 0
+							// this.lq.now >= 2 ?this.lQScrollLeft = 1800 : 0
+							
+							
+							// this.lq.timestampList = res.wylq.lq.time.map( item => {
+							// 	return new Date(item).getTime()
+							// })
+							// console.log(this.wYScrollLeft,this.lQScrollLeft,'this.lq.timestampList')							
+						} 
+
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			},			
+			changeLog(e) {
+				console.log('change事件:', e);
+				let ss = e.slice(0, 10)	
+				this.timestamp = new Date(ss).getTime()
+				this.getYun(e)
+			},			
+		},
+
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	* {
+		font-size: 28rpx;
+	}
+
+	.centerBox {
+		text-align: center;
+		padding: 20px;
+		color: #888;
+	}
+
+	.yinli {
+		line-height: 50rpx;
+
+		text {
+			writing-mode: vertical-rl;
+			letter-spacing: 20rpx;
+			color: #c06346;
+		}
+	}
+
+	.box1 {
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		justify-content: space-between;
+
+		.yunqi {
+			color: #c06346;
+			line-height: 50rpx;
+		}
+	}
+
+	.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;
+		}
+	}
+
+	.container {
+		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>

pages/peanut/home.vue

@@ -4,27 +4,30 @@
 		<view class="home_bg">
 			<view class="" style=" ">
 				
-				<view class="icon_hua">
+					<view class="icon_hua">
-					<image src="../../static/icon/home_icon_1.png" mode="aspectFit" class="icon_hua_1"></image>
+						<image src="../../static/icon/home_icon_1.png" mode="aspectFit" class="icon_hua_1"></image>
-				</view>
+					</view>	
-				<view class="hehan">
+					<view class="hehan">
-					<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
+						<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
-				</view>
+					</view>	
 							
 				<view class="fiveIcon flexbox" style="justify-content: space-around;">
-					<div class="item item1" @click="anonymous?onYouAlert():onPageJump('../acupoint/acupoint')">
+					<div class="item item1" @click="onPageJump('../acupoint/acupoint')">
-						<image src="../../static/icon/five1.png" mode="aspectFit"></image>
+						<image src="../../static/icon/five1.png" mode="aspectFit" ></image>
 						<text>经穴检索</text>
 					</div>
 					<!-- <div class="item item1">
 						<image src="../../static/icon/five2.png" mode="aspectFit"></image>
 						<text>方药检索</text>
 					</div> -->
-					<!-- <div class="item item1">
+					 <div class="item item1">
+					<div class="item item1" @click="onPageJump('../luck/luck')">
 						<image src="../../static/icon/five4.png" mode="aspectFit"></image>
 						<text>五运六气</text>
-					</div> -->
+					</div> 
-					<div class="item item1" @click="anonymous?onYouAlert():onPageJump('../peanut/searchFor')">
+					</div>
+					
+					<div class="item item1" @click="onPageJump('../peanut/searchFor')">
 						<image src="../../static/icon/five3.png" mode="aspectFit"></image>
 						<text>书名检索</text>
 					</div>
@@ -51,28 +54,28 @@
 		</view>
 		<!-- <view class="home_nar" v-if="showEbook"> -->
 		<view class="home_nar">	
-			<view class="hn_cl_tit shuguan" @click="anonymous?onYouAlert():onPageJump('../clock/index')">
+				<view class="hn_cl_tit shuguan" @click="onPageJump('../clock/index')">
-				<image src="../../static/icon/home1-1.png" mode="aspectFit"></image>
+					<image src="../../static/icon/home1-1.png" mode="aspectFit"></image>
-				<!-- <text>打 卡</text> -->
+					<!-- <text>打 卡</text> -->
-			</view>
+				</view>	
 						
-			<view class="hn_cl_tit dianzishu" @click="anonymous?onYouAlert():onPageJump('../listen/home')">
+			<view  class="hn_cl_tit dianzishu" @click="onPageJump('../listen/home')">
 				<image src="../../static/icon/home2-1.png" mode="aspectFit"></image>
 				<!-- <text>听 书</text> -->
 			</view>			
 			
 			<!-- <view class="hn_cl_tit" @click="onPageJump('../bookShop/bookShopIndex')"> -->			
-			<view class="hn_cl_tit shuping" @click="anonymous?onYouAlert():onPageJump('../comments/commentsList')">
+			<view class="hn_cl_tit shuping" @click="onPageJump('../comments/commentsList')">
 				<image src="../../static/icon/home3-1.png" mode="aspectFit"></image>
 				<!-- <text>书 评</text> -->
 			</view>
 			
-			<view class="hn_cl_tit chaoshi" @click="anonymous?onYouAlert():onPageJump('../talkBook/talkBook')">
+			<view class="hn_cl_tit chaoshi" @click="onPageJump('../talkBook/talkBook')">
 				<image src="../../static/icon/home4-1.png" mode="aspectFit"></image>
 				<!-- <text>讲 书</text> -->
 			</view>		
 			
-			<view class="hn_cl_tit chaoshi" @click="anonymous?onYouAlert():onPageJump('../yian/yian')">
+			<view class="hn_cl_tit chaoshi" @click="onPageJump('../yian/yian')">
 				<image src="../../static/icon/home5-1.png" mode="aspectFit"></image>
 				<!-- <text>讲 书</text> -->
 			</view>		
@@ -87,11 +90,11 @@
 				<image src="../../static/icon/midBtn_01.png" mode="aspectFit"></image>
 				我的书架
 			</view> -->
-		<!-- <view class="hn_sj">
+			<!-- <view class="hn_sj">
 				<image src="../../static/icon/midBtn_02.png" mode="aspectFit"></image>
 				图书推荐
 			</view> -->
-		<!-- <view class="hn_sj" @click="onPageJumpData('../eBook/bookList',1)">
+			<!-- <view class="hn_sj" @click="onPageJumpData('../eBook/bookList',1)">
 				<image src="../../static/icon/midBtn_03.png" mode="aspectFit"></image>
 				医 学
 			</view>
@@ -140,13 +143,13 @@
 		
 		<view class="newBook">			
 			<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10" style="margin-top: 0 !important;">
-				<view :class="['item']" v-for="(item,index) in newBookList" :key="index">
+				<view :class="['item']"  v-for="(item,index) in newBookList" :key="index">
-					<view class="videoBox" @click="goDetail(item.productId)">
+						<view class="videoBox" @click="goDetail(item.productId)">
-						<image v-if="item.productImages != ''" :src="item.productImages" mode="scaleToFill"></image>
+							<image  v-if="item.productImages != ''" :src="item.productImages" mode="scaleToFill"></image>
-						<image v-else src="../../static/icon/wufeng.jpg" mode="scaleToFill"></image>
+							<image v-else src="../../static/icon/wufeng.jpg" mode="scaleToFill"></image>
+						</view>
+						<text class="bookName">{{item.productName}}</text>
 					</view>
-					<text class="bookName">{{item.productName}}</text>
-				</view>
 			</scroll-view>
 		</view>
 		
@@ -216,47 +219,44 @@
 		<!-- <view class="head_line" style="margin: 30rpx 0;">
 			<b></b>
 			<text>精选商品</text> -->
-		<!-- <i @click="onShopMore('Hot')">查看更多 ></i> -->
+			<!-- <i @click="onShopMore('Hot')">查看更多 ></i> -->
-		<!-- <i @click="onPageJump('../bookShop/classify')">查看更多 ></i> -->
+			<!-- <i @click="onPageJump('../bookShop/classify')">查看更多 ></i> -->
 		<!-- </view> -->
 		<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="0">
 			<view class="ProTabs">
-				<text v-for="item in tagList" :key="item.splId" :class="[tabsid == item.splId ? 'cur' :'']"
+				<text v-for="item in tagList" :key="item.splId" :class="[tabsid == item.splId ? 'cur' :'']" @click="tabsChange(item)">{{item.labelName}}</text>			
-					@click="tabsChange(item)">{{item.labelName}}</text>
 			</view>
 		</scroll-view>
 		<!-- 商品展示 -->
 		<view class="goods">
 			<!-- 精选 -->
-			<view class="">
+			<view class="" >
-				<view v-if="tjProList.length > 0">
+				<view  v-if="tjProList.length > 0" >
-					<view class="flexbox" style="flex-wrap: wrap;">
+				<view class="flexbox" style="flex-wrap: wrap;">
-						<view class="goodsItem" v-for="(item,index) in tjProList" :key="index"
+				<view class="goodsItem" v-for="(item,index) in tjProList" :key="index"
-							@click="goDetail(item.productId)">
+					@click="goDetail(item.productId)">
-							<image :src="item.productImages" mode="" class="goodsImg"></image>
+					<image :src="item.productImages" mode="" class="goodsImg"></image>
-							<view class="goodsContent">
+					<view class="goodsContent">
-								<view class="goodsName">
+						<view class="goodsName">
-									{{item.productName}}
+							{{item.productName}}
-								</view>
+						</view>
-								<view class="goodsPrice">
+						<view class="goodsPrice">
-									<span class="price"
+							<span class="price" v-if="item.activityPrice && item.activityPrice > 0">￥{{item.activityPrice}}</span>
-										v-if="item.activityPrice && item.activityPrice > 0">￥{{item.activityPrice}}</span>
+							<span class="price" v-else>￥{{item.price}}</span>
-									<span class="price" v-else>￥{{item.price}}</span>
+							<span class="Salesnum">已售：{{item.sumSales}} 件</span>
-									<span class="Salesnum">已售：{{item.sumSales}} 件</span>
-								</view>
-							</view>
 						</view>
 					</view>
-					<view class="">
+				</view>
-						<view v-if="status==0" style="text-align: center;">
+				</view>				
-							<u-loading-icon style="display: inline-block;"></u-loading-icon>
+				<view class="">
-							<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中
+					<view v-if="status==0" style="text-align: center;">
-							</font>
+						<u-loading-icon style="display: inline-block;"></u-loading-icon>
-						</view>
+						<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
-						<view v-if="status==1">
-							<u-divider text="全部加载完成"></u-divider>
-						</view>
 					</view>
+					<view v-if="status==1">
+						<u-divider text="全部加载完成"></u-divider>
+					</view>
+				</view>				
 				</view>
 				<u-divider v-else text="暂无数据哦~"></u-divider>
 				
@@ -281,24 +281,23 @@
 	import repciptData from '@/static/json/repcipt.json'
 	import $http from '@/config/requestConfig.js';
 	import {
-		mapState,
+		mapState,mapMutations
-		mapMutations
 	} from 'vuex';
 	export default {
 		data() {
 			return {
-				myList: [],
+				myList:[],
-				showEbook: false, // 显示电子书相关
+				showEbook:false,    // 显示电子书相关
 				transaction: { // 成功回调
 				
 				},				
-				tabsNumber: null,
+				tabsNumber : null,
-				scrollLeft: 0,
+				scrollLeft:0,
-				maxTimes: 1, // 轮询最大次数
+				maxTimes:1, // 轮询最大次数
-				ComplateRequestInterval: null, // 轮询定时器
+				ComplateRequestInterval:null, // 轮询定时器
-				checking: false, // 正在检测
+				checking:false,  // 正在检测
-				ComplateRequestArr: [],
+				ComplateRequestArr:[],
-				iapChannel: null,
+				iapChannel:null,
 				scrollTop: 0,
 				list3: [
 					// '../../static/icon/home_ban_1.jpg',
@@ -310,24 +309,24 @@
 				limiTist: [],
 				jingList: [],
 				seckillList: [],
-				offSaleList: [], // 折扣列表
+				offSaleList:[],   // 折扣列表
 				goodsList: [],
 				bgiStyle: {
 					background: '#fff'
 				},
-				newBookList: [],
+				newBookList:[],
 				iconStyle: {
 					fontSize: '40rpx',
 					fontWeight: 'bold',
 					color: '#54a966',
 				},
-				tagList: [], // 推荐标签列表
+				tagList:[] ,// 推荐标签列表
-				pageSize: 10,
+				pageSize:10,
-				page: 1,
+				page:1,
-				totalPage: 0,
+				totalPage:0,
-				tjProList: [],
+				tjProList:[],
-				status: 3,
+				status : 3,
-				anonymous: false, //游客
+				userMsg:{}, // 用户信息
 			};
 		},
 		onPageScroll(e) {
@@ -337,7 +336,8 @@
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
-			// this.requestIapOrder()			
+		    // this.requestIapOrder()		
+				
 		},
 		onHide() {
 			this.page = 1
@@ -352,8 +352,8 @@
 			this.tjProList = []
 			uni.hideTabBar();
 			this.getData();	
-			this.getTags();
+			this.getTags()
-			this.anonyMo();
+			this.getUserInfo()
 		},
 		// 页面加载完毕
 		onReady() {
@@ -365,6 +365,7 @@
 			this.tjProList = []
 			this.getData()
 			this.getTags()
+			this.getUserInfo()
 			// this.requestIapOrder()	
 			uni.stopPullDownRefresh()
 					
@@ -372,11 +373,11 @@
 		onReachBottom() {
 			this.loadingNow = true
 			console.log('到底了')
-			if (this.page + 1 <= this.totalPage) {
+			if(this.page+1 <= this.totalPage){
 				this.status = 0
 				this.page++
 				this.getJtData()
-			} else {
+			}else{
 				this.status = 1
 			}
 			
@@ -398,98 +399,101 @@
 		computed: {
 			...mapState(['userInfo']),
 		},
-		components: {
+		components:{
 			musicPlay
 		},
 		//方法
 		methods: {
 			...mapMutations(['setUserInfo']),
 			// ...mapMutations(['setLoadingShow']),
-			// 游客模式
+			// 获取用户详情
-			anonyMo() {
+			getUserInfo() {
-				if (uni.getStorageSync("anonymous") == '0000000000') {
+				// 用户详情
-					this.anonymous = true
+				// if (this.userInfo.id != undefined) {
-				} else {
+					this.$http
-					this.anonymous = false
+						.post('book/user/info/' + this.userInfo.id)
-				}
+						.then(res => {
+							this.userMsg = res.user							
+						});
+				// }
 			},
 			// 获取商品标签
-			getTags() {
+			    getTags() {
-				this.loadingNow = false
+					this.loadingNow = false		
-				this.$http
+					this.$http
 					.post('book/label/getLabels')
 					.then(res => {
-						console.log(res, '标签列表')
+						console.log(res,'标签列表')
-						if (res.code == 0 && res.result.labels.length > 0) {
+						if(res.code == 0 && res.result.labels.length > 0){
 							this.tagList = res.result.labels
 							this.tabsid = this.tagList[0].splId
 							this.getJtData()
 						}						
 					}).catch(e => {
-						console.log(e, 'e')
+						console.log(e,'e')
 					});
+			    },
+			tabsChange(item){
+				    this.tjProList = []
+					this.tabsid = item.splId
+					this.page = 1
+					// 获取推荐数据
+					this.getJtData()
 			},
-			tabsChange(item) {
+			getJtData(){				
-				this.tjProList = []
-				this.tabsid = item.splId
-				this.page = 1
-				// 获取推荐数据
-				this.getJtData()
-			},
-			getJtData() {
 				this.$http
-					// .post('book/label/list',{
+				// .post('book/label/list',{
-					.post('book/label/getProductsByLabel', {
+				.post('book/label/getProductsByLabel',{	
-						'splId': this.tabsid,
+					'splId': this.tabsid,
-						'limit': this.pageSize,
+					'limit': this.pageSize,
-						'page': this.page
+					'page': this.page
-					})
+				})
-					.then(res => {
+				.then(res => {
 					
-						if (res.code == 0 && res.page.records.length > 0) {
+					if(res.code == 0 && res.page.records.length > 0){
-							this.tjProList = this.tjProList.concat(res.page.records)
+						this.tjProList = this.tjProList.concat(res.page.records)
-							this.totalPage = res.page.pages
+						this.totalPage = res.page.pages
-							this.status = 3
+						this.status = 3	
-							console.log(this.tjProList, '按标签检索结果')
+						console.log(this.tjProList,'按标签检索结果')
-						} else {
+					}else{
-							this.tjProList = []
+						this.tjProList = []
-							this.totalPage = 0
+						this.totalPage = 0
-						}
+					}										
-					}).catch(e => {
+				}).catch(e => {					
-						console.log(e, '标签检索报错')
+					console.log(e,'标签检索报错')
-					});
+				});
 			},
 			// 获取折扣图书
-			getOffSale() {
+			getOffSale(){
 				this.$http
 					.post('book/shopproduct/listactivityprice?limit=10&page=1')
 					.then(res => {
-						console.log(res, '折扣')
+						console.log(res,'折扣')
-						if (res.code == 0 && res.page.list.length > 0) {
+						if(res.code == 0 && res.page.list.length > 0){
 							this.offSaleList = res.page.list
 							this.tabsNumber = 0
 						}					    
 						
 					}).catch(e => {
-						console.log(e, 'e')
+						console.log(e,'e')
 					});
 			},
 			// 新书上市
-			getNewBook() {
+			getNewBook(){
 				this.$http
-					.post('book/shopproduct/getNewBook', {
+					.post('book/shopproduct/getNewBook',{
 						'limit': 4,
-						'page': 1
+						'page':1
 					})
 					.then(res => {
-						console.log(res, 'xinshu')
+						console.log(res,'xinshu')
-						this.newBookList = res.page.list
+					    this.newBookList = res.page.list
 					}).catch(e => {
-						console.log(e, '新书上市报错')
+						console.log(e,'新书上市报错')
 					});
 			},
 			// 检测未完成订单
-			requestIapOrder() {
+			requestIapOrder(){				
 				console.log('检测支付环境...')
 				plus.payment.getChannels((channels) => {
 					console.log(channels, 'channels')
@@ -499,74 +503,72 @@
 						if (channels[i].id === 'appleiap') {
 							this.iapChannel = channels[i]	
 							// console.log(this.userInfo.restoreFlag,'this.userInfo.restoreFlag')
-							if (this.userInfo.restoreFlag) { // 如果存在异常回调订单
+							if(this.userInfo.restoreFlag){  // 如果存在异常回调订单
 								this.restoreComplateRequest()
 							}
 						}
 					}					
 				})
 			},
-			// 查询未关闭订单
+		    // 查询未关闭订单
-			restoreComplateRequest() {
+			restoreComplateRequest(){				
 				let that = this
 				console.log('检测未完成订单')
-				console.log(this.iapChannel, 'this.iapChannel')
+				console.log(this.iapChannel,'this.iapChannel')				
 				this.iapChannel.restoreComplateRequest({
 					manualFinishTransaction: true
 				}, function(results) { 
-					if (!that.checking) {
+						if(!that.checking){
-						that.checking = true
+							that.checking = true
-						// console.log(that.checking)
+							// console.log(that.checking)
-						// results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证  
+				        // results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证  
 						that.ComplateRequestArr = results
-						console.log(that.ComplateRequestArr, '未完成订单数组')
+						console.log(that.ComplateRequestArr,'未完成订单数组')							
-						if (results && results.length > 0) {
+						if(results && results.length>0){
 							
-							results.map((item, index) => {
+						results.map((item,index)=>{
-								// "0"为正在支付；"1"为支付成功；"2"为支付失败；"3"为支付已恢复。
+							// "0"为正在支付；"1"为支付成功；"2"为支付失败；"3"为支付已恢复。
-								if (item.transactionState == '1') {
+							if(item.transactionState == '1'){ 
-									// 已经支付，但是没有走逻辑的内购订单								
+								// 已经支付，但是没有走逻辑的内购订单								
-									that.iapCheck(item, index)
+							    that.iapCheck(item,index)															
-								} else {
+							}else{
-									// 其他状态的内购订单
+								// 其他状态的内购订单
-									that.finishTransaction(item)
+								that.finishTransaction(item)	
 								
-								}
+							}	
-							})
+						})
 						}
-					}
+						}
-				});
+					});	
 					
 				
 			},
 			// 关闭交易订单
-			finishTransaction(trans, index) {
+			finishTransaction(trans,index){				
 				this.iapChannel.finishTransaction(trans, (success) => {
-					console.log('关闭订单成功', index);
+				      console.log('关闭订单成功',index);
 					  
-					if (index == this.ComplateRequestArr.length - 1) { // 最后一个支付订单
+					 if(index == this.ComplateRequestArr.length-1){  // 最后一个支付订单
-						this.setUserInfo({
+						this.setUserInfo({restoreFlag:false});
-							restoreFlag: false
-						});
 						// console.log(this.userInfo.restoreFlag,'this.ComplateRequestArr.length+++')
 					}
 					 
-				}, (fail) => {
+				    }, (fail) => {
-					console.log('关闭订单失败');
+				      console.log('关闭订单失败');
-				});
+				    });
 			},
-			iapCheck(result, index) {
+			iapCheck(result,index) {
-				const that = this
+				  const that = this
 				console.log('进入后台验证')
 				let data = {
 					transactionId: result.transactionIdentifier, // 支付交易id
 					customerOid: that.userInfo.id, 
 					productId: result.payment.productid, // 产品id
 					orderId: result.payment.username, // 系统订单号
-					receiptData: result.transactionReceipt, // 苹果返回收据
+					receiptData: result.transactionReceipt ,// 苹果返回收据
-					loadAnimate: 'none', // 请求加载动画
+					loadAnimate:'none', // 请求加载动画
 				}	
-				console.log(data, 'data')
+				console.log(data,'data')
 				$http.request({
 					url: "/Ipa/veri",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
@@ -577,51 +579,51 @@
 				}).then(res => {
 					console.log(JSON.stringify(res))					
 					console.log(res.code)
-					if (res.code == 0) {
+					if(res.code == 0){
 						// uni.hideLoading()
 						console.log('充值订单已处理，请留意账户金额变动....')						
-						// 服务器验证票据有效后在客户端关闭订单
+					// 服务器验证票据有效后在客户端关闭订单
-						that.finishTransaction(result, index)
+						that.finishTransaction(result,index)									
-					} else if (res.code == 200) { // 重复验证订单
+					}else if(res.code == 200){ // 重复验证订单
 						console.log('重复验证....')
-						that.finishTransaction(result, index)
+						that.finishTransaction(result,index)
 					}
 				}).catch(e => {					
 					console.log('支付验证失败，进入轮询程序...')
-					that.getIapPayResult(result, index)
+					that.getIapPayResult(result,index)
-				})
+				  })
 				console.log('--------------')
 			},
 			
 			// 轮询验证支付结果			
-			getIapPayResult(result, index) {
+			getIapPayResult(result,index){
 				// let interval = null
-				this.ComplateRequestInterval = setTimeout(() => {
+			this.ComplateRequestInterval = setTimeout(() => {
-					if (this.maxTimes <= 3) {
+					if(this.maxTimes <= 3){
-						this.iapCheck(result, index)
+				    this.iapCheck(result,index)
-						console.log('执行1', this.maxTimes, this.ComplateRequestInterval)
+					console.log('执行1', this.maxTimes,this.ComplateRequestInterval)
-						this.maxTimes += 1
+					this.maxTimes += 1
-					} else {
+					}else{
 						this.maxTimes = 0
-						console.log('停止轮询', this.maxTimes, this.ComplateRequestInterval, this.maxTimes)
+						console.log('停止轮询', this.maxTimes,this.ComplateRequestInterval, this.maxTimes)
 						this.checking = false
-						this.saveErrorIapOrder(result, index)
+						this.saveErrorIapOrder(result,index)
 						clearTimeout(this.ComplateRequestInterval)
 						
 					}
-				}, 10000)
+				},10000)
 				
 			},
 			// 轮询失败接口
-			saveErrorIapOrder(result, index) {
+			saveErrorIapOrder(result,index){
 				console.log('提交到充值问题单里面...')
 				let data = {
-					transactionId: result.transactionIdentifier,
+					transactionId : result.transactionIdentifier,
 					failureflag: 1,
-					orderId: result.payment.username,
+					orderId:result.payment.username,
-					receiptData: result.transactionReceipt,
+					receiptData:result.transactionReceipt,
-					productId: result.payment.productid,
+					productId:result.payment.productid,
-					customerOid: this.userInfo.id
+					customerOid:this.userInfo.id					
 				}				
 				$http.request({
 					url: "Ipa/failure",
@@ -632,16 +634,16 @@
 					},
 				}).then(res => {
 					console.log(JSON.stringify(res))					
-					if (res.code == 200) {
+					if(res.code == 200){
 						console.log('提交成功，关闭订单')
-						this.finishTransaction(result, index)
+						this.finishTransaction(result,index)
 					}
 				}).catch(e => {					
 					console.log(e)	
-					if (e.statusCode == 0) { // 重复提交，直接关闭订单
+					if(e.statusCode == 0){ // 重复提交，直接关闭订单
-						this.finishTransaction(result, index)
+						this.finishTransaction(result,index)
 					}
-				})
+				  })
 			},
 			// 获取列表数据
 			getData() {
@@ -674,6 +676,19 @@
 
 			// 跳转
 			onPageJump(url) {
+				console.log(this.userMsg,'this.userMsg')
+				if(url == '../luck/luck' && this.userMsg.wylqPower == 0){
+					uni.showModal({
+						content: "购买 中医时间医学·火病原理 后方可使用此功能",
+						confirmText: '好的',
+						showCancel: false,
+						success: function(res) {
+							if (res.confirm) {
+							}
+						}
+					})
+					return
+				 }
 				uni.navigateTo({
 					url: url
 				});
@@ -725,13 +740,7 @@
 				});
 			},
 
-			// 游客跳转
+
-			onYouAlert() {
-				uni.showToast({
-					icon: 'none',
-					title: '请先登录'
-				})
-			},
 
 		},
 
@@ -739,115 +748,46 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-
+	.fiveIcon{justify-content: space-between; text-align: center;
-	.fiveIcon {
+		text{
-		justify-content: space-between;
+			font-size: 28rpx;  color: #11a669;
-		text-align: center;
-
-		text {
-			font-size: 28rpx;
-			color: #11a669;
-		}
-
-		image {
-			width: 56rpx;
-			height: 56rpx;
-			margin: 0 auto;
 		}	
+			image{width: 56rpx; height: 56rpx; margin: 0 auto; }
 	}
-
+	.hehan{width: 80%; margin: 10rpx auto;}
-	.hehan {
+	.zhekou{
-		width: 80%;
+		.goodsName{margin-bottom: 20rpx;}
-		margin: 10rpx auto;
 	}
-
+	.activityPrice{font-size: 60rpx;}
-	.zhekou {
+	.priceAndnum{ font-size: 24rpx !important;
-		.goodsName {
+		.price{color: #9b9b9b !important; font-size: inherit; font-weight: normal !important; display: block;}
-			margin-bottom: 20rpx;
-		}
 	}
-
+	.ProTabs{
-	.activityPrice {
-		font-size: 60rpx;
-	}
-
-	.priceAndnum {
-		font-size: 24rpx !important;
-
-		.price {
-			color: #9b9b9b !important;
-			font-size: inherit;
-			font-weight: normal !important;
-			display: block;
-		}
-	}
-
-	.ProTabs {
 		// margin: 20rpx 0; 
-		padding: 0 20rpx;
+	padding:0 20rpx;
-
+		text{padding: 8rpx 14rpx; font-size: 32rpx; display: inline-block; border-radius: 10rpx; overflow: hidden; 
-		text {
+		// background-color: #eee;
-			padding: 8rpx 14rpx;
+		 color: #55aa7f; margin-right: 10rpx;}
-			font-size: 32rpx;
+		text.cur{background-color:#55aa7f ; color: #fff;}
-			display: inline-block;
-			border-radius: 10rpx;
-			overflow: hidden;
-			// background-color: #eee;
-			color: #55aa7f;
-			margin-right: 10rpx;
-		}
-
-		text.cur {
-			background-color: #55aa7f;
-			color: #fff;
-		}
 	}
-
 	// .newBook{margin-top: 10rpx;}
-	.scroll-view_H {
+	.scroll-view_H{background-color: #fff;white-space: nowrap;
-		background-color: #fff;
+		 padding:10rpx ; margin-top: 12rpx;}
-		white-space: nowrap;
+	.scroll-view_H{ 
-		padding: 10rpx;
+		.item { padding: 10rpx; overflow: hidden; display: inline-block; padding-bottom: 0;
-		margin-top: 12rpx;
+			width: 180rpx !important; margin-right: 20rpx;  border-radius: 10rpx;
-	}
+			.videoBox{ 
-
+				image{display: block; width:150rpx; 
-	.scroll-view_H {
+				height: 170rpx; 
-		.item {
-			padding: 10rpx;
-			overflow: hidden;
-			display: inline-block;
-			padding-bottom: 0;
-			width: 180rpx !important;
-			margin-right: 20rpx;
-			border-radius: 10rpx;
-
-			.videoBox {
-				image {
-					display: block;
-					width: 150rpx;
-					height: 170rpx;
 				}
 			}
-
+			.bookName{display: block; margin-top: 6rpx;   color: #666; font-size: 24rpx; white-space: nowrap;					
-			.bookName {
+		overflow-x: hidden; overflow: hidden;
-				display: block;
+		text-overflow: ellipsis;}
-				margin-top: 6rpx;
-				color: #666;
-				font-size: 24rpx;
-				white-space: nowrap;
-				overflow-x: hidden;
-				overflow: hidden;
-				text-overflow: ellipsis;
-			}
 		}
-
 		// .item.active{margin-right: 20rpx; border: 1px solid #55aa00;  border-radius: 10rpx;}
 	}
-
+	.flexbox{display: flex;}
-	.flexbox {
-		display: flex;
-	}
-
 	.head_line {
 		padding-top: 8rpx;
 		margin: 12rpx 0 0 0;
@@ -883,56 +823,32 @@
 		background-size: cover;
 		padding: 20rpx;
 		position: relative; 
-
 		// margin-bottom:60rpx;
-		// height: 400rpx; margin-bottom: 130rpx;
+	    // height: 400rpx; margin-bottom: 130rpx;
 		.icon_hua_1 {
 			// margin: 0 auto;
-			width: 100%;
+			width: 100%; text-align: center;
-			text-align: center;
+			 height: 80rpx;
-			height: 80rpx;
+			image{width: 150rpx; height: 80rpx;}
-
-			image {
-				width: 150rpx;
-				height: 80rpx;
-			}
 		}
+		.icon_hua{width: 100%; text-align: center; display: block;
+				image{width: 150rpx; height: 150rpx;  margin: 0 auto;}
+				}
+		.search_box { margin: 0 auto; margin-top: 20rpx;  align-items: center;
+			width: calc(100% - 30rpx);   margin-top: 0;
+    margin-bottom: 20rpx;
 			
-		.icon_hua {
+			.search{height: 56upx; 
-			width: 100%;
-			text-align: center;
-			display: block;
-
-			image {
-				width: 150rpx;
-				height: 150rpx;
-				margin: 0 auto;
-			}
-		}
-
-		.search_box {
-			margin: 0 auto;
-			margin-top: 20rpx;
-			align-items: center;
-			width: calc(100% - 30rpx);
-			margin-top: 0;
-			margin-bottom: 20rpx;
-
-			.search {
-				height: 56upx;
 				display: flex;
-				width: 86%;
+				width: 86%; margin: 0 auto;
-				margin: 0 auto;
 				align-items: center;
 				padding: 0upx 40upx;
 				background-color: #fff;
 				border-radius: 20upx;
 				box-shadow: 0 0px 10px 1px #54a96633;
 			}
-
 			.prompt {
-				color: #838383;
+				color: #838383; font-size: 24rpx;
-				font-size: 24rpx;
 	
 			}
 	
@@ -941,28 +857,23 @@
 				background-position: center center;
 				background-repeat: no-repeat;
 				background-size: cover;
-				width: 36upx;
+				width:36upx;
 				height: 36upx;
 				margin-right: 20upx;
 			}
 		}
-
+		.searBtn{
-		.searBtn {
+			width: 80rpx; align-items: center;
-			width: 80rpx;
+			font-size: 30rpx; color: #fff; 
-			align-items: center;
-			font-size: 30rpx;
-			color: #fff;
 		}
-	}
+}
-
 	.home_nar {
 		background-color: #fff;
 		padding: 40rpx 10rpx;
-		justify-content: space-between;
+		 justify-content: space-between;
 		display: flex;
 		color: #333; 
-		margin-bottom: 0;
+		 margin-bottom: 0;
-
 		// .dianzishu{  margin-right:10rpx;	
 		// 	background-color:#f8d6f4 ;  border: 2px solid #edcce9;
 		// }
@@ -973,28 +884,19 @@
 			// width: 23%;
 			width: 31%; 
 			text-align: center;			 
-			border-radius: 20rpx;
+			 border-radius: 20rpx ;		
 			// line-height: 110upx;
 			//display: flex;
 			align-content: center;
 			justify-content: center;
-
 			image {				
-				width: 120rpx;
+				width:120rpx;
-				height: 120rpx;
+				height:120rpx;
 				display: block;
 				margin: 0 auto;
 				// margin: 0 20rpx;
 			}
-
+			text{ display:block; text-align: center;	 margin-top:4rpx; font-size: 36rpx; color: #000; font-weight:blod;}
-			text {
-				display: block;
-				text-align: center;
-				margin-top: 4rpx;
-				font-size: 36rpx;
-				color: #000;
-				font-weight: blod;
-			}
 		}
 		
 
@@ -1258,15 +1160,13 @@
 
 	.goods {
 		width: 100%;
-		margin: 0 0 50rpx 0;
+	margin:0 0 50rpx 0; background-color: #fff;
-		background-color: #fff;
 
 		.goodsItem {
 			display: inline-block;
 			width: 46%;
 			border-radius: 20rpx;
-			padding: 25rpx;
+			padding: 25rpx; padding-bottom: 5rpx;
-			padding-bottom: 5rpx;
 			margin: 0 20rpx 20rpx 20rpx;
 			background-color: #fff;
 			border: 1px solid #eee;
@@ -1288,17 +1188,12 @@
 				.goodsPrice {
 					font-size: 28rpx;
 					margin: 5rpx 0 0 3rpx;					
-					display: flex;
+					display: flex; justify-content: space-between;
-					justify-content: space-between;
+					.price{
-
-					.price {
 						font-weight: bold;
 						color: #ff0000;
 					}
-
+					.Salesnum{color: #9b9b9b;}
-					.Salesnum {
-						color: #9b9b9b;
-					}
 				}
 			}
 		}

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')">
-				<view class="nav_list" @click="switchTab('../bookShop/orderList')">
+				<text>我的订单</text>
-					<text>我的订单</text>
+			</view>			
-				</view>
+			<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
-				<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
 				<text>我的打卡</text>
 			</view> -->
-				<view class="nav_list" @click="onPageJump('../listen/home')">
+			<view class="nav_list" @click="onPageJump('../listen/home')">
-					<text>我的听书</text>
+				<text>我的听书</text>
-				</view>
+			</view>
-				<view class="nav_list" @click="onPageJump('../listen/setListen')">
+			<view class="nav_list" @click="onPageJump('../listen/setListen')">
-					<text>听书设置</text>
+				<text>听书设置</text>
-				</view>
+			</view>
-				<view class="nav_list" @click="onPageJump('../peanut/myComments')">
+			<view class="nav_list" @click="onPageJump('../peanut/myComments')">
-					<text>我的评价</text>
+				<text>我的评价</text>
-				</view>
+			</view>
-				<view class="nav_list" @click="onPageJump('../peanut/shopping')">
+			<view class="nav_list" @click="onPageJump('../peanut/shopping')">
-					<text>购物车</text>
+				<text>购物车</text>
-				</view>
+			</view>
-				<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookBuy')">
+			<!-- <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')">
+			<view class="nav_list" @click="onPageJump('../user/persData')">
-					<text>修改个人资料</text>
+				<text>修改个人资料</text>
-				</view>
+			</view>
-				<view class="nav_list" @click="onPageJump('../user/address')">
+			<view class="nav_list" @click="onPageJump('../user/address')">
-					<text>地址管理</text>
+				<text>地址管理</text>
-				</view>
+			</view>
 			
-				<!-- <view class="nav_list" @click="onGoing()">
+			<!-- <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" v-if="isAndorid"> -->
-				<view class="nav_list" @click="newOnShare">
+			<view class="nav_list" @click="newOnShare">
-					<text>分享App</text>
+				<text>分享App</text>
-				</view>
+			</view>
-				<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
+			<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
-					<text>关于我们</text>
+				<text>关于我们</text>
-				</view>
+			</view>
-				<view class="nav_list" @click="signShow=true">
+			<view class="nav_list" @click="signShow=true">
-					<text>退出登录</text>
+				<text>退出登录</text>
-				</view>
+			</view>
-				<view class="nav_list" @click="logout">
+			<view class="nav_list" @click="logout">
-					<text>注销帐号</text>
+				<text>注销帐号</text>
-				</view>
 			</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>
 		</view>
 
 		<u-modal :show="signShow" :content="signContent" :showCancelButton="true" @cancel="signShow=false"
@@ -125,7 +115,6 @@
 		
 		<music-play :playData="playData"></music-play>
 		<z-navigation></z-navigation>
-		
 	</view>
 </template>
 
@@ -134,20 +123,18 @@
 	import $http from '@/config/requestConfig.js';
 	// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
 	import {
-		mapState,
+		mapState,mapMutations
-		mapMutations
 	} from 'vuex';
 	export default {
 		data() {
 			return {
-				showEbook: false, // 显示电子书相关
+				showEbook:false,    // 显示电子书相关
 				userMes: {},
 				signShow: false,
 				signContent: '是否要退出登录？',
-				playData: {},
+				playData:{},
-				isAndorid: true,
+				isAndorid:true,	
-				platform: null, // 设备系统
+				platform : null, // 设备系统
-				anonymous: false, //游客
 			};
 		},
 		//第一次加载
@@ -168,7 +155,6 @@
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			this.getData();
-			this.anonyMo();
 		},
 		components: {			
 			musicPlay
@@ -177,19 +163,19 @@
 		methods: {
 			...mapMutations(['setUserInfo']),
 			// 获得操作系统
-			getOS() {
+			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) {
+			haveSelected(data){
-				console.log(data, ' 选择的是')
+				console.log(data,' 选择的是')
-				if (data.index == 0) {
+				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) {
@@ -260,23 +234,23 @@
 			},
 			
 			// 新写分享
-			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({
+				this.setUserInfo({'token': null})
-					'token': null
-				})
 				uni.reLaunch({
 					url: '../user/login'
 				});

pages/talkBook/talkBookDetail.vue

@@ -26,6 +26,13 @@
 					</view>
 				</view>
 			</view>
+			<view class="imagesBox flexbox" v-if="swiperImages.length > 0" style="overflow: hidden;">
+				<!-- swiperImages -->
+				<view class="item" v-for="(item, index) in swiperImages" :key="index">
+					<image @click="previewImage(item)" :src="item" mode="aspectFit"></image>
+				</view>
+
+			</view>
 			<view class="content" v-if="talkBookDetail.content != ''" v-html="talkBookDetail.content"></view>
 			<view class="content" v-else></view>
 			<!-- 	<view class="time">
@@ -207,6 +214,7 @@
 				pPage: 1,
 				pTotal: 0, // 评论的总条数
 				plList: [], // 书评的评论list
+				swiperImages: []
 			}
 		},
 		onLoad(e) {
@@ -238,6 +246,19 @@
 		},
 		methods: {
 			...mapMutations(['setUserInfo']),
+			// 放大图片
+			previewImage(url) {
+				console.log(url)
+				uni.previewImage({
+					urls: [url],
+					longPressActions: {
+						itemList: ['很抱歉，暂不支持保存图片到本地'],
+						success: function(res) {
+							// console.log(res,'+++++')
+						}
+					}
+				});
+			},
 			start() {
 				this.initAudio() // 开始播放
 			},
@@ -350,6 +371,10 @@
 						if (res.code == 0) {
 							console.log(res, 'res')
 							this.talkBookDetail = res.bookTeach
+							if (res.bookTeach.images != "") {
+								// this.bookTeach = []
+								this.swiperImages = res.bookTeach.images.split(';')
+							}
 
 							this.audio.src = this.talkBookDetail.voices // 设置播放资源路径
 							this.audio.onCanplay((e) => {
@@ -659,6 +684,19 @@
 </script>
 
 <style scoped lang="scss">
+	.imagesBox {
+		justify-content: center;
+
+		.item {
+			width: 30%;
+			padding: 0 10rpx;
+
+			image {
+				width: 100%;
+			}
+		}
+	}
+
 	.mainContent {
 		margin: 20rpx 10rpx;
 		padding: 20rpx;
@@ -830,7 +868,7 @@
 
 			.condelt {
 				color: #fd6004;
-					margin-right: 20rpx;
+				margin-right: 20rpx;
 			}
 
 			.conhuif {

pages/talkBook/talkBookML.vue

@@ -122,7 +122,7 @@
 			uni.stopPullDownRefresh();
 		},
 		onReachBottom() {
-			console.log('到底了',this.page+1 , this.totalPage)
+			// console.log('到底了',this.page+1 , this.totalPage)
 			
 			if(this.page+1 <= this.totalPage){
 				this.page++
@@ -195,14 +195,14 @@
 					})
 					.then(res => {
 						if (res.code == 0) {
-							console.log(res, 'res')
+							// console.log(res, 'res')
 							this.bookInfo = res.book
 							// this.isBuy = res.book.isBuy
 							// this.freeChapterCount = res.book.freeChapterCount
 						} else {
 							console.log(res.msg)
 						}
-						console.log(res, 'res基本信息')
+						// console.log(res, 'res基本信息')
 					}).catch((error) => {
 						console.log(error)
 					})
@@ -229,18 +229,15 @@
 						'bookId': this.bookid,
 						'limit': 20,
 						'page': this.page						
-						// 'userid': this.userInfo.id,
-						// 'bookid': 
-						// 'id': this.playid
 					})
 					.then(res => {
 						if (res.code == 0) {
-							console.log(res, '章节目录')
+							console.log( '章节目录',res)
 							if (res.page.records.length > 0) {
 								this.libLIst = this.libLIst.concat(res.page.records)
 								this.status = 3
 								this.totalPage = res.page.pages								
-								if(this.totalPage = res.page.current){
+								if(this.totalPage == res.page.current){
 									this.status = 1
 								}						
 							} else {

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;
+	}
+}

pages/timeAcupoint/timeAcupoint - 副本.vue

@@ -0,0 +1,528 @@
+<template>
+	<view class="container88">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="时辰取穴"></z-nav-bar>
+		<view>
+			<!-- {{date}}---{{timestamp}} -->
+			<!-- <uni-section :title="'date 对象用法：' + datetimesingle" type="line"></uni-section> -->
+			<view class="datetimeBox">
+				<uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" />
+			</view>
+			<view class="flexbox box1 grayBg">
+				<view class="">
+					<text style="color: #666;  line-height: 60rpx;">所查询时间：</text><br />
+					<text style="color: #666; white-space:nowrap;;">{{dateToString}}</text>
+				</view>
+				<view class="yunqi">
+					<text style="color: #666;  line-height: 50rpx; width: 100%; margin-right: 15rpx;">天干地支</text>
+					<view class="shu">
+						<text>{{tiangandizhi.hour}} - 时</text>
+						<text>{{tiangandizhi.day}} - 日</text>
+						<text>{{tiangandizhi.month}} - 月</text>
+						<text>{{tiangandizhi.year}} - 年</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 主体 -->
+		<view class="centerBox">
+			↓ 12时辰对应穴位图表 左滑查看全部
+		</view>
+		<view class="centerBox" style="text-align: right; padding-top: 0; font-size: 24rpx;">
+			注：表中带* 者是原穴
+		</view>
+		<view class="container" style="display: flex;">
+			<view class="d-table" style="width:15%;position: relative; z-index: 1;">
+				<view class="leftBar">
+					<!-- <view :class="i === 1 ? 'd-th' : 'd-td'">张三</view> -->
+					<table border cellspacing="0" style="width:100%; background-color:#fbd5ca;">
+						<tr>
+							<td class="oneHeight"></td>
+						</tr>
+						<tr>
+							<td class="" style="height: 100rpx;"></td>
+						</tr>
+						<tr :class="curIndex == 2 ? 'cur' :''">
+							<td class="shuHeight1">23~01</td>
+						</tr>
+						<tr :class="curIndex == 3 ? 'cur' :''">
+							<td class="shuHeight1">01~03</td>
+						</tr>
+						<tr :class="curIndex == 4 ? 'cur' :''">
+							<td class="shuHeight1">03~05</td>
+						</tr>
+						<tr :class="curIndex == 5 ? 'cur' :''">
+							<td class="shuHeight1">05~07</td>
+						</tr>
+						<tr :class="curIndex == 6 ? 'cur' :''">
+							<td class="shuHeight1">07~09</td>
+						</tr>
+						<tr :class="curIndex == 7 ? 'cur' :''">
+							<td class="shuHeight1">09~11</td>
+						</tr>
+						<tr :class="curIndex == 8 ? 'cur' :''">
+							<td class="shuHeight1">11~13</td>
+						</tr>
+						<tr :class="curIndex == 9 ? 'cur' :''">
+							<td class="shuHeight1">13~15</td>
+						</tr>
+						<tr :class="curIndex == 10 ? 'cur' :''">
+							<td class="shuHeight1">15~17</td>
+						</tr>
+						<tr :class="curIndex == 11 ? 'cur' :''">
+							<td class="shuHeight1">17~19</td>
+						</tr>
+						<tr :class="curIndex == 12 ? 'cur' :''">
+							<td class="shuHeight1">19~21</td>
+						</tr>
+						<tr :class="curIndex == 13 ? 'cur' :''">
+							<td class="shuHeight1">21~23</td>
+						</tr>
+					</table>
+				</view>
+			</view>
+			<scroll-view scroll-x class="border-right" style="width: 85%;">
+				<view class="d-table scroll-x">
+					<table border style="width: 600px; background-color: antiquewhite;" cellspacing="0">
+						<tr class="tableTh">
+							<!-- <td colspan="1" class=""></td> -->
+							<td class="oneHeight" colspan="2">灵龟八法</td>
+							<td class="oneHeight" colspan="2">飞腾八法</td>
+							<td class="oneHeight" colspan="5">子午流注</td>
+						</tr>
+						<tr class="tableTh">
+							<!-- <td colspan="1" rowspan="2" class=""></td> -->
+							<td class="" rowspan="2" style="height: 100rpx;">开穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">合穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">开穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">合穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">子午纳干</td>
+							<td colspan="4">子午纳子</td>
+						</tr>
+						<!-- </td>
+						</tr> -->
+						<tr class="tableTh">
+							<td class="">补法</td>
+							<td class="">泄法</td>
+							<td class="">过时泄本</td>
+							<td class="">过时补原</td>
+						</tr>
+						<tr v-for="(item,index) in quxue" :key="index" :class="item.now ? 'cur' : ''">
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.lgbf.KX)}">{{item.lgbf.KX}}</text></td>
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.lgbf.HX)}">{{item.lgbf.HX}}</text></td>
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.ftbf.KX)}">{{item.ftbf.KX}}</text></td>
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.ftbf.HX)}">{{item.ftbf.HX}}</text></td>
+							<td class="shuHeight ">
+								<view class="flexbox" v-if="item.zwlz.ngf.length > 0"
+									style="justify-content: space-evenly;align-items: center; align-content: center;">
+									<text class="verticalRl" :style="{color: getHightLightColor(item1)}"
+										v-for="(item1,index1) in item.zwlz.ngf" :key="index1">{{item1}}</text>
+
+								</view>
+							</td>
+
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.bf)}">{{item.zwlz.nzf.bf}}</text>
+							</td>
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.xf)}">{{item.zwlz.nzf.xf}}</text>
+							</td>
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.gsxb)}">{{item.zwlz.nzf.gsxb}}</text>
+							</td>
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.gsbf)}">{{item.zwlz.nzf.gsbf}}</text>
+							</td>
+						</tr>
+
+					</table>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="centerBox">
+			注：表中带* 者是原穴
+		</view>
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+
+	function formatDateTime(time) {
+		var date = new Date(time);
+		var y = date.getFullYear();
+		var m = date.getMonth() + 1;
+		m = m < 10 ? ('0' + m) : m;
+		var d = date.getDate();
+		d = d < 10 ? ('0' + d) : d;
+		var h = date.getHours();
+		h = h < 10 ? ('0' + h) : h;
+		var minute = date.getMinutes();
+		var second = date.getSeconds();
+		minute = minute < 10 ? ('0' + minute) : minute;
+		second = second < 10 ? ('0' + second) : second;
+
+		return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+	};
+
+	export default {
+		data() {
+			return {
+				playData: {},
+				curIndex: null,
+				pageWidth: uni.getSystemInfoSync().windowWidth,
+				pageHeight: uni.getSystemInfoSync().windowHeight - 200,
+				fiveYunNum: 5,
+				// date: new Date().toISOString().slice(0, 10),      // 只返回年月日
+				date: new Date().getTime(), // 返回年月日带时间
+				dateToString: formatDateTime(new Date()), // 字符串格式的日期
+				timestamp: Date.now() - 2 * 24 * 3600 * 1000, // 时间戳				
+				showCalendar: false,
+				quxue: [], // 时辰取穴
+				tiangandizhi: {},
+				yuanXue: [
+					'腕骨', '丘墟', '丘墟', '太溪', '大陵', '京骨', '阳池', '太渊', '合谷', '太白', '冲阳', '神门'
+				],
+			}
+		},
+		onLoad() {
+			let da = new Date().toISOString().slice(0, 10)
+			this.timestamp = new Date(da).getTime()
+			console.log('初始时间', this.dateToString, this.date)
+			this.getXueWei(this.dateToString)
+			this.getTGDZ(this.dateToString)
+		},
+
+		onHide() {
+
+		},
+		methods: {
+			scroll: function(e) {},
+			// 设置文字颜色
+			getHightLightColor(text) {
+				if (text.indexOf('*') != -1) {
+					return "#9c3211"
+				}
+			},
+			// 获取天干地支
+			getTGDZ(date) {
+				let that = this
+				$http.request({
+						url: "book/point/TGDZForYear",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							console.log('天干地支', res.tgdz)
+							this.tiangandizhi = res.tgdz
+						}
+
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			},
+			// 获取时辰取穴
+			getXueWei(date) {
+				let that = this
+				$http.request({
+						url: "book/point/SCQX",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0 && res.flag.length > 0) {
+							console.log('时辰取穴', res.flag)
+							this.quxue = res.flag
+							this.curIndex = res.flag.findIndex(function(item) {
+								return item.now == true
+							})
+							this.curIndex = this.curIndex + 2
+							console.log(this.curIndex, 'this.curIndex')
+						}
+
+					}).catch(e => {
+						this.curIndex = null
+						console.log(e, 'e')
+					});
+			},
+			// checkAdult(item) {
+			// 	return item.now == true
+			// },
+			changeLog(e) {
+				console.log('change事件:', e);
+				let ss = e.slice(0, 10)
+				this.timestamp = new Date(ss).getTime()
+				this.dateToString = e
+				this.getXueWei(e)
+				this.getTGDZ(e)
+			},
+		},
+
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import './scss/common.scss';
+
+	.leftBar {
+		td {
+			font-weight: bold;
+			color: #a84a2d;
+		}
+	}
+
+	tr.cur {
+		background-color: #e7a896;
+		color: #fff;
+
+		td {
+			color: #fff;
+		}
+	}
+
+	.tableTh {
+		background-color: #fbd5ca;
+		font-weight: bold;
+		color: #a84a2d;
+	}
+
+	.shuHeight {
+		height: 100rpx;
+	}
+
+	.shuHeight1 {
+		height: 100rpx;
+	}
+
+	.verticalRl {
+		writing-mode: vertical-rl;
+	}
+
+	.oneHeight {
+		height: 50rpx;
+	}
+
+	.twoHeight {
+		height: 94rpx;
+	}
+
+	table {
+		border-collapse: collapse;
+		font-size: 28rpx;
+	}
+
+	table td {
+		border-bottom: 1px solid #a84a2d;
+		border-right: 1px solid #a84a2d;
+	}
+
+	table tr:first-child td {
+		border-top: 1px solid #a84a2d;
+	}
+
+	table tr td:first-child {
+		border-left: 1px solid #a84a2d;
+	}
+
+	td {
+		padding: 8rpx 10rpx;
+	}
+
+	.oneWidth {
+		width: 124rpx;
+	}
+
+	/deep/ .uni-table-th {
+		padding: 14rpx 20rpx
+	}
+
+	* {
+		font-size: 28rpx;
+	}
+
+	.centerBox {
+		text-align: center;
+		padding: 20px;
+		color: #666;
+	}
+
+	.yinli {
+		line-height: 50rpx;
+
+		text {
+			writing-mode: vertical-rl;
+			letter-spacing: 20rpx;
+			color: #c06346;
+		}
+	}
+
+	.box1 {
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		justify-content: space-between; align-items: center;
+
+		.yunqi {
+			color: #c06346;
+			text-align: right;
+
+			.shu {
+				text {
+					writing-mode: vertical-rl;
+					line-height: 60rpx;
+					font-size: 30rpx;
+				}
+			}
+		}
+	}
+
+	.grayBg {
+		background-color: #eee;
+	}
+
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+
+		.leftone {
+
+			border-left: 1px solid #ddd;
+		}
+
+		.row {
+			display: inline-block;
+			text-align: center;
+			background-color: #fef9e4;
+			border-right: 1px solid #ddd;
+			border-bottom: 1px solid #ddd;
+		}
+
+		.row.cur {
+			background-color: #8d3d16;
+			color: #fff;
+			position: relative;
+			border-right: 0;
+			z-index: 5;
+			box-shadow: 0 0 10px #8d3d16;
+		}
+
+		.line {
+			padding: 20rpx;
+			border-top: 1px solid #ddd;
+
+			span {
+				font-size: 36rpx;
+			}
+		}
+
+		.line1 {
+			font-size: 24rpx;
+			height: 200rpx;
+			writing-mode: vertical-rl;
+			;
+		}
+
+		.zhuyun {
+			color: #8d3d16;
+			background-color: #faede7;
+			font-size: 30rpx;
+		}
+
+		.keyun {
+			color: #c06346;
+			background-color: #fceeed;
+			font-size: 30rpx;
+		}
+	}
+
+	.container88 {
+		padding: 10rpx;
+
+		background-color: #fff;
+		padding-bottom: 70rpx;
+	}
+
+	.datetimeBox {
+		width: 80%;
+		margin: 0 auto;
+		margin-bottom: 30rpx;
+	}
+
+	.liuqiBox {
+		.line.keyun {
+			padding: 60rpx 10rpx
+		}
+	}
+
+	.wuYunBox {
+		.row {
+			width: 20%;
+			box-sizing: border-box;
+		}
+	}
+
+	/deep/ .uni-calendar__content-mobile {
+		bottom: 100rpx !important;
+	}
+
+	.sizai {
+		.keyun {
+			position: relative;
+		}
+
+		.keyun::after {
+			position: absolute;
+			content: '';
+			top: 24rpx;
+			left: 0;
+			font-size: 24rpx;
+			display: block;
+			width: 100%;
+			color: #888;
+			text-align: center;
+		}
+
+	}
+
+	.sizai1 {
+		.keyun::after {
+			content: '（司天）';
+		}
+	}
+
+	.sizai2 {
+		.keyun::after {
+			content: '（在泉）';
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+</style>

pages/timeAcupoint/timeAcupoint.vue

@@ -0,0 +1,585 @@
+<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: {},
+				pageTime:{ // 页面得时间，载入时赋值
+					hour:0,
+					minute:0,
+					increments:0 // 分钟数距离整点的差额
+				},
+				 myInterval:null, // 定时器
+				myDingshi: null,
+			}
+		},
+		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)		
+				
+		},
+		onUnload() {
+			this.pageTime.hour = 0
+			this.pageTime.minute = 0
+			this.pageTime.increments =  0
+			clearInterval(this.myDingshi)
+			clearTimeout(this.myInterval);
+			console.log('隐藏页面', this.myInterval, this.myDingshi)
+		},
+		onShow() {
+			// console.log('全局hours',this.$getHours.hourNumber,this.$getHours.minuteNumber)
+			var mydate = new Date()
+			this.pageTime.hour = mydate.getHours()
+			this.pageTime.minute =  mydate.getMinutes()
+			console.log('全局hours', this.pageTime.hour,this.pageTime.minute)
+			this.pageTime.increments =  60 - this.pageTime.minute
+			console.log('距离整点', this.pageTime.increments, this.pageTime.increments * 60000, '毫秒后执行')			
+			if(this.pageTime.increments > 0){
+				this.myInterval = setTimeout(() => {					
+					this.autoChange()
+					this.myDingshi = setInterval(() => {
+						console.log('进入轮询')
+						this.autoChange()
+					},60 * 60000)
+				}, this.pageTime.increments * 60000)
+			}
+		},
+		onHide() {
+			clearTimeout(this.myInterval);
+			clearInterval(this.myDingshi)
+			console.log('清除定时器',this.myInterval, this.myDingshi)
+			//this.myInterval = null
+		},
+		methods: {
+			scroll: function(e) {},
+			autoChange(){
+				// console.log()
+				let da = new Date().toISOString().slice(0, 10)
+				this.timestamp = new Date(da).getTime()
+				this.dateToString = formatDateTime(new Date()), // 字符串格式的日期
+				this.getXueWei(this.dateToString)
+				this.getTGDZ(this.dateToString)		
+			},
+			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>

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>

static/json/address.json

@@ -6538,6 +6538,13 @@
 						"countyName": "建德市",
 						"createDate": "2022-10-27 18:51:47",
 						"regionCode": "330182"
+					},
+					{
+						"countyId": 6455,
+						"cityId": 821,
+						"countyName": "钱塘区",
+						"createDate": "2022-10-27 18:51:47",
+						"regionCode": "330101"
 					}
 				]
 			},

utils/getHours.js

@@ -0,0 +1,19 @@
+import store from '@/store/index.js'
+import $http from '@/config/requestConfig.js';
+// #ifdef APP-PLUS
+const nowHour = new Date;
+// #endif
+// #ifdef H5
+const nowHour = new Date;
+// #endif
+nowHour.hourNumber = nowHour.getHours()   // 当前的小时数
+nowHour.minuteNumber = nowHour.getMinutes()
+
+var myHour = {	
+    playBgm({mute=false}){
+    },
+	
+	
+}
+module.exports = {nowHour}
+