diff --git a/pages.json b/pages.json
index 26a2601..6cb0218 100644
--- a/pages.json
+++ b/pages.json
@@ -523,6 +523,20 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/prescript/CNMedicineSearch",
+			"style": {
+				"navigationBarTitleText": "中药检索",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/prescript/CNMedicineSearchDetail",
+			"style": {
+				"navigationBarTitleText": "中药详情",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/medicaldes/medicaldes",
 			"style": {
diff --git a/pages/prescript/CNMedicineSearch.vue b/pages/prescript/CNMedicineSearch.vue
new file mode 100644
index 0000000..d202681
--- /dev/null
+++ b/pages/prescript/CNMedicineSearch.vue
@@ -0,0 +1,391 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="中药检索"></z-nav-bar>
+		<view class="contentBox">
+			<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="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>
+            <view v-show="!showSearchList">
+                <view class="titleList" v-if="curOneCateIndex != 2">
+                    <u-grid :col="1" v-if="titleList.length > 0">
+                        <u-grid-item v-for="(item, index) in titleList" :key="item.prescriptId"
+                            @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>
+                    <u-grid :col="1" v-if="titleList">
+                        <u-grid-item v-for="(item, index) in titleList" :key="index">
+                            <view :class="['titleItem']">{{index}}</view>
+                            <u-grid-item v-for="(item1, index1) in item" :key="item1.prescriptId">
+                                <view :class="['JFtitleItem']" @click="gotoDetail(item1)">{{item1.title}}</view>
+                            </u-grid-item>
+                        </u-grid-item>
+                    </u-grid>
+                    <u-divider v-else text="暂无中药数据哦~"></u-divider>
+                </view>
+            </view>
+		</view>
+		<u-popup mode="bottom" :show="xingweiShow" :round="10" @close="xingweiShow=false">
+			<view class="tanchu">
+				<view class="dp_title">性味选择</view>
+				<!-- <view class="flexbox">
+					<i @click="showEmj()" :class="emojiIcon"></i>
+					<editor id="editor" class="ql-container" :placeholder="placeholder" @ready="onEditorReady"></editor>
+				</view> -->
+
+				<view style="max-height: 1000rpx;overflow-y: scroll;">
+					<!-- 提交 -->
+					<view class="padding-bottom-sm flex padding-lr-sm" style="border-bottom: 1px solid #EEEEEE;">
+						
+						<view>
+							<u-button type="success" @click="goToSign">查询</u-button>
+
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import medicineSearch from './medicineSearch'
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		components: {
+			medicineSearch
+		},
+		data() {
+			return {
+				xingweiShow: false, // 查询条件弹出层，性味
+				gongxiaoShow: false, // 查询条件弹出层，功效
+				sanpinShow: false, // 查询条件弹出层，sanpin
+
+
+				searchValue: '',
+				twoCateList: [
+                    {title:"性味", id: 1},
+                    {title:"功效", id: 2},
+                    {title:"三品", id: 3}
+                ], // 二级分类标题
+				titleList: [], // 方剂标题
+				curFirstTabIndex: 0, // 20240128需求：在原来一级分类基础上再新加一级分类：方剂检索、药物检索
+				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) {
+				if (this.userMes.prescriptAPower == 0 && this.curOneCateIndex == 0) {
+					this.limitShow = true
+					return
+				}
+
+				if (this.userMes.prescriptBPower == 0 && this.curOneCateIndex == 3) {
+					this.limitShow = true
+					return
+				}
+				// 等于1 就是有权限
+				uni.navigateTo({
+					url: "./prescriptDetail?id=" + item.prescriptId
+				})
+			},
+			// 获取方剂名称
+			getTitles(id) {
+				$http.request({
+					url: "book/prescript/prescriptList",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						// loadAnimate: 'none', // 请求加载动画
+						'prescriptCategoryId': id,
+						"limit": 1000,
+						"page": 1
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '内容获取成功')
+					if (res.code == 0 && res.page.records.length > 0) {
+						this.titleList = res.page.records
+					} else {
+						this.titleList = []
+					}
+				}).catch(e => {
+					this.titleList = []
+					console.log(e)
+				})
+			},
+			setTwoCateIndex(item, index) {
+				let id = item.id
+				this.curTwoCateIndex = index
+                if(id == 1){
+                    this.xingweiShow = true
+                    this.gongxiaoShow = false
+                    this.sanpinShow = false
+                }
+			},
+
+			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()
+				}
+
+			},
+		},
+		onBackPress() {
+			// #ifdef APP-PLUS
+			plus.key.hideSoftKeybord();
+			// #endif
+		},
+	}
+</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;
+			}
+		}
+		.firstTab{
+			text {
+				text-align: center;
+				display: inline-block;
+				width: 50%;
+				padding: 20rpx 0;
+				margin-bottom: 10rpx;
+				font-size: 34rpx;
+				border-radius: 10rpx;
+			}
+		}
+
+		.twoCateList {
+			font-size: 28rpx;
+			margin-top: 20rpx;
+
+			.grid-text {
+				padding: 16rpx 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 10rpx;
+			}
+
+			.JFtitleItem {
+				background-color: #ffffff;
+				padding: 20rpx 10rpx;
+				width: 100%;
+				border-bottom: 0.5px solid #f8f9fa;
+			}
+		}
+	}
+
+
+	.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;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/prescript/CNMedicineSearchDetail.vue b/pages/prescript/CNMedicineSearchDetail.vue
new file mode 100644
index 0000000..e636741
--- /dev/null
+++ b/pages/prescript/CNMedicineSearchDetail.vue
@@ -0,0 +1,168 @@
+<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.img && prescriptDetail.img.length > 0">
+			<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
+				:duration="duration">
+				<swiper-item v-for="(item, index) in prescriptDetail.img" :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" v-if="prescriptDetail.latinname && prescriptDetail.latinname != ''" >
+					<view class="item">
+						{{prescriptDetail.latinname}}
+					</view>
+				</uni-section>
+				<uni-section class="mb-10" titleFontSize="18px" title="性味功效" type="line" v-if="prescriptDetail.property && prescriptDetail.property != ''" >
+					<view class="item" v-html="prescriptDetail.property">
+					</view>
+					<view class="item" v-html="prescriptDetail.taste">
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="来源产地" type="line" v-if="prescriptDetail.insuranceType && prescriptDetail.insuranceType != ''" >
+					<view class="item" v-html="prescriptDetail.insuranceType">
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="归经" type="line" v-if="prescriptDetail.tropism && prescriptDetail.tropism != ''" >
+					<view class="item" v-html="prescriptDetail.tropism">
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="别名" type="line" v-if="prescriptDetail.othername && prescriptDetail.othername != ''">
+					<view class="item" v-html="prescriptDetail.othername">
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="简述" type="line" v-if="prescriptDetail.description && prescriptDetail.description != ''">
+					<view class="item" v-html="prescriptDetail.description">
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="说明" type="line" v-if="prescriptDetail.information && prescriptDetail.information != ''">
+					<view class="item" v-html="prescriptDetail.information">
+					</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: {
+					img:[]
+				},
+				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/materials/getMaterials?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.img = [this.prescriptDetail.img]
+						}
+					}
+				}).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/prescript/medicineSearch.vue b/pages/prescript/medicineSearch.vue
index 776a185..46aebc3 100644
--- a/pages/prescript/medicineSearch.vue
+++ b/pages/prescript/medicineSearch.vue
@@ -5,9 +5,8 @@
             <text :class="[curOneCateIndex == index ? 'cur' : '']" @click="setOneCateIndex(item,index)"
                 v-for="(item, index) in ywTabList" :key="item.prescriptCategoryId">{{item.title}}</text>
         </view>
-        <view class="search_box" v-if="oneCateList.length > 0 && curOneCateIndex == 0">
-            <u-search @click="checkDisable" placeholder="请输入药物名" @focus="focus" @clear="clear" v-model="searchValue"
-                @input="input" @blur="blur" @search="search" @custom="search"></u-search>
+        <view class="search_box" v-if="oneCateList.length > 0 && curOneCateIndex == 0" @click="checkDisable">
+            <u-search placeholder="请输入药物名"></u-search>
         </view>
         <view class="searchList" v-show="showSearchList">
             <view class="itemBox" v-if="searchList.length > 0">
@@ -37,17 +36,16 @@
                 </u-grid>
                 <u-divider v-else text="暂无药物数据哦~"></u-divider>
             </view>
-            <!-- <view class="titleList" v-else>
-                <u-grid :col="1" v-if="titleList">
-                    <u-grid-item v-for="(item, index) in titleList" :key="index">
-                        <view :class="['titleItem']">{{index}}</view>
-                        <u-grid-item v-for="(item1, index1) in item" :key="item1.id">
-                            <view :class="['JFtitleItem']" @click="gotoDetail(item1)">{{item1.title}}</view>
-                        </u-grid-item>
+            <view class="titleList" v-else>
+                <u-grid :col="1" v-if="titleList.length > 0">
+                    <view style="font-size: 15px;padding: 5px;color: red;">大家常看的</view>
+                    <u-grid-item v-for="(item, index) in titleList" :key="item.id"
+                        @click="gotoCNDetail(item)" style="align-items: flex-start;border-bottom: 2px solid #fff;">
+                        <view :class="['titleItem']">{{item.name}}</view>
                     </u-grid-item>
                 </u-grid>
                 <u-divider v-else text="暂无药物数据哦~"></u-divider>
-            </view> -->
+            </view>
         </view>
 	</view>
 </template>
@@ -96,9 +94,12 @@ export default {
             limitContent: ''
         }
     },
+    // onLoad() {
+    //     this.getCNYao()
+    // },
 	methods: {
 		setOneCateIndex(item, index) {
-            let id = item.prescriptCategoryId
+            // let id = item.prescriptCategoryId
             this.curOneCateIndex = index
             this.curTwoCateIndex = 0
             this.searchValue = ''
@@ -108,6 +109,7 @@ export default {
                 this.getXiYao(1,1)
             } else { // 中药检索
                 // this.getTowCateList(id)
+                this.getCNYao() // book/materials/getMaterialsList
             }
         },
         setTwoCateIndex(item, index) {
@@ -152,6 +154,48 @@ export default {
                 url: "./medicineSearchDetail?id=" + item.id
             })
         },
+        // 获取中药
+        getCNYao(id, type) {
+            $http.request({
+                url: "book/materials/getMaterialsList",
+                method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+                data: {
+                    // loadAnimate: 'none', // 请求加载动画
+                    "limit": 10,
+                    "current": 1,
+                    "name":"",
+                    "type": "", // 植物、矿物、动物
+                    "effect": "",//功效 
+                    "taste": "", //味
+                    "property": "", //性
+                    "tropism":"" //归经
+                },
+                header: { //默认 无 说明：请求头
+                    'Content-Type': 'application/json'
+                },
+            }).then(res => {
+                console.log(res, '内容获取成功')
+                if (res.code == 0 && res.result.records.length > 0) {
+                    this.titleList = res.result.records
+                } else {
+                    this.titleList = []
+                }
+            }).catch(e => {
+                this.titleList = []
+                console.log(e)
+            })
+        },
+        gotoCNDetail(item) {
+            console.log('2222')
+            uni.navigateTo({
+                url: "./CNMedicineSearchDetail?id=" + item.id
+            })
+        },
+        checkDisable(){
+            uni.navigateTo({
+                url: "./CNMedicineSearch"
+            })
+        }
 	}
 };
 </script>
diff --git a/pages/prescript/prescript.vue b/pages/prescript/prescript.vue
index c30b111..7c8ea5a 100644
--- a/pages/prescript/prescript.vue
+++ b/pages/prescript/prescript.vue
@@ -58,8 +58,8 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="curFirstTabIndex==1">
-				<medicineSearch></medicineSearch>
+			<view v-show="curFirstTabIndex==1">
+				<medicineSearch ref="mSearch"></medicineSearch>
 			</view>
 		</view>
 		<u-modal :show="limitShow" :title="limitTitle" :content='limitContent' @confirm="limitShow=false">
@@ -221,6 +221,9 @@
 				
 				if (index == 1) {
 					// this.setOneCateIndex(id)
+					console.log(this.$refs)
+					console.log(this.$refs.mSearch)
+					this.$refs.mSearch.getCNYao()
 				}else{
 					this.setOneCateIndex(this.oneCateList[0], 0)
 				}