From 8dca4bd5dee482751d78766653090cebd8281dbc Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 24 Jun 2024 10:47:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=B4=E9=97=A8=E5=8C=BB?=
 =?UTF-8?q?=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/buyPup.vue                     |   4 +-
 pages.json                                |  44 +-
 pages/course/courseDetail.vue             |   2 +-
 pages/course/index.vue                    |   1 -
 pages/course/myCourse.vue                 | 116 +++-
 pages/medicaldes/medicaldes.vue           | 759 ++++++++++++++++++++
 pages/medicaldes/medicaldesDetail.vue     | 174 +++++
 pages/medicaldes/medurl.vue               |  45 ++
 pages/medicaldes/recordDetail.vue         | 169 +++++
 pages/medicaldes/video.vue                | 201 ++++++
 pages/medicaldes/xueshugongxianDetail.vue | 196 ++++++
 pages/medicaldes/zhuanzhuchuban.vue       | 808 ++++++++++++++++++++++
 pages/peanut/home.vue                     |   8 +-
 13 files changed, 2504 insertions(+), 23 deletions(-)
 create mode 100644 pages/medicaldes/medicaldes.vue
 create mode 100644 pages/medicaldes/medicaldesDetail.vue
 create mode 100644 pages/medicaldes/medurl.vue
 create mode 100644 pages/medicaldes/recordDetail.vue
 create mode 100644 pages/medicaldes/video.vue
 create mode 100644 pages/medicaldes/xueshugongxianDetail.vue
 create mode 100644 pages/medicaldes/zhuanzhuchuban.vue

diff --git a/components/buyPup.vue b/components/buyPup.vue
index 9442d50..7c2676c 100644
--- a/components/buyPup.vue
+++ b/components/buyPup.vue
@@ -16,10 +16,10 @@
 						<u-icon name="bag" color="#fff" size="28"></u-icon>
 						<text>立即购买</text>
 					</view>
-					<view class="saveBtnss gouwuche flexbox" @click="oprate('gouwuche')">
+					<!-- <view class="saveBtnss gouwuche flexbox" @click="oprate('gouwuche')">
 						<uni-icons type="cart" size="28" style="color: #666;"></uni-icons>
 						<text>加入购物车</text>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</u-popup>
diff --git a/pages.json b/pages.json
index 50eecb4..f8863ab 100644
--- a/pages.json
+++ b/pages.json
@@ -461,7 +461,49 @@
 					"popGesture": "none"
 				}
 			}
-		}		
+		},
+		{
+			"path": "pages/medicaldes/medicaldes",
+			"style": {
+				"navigationBarTitleText": "吴门医述",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicaldes/zhuanzhuchuban",
+			"style": {
+				"navigationBarTitleText": "专著出版",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicaldes/xueshugongxianDetail",
+			"style": {
+				"navigationBarTitleText": "学术贡献详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicaldes/medicaldesDetail",
+			"style": {
+				"navigationBarTitleText": "医述详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicaldes/recordDetail",
+			"style": {
+				"navigationBarTitleText": "纪实详情",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/medicaldes/video",
+			"style": {
+				"navigationBarTitleText": "医述详情",
+				"enablePullDownRefresh": false
+			}
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue
index 797e104..80358a3 100644
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -512,7 +512,7 @@
 					})
 					return
 				}
-				return false
+				
 				let images = ''
 				if (this.uploadPicLIst.length > 0) {
 					let list = this.uploadPicLIst.map(item => item.url)
diff --git a/pages/course/index.vue b/pages/course/index.vue
index 7bbc8e7..2e797a3 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -277,7 +277,6 @@
 								this.status = 2 // 加载完成
 
 							} else {
-
 								this.status = 3 // 暂无数据
 							}
 							console.log('status', this.status)
diff --git a/pages/course/myCourse.vue b/pages/course/myCourse.vue
index de2d835..1d60f22 100644
--- a/pages/course/myCourse.vue
+++ b/pages/course/myCourse.vue
@@ -108,7 +108,7 @@
 					</view>
 					<view class="buyItems">
 						<view class="txt555" @click="onPageJump('/pages/course/courseDetail',item.id)">							
-								{{item.title}}							
+								{{item.title}}-{{item.catalogueTitle}}						
 						</view>
 						<view class="jianjie" v-html="item.content">
 			
@@ -215,7 +215,8 @@
 					page: 1,
 					flag: false
 				},
-				oldValue : ''
+				oldValue : '',
+				cartList:[]
 
 			};
 		},
@@ -286,8 +287,101 @@
 				}
 			},
 			// 购物车
-			addCart(){
-				
+			addCart(val){
+				console.log(val)				
+				if (val.productStock == 0) {
+					uni.showToast({
+						title: '商品库存不足',
+						icon: "none"						
+					});
+				} else {
+					console.log(this.userInfo, '222')
+					this.$http
+						.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
+						.then(res => {				
+							// console.log(
+							this.cartList = res.cartList
+							// this.isAddLink(val)
+						})
+				}
+			},
+			// 加入购物车
+			isAddLink(item) {
+				// 统计商品信息
+				let data = {
+					"userId": this.userInfo.id,
+					"productId": item.productId,
+					"productAmount": this.productAmount,
+					"price": item.price
+				}
+				// 判断列表是否为空
+				if (this.cartList.length > 0) {
+					let flag = ''
+					let shagnpin = {}
+					// 循环购物车列表
+					flag = this.cartList.some((item, index) => {
+						if (item.productId == data.productId) {
+							shagnpin = item
+							shagnpin.productAmount = item.productAmount + 1
+							return true
+						}
+					})
+					if (flag) {
+						// 已在购物车中添加
+						$http.request({
+							url: "book/ordercart/update",
+							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+							data: shagnpin,
+							header: { //默认 无 说明：请求头
+								'Content-Type': 'application/json'
+							},
+						}).then(res => {
+							if (res.code == 0) {
+								this.upoShow = false
+								uni.showToast({
+									title: '加入购物车成功',
+									duration: 1000,
+								});
+							}
+						})
+					} else {
+						// 加入购物车
+						$http.request({
+							url: "book/ordercart/save",
+							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+							data,
+							header: { //默认 无 说明：请求头
+								'Content-Type': 'application/json'
+							},
+						}).then(res => {
+							if (res.code == 0) {
+								this.upoShow = false
+								uni.showToast({
+									title: '加入购物车成功',
+									duration: 1000,
+								});
+							}
+						})
+					}
+			
+				} else {
+					// 购物车列表为空时直接加入购物车
+					$http.request({
+						url: "book/ordercart/save",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data,
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						if (res.code == 0) {
+							uni.showToast({
+								title: '加入购物车成功',
+								duration: 1000,
+							});
+						}
+					})
+				}
 			},
 			// 直接购买
 			buy(val){
@@ -464,7 +558,7 @@
 						},
 					})
 					.then(res => {
-						if (res.code == 0) {
+						if (res.code == 0 && res.courseList != null) {
 							if (res.courseList.length > 0) {
 								this.ExpiredCourseList.list = res.courseList								
 								// if (res.courseList.pages > this.ExpiredCourseList.page) {
@@ -475,7 +569,9 @@
 							} else {
 								this.ExpiredCourseList.status = 3 // 暂无数据
 							}
-							console.log('status', this.ExpiredCourseList.status)
+							console.log('status-------------------', this.ExpiredCourseList.status)
+						}else{
+							this.ExpiredCourseList.status = 3 // 暂无数据
 						}
 						// this.ExpiredCourseList.flag = false
 					}).catch(e => {
@@ -571,7 +667,7 @@
 							url: "sociology/product/getProductListForCourse",
 							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
 							data: {
-								"id": val.id
+								"id": val.catalogueId
 							},
 							header: { //默认 无 说明：请求头
 								'Content-Type': 'application/json'
@@ -593,11 +689,7 @@
 				
 					this.pricespop = true
 				
-			},
-			// 获取续费商品
-			getCourseProList(){
-				
-			},
+			},			
 			// 跳转
 			onPageJump(url, id) {
 				uni.navigateTo({
diff --git a/pages/medicaldes/medicaldes.vue b/pages/medicaldes/medicaldes.vue
new file mode 100644
index 0000000..b128431
--- /dev/null
+++ b/pages/medicaldes/medicaldes.vue
@@ -0,0 +1,759 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="吴门医述"></z-nav-bar>
+		<!-- <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="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.type">{{item.title}}</text>
+			</view>
+			<!-- <view class="search_box" v-if="oneCateList.length > 0">
+				<u-search @click="checkDisable" placeholder="请输入方剂名" @focus="focus" @clear="clear" v-model="searchValue"
+					@input="input" @blur="blur" @search="search" @custom="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)">
+						{{item.title}}
+					</view>
+				</view>
+				<view v-else class="">
+					<u-divider text="未找到相关方剂哦~"></u-divider>
+				</view>
+			</view> -->
+			<!-- </scroll-view> -->
+			<view v-show="!showSearchList">
+				<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.dictType"
+							@click="setTwoCateIndex(item, index)">
+							<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.dictValue}}</view>
+						</u-grid-item>
+					</u-grid>
+				</view>
+				<!-- 吴门缘起-吴门之徽 -->
+				<view class="titleList" v-if="curOneCateIndex == 2&&curTwoCateIndex == 2">
+					<u-grid :col="3" v-if="titleList.length > 0">
+						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="previewImage(item.url)"
+							style="align-items: flex-start;">
+							<!-- <view :class="['titleItem']">{{item.name}}</view> -->
+							<img :src="item.url" alt="" class="wmzhimg" mode="aspectFit">
+						</u-grid-item>
+					</u-grid>
+					<u-divider v-else text="暂无数据哦~"></u-divider>
+				</view>
+				<!-- 学术贡献-学术思想和学术平台 -->
+				<view class="titleList" v-else-if="curOneCateIndex == 0&&(curTwoCateIndex == 0||curTwoCateIndex == 2)">
+					<u-grid :col="1" v-if="titleList.length > 0">
+						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
+							style="align-items: flex-start;border-bottom: 2px solid #fff;">
+							<view :class="['titleItem']">{{item.title}}</view>
+						</u-grid-item>
+					</u-grid>
+					<u-divider v-else text="暂无数据哦~"></u-divider>
+				</view>
+				<!-- 学术贡献-出版专著 -->
+				<view class="titleList" v-else-if="curOneCateIndex == 0&&(curTwoCateIndex == 1)">
+					<u-divider text="点击标签进入出版专著"></u-divider>
+				</view>
+				<!-- 其他 -->
+				<view class="titleList" v-else>
+					<u-grid :col="1" v-if="titleList.length > 0&&(curOneCateIndex==0||curOneCateIndex==2)">
+						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
+							style="align-items: flex-start;border-bottom: 2px solid #fff;">
+							<view :class="['titleItem']">{{item.name}}</view>
+						</u-grid-item>
+					</u-grid>
+					<u-grid :col="1" v-if="titleList.length > 0&&curOneCateIndex==3">
+						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
+							style="align-items: flex-start;border-bottom: 2px solid #fff;">
+							<view :class="['titleItem']">{{item.title}}</view>
+						</u-grid-item>
+					</u-grid>
+					<view :col="1" v-if="titleList.length > 0&&curOneCateIndex==1">
+						<view v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
+							style="align-items: flex-start;border-bottom: 2px solid #fff;display: flex;padding: 20rpx 0;">
+							<view style="width: 280rpx;text-align: center;">
+								<img src=""  v-if="item.imageslist&&item.imageslist.length==0" class="chImage">
+								<img :src="item.imageslist&&item.imageslist[0]" v-else class="chImage">
+							</view>
+							<view :class="['titleItem']">{{item.name}}</view>
+						</view>
+					</view>
+					<u-divider text="暂无数据哦~" v-if="titleList.length==0"></u-divider>
+				</view>
+			</view>
+		</view>
+
+
+		<!-- <view class="search_box flexbox" @click="">
+			<view class="search">
+				<text class="icon_search"></text>
+				<text class="prompt">请输入方剂名</text>
+			</view>
+		</view> -->
+
+		<!-- <u-modal :show="limitShow" :title="limitTitle" :content='limitContent' @confirm="limitShow=false">
+			<view class="limiTy">
+				<view v-if="curOneCateIndex == 0">
+					此功能使用权限仅对同一手机账号注册过一路健康APP，且开通《吴门验方基础班》【上中下】与《吴门验方提高班》【上下】五部课程的疯子读书APP学员开通。
+					<br>如果您符合条件，请联系微信客服开通。
+					<br>客服微信：<b>yilujiankangkefu</b>
+				</view>
+				<view v-if="curOneCateIndex == 3">
+					此功能使用权限仅对在疯子读书APP购买《肿瘤六经辨证法》书籍的学员开通。
+					<br>如果您符合条件，请联系微信客服开通。
+					<br>客服微信：<b>yilujiankangkefu</b>
+				</view>
+			</view>
+		</u-modal> -->
+
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				playData: {},
+				searchValue: '',
+				oneCateList: [{
+					title: "学术贡献",
+					type: 'medicaldesBookType'
+				}, {
+					title: "学术传承",
+					type: 'inheritType'
+				}, {
+					title: "吴门缘起",
+					type: 'lightType'
+				// }, {
+				// 	title: "吴门纪实",
+				// 	type: 'recordType'
+				}], // 一级分类标题1
+				twoCateList: [], // 二级分类标题
+				titleList: [], // 方剂标题
+				curOneCateIndex: 0, // 当前选中的一级分类
+				curTwoCateIndex: 0, // 当前选中的二级分类
+				searchList: [], // 搜索结果数组
+				showSearchList: false,
+				userMes: {}, // 用户信息
+				searchDisable: false, // 搜索不可用
+				limitShow: false,
+				limitTitle: '提示',
+				limitContent: ''
+			}
+		},
+		onLoad() {
+			this.getUserInfo()
+			// this.getCateList()
+
+		},
+		onHide() {
+			// this.showSearchList = false
+			// this.searchList = []
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		methods: {
+			// 检查是有权限使用搜索功能
+			checkDisable() {
+				console.log('点击了')
+			},
+			// 显示无权限弹窗
+			// 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) {
+				console.log('111', item)
+				console.log('this.curOneCateIndex', this.curOneCateIndex)
+				console.log('this.curTwoCateIndex', this.curTwoCateIndex)
+				if (this.curOneCateIndex == 0) {
+					uni.navigateTo({
+						// url: '../bookShop/commodityDetail?id=' + item.id
+						url: './xueshugongxianDetail?id=' + item.id
+					})
+					return
+				}
+				if (this.curOneCateIndex == 1) {
+					uni.navigateTo({
+						url: "./medicaldesDetail?id=" + item.id
+					})
+					return
+				}
+				if (this.curOneCateIndex == 2) {
+					console.log('111', item)
+					uni.navigateTo({
+						url: './video?title=' + item.name + '&src=' + item.url
+					})
+					return
+				}
+				if (this.curOneCateIndex == 3) {
+					console.log('111', item)
+					uni.navigateTo({
+						url: "./recordDetail?id=" + item.id
+					})
+					return
+				}
+			},
+			// 获取名称
+			getTitles(dictType) {
+				console.log('dictType', dictType)
+				if (this.curOneCateIndex == 0) {
+					if(dictType == 2){
+						uni.navigateTo({
+							url: './zhuanzhuchuban'
+						})
+						return
+					}
+					$http.request({
+						url: "book/generalArticle/articleByPage",
+						method: "POST",
+						data: {
+							// loadAnimate: 'none', // 请求加载动画
+							"type": dictType==1?'1':'2',
+							"limit": 1000,
+							"current": 1,
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						console.log(res, '内容获取成功')
+						if (res.code == 0 && res.result && res.result.records.length > 0) {
+							this.titleList = res.result.records
+						} else {
+							this.titleList = []
+						}
+					}).catch(e => {
+						this.titleList = []
+						console.log(e)
+					})
+				}
+				if (this.curOneCateIndex == 1) {
+					$http.request({
+						url: "book/medicaldes/inheritListByPage",
+						method: "POST",
+						data: {
+							// loadAnimate: 'none', // 请求加载动画
+							'dictType': dictType,
+							"limit": 1000,
+							"current": 1
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						console.log(res, '内容获取成功')
+						if (res.code == 0 && res.result.records.length > 0) {
+							this.titleList = res.result.records
+							for (let i = 0; i < this.titleList.length; i++) {
+								this.titleList[i].imageslist = [];
+								this.titleList[i].imageslist = this.titleList[i].img.split(";");
+							}
+						} else {
+							this.titleList = []
+						}
+					}).catch(e => {
+						this.titleList = []
+						console.log(e)
+					})
+				}
+				if (this.curOneCateIndex == 2) {
+					$http.request({
+						url: "book/medicaldes/lightListByType?type=" + dictType,
+						method: "POST",
+						data: {
+							// loadAnimate: 'none', // 请求加载动画
+							"limit": 1000,
+							"page": 1,
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						console.log(res, '内容获取成功')
+						if (res.code == 0 && res.result.length > 0) {
+							this.titleList = res.result
+						} else {
+							this.titleList = []
+						}
+					}).catch(e => {
+						this.titleList = []
+						console.log(e)
+					})
+				}
+				if (this.curOneCateIndex == 3) {
+					$http.request({
+						url: "book/medicaldes/recordByType?type=" + dictType,
+						method: "POST",
+						data: {
+							// loadAnimate: 'none', // 请求加载动画
+							"limit": 1000,
+							"page": 1,
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						console.log(res, '内容获取成功')
+						if (res.code == 0 && res.result.length > 0) {
+							this.titleList = res.result
+						} else {
+							this.titleList = []
+						}
+					}).catch(e => {
+						this.titleList = []
+						console.log(e)
+					})
+				}
+
+			},
+			setTwoCateIndex(item, index) {
+				let dictType = item.dictType
+				this.curTwoCateIndex = index
+				this.getTitles(dictType)
+			},
+			setOneCateIndex(item, index) {
+				// if(this.userMes.tgdzPower == 0){
+				// 	let that = this
+				// 	uni.showModal({
+				// 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
+				// 		confirmText: '好的',
+				// 		showCancel: false,
+				// 		success: function(res) {
+				// 			if (res.confirm) {
+				// 				// console.log('用户点击确定');								
+				// 			}
+				// 		}
+				// 	})
+				// 	return
+				// }
+				// if(item.title == "时辰取穴"){					
+				// 	uni.navigateTo({
+				// 		url: "../timeAcupoint/timeAcupoint"
+				// 	})
+				// 	return 
+				// }
+				let type = item.type
+				this.curOneCateIndex = index
+				this.curTwoCateIndex = 0
+				this.searchValue = ''
+				this.searchList = []
+				this.showSearchList = false
+				// if (index != 2) {
+				this.getTowCateList(type)
+				// } else {
+				// 	this.getJFList(dictType)
+				// }
+			},
+			getTowCateList(type) {
+				$http.request({
+					url: "book/medicaldes/typeList?label=" + type,
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						loadAnimate: 'none', // 请求加载动画
+						// 'categoryId': id
+					},
+					// header: { //默认 无 说明：请求头
+					// 	'Content-Type': 'application/json'
+					// },
+				}).then(res => {
+					console.log(res, '二级分类获取成功')
+					if (res.code == 0 && res.result.length >= 0) {
+						this.twoCateList = res.result
+						if (this.curOneCateIndex == 0) {
+							this.twoCateList = [{
+								'dictType': "1",
+								"dictValue": "学术思想"
+							}, {
+								'dictType': "2",
+								"dictValue": "出版专著"
+							}, {
+								'dictType': "3",
+								"dictValue": "学术平台"
+							}]
+						}
+						if (this.curOneCateIndex == 2) {
+							this.twoCateList = [{
+								'dictType': "1",
+								"dictValue": "吴门之歌"
+							}, {
+								'dictType': "2",
+								"dictValue": "巴山夜语"
+							}, {
+								'dictType': "3",
+								"dictValue": "吴门之徽"
+							}]
+						}
+						if (this.curOneCateIndex == 3) {
+							this.twoCateList = [{
+								'dictType': "1",
+								"dictValue": "学术贡献"
+							}, {
+								'dictType': "2",
+								"dictValue": "抗疫纪实"
+							}, {
+								'dictType': "3",
+								"dictValue": "吴门公益"
+							}]
+						}
+						this.getTitles(this.twoCateList[0].dictType)
+					} else {
+						this.twoCateList = []
+						this.titleList = []
+					}
+				}).catch(e => {
+					this.twoCateList = []
+					this.titleList = []
+					console.log(e)
+				})
+			},
+			transformData(inputData) {
+				const result = {};
+				inputData.forEach(item => {
+					const {
+						letter
+					} = item;
+					if (!result[letter]) {
+						result[letter] = [];
+					}
+					result[letter].push(item);
+				});
+				// const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
+				return result;
+			},
+			// getJFList(id) {
+			// 	$http.request({
+			// 		url: "book/prescript/prescriptListForJF",
+			// 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+			// 		data: {
+			// 			loadAnimate: 'none', // 请求加载动画
+			// 			'categoryId': id
+			// 		},
+			// 		header: { //默认 无 说明：请求头
+			// 			'Content-Type': 'application/json'
+			// 		},
+			// 	}).then(res => {
+			// 		if (res.code == 0 && res.list.length > 0) {
+			// 			this.twoCateList = []
+			// 			this.titleList = this.transformData(res.list)
+			// 			console.log('JF经方', this.titleList)
+			// 		} else {
+			// 			this.twoCateList = []
+			// 			this.titleList = []
+			// 		}
+			// 	}).catch(e => {
+			// 		this.twoCateList = []
+			// 		this.titleList = []
+			// 		console.log(e)
+			// 	})
+			// },
+			getCateList(id) {
+				id ? '' : id = 0
+				this.twoCateList = []
+				this.curTwoCateIndex = 0
+				// 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
+				// $http.request({
+				// 	url: "book/prescript/prescriptCategoryList",
+				// 	method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+				// 	data: {
+				// 		loadAnimate: 'none', // 请求加载动画
+				// 		'categoryId': id
+				// 	},
+				// 	header: { //默认 无 说明：请求头
+				// 		'Content-Type': 'application/json'
+				// 	},
+				// }).then(res => {
+				// console.log(res, '脉穴分类获取成功')
+				// if (res.code == 0 && res.list.length > 0) {
+				// this.oneCateList = res.list
+				this.getTowCateList(this.oneCateList[0].type)
+				// } else {
+				// 	this.oneCateList = []
+				// }
+				// }).catch(e => {
+				// 	this.oneCateList = []
+				// 	console.log(e)
+				// })
+			},
+
+			// 放大图片
+			previewImage(url) {
+				console.log(url)
+				uni.previewImage({
+					urls: [url],
+					longPressActions: {
+						itemList: ['很抱歉，暂不支持保存图片到本地'],
+						success: function(res) {
+							// console.log(res,'+++++')
+						}
+					}
+				});
+			},
+			// getSearch() {
+			// 	$http.request({
+			// 		url: "book/prescript/searchPrescript",
+			// 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+			// 		data: {
+			// 			loadAnimate: 'none', // 请求加载动画
+			// 			'keywords': this.searchValue,
+			// 			type: this.curOneCateIndex + 1
+			// 		},
+			// 		header: { //默认 无 说明：请求头
+			// 			'Content-Type': 'application/json'
+			// 		},
+			// 	}).then(res => {
+			// 		console.log(res, '搜索结果')
+			// 		if (res.code == 0 && res.list.length >= 0) {
+			// 			this.showSearchList = true
+			// 			this.searchList = res.list
+			// 		} else {
+			// 			this.searchList = []
+			// 		}
+			// 	}).catch(e => {
+			// 		// this.titleList = []	
+			// 		this.searchList = []
+			// 		console.log(e)
+			// 	})
+			// },
+			// search(res) {
+			// 	console.log(res, 'res')
+			// 	// uni.showToast({
+			// 	// 	title: '搜索：' + res,
+			// 	// 	icon: 'none'
+			// 	// })
+			// 	if (res == '') {
+			// 		this.showSearchList = false
+			// 		this.searchList = []
+			// 	} else {
+			// 		this.getSearch()
+			// 	}
+
+			// },
+			// input(res) {
+			// 	console.log('----input:', res)
+			// 	if (res == '') {
+			// 		this.searchList = []
+			// 	} else {
+			// 		this.getSearch()
+			// 	}
+			// },
+			// clear(res) {
+			// 	console.log('----clear:', res)
+			// 	// uni.showToast({
+			// 	// 	title: 'clear事件，清除值为：',
+			// 	// 	icon: 'none'
+			// 	// })
+			// 	this.searchValue = ''
+			// 	this.showSearchList = false
+			// },
+			// blur(res) {
+			// 	// console.log('----blur:', res)
+			// 	// if (res == '') {
+			// 	// 	this.showSearchList = false
+			// 	// 	this.searchList = []
+			// 	// } else {
+			// 	// 	this.getSearch()
+			// 	// }
+			// },
+			// focus(e) {
+			// 	console.log('----focus:')
+			// 	// uni.showToast({
+			// 	// 	title: 'focus事件，输出值为：' + e.value,
+			// 	// 	icon: 'none'
+			// 	// })
+			// 	// 等于1 就是有权限
+			// 	// this.showSearchList = true
+
+			// },
+			// cancel(res) {
+			// 	uni.showToast({
+			// 		title: '点击取消，输入值为：' + res.value,
+			// 		icon: 'none'
+			// 	})
+			// }
+		},
+		onBackPress() {
+			// #ifdef APP-PLUS
+			plus.key.hideSoftKeybord();
+			// #endif
+		},
+		components: {
+
+		},
+	}
+</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: #55aaff;
+				color: #fff;
+			}
+		}
+
+		.twoCateList {
+			font-size: 28rpx;
+			margin-top: 20rpx;
+
+			.grid-text {
+				padding: 30rpx 20rpx;
+				text-align: center;
+			}
+
+			.cur {
+				color: #55aaff;
+			}
+
+			// .u-grid-list{border: 0.5px solid #dadbde;}
+		}
+
+		.titleList {
+			font-size: 26rpx;
+			margin-top: 20rpx;
+			padding: 0 10rpx;
+			border-radius: 10rpx;
+			background-color: #f8f9fa;
+
+			.titleItem {
+				padding: 20rpx 10rpx;
+			}
+
+			.JFtitleItem {
+				background-color: #ffffff;
+				padding: 20rpx 10rpx;
+				width: 100%;
+				border-bottom: 0.5px solid #f8f9fa;
+			}
+
+			.wmzhimg {
+				width: 220rpx;
+				height: 220rpx;
+			}
+		}
+	}
+
+
+	.container {
+		padding: 10rpx;
+		height: 100vh;
+		background-color: #fff;
+	}
+
+	.search_box {
+		margin: 0 auto;
+		overflow: hidden;
+		align-items: center;
+		width: calc(100% - 10px);
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+
+		.search {
+			height: 56upx;
+			display: flex;
+			width: 86%;
+			margin: 0 auto;
+			align-items: center;
+			padding: 0upx 40upx;
+			background-color: #fff;
+			border-radius: 20upx;
+			box-shadow: 0 0px 10px 1px #54a96633;
+		}
+
+		.prompt {
+			color: #838383;
+			font-size: 24rpx;
+
+		}
+
+		.icon_search {
+			background-image: url('@/static/icon/map_ic_search.png');
+			background-position: center center;
+			background-repeat: no-repeat;
+			background-size: cover;
+			width: 36upx;
+			height: 36upx;
+			margin-right: 20upx;
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.uni-modal .uni-modal__bd {
+		text-align: left;
+	}
+
+	.limiTy {
+		font-size: 28rpx;
+		line-height: 46rpx;
+	}
+
+	.chImage {
+		height: 100rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/medicaldes/medicaldesDetail.vue b/pages/medicaldes/medicaldesDetail.vue
new file mode 100644
index 0000000..5fcb0ff
--- /dev/null
+++ b/pages/medicaldes/medicaldesDetail.vue
@@ -0,0 +1,174 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar :title="prescriptDetail.name"></z-nav-bar>
+		<view class="uni-margin-wrap"
+			v-if="prescriptDetail && prescriptDetail.images && prescriptDetail.images.length > 0">
+			<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
+				:duration="duration">
+				<swiper-item v-for="(item, index) in prescriptDetail.images" :key="index">
+					<view class="swiper-item">
+						<image :src="item" mode="aspectFit" @click="previewImage(item)"></image>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="contentBox">
+			<view class="content">
+				<uni-section class="mb-10" titleFontSize="18px" title="姓名" type="line">
+					<view class="item">
+						{{prescriptDetail.name}}
+					</view>
+				</uni-section>
+				<uni-section class="mb-10" titleFontSize="18px" title="城市" type="line"
+					v-if="prescriptDetail.city_name && prescriptDetail.city_name != ''">
+					<view class="item" v-html="prescriptDetail.city_name">
+					</view>
+				</uni-section>
+				<uni-section class="mb-10" titleFontSize="18px" title="详细介绍" type="line"
+					v-if="prescriptDetail.content && prescriptDetail.content != ''">
+					<view class="item" v-html="prescriptDetail.content">
+					</view>
+				</uni-section>
+
+				<!-- <uni-section class="mb-10" titleFontSize="18px" title="配伍" type="line">
+					<view class="item" v-if="prescriptDetail.compatibility && prescriptDetail.compatibility != ''" v-html="prescriptDetail.compatibility">
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="文献" type="line">
+					<view class="item" v-if="prescriptDetail.literature && prescriptDetail.literature != ''" v-html="prescriptDetail.literature">
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section> -->
+
+			</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';
+	export default {
+		data() {
+			return {
+				playData: {},
+				prescriptDetail: {
+					images: []
+				},
+				id: null,
+				indicatorDots: true,
+				autoplay: true,
+				interval: 5000,
+				duration: 500,
+			}
+		},
+		onLoad(e) {
+			this.id = e.id
+		},
+		onShow() {
+			this.getDetail()
+		},
+		methods: {
+			// 放大图片
+			previewImage(url) {
+				console.log(url)
+				uni.previewImage({
+					urls: [url],
+					longPressActions: {
+						itemList: ['很抱歉，暂不支持保存图片到本地'],
+						success: function(res) {
+							// console.log(res,'+++++')
+						}
+					}
+				});
+			},
+			// 方剂详情
+			getDetail() {
+				$http.request({
+					url: "book/medicaldes/getInheritById?id=" + this.id,
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						// loadAnimate: 'none', // 请求加载动画
+						// 'prescriptId': this.prescriptId
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '内容获取成功')
+					if (res.code == 0) {
+						this.prescriptDetail = res.result
+						if (this.prescriptDetail.img) {
+							this.prescriptDetail.images = this.prescriptDetail.img.split(';');
+						}
+					}
+				}).catch(e => {
+					// this.titleList = []		
+					console.log(e)
+				})
+			},
+
+		},
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.contentBox {
+		padding-bottom: 20rpx;
+	}
+
+	.mb-10 {
+		margin-bottom: 10px;
+	}
+
+	.content {
+		font-size: 28rpx;
+	}
+
+	.swiper-item {
+		image {
+			margin: 0 auto;
+			height: 250rpx;
+		}
+
+	}
+
+	.uni-margin-wrap {
+		margin-bottom: 20rpx;
+		padding-top: 20rpx;
+		background-color: #fff;
+	}
+
+	.container {
+		padding: 10rpx;
+
+		// background-color: #fff;
+		.item {
+			color: #666;
+			padding: 10rpx 20rpx;
+			padding-bottom: 20rpx;
+			line-height: 46rpx;
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	/deep/ .uni-section-header__decoration.line {
+		background-color: #18bc37;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/medicaldes/medurl.vue b/pages/medicaldes/medurl.vue
new file mode 100644
index 0000000..cd4331e
--- /dev/null
+++ b/pages/medicaldes/medurl.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar></z-nav-bar>
+		<view class="contentBox">
+		
+			<web-view :webview-styles="webviewStyles" :src="id"></web-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				webviewStyles: {
+					progress: {
+						color: '#000'
+					}
+				}
+			};
+		},
+		onLoad(e) {
+			this.id = uni.getStorageSync('prescriptUrl')
+		},
+		computed: {
+
+		},
+		watch: {
+
+		},
+		mounted() {
+
+		},
+		methods: {
+
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+</style>
\ No newline at end of file
diff --git a/pages/medicaldes/recordDetail.vue b/pages/medicaldes/recordDetail.vue
new file mode 100644
index 0000000..5dbcc96
--- /dev/null
+++ b/pages/medicaldes/recordDetail.vue
@@ -0,0 +1,169 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar :title="prescriptDetail.title"></z-nav-bar>
+		<view class="uni-margin-wrap"
+			v-if="prescriptDetail && prescriptDetail.images && prescriptDetail.images.length > 0">
+			<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
+				:duration="duration">
+				<swiper-item v-for="(item, index) in prescriptDetail.images" :key="index">
+					<view class="swiper-item">
+						<image :src="item" mode="aspectFit" @click="previewImage(item)"></image>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="contentBox">
+			<view class="content">
+				<uni-section class="mb-10" titleFontSize="18px" title="标题" type="line">
+					<view class="item">
+						{{prescriptDetail.title}}
+					</view>
+				</uni-section>
+				<uni-section class="mb-10" titleFontSize="18px" title="内容" type="line"
+					v-if="prescriptDetail.content && prescriptDetail.content != ''">
+					<view class="item" v-html="prescriptDetail.content">
+					</view>
+				</uni-section>
+
+				<!-- <uni-section class="mb-10" titleFontSize="18px" title="配伍" type="line">
+					<view class="item" v-if="prescriptDetail.compatibility && prescriptDetail.compatibility != ''" v-html="prescriptDetail.compatibility">
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="文献" type="line">
+					<view class="item" v-if="prescriptDetail.literature && prescriptDetail.literature != ''" v-html="prescriptDetail.literature">
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section> -->
+
+			</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';
+	export default {
+		data() {
+			return {
+				playData: {},
+				prescriptDetail: {
+					images: []
+				},
+				id: null,
+				indicatorDots: true,
+				autoplay: true,
+				interval: 5000,
+				duration: 500,
+			}
+		},
+		onLoad(e) {
+			this.id = e.id
+		},
+		onShow() {
+			this.getDetail()
+		},
+		methods: {
+			// 放大图片
+			previewImage(url) {
+				console.log(url)
+				uni.previewImage({
+					urls: [url],
+					longPressActions: {
+						itemList: ['很抱歉，暂不支持保存图片到本地'],
+						success: function(res) {
+							// console.log(res,'+++++')
+						}
+					}
+				});
+			},
+			// 方剂详情
+			getDetail() {
+				$http.request({
+					url: "book/medicaldes/getRecordById?id=" + this.id,
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						// loadAnimate: 'none', // 请求加载动画
+						// 'prescriptId': this.prescriptId
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '内容获取成功')
+					if (res.code == 0) {
+						this.prescriptDetail = res.result
+						if (this.prescriptDetail.image) {
+							this.prescriptDetail.images = this.prescriptDetail.image.split(';');
+						}
+					}
+				}).catch(e => {
+					// this.titleList = []		
+					console.log(e)
+				})
+			},
+
+		},
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.contentBox {
+		padding-bottom: 20rpx;
+	}
+
+	.mb-10 {
+		margin-bottom: 10px;
+	}
+
+	.content {
+		font-size: 28rpx;
+	}
+
+	.swiper-item {
+		image {
+			margin: 0 auto;
+			height: 250rpx;
+		}
+
+	}
+
+	.uni-margin-wrap {
+		margin-bottom: 20rpx;
+		padding-top: 20rpx;
+		background-color: #fff;
+	}
+
+	.container {
+		padding: 10rpx;
+
+		// background-color: #fff;
+		.item {
+			color: #666;
+			padding: 10rpx 20rpx;
+			padding-bottom: 20rpx;
+			line-height: 46rpx;
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	/deep/ .uni-section-header__decoration.line {
+		background-color: #18bc37;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/medicaldes/video.vue b/pages/medicaldes/video.vue
new file mode 100644
index 0000000..1c63d4c
--- /dev/null
+++ b/pages/medicaldes/video.vue
@@ -0,0 +1,201 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar :title="title"></z-nav-bar>
+		<view class="contentBox">
+			<!-- <view class="video_box" :style="{ height: screenHeight + 'px'}"> -->
+				<video
+					class="video_file"
+					:id="`video_${objId}`"
+					:ref="`video_${objId}`"
+					:src="src"
+					:poster="poster"
+					loop
+					object-fit="contain"
+					:show-play-btn="false"
+					:show-center-play-btn="false"
+					:controls="false"
+					:enable-progress-gesture="false"
+					:autoplay="videoPlayId == objId"
+					:style="'height: '+screenHeight + 'px'"
+					@timeupdate="onScheduleChange"
+					@waiting="onWaiting"
+				></video>
+				<!-- <view class="bottom_mask"></view> -->
+				<!-- 播放按钮 -->
+				<view class="play_btn" @click="onPlay">
+					<image class="icon_play" v-if="playState == 1000" src="http://qn.kemean.cn/upload/202103/08/1615183536616rn7yfe5g.png" mode="aspectFit"></image>
+				</view>
+				<view class="play_schedule" :style="{bottom: progressBottom + 'rpx'}">
+					<view class="schedule_bg"></view>
+					<view class="schedule" :style="{ width: schedule + 'rpx' }"></view>
+					<view class="progress_drag_dot" v-if="progressDrag"></view>
+				</view>
+			<!-- </view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex';
+export default {
+	data() {
+		return {
+			schedule: 0,
+			// 1000 待播放
+			// 2000 播放中
+			// 3000 播放缓冲中
+			playState: 1000,
+			// 是否拖动进度
+			progressDrag: false,
+			// 视频总长度
+			duration: 0,
+			videoCtx: null,
+			objId:''
+		};
+	},
+	onLoad(e) {
+		console.log('1111',e)
+		this.src = e.src
+		this.title = e.title
+	},
+	computed: {
+		...mapState(['videoPlayId'])
+	},
+	watch: {
+		videoPlayId(val) {
+			if (val == this.objId) {
+				setTimeout(() => {
+					this.videoCtx.play();
+					this.playState = 2000;
+				}, 200);
+			} else {
+				setTimeout(() => {
+					this.videoCtx.pause();
+					this.videoCtx.seek(0);
+					this.playState = 1000;
+					this.schedule = 0;
+				},100);
+			}
+		}
+	},
+	mounted() {
+		console.log('src', this.src)
+		this.videoCtx = uni.createVideoContext(`video_${this.objId}`, this);
+		if(this.videoPlayId == this.objId){
+			setTimeout(() => {
+				this.videoCtx.play();
+				this.playState = 2000;
+			}, 200);
+		}
+		let throttling = true;
+		uni.$on("videoProgress", res => {
+			if(throttling){
+				throttling = false;
+				setTimeout(() => {
+					throttling = true;
+					if (res.progress == 1) {
+						this.progressDrag = true;
+					} else {
+						this.progressDrag = false;
+					}
+					if (this.videoPlayId == this.objId && res.progressValue) {
+						this.schedule = res.progressValue * 750;
+						this.videoCtx.seek(this.duration * res.progressValue);
+					}
+				}, 100);
+			}
+		});
+	},
+	methods: {
+		onScheduleChange(e) {
+			this.duration = e.detail.duration;
+			if (!this.progressDrag) {
+				this.schedule = (parseFloat(e.detail.currentTime) / e.detail.duration) * 750;
+			}
+		},
+		onPlay() {
+			if (this.playState == 2000) {
+				this.videoCtx.pause();
+				this.playState = 1000;
+			} else if (this.playState == 1000) {
+				this.videoCtx.play();
+				this.playState = 2000;
+			} else if (this.playState == 3000) {
+				this.videoCtx.play();
+				this.playState = 2000;
+			}
+		},
+		// 视频进入缓冲中
+		onWaiting() {
+			this.playState = 3000;
+		},
+		onError(e){
+			console.log("视频播放出错", e);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/style/mixin.scss';
+.video_box {
+	position: relative;
+	width: 750rpx;
+}
+.bottom_mask {
+	position: absolute;
+	left: 0rpx;
+	bottom: 0rpx;
+	right: 0rpx;
+	height: 300rpx;
+	width: 750rpx;
+	background-image: linear-gradient(to bottom, rgba(0,0,0,0) , rgba(0,0,0,0.7)); 
+}
+.video_file {
+	width: 750rpx;
+}
+.play_schedule {
+	position: absolute;
+	bottom: 6rpx;
+	left: 0;
+	height: 16rpx;
+	width: 750rpx;
+	flex-direction: row;
+	align-items: center;
+	justify-content: flex-start;
+}
+.schedule_bg {
+	position: absolute;
+	top: 7rpx;
+	left: 0;
+	right: 0;
+	height: 2rpx;
+	background-color: rgba(255, 255, 255, 0.3);
+}
+.schedule {
+	background-color: #fff;
+	height: 2rpx;
+	position: relative;
+}
+.progress_drag_dot {
+	width: 16rpx;
+	height: 16rpx;
+	border-radius: 50%;
+	background-color: #fff;
+}
+.play_btn {
+	position: absolute;
+	top: 50%;
+	left: 45%;
+	right: 0;
+	bottom: 0;
+	justify-content: center;
+	align-items: center;
+}
+.icon_play {
+	width: 90rpx;
+	height: 90rpx;
+}
+</style>
diff --git a/pages/medicaldes/xueshugongxianDetail.vue b/pages/medicaldes/xueshugongxianDetail.vue
new file mode 100644
index 0000000..87feca8
--- /dev/null
+++ b/pages/medicaldes/xueshugongxianDetail.vue
@@ -0,0 +1,196 @@
+<template>
+  <view class="container">
+    <!-- 公共组件-每个页面必须引入 -->
+    <public-module></public-module>
+    <z-nav-bar :title="prescriptDetail.title"></z-nav-bar>
+    <view
+      class="contentBox"
+      v-if="prescriptDetail.content && prescriptDetail.contentType == 1"
+    >
+      <view class="content">
+        <!-- <uni-section class="mb-10" titleFontSize="18px" title="标题" type="line"> -->
+        <view class="item title-center">
+          {{ prescriptDetail.title }}
+        </view>
+        <!-- </uni-section> -->
+        <!-- <uni-section class="mb-10" titleFontSize="18px" title="内容" type="line"> -->
+        <view class="item" v-html="prescriptDetail.content"> </view>
+        <!-- </uni-section> -->
+        <!-- <view class="item" v-html="prescriptDetail.content">
+				</view> -->
+      </view>
+    </view>
+    <view class="fullscreen-webview" v-else>
+		<span style="z-index: 2; position: fixed; top: 0; left: 0; background-color: red;">< 返回</span>
+      <web-view :src="prescriptDetail.url"> </web-view>
+    </view>
+    <music-play :playData="playData"></music-play>
+  </view>
+</template>
+
+<script>
+import musicPlay from "@/components/music.vue";
+import $http from "@/config/requestConfig.js";
+export default {
+  data() {
+    return {
+      playData: {},
+      prescriptDetail: {
+        images: [],
+      },
+      id: null,
+      indicatorDots: true,
+      autoplay: true,
+      interval: 5000,
+      duration: 500,
+    };
+  },
+  onLoad(e) {
+    this.id = e.id;
+	// #ifdef APP-PLUS
+	 const pages = getCurrentPages()
+	 const page = pages[pages.length - 1];
+	 const currentWebview = page.$getAppWebview()
+	 currentWebview.setStyle({
+	 	titleNView: {
+	 		buttons: [{
+	 			float: 'right',
+	 			type: 'close',
+	 			onclick: function() {				
+					uni.navigateBack({
+						delta: 1
+					});				
+	 			}
+	 		}]
+	 	}
+	 })
+	// #endif
+  },
+  onShow() {
+    this.getDetail();
+  },
+  methods: {
+    // 放大图片
+    previewImage(url) {
+      console.log(url);
+      uni.previewImage({
+        urls: [url],
+        longPressActions: {
+          itemList: ["很抱歉，暂不支持保存图片到本地"],
+          success: function (res) {
+            // console.log(res,'+++++')
+          },
+        },
+      });
+    },
+    // 方剂详情
+    getDetail() {
+      $http
+        .request({
+          url: "book/generalArticle/getArticleById?id=" + this.id,
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data: {
+            // loadAnimate: 'none', // 请求加载动画
+            // 'prescriptId': this.prescriptId
+          },
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          console.log(res, "内容获取成功");
+          if (res.code == 0) {
+            this.prescriptDetail = res.result;
+            if (
+              this.prescriptDetail.content &&
+              this.prescriptDetail.contentType == 1
+            ) {
+              this.prescriptDetail.content = res.result.content.replace(
+                /<img/g,
+                '<img style="max-width: 100%;"'
+              );
+            }
+            // if (this.prescriptDetail.image) {
+            // 	this.prescriptDetail.images = this.prescriptDetail.image.split(';');
+            // }
+          }
+        })
+        .catch((e) => {
+          // this.titleList = []
+          console.log(e);
+        });
+    },
+  },
+  components: {
+    musicPlay,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.contentBox {
+  padding-bottom: 20rpx;
+}
+.contentBoxwebwiew {
+  height: 100%;
+  // .webwiew{
+  // 	height: 100%;
+  // }
+}
+.fullscreen-webview {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.mb-10 {
+  margin-bottom: 10px;
+}
+
+.content {
+  font-size: 28rpx;
+}
+
+.swiper-item {
+  image {
+    margin: 0 auto;
+    height: 250rpx;
+  }
+}
+
+.uni-margin-wrap {
+  margin-bottom: 20rpx;
+  padding-top: 20rpx;
+  background-color: #fff;
+}
+
+.container {
+  padding: 10rpx;
+
+  // background-color: #fff;
+  .item {
+    // color: #666;
+    padding: 10rpx 20rpx;
+    padding-bottom: 20rpx;
+    line-height: 46rpx;
+  }
+  .title-center {
+    text-align: center;
+    font-size: 32rpx;
+    font-weight: 700 !important;
+  }
+}
+
+.flexbox {
+  display: flex;
+}
+
+/deep/ .uni-section-header__decoration.line {
+  background-color: #18bc37;
+}
+</style>
\ No newline at end of file
diff --git a/pages/medicaldes/zhuanzhuchuban.vue b/pages/medicaldes/zhuanzhuchuban.vue
new file mode 100644
index 0000000..3b62788
--- /dev/null
+++ b/pages/medicaldes/zhuanzhuchuban.vue
@@ -0,0 +1,808 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="专著出版"></z-nav-bar>
+		<!-- <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="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.type">{{item.title}}</text>
+			</view> -->
+			<!-- <view class="search_box" v-if="oneCateList.length > 0">
+				<u-search @click="checkDisable" placeholder="请输入方剂名" @focus="focus" @clear="clear" v-model="searchValue"
+					@input="input" @blur="blur" @search="search" @custom="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)">
+						{{item.title}}
+					</view>
+				</view>
+				<view v-else class="">
+					<u-divider text="未找到相关方剂哦~"></u-divider>
+				</view>
+			</view> -->
+			<!-- </scroll-view> -->
+			<view v-show="!showSearchList">
+				<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.dictType"
+							@click="setTwoCateIndex(item, index)">
+							<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.dictValue}}</view>
+						</u-grid-item>
+					</u-grid>
+				</view>
+				<!-- 吴门缘起-吴门之徽 -->
+				<view class="titleList" v-if="curOneCateIndex == 2&&curTwoCateIndex == 2">
+					<u-grid :col="3" v-if="titleList.length > 0">
+						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="previewImage(item.url)"
+							style="align-items: flex-start;">
+							<!-- <view :class="['titleItem']">{{item.name}}</view> -->
+							<img :src="item.url" alt="" class="wmzhimg" mode="aspectFit">
+						</u-grid-item>
+					</u-grid>
+					<u-divider v-else text="暂无数据哦~"></u-divider>
+				</view>
+				<!-- 其他 -->
+				<view class="titleList" v-else>
+					<u-grid :col="1" v-if="titleList.length > 0&&(curOneCateIndex==0||curOneCateIndex==2)">
+						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
+							style="align-items: flex-start;border-bottom: 2px solid #fff;">
+							<view :class="['titleItem']">{{item.name}}</view>
+						</u-grid-item>
+					</u-grid>
+					<u-grid :col="1" v-if="titleList.length > 0&&curOneCateIndex==3">
+						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
+							style="align-items: flex-start;border-bottom: 2px solid #fff;">
+							<view :class="['titleItem']">{{item.title}}</view>
+						</u-grid-item>
+					</u-grid>
+					<view :col="1" v-if="titleList.length > 0&&curOneCateIndex==1">
+						<view v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
+							style="align-items: flex-start;border-bottom: 2px solid #fff;display: flex;padding: 20rpx 0;">
+							<view style="width: 280rpx;text-align: center;">
+								<img src=""  v-if="item.imageslist&&item.imageslist.length==0" class="chImage">
+								<img :src="item.imageslist&&item.imageslist[0]" v-else class="chImage">
+							</view>
+							<view :class="['titleItem']">{{item.name}}</view>
+						</view>
+					</view>
+					<u-divider text="暂无数据哦~" v-if="titleList.length==0"></u-divider>
+				</view>
+			</view>
+		</view>
+
+
+		<!-- <view class="search_box flexbox" @click="">
+			<view class="search">
+				<text class="icon_search"></text>
+				<text class="prompt">请输入方剂名</text>
+			</view>
+		</view> -->
+
+		<!-- <u-modal :show="limitShow" :title="limitTitle" :content='limitContent' @confirm="limitShow=false">
+			<view class="limiTy">
+				<view v-if="curOneCateIndex == 0">
+					此功能使用权限仅对同一手机账号注册过一路健康APP，且开通《吴门验方基础班》【上中下】与《吴门验方提高班》【上下】五部课程的疯子读书APP学员开通。
+					<br>如果您符合条件，请联系微信客服开通。
+					<br>客服微信：<b>yilujiankangkefu</b>
+				</view>
+				<view v-if="curOneCateIndex == 3">
+					此功能使用权限仅对在疯子读书APP购买《肿瘤六经辨证法》书籍的学员开通。
+					<br>如果您符合条件，请联系微信客服开通。
+					<br>客服微信：<b>yilujiankangkefu</b>
+				</view>
+			</view>
+		</u-modal> -->
+
+		<!-- <z-navigation></z-navigation> -->
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				playData: {},
+				searchValue: '',
+				oneCateList: [{
+					title: "专著出版",
+					type: 'medicaldesBookType'
+				}, {
+					title: "学术传承",
+					type: 'inheritType'
+				}, {
+					title: "吴门缘起",
+					type: 'lightType'
+				}, {
+					title: "吴门纪实",
+					type: 'recordType'
+				}], // 一级分类标题1
+				twoCateList: [], // 二级分类标题
+				titleList: [], // 方剂标题
+				curOneCateIndex: 0, // 当前选中的一级分类
+				curTwoCateIndex: 0, // 当前选中的二级分类
+				searchList: [], // 搜索结果数组
+				showSearchList: false,
+				userMes: {}, // 用户信息
+				searchDisable: false, // 搜索不可用
+				limitShow: false,
+				limitTitle: '提示',
+				limitContent: ''
+			}
+		},
+		onLoad() {
+			this.getUserInfo()
+			// this.getCateList()
+
+		},
+		onHide() {
+			// this.showSearchList = false
+			// this.searchList = []
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		methods: {
+			// 检查是有权限使用搜索功能
+			checkDisable() {
+				console.log('点击了')
+			},
+			// 显示无权限弹窗
+			// 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, '呼呼')
+						});
+				}
+			},
+			appjumpfun() {
+				let bagName = 'com.cn.nuttyreading'
+				let schemes = 'nuttyreading'										
+				// if(name == 'everhealth'){
+				if (plus.os.name == "Android") { //安卓
+					if (plus.runtime.isApplicationExist({ //查看安卓系统手机有没有下载这款app
+							pname: bagName, //B款app云打包的包名
+						})) { //安装了app
+						plus.runtime.launchApplication({ //打开app
+							pname: bagName, //B款app云打包的包名
+							extra: {
+								url: `${schemes}://${bagName}` //B款app配置的schemes+云打包的包名
+							},
+							function(e) {
+								console.log("Open system default browser failed: " + e.message);
+							}
+						})
+					} else { //未安装app
+						plus.runtime.openURL(`https://a.app.qq.com/o/simple.jsp?pkgname=${bagName}`, function(res) {
+							console.log(res);
+						});
+					}
+				} else if (plus.os.name == "iOS") { //苹果											
+					plus.runtime.launchApplication({
+						action: "${schemes}://"
+					}, function(e) {
+						plus.runtime.openURL(`https://a.app.qq.com/o/simple.jsp?pkgname=${bagName}`, function(
+						res) {													
+							console.log(res);
+						});
+					});
+					// }
+			
+				}
+			},
+			// 详情
+			gotoDetail(item) {
+				console.log('111', item)
+				console.log('this.curOneCateIndex', this.curOneCateIndex)
+				console.log('this.curTwoCateIndex', this.curTwoCateIndex)
+				if (this.curOneCateIndex == 0) {
+					console.log('点我了');
+					uni.showModal({
+						content:'详细内容请跳转至“疯子读书app”内查看',
+						cancelText:'知道了',
+						confirmText:'打开疯子读书',
+						success: function (res) {
+								if (res.confirm) {
+									console.log('用户点击确定');
+									// this.appjumpfun()
+									let bagName = 'com.cn.nuttyreading'
+									let schemes = 'nuttyreading'										
+									// if(name == 'everhealth'){
+									if (plus.os.name == "Android") { //安卓
+										if (plus.runtime.isApplicationExist({ //查看安卓系统手机有没有下载这款app
+												pname: bagName, //B款app云打包的包名
+											})) { //安装了app
+											plus.runtime.launchApplication({ //打开app
+												pname: bagName, //B款app云打包的包名
+												extra: {
+													url: `${schemes}://${bagName}` //B款app配置的schemes+云打包的包名
+												},
+												function(e) {
+													console.log("Open system default browser failed: " + e.message);
+												}
+											})
+										} else { //未安装app
+											plus.runtime.openURL(`https://a.app.qq.com/o/simple.jsp?pkgname=${bagName}`, function(res) {
+												console.log(res);
+											});
+										}
+									} else if (plus.os.name == "iOS") { //苹果											
+										plus.runtime.launchApplication({
+											action: "${schemes}://"
+										}, function(e) {
+											plus.runtime.openURL(`https://a.app.qq.com/o/simple.jsp?pkgname=${bagName}`, function(
+											res) {													
+												console.log(res);
+											});
+										});
+										// }
+												
+									}
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+					})
+					uni.navigateTo({
+						// url: '../bookShop/commodityDetail?id=' + item.id
+						url: '../eBook/bookContent?Id=' + item.id
+					})
+					return
+				}
+				if (this.curOneCateIndex == 1) {
+					uni.navigateTo({
+						url: "./medicaldesDetail?id=" + item.id
+					})
+					return
+				}
+				if (this.curOneCateIndex == 2) {
+					console.log('111', item)
+					uni.navigateTo({
+						url: './video?title=' + item.name + '&src=' + item.url
+					})
+					return
+				}
+				if (this.curOneCateIndex == 3) {
+					console.log('111', item)
+					uni.navigateTo({
+						url: "./recordDetail?id=" + item.id
+					})
+					return
+				}
+			},
+			// 获取名称
+			getTitles(dictType) {
+				console.log('dictType', dictType)
+				if (this.curOneCateIndex == 0) {
+					$http.request({
+						url: "book/medicaldes/bookListByType?type=" + dictType,
+						method: "POST",
+						data: {
+							// loadAnimate: 'none', // 请求加载动画
+							"limit": 1000,
+							"page": 1,
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						console.log(res, '内容获取成功')
+						if (res.code == 0 && res.result.length > 0) {
+							this.titleList = res.result
+						} else {
+							this.titleList = []
+						}
+					}).catch(e => {
+						this.titleList = []
+						console.log(e)
+					})
+				}
+				if (this.curOneCateIndex == 1) {
+					$http.request({
+						url: "book/medicaldes/inheritListByPage",
+						method: "POST",
+						data: {
+							// loadAnimate: 'none', // 请求加载动画
+							'dictType': dictType,
+							"limit": 1000,
+							"current": 1
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						console.log(res, '内容获取成功')
+						if (res.code == 0 && res.result.records.length > 0) {
+							this.titleList = res.result.records
+							for (let i = 0; i < this.titleList.length; i++) {
+								this.titleList[i].imageslist = [];
+								this.titleList[i].imageslist = this.titleList[i].img.split(";");
+							}
+						} else {
+							this.titleList = []
+						}
+					}).catch(e => {
+						this.titleList = []
+						console.log(e)
+					})
+				}
+				if (this.curOneCateIndex == 2) {
+					$http.request({
+						url: "book/medicaldes/lightListByType?type=" + dictType,
+						method: "POST",
+						data: {
+							// loadAnimate: 'none', // 请求加载动画
+							"limit": 1000,
+							"page": 1,
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						console.log(res, '内容获取成功')
+						if (res.code == 0 && res.result.length > 0) {
+							this.titleList = res.result
+						} else {
+							this.titleList = []
+						}
+					}).catch(e => {
+						this.titleList = []
+						console.log(e)
+					})
+				}
+				if (this.curOneCateIndex == 3) {
+					$http.request({
+						url: "book/medicaldes/recordByType?type=" + dictType,
+						method: "POST",
+						data: {
+							// loadAnimate: 'none', // 请求加载动画
+							"limit": 1000,
+							"page": 1,
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						console.log(res, '内容获取成功')
+						if (res.code == 0 && res.result.length > 0) {
+							this.titleList = res.result
+						} else {
+							this.titleList = []
+						}
+					}).catch(e => {
+						this.titleList = []
+						console.log(e)
+					})
+				}
+
+			},
+			setTwoCateIndex(item, index) {
+				let dictType = item.dictType
+				this.curTwoCateIndex = index
+				this.getTitles(dictType)
+			},
+			setOneCateIndex(item, index) {
+				// if(this.userMes.tgdzPower == 0){
+				// 	let that = this
+				// 	uni.showModal({
+				// 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
+				// 		confirmText: '好的',
+				// 		showCancel: false,
+				// 		success: function(res) {
+				// 			if (res.confirm) {
+				// 				// console.log('用户点击确定');								
+				// 			}
+				// 		}
+				// 	})
+				// 	return
+				// }
+				// if(item.title == "时辰取穴"){					
+				// 	uni.navigateTo({
+				// 		url: "../timeAcupoint/timeAcupoint"
+				// 	})
+				// 	return 
+				// }
+				let type = item.type
+				this.curOneCateIndex = index
+				this.curTwoCateIndex = 0
+				this.searchValue = ''
+				this.searchList = []
+				this.showSearchList = false
+				// if (index != 2) {
+				this.getTowCateList(type)
+				// } else {
+				// 	this.getJFList(dictType)
+				// }
+			},
+			getTowCateList(type) {
+				$http.request({
+					url: "book/medicaldes/typeList?label=" + type,
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						loadAnimate: 'none', // 请求加载动画
+						// 'categoryId': id
+					},
+					// header: { //默认 无 说明：请求头
+					// 	'Content-Type': 'application/json'
+					// },
+				}).then(res => {
+					console.log(res, '二级分类获取成功')
+					if (res.code == 0 && res.result.length >= 0) {
+						this.twoCateList = res.result
+						if (this.curOneCateIndex == 2) {
+							this.twoCateList = [{
+								'dictType': "1",
+								"dictValue": "吴门之歌"
+							}, {
+								'dictType': "2",
+								"dictValue": "巴山夜语"
+							}, {
+								'dictType': "3",
+								"dictValue": "吴门之徽"
+							}]
+						}
+						if (this.curOneCateIndex == 3) {
+							this.twoCateList = [{
+								'dictType': "1",
+								"dictValue": "学术贡献"
+							}, {
+								'dictType': "2",
+								"dictValue": "抗疫纪实"
+							}, {
+								'dictType': "3",
+								"dictValue": "吴门公益"
+							}]
+						}
+						this.getTitles(this.twoCateList[0].dictType)
+					} else {
+						this.twoCateList = []
+						this.titleList = []
+					}
+				}).catch(e => {
+					this.twoCateList = []
+					this.titleList = []
+					console.log(e)
+				})
+			},
+			transformData(inputData) {
+				const result = {};
+				inputData.forEach(item => {
+					const {
+						letter
+					} = item;
+					if (!result[letter]) {
+						result[letter] = [];
+					}
+					result[letter].push(item);
+				});
+				// const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
+				return result;
+			},
+			// getJFList(id) {
+			// 	$http.request({
+			// 		url: "book/prescript/prescriptListForJF",
+			// 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+			// 		data: {
+			// 			loadAnimate: 'none', // 请求加载动画
+			// 			'categoryId': id
+			// 		},
+			// 		header: { //默认 无 说明：请求头
+			// 			'Content-Type': 'application/json'
+			// 		},
+			// 	}).then(res => {
+			// 		if (res.code == 0 && res.list.length > 0) {
+			// 			this.twoCateList = []
+			// 			this.titleList = this.transformData(res.list)
+			// 			console.log('JF经方', this.titleList)
+			// 		} else {
+			// 			this.twoCateList = []
+			// 			this.titleList = []
+			// 		}
+			// 	}).catch(e => {
+			// 		this.twoCateList = []
+			// 		this.titleList = []
+			// 		console.log(e)
+			// 	})
+			// },
+			getCateList(id) {
+				id ? '' : id = 0
+				this.twoCateList = []
+				this.curTwoCateIndex = 0
+				// 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
+				// $http.request({
+				// 	url: "book/prescript/prescriptCategoryList",
+				// 	method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+				// 	data: {
+				// 		loadAnimate: 'none', // 请求加载动画
+				// 		'categoryId': id
+				// 	},
+				// 	header: { //默认 无 说明：请求头
+				// 		'Content-Type': 'application/json'
+				// 	},
+				// }).then(res => {
+				// console.log(res, '脉穴分类获取成功')
+				// if (res.code == 0 && res.list.length > 0) {
+				// this.oneCateList = res.list
+				this.getTowCateList(this.oneCateList[0].type)
+				// } else {
+				// 	this.oneCateList = []
+				// }
+				// }).catch(e => {
+				// 	this.oneCateList = []
+				// 	console.log(e)
+				// })
+			},
+
+			// 放大图片
+			previewImage(url) {
+				console.log(url)
+				uni.previewImage({
+					urls: [url],
+					longPressActions: {
+						itemList: ['很抱歉，暂不支持保存图片到本地'],
+						success: function(res) {
+							// console.log(res,'+++++')
+						}
+					}
+				});
+			},
+			// getSearch() {
+			// 	$http.request({
+			// 		url: "book/prescript/searchPrescript",
+			// 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+			// 		data: {
+			// 			loadAnimate: 'none', // 请求加载动画
+			// 			'keywords': this.searchValue,
+			// 			type: this.curOneCateIndex + 1
+			// 		},
+			// 		header: { //默认 无 说明：请求头
+			// 			'Content-Type': 'application/json'
+			// 		},
+			// 	}).then(res => {
+			// 		console.log(res, '搜索结果')
+			// 		if (res.code == 0 && res.list.length >= 0) {
+			// 			this.showSearchList = true
+			// 			this.searchList = res.list
+			// 		} else {
+			// 			this.searchList = []
+			// 		}
+			// 	}).catch(e => {
+			// 		// this.titleList = []	
+			// 		this.searchList = []
+			// 		console.log(e)
+			// 	})
+			// },
+			// search(res) {
+			// 	console.log(res, 'res')
+			// 	// uni.showToast({
+			// 	// 	title: '搜索：' + res,
+			// 	// 	icon: 'none'
+			// 	// })
+			// 	if (res == '') {
+			// 		this.showSearchList = false
+			// 		this.searchList = []
+			// 	} else {
+			// 		this.getSearch()
+			// 	}
+
+			// },
+			// input(res) {
+			// 	console.log('----input:', res)
+			// 	if (res == '') {
+			// 		this.searchList = []
+			// 	} else {
+			// 		this.getSearch()
+			// 	}
+			// },
+			// clear(res) {
+			// 	console.log('----clear:', res)
+			// 	// uni.showToast({
+			// 	// 	title: 'clear事件，清除值为：',
+			// 	// 	icon: 'none'
+			// 	// })
+			// 	this.searchValue = ''
+			// 	this.showSearchList = false
+			// },
+			// blur(res) {
+			// 	// console.log('----blur:', res)
+			// 	// if (res == '') {
+			// 	// 	this.showSearchList = false
+			// 	// 	this.searchList = []
+			// 	// } else {
+			// 	// 	this.getSearch()
+			// 	// }
+			// },
+			// focus(e) {
+			// 	console.log('----focus:')
+			// 	// uni.showToast({
+			// 	// 	title: 'focus事件，输出值为：' + e.value,
+			// 	// 	icon: 'none'
+			// 	// })
+			// 	// 等于1 就是有权限
+			// 	// this.showSearchList = true
+
+			// },
+			// cancel(res) {
+			// 	uni.showToast({
+			// 		title: '点击取消，输入值为：' + res.value,
+			// 		icon: 'none'
+			// 	})
+			// }
+		},
+		onBackPress() {
+			// #ifdef APP-PLUS
+			plus.key.hideSoftKeybord();
+			// #endif
+		},
+		components: {
+
+		},
+	}
+</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;
+			}
+		}
+
+		.twoCateList {
+			font-size: 28rpx;
+			margin-top: 20rpx;
+
+			.grid-text {
+				padding: 30rpx 20rpx;
+				text-align: center;
+			}
+
+			.cur {
+				color: #5aaff3;
+			}
+
+			// .u-grid-list{border: 0.5px solid #dadbde;}
+		}
+
+		.titleList {
+			font-size: 26rpx;
+			margin-top: 20rpx;
+			padding: 0 10rpx;
+			border-radius: 10rpx;
+			background-color: #f8f9fa;
+
+			.titleItem {
+				padding: 20rpx 10rpx;
+			}
+
+			.JFtitleItem {
+				background-color: #ffffff;
+				padding: 20rpx 10rpx;
+				width: 100%;
+				border-bottom: 0.5px solid #f8f9fa;
+			}
+
+			.wmzhimg {
+				width: 220rpx;
+				height: 220rpx;
+			}
+		}
+	}
+
+
+	.container {
+		padding: 10rpx;
+		height: 100vh;
+		background-color: #fff;
+	}
+
+	.search_box {
+		margin: 0 auto;
+		overflow: hidden;
+		align-items: center;
+		width: calc(100% - 10px);
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+
+		.search {
+			height: 56upx;
+			display: flex;
+			width: 86%;
+			margin: 0 auto;
+			align-items: center;
+			padding: 0upx 40upx;
+			background-color: #fff;
+			border-radius: 20upx;
+			box-shadow: 0 0px 10px 1px #54a96633;
+		}
+
+		.prompt {
+			color: #838383;
+			font-size: 24rpx;
+
+		}
+
+		.icon_search {
+			background-image: url('@/static/icon/map_ic_search.png');
+			background-position: center center;
+			background-repeat: no-repeat;
+			background-size: cover;
+			width: 36upx;
+			height: 36upx;
+			margin-right: 20upx;
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.uni-modal .uni-modal__bd {
+		text-align: left;
+	}
+
+	.limiTy {
+		font-size: 28rpx;
+		line-height: 46rpx;
+	}
+
+	.chImage {
+		height: 100rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 258181b..3dad965 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -21,11 +21,7 @@
 				<div class="item flexbox" @click="onPageJump('/pages/course/myCourse')">
 					<image src="../../static/my_02.png" mode="aspectFit"></image>
 					<text>我的课程</text>
-				</div>
-				<div class="item flexbox" @click="onPageJump('/pages/taihu/index')">
-					<image src="../../static/my_05.png" mode="aspectFit"></image>
-					<text>太湖公益</text>
-				</div>
+				</div>				
 				<!-- <div class="item flexbox" @click="onPageJump()">
 					<image src="../../static/my_03.png" mode="aspectFit"></image>
 					<text>超V专享</text>
@@ -34,7 +30,7 @@
 					<image src="../../static/my_03.png" mode="aspectFit"></image>
 					<text>太湖讲堂</text>
 				</div> -->
-				<div class="item flexbox" @click="onPageJump()">
+				<div class="item flexbox" @click="onPageJump('/pages/medicaldes/medicaldes')">
 					<image src="../../static/my_04.png" mode="aspectFit"></image>
 					<text>吴门医述</text>
 				</div>