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

修改配色
时辰取穴：当前时辰+全部时辰
2023-12-08 09:41:21 +08:00 · 2023-12-07 18:04:11 +08:00 · 2023-12-07 13:47:28 +08:00 · 2023-12-06 15:18:20 +08:00 · 2023-12-06 13:05:23 +08:00 · 2023-12-05 17:58:30 +08:00
33 changed files with 30528 additions and 24427 deletions
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -7,9 +7,9 @@ if (process.env.NODE_ENV === 'development') {
 	// 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:9100/pb/";    //  开发用电脑
-	// baseUrl = "http://192.168.110.110:9200/pb/";
+	baseUrl = "http://192.168.110.110:9200/pb/";
 	  // baseUrl = "http://192.168.110.38:9200/pb/";        // 吴春磊笔记本1
 	// socketUrl = "ws://8.129.186.35:6001/";
 } else if (process.env.NODE_ENV === 'production') {
@@ -45,9 +45,10 @@ const courtConfig = {
 	}
 };
 //手机号验证正则表达式
-// const phoneRegular = /^1\d{10}$/;
+// (中国大陆)
+const phoneRegular = /^1\d{10}$/;
 // 手机号码验证 支持港澳台 大陆
-const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$|^(00){0,1}(65){1}[13689]\d{6,7}$/;
+// const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$|^(00){0,1}(65){1}[13689]\d{6,7}$/;
 //邮箱验证正则表达式
 const mailRegular = /^\w+@\w+(\.[a-zA-Z]{2,3}){1,2}$/;
 //密码验证正则表达式
--- a/config/utils.js
+++ b/config/utils.js
@@ -235,6 +235,32 @@ export const getLatLon = function(tip) {
 	});
 }

+// 查看是否有某本书的权限
+export const checkBookRight = function(data,callback) {
+	console.log('接受的值', data)
+	$http.request({
+		url: "/book/user/checkUserBook",
+		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+		data:data,
+		header: { //默认 无 说明：请求头1
+			'Content-Type': 'application/json'
+		},
+	}).then(res => {
+		// console.log(res,'checkBookRight')			
+		if(res.code === 0){			
+			callback && callback({
+				success: true,
+				data: '有权限'
+			});
+		}
+	}).catch(e => {
+		callback && callback({
+			success: false,
+			data: '无权限'
+		});
+	})
+}
+
 // 单独微信支付
 export const setWXPay = function(payInfo, callback) {
 	$http.request({
--- a/main.js
+++ b/main.js
@@ -6,6 +6,10 @@ import {music, bgm} from '@/utils/music.js'
 Vue.prototype.$music = music
 Vue.prototype.$bgm = bgm

+
+import {nowHour} from '@/utils/getHours.js'
+Vue.prototype.$getHours = nowHour
+
 // 地址
 // Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/"
 // Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/"
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
            "src" : "图片路径"
        }
    ],
-    "versionName" : "1.2.14",
-    "versionCode" : 1214,
+    "versionName" : "1.2.18",
+    "versionCode" : 1218,
    "app-plus" : {
        "compatible" : {
            "ignoreVersion" : true
@@ -78,7 +78,8 @@
                ],
                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                "minSdkVersion" : 21,
-                "targetSdkVersion" : 30
+                "targetSdkVersion" : 30,
+                "schemes" : "nuttyreading"
            },
            "sdkConfigs" : {
                "ad" : {},
@@ -114,7 +115,9 @@
                        "com.apple.developer.associated-domains" : [ "applinks:verification.nuttyreading.com" ]
                    }
                },
-                "idfa" : false
+                "idfa" : false,
+                "urltypes" : "nuttyreading",
+                "urlschemewhitelist" : "everhealth"
            },
            "icons" : {
                "android" : {
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
 				"epubjs": "^0.3.93",
 				"jquery": "^2.2.4",
 				"qs": "^6.11.0",
+				"quill-image-resize-module": "^3.0.0",
 				"uview-ui": "^2.0.35"
 			}
 		},
@@ -50,6 +51,14 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/clone": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+			"engines": {
+				"node": ">=0.8"
+			}
+		},
 		"node_modules/core-js": {
 			"version": "3.24.1",
 			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
@@ -74,6 +83,54 @@
 				"type": "^1.0.1"
 			}
 		},
+		"node_modules/deep-equal": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
+			"integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
+			"dependencies": {
+				"is-arguments": "^1.1.1",
+				"is-date-object": "^1.0.5",
+				"is-regex": "^1.1.4",
+				"object-is": "^1.1.5",
+				"object-keys": "^1.1.1",
+				"regexp.prototype.flags": "^1.5.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/define-data-property": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+			"integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+			"dependencies": {
+				"get-intrinsic": "^1.2.1",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/define-properties": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+			"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+			"dependencies": {
+				"define-data-property": "^1.0.1",
+				"has-property-descriptors": "^1.0.0",
+				"object-keys": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/epubjs": {
 			"version": "0.3.93",
 			"resolved": "https://registry.npmjs.org/epubjs/-/epubjs-0.3.93.tgz",
@@ -132,6 +189,11 @@
 				"es5-ext": "~0.10.14"
 			}
 		},
+		"node_modules/eventemitter3": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+			"integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+		},
 		"node_modules/ext": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
@@ -145,33 +207,77 @@
 			"resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
 			"integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="
 		},
+		"node_modules/extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+		},
+		"node_modules/fast-diff": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
+			"integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+		},
 		"node_modules/function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/functions-have-names": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/get-intrinsic": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-			"integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+			"integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.3"
+				"function-bind": "^1.1.2",
+				"has-proto": "^1.0.1",
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+		"node_modules/gopd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
 			"dependencies": {
-				"function-bind": "^1.1.1"
+				"get-intrinsic": "^1.1.3"
 			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-property-descriptors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+			"integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+			"dependencies": {
+				"get-intrinsic": "^1.2.2"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/has-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
 			"engines": {
-				"node": ">= 0.4.0"
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/has-symbols": {
@@ -185,6 +291,31 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/has-tostringtag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+			"dependencies": {
+				"has-symbols": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/hasown": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+			"integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+			"dependencies": {
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/immediate": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
@@ -195,6 +326,50 @@
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
 			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
 		},
+		"node_modules/is-arguments": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-date-object": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+			"dependencies": {
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/is-regex": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -263,11 +438,39 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/object-is": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/object-keys": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/pako": {
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
 			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
 		},
+		"node_modules/parchment": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
+			"integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+		},
 		"node_modules/path-webpack": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/path-webpack/-/path-webpack-0.0.3.tgz",
@@ -292,6 +495,47 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/quill": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
+			"integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+			"dependencies": {
+				"clone": "^2.1.1",
+				"deep-equal": "^1.0.1",
+				"eventemitter3": "^2.0.3",
+				"extend": "^3.0.2",
+				"parchment": "^1.1.4",
+				"quill-delta": "^3.6.2"
+			}
+		},
+		"node_modules/quill-delta": {
+			"version": "3.6.3",
+			"resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
+			"integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+			"dependencies": {
+				"deep-equal": "^1.0.1",
+				"extend": "^3.0.2",
+				"fast-diff": "1.1.2"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
+		"node_modules/quill-image-resize-module": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/quill-image-resize-module/-/quill-image-resize-module-3.0.0.tgz",
+			"integrity": "sha512-1TZBnUxU/WIx5dPyVjQ9yN7C6mLZSp04HyWBEMqT320DIq4MW4JgzlOPDZX5ZpBM3bU6sacU4kTLUc8VgYQZYw==",
+			"dependencies": {
+				"lodash": "^4.17.4",
+				"quill": "^1.2.2",
+				"raw-loader": "^0.5.1"
+			}
+		},
+		"node_modules/raw-loader": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+			"integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
+		},
 		"node_modules/readable-stream": {
 			"version": "2.3.7",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -306,11 +550,40 @@
 				"util-deprecate": "~1.0.1"
 			}
 		},
+		"node_modules/regexp.prototype.flags": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+			"integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+			"dependencies": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.2.0",
+				"set-function-name": "^2.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/safe-buffer": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
 			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
+		"node_modules/set-function-name": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+			"integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+			"dependencies": {
+				"define-data-property": "^1.0.1",
+				"functions-have-names": "^1.2.3",
+				"has-property-descriptors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/setimmediate": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
@@ -384,6 +657,11 @@
 				"get-intrinsic": "^1.0.2"
 			}
 		},
+		"clone": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
+		},
 		"core-js": {
 			"version": "3.24.1",
 			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
@@ -403,6 +681,39 @@
 				"type": "^1.0.1"
 			}
 		},
+		"deep-equal": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
+			"integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
+			"requires": {
+				"is-arguments": "^1.1.1",
+				"is-date-object": "^1.0.5",
+				"is-regex": "^1.1.4",
+				"object-is": "^1.1.5",
+				"object-keys": "^1.1.1",
+				"regexp.prototype.flags": "^1.5.1"
+			}
+		},
+		"define-data-property": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+			"integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+			"requires": {
+				"get-intrinsic": "^1.2.1",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.0"
+			}
+		},
+		"define-properties": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+			"integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+			"requires": {
+				"define-data-property": "^1.0.1",
+				"has-property-descriptors": "^1.0.0",
+				"object-keys": "^1.1.1"
+			}
+		},
 		"epubjs": {
 			"version": "0.3.93",
 			"resolved": "https://registry.npmjs.org/epubjs/-/epubjs-0.3.93.tgz",
@@ -457,6 +768,11 @@
 				"es5-ext": "~0.10.14"
 			}
 		},
+		"eventemitter3": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+			"integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
+		},
 		"ext": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
@@ -472,34 +788,79 @@
 				}
 			}
 		},
+		"extend": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+		},
+		"fast-diff": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
+			"integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+		},
 		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+		},
+		"functions-have-names": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+			"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
 		},
 		"get-intrinsic": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-			"integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+			"integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
 			"requires": {
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.3"
+				"function-bind": "^1.1.2",
+				"has-proto": "^1.0.1",
+				"has-symbols": "^1.0.3",
+				"hasown": "^2.0.0"
 			}
 		},
-		"has": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+		"gopd": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
 			"requires": {
-				"function-bind": "^1.1.1"
+				"get-intrinsic": "^1.1.3"
 			}
 		},
+		"has-property-descriptors": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+			"integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+			"requires": {
+				"get-intrinsic": "^1.2.2"
+			}
+		},
+		"has-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
+		},
 		"has-symbols": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
 			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
 		},
+		"has-tostringtag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+			"requires": {
+				"has-symbols": "^1.0.2"
+			}
+		},
+		"hasown": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+			"integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+			"requires": {
+				"function-bind": "^1.1.2"
+			}
+		},
 		"immediate": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
@@ -510,6 +871,32 @@
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
 			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
 		},
+		"is-arguments": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+			"requires": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			}
+		},
+		"is-date-object": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+			"requires": {
+				"has-tostringtag": "^1.0.0"
+			}
+		},
+		"is-regex": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+			"requires": {
+				"call-bind": "^1.0.2",
+				"has-tostringtag": "^1.0.0"
+			}
+		},
 		"isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -577,11 +964,30 @@
 			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
 			"integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
 		},
+		"object-is": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+			"requires": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.3"
+			}
+		},
+		"object-keys": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+		},
 		"pako": {
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
 			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
 		},
+		"parchment": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
+			"integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+		},
 		"path-webpack": {
 			"version": "0.0.3",
 			"resolved": "https://registry.npmjs.org/path-webpack/-/path-webpack-0.0.3.tgz",
@@ -600,6 +1006,44 @@
 				"side-channel": "^1.0.4"
 			}
 		},
+		"quill": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
+			"integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+			"requires": {
+				"clone": "^2.1.1",
+				"deep-equal": "^1.0.1",
+				"eventemitter3": "^2.0.3",
+				"extend": "^3.0.2",
+				"parchment": "^1.1.4",
+				"quill-delta": "^3.6.2"
+			}
+		},
+		"quill-delta": {
+			"version": "3.6.3",
+			"resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
+			"integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+			"requires": {
+				"deep-equal": "^1.0.1",
+				"extend": "^3.0.2",
+				"fast-diff": "1.1.2"
+			}
+		},
+		"quill-image-resize-module": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/quill-image-resize-module/-/quill-image-resize-module-3.0.0.tgz",
+			"integrity": "sha512-1TZBnUxU/WIx5dPyVjQ9yN7C6mLZSp04HyWBEMqT320DIq4MW4JgzlOPDZX5ZpBM3bU6sacU4kTLUc8VgYQZYw==",
+			"requires": {
+				"lodash": "^4.17.4",
+				"quill": "^1.2.2",
+				"raw-loader": "^0.5.1"
+			}
+		},
+		"raw-loader": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
+			"integrity": "sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q=="
+		},
 		"readable-stream": {
 			"version": "2.3.7",
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -614,11 +1058,31 @@
 				"util-deprecate": "~1.0.1"
 			}
 		},
+		"regexp.prototype.flags": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+			"integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+			"requires": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.2.0",
+				"set-function-name": "^2.0.0"
+			}
+		},
 		"safe-buffer": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
 			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
+		"set-function-name": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+			"integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+			"requires": {
+				"define-data-property": "^1.0.1",
+				"functions-have-names": "^1.2.3",
+				"has-property-descriptors": "^1.0.0"
+			}
+		},
 		"setimmediate": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
 		"epubjs": "^0.3.93",
 		"jquery": "^2.2.4",
 		"qs": "^6.11.0",
+		"quill-image-resize-module": "^3.0.0",
 		"uview-ui": "^2.0.35"
 	},
 	"name": "e-peanut",
--- a/pages.json
+++ b/pages.json
@@ -459,6 +459,33 @@
                "enablePullDownRefresh": false
            }
            
+        },
+        {
+            "path" : "pages/yian/yian",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "医案",
+                "enablePullDownRefresh": true
+            }
+            
+        },
+        {
+            "path" : "pages/yian/yianList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "医案列表",
+                "enablePullDownRefresh": true
+            }
+            
+        }
+        ,{
+            "path" : "pages/yian/yianDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "医案详情",
+                "enablePullDownRefresh": false
+            }
+            
        },
 		{           // 更新版本
 					"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
@@ -508,6 +535,22 @@
        		"navigationBarTitleText" : "脉穴详情",
        		"enablePullDownRefresh" : false
        	}
+        },
+        {
+        	"path" : "pages/timeAcupoint/timeAcupoint",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "时辰取穴",
+        		"enablePullDownRefresh" : false
+        	}
+        },
+        {
+        	"path" : "pages/timeAcupoint/totalTable",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "全部穴位一览表",
+        		"enablePullDownRefresh" : false
+        	}
        }
    ],
 	"globalStyle": {
--- a/pages/acupoint/acupoint.vue
+++ b/pages/acupoint/acupoint.vue
@@ -6,42 +6,46 @@
 		<!-- <uni-search-bar @confirm="search" :focus="true" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
 			@cancel="cancel" @clear="clear">
 		</uni-search-bar> -->
-		<view class="search_box">
-			<u-search placeholder="请输入穴位名" @focus="focus" @clear="clear" v-model="searchValue" @input="input" @blur="blur" @search="search"></u-search>
+		<view class="search_box" v-if="oneCateList.length > 0">
+			<u-search :disabled="userMes.pointPower == 0 && oneCateList[curOneCateIndex].id == 3 || userMes
+					.pointPower == 0 && oneCateList[curOneCateIndex].id == 6 ? true : false" @click="checkDisable" placeholder="请输入穴位名" @focus="focus" @clear="clear"
+				v-model="searchValue" @input="input" @blur="blur" @search="search"></u-search>
 		</view>
 		<view class="searchList" v-show="showSearchList">
 			<view class="itemBox" v-if="searchList.length > 0">
-				<view class="item" v-for="(item, index) in searchList" :key="index"  @click="gotoDetail(item)">
+				<view class="item" v-for="(item, index) in searchList" :key="index" @click="gotoDetail(item)">
 					{{item.title}}
 				</view>
 			</view>
 			<view v-else class="">
-				<u-divider  text="未找到相关穴位哦~"></u-divider>
+				<u-divider text="未找到相关穴位哦~"></u-divider>
 			</view>
 		</view>
 		<view v-show="!showSearchList" class="contentBox">
 			<!-- <scroll-view class="scroll-view_H oneCateList" scroll-x="true" scroll-left="0"> -->
 			<view class="oneCateList flexbox">
-				<text :class="[curOneCateIndex == index ? 'cur' : '']" @click="setOneCateIndex(item,index)" v-for="(item, index) in oneCateList" :key="item.id">{{item.title}}</text>
-			</view>	
+				<text :class="[curOneCateIndex == index ? 'cur' : '']" @click="setOneCateIndex(item,index)"
+					v-for="(item, index) in oneCateList" :key="item.id">{{item.title}}</text>
+			</view>
 			<!-- </scroll-view> -->
 			<view class="grid twoCateList" v-if="twoCateList.length > 0">
 				<u-grid :col="3" border class="u-grid-list">
-						<u-grid-item v-for="(item, index) in twoCateList" :key="item.id" @click="setTwoCateIndex(item, index)">						
-							<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.title}}</view>
-						</u-grid-item>					
-					</u-grid>
-			</view>			
-			<view class="titleList">				
+					<u-grid-item v-for="(item, index) in twoCateList" :key="item.id"
+						@click="setTwoCateIndex(item, index)">
+						<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.title}}</view>
+					</u-grid-item>
+				</u-grid>
+			</view>
+			<view class="titleList">
 				<u-grid :col="3" v-if="titleList.length > 0">
-						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)">						
-							<view :class="['titleItem']">{{item.title}}</view>
-						</u-grid-item>					
+					<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)">
+						<view :class="['titleItem']">{{item.title}}</view>
+					</u-grid-item>
 				</u-grid>
 				<u-divider v-else text="暂无穴位数据哦~"></u-divider>
 			</view>
 		</view>
-		
+

 		<!-- <view class="search_box flexbox" @click="">
 			<view class="search">
@@ -57,6 +61,9 @@
 <script>
 	import musicPlay from '@/components/music.vue'
 	import $http from '@/config/requestConfig.js';
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
@@ -64,29 +71,81 @@
 				searchValue: '',
 				oneCateList: [], // 一级分类标题1
 				twoCateList: [], // 二级分类标题
-				titleList:[], // 穴位标题
-				curOneCateIndex:0, // 当前选中的一级分类
-				curTwoCateIndex:0 , // 当前选中的二级分类
-				searchList:[], // 搜索结果数组
-				showSearchList: false, 
+				titleList: [], // 穴位标题
+				curOneCateIndex: 0, // 当前选中的一级分类
+				curTwoCateIndex: 0, // 当前选中的二级分类
+				searchList: [], // 搜索结果数组
+				showSearchList: false,
+				userMes: {}, // 用户信息
+				searchDisable: false, // 搜索不可用
+
 			}
 		},
 		onLoad() {
-			this.getCateList()
-		},	
-			onHide() {
-				this.showSearchList = false
-				this.searchList = []
-			},
+			this.getUserInfo()
+			// this.getCateList()
+
+		},
+		onHide() {
+			this.showSearchList = false
+			this.searchList = []
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
 		methods: {
-			// 穴位详情
-			gotoDetail(item){
-				uni.navigateTo({
-					url:"./acupointDetail?id=" + item.id
+			// 检查是有权限使用搜索功能
+			checkDisable() {
+				console.log('点击了')
+				if (this.userMes.pointPower == 0 && this.oneCateList[this.curOneCateIndex].id == 3 || this.userMes
+					.pointPower == 0 && this.oneCateList[this.curOneCateIndex].id == 6) { // 等于0 就是没有权限
+					this.showNoRights()
+				}
+			},
+			// 显示无权限弹窗
+			showNoRights() {
+				let that = this
+				uni.showModal({
+					content: "购买 手模 或 脚模 后方可使用此功能",
+					confirmText: '好的',
+					showCancel: false,
+					success: function(res) {
+						if (res.confirm) {
+							// console.log('用户点击确定');
+							that.clear()
+						}
+					}
 				})
 			},
+			// 获取用户详情
+			getUserInfo() {
+				// 用户详情
+				if (this.userInfo.id != undefined) {
+					this.$http
+						.post('book/user/info/' + this.userInfo.id)
+						.then(res => {
+							this.userMes = res.user
+							this.getCateList()
+							console.log(this.userMes, '呼呼')
+						});
+				}
+			},
+			// 穴位详情
+			gotoDetail(item) {
+
+				if (this.userMes.pointPower == 0 && this.oneCateList[this.curOneCateIndex].id == 3 || this.userMes
+					.pointPower == 0 && this.oneCateList[this.curOneCateIndex].id == 6) { // 等于0 就是没有权限
+					this.showNoRights()
+				} else {
+					// 等于1 就是有权限
+					uni.navigateTo({
+						url: "./acupointDetail?id=" + item.id
+					})
+				}
+
+			},
 			// 获取穴位名称
-			getTitles(id){
+			getTitles(id) {
 				$http.request({
 					url: "book/point/getPointsByCategoryId",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
@@ -100,27 +159,33 @@
 				}).then(res => {
 					console.log(res, '内容获取成功')
 					if (res.code == 0 && res.points.length > 0) {
-						this.titleList = res.points						
+						this.titleList = res.points
 					} else {
-						this.titleList = []				
-					}					
+						this.titleList = []
+					}
 				}).catch(e => {
-					this.titleList = []		
+					this.titleList = []
 					console.log(e)
 				})
 			},
-			setTwoCateIndex(item, index){
+			setTwoCateIndex(item, index) {
 				let id = item.id
 				this.curTwoCateIndex = index
 				this.getTitles(id)
 			},
-			setOneCateIndex(item, index){
+			setOneCateIndex(item, index) {
+				if(item.title == "时辰取穴"){					
+					uni.navigateTo({
+						url: "../timeAcupoint/timeAcupoint"
+					})
+					return 
+				}				
 				let id = item.id
 				this.curOneCateIndex = index
 				this.curTwoCateIndex = 0
 				this.getTowCateList(id)
 			},
-			getTowCateList(id){
+			getTowCateList(id) {
 				$http.request({
 					url: "book/point/getPointCategoryByPid",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
@@ -139,16 +204,16 @@
 					} else {
 						this.twoCateList = []
 						this.titleList = []
-					}					
+					}
 				}).catch(e => {
-					this.twoCateList = []	
+					this.twoCateList = []
 					this.titleList = []
 					console.log(e)
 				})
 			},
 			getCateList(id) {
 				id ? '' : id = 0
-				this.twoCateList = []	
+				this.twoCateList = []
 				this.curTwoCateIndex = 0
 				// 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
 				$http.request({
@@ -167,14 +232,14 @@
 						this.oneCateList = res.category
 						this.getTowCateList(this.oneCateList[0].id)
 					} else {
-						this.oneCateList = []						
-					}					
+						this.oneCateList = []
+					}
 				}).catch(e => {
 					this.oneCateList = []
 					console.log(e)
 				})
 			},
-			getSearch(){
+			getSearch() {
 				$http.request({
 					url: "book/point/searchPointList",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
@@ -188,7 +253,7 @@
 				}).then(res => {
 					console.log(res, '搜索结果')
 					if (res.code == 0 && res.points.length > 0) {
-						 this.searchList = res.points
+						this.searchList = res.points
 					}
 				}).catch(e => {
 					// this.titleList = []	
@@ -197,19 +262,19 @@
 				})
 			},
 			search(res) {
-				console.log(res,'res')
+				console.log(res, 'res')
 				// uni.showToast({
 				// 	title: '搜索：' + res,
 				// 	icon: 'none'
 				// })
-				
+
 			},
 			input(res) {
 				console.log('----input:', res)
-				if(res == ''){
+				if (res == '') {
 					this.searchList = []
-				}else{
-				this.getSearch()
+				} else {
+					this.getSearch()
 				}
 			},
 			clear(res) {
@@ -217,14 +282,15 @@
 				// 	title: 'clear事件，清除值为：',
 				// 	icon: 'none'
 				// })
+				this.searchValue = ''
 				this.showSearchList = false
 			},
 			blur(res) {
-				if(res == ''){
+				if (res == '') {
 					this.showSearchList = false
 					this.searchList = []
-				}else{
-				this.getSearch()
+				} else {
+					this.getSearch()
 				}
 			},
 			focus(e) {
@@ -232,7 +298,9 @@
 				// 	title: 'focus事件，输出值为：' + e.value,
 				// 	icon: 'none'
 				// })
+				// 等于1 就是有权限
 				this.showSearchList = true
+
 			},
 			// cancel(res) {
 			// 	uni.showToast({
@@ -253,39 +321,78 @@
 </script>

 <style lang="scss" scoped>
-	.searchList{
-		.item{font-size: 28rpx; padding: 20rpx; border-bottom: 1px solid #dadbde; }
-	}
-	.scroll-view_H{background-color: #fff;white-space: nowrap;
-		 padding:10rpx ; }
-	.contentBox {
-		.oneCateList{ justify-content: space-between;
-			text{ text-align: center;
-				display: inline-block; width: 32%;  padding: 20rpx 0; font-size: 34rpx;  border-radius: 10rpx; 
-			}
-			.cur{background-color:#55aa7f; color: #fff; }
+	.searchList {
+		.item {
+			font-size: 28rpx;
+			padding: 20rpx;
+			border-bottom: 1px solid #dadbde;
 		}
-		.twoCateList{
-			font-size: 28rpx; margin-top: 20rpx;
-			.grid-text{padding:30rpx 20rpx; text-align: center; }
-			.cur{
+	}
+
+	.scroll-view_H {
+		background-color: #fff;
+		white-space: nowrap;
+		padding: 10rpx;
+	}
+
+	.contentBox {
+		.oneCateList {
+			justify-content: space-between;
+
+			text {
+				text-align: center;
+				display: inline-block;
+				width: 32%;
+				padding: 20rpx 0;
+				font-size: 34rpx;
+				border-radius: 10rpx;
+			}
+
+			.cur {
+				background-color: #55aa7f;
+				color: #fff;
+			}
+		}
+
+		.twoCateList {
+			font-size: 28rpx;
+			margin-top: 20rpx;
+
+			.grid-text {
+				padding: 30rpx 20rpx;
+				text-align: center;
+			}
+
+			.cur {
 				color: #55aa7f;
 			}
+
 			// .u-grid-list{border: 0.5px solid #dadbde;}
 		}
-		.titleList{font-size: 26rpx; margin-top: 20rpx; padding: 10rpx; border-radius: 10rpx; background-color: #f8f9fa;
-			.titleItem{padding: 20rpx 0; }			
+
+		.titleList {
+			font-size: 26rpx;
+			margin-top: 20rpx;
+			padding: 10rpx;
+			border-radius: 10rpx;
+			background-color: #f8f9fa;
+
+			.titleItem {
+				padding: 20rpx 0;
+			}
 		}
 	}
-	
+

 	.container {
-		padding: 10rpx; height: 100vh;
+		padding: 10rpx;
+		height: 100vh;
 		background-color: #fff;
 	}

 	.search_box {
-		margin: 0 auto; overflow: hidden;
+		margin: 0 auto;
+		overflow: hidden;
 		margin-top: 20rpx;
 		align-items: center;
 		width: calc(100% - 10px);
--- a/pages/bookShop/orderList
+++ b/pages/bookShop/orderList
@@ -0,0 +1,801 @@
+<template>
+	<view>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<!-- <z-nav-bar title="我的订单"></z-nav-bar> -->
+		<z-nav-bar backState="2000" title="我的订单"></z-nav-bar>
+
+		<view class="orderTabs flexbox">
+			<view v-for="(item,index) in orderTabs" @click="orderTabCLi(item.value)"
+				:class="orderListTab==item.value?'ordStyle':''">{{item.name}}</view>
+		</view>
+
+		<view class="orderList" v-if="orderList.length > 0">
+			<view class="orderItem" v-for="(ifex,inten) in orderList" @click="goOrdiCont(ifex)" :key="inten">
+				<text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text>
+				<text class="orderState orderState1" v-if="ifex.orderStatus==1">待发货</text>
+				<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text>
+				<text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text>
+				<text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text>
+				<view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0">
+					<text>剩余支付时间：</text>
+					<uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false"
+						:hour="0" :minute="0" :second="ifex.overTime" @timeup="countDown"></uni-countdown>
+				</view>
+				<view class="flexbox orderSn">
+					<text class="">订单编号: {{ifex.orderSn}}</text>
+				</view>
+				<view class="orderContent" :key="index" v-if="ifex.orderType=='order'"
+					v-for="(item,index) in ifex.productList">
+					<image :src="item.product.productImages" mode=""></image>
+					<view class="itemJian">
+						<view class="orderTitle">
+							<text>{{item.product.productName}}</text>
+						</view>
+						<view class="orderPrice">
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{item.product.price}}</text><br>
+							<text style="color: #bbbbbb;font-size: 20rpx;margin-right: 10rpx;">X</text>
+							<text style="color: #bbbbbb;">{{item.quantity}}</text>
+						</view>
+						<br clear="both">
+					</view>
+					<br clear="both">
+				</view>
+				<view class="orderContent" v-if="ifex.orderType=='point'" @click.stop="goOrdiCont(ifex)">
+					<image src="../../static/icon/oder_chong.png" mode="" style="height: 150rpx;"></image>
+					<view class="itemJian">
+						<view class="orderTitle">
+							<text>天医币充值</text>
+						</view>
+						<view class="orderPrice">
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+						</view>
+						<br clear="both">
+					</view>
+					<br clear="both">
+				</view>
+				<view class="orderContent" v-if="ifex.orderType=='vip'" @click.stop="goOrdiCont(ifex)">
+					<image src="../../static/icon/oder_vip.png" mode="" style="height: 150rpx;"></image>
+					<view class="itemJian">
+						<view class="orderTitle">
+							<text>会员充值</text>
+						</view>
+						<view class="orderPrice">
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+						</view>
+						<br clear="both">
+					</view>
+					<br clear="both">
+				</view>
+				<view class="orderReal">
+					<span style="color: #999; float: left; font-size: 12px;">下单时间：{{ifex.createTime}}</span>
+					<span style="color: #999;margin-right: 10rpx;">实付款 : </span>
+					<span style=" color: #f56c6c;">￥</span><text
+						style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+				</view>
+				<view class="orderOper" v-if="ifex.orderStatus==0">
+					<view class="opFix" @click.stop = "canceOrder(ifex)">取消订单</view>
+					<view class="opCan" @click.stop = "getNewIap" v-if="ifex.orderType == 'point' && ifex.paymentMethod == '3'">重新下单</view>
+					<view class="opCan" v-else @click.stop = "goPay(ifex)">去支付</view>
+					
+				</view>
+			</view>
+			<view v-if="status==0" style="text-align: center;">
+				<u-loading-icon style="display: inline-block;"></u-loading-icon>
+				<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+			</view>
+			<view v-if="status==1" style="padding-bottom: 20rpx;">
+				<u-divider text="全部加载完成"></u-divider>
+			</view>
+		</view>
+		<view class="" v-else style=" margin-top: 250rpx;">
+			<u-divider text="暂无订单数据"></u-divider>
+		</view>
+		<z-navigation></z-navigation>
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	import {
+		setPay,
+		setPayAssign,
+		setWXPay
+	} from '@/config/utils';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				playData: {},
+				orderTabs: [{
+					name: '全部',
+					value: null
+				}, {
+					name: '待支付',
+					value: 0
+				}, {
+					name: '待发货',
+					value: 1
+				}, {
+					name: '待收货',
+					value: 2
+				}, {
+					name: '已完成',
+					value: 3
+				}, {
+					name: '已超时',
+					value: 5
+				}, ],
+				orderListTab: null,
+				orderList: [],
+				iapChannel: {},
+				checking: false, // 正在检测
+				ComplateRequestArr: null,
+				isAndorid: true,
+				status: 3, // 加载状态
+				totalPage: 0,
+				page: 1
+			}
+		},
+		onHide() {
+			this.orderList = [],
+				this.page = 1
+			this.totalPage = 0
+			this.orderListTab = null
+		},
+		onShow() {
+			this.getOrderList()
+			// this.checkIapOrders() //检查未完成的苹果支付订单
+			this.getOS()
+			// this.countDown()
+
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.orderList = [],
+				this.page = 1
+			this.totalPage = 0
+			this.getOrderList()
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			console.log('到底了')
+			if (this.page < this.totalPage) {
+				this.page++
+				//	console.log('加载',this.page)
+				this.status = 0
+				this.getOrderList()
+			} else {
+				this.status = 1
+				console.log('加载完成了', this.page)
+				return
+			}
+		},
+		components: {
+			musicPlay
+		},
+		methods: {
+			...mapMutations(['setUserInfo']),
+			// 苹果用户重新下单
+			getNewIap(){
+				uni.navigateTo({
+					url:'/pages/peanut/reCharge'
+				})
+			},
+			// 倒计时回调
+			countDown() {
+				console.log('重新刷新订单')
+				this.totalPage = 0
+				this.page = 1
+				this.orderList = []
+				this.getOrderList()
+			},
+			// 获得操作系统
+			getOS() {
+				let oprateOs = ''
+				oprateOs = uni.getSystemInfoSync().platform
+				console.log(oprateOs)
+				if (oprateOs == 'android') {
+					this.isAndorid = true
+				} else {
+					this.isAndorid = false
+				}
+			},
+			checkIapOrders() {
+				const that = this
+				// 如果ios已经绑定支付信息，就直接支付，如果没有绑定，就需要先绑定
+				console.log('检测支付环境...')
+				plus.payment.getChannels((channels) => {
+					console.log(channels, 'channels')
+					for (var i in channels) {
+						// 判断是否苹果支付1
+						if (channels[i].id === 'appleiap') {
+							that.iapChannel = channels[i]
+							that.restoreComplateRequest() //  检查未关闭订单
+							// that.requestOrder(productId)							
+						}
+					}
+				})
+
+			},
+			// 切换订单状态
+			orderTabCLi(e) {
+				this.orderListTab = e
+				this.totalPage = 0
+				this.page = 1
+				this.orderList = []
+				this.getOrderList()
+			},
+
+			// 获取订单列表
+			getOrderList() {
+				let data = {
+					"userId": "",
+					"orderStatus": this.orderListTab,
+					"page": this.page,
+					"limit": 10,
+					'userId': this.userInfo.id
+				}
+
+				$http.request({
+					// url: "book/buyOrder/orderList",
+					url: "book/buyOrder/getUserOrderList",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					if (res.code == 0) {
+						res.page.records.forEach((item, index) => {
+							var seconds = item.timestamp + 30 * 60 + 2 // 过期时间 30分钟+2
+							// var seconds = item.timestamp + 30 + 2    // 过期时间 30秒
+							var nowSeconds = Math.floor(new Date().getTime() / 1000); // 单位秒
+							item.overTime = seconds - nowSeconds
+							// console.log(item.overTime,'item.overTime')
+						})
+						this.orderList = this.orderList.concat(res.page.records)
+						this.totalPage = res.page.pages
+						if (res.page.pages == this.page) {
+							this.status = 1
+						} else {
+							this.status = 3
+						}
+						console.log(this.orderList, '订单列表')
+					}
+				})
+
+			},
+
+			// 订单详情
+			goOrdiCont(e) {
+				console.log(e, 'e')
+				//let orderId = e.orderId ? e.orderId : e.id
+				if(e.orderType == 'point'){      // 充值订单	
+					console.log('跳转到充值页面')
+					uni.navigateTo({
+						url: '/pages/peanut/chargeDetaill?orderId=' + e.orderId + '&orderSn=' + e.orderSn
+					});
+				}else if(e.orderType == 'order'){	 // 实体订单			
+					uni.navigateTo({
+						url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus  + '&orderSn=' + e.orderSn
+					});
+				}
+			},
+
+			// 跳转到支付页面
+			goPay1(e) {
+				console.log(e, 'goPay1')
+				uni.navigateTo({
+					url: '../peanut/reCharge?orderSn=' + e.orderSn
+				});
+			},
+
+			// 取消订单
+			canceOrder(e) {
+				uni.showModal({
+					title: '提示',
+					content: '确定要取消订单吗？',
+					confirmText: "取消订单",
+					cancelText: "考虑一下",
+					confirmColor: '#c96713',
+					cancelColor: '#555',
+					success: res => {
+						if (res.confirm) {
+							this.$http
+								.post(`book/buyOrder/appDelete?orderId=${e.orderId}`)
+								.then(res => {
+									uni.showToast({
+										icon: 'none',
+										title: '取消订单成功'
+									})
+									this.page = 1
+									this.totalPage = 0
+									this.orderList = []
+									this.getOrderList()
+								})
+						}
+					}
+				});
+			},
+
+			// 支付
+			goPay(payItem) {
+				console.log(payItem, 'payItem')
+				if (payItem.paymentMethod == 2) {
+					console.log('阿里支付')
+					setPay({
+						typePay: 'alipay',
+						subject: 'order',
+						totalAmount: payItem.realMoney,
+						type: 2,
+						relevanceoid: payItem.orderSn,
+						customerId: this.userInfo.id,
+					}, res => {
+						if (res.success) {
+							uni.showToast({
+								title: "支付成功"
+							});
+						} else {
+							uni.showToast({
+								title: "支付失败",
+								icon: "none",
+								image: '../../static/icon/ic_close.png'
+							});
+						}
+						this.orderList = [],
+							this.page = 1
+						this.totalPage = 0
+						this.getOrderList()
+					})
+				} else if (payItem.paymentMethod == 1) {
+					console.log('微信支付')
+					// console.log(this.isAndorid)				
+					if (this.isAndorid == false) {
+						uni.showModal({
+							title: '提示',
+							content: '很抱歉，苹果系统暂不支持微信支付',
+							showCancel: false
+						})
+						return false
+					} else {
+						let data1 = {
+							orderSn: payItem.orderSn,
+							buyOrderId: null,
+							totalAmount: payItem.realMoney
+						}
+						console.log(data1, 'data1')
+						setWXPay(data1, res => {
+							if (res.success) {
+								uni.showToast({
+									title: "支付成功"
+								});
+							} else {
+								console.log(res)
+								if (res.data.errMsg.indexOf('User canceled') != -1) {
+									uni.showToast({
+										title: "用户取消支付",
+										icon: "none",
+										image: '../../static/icon/ic_close.png'
+									});
+								} else {
+									uni.showToast({
+										title: "支付失败",
+										icon: "none",
+										image: '../../static/icon/ic_close.png'
+									});
+								}
+							}
+						})
+					}
+				} else if (payItem.paymentMethod == 3) {
+					// 苹果充值
+					console.log('苹果二次支付')
+					if (this.isAndorid) {
+						uni.showModal({
+							title: '提示',
+							showCancel: false,
+							content: '很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单'
+						})
+					} else {
+						this.iphonepay(payItem)
+					}
+				}
+			},
+			iphonepay(payItem) {
+				console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
+				if (this.ComplateRequestArr == null || this.ComplateRequestArr == []) {
+					this.requestOrder(payItem)
+				} else {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '您的账户存在未完成的支付订单，请稍后重启app留意账户变动。',
+					})
+				}
+			},
+			requestOrder(payItem) {
+				uni.showLoading({
+					title: '获取商品信息',
+					mask: true
+				})
+				const that = this
+				// console.log(productId, 88888888)
+				// ['xxxxx'] 是平台申请拿到的内购商品的id 
+				let IAPOrders = []
+				IAPOrders.push(payItem.productId + '')
+				console.log(IAPOrders, 'IAPOrders')
+				// 新建订单
+				that.iapChannel.requestOrder(IAPOrders, function(event) {
+					// uni.hideLoading()
+					console.log(event, 'event')
+					for (var index in event) {
+						var OrderItem = event[index]
+						// console.log(OrderItem, 'OrderItem')
+						console.log(OrderItem.productid, 'OrderItem.productid')
+						that.topay(payItem)
+					}
+				}, function(erroemsg) {
+					uni.showToast({
+						title: "商品获取失败",
+						icon: 'none'
+					})
+				})
+			},
+			topay(payItem) {
+				const that = this
+				uni.hideLoading()
+				// var restoreFlag = true; // 调用支付接口时标记 restoreFlag = true , 实际应用请将标记存储在 storage 中  
+				this.setUserInfo({
+					restoreFlag: true
+				});
+				console.log(this.userInfo, '更新后的用户信息')
+				plus.payment.request(that.iapChannel, {
+					productid: payItem.productId,
+					username: payItem.orderSn, // 用户标识/订单标识 					
+					manualFinishTransaction: true // 3.5.1+ 支持，设置此参数后需要开发者主动关闭订单，参见下面的关闭订单方法 finishTransaction()
+
+				}, function(result) {
+					// restoreFlag = false; // 支付成功清除标记 restoreFlag = false 					
+					that.transaction = result
+					// 支付成功，result 为 IAP商品交易信息对象 IAPTransaction 需将返回的支付凭证传给后端进行二次认证  
+					that.iapCheck(result)
+				}, function(e) {
+					if (e.errCode == 2) {
+						// 用户未绑定支付方式，app内支付流程结束，系统弹出框引导用户绑定支付方式，此过程将跳转到系统应用 AppStore 进行绑定支付方式，绑定成功同步支付成功，用户成功付款
+						// plus.runtime.openURL("https://apps.apple.com/account/billing");
+					} else {
+						// restoreFlag = false; // 支付失败清楚标记					
+						that.finishTransaction(result);
+						//console.log('订单关闭后的用户信息', that.userInfo);
+						// console.log(e)	
+						//console.log(e.message)
+					}
+				});
+			},
+			// 查询未关闭订单
+			restoreComplateRequest() {
+				let that = this
+				console.log('检测未完成订单')
+				// console.log(that.iapChannel,'this.iapChannel')				
+				that.iapChannel.restoreComplateRequest({
+					manualFinishTransaction: true
+				}, function(results) {
+					console.log('进入restoreComplateRequest')
+					// if(!that.checking){
+					// that.checking = true
+					// console.log(that.checking)
+					// results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证  
+					that.ComplateRequestArr = results
+					console.log(that.ComplateRequestArr, '未完成订单数组')
+					if (results && results.length > 0) {
+						results.map((item, index) => {
+							// "0"为正在支付；"1"为支付成功；"2"为支付失败；"3"为支付已恢复。
+							if (item.transactionState == '1') {
+								// 已经支付，但是没有走逻辑的内购订单								
+								that.iapCheck(item, index)
+							} else {
+								// 其他状态的内购订单
+								that.finishTransaction(item)
+
+							}
+						})
+					} else {
+						this.setUserInfo({
+							restoreFlag: false
+						});
+						console.log('无未处理订单，可以拉起新的支付')
+					}
+					// }
+				});
+
+
+			},
+			// 关闭交易订单
+			finishTransaction(trans, index) {
+				this.iapChannel.finishTransaction(trans, (success) => {
+					console.log('关闭订单成功', index);
+
+					if (index == this.ComplateRequestArr.length - 1) { // 最后一个支付订单
+						this.setUserInfo({
+							restoreFlag: false
+						});
+						console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
+					}
+
+				}, (fail) => {
+					console.log('关闭订单失败');
+				});
+			},
+			iapCheck(result, index) {
+				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, // 苹果返回收据
+					loadAnimate: 'none', // 请求加载动画
+				}
+				console.log(data, 'data')
+				$http.request({
+					url: "/Ipa/veri",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(JSON.stringify(res))
+					console.log(res.code)
+					if (res.code == 0) {
+						// uni.hideLoading()
+						console.log('充值订单已处理，请留意账户金额变动....')
+						// 服务器验证票据有效后在客户端关闭订单
+						that.finishTransaction(result, index)
+					} else if (res.code == 200) { // 重复验证订单
+						console.log('重复验证....')
+						that.finishTransaction(result, index)
+					}
+				}).catch(e => {
+					console.log('支付验证失败，进入轮询程序...')
+					that.getIapPayResult(result, index)
+				})
+				console.log('--------------')
+			},
+
+			// 轮询验证支付结果			
+			getIapPayResult(result, index) {
+				// let interval = null
+				this.ComplateRequestInterval = setTimeout(() => {
+					if (this.maxTimes <= 3) {
+						this.iapCheck(result, index)
+						console.log('执行1', this.maxTimes, this.ComplateRequestInterval)
+						this.maxTimes += 1
+					} else {
+						this.maxTimes = 0
+						console.log('停止轮询', this.maxTimes, this.ComplateRequestInterval, this.maxTimes)
+						this.checking = false
+						this.saveErrorIapOrder(result, index)
+						clearTimeout(this.ComplateRequestInterval)
+
+					}
+				}, 10000)
+
+			},
+			// 轮询失败接口
+			saveErrorIapOrder(result, index) {
+				console.log('提交到充值问题单里面...')
+				let data = {
+					transactionId: result.transactionIdentifier,
+					failureflag: 1,
+					orderId: result.payment.username,
+					receiptData: result.transactionReceipt,
+					productId: result.payment.productid,
+					customerOid: this.userInfo.id
+				}
+				$http.request({
+					url: "Ipa/failure",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(JSON.stringify(res))
+					if (res.code == 200) {
+						console.log('提交成功，关闭订单')
+						this.finishTransaction(result, index)
+					}
+				}).catch(e => {
+					console.log(e)
+					if (e.statusCode == 0) { // 重复提交，直接关闭订单
+						this.finishTransaction(result, index)
+					}
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+
+	.guoqi {
+		font-size: 28rpx;
+		align-items: center;
+		color: red;
+		float: right;
+		line-height: 40rpx;
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.orderTabs {
+		margin: 60rpx 0 0 0;
+		width: 100%;
+		padding: 30rpx 3% 3% 3%;
+		// padding-top: 100rpx;
+		position: fixed;
+		top: 80rpx;
+		background-color: #fff;
+		z-index: 100;
+
+		view {
+			border-radius: 20rpx;
+			border: 1px solid #d0d0d0;
+			display: inline-block;
+			padding: 20rpx 0;
+			margin: 0 6rpx;
+			// margin: 40rpx 0 15rpx 0;
+			width: 20%;
+			text-align: center;
+			font-size: 30rpx;
+		}
+
+		.ordStyle {
+			background: #f0f9eb;
+			border: 2rpx solid #54a966;
+			color: #54a966;
+			font-weight: bold;
+		}
+	}
+
+	.orderList {
+		padding: 20rpx;
+		margin-top: 130rpx;
+
+		.orderItem {
+			position: relative;
+			padding: 30rpx 10rpx 30rpx 30rpx;
+			background-color: #fff;
+			border-radius: 30rpx;
+			margin-bottom: 30rpx;
+
+			.orderSn {
+				font-size: 26rpx;
+				color: #999;
+				padding-bottom: 20rpx;
+				border-bottom: 1px solid #eee;
+				margin-top: 60rpx;
+				margin-bottom: 30rpx;
+			}
+
+			.orderState {
+				color: #fff;
+
+				position: absolute;
+				left: 0;
+				top: 20rpx;
+				padding: 10rpx;
+				border-radius: 0 24rpx 24rpx 0;
+				font-size: 26rpx;
+				// font-weight: bold;				
+				color: #fff;
+			}
+
+			.orderState0 {
+				background-color: #e6a23c;
+			}
+
+			.orderState1 {
+				background-color: #409eff;
+			}
+
+			.orderState2 {
+				background-color: #f56c6c;
+			}
+
+			.orderState3 {
+				background-color: #67c23a;
+			}
+
+			.orderState5 {
+				background-color: #787878;
+			}
+
+			.orderContent {
+				margin-bottom: 20rpx;
+
+				image {
+					width: 130rpx;
+					height: 140rpx;
+					margin-right: 20rpx;
+					float: left;
+				}
+
+				.itemJian {
+					float: left;
+					width: 470rpx;
+
+					.orderTitle {
+						// font-weight: bold;
+						font-size: 28rpx;
+						margin: 0 0 20rpx 0;
+						float: left;
+						width: 410rpx;
+					}
+
+					.orderPrice {
+						font-size: 28rpx;
+						float: right;
+						width: 60rpx;
+						text-align: right;
+						line-height: 40rpx;
+					}
+				}
+
+
+			}
+
+			.orderReal {
+				border-top: 1px solid #eee;
+				text-align: right;
+				font-size: 30rpx;
+				margin: 30rpx 20rpx 0 0;
+				padding: 30rpx 0 0 0;
+			}
+
+			.orderOper {
+				text-align: right;
+				margin: 30rpx 20rpx 0 0;
+
+				view {
+					margin-left: 20rpx;
+					padding: 10rpx 0;
+					display: inline-block;
+					width: 150rpx;
+					font-size: 25rpx;
+					text-align: center;
+				}
+
+				.opFix {
+					color: #555;
+					border: 1px solid #ddd;
+					border-radius: 30rpx;
+				}
+
+				.opCan {
+					color: #c96713;
+					border: 1px solid #eba00b;
+					border-radius: 30rpx;
+				}
+			}
+		}
+	}
+</style>
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
--- a/pages/bookShop/orderList1.vue
+++ b/pages/bookShop/orderList1.vue
@@ -0,0 +1,624 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view class="header">
+			<!-- 顶部导航栏 -->
+			<z-nav-bar backState="2000" title="我的订单"></z-nav-bar>
+            <view class="ordersTabs">
+			    <view v-for="(item,index) in ordersTabs" @click="ordersTabCLi(item.value)" :key="index"
+				:class="ordersListTab==item.value?'ordersdefine ordStyle':'ordersdefine'">
+					{{item.name}}
+					<view class="ordersnum">22</view>
+				</view>
+		    </view>
+		</view>
+        <!-- 站位 -->
+        <view class="ordersTabs" style="z-index:0;position:unset;">
+            <view class="ordersdefine">1</view>
+        </view>
+        <view v-if="ordersListTab == 1">
+            <view v-if="newList.length > 0">
+                <view class="orderInfo" v-for="(item,index) in newList" :key="index">
+                    <view class="mainContent">
+                        <view class="item" @click.stop="toDetail(item)">
+                            <view class="orderstatus">已完成</view>
+							<view>
+								<image class="feng" v-if="item.bookimage" :src="item.bookimage" mode="aspectFill"></image>
+								<!-- <view class="description" v-html="item.content">
+								</view> -->
+								<view class="btns flexbox">
+									<span class="booknameleft">{{item.bookname}}</span>
+									<span class="right flexbox opbtns">
+										¥76
+									</span>
+								</view>
+								<view class="btns flexbox" style="margin-top:10rpx;padding-bottom: 72rpx;">
+									<span class="left" style="color: #C0C4CC;"></span>
+									<span class="right flexbox opbtns" style="color: #C0C4CC;">
+										×1
+									</span>
+								</view>
+                            </view>
+							<view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;"></span>
+                                <span class="right flexbox opbtns">
+                                    <view style="color: #000;font-size:30rpx;font-weight:700;">实付款</view>
+                                    <view style="color: #000;font-size:30rpx;font-weight:700;">{{'　¥' + item.commentNum}}</view>
+                                </span>
+                            </view>
+							<view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;">订单详情</span>
+                                <span class="right flexbox opbtns">
+                                    <view style="color: #000;border:1px solid #999;border-radius: 10rpx;padding: 0 10rpx;">查看物流</view>
+                                    <view style="color: #000;border:1px solid #999;border-radius: 10rpx;padding: 0 10rpx;margin-left:20rpx;width:140rpx;text-align: center;">评价</view>
+                                </span>
+                            </view>
+                            <view style="border-bottom:2rpx solid #e9e9e9;height:50rpx;" v-if="index<item.length-1"></view>
+                        </view>	
+                    </view>
+                </view>
+            </view>
+            <view class="quesheng" v-else>
+                暂无书评内容~
+            </view>
+        </view>
+        <view v-if="ordersListTab == 2">
+            <view v-if="hotList.length > 0">
+                <view class="orderInfo" v-for="(item,index) in hotList" :key="index">
+                    <view class="mainContent">
+                        <view class="item" @click.stop="toDetail(item)">
+                            
+                            <view class="orderstatus">{{item.title}}</view>
+                            <image class="feng" v-if="item.bookimage" :src="item.bookimage" mode="aspectFill"></image>
+                            <view class="description" v-html="item.content">
+                            </view>
+                            <view class="btns flexbox">
+                                <span class="left">{{item.bookname}}</span>
+                                <span class="right flexbox opbtns" style="color:#3c9cff;">
+                                    全文
+                                </span>
+                            </view>
+                            <view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;">{{item.createTime}}</span>
+                                <span class="right flexbox opbtns">
+                                    <image class="gzicon" v-if="item.ilike" src="../../static/icon/gz2.png" mode="aspectFill" @click.stop="clickLike(item)"></image>
+                                    <image class="gzicon" v-else src="../../static/icon/gz.png" mode="aspectFill"></image>
+                                    <view style="color: #C0C4CC;">{{item.contlike}}</view>
+                                    <image class="gzicon" v-if="1" src="../../static/icon/pinglun.png" mode="aspectFill"></image>
+                                    <view style="color: #C0C4CC;">{{item.commentNum}}</view>
+                                </span>
+                            </view>
+                            <view style="border-bottom:2rpx solid #e9e9e9;height:50rpx;" v-if="index<item.length-1"></view>
+                        </view>	
+                    </view>
+                </view>
+            </view>
+            <view class="quesheng" v-else>
+                暂无书评内容~
+            </view>
+        </view>
+        <!-- <view v-if="ordersListTab == 3">
+			<view class="" style="padding:40rpx 20rpx;">
+				<view class="mytabs flexbox">
+					<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
+						已购图书
+					</view>
+					<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+						推荐图书
+					</view>
+				</view>
+			</view>
+            <view v-if="bookList.length > 0">
+                <view class="orderInfo3" v-for="(item,index) in bookList" :key="index">
+                    <view class="mainContent3">
+                        <view class="item">
+                            <view class="btns flexbox" @click.stop="toMore(item)">
+                                <view class="title">{{item.name}}</view>
+                                <view class="pianshuping">{{item.forumNum}}篇书评</view>
+                            </view>
+                            <image class="feng" v-if="item.images" :src="item.images" mode="aspectFill" @click.stop="toMore(item)"></image>
+                            <view class="shupingList">
+                                <view class="description" v-for="(item1,index1) in item.forums" :key="index1" @click.stop="toDetail(item1)">{{item1.title}}</view>
+                            </view>
+                            <view class="btns flexbox" @click.stop="toMore(item)">
+                                <span class="left"></span>
+                                <span class="right flexbox opbtns" style="color:#3c9cff;">
+                                    全部
+                                </span>
+                            </view>
+                        </view>	
+                    </view>
+                </view>
+            </view>
+            <view class="quesheng" v-else>
+                暂无书评内容~
+            </view>
+        </view> -->
+		
+		<view v-if="status==0" style="text-align: center;">
+			<u-loading-icon style="display: inline-block;"></u-loading-icon>
+			<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+		</view>
+		<view v-if="status==1" style="padding-bottom: 20rpx;">
+			<u-divider text="全部加载完成"></u-divider>
+		</view>
+		
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
+   import musicPlay from '@/components/music.vue'
+import { data } from 'jquery';
+   import {
+   	mapState, mapMutations
+   } from 'vuex';
+	export default {
+		data() {
+			return {
+				// loadingNow : false,
+				playData:{},
+				emojiIcon:'cuIcon-emoji',
+				windowWidth:0,
+				bookid:null,
+				booklistpage: 1,
+				productList:[],
+				productInfo:{},
+				pingjiaShow:false, //添加评价 
+				Pform:{ // 评价表单
+					star:0,
+					comment:'',
+					img:[],
+					html:''
+				},
+				emoji:[],
+				Files:[],
+				page:1,
+				pageSize:10,
+				total:0,
+				status:3,
+				shupingList:[],
+				bfaid:null,
+                ordersTabs: [{
+					name: '全部',
+					value: 1
+				}, {
+					name: '待付款',
+					value: 2
+				}, {
+					name: '待发货',
+					value: 3
+				}, {
+					name: '待收货',
+					value: 4
+				}, {
+					name: '已完成',
+					value: 5
+				}],
+				ordersListTab: 1,
+                newestpage: 1,
+                hotestpage: 1,
+                booksetpage: 1,
+                newList:[],
+                hotList:[],
+                bookList:[],
+				contentShow: 1,
+
+			}
+		},
+		onPullDownRefresh() {
+			console.log('下拉刷新了')
+			uni.stopPullDownRefresh(); 
+			  
+            this.newestpage = 1
+            this.hotestpage = 1
+            this.booksetpage = 1
+            this.newList = []
+            this.hotList = []
+            this.bookList = []
+            this.getBookList(this.ordersListTab, false)
+			   
+		},
+		onReachBottom() {
+            this.newestpage++
+            this.hotestpage++
+            this.booksetpage++
+            this.getBookList(this.ordersListTab, false)
+		},
+		onLoad(e) {
+			this.windowWidth = uni.getSystemInfoSync().windowWidth;
+			console.log(e,'onload')
+			// this.bookid = e.bookid
+			this.getBookList(1, false)
+		},
+		computed:{
+			...mapState(['userInfo']),
+		},
+		methods: {
+			...mapMutations(['setLoadingShow']),
+			setData(e) {
+				this.contentShow = e
+				this.getBookList(this.ordersListTab, true)
+			},
+            // 切换tab状态
+			ordersTabCLi(e) {
+				this.ordersListTab = e
+                this.newestpage = 1
+                this.hotestpage = 1
+                this.booksetpage = 1
+                this.newList = []
+                this.hotList = []
+                this.bookList = []
+				this.getBookList(this.ordersListTab, false)
+			},
+			// 查看本书更多书评
+			toMore(val){
+				console.log(val,'val')
+				uni.navigateTo({
+					url: '../comments/comments?bookid='+val.id,
+				});
+			},
+			// 书评详情
+			toDetail(val){
+				console.log(val,'val')
+				// uni.navigateTo({
+				// 	url:'../bookShop/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
+				// })
+				uni.navigateTo({
+					url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus  + '&orderSn=' + e.orderSn
+				});
+			},
+			getBookList(flag, tushuflag){
+				// 根据tab不同，获取最新书评、最热书评、书集列表
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });			
+				
+                var httpurl = "" 
+                if(flag == 1){
+                    httpurl = "forum/articles/getForumsNew?page=" + this.newestpage + '&limit=10'
+                }else if(flag == 2){
+                    httpurl = "forum/articles/getForumsHot?page=" + this.hotestpage + '&limit=10'
+                }else{
+					if(tushuflag){ // 点击切换已购和推荐
+                		this.booksetpage = 1
+                		this.bookList = []
+					}
+					if(this.contentShow == 1){
+                    	httpurl = "forum/articles/getHasForumsAndBook?page=" + this.booksetpage + '&limit=10&userId=' + this.userInfo.id
+					} else {
+						httpurl = "forum/articles/getBestForumsAndBook?page=" + this.booksetpage + '&limit=10&userId=' + this.userInfo.id
+					}
+                }
+				this.$http
+					.post(httpurl)
+					.then(res => {
+
+                        if(flag == 1){
+                            this.newList = this.newList.concat(res.page.records)
+                        }else if(flag == 2){
+                            this.hotList = this.hotList.concat(res.page.records)
+                        }else{
+                            this.bookList = this.bookList.concat(res.page.records)
+                        }
+                        console.log(this.newList,'this.newList')
+						// let list = res.page.records
+						// console.log(list,'list')
+						// for(let i=0; i < list.length; i++){
+						// 	let data = {
+						// 		'page': 1,
+						// 		'limit': 3,
+						// 		'bookid' : list[i].bookid
+						// 	}
+						// 	this.$http
+						// 		.post('forum/articles/descupdatelist', data)
+						// 		.then(res => {
+						// 		// this.total = res.page.totalPage
+						// 		// this.shupingList = this.shupingList.concat(res.page.list)
+						// 		list[i].shupingList = res.page.list
+						// 		console.log(res.page.list,'评论获取成功')
+								
+						// 		console.log(list,'list')
+						// 		this.productList.push(list[i])
+						// 		console.log(this.productList,'productList')
+						// 		// this.status = 3
+						// 	}).catch((e)=>{
+						// 			console.log(e,'e')
+						// 		})
+						// }
+						if(res.page.records.length != 10){
+							this.status = 1
+						} else {
+							this.status = 0
+						}						
+						// uni.hideLoading();
+					}).catch((e)=>{
+						console.log(e,'e')
+					})
+			},	
+			},
+		components:{
+			musicPlay,			
+			emotion			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+// @import '@/style/mixin.scss';
+.ordersTabs {
+    // margin: 70rpx 0 0 0;
+    width: 730rpx;
+    // padding: 0 3% 3% 3%;
+    position: fixed;
+    // top: 80rpx;
+    background-color: #f7faf9;
+    z-index: 100;
+
+    .ordersdefine {
+        display: inline-block;
+        padding: 20rpx 0 20rpx 0;
+        // margin: 40rpx 0 15rpx 0;
+        width:140rpx;
+        text-align: center;
+        font-size: 30rpx;
+		position: relative;
+		.ordersnum{
+			position: absolute;
+			top: 8rpx;
+			right: 0rpx;
+			background-color: red;
+            // border:1rpx solid #a3a3a3;
+			border-radius: 40rpx;
+			width: 28rpx;
+			height: 28rpx;
+			font-size: 20rpx;
+			font-weight: 500;
+			color: rgb(255, 255, 255);
+		}
+    }
+
+    .ordStyle {
+        // border-bottom: 4rpx solid #54a966;
+        // color: #54a966;
+        font-weight: bold;
+    }
+}
+
+
+	.flexbox{display: flex;}
+	.container{padding: 0 10px;}
+	.star{display: inline-block; width: 20px; height: 20px;  margin-right: 10rpx;}
+		.starGray{ background : url(../../static/icon/star_greey.png) no-repeat; background-size: contain; }
+		.starLight{ background : url(../../static/icon/star_light.png) no-repeat;  background-size: contain;}
+		.cuIcon-emoji {
+			background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block; margin-right: 20rpx;
+	width: 30px; 	}
+	.cuIcon-keyboard{background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block;
+	width: 30px; }
+	.tanchu {
+		padding: 40rpx 30rpx 40rpx 30rpx;
+		position: relative;
+	
+	
+		.dp_title {
+			font-size: 32rpx;
+			margin-bottom: 50rpx;
+			color: #555;
+			text-align: center;
+			font-weight: bold;
+		}
+	
+		.dp_add {
+			position: absolute;
+			top: 40rpx;
+			right: 30rpx;
+			font-size: 22rpx;
+			background-color: #fd6004;
+			color: #fff;
+			border-radius: 10rpx;
+			padding: 5rpx 10rpx;
+	
+			.u-icon {
+				display: inline-block;
+				margin-right: 5rpx;
+			}
+		}}
+	
+	.quesheng{text-align: center; margin-top: 100rpx; color: #8b8a91; padding-bottom: 20rpx; padding-top: 20rpx;}
+	.gengduoshuping{text-align: right; color: #0044ff; padding-bottom: 20rpx; padding-top: 20rpx;}
+	.orderInfo{
+		justify-content: space-between;
+		// margin-bottom: 15px;
+		background-color: #fff;
+		padding:20rpx;
+		border: 1px splid #999;
+		box-sizing: border-box;
+		// padding-bottom: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+		
+	}
+	.mainContent{
+		background-color: #fff; 
+		.item{
+			// padding: 10px;
+			// margin-bottom: 30rpx;
+			// border: 1px solid #999;
+			box-sizing: border-box;
+			// padding-bottom: 20rpx;
+			border-radius: 20rpx;
+			// margin-bottom: 20rpx;
+		}
+		.feng{
+            margin:0rpx 20rpx 0 0;
+            height: 160rpx;
+            width: 140rpx;
+            float:left;
+            border-radius: 20rpx;
+            border:1rpx solid #e9e9e9;
+        }
+		.orderstatus{font-size: 30rpx; color: red; text-align: right;padding-bottom: 10rpx;}
+		/deep/.description{
+			overflow: hidden;
+			color: #666;
+			text-overflow: -o-ellipsis-lastline;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 5;
+			line-clamp: 5;
+			-webkit-box-orient: vertical;
+			font-size: 26rpx;
+			margin-bottom: 20rpx;
+			margin-top:10rpx;
+			height: 172rpx;
+			img{
+				width: 100% !important;
+			}
+		}
+		.btns{
+			font-size: 28rpx;
+			justify-content: space-between;
+			align-items: center;
+			.booknameleft{
+                width: 372rpx;
+                color: #000000;
+			}
+			.left{
+                width: 300rpx;
+                color: #a1a1a1;
+            }
+            .right{
+                width: 350rpx;
+                display: flex;
+                justify-content: flex-end;
+                align-items: center;
+            }
+            .gzicon{
+                margin:0 0 0 20rpx;
+                height: 40rpx;
+                width: 40rpx;
+                // float:left;
+                // border-radius: 20rpx;
+                // border:1rpx solid #e9e9e9;
+            }
+			.opbtns{
+				.pingjia{margin-left: 10px;}
+			}
+		}
+	}
+	.mb30{margin-bottom: 30rpx; overflow: hidden;}
+
+    // .orderInfo3{
+    //     justify-content: space-between;
+	// 	// margin-bottom: 15px;
+	// 	background-color: #fff;
+	// 	padding:20rpx;
+	// 	border: 1px splid #999;
+	// 	box-sizing: border-box;
+	// 	// padding-bottom: 20rpx;
+	// 	border-radius: 20rpx;
+	// 	margin-bottom: 20rpx;
+    //     .mainContent3{
+    //         background-color: #fff; 
+    //         .item{
+    //             // padding: 10px;
+    //             // margin-bottom: 30rpx;
+    //             // border: 1px solid #999;
+    //             box-sizing: border-box;
+    //             // padding-bottom: 20rpx;
+    //             border-radius: 20rpx;
+    //             // margin-bottom: 20rpx;
+    //         }
+    //         .feng{
+    //             margin:10rpx 20rpx 0 0;
+    //             height: 240rpx;
+    //             width: 164rpx;
+    //             float:left;
+    //             border-radius: 20rpx;
+    //             border:1rpx solid #e9e9e9;
+    //         }
+    //         .title{font-size: 30rpx; font-weight: 700; color: #000; overflow: hidden;}
+    //         .pianshuping{
+    //             font-size: 24rpx;
+    //             color: red;
+    //         }
+    //         .shupingList{
+    //             min-height: 212rpx;
+    //         }
+    //         /deep/.description{
+    //             overflow: hidden;
+    //             color: #666;
+    //             text-overflow: -o-ellipsis-lastline;
+    //             overflow: hidden;
+    //             text-overflow: ellipsis;
+    //             display: -webkit-box;
+    //             -webkit-line-clamp: 1;
+    //             line-clamp: 1;
+    //             -webkit-box-orient: vertical;
+    //             font-size: 26rpx;
+    //             margin-bottom: 20rpx;
+    //             margin-top:10rpx;
+	// 			img{
+	// 				width: 100% !important;
+	// 			}
+    //         }
+    //         .btns{
+    //             font-size: 22rpx;
+    //             justify-content: space-between;
+    //             align-items: center;
+    //             .left{
+    //                 width: 300rpx;
+    //                 color: #a1a1a1;
+    //             }
+    //             .right{
+    //                 width: 300rpx;
+    //                 display: flex;
+    //                 justify-content: flex-end;
+    //                 align-items: center;
+    //             }
+    //             .gzicon{
+    //                 margin:0 0 0 20rpx;
+    //                 height: 40rpx;
+    //                 width: 40rpx;
+    //                 // float:left;
+    //                 // border-radius: 20rpx;
+    //                 // border:1rpx solid #e9e9e9;
+    //             }
+    //             .opbtns{
+    //                 .pingjia{margin-left: 10px;}
+    //             }
+    //         }
+    //     }
+    // }
+		
+	.mytabs {
+		// background: url('@/static/icon/bgtushu.png') no-repeat left top;
+		height: 80rpx;
+		// margin-bottom: 30rpx;
+
+		.item {
+			border-radius: 10rpx;
+			background-color: #c6ead0;
+			width: 48%;
+			// margin: 0 10rpx;
+			text-align: center;
+			color: #3c7f56;
+			font-size: 36rpx;
+			line-height: 80rpx;
+		}
+
+		.item.active {
+			background-color: #3c7f56;
+			color: #fff;
+		}
+
+		.item1 {
+			margin-right: 20rpx;
+		}
+	}
+</style>
--- a/pages/bookShop/settlement.vue
+++ b/pages/bookShop/settlement.vue
@@ -291,12 +291,9 @@
 				this.shangIDNum = e.list
 			}
 		//	this.getYunFei()
-			if (this.typeId == 1) {
-				this.getCartList()
-				
-			} else if (this.typeId == 0) {
-				this.getShangList(this.shangIDNum);				
-			}	
+			
+				this.getData()
+				this.getOS()
 		},
 		onShow() {			
 			// if (this.typeId == 1) {
@@ -305,9 +302,13 @@
 			// } else if (this.typeId == 0) {
 			// 	this.getShangList(this.shangIDNum);				
 			// }			
-			this.getData()
-			this.getOS()
-			this.getUserAddress()
+			if (this.typeId == 1) {
+				this.getCartList()
+				
+			} else if (this.typeId == 0) {
+				this.getShangList(this.shangIDNum);				
+			}
+			// this.getUserAddress()
 		},
 		computed: {
 			...mapState(['userInfo']),
@@ -361,11 +362,15 @@
 								// console.log(this.addressList,'地址列表')
 								this.adressMoRen = this.addressList[this.adressMoRIndex]
 								console.log(this.adressMoRen, '默认')
-								if(this.adressMoRen != {}){
+								if(this.adressMoRen != {} && this.adressMoRen.id){
 									// console.log('运费之前')
 									this.getYunFei()
 								}else{
-									this.getUserAddress()
+									// this.getUserAddress()
+									uni.showToast({
+										title:'获取用户地址失败',
+										icon: 'none'
+									})
 								}
 							}
 						}
@@ -459,7 +464,7 @@
 					key.push({productId: item.productId, quantity:item.productAmount})
 				//	dataToString = dataToString.concat(item.productId+"="+item.productAmount+"&")
 				})	
-				 console.log(key,'this.adressMoRen.areaidpath')
+				 // console.log(key,'this.adressMoRen.areaidpath')
 				
 				$http.request({
 					// url: "book/buyOrder/calculateTransportPrice/",
--- a/pages/comments/comments.vue
+++ b/pages/comments/comments.vue
@@ -139,6 +139,9 @@ import { data } from 'jquery';
   import {
   	mapState
   } from 'vuex';
+   import {
+   	checkBookRight
+   } from '@/config/utils';
 	export default {
 		data() {
 			return {
@@ -218,9 +221,24 @@ import { data } from 'jquery';
 				}
 				if(e==2){
 					// 跳转到读书打卡
-					uni.navigateTo({
-						url: '../clock/clock?bookid='+ productInfo.id
+					let data = {
+						'userId': this.userInfo.id,
+						'bookId': productInfo.id
+					}
+					checkBookRight(data,res=>{
+						console.log(res)
+						if(res.success){
+							uni.navigateTo({
+								url: '../clock/clock?bookid='+ productInfo.id
+							})
+						}else{
+							uni.showToast({
+								title:'购买本书后方可参与打卡!',
+								icon:'none'
+							})
+						}
 					})
+					
 				}
 				if(e==3){
 					// 跳转到购买
--- a/pages/comments/commentsList.vue
+++ b/pages/comments/commentsList.vue
@@ -102,10 +102,10 @@
                            <view class="btns flexbox" @click.stop="toMore(item)">
                                <view class="title">{{item.name}}</view>
                                <view class="pianshuping">{{item.forumNum}}篇书评</view>
-                            </view>
+                            </view>							
                            <image class="feng" v-if="item.images" :src="item.images" mode="aspectFill" @click.stop="toMore(item)"></image>
                            <view class="shupingList">
-                                <view class="description" v-for="(item1,index1) in item.forums" :key="index1" @click.stop="toDetail(item1)">{{item1.title}}</view>
+                                <view class="description" v-for="(item1,index1) in item.forums" :key="index1" @click.stop="toDetail1(item1)">{{item1.title}}</view>
                            </view>
                            <view class="btns flexbox" @click.stop="toMore(item)">
                                <span class="left"></span>
@@ -142,6 +142,9 @@ import { data } from 'jquery';
   import {
   	mapState, mapMutations
   } from 'vuex';
+   import {
+   	checkBookRight
+   } from '@/config/utils';
 	export default {
 		data() {
 			return {
@@ -164,7 +167,7 @@ import { data } from 'jquery';
 				Files:[],
 				page:1,
 				pageSize:10,
-				total:0,
+				total:0,         // 资源的总页数1
 				status:3,
 				shupingList:[],
 				bfaid:null,
@@ -199,14 +202,20 @@ import { data } from 'jquery';
            this.newList = []
            this.hotList = []
            this.bookList = []
+			this.total = 0
            this.getBookList(this.commentsListTab, false)
 			   
 		},
 		onReachBottom() {
+			if(this.newestpage + 1 <= this.total || this.hotestpage +1 <= this.total || this.booksetpage + 1	<= this.total){
            this.newestpage++
            this.hotestpage++
-            this.booksetpage++
-            this.getBookList(this.commentsListTab, false)
+            this.booksetpage++				
+				 this.getBookList(this.commentsListTab, false)
+			}else{
+				this.status = 1
+			}
+           
 		},
 		onLoad(e) {
 			this.windowWidth = uni.getSystemInfoSync().windowWidth;
@@ -258,6 +267,7 @@ import { data } from 'jquery';
                this.newestpage = 1
                this.hotestpage = 1
                this.booksetpage = 1
+				this.total = 0
                this.newList = []
                this.hotList = []
                this.bookList = []
@@ -265,17 +275,54 @@ import { data } from 'jquery';
 			},
 			// 查看本书更多书评
 			toMore(val){
-				console.log(val,'val')
-				uni.navigateTo({
-					url: '../comments/comments?bookid='+val.id,
-				});
+				// console.log(val,'val')
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': val.id
+				}
+				checkBookRight(data,res=>{
+					console.log(res)
+					if(res.success){
+						uni.navigateTo({
+							url: '../comments/comments?bookid='+val.id,
+						});
+					}else{
+						uni.showToast({
+							title:'购买本书后方可查看此内容!',
+							icon:'none'
+						})
+					}
+				})
+				
 			},
 			// 书评详情
 			toDetail(val){
-				console.log(val,'val')
-				uni.navigateTo({
-					url:'../comments/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
+				// console.log(val,'val')
+						uni.navigateTo({
+							url:'../comments/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
+						})
+			},
+			// 判断健全
+			toDetail1(val){
+				// console.log(val,'val')
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': val.bookid
+				}
+				checkBookRight(data,res=>{
+					console.log(res)
+					if(res.success){
+						uni.navigateTo({
+							url:'../comments/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
+						})
+					}else{
+						uni.showToast({
+							title:'购买本书后方可查看此内容!',
+							icon:'none'
+						})
+					}
 				})
+				
 			},
            clickLike(item){
                this.$http
@@ -326,6 +373,7 @@ import { data } from 'jquery';
                        }else{
                            this.bookList = this.bookList.concat(res.page.records)
                        }
+						this.total = res.page.pages
                        console.log(this.newList,'this.newList')
 						// let list = res.page.records
 						// console.log(list,'list')
@@ -351,11 +399,11 @@ import { data } from 'jquery';
 						// 			console.log(e,'e')
 						// 		})
 						// }
-						if(res.page.records.length != 10){
-							this.status = 1
-						} else {
+						// if(res.page.records.length != 10){
+						// 	this.status = 1
+						// } else {
 							this.status = 0
-						}						
+						// }						
 						// uni.hideLoading();
 					}).catch((e)=>{
 						console.log(e,'e')
--- a/pages/eBook/bookContent.vue
+++ b/pages/eBook/bookContent.vue
@@ -4,7 +4,7 @@
 		<view class="book_neir flexbox">
 			<view class="bn_img">
 				<img :src="bookMessage.images" mode="scaleToFill">
-				
+
 			</view>
 			<view class="bn_nes">
 				<view style="font-weight: bold;margin-bottom: 30rpx;">
@@ -20,10 +20,13 @@
 				</view>
 				<view class="tags">
 					<uni-tag class="tag" @click="toMore()" :inverted="true" text="书评" type="success"></uni-tag>
-					<uni-tag @click="gotoListen()"  class="tag" v-if="bookMessage.canListen" :inverted="true" text="听书" type="primary"></uni-tag>									
+					<uni-tag @click="gotoListen()" class="tag" v-if="bookMessage.canListen" :inverted="true" text="听书"
+						type="primary"></uni-tag>
 					<!-- 1:打卡，2不打卡 -->
-					<uni-tag  @click="gotoclock()" v-if="bookMessage.clockIn == 1" class="tag" :inverted="true" text="打卡" type="warning"></uni-tag>
-					<uni-tag  @click="goJiangShu()" v-if="bookMessage.teachIn == 1" class="tag" :inverted="true" text="讲书" type="error"></uni-tag>
+					<uni-tag @click="gotoclock()" v-if="bookMessage.clockIn == 1" class="tag" :inverted="true" text="打卡"
+						type="warning"></uni-tag>
+					<uni-tag @click="goJiangShu()" v-if="bookMessage.teachIn == 1" class="tag" :inverted="true"
+						text="讲书" type="error"></uni-tag>
 				</view>
 				<view class="buy" v-if="!bookMessage.isBuy">
 					<view class="btn" @click="goBuy">
@@ -43,52 +46,54 @@
 					<text>
 						{{bookMessage.description}}
 					</text>
-			</view>
-			<u-divider v-else text="暂无简介信息"></u-divider>
-			<view class="head_line" style="margin-bottom:30rpx;">
-				<b></b>
-				<text>精彩试听</text>
-			</view>
-			<view class="playList" v-if="libLIst.length > 0">
-				<view class="item" v-for="(item,index) in libLIst" :key="index" >
-					<view >
-						<view v-if="item.isFree == 1"
-						:class="[]" @click="listenOne(item, index)">					
-						
-						<span :class="[userInfo.playingInfo.bookId==item.bookId && userInfo.playingInfo.id == item.id ? 'playing' : '','graytitle']">{{item.chapter}}</span>&nbsp;&nbsp;
-						<uni-tag v-if="item.isFree == 1" class="tag" size="small" :inverted="true" text="试听" type="success" />
-						<!-- <image  class="playingFig" src="/static/playingGif.gif" mode="aspectFill"></image>	 -->
-						</view>					
-					</view>
-				</view>	
-				<view class="" style="text-align: center;" @click="gotoListen">
-					<text style="font-size: 28rpx; color:#27b386">查看完整目录</text>
 				</view>
-			</view>
-			<u-divider v-else text="暂无试听数据"></u-divider>
-				
-			<view class="head_line" style="margin-bottom:30rpx;">
-				<b></b>
-				<text>热门书评</text>
-			</view>
-			<view class="list shupingList" v-if="shupingList.length > 0">
-				<view class="item" @click.stop="toDetail(item)" v-for="item in shupingList" :key="item.id">
-					<h4>{{item.title}}</h4>
-					<view class=""  v-if="item.content && item.content != '' ">
-						<view class="info" v-html="item.content">
+				<u-divider v-else text="暂无简介信息"></u-divider>
+				<view class="head_line" style="margin-bottom:30rpx;">
+					<b></b>
+					<text>精彩试听</text>
+				</view>
+				<view class="playList" v-if="libLIst.length > 0">
+					<view class="item" v-for="(item,index) in libLIst" :key="index">
+						<view>
+							<view v-if="item.isFree == 1" :class="[]" @click="listenOne(item, index)">
+
+								<span
+									:class="[userInfo.playingInfo.bookId==item.bookId && userInfo.playingInfo.id == item.id ? 'playing' : '','graytitle']">{{item.chapter}}</span>&nbsp;&nbsp;
+								<uni-tag v-if="item.isFree == 1" class="tag" size="small" :inverted="true" text="试听"
+									type="success" />
+								<!-- <image  class="playingFig" src="/static/playingGif.gif" mode="aspectFill"></image>	 -->
+							</view>
 						</view>
 					</view>
-					<view class="more" @click.stop="toDetail(item)">立即查看</view>
+					<view class="" style="text-align: center;" @click="gotoListen">
+						<text style="font-size: 28rpx; color:#27b386">查看完整目录</text>
+					</view>
 				</view>
-				<view class="moreBtn"  @click="toMore(item)">
-					<text>查看更多</text>
+				<u-divider v-else text="暂无试听数据"></u-divider>
+
+				<view class="head_line" style="margin-bottom:30rpx;">
+					<b></b>
+					<text>热门书评</text>
 				</view>
+				<view class="list shupingList" v-if="shupingList.length > 0">
+					<view class="item" @click.stop="toDetail(item)" v-for="item in shupingList" :key="item.id">
+						<h4>{{item.title}}</h4>
+						<view class="" v-if="item.content && item.content != '' ">
+							<view class="info" v-html="item.content">
+							</view>
+						</view>
+						<view class="more" @click.stop="toDetail(item)">立即查看</view>
+					</view>
+					<view class="moreBtn" @click="toMore(item)">
+						<text>查看更多</text>
+					</view>
+				</view>
+				<u-divider v-else text="暂无书评数据"></u-divider>
+			</view>
+			<view>
+				<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle='bgiStyle'
+					:iconStyle="iconStyle"></u-back-top>
 			</view>
-			<u-divider v-else text="暂无书评数据"></u-divider>
-		</view>	
-		<view>
-			<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle='bgiStyle' :iconStyle="iconStyle"></u-back-top>
-		</view>

 		</view>
 		<music-play :playData="playData"></music-play>
@@ -96,25 +101,29 @@
 </template>

 <script>
-	 import musicPlay from '@/components/music.vue'
+	import musicPlay from '@/components/music.vue'
 	import $http from '@/config/requestConfig.js';
 	import {
-		mapState,mapMutations
+		mapState,
+		mapMutations
 	} from 'vuex';
+	import {
+		checkBookRight
+	} from '@/config/utils';
 	export default {
 		data() {
 			return {
-				
-				playData:{},
-				youhuiShow:false,
-				youhuiIndex:'',
-				youhuiList:[], // 优惠券列表
+
+				playData: {},
+				youhuiShow: false,
+				youhuiIndex: '',
+				youhuiList: [], // 优惠券列表
 				couponMz: 0, // 优惠券钱数
-				useCouponAmount: '' , // 使用的优惠券金额
+				useCouponAmount: '', // 使用的优惠券金额
 				bookJiageA: 0,
 				youhuiContent: {
-					coupons:{
-						id:'0'
+					coupons: {
+						id: '0'
 					}
 				},
 				scrollTop: 0,
@@ -128,9 +137,11 @@
 				tab_muJian: 0,
 				bookId: '',
 				bookMessage: {
-					flag: false,					
-					author:{authorName:''}
-					
+					flag: false,
+					author: {
+						authorName: ''
+					}
+
 				},
 				bookCatalogue: [],
 				bgiStyle: {
@@ -145,10 +156,10 @@
 				buyShow: false,
 				buysignShow: false,
 				buysignContent: '',
-				libLIst:[],
-				freeChapterCount:0,
-				isBuy:false,
-				shupingList:[],
+				libLIst: [],
+				freeChapterCount: 0,
+				isBuy: false,
+				shupingList: [],
 			};
 		},

@@ -170,7 +181,7 @@
 		onShow() {
 			this.getData();
 		},
-		components: {			
+		components: {
 			musicPlay
 		},
 		//方法
@@ -185,11 +196,11 @@
 						'userId': this.userInfo.id
 					})
 					.then(res => {
-						console.log('书详细',res.book)
+						console.log('书详细', res.book)
 						this.bookMessage = res.book
 						this.bokMesDet.bookId = res.book.id
 						this.bokMesDet.bookName = res.book.name,
-						this.bokMesDet.images = res.book.images	
+							this.bokMesDet.images = res.book.images
 						this.isBuy = res.book.isBuy
 						this.freeChapterCount = res.book.freeChapterCount
 						this.bokMesDet.userId = this.userInfo.id
@@ -219,120 +230,173 @@
 				this.getLibList()
 				// 获取
 				this.getComments()
-				
+
 			},
 			// 去讲书
-			goJiangShu(){
-				uni.navigateTo({
-					url: '../talkBook/talkBookDetail?bookId='+ this.bookId					
-				});
+			goJiangShu() {
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': this.bookId
+				}
+				checkBookRight(data,res=>{
+					console.log(res)
+					if(res.success){
+						uni.navigateTo({
+							url: '../talkBook/talkBookML?bookid=' + this.bookId
+						});
+					}else{
+						uni.showToast({
+							title:'购买本书后方可查看此内容!',
+							icon:'none'
+						})
+					}
+				})
+				
 			},
 			// 去听书
-			gotoListen(){
-				uni.navigateTo({					
-					 url: "../listen/listen?bookid="+ this.bookId				
+			gotoListen() {
+				uni.navigateTo({
+					url: "../listen/listen?bookid=" + this.bookId
 				});
 			},
 			// 去打卡
-			gotoclock(){
-				this.onPageJump('../clock/clock?bookid='+ this.bookId)
+			gotoclock() {
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': this.bookId
+				}
+				checkBookRight(data,res=>{
+					console.log(res)
+					if(res.success){
+						this.onPageJump('../clock/clock?bookid=' + this.bookId)
+					}else{
+						uni.showToast({
+							title:'购买本书后方可参与打卡!',
+							icon:'none'
+						})
+					}
+				})
+				
 			},
 			// 查看本书更多书评
-			toMore(val){
-				console.log(val,'val')
-				uni.navigateTo({
-					url: '../comments/comments?bookid='+ this.bookId,
-				});
+			toMore(val) {
+				// console.log(val, 'val')
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': this.bookId
+				}
+				checkBookRight(data,res=>{
+					console.log(res)
+					if(res.success){
+						uni.navigateTo({
+							url: '../comments/comments?bookid=' + this.bookId,
+						});
+					}else{
+						uni.showToast({
+							title:'购买本书后方可查看此内容!',
+							icon:'none'
+						})
+					}
+				})
+				
 			},
 			// 去购买
-			goBuy(){
+			goBuy() {
 				uni.navigateTo({
-					url: '../bookShop/commodityDetail?id=' + this.bookMessage.productId					
+					url: '../bookShop/commodityDetail?id=' + this.bookMessage.productId
 				});
 			},
 			// 获取书评
-			getComments(){
+			getComments() {
 				let data = {
 					'page': 1,
 					'limit': 3,
-					'bookid' : this.bookId
+					'bookid': this.bookId
 				}
 				this.$http
 					.post('forum/articles/descupdatelist', data)
-					.then(res => {										
-					console.log(res.page.list,'评论获取成功')
-					this.shupingList = res.page.list
-				}).catch((e)=>{
-						console.log(e,'e')
+					.then(res => {
+						console.log(res.page.list, '评论获取成功')
+						this.shupingList = res.page.list
+					}).catch((e) => {
+						console.log(e, 'e')
 					})
 			},
 			// 播放单个音频
-			listenOne(item,index){				
-				console.log('点击了',index)	
-				if(this.libLIst.length > 0){
-					this.setUserInfo({'playIndex': index})
-				    this.$music.setList(this.libLIst,'autoPlay',index)
-					this.setUserInfo({'playVisible': true})
+			listenOne(item, index) {
+				console.log('点击了', index)
+				if (this.libLIst.length > 0) {
+					this.setUserInfo({
+						'playIndex': index
+					})
+					this.$music.setList(this.libLIst, 'autoPlay', index)
+					this.setUserInfo({
+						'playVisible': true
+					})
 					uni.setStorage({
 						key: 'playVisible',
 						data: true,
-						success: function () {
+						success: function() {
 							console.log('success');
 						}
 					});
-				
-				// 本地存储播放列表
-				uni.setStorage({
-					key: 'playData',
-					data: {'myList':this.libLIst},
-					success: function () {
-						console.log('success');
-					}
-				});
-				// 系统暂存
-				this.setUserInfo({'myList':this.libLIst})				
-			  }	
+
+					// 本地存储播放列表
+					uni.setStorage({
+						key: 'playData',
+						data: {
+							'myList': this.libLIst
+						},
+						success: function() {
+							console.log('success');
+						}
+					});
+					// 系统暂存
+					this.setUserInfo({
+						'myList': this.libLIst
+					})
+				}
 			},
 			// 获取章节列表
-			getLibList(){				
+			getLibList() {
 				this.$http
 					.post('book/book/getBookCatalogue', {
 						'userId': this.userInfo.id,
 						'bookId': this.bookId,
 						// 'id': this.playid
 					})
-					.then(res => {						
-						if(res.code == 0){
-							console.log(res,999)
-							if(res.BookCatalogue.length > 0){	
-								res.BookCatalogue.map( item => {
-									if(item.isFree == 1){
+					.then(res => {
+						if (res.code == 0) {
+							console.log(res, 999)
+							if (res.BookCatalogue.length > 0) {
+								res.BookCatalogue.map(item => {
+									if (item.isFree == 1) {
 										this.libLIst.push(item)
 									}
 								})
-								console.log('改变后的试听目录',this.libLIst)
+								console.log('改变后的试听目录', this.libLIst)
 								//this.libLIst = res.BookCatalogue
 								// this.fengImg = res.images
 							}
 						}
-					}).catch((e)=>{
+					}).catch((e) => {
 						console.log(e.msg)
 					})
-			},		
-			
-		
+			},
+
+
 			// 跳转
 			onPageJump(url) {
 				uni.navigateTo({
 					url: url
-				});				
-				
+				});
+
 			},
 			// 书评详情
-			toDetail(val){
-				console.log(val,'val')
+			toDetail(val) {
+				console.log(val, 'val')
 				uni.navigateTo({
-					url:'../comments/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
+					url: '../comments/commentsDetail?bookid=' + val.bookid + '&bfa_id=' + val.id
 				})
 			},
 			// 信息介绍跳转
@@ -342,8 +406,8 @@
 				});
 			},

-			
-		
+
+



@@ -352,35 +416,103 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-	.playing{color: #1daa5c !important;}
-	.graytitle{color: #666;}
-	.flexbox{display: flex;}
-	.tags{
-		.tag{
-			margin-left: 0; margin-right: 10rpx;
+
+	.playing {
+		color: #1daa5c !important;
+	}
+
+	.graytitle {
+		color: #666;
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.tags {
+		.tag {
+			margin-left: 0;
+			margin-right: 10rpx;
 		}
 	}
-	.moreBtn{text-align: center; margin-top: 20rpx;
-	text{padding: 6rpx 20rpx; border: 1px solid #27b386; color: #27b386; border-radius: 10rpx;}
+
+	.moreBtn {
+		text-align: center;
+		margin-top: 20rpx;
+
+		text {
+			padding: 6rpx 20rpx;
+			border: 1px solid #27b386;
+			color: #27b386;
+			border-radius: 10rpx;
+		}
 	}
-	.buy{ text-align: right;
-		.btn{display: inline-block; padding: 6rpx 8rpx; font-size: 36rpx; color: #d75f54; border: 1px solid #d75f54; border-radius: 10rpx;}
+
+	.buy {
+		text-align: right;
+
+		.btn {
+			display: inline-block;
+			padding: 6rpx 8rpx;
+			font-size: 36rpx;
+			color: #d75f54;
+			border: 1px solid #d75f54;
+			border-radius: 10rpx;
+		}
 	}
-	.shupingList{
-		h4{font-size: 36rpx;}
-		.item{padding: 30rpx 20rpx; padding-bottom: 60rpx; border-bottom: 20rpx solid #eee; border-radius: 46rpx;}
-		.more{display: inline-block; margin-top: 20rpx; padding: 3rpx 5rpx; color: #27b386; border: 1px solid #27b386; border-radius:8rpx;}
-		.info{line-height:40rpx ; font-size: 26rpx; margin-top: 20rpx; height: 80rpx; overflow: hidden;  }
+
+	.shupingList {
+		h4 {
+			font-size: 36rpx;
+		}
+
+		.item {
+			padding: 30rpx 20rpx;
+			padding-bottom: 60rpx;
+			border-bottom: 20rpx solid #eee;
+			border-radius: 46rpx;
+		}
+
+		.more {
+			display: inline-block;
+			margin-top: 20rpx;
+			padding: 3rpx 5rpx;
+			color: #27b386;
+			border: 1px solid #27b386;
+			border-radius: 8rpx;
+		}
+
+		.info {
+			line-height: 40rpx;
+			font-size: 26rpx;
+			margin-top: 20rpx;
+			height: 80rpx;
+			overflow: hidden;
+		}
 	}
-	.playList{padding: 20rpx; color: #666; }
-	.playList .item{display: block;line-height:60rpx;  white-space: nowrap;					
-		overflow-x: hidden; font-size: 36rpx; 
-		text-overflow: ellipsis;}
-	.tag{margin-left: 20rpx;}
+
+	.playList {
+		padding: 20rpx;
+		color: #666;
+	}
+
+	.playList .item {
+		display: block;
+		line-height: 60rpx;
+		white-space: nowrap;
+		overflow-x: hidden;
+		font-size: 36rpx;
+		text-overflow: ellipsis;
+	}
+
+	.tag {
+		margin-left: 20rpx;
+	}
+
 	.head_line {
 		margin: 50rpx 0 0 0;
-	
-	
+
+
 		b {
 			display: inline-block;
 			width: 12rpx;
@@ -389,12 +521,12 @@
 			vertical-align: bottom;
 			margin: 0 20rpx 0 0;
 		}
-	
+
 		text {
 			font-size: 32rpx;
 			font-weight: bold;
 		}
-	
+
 		i {
 			float: right;
 			font-style: normal;
@@ -403,46 +535,52 @@
 			margin: 5rpx 35rpx 0 0;
 		}
 	}
-.yq_youhui {
-			.yqLeft {
-				display: inline-block;
-				margin-right: 10rpx;
-			}

-			.yqRight {
-				float: right;
-			}
+	.yq_youhui {
+		.yqLeft {
+			display: inline-block;
+			margin-right: 10rpx;
+		}

-			.dagnqian {
-				float: right;
-				font-size: 22rpx;
-				background-color: #dd1919;
-				color: #fff;
-				border-radius: 20rpx;
-				padding: 5rpx 10rpx;
-			}
+		.yqRight {
+			float: right;
 		}
-		.yq_yunfei {
-			.yqLeft {
-				display: inline-block;
-				margin-right: 10rpx;
-			}
-		
-			text {
-				float: right;
-			}
+
+		.dagnqian {
+			float: right;
+			font-size: 22rpx;
+			background-color: #dd1919;
+			color: #fff;
+			border-radius: 20rpx;
+			padding: 5rpx 10rpx;
 		}
+	}
+
+	.yq_yunfei {
+		.yqLeft {
+			display: inline-block;
+			margin-right: 10rpx;
+		}
+
+		text {
+			float: right;
+		}
+	}
+
 	.book_neir {
 		margin: 20rpx 0 0 0;
 		position: relative;


 		.bn_img {
-			
+
 			width: 250upx;
 			height: 320upx;
-			img{width: 250upx;
-			height: 320upx;}
+
+			img {
+				width: 250upx;
+				height: 320upx;
+			}
 		}

 		.bn_nes {
@@ -493,13 +631,13 @@
 			line-height: 40rpx;
 		}
 	}
-	
-	.book_vip{
+
+	.book_vip {
 		background: url('../../static/icon/mine_card.png') top center no-repeat;
 		color: #87510d;
 		font-weight: bold;
 	}
-	
+


 	.book_tab {
@@ -633,6 +771,7 @@
 			display: inline-block;
 		}
 	}
+
 	.youhuiItem {
 		border: 1px solid #d9d9d9;
 		border-radius: 10rpx;
@@ -644,12 +783,12 @@
 		background-color: #fff;
 		font-size: 30rpx;
 	}
-	
+
 	.youhuiItem>view {
 		float: left;
 	}
-	
+
 	.youhuiItem.youItem_style {
 		border-color: #fd6004;
 	}
-</style>
+</style>
--- a/pages/listen/listen.vue
+++ b/pages/listen/listen.vue
@@ -110,6 +110,9 @@
 	 import {
 	 	mapState,mapMutations
 	 } from 'vuex';
+	 import {
+	 	checkBookRight
+	 } from '@/config/utils';
 	export default {
 		components: {
 			//  cxAdudioPlay,
@@ -218,10 +221,23 @@
 			// },
 			// 查看本书更多书评
 			toMore(val){
-				console.log(val,'val')
-				uni.navigateTo({
-					url: '../comments/comments?bookid='+ this.bookid,
-				});
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': this.bookid
+				}
+				checkBookRight(data,res=>{
+					// console.log(res)
+					if(res.success){
+						uni.navigateTo({
+							url: '../comments/comments?bookid='+ this.bookid,
+						});
+					}else{
+						uni.showToast({
+							title:'购买本书后方可查看此内容!',
+							icon:'none'
+						})
+					}
+				})				
 			},
 			// 去听书
 			gotoListen(){
@@ -231,15 +247,43 @@
 			},
 			// 去讲书
 			goJiangShu(){
-				uni.navigateTo({
-					url: '../talkBook/talkBookDetail?bookId='+ this.bookid					
-				});
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': this.bookid
+				}
+				checkBookRight(data,res=>{
+					console.log(res)
+					if(res.success){
+						uni.navigateTo({
+							url: '../talkBook/talkBookML?bookid=' + this.bookid				
+						});
+					}else{
+						uni.showToast({
+							title:'购买本书后方可查看此内容!',
+							icon:'none'
+						})
+					}
+				})				
 			},
 			// 去打卡
-			gotoclock(){				
-				uni.navigateTo({
-					url: '../clock/clock?bookid='+ this.bookid,
-				});
+			gotoclock(){	
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': this.bookid
+				}
+				checkBookRight(data,res=>{
+					console.log(res)
+					if(res.success){
+						uni.navigateTo({
+							url: '../clock/clock?bookid='+ this.bookid,
+						});
+					}else{
+						uni.showToast({
+							title:'购买本书后方可参与打卡!',
+							icon:'none'
+						})
+					}
+				})
 			},
 			getBookInfo(){
 				// 获取书本基本信息
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -24,6 +24,10 @@
 						<image src="../../static/icon/five4.png" mode="aspectFit"></image>
 						<text>五运六气</text>
 					</div> -->
+					<!-- <div class="item item1" @click="onPageJump('../timeAcupoint/timeAcupoint')">
+						<image src="../../static/icon/five6.png" mode="aspectFit"></image>
+						<text>时辰取穴</text>
+					</div> -->
 					<div class="item item1" @click="onPageJump('../peanut/searchFor')">
 						<image src="../../static/icon/five3.png" mode="aspectFit"></image>
 						<text>书名检索</text>
@@ -71,6 +75,11 @@
 				<image src="../../static/icon/home4-1.png" mode="aspectFit"></image>
 				<!-- <text>讲 书</text> -->
 			</view>		
+			
+			<view class="hn_cl_tit chaoshi" @click="onPageJump('../yian/yian')">
+				<image src="../../static/icon/home5-1.png" mode="aspectFit"></image>
+				<!-- <text>讲 书</text> -->
+			</view>		
 		</view>

 		<!-- <view class="home_lunbo">
@@ -327,7 +336,8 @@
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
-		    // this.requestIapOrder()			
+		    // this.requestIapOrder()		
+				
 		},
 		onHide() {
 			this.page = 1
@@ -833,7 +843,7 @@
 }
 	.home_nar {
 		background-color: #fff;
-		padding: 20rpx 30rpx;
+		padding: 40rpx 10rpx;
 		 justify-content: space-between;
 		display: flex;
 		color: #333; 
--- a/pages/talkBook/talkBook.vue
+++ b/pages/talkBook/talkBook.vue
@@ -19,17 +19,17 @@
 		</view> -->
 		<view class="mainContainer">
 			<view class="item" v-if="bookList.length > 0">
-				<u-row gutter="16" justify="flex-start" >
+				<u-row gutter="16" justify="flex-start">
 					<u-col span="4" v-for="(item,index) in bookList" :key="index">
 						<view>
 							<view class="videoBox demo-layout bg-purple" @click="toDetail(item)">
 								<image v-if="item.images != ''" :src="item.images" 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.name}}</text>
 						</view>
 					</u-col>
-				</u-row>				
+				</u-row>
 			</view>
 			<u-divider v-else text="暂无数据"></u-divider>
 			<view style="width: 100%;">
@@ -41,10 +41,10 @@
 					<u-divider text="全部加载完成"></u-divider>
 				</view>
 			</view>
-			
+
 		</view>
 		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>			
+		<public-module></public-module>
 		<music-play :playData="playData"></music-play>
 	</view>
 </template>
@@ -52,42 +52,44 @@
 <script>
 	import $http from '@/config/requestConfig.js';
 	// import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
-   import musicPlay from '@/components/music.vue'
-import { data } from 'jquery';
-   import {
-   	mapState
-   } from 'vuex';
+	import musicPlay from '@/components/music.vue'
+	import {
+		data
+	} from 'jquery';
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
-				loadingNow : false,
-				playData:{},				
-				windowWidth:0,
-				bookid:null,
-				productInfo:{},	
-				page:1,
-				bookList:[],
-				pageSize:9,
-				total:0,
-				totalPage:0,
-				status:3,
-				shupingList:[],
-				bfaid:null,
+				loadingNow: false,
+				playData: {},
+				windowWidth: 0,
+				bookid: null,
+				productInfo: {},
+				page: 1,
+				bookList: [],
+				pageSize: 9,
+				total: 0,
+				totalPage: 0,
+				status: 3,
+				shupingList: [],
+				bfaid: null,
 				contentShow: 1,
 			}
 		},
 		onPullDownRefresh() {
 			console.log('下拉刷新了')
-			uni.stopPullDownRefresh(); 
+			uni.stopPullDownRefresh();
 		},
 		onReachBottom() {
-			this.loadingNow = true			
+			this.loadingNow = true
 			// if(this.page < this.total){
 			// 	this.page++
 			// 	console.log('加载',this.page)
 			// 	this.status = 0
 			// 	this.getBookCom()
-				
+
 			// }else{
 			// 	this.status = 1
 			// 	console.log('加载完成了',this.page)
@@ -96,104 +98,112 @@ import { data } from 'jquery';
 		},
 		onLoad(e) {
 			this.windowWidth = uni.getSystemInfoSync().windowWidth;
-			console.log(e,'onload')
+			console.log(e, 'onload')
 			this.bookid = e.bookid
-		//	this.getProDetail(e)
+			//	this.getProDetail(e)
 			this.getBooks()
 		},
-		computed:{
+		computed: {
 			...mapState(['userInfo']),
 		},
-		methods: { 
+		methods: {
 			setData(e) {
 				this.contentShow = e
 				this.getBooks()
 			},
-			getBooks(){
-				if(this.contentShow == 1){
+			getBooks() {
+				if (this.contentShow == 1) {

 					$http.request({
-						url: "book/teach/getUserTeachBooks",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-						data: {
-							id: this.userInfo.id,
-							'limit': 100,
-							'page': this.page
-						},
-						header: { //默认 无 说明：请求头
-							'Content-Type': 'application/json'
-						},
-					})
-					.then(res => {
-						console.log(res,'讲书列表')
-						if(res.code == 0 && res.page.records.length > 0){
-							this.bookList = res.page.records
-							this.totalPage = res.page.pages
-							this.status = 3
-							console.log(this.bookList,'this.bookList')
-						}else{
-							this.bookList = []
-							this.totalPage = 0
-						}					    
-						
-					}).catch(e => {
-						console.log(e,'e')
-					});
-				}else{
+							url: "book/teach/getUserTeachBooks",
+							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+							data: {
+								id: this.userInfo.id,
+								'limit': 100,
+								'page': this.page
+							},
+							header: { //默认 无 说明：请求头
+								'Content-Type': 'application/json'
+							},
+						})
+						.then(res => {
+							console.log(res, '讲书列表')
+							if (res.code == 0 && res.page.records.length > 0) {
+								this.bookList = res.page.records
+								this.totalPage = res.page.pages
+								this.status = 3
+								console.log(this.bookList, 'this.bookList')
+							} else {
+								this.bookList = []
+								this.totalPage = 0
+							}
+
+						}).catch(e => {
+							console.log(e, 'e')
+						});
+				} else {
 					$http.request({
-						url: "book/teach/getUserBestTeachBooks",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-						data: {
-							id: this.userInfo.id,
-							'limit': 100,
-							'page': this.page
-						},
-						header: { //默认 无 说明：请求头
-							'Content-Type': 'application/json'
-						},
-					})
-					// this.$http
-					// .post('book/teach/getUserBestTeachBooks',{
-					// 	id: this.userInfo.id,
-					// 	'limit': 100,
-					// 	'page': this.page
-					// })
-					.then(res => {
-						console.log(res,'讲书列表')
-						if(res.code == 0 && res.page.records.length > 0){
-							this.bookList = res.page.records
-							this.totalPage = res.page.pages
-							this.status = 3
-							console.log(this.bookList,'this.bookList')
-						}else{
-							this.bookList = []
-							this.totalPage = 0
-						}					    
-						
-					}).catch(e => {
-						console.log(e,'e')
-					});
+							url: "book/teach/getUserBestTeachBooks",
+							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+							data: {
+								id: this.userInfo.id,
+								'limit': 100,
+								'page': this.page
+							},
+							header: { //默认 无 说明：请求头
+								'Content-Type': 'application/json'
+							},
+						})
+						// this.$http
+						// .post('book/teach/getUserBestTeachBooks',{
+						// 	id: this.userInfo.id,
+						// 	'limit': 100,
+						// 	'page': this.page
+						// })
+						.then(res => {
+							console.log(res, '讲书列表')
+							if (res.code == 0 && res.page.records.length > 0) {
+								this.bookList = res.page.records
+								this.totalPage = res.page.pages
+								this.status = 3
+								console.log(this.bookList, 'this.bookList')
+							} else {
+								this.bookList = []
+								this.totalPage = 0
+							}
+
+						}).catch(e => {
+							console.log(e, 'e')
+						});
 				}
-				
+
 			},
 			// 书评详情
-			toDetail(val){
-				console.log(val,'val')
-				uni.navigateTo({
-					url:'./talkBookML?bookid='+val.id
-				})
+			toDetail(val) {
+				// console.log(val,'val')
+				if (this.contentShow == 1) {
+					uni.navigateTo({
+						url: './talkBookML?bookid=' + val.id
+					})
+				}
+				if (this.contentShow == 2) {
+					uni.navigateTo({
+						url: '../eBook/bookContent?Id=' + val.id
+					});
+				}
+
 			},
-			
-			
-			},
-		components:{
-			musicPlay	
-						
+
+
+		},
+		components: {
+			musicPlay
+
 		}
 	}
 </script>

-<style lang="scss" scoped>	
+<style lang="scss" scoped>
 	.mytabs {
 		// background: url('@/static/icon/bgtushu.png') no-repeat left top;
 		height: 80rpx;
@@ -219,35 +229,55 @@ import { data } from 'jquery';
 			margin-right: 20rpx;
 		}
 	}
-.tip{
-		padding: 20rpx; background-color: #fff;
-		text{ font-size: 36rpx;}
+
+	.tip {
+		padding: 20rpx;
+		background-color: #fff;
+
+		text {
+			font-size: 36rpx;
+		}
 	}
-	.flexbox{display: flex;}
-	.container{padding: 10px;}
-.bookName {
-		white-space: nowrap; 
+
+	.flexbox {
+		display: flex;
+	}
+
+	.container {
+		padding: 10px;
+	}
+
+	.bookName {
+		white-space: nowrap;
 		overflow-x: hidden;
 		text-overflow: ellipsis;
 		font-size: 30rpx;
-		color: #333; 
+		color: #333;
 		padding: 10rpx 0;
 	}
+
 	uni-image {
 		width: auto !important;
 		height: 350rpx;
 	}
+
 	.listenList {
 		padding: 10rpx;
 		box-sizing: border-box;
 		width: calc(100% - 10rpx);
 	}
+
 	.u-row {
 		flex-wrap: wrap;
 	}
+
 	.u-col {
 		overflow: hidden;
 		margin-bottom: 20rpx;
 	}
-	.mb30{margin-bottom: 30rpx; overflow: hidden;}
-</style>
+
+	.mb30 {
+		margin-bottom: 30rpx;
+		overflow: hidden;
+	}
+</style>
--- a/pages/talkBook/talkBookML.vue
+++ b/pages/talkBook/talkBookML.vue
@@ -86,6 +86,9 @@
 		mapState,
 		mapMutations
 	} from 'vuex';
+	import {
+		checkBookRight
+	} from '@/config/utils';
 	export default {
 		components: {
 			//  cxAdudioPlay,
@@ -157,10 +160,25 @@

 			// 查看本书更多书评
 			toMore(val) {
-				console.log(val, 'val')
-				uni.navigateTo({
-					url: '../comments/comments?bookid=' + this.bookid,
-				});
+				// console.log(val, 'val')
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': this.bookid
+				}
+				checkBookRight(data,res=>{
+					console.log(res)
+					if(res.success){
+						uni.navigateTo({
+							url: '../comments/comments?bookid=' + this.bookid,
+						});
+					}else{
+						uni.showToast({
+							title:'购买本书后方可查看此内容!',
+							icon:'none'
+						})
+					}
+				})
+				
 			},
 			// 去打卡
 			gotoclock() {
@@ -209,7 +227,7 @@
 				this.$http
 					.post('book/teach/getBookTeachItems', {
 						'bookId': this.bookid,
-						'limit': 10,
+						'limit': 20,
 						'page': this.page
 						// 'userid': this.userInfo.id,
 						// 'bookid': 
@@ -222,7 +240,9 @@
 								this.libLIst = this.libLIst.concat(res.page.records)
 								this.status = 3
 								this.totalPage = res.page.pages								
-														
+								if(this.totalPage = res.page.current){
+									this.status = 1
+								}						
 							} else {
 								this.libLIst = []
 								this.totalPage = 0
--- a/pages/timeAcupoint/scss/common.scss
+++ b/pages/timeAcupoint/scss/common.scss
@@ -0,0 +1,297 @@
+page {
+	font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
+}
+@for $i from 0 through 100 {
+	.w-#{$i} {
+		width: $i + '%';
+	}
+	.h-#{$i} {
+		height: $i + '%';
+	}
+	.padding-#{$i} {
+		padding: $i + rpx;
+	}
+	.padding-left-#{$i} {
+		padding-left: $i + rpx;
+	}
+	.padding-right-#{$i} {
+		padding-right: $i + rpx;
+	}
+	.padding-top-#{$i} {
+		padding-top: $i + rpx;
+	}
+	.padding-bottom-#{$i} {
+		padding-bottom: $i + rpx;
+	}
+	.margin-#{$i} {
+		margin: $i + rpx;
+	}
+	.margin-left-#{$i} {
+		margin-left: $i + rpx;
+	}
+	.margin-right-#{$i} {
+		margin-right: $i + rpx;
+	}
+	.margin-top-#{$i} {
+		margin-top: $i + rpx;
+	}
+	.margin-bottom-#{$i} {
+		margin-bottom: $i + rpx;
+	}
+}
+.d-table {
+	display: table;
+	width: 100%;
+	vertical-align: middle;
+	text-align: center;
+	table-layout: fixed;
+	font-size: 28rpx;
+	word-break: break-all;
+	background-color: white;
+	border-collapse: collapse;
+	&.primary {
+		&.dark {
+			.d-thead {
+				background-color: #2b85e4;
+			}
+		}
+		&.disabled {
+			.d-thead {
+				background-color: #a0cfff;
+			}
+		}
+		&.light {
+			.d-thead {
+				background-color: #ecf5ff;
+			}
+		}
+		.d-thead {
+			background-color: #2979ff;
+			color: #fff;
+		}
+	}
+	&.success {
+		&.dark {
+			.d-thead {
+				background-color: #18b566;
+			}
+		}
+		&.disabled {
+			.d-thead {
+				background-color: #71d5a1;
+			}
+		}
+		&.light {
+			.d-thead {
+				background-color: #dbf1e1;
+			}
+		}
+		.d-thead {
+			background-color: #19be6b;
+			color: #fff;
+		}
+	}
+	&.warning {
+		&.dark {
+			.d-thead {
+				background-color: #f29100;
+			}
+		}
+		&.disabled {
+			.d-thead {
+				background-color: #fcbd71;
+			}
+		}
+		&.light {
+			.d-thead {
+				background-color: #fdf6ec;
+			}
+		}
+		.d-thead {
+			background-color: #ff9900;
+			color: #fff;
+		}
+	}
+	&.danger {
+		&.dark {
+			.d-thead {
+				background-color: #dd6161;
+			}
+		}
+		&.disabled {
+			.d-thead {
+				background-color: #fab6b6;
+			}
+		}
+		&.light {
+			.d-thead {
+				background-color: #fef0f0;
+			}
+		}
+		.d-thead {
+			background-color: #fa3534;
+			color: #fff;
+		}
+	}
+	&.info {
+		&.dark {
+			.d-thead {
+				background-color: #82848a;
+			}
+		}
+		&.disabled {
+			.d-thead {
+				background-color: #c8c9cc;
+			}
+		}
+		&.light {
+			.d-thead {
+				background-color: #f4f4f5;
+			}
+		}
+		.d-thead {
+			background-color: #909399;
+			color: #fff;
+		}
+	}
+	&.gray {
+		.d-thead {
+			background-color: #aaa;
+			color: #fff;
+		}
+	}
+	&.border-under {
+		.d-td,
+		.d-th {
+			@extend .noBorder;
+		}
+		.d-tr {
+			@extend .border-bottom;
+		}
+		.d-table {
+			.d-tr {
+				@extend .noBorder;
+			}
+		}
+	}
+	&.large {
+		.d-td,
+		.d-th {
+			height: 80rpx;
+		}
+	}
+	&.middle {
+		.d-td,
+		.d-th {
+			height: 60rpx;
+		}
+	}
+	.d-td,
+	.d-th {
+		@extend .border;
+	}
+	.d-table {
+		height: 100%;
+		.d-td,
+		.d-th {
+			@extend .noBorder;
+		}
+		// .d-tr {
+		// 	&:first-child {
+		// 		.d-td{
+		// 			&.border-bottom {
+		// 				border-bottom: none;
+		// 			}
+		// 			&.border-top {
+		// 				border-top: none;
+		// 			}
+		// 		}
+		// 	}
+		// }
+	}
+	input.borderInput {
+		border: 1px solid #ccc;
+		border-radius: 6rpx;
+		width: 80%;
+		height: 80%;
+		display: inline-flex;
+	}
+}
+.d-caption {
+	display: table-caption;
+	background-color: inherit;
+}
+.d-thead {
+	display: table-header-group;
+	font-weight: 600;
+}
+.d-tbody {
+	display: table-row-group;
+}
+.d-tfoot {
+	display: table-footer-group;
+}
+.d-tr {
+	display: table-row;
+	width: 100%;
+}
+.d-td,
+.d-th {
+	display: table-cell;
+	vertical-align: middle;
+	height: 50rpx;
+	font-size: 28rpx;
+}
+.d-th {
+	font-weight: 600;
+}
+.border-top {
+	border-top: 1px solid #efefef !important;
+}
+.border-left {
+	border-left: 1px solid #efefef !important;
+}
+.border-bottom {
+	border-bottom: 1px solid #efefef !important;
+}
+.border-right {
+	border-right: 1px solid #efefef !important;
+}
+.border {
+	border: 1px solid #efefef;
+}
+.noBorder {
+	border: 0;
+}
+
+.flex {
+	display: flex;
+	align-items: center;
+	&-wrap {
+		flex-wrap: wrap;
+	}
+	&-nowrap {
+		flex-wrap: nowrap;
+	}
+	&-direction {
+		flex-direction: column;
+	}
+}
+
+@each $type in center, space-between, space-around, flex-start, flex-end {
+	.row-#{$type} {
+		justify-content: $type;
+	}
+}
+
+@each $type in center, stretch, flex-start, flex-end {
+	.col-#{$type} {
+		align-items: $type;
+	}
+}
+
+@each $type in center, left, right {
+	.text-#{$type} {
+		text-align: $type!important;
+	}
+}
--- a/pages/timeAcupoint/timeAcupoint
+++ b/pages/timeAcupoint/timeAcupoint
@@ -0,0 +1,528 @@
+<template>
+	<view class="container88">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="时辰取穴"></z-nav-bar>
+		<view>
+			<!-- {{date}}---{{timestamp}} -->
+			<!-- <uni-section :title="'date 对象用法：' + datetimesingle" type="line"></uni-section> -->
+			<view class="datetimeBox">
+				<uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" />
+			</view>
+			<view class="flexbox box1 grayBg">
+				<view class="">
+					<text style="color: #666;  line-height: 60rpx;">所查询时间：</text><br />
+					<text style="color: #666; white-space:nowrap;;">{{dateToString}}</text>
+				</view>
+				<view class="yunqi">
+					<text style="color: #666;  line-height: 50rpx; width: 100%; margin-right: 15rpx;">天干地支</text>
+					<view class="shu">
+						<text>{{tiangandizhi.hour}} - 时</text>
+						<text>{{tiangandizhi.day}} - 日</text>
+						<text>{{tiangandizhi.month}} - 月</text>
+						<text>{{tiangandizhi.year}} - 年</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 主体 -->
+		<view class="centerBox">
+			↓ 12时辰对应穴位图表 左滑查看全部
+		</view>
+		<view class="centerBox" style="text-align: right; padding-top: 0; font-size: 24rpx;">
+			注：表中带* 者是原穴
+		</view>
+		<view class="container" style="display: flex;">
+			<view class="d-table" style="width:15%;position: relative; z-index: 1;">
+				<view class="leftBar">
+					<!-- <view :class="i === 1 ? 'd-th' : 'd-td'">张三</view> -->
+					<table border cellspacing="0" style="width:100%; background-color:#fbd5ca;">
+						<tr>
+							<td class="oneHeight"></td>
+						</tr>
+						<tr>
+							<td class="" style="height: 100rpx;"></td>
+						</tr>
+						<tr :class="curIndex == 2 ? 'cur' :''">
+							<td class="shuHeight1">23~01</td>
+						</tr>
+						<tr :class="curIndex == 3 ? 'cur' :''">
+							<td class="shuHeight1">01~03</td>
+						</tr>
+						<tr :class="curIndex == 4 ? 'cur' :''">
+							<td class="shuHeight1">03~05</td>
+						</tr>
+						<tr :class="curIndex == 5 ? 'cur' :''">
+							<td class="shuHeight1">05~07</td>
+						</tr>
+						<tr :class="curIndex == 6 ? 'cur' :''">
+							<td class="shuHeight1">07~09</td>
+						</tr>
+						<tr :class="curIndex == 7 ? 'cur' :''">
+							<td class="shuHeight1">09~11</td>
+						</tr>
+						<tr :class="curIndex == 8 ? 'cur' :''">
+							<td class="shuHeight1">11~13</td>
+						</tr>
+						<tr :class="curIndex == 9 ? 'cur' :''">
+							<td class="shuHeight1">13~15</td>
+						</tr>
+						<tr :class="curIndex == 10 ? 'cur' :''">
+							<td class="shuHeight1">15~17</td>
+						</tr>
+						<tr :class="curIndex == 11 ? 'cur' :''">
+							<td class="shuHeight1">17~19</td>
+						</tr>
+						<tr :class="curIndex == 12 ? 'cur' :''">
+							<td class="shuHeight1">19~21</td>
+						</tr>
+						<tr :class="curIndex == 13 ? 'cur' :''">
+							<td class="shuHeight1">21~23</td>
+						</tr>
+					</table>
+				</view>
+			</view>
+			<scroll-view scroll-x class="border-right" style="width: 85%;">
+				<view class="d-table scroll-x">
+					<table border style="width: 600px; background-color: antiquewhite;" cellspacing="0">
+						<tr class="tableTh">
+							<!-- <td colspan="1" class=""></td> -->
+							<td class="oneHeight" colspan="2">灵龟八法</td>
+							<td class="oneHeight" colspan="2">飞腾八法</td>
+							<td class="oneHeight" colspan="5">子午流注</td>
+						</tr>
+						<tr class="tableTh">
+							<!-- <td colspan="1" rowspan="2" class=""></td> -->
+							<td class="" rowspan="2" style="height: 100rpx;">开穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">合穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">开穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">合穴</td>
+							<td class="" rowspan="2" style="height: 100rpx;">子午纳干</td>
+							<td colspan="4">子午纳子</td>
+						</tr>
+						<!-- </td>
+						</tr> -->
+						<tr class="tableTh">
+							<td class="">补法</td>
+							<td class="">泄法</td>
+							<td class="">过时泄本</td>
+							<td class="">过时补原</td>
+						</tr>
+						<tr v-for="(item,index) in quxue" :key="index" :class="item.now ? 'cur' : ''">
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.lgbf.KX)}">{{item.lgbf.KX}}</text></td>
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.lgbf.HX)}">{{item.lgbf.HX}}</text></td>
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.ftbf.KX)}">{{item.ftbf.KX}}</text></td>
+							<td class="shuHeight "><text class="verticalRl"
+									:style="{color: getHightLightColor(item.ftbf.HX)}">{{item.ftbf.HX}}</text></td>
+							<td class="shuHeight ">
+								<view class="flexbox" v-if="item.zwlz.ngf.length > 0"
+									style="justify-content: space-evenly;align-items: center; align-content: center;">
+									<text class="verticalRl" :style="{color: getHightLightColor(item1)}"
+										v-for="(item1,index1) in item.zwlz.ngf" :key="index1">{{item1}}</text>
+
+								</view>
+							</td>
+
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.bf)}">{{item.zwlz.nzf.bf}}</text>
+							</td>
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.xf)}">{{item.zwlz.nzf.xf}}</text>
+							</td>
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.gsxb)}">{{item.zwlz.nzf.gsxb}}</text>
+							</td>
+							<td class="shuHeight">
+								<text class="verticalRl"
+									:style="{color: getHightLightColor(item.zwlz.nzf.gsbf)}">{{item.zwlz.nzf.gsbf}}</text>
+							</td>
+						</tr>
+
+					</table>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="centerBox">
+			注：表中带* 者是原穴
+		</view>
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+
+	function formatDateTime(time) {
+		var date = new Date(time);
+		var y = date.getFullYear();
+		var m = date.getMonth() + 1;
+		m = m < 10 ? ('0' + m) : m;
+		var d = date.getDate();
+		d = d < 10 ? ('0' + d) : d;
+		var h = date.getHours();
+		h = h < 10 ? ('0' + h) : h;
+		var minute = date.getMinutes();
+		var second = date.getSeconds();
+		minute = minute < 10 ? ('0' + minute) : minute;
+		second = second < 10 ? ('0' + second) : second;
+
+		return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+	};
+
+	export default {
+		data() {
+			return {
+				playData: {},
+				curIndex: null,
+				pageWidth: uni.getSystemInfoSync().windowWidth,
+				pageHeight: uni.getSystemInfoSync().windowHeight - 200,
+				fiveYunNum: 5,
+				// date: new Date().toISOString().slice(0, 10),      // 只返回年月日
+				date: new Date().getTime(), // 返回年月日带时间
+				dateToString: formatDateTime(new Date()), // 字符串格式的日期
+				timestamp: Date.now() - 2 * 24 * 3600 * 1000, // 时间戳				
+				showCalendar: false,
+				quxue: [], // 时辰取穴
+				tiangandizhi: {},
+				yuanXue: [
+					'腕骨', '丘墟', '丘墟', '太溪', '大陵', '京骨', '阳池', '太渊', '合谷', '太白', '冲阳', '神门'
+				],
+			}
+		},
+		onLoad() {
+			let da = new Date().toISOString().slice(0, 10)
+			this.timestamp = new Date(da).getTime()
+			console.log('初始时间', this.dateToString, this.date)
+			this.getXueWei(this.dateToString)
+			this.getTGDZ(this.dateToString)
+		},
+
+		onHide() {
+
+		},
+		methods: {
+			scroll: function(e) {},
+			// 设置文字颜色
+			getHightLightColor(text) {
+				if (text.indexOf('*') != -1) {
+					return "#9c3211"
+				}
+			},
+			// 获取天干地支
+			getTGDZ(date) {
+				let that = this
+				$http.request({
+						url: "book/point/TGDZForYear",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							console.log('天干地支', res.tgdz)
+							this.tiangandizhi = res.tgdz
+						}
+
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			},
+			// 获取时辰取穴
+			getXueWei(date) {
+				let that = this
+				$http.request({
+						url: "book/point/SCQX",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0 && res.flag.length > 0) {
+							console.log('时辰取穴', res.flag)
+							this.quxue = res.flag
+							this.curIndex = res.flag.findIndex(function(item) {
+								return item.now == true
+							})
+							this.curIndex = this.curIndex + 2
+							console.log(this.curIndex, 'this.curIndex')
+						}
+
+					}).catch(e => {
+						this.curIndex = null
+						console.log(e, 'e')
+					});
+			},
+			// checkAdult(item) {
+			// 	return item.now == true
+			// },
+			changeLog(e) {
+				console.log('change事件:', e);
+				let ss = e.slice(0, 10)
+				this.timestamp = new Date(ss).getTime()
+				this.dateToString = e
+				this.getXueWei(e)
+				this.getTGDZ(e)
+			},
+		},
+
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import './scss/common.scss';
+
+	.leftBar {
+		td {
+			font-weight: bold;
+			color: #a84a2d;
+		}
+	}
+
+	tr.cur {
+		background-color: #e7a896;
+		color: #fff;
+
+		td {
+			color: #fff;
+		}
+	}
+
+	.tableTh {
+		background-color: #fbd5ca;
+		font-weight: bold;
+		color: #a84a2d;
+	}
+
+	.shuHeight {
+		height: 100rpx;
+	}
+
+	.shuHeight1 {
+		height: 100rpx;
+	}
+
+	.verticalRl {
+		writing-mode: vertical-rl;
+	}
+
+	.oneHeight {
+		height: 50rpx;
+	}
+
+	.twoHeight {
+		height: 94rpx;
+	}
+
+	table {
+		border-collapse: collapse;
+		font-size: 28rpx;
+	}
+
+	table td {
+		border-bottom: 1px solid #a84a2d;
+		border-right: 1px solid #a84a2d;
+	}
+
+	table tr:first-child td {
+		border-top: 1px solid #a84a2d;
+	}
+
+	table tr td:first-child {
+		border-left: 1px solid #a84a2d;
+	}
+
+	td {
+		padding: 8rpx 10rpx;
+	}
+
+	.oneWidth {
+		width: 124rpx;
+	}
+
+	/deep/ .uni-table-th {
+		padding: 14rpx 20rpx
+	}
+
+	* {
+		font-size: 28rpx;
+	}
+
+	.centerBox {
+		text-align: center;
+		padding: 20px;
+		color: #666;
+	}
+
+	.yinli {
+		line-height: 50rpx;
+
+		text {
+			writing-mode: vertical-rl;
+			letter-spacing: 20rpx;
+			color: #c06346;
+		}
+	}
+
+	.box1 {
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		justify-content: space-between; align-items: center;
+
+		.yunqi {
+			color: #c06346;
+			text-align: right;
+
+			.shu {
+				text {
+					writing-mode: vertical-rl;
+					line-height: 60rpx;
+					font-size: 30rpx;
+				}
+			}
+		}
+	}
+
+	.grayBg {
+		background-color: #eee;
+	}
+
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+
+		.leftone {
+
+			border-left: 1px solid #ddd;
+		}
+
+		.row {
+			display: inline-block;
+			text-align: center;
+			background-color: #fef9e4;
+			border-right: 1px solid #ddd;
+			border-bottom: 1px solid #ddd;
+		}
+
+		.row.cur {
+			background-color: #8d3d16;
+			color: #fff;
+			position: relative;
+			border-right: 0;
+			z-index: 5;
+			box-shadow: 0 0 10px #8d3d16;
+		}
+
+		.line {
+			padding: 20rpx;
+			border-top: 1px solid #ddd;
+
+			span {
+				font-size: 36rpx;
+			}
+		}
+
+		.line1 {
+			font-size: 24rpx;
+			height: 200rpx;
+			writing-mode: vertical-rl;
+			;
+		}
+
+		.zhuyun {
+			color: #8d3d16;
+			background-color: #faede7;
+			font-size: 30rpx;
+		}
+
+		.keyun {
+			color: #c06346;
+			background-color: #fceeed;
+			font-size: 30rpx;
+		}
+	}
+
+	.container88 {
+		padding: 10rpx;
+
+		background-color: #fff;
+		padding-bottom: 70rpx;
+	}
+
+	.datetimeBox {
+		width: 80%;
+		margin: 0 auto;
+		margin-bottom: 30rpx;
+	}
+
+	.liuqiBox {
+		.line.keyun {
+			padding: 60rpx 10rpx
+		}
+	}
+
+	.wuYunBox {
+		.row {
+			width: 20%;
+			box-sizing: border-box;
+		}
+	}
+
+	/deep/ .uni-calendar__content-mobile {
+		bottom: 100rpx !important;
+	}
+
+	.sizai {
+		.keyun {
+			position: relative;
+		}
+
+		.keyun::after {
+			position: absolute;
+			content: '';
+			top: 24rpx;
+			left: 0;
+			font-size: 24rpx;
+			display: block;
+			width: 100%;
+			color: #888;
+			text-align: center;
+		}
+
+	}
+
+	.sizai1 {
+		.keyun::after {
+			content: '（司天）';
+		}
+	}
+
+	.sizai2 {
+		.keyun::after {
+			content: '（在泉）';
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+</style>
--- a/pages/timeAcupoint/timeAcupoint.vue
+++ b/pages/timeAcupoint/timeAcupoint.vue
@@ -0,0 +1,545 @@
+<template>
+	<view class="container88">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="时辰取穴"></z-nav-bar>
+		<view>
+			<!-- <uni-section :title="'date 对象用法：' + datetimesingle" type="line"></uni-section> -->
+			<!-- <view class="datetimeBox">
+				<uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" />
+			</view> -->
+			<view class="box1 ">
+				<view class="" style="text-align: center; margin-top: 50rpx; align-items: center; margin-bottom: 30rpx;">
+					<!-- <text style="color: #666;  line-height: 60rpx;">所查询时间：</text><br /> -->
+					<view class="" style="margin-bottom: 10rpx; ">
+						<text style="color: #a84a2d; font-size: 50rpx; white-space:nowrap; font-weight: bold;">{{dateToString}}</text>
+					</view>
+					<view class="">
+						<uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" />
+					</view>
+					
+					<!-- <uni-datetime-picker style="color: #666; " v-model="single"
+						>切换时间</uni-datetime-picker> -->
+					<!-- <uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" /> -->
+				</view>
+				<view class="yunqi">
+					<!-- <text style="color: #666;  line-height: 50rpx; width: 100%; margin-right: 15rpx;">天干地支</text> -->
+					<view class="shu">
+						<text>{{tiangandizhi.hour}} - 时</text>
+						<text>{{tiangandizhi.day}} - 日</text>
+						<text>{{tiangandizhi.month}} - 月</text>
+						<text>{{tiangandizhi.year}} - 年</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 当天 -->
+		<view class="curBox flexbox" style="justify-content: space-between;" v-if="showDetail">
+			<table border style=" text-align: center;;background-color: antiquewhite;" cellspacing="0">
+				<tr class="">
+					<!-- <td colspan="1" class=""></td> -->
+					<td class="" rowspan="2">灵龟八法</td>
+					<td class="">开穴</td>
+					<td class="curText" style="width: 130rpx"><text class="verticalRl" style="writing-mode: vertical-rl;">{{quxue[curIndex-2].lgbf.KX}}</text></td>
+				</tr>
+				<tr class="">
+					<td class="">合穴</td>
+					<td class="curText" v-if="quxue[curIndex-2].lgbf.HX != ''"><text class="verticalRl">{{quxue[curIndex-2].lgbf.HX}}</text></td>
+					<td class="curText" v-else> / </td>
+				</tr>
+			</table>
+			<table border style="text-align: center; margin-left: 10rpx;background-color: antiquewhite;"
+				cellspacing="0">
+				<tr class="">
+					<!-- <td colspan="1" class=""></td> -->
+					<td class="" rowspan="2">飞腾八法</td>
+					<td class="">开穴</td>
+					<td class="curText" style="width: 130rpx"><text class="">{{quxue[curIndex-2].ftbf.KX}}</text></td>
+				</tr>
+				<tr class="">
+					<td class="">合穴</td>
+					<td class="curText" v-if="quxue[curIndex-2].ftbf.HX != ''"><text class="">{{quxue[curIndex-2].ftbf.HX}}</text></td>
+					<td class="curText" v-else> / </td>
+				</tr>
+			</table>
+		</view>		
+		<view class="curBox" style="margin-top: 10rpx;" v-if="showDetail">
+			<table border style=" width: 100%; text-align: center;background-color: antiquewhite;" cellspacing="0">
+				<tr class="">
+					<!-- <td colspan="1" class=""></td> -->
+					<td class="" rowspan="5">子午流注</td>
+					<td class="shuHeight" colspan="2" rowspan="1">子午纳干</td>
+					<td class="curText" style=" border: none; text-align: center; vertical-align: middle;" v-if="quxue[curIndex-2].zwlz.ngf.length > 0">
+						<text class="" style="display: inline-block; height: 100%;" v-for="(item, index) in quxue[curIndex-2].zwlz.ngf"
+							:style="{color: getHightLightColor(item)}">{{item}}</text>
+					</td>
+					<td class="curText" v-else> / </td>
+				</tr>
+				<tr class="">
+					<td class="" rowspan="4">子午纳子</td>
+					<td class="">补法</td>
+					<td class="curText" style="width: 200rpx;" v-if="quxue[curIndex-2].zwlz.nzf.bf != ''">
+						<text class="verticalRl"
+							:style="{color: getHightLightColor(quxue[curIndex-2].zwlz.nzf.bf)}">{{quxue[curIndex-2].zwlz.nzf.bf}}</text>
+					</td>
+					<td class="curText" v-else> / </td>
+					<!-- <td class="" v-if="quxue[curIndex-2].ftbf.HX != ''">{{quxue[curIndex-2].ftbf.HX}}</td>
+					<td class="" v-else> / </td> -->
+				</tr>
+
+				<tr class="">
+					<td class="">泄法</td>
+					<td class="curText" style="width: 200rpx;" v-if="quxue[curIndex-2].zwlz.nzf.xf != ''">
+						<text class="verticalRl"
+							:style="{color: getHightLightColor(quxue[curIndex-2].zwlz.nzf.xf)}">{{quxue[curIndex-2].zwlz.nzf.xf}}</text>
+					</td>
+					<td class="curText" v-else> / </td>
+				</tr>
+				<tr class="">
+					<td class="">过时泄本</td>
+					<td class="curText" style="width: 200rpx;" v-if="quxue[curIndex-2].zwlz.nzf.gsxb != ''">
+						<text class="verticalRl"
+							:style="{color: getHightLightColor(quxue[curIndex-2].zwlz.nzf.gsxb)}">{{quxue[curIndex-2].zwlz.nzf.gsxb}}</text>
+					</td>
+					<td class="curText" v-else> / </td>
+				</tr>
+				<tr class="">
+					<td class="">过时补原</td>
+					<td class="curText" style="width: 200rpx;" v-if="quxue[curIndex-2].zwlz.nzf.gsbf != ''">
+						<text class="verticalRl"
+							:style="{color: getHightLightColor(quxue[curIndex-2].zwlz.nzf.gsbf)}">{{quxue[curIndex-2].zwlz.nzf.gsbf}}</text>
+					</td>
+					<td class="curText" v-else> / </td>
+				</tr>
+			</table>
+		</view>
+		<view class="centerBox" style="text-align: right; padding-top:10rpx; font-size: 24rpx;">
+			注：表中带* 者是原穴
+		</view>
+		<!-- end -->
+		<view class="showBtn">
+			<text @click="showTotalFun" v-if="!showTotal">《 查看全部时辰对应穴位 》</text>
+			<!-- <text @click="showTotalFun" v-else>《 收起全部时辰 》</text> -->
+		</view>		
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+
+	function formatDateTime(time) {
+		var date = new Date(time);
+		var y = date.getFullYear();
+		var m = date.getMonth() + 1;
+		m = m < 10 ? ('0' + m) : m;
+		var d = date.getDate();
+		d = d < 10 ? ('0' + d) : d;
+		var h = date.getHours();
+		h = h < 10 ? ('0' + h) : h;
+		var minute = date.getMinutes();
+		var second = date.getSeconds();
+		minute = minute < 10 ? ('0' + minute) : minute;
+		second = second < 10 ? ('0' + second) : second;
+
+		return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+	};
+
+	export default {
+		data() {
+			return {
+				showDetail: true,
+				showTotal: false,
+				single: '',
+				playData: {},
+				curIndex: null,
+				pageWidth: uni.getSystemInfoSync().windowWidth,
+				pageHeight: uni.getSystemInfoSync().windowHeight - 200,
+				fiveYunNum: 5,
+				// date: new Date().toISOString().slice(0, 10),      // 只返回年月日
+				date: new Date().getTime(), // 返回年月日带时间
+				dateToString: formatDateTime(new Date()), // 字符串格式的日期
+				timestamp: Date.now() - 2 * 24 * 3600 * 1000, // 时间戳				
+				showCalendar: false,
+				quxue: [], // 时辰取穴
+				tiangandizhi: {},
+				yuanXue: [
+					'腕骨', '丘墟', '丘墟', '太溪', '大陵', '京骨', '阳池', '太渊', '合谷', '太白', '冲阳', '神门'
+				],
+			}
+		},
+		onLoad() {			
+			let da = new Date().toISOString().slice(0, 10)
+			this.timestamp = new Date(da).getTime()
+			console.log('初始时间', this.dateToString, this.date)
+			this.getXueWei(this.dateToString)
+			this.getTGDZ(this.dateToString)
+			// console.log('全局hours',this.$getHours.hourNumber)
+		},
+
+		onHide() {
+
+		},
+		methods: {
+			scroll: function(e) {},
+			showTotalFun() {
+				uni.navigateTo({
+					url: "./totalTable"
+				})
+				// this.showTotal = !this.showTotal
+			},
+			// 设置文字颜色
+			getHightLightColor(text) {
+				if (text.indexOf('*') != -1) {
+					return "#9c3211"
+				}
+			},
+			// 获取天干地支
+			getTGDZ(date) {
+				let that = this
+				$http.request({
+						url: "book/point/TGDZForYear",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							console.log('天干地支', res.tgdz)
+							this.tiangandizhi = res.tgdz
+						}
+
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			},
+			// 获取时辰取穴
+			getXueWei(date) {
+				this.showDetail = false
+				let that = this
+				$http.request({
+						url: "book/point/SCQX",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0 && res.flag.length > 0) {
+							console.log('时辰取穴', res.flag)
+							this.quxue = res.flag
+							this.curIndex = res.flag.findIndex(function(item) {
+								return item.now == true
+							})
+							this.curIndex = this.curIndex + 2
+							console.log(this.curIndex, 'this.curIndex')
+							this.showDetail = true
+						}
+
+					}).catch(e => {
+						this.curIndex = null
+						console.log(e, 'e')
+					});
+			},
+			// checkAdult(item) {
+			// 	return item.now == true
+			// },
+			changeLog(e) {
+				console.log('change事件:', e);
+				let ss = e.slice(0, 10)
+				this.timestamp = new Date(ss).getTime()
+				this.dateToString = e
+				this.getXueWei(e)
+				this.getTGDZ(e)
+			},
+		},
+
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import './scss/common.scss';
+
+	/deep/ .uni-date-editor { position: relative;
+		display: block; width:200rpx; height:34rpx;
+		background-image: url('@/static/icon/change.png');
+		background-size: contain; margin: 0 auto;
+		background-repeat: no-repeat;
+		padding-left: 50rpx;
+		background-position: left top;
+		.uni-date-editor--x{display: none;}
+	}
+	/deep/ .uni-date-editor::after{content: '切换时间'; font-size: 30rpx; position: absolute; top: -2px; left: 40rpx; top: 0; display: block;}
+
+	.showBtn {
+		text-align: center;
+
+		text {
+			color: #a84a2d;
+		}
+	}
+
+	.textBlock {
+		display: block
+	}
+
+	.curText { height: 90rpx;
+		background-color: #fbd5ca;
+		text{
+			writing-mode: vertical-rl !important;
+		}
+		
+	}
+
+	.leftBar {
+		td {
+			font-weight: bold;
+			color: #a84a2d;
+		}
+	}
+
+	tr.cur {
+		background-color: #e7a896;
+		color: #fff;
+
+		td {
+			color: #fff;
+		}
+	}
+
+	.tableTh {
+		background-color: #fbd5ca;
+		font-weight: bold;
+		color: #a84a2d;
+	}
+
+	.shuHeight {
+		height: 100rpx;
+	}
+
+	.shuHeight1 {
+		height: 100rpx;
+	}
+
+	.verticalRl {
+		writing-mode: vertical-rl;
+	}
+
+	.oneHeight {
+		height: 50rpx;
+	}
+
+	.twoHeight {
+		height: 94rpx;
+	}
+
+	table {
+		border-collapse: collapse;
+		font-size: 28rpx;
+	}
+
+	table td {
+		border-bottom: 1px solid #a84a2d;
+		border-right: 1px solid #a84a2d;
+	}
+
+	table tr:first-child td {
+		border-top: 1px solid #a84a2d;
+	}
+
+	table tr td:first-child {
+		border-left: 1px solid #a84a2d;
+	}
+
+	td {
+		padding: 8rpx 10rpx;
+	}
+
+	.oneWidth {
+		width: 124rpx;
+	}
+
+	/deep/ .uni-table-th {
+		padding: 14rpx 20rpx
+	}
+
+	* {
+		font-size: 28rpx;
+	}
+
+	.centerBox {
+		text-align: center;
+		padding: 20px;
+		color: #666;
+	}
+
+	.yinli {
+		line-height: 50rpx;
+
+		text {
+			writing-mode: vertical-rl;
+			letter-spacing: 20rpx;
+			color: #c06346;
+		}
+	}
+
+	.box1 {
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		justify-content: space-between;
+		align-items: center;
+
+		.yunqi {
+			color: #c06346;
+			text-align: center;
+			margin-top: 20rpx;
+
+			.shu {
+				display: inline-block;
+				padding: 20rpx;
+
+				text {
+					writing-mode: vertical-rl;
+					line-height: 80rpx;
+					font-size:34rpx;
+				}
+			}
+		}
+	}
+
+	.grayBg {
+		background-color: #eee;
+	}
+
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+
+		.leftone {
+
+			border-left: 1px solid #ddd;
+		}
+
+		.row {
+			display: inline-block;
+			text-align: center;
+			background-color: #fef9e4;
+			border-right: 1px solid #ddd;
+			border-bottom: 1px solid #ddd;
+		}
+
+		.row.cur {
+			background-color: #8d3d16;
+			color: #fff;
+			position: relative;
+			border-right: 0;
+			z-index: 5;
+			box-shadow: 0 0 10px #8d3d16;
+		}
+
+		.line {
+			padding: 20rpx;
+			border-top: 1px solid #ddd;
+
+			span {
+				font-size: 36rpx;
+			}
+		}
+
+		.line1 {
+			font-size: 24rpx;
+			height: 200rpx;
+			writing-mode: vertical-rl;
+			;
+		}
+
+		.zhuyun {
+			color: #8d3d16;
+			background-color: #faede7;
+			font-size: 30rpx;
+		}
+
+		.keyun {
+			color: #c06346;
+			background-color: #fceeed;
+			font-size: 30rpx;
+		}
+	}
+
+	.container88 {
+		padding: 10rpx;
+
+		background-color: #fff;
+		padding-bottom: 70rpx;
+	}
+
+	.datetimeBox {
+		width: 80%;
+		margin: 0 auto;
+		margin-bottom: 30rpx;
+	}
+
+	.liuqiBox {
+		.line.keyun {
+			padding: 60rpx 10rpx
+		}
+	}
+
+	.wuYunBox {
+		.row {
+			width: 20%;
+			box-sizing: border-box;
+		}
+	}
+
+	/deep/ .uni-calendar__content-mobile {
+		bottom: 100rpx !important;
+	}
+
+	.sizai {
+		.keyun {
+			position: relative;
+		}
+
+		.keyun::after {
+			position: absolute;
+			content: '';
+			top: 24rpx;
+			left: 0;
+			font-size: 24rpx;
+			display: block;
+			width: 100%;
+			color: #888;
+			text-align: center;
+		}
+
+	}
+
+	.sizai1 {
+		.keyun::after {
+			content: '（司天）';
+		}
+	}
+
+	.sizai2 {
+		.keyun::after {
+			content: '（在泉）';
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+</style>
--- a/pages/timeAcupoint/totalTable.vue
+++ b/pages/timeAcupoint/totalTable.vue
@@ -0,0 +1,583 @@
+<template>
+	<view class="container88">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<!-- <view class="whiteBg"> -->
+		<z-nav-bar title="" ></z-nav-bar>	
+		<!-- </view> -->
+	    <!-- <view class="whiteBg"></view> -->
+	<view>		
+		<view class="box1 ">
+			<view class="" style="text-align: center; margin-top: 20rpx; align-items: center; margin-bottom: 10rpx;">
+				<!-- <text style="color: #666;  line-height: 60rpx;">所查询时间：</text><br /> -->
+				<view class="" style="margin-bottom: 10rpx; ">
+					<text style="color: #a84a2d; font-size: 50rpx; white-space:nowrap; font-weight: bold;">{{dateToString}}</text>
+				</view>
+				
+				<view class="">
+					<uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" />
+				</view>
+				<!-- <uni-datetime-picker type="datetime" v-model="date" @change="changeLog" :clear-icon="false" /> -->
+			</view>			
+		</view>
+	</view>
+		
+		<view class="hole">
+			<!-- 全部表格 -->
+			<view class="centerBox" style="padding-top: 10rpx;">
+				↓ 12时辰对应穴位图表
+			</view>
+
+			<view class="container" style="display: flex;">
+				<view class="d-table" style="width:15%;position: relative; z-index: 1;">
+					<view class="leftBar">
+						<!-- <view :class="i === 1 ? 'd-th' : 'd-td'">张三</view> -->
+						<table border cellspacing="0" style="width:100%; background-color:antiquewhite;">
+							<tr>
+								<td class="shuHeight1"></td>
+							</tr>
+							<tr>
+								<td  style="height: 150rpx;"></td>
+							</tr>
+							<tr :class="curIndex == 2 ? 'cur' :''">
+								<td class="shuHeight1">23~01</td>
+							</tr>
+							<tr :class="curIndex == 3 ? 'cur' :''">
+								<td class="shuHeight1">01~03</td>
+							</tr>
+							<tr :class="curIndex == 4 ? 'cur' :''">
+								<td class="shuHeight1">03~05</td>
+							</tr>
+							<tr :class="curIndex == 5 ? 'cur' :''">
+								<td class="shuHeight1">05~07</td>
+							</tr>
+							<tr :class="curIndex == 6 ? 'cur' :''">
+								<td class="shuHeight1">07~09</td>
+							</tr>
+							<tr :class="curIndex == 7 ? 'cur' :''">
+								<td class="shuHeight1">09~11</td>
+							</tr>
+							<tr :class="curIndex == 8 ? 'cur' :''">
+								<td class="shuHeight1">11~13</td>
+							</tr>
+							<tr :class="curIndex == 9 ? 'cur' :''">
+								<td class="shuHeight1">13~15</td>
+							</tr>
+							<tr :class="curIndex == 10 ? 'cur' :''">
+								<td class="shuHeight1">15~17</td>
+							</tr>
+							<tr :class="curIndex == 11 ? 'cur' :''">
+								<td class="shuHeight1">17~19</td>
+							</tr>
+							<tr :class="curIndex == 12 ? 'cur' :''">
+								<td class="shuHeight1">19~21</td>
+							</tr>
+							<tr :class="curIndex == 13 ? 'cur' :''">
+								<td class="shuHeight1">21~23</td>
+							</tr>
+						</table>
+					</view>
+				</view>
+				<scroll-view scroll-x class="border-right" style="width: 85%;">
+					<view class="d-table scroll-x">
+						<table border style="width: 84vw; background-color:#fbd5ca;" cellspacing="0">
+							<tr class="tableTh">
+								<!-- <td colspan="1" class=""></td> -->
+								<td class="shuHeight" colspan="2">灵龟八法</td>
+								<td class="shuHeight" colspan="2">飞腾八法</td>
+								<td class="shuHeight" colspan="5">子午流注</td>
+							</tr>
+							<tr class="tableTh">
+								<!-- <td colspan="1" rowspan="2" class=""></td> -->
+								<td class="" rowspan="2" style="height: 150rpx;">开穴</td>
+								<td class="" rowspan="2" style="height: 150rpx;">合穴</td>
+								<td class="" rowspan="2" style="height: 150rpx;">开穴</td>
+								<td class="" rowspan="2" style="height: 150rpx;">合穴</td>
+								<td class="" rowspan="2" style="height: 150rpx;">子午纳干</td>
+								<td colspan="4">子午纳子</td>
+							</tr>
+							<!-- </td>
+						</tr> -->
+							<tr class="tableTh">
+								<td class="">补法</td>
+								<td class="">泄法</td>
+								<td class="">过时泄本</td>
+								<td class="">过时补原</td>
+							</tr>
+							<tr v-for="(item,index) in quxue" :key="index" :class="item.now ? 'cur' : ''">
+								<td class="shuHeight "><text class="verticalRl"
+										:style="{color: getHightLightColor(item.lgbf.KX)}">{{item.lgbf.KX}}</text></td>
+								<td class="shuHeight "><text class="verticalRl"
+										:style="{color: getHightLightColor(item.lgbf.HX)}">{{item.lgbf.HX}}</text></td>
+								<td class="shuHeight "><text class="verticalRl"
+										:style="{color: getHightLightColor(item.ftbf.KX)}">{{item.ftbf.KX}}</text></td>
+								<td class="shuHeight "><text class="verticalRl"
+										:style="{color: getHightLightColor(item.ftbf.HX)}">{{item.ftbf.HX}}</text></td>
+								<td class="shuHeight ">
+									<view class="flexbox" v-if="item.zwlz.ngf.length > 0"
+										style="justify-content: space-evenly;align-items: center; align-content: center;">
+										<text class="verticalRl" :style="{color: getHightLightColor(item1)}"
+											v-for="(item1,index1) in item.zwlz.ngf" :key="index1">{{item1}}</text>
+
+									</view>
+								</td>
+
+								<td class="shuHeight">
+									<text class="verticalRl"
+										:style="{color: getHightLightColor(item.zwlz.nzf.bf)}">{{item.zwlz.nzf.bf}}</text>
+								</td>
+								<td class="shuHeight">
+									<text class="verticalRl"
+										:style="{color: getHightLightColor(item.zwlz.nzf.xf)}">{{item.zwlz.nzf.xf}}</text>
+								</td>
+								<td class="shuHeight">
+									<text class="verticalRl"
+										:style="{color: getHightLightColor(item.zwlz.nzf.gsxb)}">{{item.zwlz.nzf.gsxb}}</text>
+								</td>
+								<td class="shuHeight">
+									<text class="verticalRl"
+										:style="{color: getHightLightColor(item.zwlz.nzf.gsbf)}">{{item.zwlz.nzf.gsbf}}</text>
+								</td>
+							</tr>
+
+						</table>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="centerBox" style="text-align: right; padding-top:10rpx; font-size: 24rpx;">
+				注：表中带* 者是原穴
+			</view>
+		</view>
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+
+	function formatDateTime(time) {
+		var date = new Date(time);
+		var y = date.getFullYear();
+		var m = date.getMonth() + 1;
+		m = m < 10 ? ('0' + m) : m;
+		var d = date.getDate();
+		d = d < 10 ? ('0' + d) : d;
+		var h = date.getHours();
+		h = h < 10 ? ('0' + h) : h;
+		var minute = date.getMinutes();
+		var second = date.getSeconds();
+		minute = minute < 10 ? ('0' + minute) : minute;
+		second = second < 10 ? ('0' + second) : second;
+
+		return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+	};
+
+	export default {
+		data() {
+			return {
+				showTotal: false,
+				single: '',
+				playData: {},
+				curIndex: null,
+				pageWidth: uni.getSystemInfoSync().windowWidth,
+				pageHeight: uni.getSystemInfoSync().windowHeight - 200,
+				fiveYunNum: 5,
+				// date: new Date().toISOString().slice(0, 10),      // 只返回年月日
+				date: new Date().getTime(), // 返回年月日带时间
+				dateToString: formatDateTime(new Date()), // 字符串格式的日期
+				timestamp: Date.now() - 2 * 24 * 3600 * 1000, // 时间戳				
+				showCalendar: false,
+				quxue: [], // 时辰取穴
+				tiangandizhi: {},
+				yuanXue: [
+					'腕骨', '丘墟', '丘墟', '太溪', '大陵', '京骨', '阳池', '太渊', '合谷', '太白', '冲阳', '神门'
+				],
+			}
+		},
+		onLoad() {
+			// 页面自动横屏
+			// #ifdef APP-PLUS
+			// plus.screen.lockOrientation("landscape-primary");
+				// uni.showLoading({
+				// 		title: "加载中..."
+				// 	})
+			 //    setTimeout(() => {
+			 //        plus.screen.unlockOrientation();
+			 //        plus.screen.lockOrientation('landscape-primary');
+			 //        uni.hideLoading();
+			 //    }, 1200)
+			// #endif
+			
+			let da = new Date().toISOString().slice(0, 10)
+			this.timestamp = new Date(da).getTime()
+			console.log('初始时间', this.dateToString, this.date)
+			this.getXueWei(this.dateToString)
+			this.getTGDZ(this.dateToString)
+		},
+		onUnload() {
+			// 退出当前页面时 自动切换成竖屏
+			// #ifdef APP-PLUS
+			// plus.screen.lockOrientation("portrait-primary");
+			// #endif
+		  },
+		onHide() {
+
+		},
+		methods: {
+			scroll: function(e) {},
+			showTotalFun() {
+				this.showTotal = !this.showTotal
+			},
+			// 设置文字颜色
+			getHightLightColor(text) {
+				if (text.indexOf('*') != -1) {
+					return "#9c3211"
+				}
+			},
+			// 获取天干地支
+			getTGDZ(date) {
+				let that = this
+				$http.request({
+						url: "book/point/TGDZForYear",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							console.log('天干地支', res.tgdz)
+							this.tiangandizhi = res.tgdz
+						}
+
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			},
+			// 获取时辰取穴
+			getXueWei(date) {
+				let that = this
+				$http.request({
+						url: "book/point/SCQX",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"date": date
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0 && res.flag.length > 0) {
+							console.log('时辰取穴', res.flag)
+							this.quxue = res.flag
+							this.curIndex = res.flag.findIndex(function(item) {
+								return item.now == true
+							})
+							this.curIndex = this.curIndex + 2
+							console.log(this.curIndex, 'this.curIndex')
+						}
+
+					}).catch(e => {
+						this.curIndex = null
+						console.log(e, 'e')
+					});
+			},
+			// checkAdult(item) {
+			// 	return item.now == true
+			// },
+			changeLog(e) {
+				console.log('change事件:', e);
+				let ss = e.slice(0, 10)
+				this.timestamp = new Date(ss).getTime()
+				this.dateToString = e
+				this.getXueWei(e)
+				this.getTGDZ(e)
+			},
+		},
+
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import './scss/common.scss';
+	.whiteBg{background-color: #fff; overflow: hidden; position: fixed; top: 0; width: 100vw; z-index: 5;}
+	/deep/ .uni-date-editor { position: relative;
+		display: block; width:200rpx; height:34rpx;
+		background-image: url('@/static/icon/change.png');
+		background-size: contain; margin: 0 auto;
+		background-repeat: no-repeat;
+		padding-left: 50rpx;
+		background-position: left top;
+		.uni-date-editor--x{display: none;}
+	}
+	/deep/ .uni-date-editor::after{content: '切换时间'; font-size: 30rpx; position: absolute; top: -2px; left: 40rpx; top: 0; display: block;}
+	
+
+	.showBtn {
+		text-align: center;
+
+		text {
+			color: #a84a2d;
+		}
+	}
+
+	.textBlock {
+		display: block
+	}
+
+	.curText {
+		background-color: #fbd5ca;
+		writing-mode: vertical-rl;
+	}
+
+	.leftBar {
+		td {
+			font-weight: bold;
+			color: #a84a2d;
+		}
+	}
+
+	tr.cur {
+		background-color: #e7a896;
+		color: #fff;
+
+		td {
+			color: #fff;
+		}
+	}
+
+	.tableTh {
+		// background-color: #fbd5ca;
+		background-color: antiquewhite;
+		font-weight: bold;
+		color: #a84a2d;
+	}
+
+	.shuHeight {
+		height: 100rpx;
+	}
+
+	.shuHeight1 {
+		height: 100rpx;
+	}
+
+	.verticalRl {
+		writing-mode: vertical-rl;
+	}
+
+	.oneHeight {
+		height: 50rpx;
+	}
+
+	.twoHeight {
+		height: 94rpx;
+	}
+
+	table {
+		border-collapse: collapse;
+		font-size: 28rpx;
+	}
+
+	table td {
+		border-bottom: 1px solid #a84a2d;
+		border-right: 1px solid #a84a2d;
+	}
+
+	table tr:first-child td {
+		border-top: 1px solid #a84a2d;
+	}
+
+	table tr td:first-child {
+		border-left: 1px solid #a84a2d;
+	}
+
+	td {
+		padding: 8rpx 10rpx;
+	}
+
+	.oneWidth {
+		width: 124rpx;
+	}
+
+	/deep/ .uni-table-th {
+		padding: 14rpx 20rpx
+	}
+
+	* {
+		font-size: 28rpx;
+	}
+
+	.centerBox {
+		text-align: center;
+		padding: 20px;
+		color: #666;
+	}
+
+	.yinli {
+		line-height: 50rpx;
+
+		text {
+			writing-mode: vertical-rl;
+			letter-spacing: 20rpx;
+			color: #c06346;
+		}
+	}
+
+	.box1 {
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		justify-content: space-between;
+		align-items: center;
+
+		.yunqi {
+			color: #c06346;
+			text-align: center;
+			margin-top: 20rpx;
+
+			.shu {
+				display: inline-block;
+				padding: 20rpx;
+
+				text {
+					writing-mode: vertical-rl;
+					line-height: 80rpx;
+					font-size: 48rpx;
+				}
+			}
+		}
+	}
+
+	.grayBg {
+		background-color: #eee;
+	}
+
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+
+		.leftone {
+
+			border-left: 1px solid #ddd;
+		}
+
+		.row {
+			display: inline-block;
+			text-align: center;
+			background-color: #fef9e4;
+			border-right: 1px solid #ddd;
+			border-bottom: 1px solid #ddd;
+		}
+
+		.row.cur {
+			background-color: #8d3d16;
+			color: #fff;
+			position: relative;
+			border-right: 0;
+			z-index: 5;
+			box-shadow: 0 0 10px #8d3d16;
+		}
+
+		.line {
+			padding: 20rpx;
+			border-top: 1px solid #ddd;
+
+			span {
+				font-size: 36rpx;
+			}
+		}
+
+		.line1 {
+			font-size: 24rpx;
+			height: 200rpx;
+			writing-mode: vertical-rl;
+			;
+		}
+
+		.zhuyun {
+			color: #8d3d16;
+			background-color: #faede7;
+			font-size: 30rpx;
+		}
+
+		.keyun {
+			color: #c06346;
+			background-color: #fceeed;
+			font-size: 30rpx;
+		}
+	}
+
+	.container88 {
+		padding: 10rpx;
+
+		background-color: #fff;
+		padding-bottom: 70rpx;
+	}
+
+	.datetimeBox {
+		width: 80%;
+		margin: 0 auto;
+		margin-bottom: 30rpx;
+	}
+
+	.liuqiBox {
+		.line.keyun {
+			padding: 60rpx 10rpx
+		}
+	}
+
+	.wuYunBox {
+		.row {
+			width: 20%;
+			box-sizing: border-box;
+		}
+	}
+
+	/deep/ .uni-calendar__content-mobile {
+		bottom: 100rpx !important;
+	}
+
+	.sizai {
+		.keyun {
+			position: relative;
+		}
+
+		.keyun::after {
+			position: absolute;
+			content: '';
+			top: 24rpx;
+			left: 0;
+			font-size: 24rpx;
+			display: block;
+			width: 100%;
+			color: #888;
+			text-align: center;
+		}
+
+	}
+
+	.sizai1 {
+		.keyun::after {
+			content: '（司天）';
+		}
+	}
+
+	.sizai2 {
+		.keyun::after {
+			content: '（在泉）';
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+</style>
--- a/pages/user/addAddress.vue
+++ b/pages/user/addAddress.vue
@@ -176,7 +176,9 @@

 							for (let i = 0; i < this.addressList.length; i++) {
 								this.addressList[i].UName = this.addressList[i].provName
-								if (this.addressList[i].cityList == null) {
+								if (this.addressList[i].cityList == null) {   
+									// 如果没有cityList数据，就添加一项，用省份的信息
+									// console.log('存在单一',this.addressList[i].provId)
 									this.addressList[i].cityList = [{
 										"cityId": this.addressList[i].provId,
 										"provId": this.addressList[i].provId,
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -15,26 +15,31 @@
 				<!-- <view class="title" :class="{ active: type == 2000 }" @click="type = 2000">验证码登录/注册</view>
 				<view class="title" :class="{ active: type == 1000 }" @click="type = 1000">密码登录</view> -->
 			</view>
-			<view class="input_tit">手机号</view>
+			<view class="flexbox" style=" margin-top: 20rpx;">
+				<view class="input_tit" style="margin-top: 0; margin-right: 20rpx;">手机号</view>
+				<view class="quhao">
+					<uni-data-select class="myselect" placeholder="选择区号" v-model="quCode" :localdata="quCodeList" style="height: 30rpx !important;"
+						@change="quChange"></uni-data-select>
+				</view>
+			</view>
 			<!-- 带区号 -->
-			<!-- <view class="flexbox " style="margin:36rpx 0; justify-content: space-between;">
-				<view class="quhao">					
-					<uni-data-select 
-					      placeholder="区号" model="quCode"
-					      :localdata="quCodeList"
-					      @change="quChange"
-					    ></uni-data-select>
+			<view class="flexbox " style="margin:36rpx 0; justify-content: space-between;">
+				<view class="triangle borderBottom phoneNumberInput" style="width: 150rpx;">
+					<input type="number" v-model="quCode" placeholder="区号" placeholder-class="grey" />
+					
 				</view>
-				<view class="triangle borderBottom phoneNumberInput" :clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
-					<input type="number" v-model="phone" @input="onInput"  placeholder="请输入您的手机号" placeholder-class="grey" />
+				<view class="triangle borderBottom phoneNumberInput"
+					:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
+					<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号"
+						placeholder-class="grey" />
 				</view>
-			</view> -->
+			</view>

 			<!-- 不带区号 -->
-			<view class="triangle borderBottom phoneNumberInput input_box"
+			<!-- <view class="triangle borderBottom phoneNumberInput input_box"
 				:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
 				<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号" placeholder-class="grey" />
-			</view>
+			</view> -->

 			<view class="input_tit" v-if="type == 1000">密码</view>
 			<view class="input_box" v-if="type == 1000">
@@ -190,16 +195,8 @@
 					Content: ''
 				},
 				quShow: false,
-				quCodeList: [{
-						value: '1',
-						text: '江'
-					},
-					{
-						value: '2',
-						text: '湖'
-					}
-				],
-				quCode: null,
+				quCodeList: [], // 国家区域码
+				quCode: 86,

 			};
 		},
@@ -216,11 +213,43 @@
 			// #endif
 		},
 		//页面显示
-		onShow() {},
+		onShow() {
+			this.getCountyCode()
+		},
 		//方法
 		methods: {
 			...mapMutations(['setUserInfo']),
 			...mapMutations(['setHealthMes']),
+			// 获取国家区域编码
+			getCountyCode() {
+				$http.request({
+						url: "book/baseArea/getAllBaseArea",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						// console.log(res,'区域码')
+						if (res.code == 0 && res.baseAreas.length > 0) {
+							//	this.quCodeList = res.baseAreas
+							this.quCodeList = res.baseAreas.map(item => {
+								let obj = {
+									'text': item.title,
+									'value': item.code,
+								}
+								return obj
+							})
+							// console.log('改变格式后',this.quCodeList)						
+						} else {
+							this.quCodeList = []
+							// this.totalPage = 0
+						}
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			},
 			quChange(e) {
 				console.log(e, 'e')
 			},
@@ -294,12 +323,15 @@
 					});
 					return;
 				}
-				if (!this.$base.phoneRegular.test(this.phone)) {
-					uni.showToast({
-						title: '手机格式不正确',
-						icon: 'none'
-					});
-					return;
+				if (this.quCode == null || this.quCode == 86) { // 如果没选择国家code，默认是中国大陆
+					if (!this.$base.phoneRegular.test(this.phone)) {
+						uni.showToast({
+							title: '手机格式不正确',
+							icon: 'none'
+						});
+						return;
+					}
+					console.log(this.quCode, '选择的区段')
 				}
 				if (!this.agree) {
 					uni.showToast({
@@ -312,6 +344,7 @@
 				this.$http
 					.get('book/user/sms/sendcode', {
 						phone: this.phone,
+						areaCode: this.quCode,
 						type: 2000
 					})
 					.then(res => {
@@ -339,12 +372,14 @@
 					});
 					return;
 				}
-				if (!this.$base.phoneRegular.test(this.phone)) {
-					uni.showToast({
-						title: '手机格式不正确',
-						icon: 'none'
-					});
-					return;
+				if (this.quCode == null || this.quCode == 86) {
+					if (!this.$base.phoneRegular.test(this.phone)) {
+						uni.showToast({
+							title: '手机格式不正确',
+							icon: 'none'
+						});
+						return;
+					}
 				}
 				let httpData = {};
 				if (this.type == 2000) {
@@ -635,10 +670,10 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-
+	.myselect{height: 50rpx !important;}
 	.phoneNumberInput {
-		width: calc(100% - 130rpx);
-		width: 100%;
+		width: calc(100% - 160rpx);
+		// width: 100%;
 		height: 67rpx;

 		input {
@@ -656,7 +691,8 @@
 	}

 	.quhao {
-		width: 120rpx;
+		height: 50rpx;
+		width: 180rpx;
 	}

 	.highlight {
--- a/pages/yian/yian.vue
+++ b/pages/yian/yian.vue
@@ -0,0 +1,269 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view class="header">
+			<!-- 顶部导航栏 -->
+			<z-nav-bar title="医案"></z-nav-bar>
+		</view>
+        <view>
+			<view class="" style="padding:40rpx 20rpx;">
+				<view class="mytabs flexbox">
+					<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
+						已购图书
+					</view>
+					<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+						推荐图书
+					</view>
+				</view>
+			</view>
+			<view class="mainContainer">
+				<view class="item" v-if="yianList.length > 0">
+					<u-row gutter="16" justify="flex-start">
+						<u-col span="4" v-for="(item,index) in yianList" :key="index">
+							<view>
+								<view class="videoBox demo-layout bg-purple" @click="toMore(item)">
+									<image v-if="item.images != ''" :src="item.images" mode="scaleToFill"></image>
+									<image v-else src="../../static/icon/wufeng.jpg" mode="scaleToFill"></image>
+								</view>
+								<text class="bookName">{{item.name}}</text>
+							</view>
+						</u-col>
+					</u-row>
+				</view>
+				<u-divider v-else text="暂无数据"></u-divider>
+				<view style="width: 100%;">
+					<view v-if="status==0" style="text-align: center;">
+						<u-loading-icon style="display: inline-block;"></u-loading-icon>
+						<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+					</view>
+					<view v-if="status==1">
+						<u-divider text="全部加载完成"></u-divider>
+					</view>
+				</view>
+			</view>
+        </view>
+		
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
+   import musicPlay from '@/components/music.vue'
+import { data } from 'jquery';
+   import {
+   	mapState, mapMutations
+   } from 'vuex';
+   import {
+   	checkBookRight
+   } from '@/config/utils';
+	export default {
+		data() {
+			return {
+				playData:{},
+				windowWidth:0,
+				bookid:null,
+				page:1,
+				pageSize:10,
+				total:0,
+				status:3,
+                booksetpage: 1,
+                yianList:[],
+				contentShow: 1,
+
+			}
+		},
+		onPullDownRefresh() {
+			console.log('下拉刷新了')
+			uni.stopPullDownRefresh(); 
+			  
+            this.booksetpage = 1
+            this.yianList = []
+            this.getYianList(false)
+			   
+		},
+		onReachBottom() {
+            this.booksetpage++
+            this.getYianList(false)
+		},
+		onLoad(e) {
+			this.windowWidth = uni.getSystemInfoSync().windowWidth;
+			console.log(e,'onload')
+			// this.bookid = e.bookid
+			this.getYianList(false)
+		},
+		computed:{
+			...mapState(['userInfo']),
+		},
+		methods: {
+			...mapMutations(['setLoadingShow']),
+			setData(e) {
+				this.contentShow = e
+				this.getYianList(true)
+			},
+			// 查看本书更多书评
+			toMore(val){
+				if (this.contentShow == 1) {
+					uni.navigateTo({
+						url: '../yian/yianList?bookid='+val.id + '&bookname='+val.name,
+					})
+				}
+				if (this.contentShow == 2) {
+					uni.navigateTo({
+						url: '../eBook/bookContent?Id=' + val.id
+					});
+				}
+				// console.log(val,'val')
+			},
+			// // 医案详情
+			// toDetail1(val){
+			// 	// console.log(val,'val')
+			// 	let data = {
+			// 		'userId': this.userInfo.id,
+			// 		'bookId': val.bookid
+			// 	}
+			// 	checkBookRight(data,res=>{
+			// 		console.log(res)
+			// 		if(res.success){
+			// 			uni.navigateTo({
+			// 				url: '../yian/yianDetail?medicalRecordsId='+val.medicalRecordsId
+			// 			})
+			// 		}else{
+			// 			uni.showToast({
+			// 				title:'购买本书后方可查看此内容!',
+			// 				icon:'none'
+			// 			})
+			// 		}
+			// 	})
+				
+			// },
+			getYianList(tushuflag){
+				
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });			
+				
+                var httpurl = "" 
+				if(tushuflag){ // 点击切换已购和推荐
+					this.booksetpage = 1
+					this.yianList = []
+				}
+				if(this.contentShow == 2){
+					httpurl = "book/bookMedicalRecords/userEbookBuyList"
+				} else {
+					httpurl = "book/bookMedicalRecords/recommendBookList"
+				}
+				
+				$http.request({
+					url: httpurl,
+					method: "POST", 
+					data: {
+						"page": this.booksetpage,
+						"limit": 10,
+						"userId": this.userInfo.id
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					this.yianList = this.yianList.concat(res.page.records)
+					console.log(this.yianList,'this.yianList')
+					if(res.page.records.length != 10){
+						this.status = 1
+					} else {
+						this.status = 0
+					}	
+				}).catch(e => {
+					console.log(e)
+				})
+				
+			},
+			
+		},
+		components:{
+			musicPlay,			
+			emotion			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.mytabs {
+		// background: url('@/static/icon/bgtushu.png') no-repeat left top;
+		height: 80rpx;
+		// margin-bottom: 30rpx;
+
+		.item {
+			border-radius: 10rpx;
+			background-color: #c6ead0;
+			width: 48%;
+			// margin: 0 10rpx;
+			text-align: center;
+			color: #3c7f56;
+			font-size: 36rpx;
+			line-height: 80rpx;
+		}
+
+		.item.active {
+			background-color: #3c7f56;
+			color: #fff;
+		}
+
+		.item1 {
+			margin-right: 20rpx;
+		}
+	}
+
+	.tip {
+		padding: 20rpx;
+		background-color: #fff;
+
+		text {
+			font-size: 36rpx;
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.container {
+		padding: 10px;
+	}
+
+	.bookName {
+		white-space: nowrap;
+		overflow-x: hidden;
+		text-overflow: ellipsis;
+		font-size: 30rpx;
+		color: #333;
+		padding: 10rpx 0;
+	}
+
+	uni-image {
+		width: auto !important;
+		height: 350rpx;
+	}
+
+	.listenList {
+		padding: 10rpx;
+		box-sizing: border-box;
+		width: calc(100% - 10rpx);
+	}
+
+	.u-row {
+		flex-wrap: wrap;
+	}
+
+	.u-col {
+		overflow: hidden;
+		margin-bottom: 20rpx;
+	}
+
+	.mb30 {
+		margin-bottom: 30rpx;
+		overflow: hidden;
+	}
+</style>
--- a/pages/yian/yianDetail.vue
+++ b/pages/yian/yianDetail.vue
@@ -0,0 +1,576 @@
+<template>
+	<view class="container">
+		<view class="header">
+			<!-- 顶部导航栏 -->
+			<z-nav-bar :title="productInfo.title"></z-nav-bar>
+		</view>
+		<view class="bookInfo">
+			<!-- <image :src="productInfo.images" mode="aspectFill"></image> -->
+			<view>
+				<!-- <span class="title">{{productInfo.title}}</span> -->
+				<!-- <view class="description">{{productInfo.content}}</view> -->
+				<view class="content" v-html="productInfo.content"></view>
+			</view>
+			<!-- <view class="flexbox" style="margin-bottom: 20px;">
+				<image :src="productInfo.images" mode="aspectFill" class="imageradius bookinfoimage"></image>
+				<view class="bookInfo-inner">
+					<span class="title">{{productInfo.name}}</span>
+					<span class="author">作者：{{productInfo.authorName}}</span>
+					<view class="description" v-if="productInfo.description == ''">暂无简介内容</view>
+					<view class="description" v-else>简介：{{productInfo.description}}</view>
+				</view>
+			</view>	 -->
+			
+		</view>
+		
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
+   import musicPlay from '@/components/music.vue'
+   	import emojiList1 from '../../bkhumor-emojiplus/emoji/biaoqin.js'
+   import {
+   	mapState
+   } from 'vuex';
+	export default {
+		data() {
+			return {
+				playData:{},
+				isShowEmj: false,
+				emojiIcon:'cuIcon-emoji',
+				windowWidth:0,
+				bookid:null,
+				bfa_id:null, //书评id
+				productInfo:{},
+				status:3,
+				pingjiaShow:false, //添加评价 
+				Pform:{ // 评价表单
+					//star:0,
+					comment:'',
+					//img:[],
+					html:''
+				},
+				emoji:[],
+				Files:[],
+				commentInfo:{},
+				pPage:1,
+				pTotal:0, // 评论的总条数
+				// pinglunId:null,
+				plList:[],  // 书评的评论list
+			}
+		},
+		onLoad(e) {
+			this.windowWidth = uni.getSystemInfoSync().windowWidth;
+			console.log(e,'onload')
+			this.medicalRecordsId = e.medicalRecordsId
+			this.bfa_id = e.bfa_id			
+		},
+		onShow() {
+			this.getProDetail()
+		},
+		onReachBottom() {
+		},
+		computed:{
+			...mapState(['userInfo']),
+		},
+		methods: {
+            formatTimeDifferenceFromT(dateTimeT) {
+                const now = new Date();
+                const t = new Date(dateTimeT);
+                const differenceInSeconds = Math.floor((now - t) / 1000);
+
+                if (differenceInSeconds <= 3600) {
+                    const minutes = Math.floor(differenceInSeconds / 60);
+                    return `${minutes} 分钟前`;
+                } else if (differenceInSeconds <= 86400) {
+                    const hours = Math.floor(differenceInSeconds / 3600);
+                    return `${hours} 小时前`;
+                } else if (differenceInSeconds <= 2592000) {
+                    const days = Math.floor(differenceInSeconds / 86400);
+                    return `${days} 天前`;
+                } else {
+                    const currentYear = now.getFullYear();
+                    const tYear = t.getFullYear();
+                    if (currentYear === tYear) {
+                        const month = t.getMonth() + 1;
+                        const day = t.getDate();
+                        return `${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
+                    } else {
+                        const year = t.getFullYear();
+                        const month = t.getMonth() + 1;
+                        const day = t.getDate();
+                        return `${year}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
+                    }
+                }
+            },
+            clickLikeshuping(item){
+                this.$http
+					.post("forum/articles/chickForumContlike?forum_id=" + item.id,)
+					.then(res => {
+                        if (res.code == 0) {
+                            uni.showToast({
+                                title:'点赞成功！',
+                                icon:'success'
+                            })
+                            
+                            item.contlike++
+                        }
+					}).catch((e)=>{
+						console.log(e,'e')
+					})
+            },
+            clickLikehuifu(item){
+				let data = {
+					comment_id: item.id
+				}
+                this.$http
+					.post("forum/articles/chickCommentConlike", data)
+					.then(res => {
+                        if (res.code == 0) {
+                            uni.showToast({
+                                title:'点赞成功！',
+                                icon:'success'
+                            })
+                            
+                            item.contlike++
+                        }
+					}).catch((e)=>{
+						console.log(e,'e')
+					})
+            },
+			getProDetail(){
+				// 获取商品详情
+				uni.showLoading({
+					title: '加载中'
+				});		
+				//console.log(e.id,'e.id')	
+				this.$http
+					.post('book/bookMedicalRecords/getById?medicalRecordsId=' + this.medicalRecordsId )
+					.then(res => {	
+						console.log(res,'res')
+						this.productInfo = res.entity
+						uni.hideLoading();
+					}).catch((e)=>{
+						console.log(e,'e')
+					})
+			},	
+			// 获得输入的表情数组
+			handleEmj(i) {
+			 console.log(i,'i---------'); 
+				this.inputValue = i
+				// console.log(this.inputValue);
+				if(i.emotioni == '[em_98]') {
+					//匹配最后一个表情符号并删除11。
+					this.Pform.comment = this.Pform.comment.replace(/(\[[^\]]+\]|[\s\S])$/, '');
+					if(this.emoji.length > 0){
+						this.emoji = this.emoji.slice(0,-1)
+					}
+				} else {
+					this.emoji.push({'tag' : i.emotion, 'name':i.emotioni})	
+					// console.log(this.emoji,'this.emoji')
+					this.Pform.comment += i.emotioni;
+					/// this.Pform.html += i.emotion
+				}
+			},
+			textareaBInput(e) {
+				console.log(e,'e')
+				this.Pform.comment = e.detail.value
+				/// this.Pform.html = e.detail.value
+			},
+			showEmj() {
+				let bool = !this.isShowEmj;
+				if(bool) {
+					this.emojiIcon = 'cuIcon-keyboard';
+				} else {
+					this.emojiIcon = 'cuIcon-emoji';
+				}
+				
+				this.isShowEmj = bool;
+				this.$emit('show')
+			},			
+			InputBlur(e){
+				
+			},
+			InputFocus(e){
+				this.isShowEmj = false;
+				this.emojiIcon = 'cuIcon-emoji';
+				this.$emit('foc')
+			},
+			
+			// end
+			deleteImg(e){					
+				// var arr = this.Pform.img.slice(0,-1)
+				this.Pform.img.pop()	
+			  //  console.log('删除文件',arr)
+				console.log(this.Pform)
+			},
+			getStar(i){
+				this.Pform.star = i
+			},
+			select(e){
+				 console.log('选择文件：',e)
+				let arr =  e.tempFiles.map(item => {
+					  return {'url':item.url,'name':item.name}
+				  })
+				 this.Pform.img = this.Pform.img.concat(...arr)
+				//this.Pform.img = arr
+				 console.log(this.Pform,'img')				
+			},
+			upSuccess(e){
+				console.log(e)
+			},
+			// 获取html格式的评论1
+			getHtmlComment(comment){
+				 // 格式化html
+				//	 console.log(comment,'comment')
+				         // 这里处理 链接   换行符
+				         let replacedStr = comment.replace(/\[([^(\]|\[)]*)\]/g, (item, index) => {
+							// console.log(item, index)
+							 var indexss = emojiList1.findIndex(item1 => item1.alt === item)
+							 // console.log(indexss, 'indexss')
+				           return '<img src="https://www.nuttyreading.com/emojis/emojis/qq/' + emojiList1[indexss].url + '" width="18rpx">';
+				         });
+						// console.log(replacedStr,'replacedStr')
+				         return replacedStr.replace(/(\r\n)|(\n)/g, '<br>');
+				       
+						
+			},
+			deletePic() {
+				let that = this
+				that.Pform.img.splice(0, 1)
+				//console.log(that.Pform.img)
+			},
+			afterRead(e) {
+				//console.log(e)
+				let that = this
+				for (var i=0; i< e.file.length; i++) {
+					//console.log(i,e.file[i].url)
+					uni.uploadFile({
+						url: this.$baseUrl + 'oss/fileoss',
+						filePath: e.file[i].url,
+						//files:e.file,
+						 name: 'file',
+						formData: {},
+						success: (res) => {
+							that.Pform.img.push({
+								url: JSON.parse(res.data).url
+							})
+						}
+					});
+				}
+			},			
+			closePingjia(){
+				this.pingjiaShow = false
+				this.Pform.comment = ''
+				this.Pform.html = ''
+				this.emoji = []
+			},
+			// 点赞
+			dianzan(val){},
+			
+			// 放大图片
+			previewImage(url) {
+				console.log(url)
+				uni.previewImage({
+					urls: [url]
+				});
+			},
+			// 显示评论框
+			pinglun(val){
+				console.log('pinglun-val', val)
+				if(val && val.user && val.user.id && val.puser && val.puser.id){
+					this.Pform.name = val.user.name || ''
+					this.Pform.pid = val.pid
+					this.Pform.puserId = val.user.id || ''
+				}else if(val && val.user && val.user.id){					
+						this.Pform.name = val.user.name || ''
+						this.Pform.pid = val.id
+						this.Pform.puserId = val.user.id || ''
+				}else {
+					// this.pinglunId = val || null
+					this.Pform.pid = ''
+					this.Pform.puserId = ''
+				}
+				this.pingjiaShow = true
+			},
+		},
+		components:{
+			musicPlay,			
+			emotion
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.addPl{padding-top: 0rpx; margin-bottom: 0rpx;}
+	.pinglunMain{
+		.pl-item{
+			margin: 0 0 14rpx 0;
+			padding: 0 0 14rpx 0;
+			border-bottom: 1px solid #f0f0f0;
+			.pl-son{
+				margin: 14rpx 0 14rpx 60rpx;
+				padding: 0 14rpx 14rpx 14rpx;
+				background-color: #f0f0f0;
+				border-radius: 10rpx;
+				.pl-son-item{
+					font-size: 26rpx;
+					padding-top: 28rpx;
+					.pl-son-item-content{
+
+					}
+					.pl-son-atob{
+						color: #a1a1a1;
+					}
+				}
+			}
+		}
+		.plusername{
+			font-size: 26rpx;
+			color: #a1a1a1;
+		}
+		.content{
+			margin: 30rpx 0rpx;
+			line-height: 40rpx;
+			color: #000;
+			font-size: 30rpx;
+		}
+		background-color: #fff; padding: 10px;
+		// h4{color: #55aa00; font-size: 40rpx;  margin:30rpx 0 ; text-align: center;}
+		.time{color: #888; font-size: 24rpx;}
+		.btns{
+			font-size: 22rpx;
+			justify-content: space-between;
+			align-items: center;
+			.left{
+				width: 300rpx;
+				color: #a1a1a1;
+			}
+			.right{
+				width: 300rpx;
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+			}
+			.gzicon{
+				margin:0 0 0 20rpx;
+				height: 40rpx;
+				width: 40rpx;
+				// float:left;
+				// border-radius: 20rpx;
+				// border:1rpx solid #e9e9e9;
+			}
+			.opbtns{
+				.pingjia{margin-left: 10px;}
+			}
+		}
+		
+	}
+	// .mbtns{padding: 5px; background-color: #f4fff5; border-radius: 10px; font-size: 34rpx; color: #8b8a91; margin:15px 0; justify-content: space-between;}
+	/deep/.zhengwen{
+		line-height: 50rpx;
+		font-size: 28rpx;
+		margin-top: 20rpx;
+		img{
+			width: 100% !important;
+		}
+	}
+	.flexbox{display: flex;}
+	.container{padding: 10px;}
+	.star{display: inline-block; width: 20px; height: 20px;  margin-right: 10rpx;}
+		.starGray{ background : url(../../static/icon/star_greey.png) no-repeat; background-size: contain; }
+		.starLight{ background : url(../../static/icon/star_light.png) no-repeat;  background-size: contain;}
+		.cuIcon-emoji {
+			background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block; margin-right: 20rpx;
+	width: 30px; 	}
+	.cuIcon-keyboard{background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block;
+	width: 30px; }
+	.tanchu {
+		padding: 40rpx 30rpx 40rpx 30rpx;
+		position: relative;
+	
+	
+		.dp_title {
+			font-size: 32rpx;
+			margin-bottom: 50rpx;
+			color: #555;
+			text-align: center;
+			font-weight: bold;
+		}
+	
+		.dp_add {
+			position: absolute;
+			top: 40rpx;
+			right: 30rpx;
+			font-size: 22rpx;
+			background-color: #fd6004;
+			color: #fff;
+			border-radius: 10rpx;
+			padding: 5rpx 10rpx;
+	
+			.u-icon {
+				display: inline-block;
+				margin-right: 5rpx;
+			}
+		}}
+	
+	.quesheng{text-align: center; margin-top: 100rpx; color: #8b8a91; padding-bottom: 20rpx; padding-top: 20rpx;}
+	// .bookInfo{justify-content: space-between; margin-bottom: 15px; background-color: #fff; padding:10px; border: 1px splid #999;
+		
+	// 	view{ padding-left: 30rpx;width: calc(100% - 150rpx); box-sizing: border-box;
+	// 		.title{font-size: 38rpx; margin-top: 20rpx; margin-bottom: 20rpx; display: block;}
+	// 		.description{line-height: 20px; width: 100%;  color:#888; padding-left: 0;}
+	// 		text{margin-left: 10px; line-height: 20px; color: #888; padding-left: 0;}
+	// 	}
+	// 	image{width: 150px; height: 150px;}
+		
+	// }
+	.bookInfo{
+		justify-content: space-between;
+		margin-bottom: 15px;
+		background-color: #fff;
+		padding:10px;
+		border: 1px splid #999;
+		box-sizing: border-box;
+		padding-bottom: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+		// .imageradius{
+		// 	border-radius: 20rpx;
+		// 	border:1rpx solid #e9e9e9;
+		// }
+		
+		// .bookInfo-inner{ padding-left: 30rpx;  box-sizing: border-box;  width: calc(100% - 150px);
+		// 	.title{font-size: 32rpx; margin-top: 0rpx; margin-bottom: 20rpx;font-weight: 700; display: block;}
+		// 	.author{font-size: 30rpx;margin-top: 0rpx;margin-bottom: 20rpx;font-weight: 500; display: block; }
+
+		// 	.description{
+		// 		font-size: 28rpx;
+		// 		line-height: 20px;
+		// 		width: 100%;
+		// 		color:#888;
+		// 		padding-left: 0;
+		// 		overflow:hidden;
+		// 		text-overflow: ellipsis;
+		// 		-webkit-line-clamp: 9;
+		// 		display: -webkit-box;
+		// 		-webkit-box-orient: vertical;
+		// 	}
+		// }
+		// .bookinfoimage{width: 150px !important;  }
+		
+		// view{ padding-left: 30rpx;  box-sizing: border-box;  width: calc(100% - 150px);
+		// 	.title{font-size: 38rpx; margin-top: 20rpx; font-weight: blod; margin-bottom: 20rpx; display: block;			
+		// 	}
+		// 	.description{line-height: 20px; width: 100%;  color:#888; padding-left: 0;}
+		// }
+		// image{width: 150px !important;  }
+		
+		.btns{
+			font-size: 22rpx;
+			justify-content: space-between;
+			align-items: center;
+			.left{
+				width: 300rpx;
+				color: #a1a1a1;
+			}
+			.right{
+				width: 300rpx;
+				display: flex;
+				justify-content: flex-end;
+				align-items: center;
+			}
+			.gzicon{
+				margin:0 0 0 20rpx;
+				height: 40rpx;
+				width: 40rpx;
+				// float:left;
+				// border-radius: 20rpx;
+				// border:1rpx solid #e9e9e9;
+			}
+			.opbtns{
+				.pingjia{margin-left: 10px;}
+			}
+		}
+		
+		.feng{
+			// margin:10rpx 0 0 0;
+			// height: 670rpx;
+			// width: 670rpx;
+			// border-radius: 20rpx;
+			// border:1rpx solid #e9e9e9;
+
+			margin:10rpx 20rpx 0 0;
+            height: 360rpx;
+            width: 280rpx;
+            // float:left;
+            border-radius: 20rpx;
+            border:1rpx solid #e9e9e9;
+		}
+		.item{
+			// padding: 10px;
+			margin-bottom: 30rpx;
+		}
+		// .title{font-size: 38rpx; font-weight: blod; color: #55aa00; overflow: hidden;}
+		.title{font-size: 32rpx; font-weight: 700; color: #000; overflow: hidden;padding-top: 20rpx;padding-bottom: 10rpx;}
+		.description{
+			overflow: hidden;
+			color: #666;
+			font-size: 28rpx;
+			margin-bottom: 30rpx;
+			margin-top:10rpx;
+		}
+		
+	}
+	.mainContent{
+		background-color: #fff; 
+		padding: 20rpx;
+		border-radius: 20rpx;
+		.item{
+			// padding: 10px;
+			margin-bottom: 30rpx;
+		}
+		.feng{
+			// margin:10rpx 0 0 0;
+			// height: 670rpx;
+			// width: 670rpx;
+			// border-radius: 20rpx;
+			// border:1rpx solid #e9e9e9;
+
+			margin:10rpx 20rpx 0 0;
+            height: 160rpx;
+            width: 140rpx;
+            float:left;
+            border-radius: 20rpx;
+            border:1rpx solid #e9e9e9;
+		}
+		// .title{font-size: 38rpx; font-weight: blod; color: #55aa00; overflow: hidden;}
+		.title{font-size: 32rpx; font-weight: 500; color: #55aa00; overflow: hidden;padding-top: 20rpx;}
+		.description{
+			overflow: hidden;
+			color: #666;
+			font-size: 28rpx;
+			margin-bottom: 15px;
+			margin-top:5px;
+
+			// overflow: hidden;
+			// color: #666;
+			// text-overflow: -o-ellipsis-lastline;
+			// overflow: hidden;
+			// text-overflow: ellipsis;
+			// display: -webkit-box;
+			// -webkit-line-clamp: 5;
+			// line-clamp: 5;
+			// -webkit-box-orient: vertical;
+			// font-size: 28rpx;
+			// margin-bottom: 15px;
+			// margin-top:5px;
+			// min-height: 186rpx;
+		}
+	}
+	
+	.mb30{margin-bottom: 30rpx; overflow: hidden;}
+</style>
--- a/pages/yian/yianList.vue
+++ b/pages/yian/yianList.vue
@@ -0,0 +1,481 @@
+<template>
+	<!--父组件-->
+	
+	<view class="container" style="padding-bottom: 10rpx;">
+		<!-- <view class="mini"></view> -->
+		<view>
+			<z-nav-bar :title="'医案-'+bookname"></z-nav-bar>
+			<!-- 基本信息 -->			
+			<view class="book_neir">
+				<view class="flexbox info">
+					<view class="item">
+						<image class="bn_img" v-if="bookInfo.images != ''" :src="bookInfo.images" mode="widthFix">
+						</image>
+						<image class="bn_img" style="border:1px solid #eee" v-else src="../../static/icon/wufeng.jpg"
+							mode="widthFix"></image>
+					</view>
+					<!-- <img :src="bookInfo.images" class="bn_img"> -->
+					<view class="item">
+						<!-- <b class="leiXing" v-if="bookInfo.isVip==1" style="background: #c79119;">VIP</b>
+					<b class="leiXing" v-if="bookInfo.isVip==2" style="background: #c74119;">付费</b> -->
+						<view class="bn_nes">
+							<view style="font-weight: bold;margin-bottom: 30rpx;">
+								{{bookInfo.name}}
+							</view>
+							<view v-if="bookInfo.author != null"
+								style="color: #9b9b9b;font-size: 28rpx;margin:20rpx 0 0 0;max-width: 400rpx;line-height: 38rpx;">
+								<p @click="onAuCHJump(bookInfo.author.id,1)" style="margin-bottom: 20rpx;">
+									{{bookInfo.author.authorName}} [著] >
+								</p>
+								<p @click="onAuCHJump(item.id,2)" v-for="item in this.bookInfo.publisherNIList">
+									{{item.title}} >
+								</p>
+							</view>
+							<view class="tags">
+								<uni-tag class="tag" @click="toMore()" :inverted="true" text="书评"
+									type="success"></uni-tag>
+								<!-- 1:打卡，2不打卡 -->
+								<uni-tag @click="gotoclock()" v-if="bookInfo.clockIn == 1" class="tag" :inverted="true"
+									text="签到" type="warning"></uni-tag>
+							</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<!-- end -->
+			<view class="playList" v-if="yianList.length > 0">
+				<view class="item" v-for="(item,index) in yianList" :key="index">
+					<view>
+						<view @click="toDetail(item)" class="flexbox muluitem">
+							<span>{{item.title}}</span>&nbsp;&nbsp;
+							<!-- <view >
+							<uni-tag v-if="item.voices != ''" class="tag" size="small" :inverted="true" text="音频"
+								type="success" /></view> -->
+							<view ><uni-tag v-if="item.content != ''" class="tag" size="small" :inverted="true" text="文字"
+								type="primary" /></view>
+							<!-- <image  class="playingFig" src="/static/playingGif.gif" mode="aspectFill"></image>	 -->
+						</view>
+					</view>
+				</view>
+				<view style="width: 100%;">
+					<view v-if="status==0" style="text-align: center;">
+						<u-loading-icon style="display: inline-block;"></u-loading-icon>
+						<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+					</view>
+					<view v-if="status==1">
+						<u-divider text="全部加载完成"></u-divider>
+					</view>
+				</view>				
+			</view>
+			<u-divider v-else text="暂无讲书目录"></u-divider>
+			<music-play :playData="playData"></music-play>
+			<!-- 公共组件-每个页面必须引入 -->
+			<public-module></public-module>		
+			<!-- <z-navigation></z-navigation> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	// import textScroll from '@/components/textScroll/index.vue'
+	// import cxAdudioPlay from '@/components/cx-audio-play/cx-audio-play.vue'
+	import musicPlay from '@/components/music.vue'
+	import $http from '../../config/requestConfig';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	import {
+		checkBookRight
+	} from '@/config/utils';
+	export default {
+		components: {
+			//  cxAdudioPlay,
+			// textScroll,
+			musicPlay
+		},
+		data() {
+			return {
+				isBuy: false, // true 已购买，false 未购买
+				playData: {},				
+				bookInfo: {
+					author:{
+						authorName:''
+					}
+				}, // 书籍详情
+				bookid: null, // 书籍id
+				status:3,				
+				freeChapterCount: 0, // 免费章节数				
+				yianList: [], // 书籍目录
+				videoList: [], //音频文件
+				page:1,
+				totalPage:0,
+			}
+		},
+		onPullDownRefresh() {
+			console.log('下拉刷新了')
+			this.yianList = []
+			this.page = 1
+			this.totalPage = 0
+			this.getyianList()
+			uni.stopPullDownRefresh();
+		},
+		onReachBottom() {
+			console.log('到底了',this.page+1 , this.totalPage)
+			
+			if(this.page+1 <= this.totalPage){
+				this.page++
+				this.status = 0
+				this.getyianList()
+			}else{
+				this.status = 1
+			}
+		},
+		onHide() {
+			this.yianList = []
+			this.page = 1
+		},
+		//第一次加载
+		onLoad(e) {
+			console.log('------------------')
+			// 隐藏原生的tabbar
+			console.log(e, 'e')
+			uni.hideTabBar();
+			this.bookid = e.bookid
+			this.bookname = e.bookname		
+		},		
+		onShow() {
+			// this.yianList = []
+			// this.page = 1
+			// this.totalPage = 0
+			this.getyianList()
+			this.getBookInfo()
+			
+		},
+		computed: {
+			...mapState(['userInfo'])
+		},
+		methods: {
+			...mapMutations(['setUserInfo']),
+
+			// 查看本书更多书评
+			toMore(val) {
+				// console.log(val, 'val')
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': this.bookid
+				}
+				checkBookRight(data,res=>{
+					console.log(res)
+					if(res.success){
+						uni.navigateTo({
+							url: '../comments/comments?bookid=' + this.bookid,
+						});
+					}else{
+						uni.showToast({
+							title:'购买本书后方可查看此内容!',
+							icon:'none'
+						})
+					}
+				})
+				
+			},
+			// 去打卡
+			gotoclock() {
+				uni.navigateTo({
+					url: '../clock/clock?bookid=' + this.bookid,
+				});
+			},
+			getBookInfo() {
+				// 获取书本基本信息
+				this.$http					
+					.post('book/book/getBookInfo', {
+						'bookId': this.bookid,
+						'userId': this.userInfo.id
+					})
+					.then(res => {
+						if (res.code == 0) {
+							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基本信息')
+					}).catch((error) => {
+						console.log(error)
+					})
+			},
+
+			// 详细
+			toDetail(item) {
+				console.log('点击了', item)
+				// uni.navigateTo({
+				// 	url: './talkBookDetail?teachId=' + item.teachId +"&bookId="+item.bookId
+				// });
+				uni.navigateTo({
+					url: '../yian/yianDetail?medicalRecordsId='+item.medicalRecordsId,
+				});
+			},
+
+			// 信息介绍跳转
+			onAuCHJump(id, e) {
+				uni.navigateTo({
+					url: '../eBook/bookMessage?Id=' + id + '&typ=' + e
+				});
+			},
+			// 获取章节列表
+			getyianList() {
+				$http.request({
+					url: "book/bookMedicalRecords/listByBookId",
+					method: "POST", 
+					data: {
+						"page": this.page,
+						"limit": 20,
+						"bookId": this.bookid
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				})
+				// this.$http
+				// 	.post('book/teach/getBookTeachItems', {
+				// 		'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, '章节目录')
+							if (res.page.records.length > 0) {
+								this.yianList = this.yianList.concat(res.page.records)
+								this.status = 3
+								this.totalPage = res.page.pages								
+								if(this.totalPage = res.page.current){
+									this.status = 1
+								}						
+							} else {
+								this.yianList = []
+								this.totalPage = 0
+							}
+						}
+					}).catch((e) => {
+						console.log(e.msg)
+					})
+			},
+			
+		},
+	}
+</script>
+
+<style lang="less">
+	.muluitem{
+		span{
+			white-space: nowrap;
+			overflow-x: hidden;
+			text-overflow: ellipsis;
+		}
+	}
+	.playingFig {
+		width: 100rpx;
+		height: 100rpx;
+		display: inline-block;
+		vertical-align: middle;
+	}
+
+	.price {
+		margin-top: 160rpx;
+		overflow: hidden;
+
+		.light {
+			font-size: 50rpx;
+			font-weight: bold;
+			color: #f05654;
+		}
+	}
+
+	.tags {
+		.tag {
+			margin-left: 0;
+			margin-right: 10rpx;
+		}
+	}
+
+	.charType {
+		display: inline;
+		width: 20px !important;
+	}
+
+	.graytitle {
+		color: #999;
+	}
+
+	.yigoumai {
+		background-color: #ffc773;
+	}
+
+	.shiting {
+		background-color: #f47983;
+	}
+
+	.playing {
+		color: #1daa5c;
+	}
+
+	.chaoshi {
+		background-color: #1daa5c;
+	}
+
+	.home_nar {
+		margin: 30rpx 0;
+		justify-content: space-between;
+	}
+
+	.hn_cl_tit {
+		width: 48%;
+		text-align: center;
+		border-radius: 20rpx;
+		padding-top: 10rpx;
+		// line-height: 110upx;
+		display: flex;
+		align-content: center;
+		justify-content: center;
+
+		image {
+
+			width: 80upx;
+			height: 80upx;
+			display: inline-block;
+			// margin: 0 auto;
+			// margin: 0 20rpx;
+		}
+
+		text {
+			height: 100upx;
+			display: inline-block;
+			line-height: 80upx;
+			color: #fff;
+			font-size: 38rpx;
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.book_neir {
+		margin-top: 80rpx;
+		padding: 20rpx;
+
+		.bn_img {
+			width: 300rpx !important;
+		}
+	}
+
+	.info {
+		overflow: hidden;
+		width: 100%;
+	}
+
+	.book_neir {
+		margin: 20rpx 0 0 0;
+		position: relative;
+
+		.item {
+			display: inline-block;
+			float: left;
+			width: 50%;
+			overflow: hidden;
+		}
+
+		.bn_img {
+			float: left;
+			width: 250upx;
+			height: 320upx;
+		}
+
+		.bn_nes {
+			float: left;
+			font-size: 36rpx;
+			margin-left: 40rpx;
+
+			view {
+				margin: 20rpx 0 0 0;
+			}
+		}
+
+		.leiXing {
+			display: block;
+			padding: 5rpx 10rpx;
+			border-radius: 10rpx;
+			text-align: center;
+			color: #fff;
+			font-weight: normal;
+			background: #27b386;
+			position: absolute;
+			left: -15upx;
+			top: 10upx;
+			font-size: 16rpx;
+		}
+	}
+
+	.container {
+		background-color: #fff;
+	}
+
+	.playTitle {
+		width: 80%;
+		margin: 20rpx auto;
+		margin-top: 50rpx;
+	}
+
+	.libTitle {
+		font-size: 40rpx;
+		margin: 40rpx 0;
+		display: block;
+		text-align: center;
+	}
+
+	.tanchu {
+		padding: 40rpx 30rpx 40rpx 30rpx;
+	}
+
+	.playList {
+		padding: 20rpx;
+		color: #666;
+	}
+
+	.playList .item {
+		display: block;
+		line-height: 80rpx;
+		white-space: nowrap;
+		overflow-x: hidden;
+		font-size: 36rpx;
+		text-overflow: ellipsis;
+	}
+
+	.tag {
+		margin-left: 20rpx;
+	}
+
+	.playNow {
+		color: #27b386;
+	}
+
+	.pageTabBox {
+		width: 150px;
+		margin: 20rpx auto;
+		font-size: 60rpx;
+	}
+
+	.cxAdudioPlay {
+		position: fixed;
+		bottom: 150rpx;
+		left: 0;
+	}
+</style>
--- a/pages/yian/yianList1.vue
+++ b/pages/yian/yianList1.vue
@@ -0,0 +1,481 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view class="header">
+			<!-- 顶部导航栏 -->
+			<z-nav-bar :title="'医案-'+bookname"></z-nav-bar>
+		</view>
+		<view class="ordersTabs" style="z-index:0;position:unset;height: 10px;">
+            <view class="ordersdefine">　</view>
+        </view>
+        <view>
+			<!-- <view class="" style="padding:40rpx 20rpx;">
+				<view class="mytabs flexbox">
+					<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
+						已购图书
+					</view>
+					<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+						推荐图书
+					</view>
+				</view>
+			</view> -->
+            <view v-if="yianList.length > 0">
+                <view class="bookInfo3" v-for="(item,index) in yianList" :key="index">
+                    <view class="mainContent3">
+                        <view class="item">
+                            <view class="btns flexbox" @click.stop="toMore(item)">
+                                <view class="title">{{item.title}}</view>
+                                <!-- <view class="pianshuping">{{item.forumNum}}篇医案</view> -->
+                            </view>							
+                            <!-- <image class="feng" v-if="item.images" :src="item.images" mode="aspectFill" @click.stop="toMore(item)"></image>
+                            <view class="shupingList">
+                                <view class="description" v-for="(item1,index1) in item.forums" :key="index1" @click.stop="toDetail1(item1)">{{item1.title}}</view>
+                            </view>
+                            <view class="btns flexbox" @click.stop="toMore(item)">
+                                <span class="left"></span>
+                                <span class="right flexbox opbtns" style="color:#3c9cff;">
+                                    全部
+                                </span>
+                            </view> -->
+                        </view>	
+                    </view>
+                </view>
+            </view>
+            <view class="quesheng"  v-if="status==1 && yianList.length == 0">
+                暂无医案内容~
+            </view>
+        </view>
+		
+		<view v-if="status==0" style="text-align: center;">
+			<u-loading-icon style="display: inline-block;"></u-loading-icon>
+			<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+		</view>
+		<view v-if="status==1" style="padding-bottom: 20rpx;">
+			<u-divider text="全部加载完成"></u-divider>
+		</view>
+		
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
+   import musicPlay from '@/components/music.vue'
+import { data } from 'jquery';
+   import {
+   	mapState, mapMutations
+   } from 'vuex';
+   import {
+   	checkBookRight
+   } from '@/config/utils';
+	export default {
+		data() {
+			return {
+				playData:{},
+				windowWidth:0,
+				bookid:null,
+				page:1,
+				pageSize:10,
+				total:0,
+				status:3,
+                booksetpage: 1,
+                yianList:[],
+				contentShow: 1,
+
+			}
+		},
+		onPullDownRefresh() {
+			console.log('下拉刷新了')
+			uni.stopPullDownRefresh(); 
+			  
+            this.booksetpage = 1
+            this.yianList = []
+            this.getYianList(false)
+			   
+		},
+		onReachBottom() {
+            this.booksetpage++
+            this.getYianList(false)
+		},
+		onLoad(e) {
+			this.windowWidth = uni.getSystemInfoSync().windowWidth;
+			console.log(e,'onload')
+			this.bookid = e.bookid
+			this.bookname = e.bookname
+			this.getYianList(false)
+		},
+		computed:{
+			...mapState(['userInfo']),
+		},
+		methods: {
+			...mapMutations(['setLoadingShow']),
+			setData(e) {
+				this.contentShow = e
+				this.getYianList(true)
+			},
+			// 查看本书更多书评
+			toMore(val){
+				// console.log(val,'val')
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': val.id
+				}
+				// checkBookRight(data,res=>{
+				// 	console.log(res)
+				// 	if(res.success){
+						uni.navigateTo({
+							url: '../yian/yianDetail?medicalRecordsId='+val.medicalRecordsId,
+						});
+				// 	}else{
+				// 		uni.showToast({
+				// 			title:'购买本书后方可查看此内容!',
+				// 			icon:'none'
+				// 		})
+				// 	}
+				// })
+				
+			},
+			// 医案详情
+			toDetail1(val){
+				// console.log(val,'val')
+				let data = {
+					'userId': this.userInfo.id,
+					'bookId': val.bookid
+				}
+				checkBookRight(data,res=>{
+					console.log(res)
+					if(res.success){
+						uni.navigateTo({
+							url: '../yian/yianDetail?medicalRecordsId='+val.medicalRecordsId
+						})
+					}else{
+						uni.showToast({
+							title:'购买本书后方可查看此内容!',
+							icon:'none'
+						})
+					}
+				})
+				
+			},
+			getYianList(){
+				
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });			
+				
+				$http.request({
+					url: "book/bookMedicalRecords/listByBookId",
+					method: "POST", 
+					data: {
+						"page": this.booksetpage,
+						"limit": 10,
+						"bookId": this.bookid
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					this.yianList = this.yianList.concat(res.page.records)
+					console.log(this.yianList,'this.yianList')
+					if(res.page.records.length != 10){
+						this.status = 1
+					} else {
+						this.status = 0
+					}	
+				}).catch(e => {
+					console.log(e)
+				})
+				
+			},
+			
+		},
+		components:{
+			musicPlay,			
+			emotion			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+// @import '@/style/mixin.scss';
+.orderTabs {
+    // margin: 70rpx 0 0 0;
+    width: 100%;
+    // padding: 0 3% 3% 3%;
+    position: fixed;
+    // top: 80rpx;
+    background-color: #f7faf9;
+    z-index: 100;
+
+    .orderdefine {
+        display: inline-block;
+        padding: 20rpx 0 20rpx 0;
+        // margin: 40rpx 0 15rpx 0;
+        width:230rpx;
+        text-align: center;
+        font-size: 30rpx;
+    }
+
+    .ordStyle {
+        // border-bottom: 4rpx solid #54a966;
+        // color: #54a966;
+        font-weight: bold;
+    }
+}
+
+
+	.flexbox{display: flex;}
+	.container{padding: 0 10px;}
+	.star{display: inline-block; width: 20px; height: 20px;  margin-right: 10rpx;}
+		.starGray{ background : url(../../static/icon/star_greey.png) no-repeat; background-size: contain; }
+		.starLight{ background : url(../../static/icon/star_light.png) no-repeat;  background-size: contain;}
+		.cuIcon-emoji {
+			background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block; margin-right: 20rpx;
+	width: 30px; 	}
+	.cuIcon-keyboard{background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block;
+	width: 30px; }
+	.tanchu {
+		padding: 40rpx 30rpx 40rpx 30rpx;
+		position: relative;
+	
+	
+		.dp_title {
+			font-size: 32rpx;
+			margin-bottom: 50rpx;
+			color: #555;
+			text-align: center;
+			font-weight: bold;
+		}
+	
+		.dp_add {
+			position: absolute;
+			top: 40rpx;
+			right: 30rpx;
+			font-size: 22rpx;
+			background-color: #fd6004;
+			color: #fff;
+			border-radius: 10rpx;
+			padding: 5rpx 10rpx;
+	
+			.u-icon {
+				display: inline-block;
+				margin-right: 5rpx;
+			}
+		}}
+	
+	.quesheng{text-align: center; margin-top: 100rpx; color: #8b8a91; padding-bottom: 20rpx; padding-top: 20rpx;}
+	.gengduoshuping{text-align: right; color: #0044ff; padding-bottom: 20rpx; padding-top: 20rpx;}
+	.bookInfo{
+		justify-content: space-between;
+		// margin-bottom: 15px;
+		background-color: #fff;
+		padding:20rpx;
+		border: 1px splid #999;
+		box-sizing: border-box;
+		// padding-bottom: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+
+		// .imageradius{
+		// 	border-radius: 20rpx;
+		// 	border:1rpx solid #e9e9e9;
+		// }
+		
+		// .bookInfo-inner{ padding-left: 30rpx;  box-sizing: border-box;  width: calc(100% - 150px);
+		// 	.title{font-size: 32rpx; margin-top: 0rpx; margin-bottom: 20rpx;font-weight: 700; display: block;}
+		// 	.author{font-size: 30rpx;margin-top: 0rpx;margin-bottom: 20rpx;font-weight: 500; display: block; }
+
+		// 	.description{
+		// 		font-size: 28rpx;
+		// 		line-height: 20px;
+		// 		width: 100%;
+		// 		color:#888;
+		// 		padding-left: 0;
+		// 		overflow:hidden;
+		// 		text-overflow: ellipsis;
+		// 		-webkit-line-clamp: 9;
+		// 		display: -webkit-box;
+		// 		-webkit-box-orient: vertical;
+		// 	}
+		// }
+		// .bookinfoimage{width: 150px !important;  }
+		
+	}
+	.mainContent{
+		background-color: #fff; 
+		.item{
+			// padding: 10px;
+			// margin-bottom: 30rpx;
+			// border: 1px solid #999;
+			box-sizing: border-box;
+			// padding-bottom: 20rpx;
+			border-radius: 20rpx;
+			// margin-bottom: 20rpx;
+		}
+		.feng{
+            margin:10rpx 20rpx 0 0;
+            height: 160rpx;
+            width: 140rpx;
+            float:left;
+            border-radius: 20rpx;
+            border:1rpx solid #e9e9e9;
+        }
+		.title{font-size: 30rpx; font-weight: 700; color: #000; overflow: hidden;}
+		/deep/.description{
+			overflow: hidden;
+			color: #666;
+			text-overflow: -o-ellipsis-lastline;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 5;
+			line-clamp: 5;
+			-webkit-box-orient: vertical;
+			font-size: 26rpx;
+			margin-bottom: 20rpx;
+			margin-top:10rpx;
+			height: 172rpx;
+			img{
+				width: 100% !important;
+			}
+		}
+		.btns{
+			font-size: 22rpx;
+			justify-content: space-between;
+			align-items: center;
+			.left{
+                width: 300rpx;
+                color: #a1a1a1;
+            }
+            .right{
+                width: 300rpx;
+                display: flex;
+                justify-content: flex-end;
+                align-items: center;
+            }
+            .gzicon{
+                margin:0 0 0 20rpx;
+                height: 40rpx;
+                width: 40rpx;
+                // float:left;
+                // border-radius: 20rpx;
+                // border:1rpx solid #e9e9e9;
+            }
+			.opbtns{
+				.pingjia{margin-left: 10px;}
+			}
+		}
+	}
+	.mb30{margin-bottom: 30rpx; overflow: hidden;}
+
+    .bookInfo3{
+        justify-content: space-between;
+		// margin-bottom: 15px;
+		background-color: #fff;
+		padding:20rpx;
+		border: 1px splid #999;
+		box-sizing: border-box;
+		// padding-bottom: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+        .mainContent3{
+            background-color: #fff; 
+            .item{
+                // padding: 10px;
+                // margin-bottom: 30rpx;
+                // border: 1px solid #999;
+                box-sizing: border-box;
+                // padding-bottom: 20rpx;
+                border-radius: 20rpx;
+                // margin-bottom: 20rpx;
+            }
+            .feng{
+                margin:10rpx 20rpx 0 0;
+                height: 240rpx;
+                width: 164rpx;
+                float:left;
+                border-radius: 20rpx;
+                border:1rpx solid #e9e9e9;
+            }
+            .title{font-size: 30rpx; font-weight: 700; color: #000; overflow: hidden;}
+            .pianshuping{
+                font-size: 24rpx;
+                color: red;
+            }
+            .shupingList{
+                min-height: 212rpx;
+            }
+            /deep/.description{
+                overflow: hidden;
+                color: #666;
+                text-overflow: -o-ellipsis-lastline;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                display: -webkit-box;
+                -webkit-line-clamp: 1;
+                line-clamp: 1;
+                -webkit-box-orient: vertical;
+                font-size: 26rpx;
+                margin-bottom: 20rpx;
+                margin-top:10rpx;
+				img{
+					width: 100% !important;
+				}
+            }
+            .btns{
+                font-size: 22rpx;
+                justify-content: space-between;
+                align-items: center;
+                .left{
+                    width: 300rpx;
+                    color: #a1a1a1;
+                }
+                .right{
+                    width: 300rpx;
+                    display: flex;
+                    justify-content: flex-end;
+                    align-items: center;
+                }
+                .gzicon{
+                    margin:0 0 0 20rpx;
+                    height: 40rpx;
+                    width: 40rpx;
+                    // float:left;
+                    // border-radius: 20rpx;
+                    // border:1rpx solid #e9e9e9;
+                }
+                .opbtns{
+                    .pingjia{margin-left: 10px;}
+                }
+            }
+        }
+    }
+		
+	.mytabs {
+		// background: url('@/static/icon/bgtushu.png') no-repeat left top;
+		height: 80rpx;
+		// margin-bottom: 30rpx;
+
+		.item {
+			border-radius: 10rpx;
+			background-color: #c6ead0;
+			width: 48%;
+			// margin: 0 10rpx;
+			text-align: center;
+			color: #3c7f56;
+			font-size: 36rpx;
+			line-height: 80rpx;
+		}
+
+		.item.active {
+			background-color: #3c7f56;
+			color: #fff;
+		}
+
+		.item1 {
+			margin-right: 20rpx;
+		}
+	}
+</style>
--- a/static/icon/change.png
+++ b/static/icon/change.png
--- a/static/icon/five6.png
+++ b/static/icon/five6.png
--- a/static/icon/home5-1.png
+++ b/static/icon/home5-1.png
--- a/static/json/address.json
+++ b/static/json/address.json
Author	SHA1	Message	Date
@fawn-nine	ea98643858	微调-引入全局获取时间小时数据	2023-12-08 09:41:21 +08:00
@fawn-nine	bda49ff7c8	修改配色	2023-12-07 18:04:11 +08:00
@fawn-nine	073c3b4a74	时辰取穴：当前时辰+全部时辰	2023-12-07 13:47:28 +08:00
@fawn-nine	fdd19cc195	对应时辰高亮，效果美化	2023-12-06 15:18:20 +08:00
@fawn-nine	3c83081ad5	接口对接+效果美化	2023-12-06 13:05:23 +08:00
@fawn-nine	8506d8a7dc	修改表格颜色	2023-12-05 17:58:30 +08:00
@fawn-nine	f494d89eeb	时辰取穴	2023-12-05 15:12:13 +08:00
@fawn-nine	c04a69ba88	1	2023-12-04 10:34:29 +08:00
@fawn-nine	0829e6f5b6	书评列表报错	2023-12-04 10:25:32 +08:00
yanwenlong	faf38825cc	医案改版	2023-12-04 08:58:42 +08:00
徐哼唧L	4c7ff7b1cb	医案图标	2023-12-01 15:34:40 +08:00
yanwenlong	d96dcf9256	移动端-医案	2023-11-30 22:24:34 +08:00
@fawn-nine	6f015fe890	.	2023-11-28 16:39:50 +08:00
@fawn-nine	815554aa18	书籍附加功能添加权限检查	2023-11-27 17:28:46 +08:00
@fawn-nine	f53a3b1b62	订单金额展示bug	2023-11-24 17:36:03 +08:00
@fawn-nine	3e5f50b22d	bug修复	2023-11-24 10:32:56 +08:00
@fawn-nine	a79ee8f7f6	经穴检索添加权限	2023-11-23 17:15:38 +08:00
@fawn-nine	9e4980f9f4	.	2023-11-23 15:02:19 +08:00
@fawn-nine	d8bebc4bc4	地址信息完善	2023-11-23 13:59:49 +08:00
@fawn-nine	d097e6da6d	.	2023-11-22 17:19:03 +08:00
@fawn-nine	493d74d025	更新地址数据	2023-11-22 16:19:02 +08:00
@fawn-nine	31b73967a3	bug修复	2023-11-20 17:31:10 +08:00
yanwenlong	79fb0c430f	订单列表	2023-11-20 14:11:25 +08:00
@fawn-nine	1d04dffd4e	.	2023-11-20 09:08:34 +08:00
@fawn-nine	5277ab3f5b	境外短信验证登陆	2023-11-14 18:08:16 +08:00