完善功能

2025-07-01 16:38:30 +08:00
parent 6dd6e9d213
commit 6b63bdc466
32 changed files with 2617 additions and 188 deletions
--- a/components/music.vue
+++ b/components/music.vue
@@ -0,0 +1,362 @@
+<template>
+	<view>
+		<view :class="['fuchuang',showBig?'bigMode':'miniMode']" v-show="userInfo.playVisible">
+			<view>
+				<view class="audo-video" >
+					<!--音频播放按钮处-->
+					<view class="audo-top">
+						
+						<!-- 播放封面 -->
+						<image   @click="changeShow" style="width: 120rpx; height: 120rpx; margin-top: 0;" :class="['fengImg','fengmianBox','defaultBg', userInfo.playFlag ? 'playAnimate' : '']" :src="userInfo.fengImg" mode="aspectFill"></image>	
+						<!-- <image v-else  @click="changeShow" style="width: 120rpx; height: 120rpx; margin-top: 0;" :class="['fengImg','fengmianBox','defaultBg', userInfo.playFlag ? 'playAnimate' : '']" src="@/static/icon/fengziIcon.jpg" mode="aspectFill"></image>	 -->
+						
+						<!-- <u-icon name="arrow-right" color="#61e781" size="28" v-else @click="changeShow"></u-icon> -->
+						<!--上一首切换按钮-->	
+						
+						<!-- <image class="prevMusic" @click="prevMusic" src="/static/xys.png" 
+							mode="aspectFill"></image> -->						
+						<!-- <image v-else style="width:50rpx;height:50rpx;" @click="nosig" src="/static/sys.png" mode="aspectFill"></image> -->
+						<!--上一首切换按钮-->
+	
+						<!--快退按钮-->
+						<!-- <image src="/static/kt.png" style="width:45rpx;height:45rpx;" mode="aspectFill" @click="kt()"></image> -->
+						<!--快退按钮-->
+	
+						<!--播放按钮-->
+						<image class="plays" :src="userInfo.playFlag ?'/static/zantigBtn.png':'/static/bofangBtn.png'" mode="aspectFill"
+							style="" @click.stop="plays()"></image>
+						<!--播放按钮-->
+	
+						<!--快进按钮-->
+						<!-- <image src="/static/kj.png" style="width:45rpx;height:45rpx;" mode="aspectFill" @click="kj()"></image> -->
+						<!--快进按钮-->
+	
+						<!--下一首切换按钮-->
+						<!-- <image v-if="jia" @click="noxig" style="width:50rpx;height:50rpx;transform:rotate(180deg)" src="/static/sys.png"
+							mode="aspectFill"> </image> -->
+						<!-- <image class="nextMusic" style="" src="/static/xys.png" @click="nextMusic"  mode="aspectFill"></image> -->
+						<!-- <u-icon name="arrow-right" color="#61e781" size="28" v-if="!showBig" @click="changeShow"></u-icon> -->
+						
+						
+						<!-- 暂时去掉关闭按钮 -->
+						<u-icon name="close" color="#61e781" size="20" style="background-color: #fff;border-radius: 100%;" v-if="!showBig" @click="closePlayer"></u-icon>
+						
+							<!-- 暂时去掉关闭按钮 -->
+						
+						<!-- 播放目录 -->
+						<!-- <image src="/static/libIcon.png" style="width:45rpx;height:45rpx;" mode="aspectFill"></image> -->
+						
+					</view>
+						
+				</view>
+			</view>
+		</view>
+		<view class="h-100"></view>
+		<!--占位-->
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,mapMutations
+	} from 'vuex';
+	export default {
+		name:"music",
+		props:{
+			playData:{
+				type:Object,
+				default:()=>({})
+			},			
+		},
+		data() {
+			return {
+				showBig:false, // 显示详细模式
+				muteBgMusic:true,
+				fengImg:'',
+				libLIst:[], // 播放目录
+				playIndex: 0,// 播放器index
+				
+			};
+		},
+		onLoad() {
+			
+			this.$music.playBgm({mute:false})				
+			 
+
+               
+		},
+		created() {
+			// this.fengImg = this.$music.getCoverImg()
+			this.fengImg = this.userInfo.fengImg
+			this.libLIst = this.userInfo.myList
+		},
+		mounted() {
+			
+		},		
+		
+		methods:{
+			...mapMutations(['setUserInfo']),
+			
+			closePlayer(){
+				// 关闭播放器
+				// console.log('点击了关闭按钮')				
+				this.$music.setCloseBgm()	 // 关闭音频
+				uni.setStorage({
+					key: 'playVisible',
+					data: false,
+					success: function () {
+						console.log('success');
+					}
+				});				
+				this.setUserInfo({'playVisible':false})
+			},
+			changeShow(){
+				uni.navigateTo({
+					url:'/pages/listen/bigListen'
+				})
+			//	this.showBig = !this.showBig
+			},
+			// 上一首
+			prevMusic(){
+				if(this.$bgm._options.src == ''){ // 如果直接点下一首，没点播放
+					this.$music.playBgm({mute:false})
+					this.$music.setPlayIndex('next')
+				}else{
+				this.$music.setPlayIndex('prev')
+				}
+				
+			},
+			 
+			nextMusic(){ // 下一首
+				if(this.$bgm._options.src == ''){ // 如果直接点下一首，没点播放
+					this.$music.playBgm({mute:false})
+					this.$music.setPlayIndex('next')
+				}else{
+					this.$music.setPlayIndex('next')
+				}
+			},			
+			
+			//关闭或开启 音乐
+            plays() {
+                this.muteBgMusic = !this.muteBgMusic
+                console.log(this.muteBgMusic,this.muteBgMusic?'已关闭音乐####':'已开启音乐####');      
+                
+				if (this.userInfo.playFlag) {
+                    // 暂停
+                  //  this.$music.playBgm({mute:true})	
+					this.$bgm.pause()			
+                } else {
+                    // 播放
+                    // this.$music.playBgm({mute:false})
+					if(this.$bgm._options.src == ''){
+						this.$music.playBgm({mute:false})
+					}else{
+						this.$bgm.play()
+						}
+                }
+            },
+		},
+		computed:{
+			...mapState(['userInfo']),
+			timer() {
+				return calcTimer(this.userInfo.currentTime)
+			},
+			overTimer() {
+				return calcTimer(this.userInfo.duration)
+			},
+			playStatus(){
+				var playFlag = false
+				this.userInfo.playFlag !== undefined ? playFlag = this.userInfo.playFlag : ''
+				console.log(playFlag,'playFlag')
+				return playFlag
+			}
+		},
+		watch:{
+			playData(newVal, oldVal){
+					console.log(newVal,'组件获取到新值')
+					if(newVal.myList.length > 0){
+						this.setUserInfo({'playIndex': 0})
+					    this.$music.setList(newVal.myList,'autoPlay')
+					// this.fengImg = newVal.fengImg
+					
+					// 本地存储播放列表
+					uni.setStorage({
+						key: 'playData',
+						data: newVal,
+						success: function () {
+							console.log('success');
+						}
+					});
+					// 系统暂存
+					this.setUserInfo({'myList':newVal.myList})
+				    
+					
+					this.libLIst = newVal.myList
+					// console.log(newVal.myList,'newVal.myList')					
+					uni.showToast({
+						title:'添加列表成功',
+						icon:'success',
+						duration:2000
+					})
+					}else{
+						uni.showToast({
+							title:'添加列表失败',
+							icon:'error',
+							duration:2000
+						})
+					}
+			}
+		}
+	}
+	//时间换算
+	function calcTimer(timer) {
+		if (timer === 0 || typeof timer !== 'number') {
+			return '00:00'
+		}
+		let mm = Math.floor(timer / 60)
+		let ss = Math.floor(timer % 60)
+		if (mm < 10) {
+			mm = '0' + mm
+		}
+		if (ss < 10) {
+			ss = '0' + ss
+		}
+		return mm + ':' + ss
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+	.fengImg{ border-radius: 100%; background-size: cover; }
+	@-webkit-keyframes rotation {	
+	   from {
+	       -webkit-transform: rotate(0deg);         
+	        }	
+	 to {
+	     -webkit-transform: rotate(360deg);
+			}	
+		}
+	.leveOne{padding: 0 20rpx; }
+	.playList{ width: calc(100% - 250rpx); height: 300rpx; overflow-y: scroll;}
+	.playList .item{line-height:80rpx; white-space: nowrap;
+			overflow-x: hidden; font-size: 38rpx; 
+			text-overflow: ellipsis;}
+	.playNow{color: #27b386;}
+	.flexbox{display: flex; }
+		.miniMode{width:160px; padding-left: -20px; border-radius:  100rpx 0 0 100rpx; padding-top: 0rpx; 
+		height: 140rpx;  
+		border: 1px solid #eee; 
+			.closeBtn{border: 1px solid #666; display: inline-block; padding: 3px;}
+			.leveOne{display: none;}
+			.prevMusic{ display: none;
+				width:30rpx;height:30rpx;transform:rotate(180deg)
+			}
+			.plays{width:50rpx;height:50rpx; margin-left: 0 !important;}
+			.nextMusic{width:50rpx;height:50rpx; display: none;}
+			}
+		
+     .fuchuang{position: fixed; padding-right: 10px;  padding-left: 0; bottom:180rpx; right:0; z-index: 888; background-color:rgba(255, 255, 255, 1); }
+	.playAnimate{
+		-webkit-transform: rotate(360deg);
+		animation: rotation 6s linear infinite;
+		-moz-animation: rotation 6s linear infinite;
+		-webkit-animation: rotation 6s linear infinite;
+		-o-animation: rotation 6s linear infinite;		
+	}
+	.playNow{color: #27b386;}	
+	.fengmianBox{text-align: center;  margin-top:50rpx; 
+		.times{ }
+	 }
+	
+	.fengmianBox .defaultBg{ width: 100%; margin: 0 auto;border-radius: 200rpx; margin: 0 auto; 
+	margin-bottom: 20rpx; background-size: cover; 
+	background-repeat: no-repeat; 
+	background-image: url('@/static/icon/home_icon_0.png'); 
+	}
+	
+	page {
+		background-color: #F6F6F8;
+	}
+
+	/* 	#video {
+		width: 100%;
+	} */
+	.audo-video {
+		padding-bottom: 20rpx;
+		color: #999;
+	}
+
+	.slider-box {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 27rpx;
+		color: #999; margin: 0 auto;
+	}
+
+	button {
+		display: inline-block;
+		width: 100rpx;
+		background-color: #fff;
+		font-size: 24rpx;
+		color: #000;
+		padding: 0;
+	}
+
+	.hidden {
+		position: fixed;
+		top: 0;
+		left: -10rpx;
+		z-index: -1;
+		width: 1rpx;
+		height: 1rpx;
+	}
+
+	.audo-top {
+		padding: 10rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		image {
+			width: 45rpx;
+			height: 45rpx;
+		}
+	}
+
+	.audo-a {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 750rpx;
+		position: relative;
+		z-index: 9; margin: 0 auto;
+	}
+
+	.beishu {
+		position: relative;
+		width: 100rpx;
+		padding-top: 5rpx;
+		padding-bottom: 5rpx;
+		text-align: center;
+		border-radius: 25rpx;
+		font-size: 28rpx;
+	}
+
+	.absolute {
+		position: absolute;
+
+		.beishu-a {
+			width: 200rpx;
+			border-radius: 20rpx;
+			text-align: center;
+			line-height: 90rpx;
+			background: #fff;
+
+			.title {
+				pdding-left: 30rpx;
+			}
+		}
+	}
+	
+</style>
--- a/components/z-navigation/z-navigation.vue
+++ b/components/z-navigation/z-navigation.vue
@@ -79,6 +79,12 @@ export default {
 			"selectedIconPath": "static/tab/icon_tab1_a.png",
 			"text": "智慧医疗"
 		},
+		{
+			"pagePath": "pages/doctors/index",
+			"iconPath": "static/tab/icon_tab3.png",
+			"selectedIconPath": "static/tab/icon_tab3_a.png",
+			"text": "名医精彩"
+		},
 		{
 			"pagePath": "pages/talents/index",
 			"iconPath": "static/tab/icon_tab2.png",
@@ -86,17 +92,11 @@ export default {
 			"text": "太湖英才"
 		},
 		{
-			"pagePath": "pages/doctors/index",
-			"iconPath": "static/tab/icon_tab3.png",
-			"selectedIconPath": "static/tab/icon_tab3_a.png",
-			"text": "名医精彩"
+			"pagePath": "pages/wumen/medicaldes",
+			"iconPath": "static/tab/icon_tab4.png",
+			"selectedIconPath": "static/tab/icon_tab4_a.png",
+			"text": "吴门医述"
 		},
-		// {
-		// 	"pagePath": "pages/wumen/index",
-		// 	"iconPath": "static/tab/icon_tab4.png",
-		// 	"selectedIconPath": "static/tab/icon_tab4_a.png",
-		// 	"text": "吴门医述"
-		// },
 		{
 			"pagePath": "pages/my/index",
 			"iconPath": "static/tab/icon_tab5.png",
@@ -111,6 +111,12 @@ export default {
 			"selectedIconPath": "static/tab/icon_tab1_a.png",
 			"text": "智慧医疗"
 		},
+		{
+			"pagePath": "pages/doctors/index",
+			"iconPath": "static/tab/icon_tab3.png",
+			"selectedIconPath": "static/tab/icon_tab3_a.png",
+			"text": "名医精彩"
+		},
 		{
 			"pagePath": "pages/talents/index",
 			"iconPath": "static/tab/icon_tab2.png",
@@ -118,17 +124,11 @@ export default {
 			"text": "太湖英才"
 		},
 		{
-			"pagePath": "pages/doctors/index",
-			"iconPath": "static/tab/icon_tab3.png",
-			"selectedIconPath": "static/tab/icon_tab3_a.png",
-			"text": "名医精彩"
+			"pagePath": "pages/wumen/medicaldes",
+			"iconPath": "static/tab/icon_tab4.png",
+			"selectedIconPath": "static/tab/icon_tab4_a.png",
+			"text": "吴门医述"
 		},
-		// {
-		// 	"pagePath": "pages/wumen/index",
-		// 	"iconPath": "static/tab/icon_tab4.png",
-		// 	"selectedIconPath": "static/tab/icon_tab4_a.png",
-		// 	"text": "吴门医述"
-		// },
 		{
 			"pagePath": "pages/my/index",
 			"iconPath": "static/tab/icon_tab5.png",
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -2,11 +2,11 @@ let baseUrl = "";
 let socketUrl = "";
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
-	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
-	//baseUrl = "https://api.nuttyreading.com/"; //线上正式
+	//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	baseUrl = "https://api.nuttyreading.com/"; //线上正式
 } else if (process.env.NODE_ENV === 'production') {
-	baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
-	//baseUrl = "https://api.nuttyreading.com/"; //线上正式
+	//baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+	baseUrl = "https://api.nuttyreading.com/"; //线上正式
 }
 const courtConfig = {
 	//微信公众号APPID
--- a/main.js
+++ b/main.js
@@ -25,8 +25,8 @@ import { judgeLogin } from '@/config/login';
 Vue.prototype.judgeLogin = judgeLogin;
 Vue.prototype.isShowHtml = store.state.loadingShow;

-//Vue.prototype.$baseUrl = "https://api.nuttyreading.com/"
-Vue.prototype.$baseUrl = "http://192.168.110.100:9200/pb/"
+Vue.prototype.$baseUrl = "https://api.nuttyreading.com/"
+//Vue.prototype.$baseUrl = "http://192.168.110.100:9200/pb/"

 //判断手机型号
 uni.getSystemInfo({
--- a/manifest.json
+++ b/manifest.json
@@ -28,7 +28,9 @@
        /* 模块配置 */
        "modules" : {
            "Camera" : {},
-            "Payment" : {}
+            "Payment" : {},
+            "VideoPlayer" : {},
+            "Share" : {}
        },
        /* 应用发布信息 */
        "distribute" : {
@@ -85,6 +87,12 @@
                        "appid" : "wx5c50e3696028d2ec",
                        "UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__1B1584A/"
                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx5c50e3696028d2ec",
+                        "UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__1B1584A/"
+                    }
                }
            },
            "splashscreen" : {
--- a/pages.json
+++ b/pages.json
@@ -121,7 +121,7 @@
 			"path": "pages/talents/index",
 			"style": {
 				"navigationBarTitleText": "太湖英才",
-				"enablePullDownRefresh": false, // 禁止下拉刷新
+				"enablePullDownRefresh": true,
 				"app-plus": {
 					"bounce": "none",
 					"titleNView": false,
@@ -157,7 +157,7 @@
 			"path": "pages/doctors/index",
 			"style": {
 				"navigationBarTitleText": "名医精彩",
-				"enablePullDownRefresh": false, // 禁止下拉刷新
+				"enablePullDownRefresh": true, // 禁止下拉刷新
 				"app-plus": {
 					"bounce": "none",
 					"titleNView": false,
@@ -167,7 +167,7 @@
 		},
 		
 		{
-			"path": "pages/wumen/index",
+			"path": "pages/wumen/medicaldes",
 			"style": {
 				"navigationBarTitleText": "吴门医述",
 				"enablePullDownRefresh": false, // 禁止下拉刷新
@@ -322,6 +322,78 @@
 				}
 			}
 		},
+		{
+			"path": "pages/wumen/zhuanzhuchuban",
+			"style": {
+				"navigationBarTitleText": "专著出版",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/wumen/xueshugongxianDetail",
+			"style": {
+				"navigationBarTitleText": "学术贡献详情",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/wumen/medicaldesDetail",
+			"style": {
+				"navigationBarTitleText": "医述详情",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/wumen/recordDetail",
+			"style": {
+				"navigationBarTitleText": "纪实详情",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/wumen/video",
+			"style": {
+				"navigationBarTitleText": "医述详情",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/wumen/xueshuwebView",
+			"style": {
+				"navigationBarTitleText": "学术webView预览页面",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},
 		
 		
 		
@@ -353,18 +425,19 @@
 				"pagePath": "pages/home/index",
 				"text": "智慧医疗"
 			},
-			{
-				"pagePath": "pages/talents/index",
-				"text": "太湖英才"
-			},
 			{
 				"pagePath": "pages/doctors/index",
 				"text": "名医精彩"
 			},
-			// {
-			// 	"pagePath": "pages/wumen/index",
-			// 	"text": "吴门医述"
-			// },
+			{
+				"pagePath": "pages/talents/index",
+				"text": "太湖英才"
+			},
+			
+			{
+				"pagePath": "pages/wumen/medicaldes",
+				"text": "吴门医述"
+			},
 			{
 				"pagePath": "pages/my/index",
 				"text": "我的"
--- a/pages/component/commonComponents/anchorLink.vue
+++ b/pages/component/commonComponents/anchorLink.vue
@@ -527,7 +527,7 @@

 			.section_content_progress {
 				background: initial;
-				padding: 0 15rpx;
+				padding: 0 20rpx;
 			}

 			.content_result {
--- a/pages/component/commonComponents/audio.vue
+++ b/pages/component/commonComponents/audio.vue
@@ -1078,7 +1078,7 @@ export default {

 <style lang="scss" scoped>
 .container {
-  width: 100vw;
+  width: 100vh;
  height: auto;

  /deep/.pause {
--- a/pages/curriculum/index.vue
+++ b/pages/curriculum/index.vue
@@ -97,9 +97,7 @@
 								<courseDescription :isCondition="true" :dataList="slotProps.dataList"
 									@hancleClick="(data, index) => gotoDetail(data, index, slotProps)" label="title">
 									<template slot="labelSlot" slot-scope="slotProps1">
-										<view :style="`${ slotProps1.row.isAudition==1
-											  ? 'width:calc(100% - 100rpx);float:left;'
-											  : 'width:calc(100%);'}, ${ slotProps1.row.isLearned==1||slotProps1.row.isLearned==0
+										<view :style="`${ slotProps1.row.isAudition==1|| slotProps1.row.isLearned==1||slotProps1.row.isLearned==0
 											  ? 'width:calc(100% - 100rpx);float:left;'
 											  : 'width:calc(100%);'}`">
 											<text :class="`${slotProps1.row.viewFlg == 1 ? 'aui-text-success' : ''}`">{{ slotProps1.row.title }}</text>
@@ -131,6 +129,18 @@
 											size="22"
 										  ></u-icon>
 										</view>
+										<view class="shitingTag" v-if="slotProps.data.type == 0">
+										  <u-icon
+										    v-if="
+										      !userVip&&
+										      slotProps1.row.isAudition == 0 &&
+										      slotProps.data.isBuy == 0
+										    "
+										    name="lock"
+										    color="#5188e5 "
+										    size="24"
+										  ></u-icon>
+										</view>
 									</template>
 								</courseDescription>
 							</view>
@@ -1253,6 +1263,7 @@
 	}

 	.course_title {
+		width: 100%;
 		align-items: center;
 		justify-content: space-between;
 		background: #fff;
@@ -1332,7 +1343,6 @@
 	}

 	.courseTitle {
-		width: calc(100% - 220rpx);
 		padding: 20rpx;
 		font-size: 38rpx;
 		font-weight: bold;
--- a/pages/curriculum/index/index.vue
+++ b/pages/curriculum/index/index.vue
@@ -144,7 +144,7 @@ export default {
 	z-index: 9999;
 }
 .list_block{
-	padding: 20rpx 20rpx 0;
+	padding: 20rpx 30rpx 0;
 	margin-top: 70rpx;
 }
 .list_item{
--- a/pages/curriculum/index3.vue
+++ b/pages/curriculum/index3.vue
@@ -782,16 +782,6 @@
 			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 {
--- a/pages/doctors/index.vue
+++ b/pages/doctors/index.vue
@@ -14,53 +14,37 @@
 					placeholderClass="name-placeholder"
 					class="center-input"
 				/>
-				<button @click="getListData(taihumedId)">查询</button>
+				<button @click="getListData(taihumedId, true)">查询</button>
 			</view>
 		</view>
 		<scroll-view scroll-y="true"
+			:scroll-top="scrollTop"
 			@scrolltolower="loadMore"
 			style="height: calc(100vh - 300rpx); margin-top: 185rpx; padding-bottom: 140rpx;"
-			:scroll-into-view="scrollIntoViewId"
 			v-if="show==true">
 			<view class="doctors_list" id="top">
 				<view class="doctors_item" v-for="(item,index) in list" :key="index" @click="goToDetail(item)">
-					<view class="flex" v-if="item.taihuTalent">
-						<view class="flex" v-if="item.taihuTalent.length>=1">
-							<image v-if="item.taihuTalent.length==1&&item.taihuTalent[0].icon" :src="item.taihuTalent[0].icon" class="item_image" mode="aspectFit"></image>
-							<image v-else-if="item.image" :src="item.image" class="item_image" mode="aspectFit"></image>
+					<view class="flex">
+						<view class="flex">
+							<image v-if="item.squareImage" :src="item.squareImage" class="item_image" mode="aspectFit"></image>
 							<image v-else src="../../static/logo_zi.png" class="item_image" mode="aspectFit"></image>
-							<view class="item_right" v-if="item.taihuTalent.length==1">
+							
+							<view class="item_right" v-if="currentCateIndex!=2">
 								<view class="item_top">
-									<text class="item_name">{{item.taihuTalent[0].name}}</text>
+									<text class="item_name" v-if="item.taihuTalent&&item.taihuTalent.length>0">{{item.taihuTalent[0].name}}</text>
 								</view>
 								<text class="item_con">{{item.title}}</text>
 							</view>
 							
-							<view class="item_right" v-if="item.taihuTalent.length>1">
+							<view class="item_right" v-else>
 								<view class="item_top">
 									<text class="item_name">{{item.title}}</text>
 								</view>
 								<text class="item_con">{{ item.taihuTalent.map(talent => talent.name).join(' ') }}</text>
 							</view>
 						</view>
-						
-						<view class="flex" v-else>
-							<image v-if="item.image" :src="item.image" class="item_image" mode="aspectFit"></image>
-							<image v-else src="../../static/logo_zi.png" class="item_image" mode="aspectFit"></image>
-							<view class="item_right">
-								<text class="item_con">{{item.title}}</text>
-							</view>
-						</view>
 					</view>
 					
-					<view class="flex" v-else>
-						<image :src="item.image" class="item_image" mode="aspectFit"></image>
-						<view class="item_right">
-							<view class="item_top">
-								<text class="item_name">{{item.title}}</text>
-							</view>
-						</view>
-					</view>
 					<view class="list_item_bt">
 						<view class="list_item_price" v-if="item.courseCatalogueEntityList.length==1">
 							<text v-if="item.courseCatalogueEntityList[0].halfFee==0">免费</text>
@@ -105,19 +89,31 @@ export default {
 			noMore: false,
 			show: null,
 			count: 0,
-			scrollIntoViewId: '',  //用于控制滚动到哪个元素
+			scrollTop: 0,  //滚动位置
+			isRefreshing: false,  //刷新状态
 		}
 	},
+	onPullDownRefresh() {
+		this.isRefreshing = true;
+		console.log("下拉刷新");
+		
+		setTimeout(() => {
+			this.current = 1;
+			this.list = [];
+			this.noMore = false;
+			
+			this.getListData(this.tabsList[this.currentCateIndex].id);
+			uni.stopPullDownRefresh();
+			this.isRefreshing = false;
+			console.log("下拉刷新已停止");
+		}, 800);
+	},
 	onLoad() {
 		uni.hideTabBar();
 		this.getTabData();
 	},
 	onShow() {
-		//回到顶部设置
-		this.scrollIntoViewId = 'top';
-		this.timer = setTimeout(() => {
-			this.scrollIntoViewId = '';
-		}, 300);
+		
 	},
 	methods: {
 		//判断显示‘上/中/下’
@@ -146,13 +142,18 @@ export default {
 			.then(res=> {
 				if (res.list&&res.list.length>0) {
 					this.tabsList = res.list;
-					this.taihumedId = this.tabsList[0].id
+					this.taihumedId = this.tabsList[0].id;
 					this.getListData(this.taihumedId);
 				}
 			});
 		},
 		//获取列表数据
-		getListData(taihumedId) {
+		getListData(taihumedId, type) {
+			if(type){
+				this.current = 1;
+				this.list = [];
+				this.noMore = false;
+			}
 			if(this.noMore){
 				return false;
 			};
@@ -188,6 +189,13 @@ export default {
 					this.current += 1;  //更新页码
 					//显示提示语
 					this.showText = true;
+					
+					if(this.current==2||type){
+						this.scrollTop = 0
+						this.$nextTick(() => {
+							this.scrollTop = 0.1;  // 确保触发滚动
+						})
+					}
 				}else{
 					this.show = false;
 					this.null_text = '暂无数据';
@@ -200,6 +208,7 @@ export default {
 		},
 		//切换tab状态
 		ordersTabCLi(data, index) {
+			this.currentCateIndex = index;
 			this.courseName = '';
 			this.taihumedId = data.id;
 			//重置
@@ -212,6 +221,7 @@ export default {
 		},
 		//详情
 		goToDetail(item){
+			if (this.isRefreshing) return;
 			uni.navigateTo({
 				url: `/pages/curriculum/index?navTitle=${item.title}&title=${item.title}&id=${item.id}`
 			});
@@ -242,8 +252,10 @@ export default {
 }
 .item_image{
 	display: block;
-	width: 160rpx;
+	width: 200rpx;
 	height: 200rpx;
+	flex-shrink: 0;
+	background: #f3f3f3;
 }
 .item_right{
 	width: calc(100% - 200rpx);
@@ -286,12 +298,11 @@ export default {
 .doctors_module{
 	width: 100%;
 	position: fixed;
-	z-index: 999;
+	z-index: 99;
 	left: 0;
 }
 .cateList{
 	background: #f3f3f3;
-	
 }
 .flex{
 	 display: flex; 
--- a/pages/talents/detail.vue
+++ b/pages/talents/detail.vue
@@ -47,6 +47,13 @@
 				</view>
 				<view class="certificate-list" v-else>暂无</view>
 			</view>
+			<view class="taihu_common">
+				<text>名医精彩</text>
+				<view class="certificate-list" v-if="courseList.length>0">
+					<view v-for="(item, index) in courseList" :key='index' style=" text-decoration: underline;" @click="goToDetail(item)">{{item.title}}</view>
+				</view>
+				<view class="certificate-list" v-else>暂无</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -60,6 +67,7 @@ export default {
 			taihuTalent: {},
 			label: [],  //标签
 			certificates: [],  //证书
+			courseList: [],  //名医精彩数据
 			status: false,
 			showAll: false,  //是否显示全部
 			defaultShowCount: 6  //默认显示条数
@@ -104,6 +112,10 @@ export default {
 					this.taihuTalent = res.taihuTalent;
 					this.label = res.label;
 					this.certificates = res.certificates;
+					
+					if(res.courseList&&res.courseList.length>0){
+						this.courseList = res.courseList;
+					}
 				}
 			});
 		},
@@ -115,12 +127,18 @@ export default {
 		goToUrl(urlArr){
 			if(urlArr&&urlArr.length>0){
 				uni.navigateTo({
-					url: '/pages/talents/certificateUrl?data='+JSON.stringify(urlArr),
+					url: '/pages/talents/certificateUrl?data='+JSON.stringify(urlArr)
 				});
 			}else{
 				this.$commonJS.showToast("暂无证书图片");
 			}
 		},
+		//跳转到课程详情
+		goToDetail(item){
+			uni.navigateTo({
+				url: '/pages/curriculum/index?navTitle='+item.title+'&title='+item.title+'&id='+item.id
+			});
+		},
 	},
 }
 </script>
@@ -142,8 +160,9 @@ export default {
 }
 .infor_image{
 	display: block;
-	width: 180rpx;
+	width: 200rpx;
 	height: 220rpx;
+	background-color: #f3f3f3;
 }
 .infor_right{
 	width: calc(100% - 220rpx);
--- a/pages/talents/index.vue
+++ b/pages/talents/index.vue
@@ -54,14 +54,17 @@
 					placeholderClass="name-placeholder"
 					class="center-input"
 				/>
-				<button @click="getData()">查询</button>
+				<button @click="getData(true)">查询</button>
 			</view>
 		</view>
 		
 		<!-- 遮罩层 -->
 		<view v-if="activeFilter" class="overlay" @click="closeFilter"></view>
-		
-		<view class="talents_list" v-if="list&&list.length>0">
+		<scroll-view scroll-y="true"
+			:scroll-top="scrollTop"
+			style="height: calc(100vh - 300rpx); margin-top: 185rpx; padding-bottom: 140rpx;"
+			v-if="list&&list.length>0">
+			<view class="talents_list">
 				<view class="talents_item" v-for="(item,index) in list" :key="index" @click="goToDetail(item.id)">
 					<image :src="item.icon" class="item_image" mode="aspectFit"></image>
 					<view class="item_right">
@@ -73,6 +76,7 @@
 					</view>
 				</view>
 			</view>
+		</scroll-view>
 		<text class="null_text" v-else>{{null_text}}</text>
 		<z-navigation></z-navigation>
 	</view>
@@ -105,8 +109,22 @@ export default {
 			//城市模块是否显示
 			cityStatus: false,
 			selectedPath: [],  //存储选中路径
+			scrollTop: 0,  //滚动位置
+			isRefreshing: false,  //刷新状态
 		}
 	},
+	onPullDownRefresh() {
+		this.isRefreshing = true;
+		console.log("下拉刷新");
+		
+		setTimeout(() => {
+			this.region = '';
+			this.getData();
+			uni.stopPullDownRefresh();
+			this.isRefreshing = false;
+			console.log("下拉刷新已停止");
+		}, 800);
+	},
 	onLoad() {
 		uni.hideTabBar();
 		this.getAllBaseArea();
@@ -117,7 +135,7 @@ export default {
 	},
 	methods: {
 		//获取数据
-		getData() {
+		getData(type) {
 			uni.showLoading({
 				title: '加载中'
 			})
@@ -137,6 +155,13 @@ export default {
 				uni.hideLoading();
 				if (res.list&&res.list.length>0) {
 					this.list = res.list;
+					
+					if(type){
+						this.scrollTop = 0
+						this.$nextTick(() => {
+							this.scrollTop = 0.1;  // 确保触发滚动
+						})
+					}
 				}else{
 					this.list = [];
 					this.null_text = '暂无数据';
@@ -272,6 +297,7 @@ export default {
 		},
 		//详情
 		goToDetail(id){
+			if (this.isRefreshing) return;
 			uni.navigateTo({
 				url: '/pages/talents/detail?id='+id,
 			});
@@ -309,8 +335,7 @@ export default {
 	background-color: #fff;
 }
 .talents_list{
-	margin: 185rpx 30rpx 20rpx;
-	padding-bottom: 120rpx;
+	margin: 0 30rpx 20rpx;
 }
 .talents_item{
 	border: 1rpx solid $themeColor;
@@ -322,8 +347,9 @@ export default {
 }
 .item_image{
 	display: block;
-	width: 160rpx;
+	width: 180rpx;
 	height: 200rpx;
+	background: #f3f3f3;
 }
 .item_right{
 	width: calc(100% - 200rpx);
@@ -367,7 +393,7 @@ export default {
 .talents_module{
 	width: 100%;
 	position: fixed;
-	z-index: 999;
+	z-index: 99;
 	top: 0;
 	left: 0;
 }
--- a/pages/wallet/account.vue
+++ b/pages/wallet/account.vue
@@ -53,18 +53,17 @@
          </view>
        </view>
      </view>
-
+    </view>
 	<view>
 	  <u-back-top
 	    :scroll-top="scrollTop"
-          bottom="60"
+	    bottom="65"
 	    :customStyle="bgiStyle"
 	    :iconStyle="iconStyle"
 	  >
 	  </u-back-top>
 	</view>
  </view>
-  </view>
 </template>

 <script>
@@ -98,7 +97,7 @@ export default {
      },
    };
  },
-  // 返回顶部
+  //返回顶部
  onPageScroll(e) {
    this.scrollTop = e.scrollTop;
  },
@@ -168,10 +167,10 @@ export default {
 .wallet_wrap{
 	background-color: #eff5f8;
 	height: 100%;
-	overflow: auto;
 }
 .ACTable_block{
-	padding: 0 30rpx;
+	background-color: #eff5f8;
+	padding: 0 30rpx 30rpx;
 }
 .ACTable {
 	margin-top: 20rpx;
--- a/pages/wumen/index.vue
+++ b/pages/wumen/index.vue
@@ -1,48 +0,0 @@
-<template>
-	<view class="content">
-		<z-nav-bar title="吴门医述" bgColor="#5188e5" fontColor="#fff"></z-nav-bar>
-		<z-navigation></z-navigation>
-	</view>
-</template>
-
-<script>
-import $http from "@/config/requestConfig.js";
-export default {
-	data() {
-		return {
-			list: [],
-			
-		}
-	},
-	onLoad() {
-		uni.hideTabBar();
-	},
-	methods: {
-		//获取数据
-		getData() {
-			this.$http.request({
-				url: 'common/ragFlowApi/getChatAssistants',
-				method: "POST",
-				data: {},
-				header: {
-					"Content-Type": "application/json",
-				},
-			})
-			.then(res=> {
-				if (res.list&&res.list.length>0) {
-					
-				}
-			});
-		}
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-@import '@/static/mixin.scss';
-.content{
-	height: 100%;
-	overflow: auto;
-	background-color: #fff;
-}
-</style>
--- a/pages/wumen/medicaldes.vue
+++ b/pages/wumen/medicaldes.vue
@@ -0,0 +1,542 @@
+<template>
+	<view class="container">
+		<z-nav-bar title="吴门医述" bgColor="#5188e5" fontColor="#fff" :backState="2000"></z-nav-bar>
+		<view class="contentBox">
+			<view class="oneCateList">
+				<common-sticky itemStyle="width:33.3%; height: 38px;font-size:24rpx;" :list="oneCateList" label="title"
+				:currentCateIndex="curOneCateIndex" @handleselectCate="setOneCateIndex"></common-sticky>
+			</view>
+			
+			<view v-show="!showSearchList" style="padding-bottom: 140rpx;">
+				<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;">
+							<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:center;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']" style=" font-size: 28rpx;">{{item.name}}</view>
+						</view>
+					</view>
+					<u-divider text="暂无数据哦~" v-if="titleList.length==0"></u-divider>
+				</view>
+			</view>
+		</view>
+		<view>
+		  <u-back-top
+		    :scroll-top="scrollTop"
+		    bottom="65"
+		    :customStyle="bgiStyle"
+		    :iconStyle="iconStyle"
+		  >
+		  </u-back-top>
+		</view>
+		<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'
+			}], // 一级分类标题1
+			twoCateList: [], // 二级分类标题
+			titleList: [], // 方剂标题
+			curOneCateIndex: 0, // 当前选中的一级分类
+			curTwoCateIndex: 0, // 当前选中的二级分类
+			searchList: [], // 搜索结果数组
+			showSearchList: false,
+			userMes: {}, // 用户信息
+			searchDisable: false, // 搜索不可用
+			limitShow: false,
+			limitTitle: '提示',
+			limitContent: '',
+			scrollTop: 0,
+			bgiStyle: {
+			  background: "#5188e5",
+			},
+			iconStyle: {
+			  fontSize: "40rpx",
+			  fontWeight: "bold",
+			  color: "#fff",
+			},
+		}
+	},
+	onLoad() {
+		uni.hideTabBar();
+		this.getUserInfo();
+	},
+	onHide() {
+		
+	},
+	//返回顶部
+	onPageScroll(e) {
+	  this.scrollTop = e.scrollTop;
+	},
+	computed: {
+		...mapState(['userInfo']),
+	},
+	methods: {
+		// 检查是有权限使用搜索功能
+		checkDisable() {
+			console.log('点击了')
+		},
+		// 获取用户详情
+		getUserInfo() {
+			if (this.userInfo.id != undefined) {
+				this.$http
+					.post('book/user/info/' + this.userInfo.id)
+					.then(res => {
+						this.userMes = res.user
+						this.getCateList();
+					});
+			}
+		},
+		// 详情
+		gotoDetail(item) {
+			console.log('111', item)
+			console.log('this.curOneCateIndex', this.curOneCateIndex)
+			console.log('this.curTwoCateIndex', this.curTwoCateIndex)
+			if (this.curOneCateIndex == 0) {
+				if(item.contentType == 2){
+					uni.navigateTo({
+						url: './xueshuwebView?id=' + item.id
+					})
+				}else{
+					uni.navigateTo({
+						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: {
+						"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: {
+						'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: {
+						"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: {
+						"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) {
+			let type = item.type
+			this.curOneCateIndex = index
+			this.curTwoCateIndex = 0
+			this.searchValue = ''
+			this.searchList = []
+			this.showSearchList = false
+			this.getTowCateList(type)
+		},
+		getTowCateList(type) {
+			$http.request({
+				url: "book/medicaldes/typeList?label=" + type,
+				method: "POST",
+				data: {
+					loadAnimate: 'none'
+				},
+			}).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);
+			});
+			return result;
+		},
+		
+		getCateList(id) {
+			id ? '' : id = 0
+			this.twoCateList = []
+			this.curTwoCateIndex = 0;
+			this.getTowCateList(this.oneCateList[0].type);
+		},
+
+		// 放大图片
+		previewImage(url) {
+			console.log(url)
+			uni.previewImage({
+				urls: [url],
+				longPressActions: {
+					itemList: ['很抱歉，暂不支持保存图片到本地'],
+					success: function(res) {
+						// console.log(res,'+++++')
+					}
+				}
+			});
+		},
+	},
+	onBackPress() {
+		// #ifdef APP-PLUS
+		plus.key.hideSoftKeybord();
+		// #endif
+	},
+	components: {
+
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/static/mixin.scss';
+.searchList {
+	.item {
+		font-size: 28rpx;
+		padding: 20rpx;
+		border-bottom: 1px solid #dadbde;
+	}
+}
+
+.scroll-view_H {
+	background-color: #fff;
+	white-space: nowrap;
+	padding: 10rpx;
+}
+/deep/.u-grid-item{
+	margin: 12rpx 0;
+}
+
+.contentBox {
+	height: 100vh;
+	
+	.oneCateList {
+		width: 100%;
+		background: #f3f3f3;
+	}
+
+	.twoCateList {
+		font-size: 28rpx;
+		margin: 12rpx 0;
+
+		.grid-text {
+			text-align: center;
+			font-size: 28rpx;
+			line-height: 38rpx;
+		}
+
+		.cur {
+			color: $themeColor;
+		}
+	}
+
+	.titleList {
+		padding: 0 10rpx;
+		border-radius: 10rpx;
+		background-color: #f8f9fa;
+
+		.titleItem {
+			font-size: 28rpx;
+			padding: 20rpx 20rpx;
+		}
+
+		.JFtitleItem {
+			background-color: #ffffff;
+			padding: 20rpx 10rpx;
+			width: 100%;
+			border-bottom: 0.5px solid #f8f9fa;
+		}
+
+		.wmzhimg {
+			width: 220rpx;
+			height: 220rpx;
+		}
+	}
+}
+
+
+.container {
+	height: 100vh;
+	background-color: #fff;
+}
+/deep/.u-grid .u-grid-item:last-child{
+	border-bottom: 0 !important;
+}
+.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;
+
+	}
+}
+
+/deep/.u-divider__text{
+	font-size: 28rpx !important;
+}
+
+.flexbox {
+	display: flex;
+}
+
+.uni-modal .uni-modal__bd {
+	text-align: left;
+}
+
+.limiTy {
+	font-size: 28rpx;
+	line-height: 46rpx;
+}
+
+.chImage {
+	height: 100rpx;
+}
+</style>
--- a/pages/wumen/medicaldesDetail.vue
+++ b/pages/wumen/medicaldesDetail.vue
@@ -0,0 +1,152 @@
+<template>
+	<view class="container">
+		<z-nav-bar :title="prescriptDetail.name" bgColor="#5188e5" fontColor="#fff"></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>
+
+			</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
+	},
+	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",	
+				data: {
+					
+				},
+				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 {
+		
+		.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>
--- a/pages/wumen/medurl.vue
+++ b/pages/wumen/medurl.vue
@@ -0,0 +1,42 @@
+<template>
+	<view class="container">
+		<z-nav-bar bgColor="#5188e5" fontColor="#fff"></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 '@/static/mixin.scss';
+</style>
--- a/pages/wumen/recordDetail.vue
+++ b/pages/wumen/recordDetail.vue
@@ -0,0 +1,145 @@
+<template>
+	<view class="container">
+		<z-nav-bar :title="prescriptDetail.title" bgColor="#5188e5" fontColor="#fff"></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>
+			</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
+		},
+		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",
+					data: {
+						
+					},
+					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 => {	
+					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 {
+		
+		.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>
--- a/pages/wumen/video.vue
+++ b/pages/wumen/video.vue
@@ -0,0 +1,196 @@
+<template>
+	<view class="container">
+		<z-nav-bar :title="title" bgColor="#5188e5" fontColor="#fff"></z-nav-bar>
+		<view class="contentBox">
+			<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="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>
+</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 '@/static/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>
--- a/pages/wumen/xueshugongxianDetail.vue
+++ b/pages/wumen/xueshugongxianDetail.vue
@@ -0,0 +1,158 @@
+<template>
+  <view class="container">
+    <z-nav-bar :title="prescriptDetail.title" bgColor="#5188e5" fontColor="#fff"></z-nav-bar>
+    <view
+      class="contentBox"
+      v-if="prescriptDetail.content && prescriptDetail.contentType == 1"
+    >
+      <view class="content">
+        <view class="item title-center">
+          {{ prescriptDetail.title }}
+        </view>
+        <view class="item" v-html="prescriptDetail.content"> </view>
+      </view>
+    </view>
+    <view class="fullscreen-webview" v-else>	
+      <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;	
+  },
+  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",
+          data: {
+			  
+		  },
+          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%;"'
+              );
+            }
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+  },
+  components: {
+    musicPlay,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.contentBox {
+  padding-bottom: 20rpx;
+}
+.contentBoxwebwiew {
+  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 {
+	
+  .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>
--- a/pages/wumen/xueshuwebView.vue
+++ b/pages/wumen/xueshuwebView.vue
@@ -0,0 +1,164 @@
+<template>
+  <view class="container">
+    <z-nav-bar :title="prescriptDetail.title" bgColor="#5188e5" fontColor="#fff"></z-nav-bar>   
+    <view class="fullscreen-webview">		
+      <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",
+          data: {
+			  
+		  },
+          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%;"'
+              );
+            }
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
+    },
+  },
+  components: {
+    musicPlay,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.contentBox {
+  padding-bottom: 20rpx;
+}
+.contentBoxwebwiew {
+  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 {
+	
+  .item {
+    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>
--- a/pages/wumen/zhuanzhuchuban.vue
+++ b/pages/wumen/zhuanzhuchuban.vue
@@ -0,0 +1,571 @@
+<template>
+	<view class="container">
+		<z-nav-bar title="专著出版" bgColor="#5188e5" fontColor="#fff"></z-nav-bar>
+
+		<view class="contentBox">
+			<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;">
+							<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>
+</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();
+		},
+		onHide() {
+			
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		methods: {
+			// 检查是有权限使用搜索功能
+			checkDisable() {
+				console.log('点击了')
+			},
+			// 获取用户详情
+			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('用户点击确定');
+									let bagName = 'com.cn.nuttyreading'
+									let schemes = 'nuttyreading'	
+									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: '../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: {
+							"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: {
+							'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: {
+							"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: {
+							"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) {
+				let type = item.type
+				this.curOneCateIndex = index
+				this.curTwoCateIndex = 0
+				this.searchValue = ''
+				this.searchList = []
+				this.showSearchList = false
+				this.getTowCateList(type)
+			},
+			getTowCateList(type) {
+				$http.request({
+					url: "book/medicaldes/typeList?label=" + type,
+					method: "POST",
+					data: {
+						loadAnimate: 'none',
+					},
+				}).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);
+				});
+				return result;
+			},
+			
+			getCateList(id) {
+				id ? '' : id = 0
+				this.twoCateList = []
+				this.curTwoCateIndex = 0
+				
+				this.getTowCateList(this.oneCateList[0].type);
+			},
+
+			// 放大图片
+			previewImage(url) {
+				console.log(url)
+				uni.previewImage({
+					urls: [url],
+					longPressActions: {
+						itemList: ['很抱歉，暂不支持保存图片到本地'],
+						success: function(res) {
+							// console.log(res,'+++++')
+						}
+					}
+				});
+			},
+		},
+		onBackPress() {
+			// #ifdef APP-PLUS
+			plus.key.hideSoftKeybord();
+			// #endif
+		},
+		components: {
+
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '@/static/mixin.scss';
+	.searchList {
+		.item {
+			font-size: 28rpx;
+			padding: 20rpx;
+			border-bottom: 1px solid #dadbde;
+		}
+	}
+
+	.scroll-view_H {
+		background-color: #fff;
+		white-space: nowrap;
+		padding: 10rpx;
+	}
+	/deep/.u-border-bottom{
+		border-bottom: 0;
+	}
+	.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;
+			}
+		}
+
+		/deep/.u-grid-item{
+			margin: 10rpx 0;
+		}
+		/deep/.u-grid .u-grid-item:last-child{
+			border-bottom: 0 !important;
+		}
+		.twoCateList {
+			font-size: 28rpx;
+			margin: 12rpx 0;
+			
+			.grid-text {
+				text-align: center;
+				font-size: 28rpx;
+				line-height: 38rpx;
+			}
+			
+			.cur {
+				color: $themeColor;
+			}
+		}
+
+		.titleList {
+			font-size: 26rpx;
+			margin-top: 20rpx;
+			padding: 0 10rpx;
+			border-radius: 10rpx;
+			background-color: #f8f9fa;
+
+			.titleItem {
+				font-size: 28rpx;
+				padding: 20rpx 20rpx;
+			}
+			.JFtitleItem {
+				background-color: #ffffff;
+				padding: 20rpx 10rpx;
+				width: 100%;
+				border-bottom: 0.5px solid #f8f9fa;
+			}
+
+			.wmzhimg {
+				width: 220rpx;
+				height: 220rpx;
+			}
+		}
+	}
+
+
+	.container {
+		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;
+
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.uni-modal .uni-modal__bd {
+		text-align: left;
+	}
+
+	.limiTy {
+		font-size: 28rpx;
+		line-height: 46rpx;
+	}
+
+	.chImage {
+		height: 100rpx;
+	}
+</style>
--- a/static/common.scss
+++ b/static/common.scss
@@ -266,7 +266,6 @@ $themeBgColor: #fff !important;

 .container {
 	width: 100%;
-	padding: 10rpx;
 	height: 100%;
 	box-sizing: border-box;

--- a/static/icon/home_icon_0.png
+++ b/static/icon/home_icon_0.png
--- a/store/modules/video.js
+++ b/store/modules/video.js
@@ -0,0 +1,11 @@
+export const state = {
+  videoPlayId: ""
+};
+export const mutations = {
+  setVideoPlayId(state, data){
+	state.videoPlayId = data;
+  }
+};
+export const actions = {
+  
+};
--- a/unpackage/dist/build/app-plus/app-config-service.js
+++ b/unpackage/dist/build/app-plus/app-config-service.js
--- a/unpackage/dist/build/app-plus/app-service.js
+++ b/unpackage/dist/build/app-plus/app-service.js
--- a/unpackage/dist/build/app-plus/app-view.js
+++ b/unpackage/dist/build/app-plus/app-view.js
--- a/unpackage/dist/build/app-plus/manifest.json
+++ b/unpackage/dist/build/app-plus/manifest.json
--- a/unpackage/dist/build/app-plus/static/common.scss
+++ b/unpackage/dist/build/app-plus/static/common.scss
@@ -266,7 +266,6 @@ $themeBgColor: #fff !important;

 .container {
 	width: 100%;
-	padding: 10rpx;
 	height: 100%;
 	box-sizing: border-box;