From 5ae322d192354d6bfa6a1f4b1bfb880c4ab921e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=93=BC=E5=94=A7L?= <xl376837995@163.com>
Date: Wed, 31 Jan 2024 15:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/guide-pages/guide-pages.vue     |   6 +-
 manifest.json                              |   4 +-
 pages.json                                 |   7 +
 pages/bookShop/commodityDetail.vue         |   8 +-
 pages/bookShop/orderLCont.vue              |   2 +-
 pages/classic/classic.vue                  |  42 +-
 pages/medicaldes/medurl.vue                |  45 ++
 pages/peanut/aboutUs.vue                   |   2 +-
 pages/prescript/CNMedicineSearch.vue       | 437 +++++++++++++------
 pages/prescript/CNMedicineSearchDetail.vue |   2 +
 pages/prescript/CNMedicineText.vue         | 191 +++++++++
 pages/prescript/medicineSearch.vue         | 472 +++++++++++----------
 pages/prescript/prescript.vue              |  33 +-
 pages/yian/yianList.vue                    | 106 +++--
 static/icon/earth.png                      | Bin 0 -> 5323 bytes
 static/jainsuo.png                         | Bin 0 -> 595 bytes
 style/common.scss                          |   4 +-
 17 files changed, 912 insertions(+), 449 deletions(-)
 create mode 100644 pages/medicaldes/medurl.vue
 create mode 100644 pages/prescript/CNMedicineText.vue
 create mode 100644 static/icon/earth.png
 create mode 100644 static/jainsuo.png

diff --git a/components/guide-pages/guide-pages.vue b/components/guide-pages/guide-pages.vue
index c9a2311..0a06c28 100644
--- a/components/guide-pages/guide-pages.vue
+++ b/components/guide-pages/guide-pages.vue
@@ -1,6 +1,6 @@
 <template>
 	<view v-if="show">
-		<swiper class="guide_pages_swiper">
+		<swiper class="guide_pages_swiper" indicator-dots="true" indicator-color="#d1d1d1" indicator-active-color="#54a966">
 			<swiper-item>
 				<view class="guide_pages_bg1">
 					疯子读书，
@@ -22,7 +22,7 @@
 					和光同尘，普惠人间
 				</view>
 				<button v-if="screenHeight > 667" class="guide_pages_close close_1624" @click="onClose">开始使用</button>
-				<button v-else class="guide_pages_close close_1334" @click="onClose">开始使用</button>
+				<button v-else class="guide_pages_close close_btj" @click="onClose">开始使用</button>
 			</swiper-item>
 		</swiper>
 	</view>
@@ -123,7 +123,7 @@
 			height: 68rpx;
 		}
 
-		.close_1334 {
+		.close_btj {
 			position: absolute;
 			top: 50%;
 			left: 50%;
diff --git a/manifest.json b/manifest.json
index 981d587..54032e0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.2.29",
-    "versionCode" : 1229,
+    "versionName" : "1.2.31",
+    "versionCode" : 1231,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true
diff --git a/pages.json b/pages.json
index 6cb0218..9432ed3 100644
--- a/pages.json
+++ b/pages.json
@@ -537,6 +537,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/prescript/CNMedicineText",
+			"style": {
+				"navigationBarTitleText": "中药搜索",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/medicaldes/medicaldes",
 			"style": {
diff --git a/pages/bookShop/commodityDetail.vue b/pages/bookShop/commodityDetail.vue
index bca8187..f60949d 100644
--- a/pages/bookShop/commodityDetail.vue
+++ b/pages/bookShop/commodityDetail.vue
@@ -110,7 +110,7 @@
 						</u-row>
 					</view>
 					<!-- <view class="commodityIntroduce" v-html="productInfo.productDetails"> -->
-					<view class="commodityIntroduce">						
+					<view class="commodityIntroduce">
 						<view v-if="productInfo.productDetails">
 							<rich-text v-if="productInfo.productDetails" class="xiangqing" @itemclick="showImg"
 								:nodes="productInfo.productDetails|formatRichText"></rich-text>
@@ -225,7 +225,7 @@
 				options: [{
 					icon: 'cart',
 					text: '购物车'
-				}],				
+				}],
 				buttonGroup: [{
 						text: '加入购物车',
 						backgroundColor: 'linear-gradient(90deg, #FFCD1E, #FF8A18)',
@@ -766,6 +766,10 @@
 	}
 </script>
 <style lang="scss" scoped>
+	.header_fixed {
+		background-color: #fff;
+	}
+
 	.tanchu {
 		background: #fff;
 		position: relative;
diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue
index d3e5c66..c754f20 100644
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -508,7 +508,7 @@
 			kefu(){
 				uni.showModal({
 					title: '提示',
-						content: '拨打客服热线：022-24142321',
+						content: '微信号：yilujiankangkefu',
 						success: function (res) {
 							if (res.confirm) {
 								uni.makePhoneCall({
diff --git a/pages/classic/classic.vue b/pages/classic/classic.vue
index 51cf1d7..bbb9734 100644
--- a/pages/classic/classic.vue
+++ b/pages/classic/classic.vue
@@ -33,7 +33,7 @@
 							<view>
 								<view class="flexbox yigoumaiList">
 									<view class="info">
-										<view class="videoBox demo-layout bg-purple"  @click="goDetail(item)">
+										<view class="videoBox demo-layout bg-purple" @click="goDetail(item)">
 											<image v-if="item.images != '' && item.images != null" :src="item.images"
 												mode="scaleToFill"></image>
 											<image v-else src="../../static/icon/wufeng.jpg" mode="scaleToFill"></image>
@@ -71,7 +71,8 @@
 													<image src="../../static/icon/home2.png" mode="aspectFit"></image>
 												</view>
 												<view v-else @click="noOp()">
-													<image class="gray" src="../../static/icon/home2.png" mode="aspectFit"></image>
+													<image class="gray" src="../../static/icon/home2.png"
+														mode="aspectFit"></image>
 												</view>
 												<view class="v1"><text>听 书</text></view>
 											</view>
@@ -142,8 +143,12 @@
 				status: 3,
 				bookList: [],
 			}
+		},
+		onShow() {
+
 		},
 		onLoad() {
+			this.bookList = []
 			this.getData()
 		},
 
@@ -173,11 +178,10 @@
 		methods: {
 			// 获取数据列表
 			getData() {
-				this.bookList=[]
 				$http.request({
 					url: "book/book/getClassicsBookList",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-					data:{
+					data: {
 						'bookType': this.contentShow,
 						'page': this.page,
 						'limit': 10
@@ -189,7 +193,9 @@
 					if (res.code == 0) {
 						console.log(res, '获取经典查阅书籍')
 						if (res.page.records.length > 0) {
-							this.bookList = this.bookList.concat(res.page.records)
+							for (var i = 0; i < res.page.records.length; i++) {
+								this.bookList.push(res.page.records[i])
+							}
 							this.totalPage = res.page.pages
 							if (this.page == this.totalPage) {
 								this.status = 1
@@ -198,9 +204,9 @@
 							}
 						}
 					}
-				
+
 				});
-				
+
 			},
 
 
@@ -264,6 +270,8 @@
 			// 切换
 			TabData(e) {
 				this.contentShow = e
+				this.page = 1
+				this.bookList = []
 				this.getData()
 			},
 
@@ -293,10 +301,10 @@
 				});
 			},
 			// 点不过去的
-			noOp(){
+			noOp() {
 				uni.showToast({
-					title:'该书未开通此功能',
-					icon:'none'
+					title: '该书未开通此功能',
+					icon: 'none'
 				})
 			},
 		},
@@ -512,13 +520,13 @@
 			}
 		}
 	}
-	
+
 	.gray {
-	    -webkit-filter: grayscale(100%);   
-	    -moz-filter: grayscale(100%);   
-	    -ms-filter: grayscale(100%);   
-	    -o-filter: grayscale(100%);     
-	    filter: grayscale(100%);
-	    filter: gray; 
+		-webkit-filter: grayscale(100%);
+		-moz-filter: grayscale(100%);
+		-ms-filter: grayscale(100%);
+		-o-filter: grayscale(100%);
+		filter: grayscale(100%);
+		filter: gray;
 	}
 </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/peanut/aboutUs.vue b/pages/peanut/aboutUs.vue
index af7a8ed..fc9cfbf 100644
--- a/pages/peanut/aboutUs.vue
+++ b/pages/peanut/aboutUs.vue
@@ -59,7 +59,7 @@
 			makeTel(){
 				uni.showModal({
 					title: '提示',
-						content: '拨打客服热线：022-24142321',
+						content: '微信号：yilujiankangkefu',
 						success: function (res) {
 							if (res.confirm) {
 								uni.makePhoneCall({
diff --git a/pages/prescript/CNMedicineSearch.vue b/pages/prescript/CNMedicineSearch.vue
index 17a4431..1eaaa06 100644
--- a/pages/prescript/CNMedicineSearch.vue
+++ b/pages/prescript/CNMedicineSearch.vue
@@ -5,14 +5,51 @@
 		<z-nav-bar title="中药检索"></z-nav-bar>
 		<view class="contentBox">
 			<view class="grid twoCateList" v-if="twoCateList.length > 0">
-                <u-grid :col="2" 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',false ? 'cur' : '']">{{item.title}}</view>
-                    </u-grid-item>
-                </u-grid>
-            </view>
-            <!-- <view class="searchList" v-show="showSearchList">
+				<u-grid :col="2" 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',false ? 'cur' : '']">
+							{{item.title}}
+							<b v-if="index==0&&xingweiShow">
+								<u-icon name="arrow-up-fill" color="#666" size="12"></u-icon>
+							</b>
+							<b v-if="index==0&&!xingweiShow">
+								<u-icon name="arrow-down-fill" color="#666" size="12"></u-icon>
+							</b>
+							<b v-if="index==1&&gongxiaoShow">
+								<u-icon name="arrow-up-fill" color="#666" size="12"></u-icon>
+							</b>
+							<b v-if="index==1&&!gongxiaoShow">
+								<u-icon name="arrow-down-fill" color="#666" size="12"></u-icon>
+							</b>
+						</view>
+					</u-grid-item>
+				</u-grid>
+			</view>
+			<view class="marYao" @click="xingweiShow = true"
+				v-if="curXingIndex.length>0||curWeiIndex.length>0||curGuijingIndex.length>0">
+				性味：
+				<span v-for="(item, index) in curXingIndex">
+					{{item}}
+					<font>,</font>
+				</span>
+				<span v-for="(item, index) in curWeiIndex">
+					{{item}}
+					<font>,</font>
+				</span>
+				<span v-for="(item, index) in curGuijingIndex">
+					{{item}}
+					<font>,</font>
+				</span>
+			</view>
+			<view class="marYao" @click="gongxiaoShow = true" v-if="curGongxiaoIndex.length>0">
+				功效：
+				<span v-for="(item, index) in curGongxiaoIndex">
+					{{item}}
+					<font v-if="index+1!=curGongxiaoIndex.length">,</font>
+				</span>
+			</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}}
@@ -22,7 +59,7 @@
                     <u-divider text="未找到相关中药哦~"></u-divider>
                 </view>
             </view> -->
-            <view v-show="!showSearchList">
+			<view v-show="!showSearchList">
 				<!-- <view class="grid twoCateList" v-if="twoCateList.length > 0 && curOneCateIndex == 1">
 					<u-grid :col="3" border class="u-grid-list">
 						<u-grid-item v-for="(item, index) in twoCateList" :key="item.prescriptCategoryId"
@@ -43,12 +80,25 @@
 				<view class="titleList">
 					<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;">
+						<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 v-if="status==0" style="text-align: center;padding: 20rpx 0;">
+							<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: 20rpx 0;">
+							<u-divider text="全部加载完成"></u-divider>
+						</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -59,7 +109,8 @@
 					<u-grid :col="3" border class="u-grid-list">
 						<u-grid-item v-for="(item, index) in xingSelectionList" :key="item.title"
 							@click="setXingIndex(item, index, curXingIndex)">
-							<view :class="['grid-text',curXingIndex.includes(item.title)  ? 'cur' : '']">{{item.title}}</view>
+							<view :class="['grid-text',curXingIndex.includes(item.title)  ? 'cur' : '']">{{item.title}}
+							</view>
 						</u-grid-item>
 					</u-grid>
 				</view>
@@ -68,7 +119,8 @@
 					<u-grid :col="3" border class="u-grid-list">
 						<u-grid-item v-for="(item, index) in weiSelectionList" :key="item.title"
 							@click="setXingIndex(item, index, curWeiIndex)">
-							<view :class="['grid-text',curWeiIndex.includes(item.title) ? 'cur' : '']">{{item.title}}</view>
+							<view :class="['grid-text',curWeiIndex.includes(item.title) ? 'cur' : '']">{{item.title}}
+							</view>
 						</u-grid-item>
 					</u-grid>
 				</view>
@@ -77,7 +129,9 @@
 					<u-grid :col="3" border class="u-grid-list">
 						<u-grid-item v-for="(item, index) in guijingSelectionList" :key="item.title"
 							@click="setXingIndex(item, index, curGuijingIndex)">
-							<view :class="['grid-text',curGuijingIndex.includes(item.title) ? 'cur' : '']">{{item.title}}</view>
+							<view :class="['grid-text',curGuijingIndex.includes(item.title) ? 'cur' : '']">
+								{{item.title}}
+							</view>
 						</u-grid-item>
 					</u-grid>
 				</view>
@@ -85,7 +139,7 @@
 					<!-- 提交 -->
 					<view class="padding-bottom-sm flex padding-lr-sm" style="border-bottom: 1px solid #EEEEEE;">
 						<view>
-							<u-button type="success" @click="goToSearch">查询</u-button>
+							<u-button type="success" @click="goNewSearch">查询</u-button>
 						</view>
 					</view>
 				</view>
@@ -98,7 +152,9 @@
 					<u-grid :col="3" border class="u-grid-list">
 						<u-grid-item v-for="(item, index) in gongxiaoSelectionList" :key="item.title"
 							@click="setXingIndex(item, index, curGongxiaoIndex)">
-							<view :class="['grid-text',curGongxiaoIndex.includes(item.title)  ? 'cur' : '']">{{item.title}}</view>
+							<view :class="['grid-text',curGongxiaoIndex.includes(item.title)  ? 'cur' : '']">
+								{{item.title}}
+							</view>
 						</u-grid-item>
 					</u-grid>
 				</view>
@@ -106,7 +162,7 @@
 					<!-- 提交 -->
 					<view class="padding-bottom-sm flex padding-lr-sm" style="border-bottom: 1px solid #EEEEEE;">
 						<view>
-							<u-button type="success" @click="goToSearch">查询</u-button>
+							<u-button type="success" @click="goNewSearch">查询</u-button>
 						</view>
 					</view>
 				</view>
@@ -130,66 +186,145 @@
 				xingweiShow: false, // 查询条件弹出层，性味
 				gongxiaoShow: false, // 查询条件弹出层，功效
 				sanpinShow: false, // 查询条件弹出层，sanpin
-				xingSelectionList: [
-					{title: "寒"},
-					{title: "凉"},
-					{title: "平"},
-					{title: "温"},
-					{title: "热"},
+				xingSelectionList: [{
+						title: "寒"
+					},
+					{
+						title: "凉"
+					},
+					{
+						title: "平"
+					},
+					{
+						title: "温"
+					},
+					{
+						title: "热"
+					},
 				],
-				weiSelectionList: [
-					{title: "酸"},
-					{title: "涩"},
-					{title: "甘"},
-					{title: "苦"},
-					{title: "辛"},
-					{title: "咸"},
-					{title: "淡"},
+				weiSelectionList: [{
+						title: "酸"
+					},
+					{
+						title: "涩"
+					},
+					{
+						title: "甘"
+					},
+					{
+						title: "苦"
+					},
+					{
+						title: "辛"
+					},
+					{
+						title: "咸"
+					},
+					{
+						title: "淡"
+					},
 				],
-				guijingSelectionList: [
-					{title: "心"},
-					{title: "肝"},
-					{title: "脾"},
-					{title: "肺"},
-					{title: "肾"},
-					{title: "肠"},
-					{title: "膀胱"},
-					{title: "胃"},
+				guijingSelectionList: [{
+						title: "心"
+					},
+					{
+						title: "肝"
+					},
+					{
+						title: "脾"
+					},
+					{
+						title: "肺"
+					},
+					{
+						title: "肾"
+					},
+					{
+						title: "肠"
+					},
+					{
+						title: "膀胱"
+					},
+					{
+						title: "胃"
+					},
 				],
 				curXingIndex: [],
 				curWeiIndex: [],
 				curGuijingIndex: [],
-				gongxiaoSelectionList: [
-					{title: "解表"},
-					{title: "清热"},
-					{title: "泻下"},
-					{title: "祛风湿"},
-					{title: "芳香化湿"},
-					{title: "利水渗湿"},
-					{title: "温里"},
-					{title: "理气"},
-					{title: "消食"},
-					{title: "驱虫"},
-					{title: "止血"},
-					{title: "活血祛瘀"},
-					{title: "化痰止咳平喘"},
-					{title: "安神"},
-					{title: "平肝息风"},
-					{title: "开窍"},
-					{title: "补虚"},
-					{title: "收涩"},
-					{title: "涌吐"},
-					{title: "外用及其他"},
+				gongxiaoSelectionList: [{
+						title: "解表"
+					},
+					{
+						title: "清热"
+					},
+					{
+						title: "泻下"
+					},
+					{
+						title: "祛风湿"
+					},
+					{
+						title: "芳香化湿"
+					},
+					{
+						title: "利水渗湿"
+					},
+					{
+						title: "温里"
+					},
+					{
+						title: "理气"
+					},
+					{
+						title: "消食"
+					},
+					{
+						title: "驱虫"
+					},
+					{
+						title: "止血"
+					},
+					{
+						title: "活血祛瘀"
+					},
+					{
+						title: "化痰止咳平喘"
+					},
+					{
+						title: "安神"
+					},
+					{
+						title: "平肝息风"
+					},
+					{
+						title: "开窍"
+					},
+					{
+						title: "补虚"
+					},
+					{
+						title: "收涩"
+					},
+					{
+						title: "涌吐"
+					},
+					{
+						title: "外用及其他"
+					},
 				],
 				curGongxiaoIndex: [],
-
-
 				searchValue: '',
-				twoCateList: [
-                    {title:"性味", id: 1},
-                    {title:"功效", id: 2},
-                    // {title:"三品", id: 3}
-                ], // 二级分类标题
+				twoCateList: [{
+						title: "性味",
+						id: 1
+					},
+					{
+						title: "功效",
+						id: 2
+					},
+					// {title:"三品", id: 3}
+				], // 二级分类标题
 				titleList: [], // 方剂标题
 				curFirstTabIndex: 0, // 20240128需求：在原来一级分类基础上再新加一级分类：方剂检索、药物检索
 				curOneCateIndex: 0, // 当前选中的一级分类
@@ -200,11 +335,15 @@
 				searchDisable: false, // 搜索不可用
 				limitShow: false,
 				limitTitle: '提示',
-				limitContent: ''
+				limitContent: '',
+				status: 3,
+				page: 1,
+				totalPage: 1,
 			}
 		},
 		onLoad() {
-			this.goToSearch()
+			this.goNewSearch()
+			this.titleList = []
 			// this.getUserInfo()
 			// this.getCateList()
 
@@ -212,6 +351,25 @@
 		onHide() {
 			// this.showSearchList = false
 			// this.searchList = []
+			this.page = 1
+		},
+
+		onPullDownRefresh() {
+			console.log('下拉刷新了')
+			// this.contentShow = 1
+			this.page = 1
+			this.goToSearch()
+			uni.stopPullDownRefresh();
+		},
+		onReachBottom() {
+			// this.loadingNow = true
+			console.log('到底了')
+			if (this.page + 1 <= this.totalPage) {
+				this.page++
+				this.goToSearch()
+			} else {
+				this.status = 1
+			}
 		},
 		computed: {
 			...mapState(['userInfo']),
@@ -229,22 +387,34 @@
 					// 若不包含，则向数组中添加该值
 					arr.push(item.title);
 				}
+				this.page = 1
+				this.titleList = []
+				this.goToSearch()
 				console.log(arr);
 			},
+			goNewSearch() {
+				this.page = 1
+				this.titleList = []
+				this.goToSearch()
+				this.xingweiShow = false
+				this.gongxiaoShow = false
+				this.sanpinShow = false
+			},
+
 			goToSearch() {
 				$http.request({
 					url: "book/materials/getMaterialsList",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
 					data: {
 						// loadAnimate: 'none', // 请求加载动画
-						"limit": 100,
-						"current": 1,
-						"name":"",
+						"limit": 20,
+						"current": this.page,
+						"name": "",
 						"type": "", // 植物、矿物、动物
-						"effect": this.curGongxiaoIndex.join(','),//功效 
+						"effect": this.curGongxiaoIndex.join(','), //功效 
 						"taste": this.curWeiIndex.join(','), //味
 						"property": this.curXingIndex.join(','), //性
-						"tropism":this.curGuijingIndex.join(',') //归经
+						"tropism": this.curGuijingIndex.join(',') //归经
 					},
 					header: { //默认 无 说明：请求头
 						'Content-Type': 'application/json'
@@ -252,11 +422,18 @@
 				}).then(res => {
 					console.log(res, '内容获取成功')
 					if (res.code == 0 && res.result.records.length > 0) {
-						this.titleList = res.result.records
-						
-						this.xingweiShow = false
-						this.gongxiaoShow = false
-						this.sanpinShow = false
+						for (var i = 0; i < res.result.records.length; i++) {
+							this.titleList.push(res.result.records[i])
+						}
+
+						this.totalPage = res.result.pages
+						if (this.page == this.totalPage) {
+							this.status = 1
+						} else {
+							this.status = 3
+						}
+
+
 					} else {
 						this.titleList = []
 					}
@@ -265,6 +442,7 @@
 					console.log(e)
 				})
 			},
+
 			gotoCNDetail(item) {
 				uni.navigateTo({
 					url: "./CNMedicineSearchDetail?id=" + item.id
@@ -289,17 +467,18 @@
 			setTwoCateIndex(item, index) {
 				let id = item.id
 				this.curTwoCateIndex = index
-                if(id == 1){
-                    this.xingweiShow = true
-                    this.gongxiaoShow = false
-                    this.sanpinShow = false
-                }
-				if(id == 2){
-                    this.xingweiShow = false
-                    this.gongxiaoShow = true
-                    this.sanpinShow = false
-                }
+				if (id == 1) {
+					this.xingweiShow = true
+					this.gongxiaoShow = false
+					this.sanpinShow = false
+				}
+				if (id == 2) {
+					this.xingweiShow = false
+					this.gongxiaoShow = true
+					this.sanpinShow = false
+				}
 			},
+
 		},
 		onBackPress() {
 			// #ifdef APP-PLUS
@@ -342,7 +521,8 @@
 				color: #fff;
 			}
 		}
-		.firstTab{
+
+		.firstTab {
 			text {
 				text-align: center;
 				display: inline-block;
@@ -361,13 +541,21 @@
 			.grid-text {
 				padding: 16rpx 20rpx;
 				text-align: center;
+
+
+			}
+
+			.grid-text>b {
+				margin-left: 10rpx;
+				display: inline-block;
+				vertical-align: middle;
 			}
 
 			.cur {
 				color: #55aa7f;
 			}
 
-			.u-grid-list{
+			.u-grid-list {
 				// border-top: 0.5px solid #dadbde;
 				// border-bottom: 0.5px solid #dadbde;
 			}
@@ -391,6 +579,32 @@
 				border-bottom: 0.5px solid #f8f9fa;
 			}
 		}
+
+		.marYao {
+			background-color: #55aa7f1c;
+			padding: 10rpx 20rpx 10rpx 20rpx;
+			margin-bottom: 10rpx;
+			font-size: 26rpx;
+			color: #225f40;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+
+			span {
+
+				color: #55aa7f;
+
+				font {
+					display: inline-block;
+					margin: 0 5rpx;
+				}
+			}
+
+		}
+
+		.marYao:nth-last-child(1) {
+			display: none;
+		}
 	}
 
 
@@ -400,42 +614,7 @@
 		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;
@@ -444,8 +623,8 @@
 	.uni-modal .uni-modal__bd {
 		text-align: left;
 	}
-	
-	.limiTy{
+
+	.limiTy {
 		font-size: 28rpx;
 		line-height: 46rpx;
 	}
diff --git a/pages/prescript/CNMedicineSearchDetail.vue b/pages/prescript/CNMedicineSearchDetail.vue
index 8072932..a1939e4 100644
--- a/pages/prescript/CNMedicineSearchDetail.vue
+++ b/pages/prescript/CNMedicineSearchDetail.vue
@@ -25,6 +25,8 @@
 					</view>
 					<view class="item" v-html="prescriptDetail.taste">
 					</view>
+					<view class="item" v-html="prescriptDetail.effect">
+					</view>
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="来源产地" type="line" v-if="prescriptDetail.insuranceType && prescriptDetail.insuranceType != ''" >
diff --git a/pages/prescript/CNMedicineText.vue b/pages/prescript/CNMedicineText.vue
new file mode 100644
index 0000000..310105f
--- /dev/null
+++ b/pages/prescript/CNMedicineText.vue
@@ -0,0 +1,191 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar title="中药搜索"></z-nav-bar>
+		<view class="contentBox">
+			<view class="search_box">
+				<u-search :clearabled="true" bgColor="#fff" borderColor="#54a966" focus v-model="keyword"
+					@custom='souYao' @clear="souYao"></u-search>
+			</view>
+			<view class="titleList">
+				<u-grid :col="1" v-if="titleList.length > 0">
+					<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 v-if="status==0" style="text-align: center;padding: 20rpx 0;">
+				<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: 20rpx 0;">
+				<u-divider text="全部加载完成"></u-divider>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				keyword: '',
+				titleList: [],
+				status: 3,
+				page: 1,
+				totalPage: 1,
+			}
+		},
+		onLoad() {
+			this.titleList = []
+		},
+		onHide() {
+			this.page = 1
+		},
+
+		onPullDownRefresh() {
+			console.log('下拉刷新了')
+			// this.contentShow = 1
+			this.page = 1
+			this.goToSearch()
+			uni.stopPullDownRefresh();
+		},
+		onReachBottom() {
+			// this.loadingNow = true
+			console.log('到底了')
+			if (this.page + 1 <= this.totalPage) {
+				this.page++
+				this.goToSearch()
+			} else {
+				this.status = 1
+			}
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		methods: {
+			// 搜索
+			goToSearch() {
+				$http.request({
+					url: "book/materials/getMaterialsList",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						// loadAnimate: 'none', // 请求加载动画
+						"limit": 20,
+						"current": this.page,
+						"name": this.keyword,
+						"type": "", // 植物、矿物、动物
+						"effect": '', //功效 
+						"taste": '', //味
+						"property": '', //性
+						"tropism": '' //归经
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '内容获取成功')
+					if (res.code == 0 && res.result.records.length > 0) {
+						for (var i = 0; i < res.result.records.length; i++) {
+							this.titleList.push(res.result.records[i])
+						}
+
+						this.totalPage = res.result.pages
+						if (this.page == this.totalPage) {
+							this.status = 1
+						} else {
+							this.status = 3
+						}
+
+
+					} else {
+						this.titleList = []
+					}
+				}).catch(e => {
+					this.titleList = []
+					console.log(e)
+				})
+			},
+
+			// 点击搜索
+			souYao() {
+				this.page = 1
+				this.titleList = []
+				this.goToSearch()
+			},
+			
+			// 跳转详情
+			gotoCNDetail(item) {
+				uni.navigateTo({
+					url: "./CNMedicineSearchDetail?id=" + item.id
+				})
+			},
+
+		},
+		onBackPress() {
+			// #ifdef APP-PLUS
+			plus.key.hideSoftKeybord();
+			// #endif
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		padding: 10rpx;
+		height: 100vh;
+		background-color: #fff;
+	}
+
+	.contentBox {
+
+		.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;
+			}
+		}
+
+
+	}
+
+	.search_box {
+		margin: 0 auto;
+		overflow: hidden;
+		align-items: center;
+		width: calc(100% - 10px);
+		margin-top: 20rpx;
+		margin-bottom: 20rpx;
+
+
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/prescript/medicineSearch.vue b/pages/prescript/medicineSearch.vue
index dfaa6fc..2fc3975 100644
--- a/pages/prescript/medicineSearch.vue
+++ b/pages/prescript/medicineSearch.vue
@@ -2,206 +2,243 @@
 <template>
 	<view class="contentBox">
 		<view class="oneCateList flexbox">
-            <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" @click="checkDisable">
-            <u-search placeholder="请输入药物名" :showAction="false"></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>
-        <view v-show="!showSearchList">
-            <view class="grid twoCateList" v-if="twoCateList.length > 0 && curOneCateIndex == 1">
-                <u-grid :col="3" border class="u-grid-list">
-                    <u-grid-item v-for="(item, index) in twoCateList" :key="item.prescriptCategoryId"
-                        @click="setTwoCateIndex(item, index)">
-                        <view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.title}}</view>
-                    </u-grid-item>
-                </u-grid>
-            </view>
-            <view class="titleList" v-if="curOneCateIndex == 1">
-                <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.name}}</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.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>
+			<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" @click="gotoSousuo()">
+			<u-search placeholder="请输入药物名" :showAction="false" disabled></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>
+		<view v-show="!showSearchList">
+			<view class="grid twoCateList" v-if="twoCateList.length > 0 && curOneCateIndex == 1">
+				<u-grid :col="3" border class="u-grid-list">
+					<u-grid-item v-for="(item, index) in twoCateList" :key="item.prescriptCategoryId"
+						@click="setTwoCateIndex(item, index)">
+						<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.title}}</view>
+					</u-grid-item>
+				</u-grid>
+			</view>
+			<view class="titleList" v-if="curOneCateIndex == 1">
+				<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.name}}</view>
+					</u-grid-item>
+				</u-grid>
+				<u-divider v-else text="暂无药物数据哦~"></u-divider>
+			</view>
+			<view style="padding: 10rpx 20rpx 0 20rpx;font-size: 30rpx;" v-if="!curOneCateIndex == 1">
+				<b>大家常看的</b>
+				<view style="color: #55aa7f;float: right;font-weight: bold;" @click="gotoFenlei()">
+					<img src="../../static/jainsuo.png" alt="" style="width: 36rpx;vertical-align: text-top;margin-right: 8rpx;">
+					分类检索
+				</view>
+			</view>
+			<view class="titleList" v-if="!curOneCateIndex == 1">
+				<u-grid :col="1" v-if="titleList.length > 0">
+					<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>
 </template>
 
 <script>
-import $http from '@/config/requestConfig.js';
-export default {
-	// props: {
-	// 	type: Number, // 下拉状态（inOffset：1， outOffset：2， showLoading：3， endDownScroll：4）
-	// 	rate: Number // 下拉比率 (inOffset: rate<1; outOffset: rate>=1)
-	// },
-    data() {
-        return {
-            ywTabList:[{
-                prescriptCategoryId: 1,
-                title: '中药检索'
-            },{
-                prescriptCategoryId: 2,
-                title: '西药检索'
-            }],
-            playData: {},
-            searchValue: '',
-            oneCateList: [{
-                prescriptCategoryId: 0
-            }], // 一级分类标题1
-            twoCateList: [
-                {prescriptCategoryId: 1, title: '抗感染类'},
-                {prescriptCategoryId: 2, title: '神经类'},
-                {prescriptCategoryId: 3, title: '精神类'},
-                {prescriptCategoryId: 4, title: '抗肿瘤类'},
-                {prescriptCategoryId: 5, title: '心血管类'},
-                {prescriptCategoryId: 6, title: '呼吸类'},
-                {prescriptCategoryId: 7, title: '泌尿系统类'},
-                {prescriptCategoryId: 8, title: '消化类'},
-                {prescriptCategoryId: 9, title: '麻醉及其辅助'},
-            ], // 二级分类标题
-            titleList: [], // 药物标题
-            curOneCateIndex: 0, // 当前选中的一级分类
-            curTwoCateIndex: 0, // 当前选中的二级分类
-            searchList: [], // 搜索结果数组
-            showSearchList: false,
-            userMes: {}, // 用户信息
-            searchDisable: false, // 搜索不可用
-            limitShow: false,
-            limitTitle: '提示',
-            limitContent: ''
-        }
-    },
-    // onLoad() {
-    //     this.getCNYao()
-    // },
-	methods: {
-		setOneCateIndex(item, index) {
-            // let id = item.prescriptCategoryId
-            this.curOneCateIndex = index
-            this.curTwoCateIndex = 0
-            this.searchValue = ''
-            this.searchList = []
-            this.showSearchList = false
-            if (index == 1) { // 西药检索
-                this.getXiYao('抗感染类',1)
-            } else { // 中药检索
-                // this.getTowCateList(id)
-                this.getCNYao() // book/materials/getMaterialsList
-            }
-        },
-        setTwoCateIndex(item, index) {
-            let id = item.title
-            this.curTwoCateIndex = index
-            this.getXiYao(id,1)
-        },
-        // 获取西药
-        getXiYao(id, type) {
-            $http.request({
-                url: "book/materials/getDrugList",
-                method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
-                data: {
-                    // loadAnimate: 'none', // 请求加载动画
-                    "limit": 1000,
-                    "current": 1,
-                    "name":"",
-                    "kind": id, // 药品类型   抗病毒药/解热镇痛、非甾体抗炎药.......
-                    "prescriptionType":"", // 处方类型 处方药/OTC甲类/OTC乙类
-                    "insuranceType":"", // 医保类型 非医保/医保甲类/医保乙类
-                    "type": type, // 0中药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
-                } else {
-                    this.titleList = []
-                }
-            }).catch(e => {
-                this.titleList = []
-                console.log(e)
-            })
-        },
-        // 详情
-        gotoDetail(item) {
-            console.log('111111111111')
-            uni.navigateTo({
-                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"
-            })
-        }
-	}
-};
+	import $http from '@/config/requestConfig.js';
+	export default {
+		// props: {
+		// 	type: Number, // 下拉状态（inOffset：1， outOffset：2， showLoading：3， endDownScroll：4）
+		// 	rate: Number // 下拉比率 (inOffset: rate<1; outOffset: rate>=1)
+		// },
+		data() {
+			return {
+				ywTabList: [{
+					prescriptCategoryId: 1,
+					title: '中药检索'
+				}, {
+					prescriptCategoryId: 2,
+					title: '西药检索'
+				}],
+				playData: {},
+				searchValue: '',
+				oneCateList: [{
+					prescriptCategoryId: 0
+				}], // 一级分类标题1
+				twoCateList: [{
+						prescriptCategoryId: 1,
+						title: '抗感染类'
+					},
+					{
+						prescriptCategoryId: 2,
+						title: '神经类'
+					},
+					{
+						prescriptCategoryId: 3,
+						title: '精神类'
+					},
+					{
+						prescriptCategoryId: 4,
+						title: '抗肿瘤类'
+					},
+					{
+						prescriptCategoryId: 5,
+						title: '心血管类'
+					},
+					{
+						prescriptCategoryId: 6,
+						title: '呼吸类'
+					},
+					{
+						prescriptCategoryId: 7,
+						title: '泌尿系统类'
+					},
+					{
+						prescriptCategoryId: 8,
+						title: '消化类'
+					},
+					{
+						prescriptCategoryId: 9,
+						title: '麻醉及其辅助'
+					},
+				], // 二级分类标题
+				titleList: [], // 药物标题
+				curOneCateIndex: 0, // 当前选中的一级分类
+				curTwoCateIndex: 0, // 当前选中的二级分类
+				searchList: [], // 搜索结果数组
+				showSearchList: false,
+				userMes: {}, // 用户信息
+				searchDisable: false, // 搜索不可用
+				limitShow: false,
+				limitTitle: '提示',
+				limitContent: ''
+			}
+		},
+		// onLoad() {
+		//     this.getCNYao()
+		// },
+		methods: {
+			setOneCateIndex(item, index) {
+				// let id = item.prescriptCategoryId
+				this.curOneCateIndex = index
+				this.curTwoCateIndex = 0
+				this.searchValue = ''
+				this.searchList = []
+				this.showSearchList = false
+				if (index == 1) { // 西药检索
+					this.getXiYao('抗感染类', 1)
+				} else { // 中药检索
+					// this.getTowCateList(id)
+					this.getCNYao() // book/materials/getMaterialsList
+				}
+			},
+			setTwoCateIndex(item, index) {
+				let id = item.title
+				this.curTwoCateIndex = index
+				this.getXiYao(id, 1)
+			},
+			// 获取西药
+			getXiYao(id, type) {
+				$http.request({
+					url: "book/materials/getDrugList",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						// loadAnimate: 'none', // 请求加载动画
+						"limit": 1000,
+						"current": 1,
+						"name": "",
+						"kind": id, // 药品类型   抗病毒药/解热镇痛、非甾体抗炎药.......
+						"prescriptionType": "", // 处方类型 处方药/OTC甲类/OTC乙类
+						"insuranceType": "", // 医保类型 非医保/医保甲类/医保乙类
+						"type": type, // 0中药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
+					} else {
+						this.titleList = []
+					}
+				}).catch(e => {
+					this.titleList = []
+					console.log(e)
+				})
+			},
+			// 详情
+			gotoDetail(item) {
+				console.log('111111111111')
+				uni.navigateTo({
+					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
+				})
+			},
+			gotoSousuo() {
+				uni.navigateTo({
+					url: "./CNMedicineText"
+				})
+			},
+			gotoFenlei() {
+				uni.navigateTo({
+					url: "./CNMedicineSearch"
+				})
+			}
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
-.searchList {
+	.searchList {
 		.item {
 			font-size: 28rpx;
 			padding: 20rpx;
@@ -217,23 +254,26 @@ export default {
 
 	.contentBox {
 		.oneCateList {
+			margin-top: 15rpx;
 			justify-content: space-between;
 
 			text {
 				text-align: center;
 				display: inline-block;
 				width: 50%;
-				padding: 20rpx 0;
-				font-size: 34rpx;
+				padding: 10rpx 0;
+				font-size: 30rpx;
 				border-radius: 10rpx;
 			}
 
 			.cur {
-				background-color: #55aa7f;
-				color: #fff;
+				background-color: #55aa7f3d;
+				color: #55aa7f;
+				font-weight: bold;
 			}
 		}
-		.firstTab{
+
+		.firstTab {
 			text {
 				text-align: center;
 				display: inline-block;
@@ -293,36 +333,10 @@ export default {
 		overflow: hidden;
 		align-items: center;
 		width: calc(100% - 10px);
-		margin-top: 20rpx;
+		margin-top: 30rpx;
 		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 {
@@ -332,9 +346,9 @@ export default {
 	.uni-modal .uni-modal__bd {
 		text-align: left;
 	}
-	
-	.limiTy{
+
+	.limiTy {
 		font-size: 28rpx;
 		line-height: 46rpx;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/prescript/prescript.vue b/pages/prescript/prescript.vue
index de25a65..acc8619 100644
--- a/pages/prescript/prescript.vue
+++ b/pages/prescript/prescript.vue
@@ -9,7 +9,7 @@
 					v-for="(item, index) in firstTabList" :key="item.firstTabId">{{item.title}}</text>
 			</view>
 			<view v-if="curFirstTabIndex==0">
-				<view class="oneCateList flexbox">
+				<view class="oneCateBot flexbox">
 					<text :class="[curOneCateIndex == index ? 'cur' : '']" @click="setOneCateIndex(item,index)"
 						v-for="(item, index) in oneCateList" :key="item.prescriptCategoryId">{{item.title}}</text>
 				</view>
@@ -473,19 +473,38 @@
 	.contentBox {
 		.oneCateList {
 			justify-content: space-between;
-
 			text {
 				text-align: center;
 				display: inline-block;
 				width: 32%;
 				padding: 20rpx 0;
-				font-size: 34rpx;
+				font-size: 32rpx;
+				font-weight: bold;
+			}
+			
+			.cur {
+				border-bottom: 5rpx solid #55aa7f;
+				color: #55aa7f;
+			}
+		}
+		
+		.oneCateBot{
+			margin-top: 15rpx;
+			justify-content: space-between;
+			
+			text {
+				text-align: center;
+				display: inline-block;
+				width: 32%;
+				padding: 10rpx 0;
+				font-size: 30rpx;
 				border-radius: 10rpx;
 			}
-
+			
 			.cur {
-				background-color: #55aa7f;
-				color: #fff;
+				background-color: #55aa7f3d;
+				color: #55aa7f;
+				font-weight: bold;
 			}
 		}
 		.firstTab{
@@ -495,8 +514,6 @@
 				width: 50%;
 				padding: 20rpx 0;
 				margin-bottom: 10rpx;
-				font-size: 34rpx;
-				border-radius: 10rpx;
 			}
 		}
 
diff --git a/pages/yian/yianList.vue b/pages/yian/yianList.vue
index e38139b..5f3321b 100644
--- a/pages/yian/yianList.vue
+++ b/pages/yian/yianList.vue
@@ -1,11 +1,11 @@
 <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">
@@ -52,8 +52,8 @@
 							<!-- <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>
+							<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>
@@ -61,17 +61,18 @@
 				<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>
+						<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>
 			<u-divider v-else text="暂无讲书目录"></u-divider>
 			<music-play :playData="playData"></music-play>
 			<!-- 公共组件-每个页面必须引入 -->
-			<public-module></public-module>		
+			<public-module></public-module>
 			<!-- <z-navigation></z-navigation> -->
 		</view>
 	</view>
@@ -98,19 +99,19 @@
 		data() {
 			return {
 				isBuy: false, // true 已购买，false 未购买
-				playData: {},				
+				playData: {},
 				bookInfo: {
-					author:{
-						authorName:''
+					author: {
+						authorName: ''
 					}
 				}, // 书籍详情
 				bookid: null, // 书籍id
-				status:3,				
+				status: 3,
 				freeChapterCount: 0, // 免费章节数				
 				yianList: [], // 书籍目录
 				videoList: [], //音频文件
-				page:1,
-				totalPage:0,
+				page: 1,
+				totalPage: 0,
 			}
 		},
 		onPullDownRefresh() {
@@ -122,13 +123,13 @@
 			uni.stopPullDownRefresh();
 		},
 		onReachBottom() {
-			console.log('到底了',this.page+1 , this.totalPage)
-			
-			if(this.page+1 <= this.totalPage){
+			console.log('到底了', this.page + 1, this.totalPage)
+
+			if (this.page + 1 <= this.totalPage) {
 				this.page++
 				this.status = 0
 				this.getyianList()
-			}else{
+			} else {
 				this.status = 1
 			}
 		},
@@ -143,15 +144,15 @@
 			console.log(e, 'e')
 			uni.hideTabBar();
 			this.bookid = e.bookid
-			this.bookname = e.bookname		
-		},		
+			this.bookname = e.bookname
+		},
 		onShow() {
 			// this.yianList = []
 			// this.page = 1
 			// this.totalPage = 0
 			this.getyianList()
 			this.getBookInfo()
-			
+
 		},
 		computed: {
 			...mapState(['userInfo'])
@@ -166,20 +167,20 @@
 					'userId': this.userInfo.id,
 					'bookId': this.bookid
 				}
-				checkBookRight(data,res=>{
+				checkBookRight(data, res => {
 					console.log(res)
-					if(res.success){
+					if (res.success) {
 						uni.navigateTo({
 							url: '../comments/comments?bookid=' + this.bookid,
 						});
-					}else{
+					} else {
 						uni.showToast({
-							title:'购买本书后方可查看此内容!',
-							icon:'none'
+							title: '购买本书后方可查看此内容!',
+							icon: 'none'
 						})
 					}
 				})
-				
+
 			},
 			// 去打卡
 			gotoclock() {
@@ -189,7 +190,7 @@
 			},
 			getBookInfo() {
 				// 获取书本基本信息
-				this.$http					
+				this.$http
 					.post('book/book/getBookInfo', {
 						'bookId': this.bookid,
 						'userId': this.userInfo.id
@@ -216,7 +217,7 @@
 				// 	url: './talkBookDetail?teachId=' + item.teachId +"&bookId="+item.bookId
 				// });
 				uni.navigateTo({
-					url: '../yian/yianDetail?medicalRecordsId='+item.medicalRecordsId,
+					url: '../yian/yianDetail?medicalRecordsId=' + item.medicalRecordsId,
 				});
 			},
 
@@ -226,39 +227,31 @@
 					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
-				// 	})
+						url: "book/bookMedicalRecords/listByBookId",
+						method: "POST",
+						data: {
+							"page": this.page,
+							"limit": 20,
+							"bookId": this.bookid
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
 					.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.totalPage = res.page.pages
+								if (this.page == this.totalPage) {
 									this.status = 1
-								}						
+								} else {
+									this.status = 3
+								}
 							} else {
 								this.yianList = []
 								this.totalPage = 0
@@ -268,19 +261,20 @@
 						console.log(e.msg)
 					})
 			},
-			
+
 		},
 	}
 </script>
 
 <style lang="less">
-	.muluitem{
-		span{
+	.muluitem {
+		span {
 			white-space: nowrap;
 			overflow-x: hidden;
 			text-overflow: ellipsis;
 		}
 	}
+
 	.playingFig {
 		width: 100rpx;
 		height: 100rpx;
diff --git a/static/icon/earth.png b/static/icon/earth.png
new file mode 100644
index 0000000000000000000000000000000000000000..692e961c4311b1f413d68c7b17d396bf75213ea6
GIT binary patch
literal 5323
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

literal 0
HcmV?d00001

diff --git a/static/jainsuo.png b/static/jainsuo.png
new file mode 100644
index 0000000000000000000000000000000000000000..854e94a5baf48d9a22073060499a73791a6b15f0
GIT binary patch
literal 595
zcmV-Z0<8UsP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00001b5ch_0Itp)
z=>Px%4M{{nR7gw3R&8>EKnzVv?@>KT^$x<cztoEq=tb(kcECH7o}~01#dLz~n*D%9
z(do`O<G_-aeaU-SgnwH2Pq;7{_~|{H{oWteNVot1{_&~-paQ_JGRbzn!%YHSmDvJ`
zJ_D@nq6YJi=ZurlO9QLS?I1{ZKfbKvBHIAao7zuE8UN?~0Q3j|Gs!^I;8KEX;J8Ss
zKXcqla89y`=v&cBh}(UfRq}gLf;J%l*p*4XReLn>s(eY2aN`5F1II<m^tSbk8l2lS
z$`~dyrvqG6;}bh36TYN7cDN**XjLZpvMtHEa*`(qomR!}*ksD<GRfzYfy*QxmALGF
z_06acB`YF`&OXGNWXS<O)<PSA5v#AG32|w6voDFbNV&#s<2t}Ya$=3{<JX)&w4|h)
zrSH_%el01fW1W>1q;}<WG7p)Q4Q_R`A-%I}EKaQ?!jCFK%oXh(^8mXn7XkNx^JDg7
zwn}69Sh*Njfp?Qh*`lY^ev_F5tWcO*{?Do)JUn!RVr{#X%*vQfeRA^qH`GH?lG^pj
zPIfg<8>c=)<}jq=J{hTaW8~C_?a0jDD2&5#xvSK8jCt6deN$jgNX%~I)Her~lS%f(
z&4H~`yBC3@&7IfPLme-rHaHgJB0XD9fjO)vk-WjGDK|w<q4{szD(%fijg|F<B8J`%
h-8vlu2?e|M`#%jXPA(wx`u6|;002ovPDHLkV1m|<96100

literal 0
HcmV?d00001

diff --git a/style/common.scss b/style/common.scss
index 3ee9e3b..ede3474 100644
--- a/style/common.scss
+++ b/style/common.scss
@@ -52,8 +52,10 @@ button::after {
 		}
 
 		.cur {
-			color: #55aa7f;
+			color: #087940;
 			border: 0.5px solid #55aa7f;
+			background: #55aa7f1c;
+			font-weight: bold;
 		}
 
 		.u-grid-list{