备份

方剂检索页面ui
2023-12-08 14:48:44 +08:00 · 2023-11-10 13:58:57 +08:00
45 changed files with 25686 additions and 29525 deletions
--- a/components/z-navigation/z-navigation.vue
+++ b/components/z-navigation/z-navigation.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="footer_box" :class="{ footer_bg: bg }">
 			<view v-for="(item, index) of navigationList" :key="index" class="footer_item">
-				<view class="footer_nav_item" @click="onPageJump(item.pagePath,index+1)">
+				<view class="footer_nav_item" @click="onPageJump(item.pagePath)">
 					<image v-if="item.pagePath == path" class="footer_nav_item_image footer_nav_item_image_scale"
 						:src="'/' + item.selectedIconPath" mode="aspectFit"></image>
 					<image v-else class="footer_nav_item_image" :src="'/' + item.iconPath" mode="aspectFit"></image>
@@ -49,7 +49,7 @@
 						iconPath: 'static/tab/icon2_n.png',
 						selectedIconPath: 'static/tab/icon2_y.png',
 						text: '我的订单'
-
+						
 					},
 					{
 						pagePath: 'pages/peanut/mine',
@@ -69,23 +69,11 @@
 		},
 		//方法
 		methods: {
-			onPageJump(url,num) {
-				if (uni.getStorageSync("anonymous") == '0000000000' && (num == 2 || num == 3)) {
-					uni.showToast({
-						icon: 'none',
-						title: '请先登录'
-					})
-					// setTimeout(() => {
-					// 	uni.navigateTo({
-					// 		url: "/pages/user/login"
-					// 	});
-					// }, 1000)
-				} else {
-					if (this.path !== url) {
-						uni.switchTab({
-							url: '/' + url
-						});
-					}
+			onPageJump(url) {
+				if (this.path !== url) {
+					uni.switchTab({
+						url: '/' + url
+					});
 				}
 			},
 		}
@@ -171,10 +159,10 @@
 		}
 	}

-
+	

 	.footer_item_text_active {
 		color: #079307;
 		font-weight: bold;
 	}
-</style>
+</style>
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -6,8 +6,8 @@ if (process.env.NODE_ENV === 'development') {
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "http://59.110.212.44:9200/pb/";
-	baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
-	 // baseUrl = "https://api.nuttyreading.com/";   // 线上正式
+	// baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
+	 baseUrl = "https://api.nuttyreading.com/";   // 线上正式
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
 	// baseUrl = "http://192.168.110.110:9200/pb/";
 	  // baseUrl = "http://192.168.110.38:9200/pb/";        // 吴春磊笔记本1
@@ -45,10 +45,9 @@ const courtConfig = {
 	}
 };
 //手机号验证正则表达式
-// (中国大陆)
-const phoneRegular = /^1\d{10}$/;
+// const phoneRegular = /^1\d{10}$/;
 // 手机号码验证 支持港澳台 大陆
-// const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$|^(00){0,1}(65){1}[13689]\d{6,7}$/;
+const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$|^(00){0,1}(65){1}[13689]\d{6,7}$/;
 //邮箱验证正则表达式
 const mailRegular = /^\w+@\w+(\.[a-zA-Z]{2,3}){1,2}$/;
 //密码验证正则表达式
--- a/config/html5Utils.js
+++ b/config/html5Utils.js
@@ -240,13 +240,13 @@ export const h5Login = function(type = "judge", callback) {
 			appMutual("jumpLogin", null, function() {
 				if (type == "force") {
 					// 没登录跳转回登录页
-					// uni.showToast({
-					// 	icon: 'none',
-					// 	title: '用户信息失效，请重新登陆。'
-					// })
-					// uni.navigateTo({
-					// 	url: "/pages/user/login"
-					// });
+					uni.showToast({
+						icon: 'none',
+						title: '用户信息失效，请重新登陆。'
+					})
+					uni.navigateTo({
+						url: "/pages/user/login"
+					});
 				}else{
 					uni.showModal({
 						title:"提示",
--- a/config/requestConfig.js
+++ b/config/requestConfig.js
@@ -125,11 +125,9 @@ $http.requestStart = function(options) {
 	let storeUserInfo = store.state.userInfo;
 	if (!storeUserInfo.token) { // nvue页面读取不到vuex里面数据，将取缓存
 		storeUserInfo = uni.getStorageSync("userInfo");
-		uni.setStorageSync('anonymous', '0000000000');
 	}
 	if (storeUserInfo.token) {
 		options.header['token'] = storeUserInfo.token;
-		uni.setStorageSync('anonymous', storeUserInfo.token);
 	};
 	return options;
 }
@@ -163,14 +161,12 @@ $http.dataFactory = async function(res) {
 			// 返回正确的结果(then接受数据)
 			return Promise.resolve(httpData);
 		} else if (httpData.code == "401") {
-			console.log(uni.getStorageSync("anonymous"))
 			// token失效
-			if (uni.getStorageSync('guidePages') == 2 && uni.getStorageSync("anonymous") != '0000000000') {
+			if (uni.getStorageSync('guidePages') == 2) {
 				uni.showToast({
 					title: '登录失效，请重新登录',
 					icon: 'none'
 				});
-				console.log('到这里了')
 				setTimeout(() => {
 					uni.navigateTo({
 						url: "/pages/user/login"
@@ -298,7 +294,7 @@ $http.dataFactory = async function(res) {
 			});
 		} else { //其他错误提示   
 			console.log(httpData.info || httpData.msg)
-			if (res.isPrompt && res.data.loadAnimate != 'none') {
+			if (res.isPrompt && res.data.loadAnimate != 'none') {	
 				uni.showToast({
 					title: httpData.info || httpData.msg,
 					icon: "none",
@@ -337,4 +333,4 @@ $http.requestError = function(e) {
 		// });
 	}
 }
-export default $http;
+export default $http;
--- a/config/utils.js
+++ b/config/utils.js
@@ -235,32 +235,6 @@ export const getLatLon = function(tip) {
 	});
 }

-// 查看是否有某本书的权限
-export const checkBookRight = function(data,callback) {
-	console.log('接受的值', data)
-	$http.request({
-		url: "/book/user/checkUserBook",
-		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-		data:data,
-		header: { //默认 无 说明：请求头1
-			'Content-Type': 'application/json'
-		},
-	}).then(res => {
-		// console.log(res,'checkBookRight')			
-		if(res.code === 0){			
-			callback && callback({
-				success: true,
-				data: '有权限'
-			});
-		}
-	}).catch(e => {
-		callback && callback({
-			success: false,
-			data: '无权限'
-		});
-	})
-}
-
 // 单独微信支付
 export const setWXPay = function(payInfo, callback) {
 	$http.request({
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
            "src" : "图片路径"
        }
    ],
-    "versionName" : "1.2.18",
-    "versionCode" : 1218,
+    "versionName" : "1.2.13",
+    "versionCode" : 1213,
    "app-plus" : {
        "compatible" : {
            "ignoreVersion" : true
@@ -78,8 +78,7 @@
                ],
                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                "minSdkVersion" : 21,
-                "targetSdkVersion" : 30,
-                "schemes" : "nuttyreading"
+                "targetSdkVersion" : 30
            },
            "sdkConfigs" : {
                "ad" : {},
@@ -115,9 +114,7 @@
                        "com.apple.developer.associated-domains" : [ "applinks:verification.nuttyreading.com" ]
                    }
                },
-                "idfa" : false,
-                "urltypes" : "nuttyreading",
-                "urlschemewhitelist" : "everhealth"
+                "idfa" : false
            },
            "icons" : {
                "android" : {
@@ -157,10 +154,7 @@
        "splashscreen" : {
            "alwaysShowBeforeRender" : false
        },
-        "nativePlugins" : {},
-        "uniStatistics" : {
-            "enable" : true
-        }
+        "nativePlugins" : {}
    },
    // 5+App特有相关
    "quickapp" : {},
@@ -178,9 +172,6 @@
            "scope.userLocation" : {
                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
            }
-        },
-        "uniStatistics" : {
-            "enable" : true
        }
    },
    "h5" : {
@@ -193,61 +184,9 @@
            "treeShaking" : {
                "enable" : true
            }
-        },
-        "uniStatistics" : {
-            "enable" : true
        }
    },
-    "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274",
-    "uniStatistics" : {
-        "version" : "2",
-        "enable" : true
-    },
-    "mp-alipay" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-baidu" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-jd" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-kuaishou" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-lark" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-qq" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-toutiao" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "quickapp-webview-huawei" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "quickapp-webview-union" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    }
+    "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274"
 }
 // 小程序特有相关

--- a/pages.json
+++ b/pages.json
@@ -459,33 +459,6 @@
                "enablePullDownRefresh": false
            }
            
-        },
-        {
-            "path" : "pages/yian/yian",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "医案",
-                "enablePullDownRefresh": true
-            }
-            
-        },
-        {
-            "path" : "pages/yian/yianList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "医案列表",
-                "enablePullDownRefresh": true
-            }
-            
-        }
-        ,{
-            "path" : "pages/yian/yianDetail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "医案详情",
-                "enablePullDownRefresh": false
-            }
-            
        },
 		{           // 更新版本
 					"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
@@ -535,6 +508,22 @@
        		"navigationBarTitleText" : "脉穴详情",
        		"enablePullDownRefresh" : false
        	}
+        },
+        {
+        	"path" : "pages/prescription/prescription",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "方药检索",
+        		"enablePullDownRefresh" : false
+        	}
+        },
+        {
+        	"path" : "pages/prescription/prescriptionDetail",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "方药详情",
+        		"enablePullDownRefresh" : false
+        	}
        }
    ],
 	"globalStyle": {
--- a/pages/acupoint/acupoint.vue
+++ b/pages/acupoint/acupoint.vue
@@ -6,46 +6,42 @@
 		<!-- <uni-search-bar @confirm="search" :focus="true" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
 			@cancel="cancel" @clear="clear">
 		</uni-search-bar> -->
-		<view class="search_box" v-if="oneCateList.length > 0">
-			<u-search :disabled="userMes.pointPower == 0 && oneCateList[curOneCateIndex].id == 3 || userMes
-					.pointPower == 0 && oneCateList[curOneCateIndex].id == 6 ? true : false" @click="checkDisable" placeholder="请输入穴位名" @focus="focus" @clear="clear"
-				v-model="searchValue" @input="input" @blur="blur" @search="search"></u-search>
+		<view class="search_box">
+			<u-search placeholder="请输入穴位名" @focus="focus" @clear="clear" v-model="searchValue" @input="input" @blur="blur" @search="search"></u-search>
 		</view>
 		<view class="searchList" v-show="showSearchList">
 			<view class="itemBox" v-if="searchList.length > 0">
-				<view class="item" v-for="(item, index) in searchList" :key="index" @click="gotoDetail(item)">
+				<view class="item" v-for="(item, index) in searchList" :key="index"  @click="gotoDetail(item)">
 					{{item.title}}
 				</view>
 			</view>
 			<view v-else class="">
-				<u-divider text="未找到相关穴位哦~"></u-divider>
+				<u-divider  text="未找到相关穴位哦~"></u-divider>
 			</view>
 		</view>
 		<view v-show="!showSearchList" class="contentBox">
 			<!-- <scroll-view class="scroll-view_H oneCateList" scroll-x="true" scroll-left="0"> -->
 			<view class="oneCateList flexbox">
-				<text :class="[curOneCateIndex == index ? 'cur' : '']" @click="setOneCateIndex(item,index)"
-					v-for="(item, index) in oneCateList" :key="item.id">{{item.title}}</text>
-			</view>
+				<text :class="[curOneCateIndex == index ? 'cur' : '']" @click="setOneCateIndex(item,index)" v-for="(item, index) in oneCateList" :key="item.id">{{item.title}}</text>
+			</view>	
 			<!-- </scroll-view> -->
 			<view class="grid twoCateList" v-if="twoCateList.length > 0">
 				<u-grid :col="3" border class="u-grid-list">
-					<u-grid-item v-for="(item, index) in twoCateList" :key="item.id"
-						@click="setTwoCateIndex(item, index)">
-						<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.title}}</view>
-					</u-grid-item>
-				</u-grid>
-			</view>
-			<view class="titleList">
+						<u-grid-item v-for="(item, index) in twoCateList" :key="item.id" @click="setTwoCateIndex(item, index)">						
+							<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.title}}</view>
+						</u-grid-item>					
+					</u-grid>
+			</view>			
+			<view class="titleList">				
 				<u-grid :col="3" v-if="titleList.length > 0">
-					<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)">
-						<view :class="['titleItem']">{{item.title}}</view>
-					</u-grid-item>
+						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)">						
+							<view :class="['titleItem']">{{item.title}}</view>
+						</u-grid-item>					
 				</u-grid>
 				<u-divider v-else text="暂无穴位数据哦~"></u-divider>
 			</view>
 		</view>
-
+		

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

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

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

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

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

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

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

-
-
+			
+		



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

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


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

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


 	.book_tab {
@@ -771,7 +633,6 @@
 			display: inline-block;
 		}
 	}
-
 	.youhuiItem {
 		border: 1px solid #d9d9d9;
 		border-radius: 10rpx;
@@ -783,12 +644,12 @@
 		background-color: #fff;
 		font-size: 30rpx;
 	}
-
+	
 	.youhuiItem>view {
 		float: left;
 	}
-
+	
 	.youhuiItem.youItem_style {
 		border-color: #fd6004;
 	}
-</style>
+</style>
--- a/pages/library/library.vue
+++ b/pages/library/library.vue
@@ -67,7 +67,6 @@
 												<view v-if="item.clockIn != null && item.clockIn != 2" @click="goDaKa(item)">
 													<image src="../../static/icon/home1.png" mode="aspectFit"></image>
 												</view>
-												
 												<view v-else @click="noOp()">
 													<image class="gray" src="../../static/icon/home1.png" mode="aspectFit"></image>
 												</view>											
--- a/pages/listen/listen.vue
+++ b/pages/listen/listen.vue
@@ -110,9 +110,6 @@
 	 import {
 	 	mapState,mapMutations
 	 } from 'vuex';
-	 import {
-	 	checkBookRight
-	 } from '@/config/utils';
 	export default {
 		components: {
 			//  cxAdudioPlay,
@@ -221,23 +218,10 @@
 			// },
 			// 查看本书更多书评
 			toMore(val){
-				let data = {
-					'userId': this.userInfo.id,
-					'bookId': this.bookid
-				}
-				checkBookRight(data,res=>{
-					// console.log(res)
-					if(res.success){
-						uni.navigateTo({
-							url: '../comments/comments?bookid='+ this.bookid,
-						});
-					}else{
-						uni.showToast({
-							title:'购买本书后方可查看此内容!',
-							icon:'none'
-						})
-					}
-				})				
+				console.log(val,'val')
+				uni.navigateTo({
+					url: '../comments/comments?bookid='+ this.bookid,
+				});
 			},
 			// 去听书
 			gotoListen(){
@@ -247,43 +231,15 @@
 			},
 			// 去讲书
 			goJiangShu(){
-				let data = {
-					'userId': this.userInfo.id,
-					'bookId': this.bookid
-				}
-				checkBookRight(data,res=>{
-					console.log(res)
-					if(res.success){
-						uni.navigateTo({
-							url: '../talkBook/talkBookML?bookid=' + this.bookid				
-						});
-					}else{
-						uni.showToast({
-							title:'购买本书后方可查看此内容!',
-							icon:'none'
-						})
-					}
-				})				
+				uni.navigateTo({
+					url: '../talkBook/talkBookDetail?bookId='+ this.bookid					
+				});
 			},
 			// 去打卡
-			gotoclock(){	
-				let data = {
-					'userId': this.userInfo.id,
-					'bookId': this.bookid
-				}
-				checkBookRight(data,res=>{
-					console.log(res)
-					if(res.success){
-						uni.navigateTo({
-							url: '../clock/clock?bookid='+ this.bookid,
-						});
-					}else{
-						uni.showToast({
-							title:'购买本书后方可参与打卡!',
-							icon:'none'
-						})
-					}
-				})
+			gotoclock(){				
+				uni.navigateTo({
+					url: '../clock/clock?bookid='+ this.bookid,
+				});
 			},
 			getBookInfo(){
 				// 获取书本基本信息
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
--- a/pages/peanut/mine.vue
+++ b/pages/peanut/mine.vue
@@ -5,12 +5,12 @@
 		<view style="height: 50rpx;"></view>
 		<view class="per_mes">
 			<image :src="userMes.avatar" v-if="userMes.avatar!=null" class="per_mes_img"></image>
-			<image src="../../static/icon/home_icon_1.png" v-if="userMes.avatar==null" class="per_mes_img" @click="signOut()"></image>
+			<image src="../../static/icon/home_icon_1.png" v-if="userMes.avatar==null" class="per_mes_img"></image>
 			<view>
 				<text class="name" v-if="userMes.nickname!=null">{{userMes.nickname}}</text>
-				<text class="name" v-if="userMes.nickname==null" @click="signOut()">未登录</text>
+				<text class="name" v-if="userMes.nickname==null">未设置</text>
 				<!-- <image v-if="userMes.vip==1" src="../../static/icon/mine_v.png" alt="" class="per_user_img"></image> -->
-				<text style="margin-left: 20rpx;font-size: 22rpx;color: #888;" v-if="userMes.tel">({{userMes.tel}})</text>
+				<text style="margin-left: 20rpx;font-size: 22rpx;color: #888;">({{userMes.tel}})</text>

 				<!-- <text class="tong">累计读书5本
 					<span style="margin: 0 20upx;">|</span> 今日读50分钟
@@ -35,7 +35,7 @@
 			<b class="kt_btn" @click="onPageJump('./opeVip')">立即续费</b>
 		</view> -->

-		<view class="chong_zhi" v-if="!anonymous">
+		<view class="chong_zhi">
 			<view class="zhanghu" @click="onPageJump('../user/persCount')">
 				我的账户
 				<text style="float: right;line-height: 85rpx;"> > </text>
@@ -55,64 +55,53 @@
 		</view>

 		<view class="xiugai">
-			<view v-if="!anonymous">
-				<view class="nav_list" @click="switchTab('../bookShop/orderList')">
-					<text>我的订单</text>
-				</view>
-				<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
+			<view class="nav_list" @click="switchTab('../bookShop/orderList')">
+				<text>我的订单</text>
+			</view>			
+			<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
 				<text>我的打卡</text>
 			</view> -->
-				<view class="nav_list" @click="onPageJump('../listen/home')">
-					<text>我的听书</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../listen/setListen')">
-					<text>听书设置</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../peanut/myComments')">
-					<text>我的评价</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../peanut/shopping')">
-					<text>购物车</text>
-				</view>
-				<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookBuy')">
+			<view class="nav_list" @click="onPageJump('../listen/home')">
+				<text>我的听书</text>
+			</view>
+			<view class="nav_list" @click="onPageJump('../listen/setListen')">
+				<text>听书设置</text>
+			</view>
+			<view class="nav_list" @click="onPageJump('../peanut/myComments')">
+				<text>我的评价</text>
+			</view>
+			<view class="nav_list" @click="onPageJump('../peanut/shopping')">
+				<text>购物车</text>
+			</view>
+			<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookBuy')">
 				<text>电子书购买记录</text>
 			</view> -->
-				<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookRecord')">
+			<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookRecord')">
 				<text>阅读记录</text>
 			</view> -->
-				<view class="nav_list" @click="onPageJump('../user/persData')">
-					<text>修改个人资料</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../user/address')">
-					<text>地址管理</text>
-				</view>
-
-				<!-- <view class="nav_list" @click="onGoing()">
+			<view class="nav_list" @click="onPageJump('../user/persData')">
+				<text>修改个人资料</text>
+			</view>
+			<view class="nav_list" @click="onPageJump('../user/address')">
+				<text>地址管理</text>
+			</view>
+			
+			<!-- <view class="nav_list" @click="onGoing()">
 				<text>帮助与反馈11111</text>
-			</view> -->
-				<!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
-				<view class="nav_list" @click="newOnShare">
-					<text>分享App</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
-					<text>关于我们</text>
-				</view>
-				<view class="nav_list" @click="signShow=true">
-					<text>退出登录</text>
-				</view>
-				<view class="nav_list" @click="logout">
-					<text>注销帐号</text>
-				</view>
+			</view> -->			
+			<view class="nav_list" @click="newOnShare" v-if="isAndorid">
+				<text>分享App</text>
 			</view>
-
-			<view v-if="anonymous">
-				<view class="nav_list" @click="newOnShare">
-					<text>分享App</text>
-				</view>
-				<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
-					<text>关于我们</text>
-				</view>
+			<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
+				<text>关于我们</text>
 			</view>
+			<view class="nav_list" @click="signShow=true">
+				<text>退出登录</text>
+			</view>
+			<view class="nav_list" @click="logout">
+				<text>注销帐号</text>
+			</view>
+			
 		</view>

 		<u-modal :show="signShow" :content="signContent" :showCancelButton="true" @cancel="signShow=false"
@@ -122,10 +111,9 @@
 		<uni-popup ref="share" type="share" safeArea backgroundColor="#fff">
 			<uni-popup-share @select="haveSelected"></uni-popup-share>
 		</uni-popup>
-
+		
 		<music-play :playData="playData"></music-play>
 		<z-navigation></z-navigation>
-		
 	</view>
 </template>

@@ -134,28 +122,26 @@
 	import $http from '@/config/requestConfig.js';
 	// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
 	import {
-		mapState,
-		mapMutations
+		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
-				showEbook: false, // 显示电子书相关
+				showEbook:false,    // 显示电子书相关
 				userMes: {},
 				signShow: false,
 				signContent: '是否要退出登录？',
-				playData: {},
-				isAndorid: true,
-				platform: null, // 设备系统
-				anonymous: false, //游客
+				playData:{},
+				isAndorid:true,	
+				platform : null, // 设备系统
 			};
 		},
 		//第一次加载
 		onLoad(e) {
 			// 隐藏原生的tabbar
-			uni.hideTabBar();
+			uni.hideTabBar();			
 			// #ifdef APP-PLUS
-			this.getOS()
+			this.getOS()			
 			this.platform = uni.getSystemInfoSync().platform
 			// console.log('操纵系统',this.platform)
 			// #endif
@@ -168,28 +154,26 @@
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			this.getData();
-			this.anonyMo();
 		},
-		components: {
+		components: {			
 			musicPlay
 		},
 		//方法
 		methods: {
-			...mapMutations(['setUserInfo']),
 			// 获得操作系统
-			getOS() {
-				let oprateOs = ''
+			getOS(){
+				let oprateOs = ''				
 				oprateOs = uni.getSystemInfoSync().platform
 				// console.log(oprateOs)
-				if (oprateOs == 'android') {
+				if(oprateOs == 'android'){
 					this.isAndorid = true
-				} else {
+				}else{
 					this.isAndorid = false
 				}
 			},
-			haveSelected(data) {
-				console.log(data, ' 选择的是')
-				if (data.index == 0) {
+			haveSelected(data){
+				console.log(data,' 选择的是')
+				if(data.index == 0){    
 					// 分享到好友
 					uni.share({
 						provider: "weixin",
@@ -199,14 +183,14 @@
 						title: "疯子读书",
 						summary: "我正在使用疯子读书提升自己，赶紧跟我一起来体验吧！",
 						imageUrl: "static/fengziIcon.jpg",
-						success: function(res) {
+						success: function (res) {
 							console.log("success:" + JSON.stringify(res));
 						},
-						fail: function(err) {
+						fail: function (err) {
 							console.log("fail:" + JSON.stringify(err));
 						}
 					});
-				} else if (data.index == 1) {
+				}else if(data.index == 1){
 					// 分享到朋友圈
 					uni.share({
 						provider: "weixin",
@@ -216,32 +200,20 @@
 						title: "疯子读书",
 						summary: "我正在使用疯子读书提升自己，赶紧跟我一起来体验吧！",
 						imageUrl: "static/fengziIcon.jpg",
-						success: function(res) {
+						success: function (res) {
 							console.log("success:" + JSON.stringify(res));
 						},
-						fail: function(err) {
+						fail: function (err) {
 							console.log("fail:" + JSON.stringify(err));
 						}
 					});
 				}
 			},
-			switchTab(url) {
+			switchTab(url){
 				uni.switchTab({
 					url: url
 				});
 			},
-
-			// 游客模式
-			anonyMo() {
-				if (uni.getStorageSync("anonymous") == '0000000000') {
-					this.anonymous = true
-				} else {
-					this.anonymous = false
-				}
-
-			},
-
-
 			getData() {
 				// 获取个人信息
 				if (this.userInfo.id != undefined) {
@@ -258,25 +230,25 @@
 				}

 			},
-
+			
 			// 新写分享
-			newOnShare() {
+			newOnShare(){
 				this.$refs.share.open()
-			},
-
+			},			
+			
 			// 注销账户
-			logout() {
+			logout(){
 				let that = this
 				uni.showModal({
 					title: '提示',
 					content: '确定要注销当前账户吗？',
-					success: function(res) {
+					success: function (res) {
 						if (res.confirm) {
 							uni.showModal({
 								title: '提示',
-								showCancel: false,
+								showCancel:false,
 								content: `注销申请已提交成功,请联系客服进行后续操作：022-24142321`,
-								success: function(res1) {
+								success: function (res1) {
 									if (res1.confirm) {
 										that.signOut()
 									}
@@ -296,7 +268,7 @@
 				})
 			},
 			onPageJump(url) {
-				console.log(url, 'url')
+				console.log(url,'url')
 				uni.navigateTo({
 					url: url
 				});
@@ -306,9 +278,6 @@
 			// 退出登录
 			signOut() {
 				this.signShow = false
-				this.setUserInfo({
-					'token': null
-				})
 				uni.reLaunch({
 					url: '../user/login'
 				});
@@ -475,4 +444,4 @@
 			border-bottom: 0;
 		}
 	}
-</style>
+</style>
--- a/pages/prescription/prescription.vue
+++ b/pages/prescription/prescription.vue
@@ -0,0 +1,630 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入1 -->
+		<public-module></public-module> -->
+		<z-nav-bar title="方药检索"></z-nav-bar>
+		<!-- <uni-search-bar @confirm="search" :focus="true" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
+			@cancel="cancel" @clear="clear">
+		</uni-search-bar> -->
+		<view class="oneCateList flexbox">
+			<text :class="[curOneCateIndex == index ? 'cur' : '']" @click="setOneCateIndex(item,index)"
+				v-for="(item, index) in oneCateList" :key="item.id">{{item.title}}</text>
+		</view>
+		<view class="search_box">
+			<u-search placeholder="请输入方药名" @focus="focus" @clear="clear" v-model="searchValue" @input="input"
+				@blur="blur" @search="search"></u-search>
+		</view>
+		<view class="searchList" v-show="showSearchList">
+			<view class="itemBox" v-if="searchList.length > 0">
+				<view class="item" v-for="(item, index) in searchList" :key="index" @click="gotoDetail(item)">
+					{{item.title}}
+				</view>
+			</view>
+			<view v-else class="">
+				<u-divider text="未找到相关方药哦~"></u-divider>
+			</view>
+		</view>
+		<view v-show="!showSearchList" class="contentBox">
+			<view class="" v-if="false">
+				<!-- 常规格式 -->				
+				<view class="grid twoCateList" v-if="twoCateList.length > 0">
+					<u-grid :col="3" border class="u-grid-list">
+						<u-grid-item v-for="(item, index) in twoCateList" :key="item.id"
+							@click="setTwoCateIndex(item, index)">
+							<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.title}}</view>
+						</u-grid-item>
+					</u-grid>
+				</view>
+				<view class="titleList">
+					<u-grid :col="3" v-if="titleList.length > 0">
+						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)">
+							<view :class="['titleItem']">{{item.title}}</view>
+						</u-grid-item>
+					</u-grid>
+					<u-divider v-else text="暂无方药数据哦~"></u-divider>
+				</view>
+			</view>
+			<view class="mode2" v-else>
+				<!-- 经方样式 -->
+				<scroll-view class="scroll-container" scroll-y="true" :scroll-into-view="toView"
+					scroll-with-animation="true">
+					<view class="address-book" v-for="(item, index) in jingfangList" :key="index" :id="item.id">
+						<view class="address-book-index">{{ item.id }}</view>
+						<view class="contact-container" v-for="(item, index) in item.data" :key="index">
+							<view class="contact-detail-container">
+								<view class="contact-name">{{ item.title }}</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="letter-nav">
+					<view class="item" v-for="(item, index) in indexList" :key="index" @click="toSelectIndex(item)">
+						{{ item }}
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	export default {
+		data() {
+			return {
+				indexList: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+					'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
+				],
+				playData: {},
+				searchValue: '',
+				oneCateList: [], // 一级分类标题1
+				twoCateList: [], // 二级分类标题
+				titleList: [], // 方药标题
+				curOneCateIndex: 0, // 当前选中的一级分类
+				curTwoCateIndex: 0, // 当前选中的二级分类
+				searchList: [], // 搜索结果数组
+				showSearchList: false,
+				toView: '',
+				jingfangList: [{
+						id: 'A',
+						data: [{
+								title: '阿联酋迪拉姆',
+							},
+							{
+								title: '阿尔巴尼亚列克',
+							},
+						]
+					},
+					{
+						id: 'B',
+						data: [{
+								title: '孟加拉国塔卡',
+							},
+							{
+								title: '保加利亚列瓦',
+							},
+						]
+					},
+
+					{
+						id: 'C',
+						data: [{
+								title: '加拿大元',
+							},
+							{
+								title: '瑞士法郎',
+							},
+						]
+					},
+					{
+						id: 'D',
+						data: [{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+						]
+					},
+					{
+						id: 'E',
+						data: [{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+						]
+					},
+					{
+						id: 'F',
+						data: [{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+						]
+					},
+					{
+						id: 'G',
+						data: [{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+						]
+					},
+					{
+						id: 'H',
+						data: [{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+						]
+					},
+					{
+						id: 'I',
+						data: [{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+						]
+					},
+					{
+						id: 'J',
+						data: [{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+							{
+								title: '丹麦克朗',
+							},
+							{
+								title: '多米尼加比索',
+							},
+						]
+					},
+					{
+						id: 'Z',
+						data: [{
+								title: 'z',
+							},
+							{
+								title: 'zzz',
+							},
+						]
+					}
+
+				], // 经方数组
+			}
+		},
+		onLoad() {
+			this.getCateList()
+		},
+		onHide() {
+			this.showSearchList = false
+			this.searchList = []
+		},
+		methods: {
+			toSelectIndex(item) {
+				this.toView = item
+			},
+			// 方药详情
+			gotoDetail(item) {
+				uni.navigateTo({
+					url: "./acupointDetail?id=" + item.id
+				})
+			},
+			// 获取方药名称
+			getTitles(id) {
+				$http.request({
+					url: "book/point/getPointsByCategoryId",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						// loadAnimate: 'none', // 请求加载动画
+						'pointCategoryId': id
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '内容获取成功')
+					if (res.code == 0 && res.points.length > 0) {
+						this.titleList = res.points
+					} else {
+						this.titleList = []
+					}
+				}).catch(e => {
+					this.titleList = []
+					console.log(e)
+				})
+			},
+			setTwoCateIndex(item, index) {
+				let id = item.id
+				this.curTwoCateIndex = index
+				this.getTitles(id)
+			},
+			setOneCateIndex(item, index) {
+				let id = item.id
+				this.curOneCateIndex = index
+				this.curTwoCateIndex = 0
+				this.getTowCateList(id)
+			},
+			getTowCateList(id) {
+				$http.request({
+					url: "book/point/getPointCategoryByPid",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						loadAnimate: 'none', // 请求加载动画
+						'id': id
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '二级分类获取成功')
+					if (res.code == 0 && res.category.length > 0) {
+						this.twoCateList = res.category
+						this.getTitles(this.twoCateList[0].id)
+					} else {
+						this.twoCateList = []
+						this.titleList = []
+					}
+				}).catch(e => {
+					this.twoCateList = []
+					this.titleList = []
+					console.log(e)
+				})
+			},
+			getCateList(id) {
+				id ? '' : id = 0
+				this.twoCateList = []
+				this.curTwoCateIndex = 0
+				// 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
+				$http.request({
+					url: "book/point/getPointCategoryByPid",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						loadAnimate: 'none', // 请求加载动画
+						'id': id
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '脉穴分类获取成功')
+					if (res.code == 0 && res.category.length > 0) {
+						this.oneCateList = res.category
+						this.getTowCateList(this.oneCateList[0].id)
+					} else {
+						this.oneCateList = []
+					}
+				}).catch(e => {
+					this.oneCateList = []
+					console.log(e)
+				})
+			},
+			getSearch() {
+				$http.request({
+					url: "book/point/searchPointList",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						loadAnimate: 'none', // 请求加载动画
+						'keywords': this.searchValue
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '搜索结果')
+					if (res.code == 0 && res.points.length > 0) {
+						this.searchList = res.points
+					}
+				}).catch(e => {
+					// this.titleList = []	
+					this.searchList = []
+					console.log(e)
+				})
+			},
+			search(res) {
+				console.log(res, 'res')
+				// uni.showToast({
+				// 	title: '搜索：' + res,
+				// 	icon: 'none'
+				// })
+
+			},
+			input(res) {
+				console.log('----input:', res)
+				if (res == '') {
+					this.searchList = []
+				} else {
+					this.getSearch()
+				}
+			},
+			clear(res) {
+				// uni.showToast({
+				// 	title: 'clear事件，清除值为：',
+				// 	icon: 'none'
+				// })
+				this.showSearchList = false
+			},
+			blur(res) {
+				if (res == '') {
+					this.showSearchList = false
+					this.searchList = []
+				} else {
+					this.getSearch()
+				}
+			},
+			focus(e) {
+				// uni.showToast({
+				// 	title: 'focus事件，输出值为：' + e.value,
+				// 	icon: 'none'
+				// })
+				this.showSearchList = true
+			},
+			// cancel(res) {
+			// 	uni.showToast({
+			// 		title: '点击取消，输入值为：' + res.value,
+			// 		icon: 'none'
+			// 	})
+			// }
+		},
+		onBackPress() {
+			// #ifdef APP-PLUS
+			plus.key.hideSoftKeybord();
+			// #endif
+		},
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.mode2 {
+		position: relative;
+	}
+
+	.address-book-index {
+		background-color: #f8f9fa; padding: 10rpx 0; text-indent: 2%;
+	}
+
+	.contact-img {
+		width: 20px;
+		height: 20px;
+	}
+
+	.scroll-container {
+		height: calc(100vh - 70rpx);
+	}
+
+	.letter-nav {
+		position: absolute;
+		right: 25rpx;
+		top: 40rpx;
+
+		.item {
+			font-size: 28rpx; margin-bottom: 10rpx;
+		}
+	}
+
+	.contact-container {
+		display: flex;
+		align-items: center;
+		margin: 2%;
+	}
+
+	.contact-detail-container {
+		margin-left: 2%;
+		.contact-name{
+			padding: 10rpx;
+		}
+
+	}
+
+	.searchList {
+		.item {
+			font-size: 28rpx;
+			padding: 20rpx;
+			border-bottom: 1px solid #dadbde;
+		}
+	}
+
+	.scroll-view_H {
+		background-color: #fff;
+		white-space: nowrap;
+		padding: 10rpx;
+	}
+
+	.oneCateList {
+		margin-bottom: 20rpx;
+		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;
+		}
+	}
+
+	.contentBox {
+
+		.twoCateList {
+			font-size: 28rpx;
+			margin-top: 20rpx;
+
+			.grid-text {
+				padding: 30rpx 20rpx;
+				text-align: center;
+			}
+
+			.cur {
+				color: #55aa7f;
+			}
+
+			// .u-grid-list{border: 0.5px solid #dadbde;}
+		}
+
+		.titleList {
+			font-size: 26rpx;
+			margin-top: 20rpx;
+			padding: 10rpx;
+			border-radius: 10rpx;
+			background-color: #f8f9fa;
+
+			.titleItem {
+				padding: 20rpx 0;
+			}
+		}
+	}
+
+
+	.container {
+		padding: 10rpx;
+		min-height: 100vh;
+		overflow: hidden;
+		background-color: #fff;
+	}
+
+	.search_box {
+		margin: 0 auto;
+		overflow: hidden;
+		margin-top: 20rpx;
+		align-items: center;
+		width: calc(100% - 10px);
+		margin-top: 0;
+		margin-bottom: 40rpx;
+
+		.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;
+	}
+</style>
--- a/pages/prescription/prescriptionDetail.vue
+++ b/pages/prescription/prescriptionDetail.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
--- a/pages/talkBook/talkBook.vue
+++ b/pages/talkBook/talkBook.vue
@@ -19,17 +19,17 @@
 		</view> -->
 		<view class="mainContainer">
 			<view class="item" v-if="bookList.length > 0">
-				<u-row gutter="16" justify="flex-start">
+				<u-row gutter="16" justify="flex-start" >
 					<u-col span="4" v-for="(item,index) in bookList" :key="index">
 						<view>
 							<view class="videoBox demo-layout bg-purple" @click="toDetail(item)">
 								<image v-if="item.images != ''" :src="item.images" mode="scaleToFill"></image>
-								<image v-else src="../../static/icon/wufeng.jpg" mode="scaleToFill"></image>
+								<image v-else src="../../static/icon/wufeng.jpg" mode="scaleToFill"></image>								
 							</view>
 							<text class="bookName">{{item.name}}</text>
 						</view>
 					</u-col>
-				</u-row>
+				</u-row>				
 			</view>
 			<u-divider v-else text="暂无数据"></u-divider>
 			<view style="width: 100%;">
@@ -41,10 +41,10 @@
 					<u-divider text="全部加载完成"></u-divider>
 				</view>
 			</view>
-
+			
 		</view>
 		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
+		<public-module></public-module>			
 		<music-play :playData="playData"></music-play>
 	</view>
 </template>
@@ -52,44 +52,42 @@
 <script>
 	import $http from '@/config/requestConfig.js';
 	// import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
-	import musicPlay from '@/components/music.vue'
-	import {
-		data
-	} from 'jquery';
-	import {
-		mapState
-	} from 'vuex';
+   import musicPlay from '@/components/music.vue'
+import { data } from 'jquery';
+   import {
+   	mapState
+   } from 'vuex';
 	export default {
 		data() {
 			return {
-				loadingNow: false,
-				playData: {},
-				windowWidth: 0,
-				bookid: null,
-				productInfo: {},
-				page: 1,
-				bookList: [],
-				pageSize: 9,
-				total: 0,
-				totalPage: 0,
-				status: 3,
-				shupingList: [],
-				bfaid: null,
+				loadingNow : false,
+				playData:{},				
+				windowWidth:0,
+				bookid:null,
+				productInfo:{},	
+				page:1,
+				bookList:[],
+				pageSize:9,
+				total:0,
+				totalPage:0,
+				status:3,
+				shupingList:[],
+				bfaid:null,
 				contentShow: 1,
 			}
 		},
 		onPullDownRefresh() {
 			console.log('下拉刷新了')
-			uni.stopPullDownRefresh();
+			uni.stopPullDownRefresh(); 
 		},
 		onReachBottom() {
-			this.loadingNow = true
+			this.loadingNow = true			
 			// if(this.page < this.total){
 			// 	this.page++
 			// 	console.log('加载',this.page)
 			// 	this.status = 0
 			// 	this.getBookCom()
-
+				
 			// }else{
 			// 	this.status = 1
 			// 	console.log('加载完成了',this.page)
@@ -98,112 +96,104 @@
 		},
 		onLoad(e) {
 			this.windowWidth = uni.getSystemInfoSync().windowWidth;
-			console.log(e, 'onload')
+			console.log(e,'onload')
 			this.bookid = e.bookid
-			//	this.getProDetail(e)
+		//	this.getProDetail(e)
 			this.getBooks()
 		},
-		computed: {
+		computed:{
 			...mapState(['userInfo']),
 		},
-		methods: {
+		methods: { 
 			setData(e) {
 				this.contentShow = e
 				this.getBooks()
 			},
-			getBooks() {
-				if (this.contentShow == 1) {
+			getBooks(){
+				if(this.contentShow == 1){

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

-<style lang="scss" scoped>
+<style lang="scss" scoped>	
 	.mytabs {
 		// background: url('@/static/icon/bgtushu.png') no-repeat left top;
 		height: 80rpx;
@@ -229,55 +219,35 @@
 			margin-right: 20rpx;
 		}
 	}
-
-	.tip {
-		padding: 20rpx;
-		background-color: #fff;
-
-		text {
-			font-size: 36rpx;
-		}
+.tip{
+		padding: 20rpx; background-color: #fff;
+		text{ font-size: 36rpx;}
 	}
-
-	.flexbox {
-		display: flex;
-	}
-
-	.container {
-		padding: 10px;
-	}
-
-	.bookName {
-		white-space: nowrap;
+	.flexbox{display: flex;}
+	.container{padding: 10px;}
+.bookName {
+		white-space: nowrap; 
 		overflow-x: hidden;
 		text-overflow: ellipsis;
 		font-size: 30rpx;
-		color: #333;
+		color: #333; 
 		padding: 10rpx 0;
 	}
-
 	uni-image {
 		width: auto !important;
 		height: 350rpx;
 	}
-
 	.listenList {
 		padding: 10rpx;
 		box-sizing: border-box;
 		width: calc(100% - 10rpx);
 	}
-
 	.u-row {
 		flex-wrap: wrap;
 	}
-
 	.u-col {
 		overflow: hidden;
 		margin-bottom: 20rpx;
 	}
-
-	.mb30 {
-		margin-bottom: 30rpx;
-		overflow: hidden;
-	}
-</style>
+	.mb30{margin-bottom: 30rpx; overflow: hidden;}
+</style>
--- a/pages/talkBook/talkBookDetail.vue
+++ b/pages/talkBook/talkBookDetail.vue
@@ -11,16 +11,13 @@
 				<view class="audiobox">
 					<view class="audioinfo">
 						<image class="audioimg" :src="bookInfo.images" mode="aspectFit"></image>
-						<image class="audioimgstart" v-if="!this.paused" mode="aspectFit"
-							src="../../static/audiostart.png" @click="start"></image>
-						<image class="audioimgstart" v-else mode="aspectFit" src="../../static/audiostop.png"
-							@click="start"></image>
+						<image class="audioimgstart" v-if="!this.paused" mode="aspectFit" src="../../static/audiostart.png" @click="start"></image>
+						<image class="audioimgstart" v-else mode="aspectFit" src="../../static/audiostop.png" @click="start"></image>
 						<view>
 							<view class="audiotitle">{{talkBookDetail.title}}</view>
 							<view class="audioauthor">{{bookInfo.author.authorName}}</view>
 							<view class="audioauthor">{{currentTime+'/'+duration}}秒</view>
-							<slider class="audioslider" block-size="12" v-model="currentTime" :max="duration"
-								@change="changeTime"></slider>
+							<slider class="audioslider" block-size="12" v-model="currentTime" :max="duration" @change="changeTime"></slider>
 							<!-- <view @click="start">点击播放/暂停</view> -->
 						</view>
 					</view>
@@ -28,21 +25,8 @@
 			</view>
 			<view class="content" v-if="talkBookDetail.content != ''" v-html="talkBookDetail.content"></view>
 			<view class="content" v-else></view>
-			<!-- 	<view class="time">
+			<view class="time">
 				<text>{{talkBookDetail.createTime}}</text>
-			</view> -->
-			<view class="zanche flexbox" style="margin-top:15rpx;">
-				<span class="left">{{talkBookDetail.createTime}}</span>
-				<span class="right flexbox opbtns">
-					<image class="gzicon" v-if="contlikeYN" src="../../static/icon/gz2.png" mode="aspectFill"
-						@click.stop="clickLike(talkBookDetail)"></image>
-					<image class="gzicon" v-else src="../../static/icon/gz.png" mode="aspectFill"
-						@click.stop="clickLike(talkBookDetail)"></image>
-					<view style="color: #C0C4CC;">{{contlike}}</view>
-					<image class="gzicon" v-if="1" src="../../static/icon/pinglun.png" mode="aspectFill"
-						@click="pinglun()"></image>
-					<view style="color: #C0C4CC;" @click="pinglun()">{{pTotal}}</view>
-				</span>
 			</view>
 			<view class="tuijin" v-if="!isBuy && bookInfo.productId != null">
 				<p>觉得这本书还不错？</p>
@@ -68,99 +52,14 @@
 				<view class="">下一章</view>
 			</view> -->
 		</view>
-
-		<view class="pinglunMain">
-			<!-- <u-button class="addPl" type='success' plain @click="pinglun()">添加评论</u-button>
-			<view class="">
-				<view style="font-weight: 700;margin:30rpx 0rpx 30rpx;font-size: 30rpx;color:#55aa00;">精彩热评</view>
-			</view> -->
-			<!-- <h4>~ 精彩热评 ~</h4> -->
-			<view v-if="plList.length > 0">
-				<view class="pl-item" v-for="item in plList" :key="item.id">
-					<view class="plusername">
-						<image :src="item.user.avatar"></image>
-						<span v-if="item.user.nickname!=null">{{item.user.nickname}}</span>
-						<span v-if="item.user.nickname==null">匿名用户</span>
-					</view>
-					<view class="content" v-html="item.content"></view>
-					<view class="btns flexbox" style="margin-top:10rpx;">
-						<span class="left" style="color: #C0C4CC;">{{formatTimeDifferenceFromT(item.createTime)}}</span>
-						<span class="condelt" @click="deleteCont(item)" v-if="item.deletUse">删除</span>
-						<!-- <span class="conhuif" @click="pinglun(item)">回复</span> -->
-					</view>
-					<!-- <view class="pl-son" v-if="item.comments.length > 0">
-						<view class="pl-son-item" v-for="(item1,index) in item.comments" :key="index">
-							<view class="pl-son-item-content">
-								<text class="pl-son-atob">
-									<text v-if="item1.user.nickname!=null">{{item1.user.nickname}}</text>
-									<text v-if="item1.user.nickname==null">匿名用户</text>
-									<text style="margin: 0 10rpx;">回复</text>  
-									<text v-if="item.user.nickname!=null">{{item.user.nickname}}</text>
-									<text v-if="item.user.nickname==null">匿名用户</text>：
-								</text>
-								<text v-html="item1.content"></text>
-							</view>
-							<view class="btns flexbox" style="margin-top:10rpx;">
-								<span class="left"
-									style="color: #C0C4CC;">{{formatTimeDifferenceFromT(item1.createTime)}}</span>
-								<span class="condelt" @click="deleteCont(item)" v-if="item.deletUse">删除</span>
-								<span class="conhuif" @click="pinglun(item)">回复</span>
-							</view>
-							<view style="border-bottom:2rpx solid #e9e9e9;height:20rpx;"
-								v-if="index<item.comments.length-1"></view>
-						</view>
-					</view> -->
-					<!-- </view> -->
-				</view>
-			</view>
-			<view class="quesheng" v-else>
-				<text>暂无评论内容~</text>
-			</view>
-		</view>
-		<view v-if="status==0" style="text-align: center;">
-			<u-loading-icon style="display: inline-block;"></u-loading-icon>
-			<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
-		</view>
-		<u-divider v-if="status == 1" text="已加载全部评论"></u-divider>
-		<!-- 评论书评对话框 -->
-		<!-- 回复评论对话框 -->
-		<u-popup :show="pingjiaShow" :round="10" @close="closePingjia">
-			<view class="tanchu">
-				<view class="dp_title">添加评论</view>
-				<view style="max-height: 1000rpx;overflow-y: scroll;">
-					<view class="padding-bottom-sm flex padding-lr-sm" style="border-bottom: 1px solid #EEEEEE;">
-
-						<view class="flex-sub flexbox">
-							<i @click="showEmj()" :class="emojiIcon"></i>
-							<textarea class="textarea" v-model="Pform.comment" @focus="InputFocus" @blur="InputBlur"
-								@input="textareaBInput" placeholder-style="font-size:24rpx;color:#aaaaaa;"
-								placeholder="请输入您要发送的内容"></textarea>
-						</view>
-						<view class="">
-							<u-button type="success" @click="submitPJ">提交</u-button>
-						</view>
-					</view>
-
-					<view style="position: relative;">
-						<emotion @emotion="handleEmj" :height="220" v-if="isShowEmj" :windowWidth="windowWidth">
-						</emotion>
-					</view>
-				</view>
-			</view>
-		</u-popup>
-
 		<music-play :playData="playData"></music-play>
 		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
+		<public-module></public-module>		
 	</view>
 </template>

 <script>
-	import $http from '@/config/requestConfig.js';
-	import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
-	import emojiList1 from '../../bkhumor-emojiplus/emoji/biaoqin.js'
 	import musicPlay from '@/components/music.vue'
-
 	import {
 		mapState,
 		mapMutations
@@ -172,10 +71,6 @@
 					method: 'pause'
 				},
 				audioShow: false,
-				isShowEmj: false,
-				emojiIcon: 'cuIcon-emoji',
-				emoji: [],
-				windowWidth: 0,
 				voicesImg: '',
 				isBuy: false,
 				playData: {},
@@ -191,22 +86,7 @@
 				audio: null,
 				duration: 10,
 				currentTime: 0,
-				paused: false,
-				emojiIcon: 'cuIcon-emoji',
-				isShowEmj: false,
-				status: 3,
-				pingjiaShow: false, //添加评价
-				Pform: { // 评价表单
-					//star:0,
-					comment: '',
-					//img:[],
-					html: ''
-				},
-				contlike: 0,
-				contlikeYN: false,
-				pPage: 1,
-				pTotal: 0, // 评论的总条数
-				plList: [], // 书评的评论list
+				paused: false
 			}
 		},
 		onLoad(e) {
@@ -221,8 +101,6 @@
 		onShow() {
 			this.getBookInfo()
 			this.getTalkBookDetail()
-			this.getCommPL()
-			this.getGoodNum()
 		},
 		onHide() {
 			// console.log('onHide----',this.paused)
@@ -238,68 +116,37 @@
 		},
 		methods: {
 			...mapMutations(['setUserInfo']),
-			start() {
+			start(){
 				this.initAudio() // 开始播放
 			},
-			formatTimeDifferenceFromT(dateTimeT) {
-				const now = new Date();
-				const t = new Date(dateTimeT);
-				const differenceInSeconds = Math.floor((now - t) / 1000);
-
-				if (differenceInSeconds <= 3600) {
-					const minutes = Math.floor(differenceInSeconds / 60);
-					return `${minutes} 分钟前`;
-				} else if (differenceInSeconds <= 86400) {
-					const hours = Math.floor(differenceInSeconds / 3600);
-					return `${hours} 小时前`;
-				} else if (differenceInSeconds <= 2592000) {
-					const days = Math.floor(differenceInSeconds / 86400);
-					return `${days} 天前`;
-				} else {
-					const currentYear = now.getFullYear();
-					const tYear = t.getFullYear();
-					if (currentYear === tYear) {
-						const month = t.getMonth() + 1;
-						const day = t.getDate();
-						return `${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
-					} else {
-						const year = t.getFullYear();
-						const month = t.getMonth() + 1;
-						const day = t.getDate();
-						return `${year}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day}`;
-					}
-				}
-			},
-			initAudio() {
-				this.audio.onTimeUpdate(() => {
+			initAudio(){
+				this.audio.onTimeUpdate(()=>{
 					this.duration = this.audio.duration.toFixed()
 					this.currentTime = this.audio.currentTime.toFixed()
 				})
-				this.audio.onPause(() => { // 用于被听书组件打断时，设置播放icon状态
+				this.audio.onPause(()=>{ // 用于被听书组件打断时，设置播放icon状态
 					this.paused = false
 					// console.log('onPause----------',this.paused)
 				})
 				this.paused = this.audio.paused
 				// console.log('paused',this.paused)
-				if (this.paused) {
+				if(this.paused){
 					this.audio.play()
-				} else {
+				}else{
 					this.audio.pause()
 				}
 			},
-			updateTime(e) {
+			updateTime(e){
 				this.currentTime = e.detail.currentTime.toFixed()
 				this.duration = e.detail.duration.toFixed()
 			},
-			changeTime(e) {
+			changeTime(e){
 				this.audio.seek(e.detail.value) // 设置播放位置
 			},
-			audioPlay() {
-				console.log('播放讲书', this.$music)
-				this.$music.setCloseBgm() // 关闭听书音频
-				this.setUserInfo({
-					'playFlag': false
-				})
+			audioPlay(){
+				console.log('播放讲书',this.$music)				
+				this.$music.setCloseBgm()	 // 关闭听书音频
+				this.setUserInfo({'playFlag': false})				
 			},
 			// 购买
 			gotoBuy() {
@@ -352,13 +199,12 @@
 							this.talkBookDetail = res.bookTeach

 							this.audio.src = this.talkBookDetail.voices // 设置播放资源路径
-							this.audio.onCanplay((e) => {
+							this.audio.onCanplay((e)=>{
 								this.duration = this.audio.duration.toFixed() // 初始化进度条和音频秒数
 							})

 							// this.isBuy = res.book.isBuy
 							// this.freeChapterCount = res.book.freeChapterCount
-
 						} else {
 							console.log(res.msg)
 						}
@@ -369,291 +215,9 @@
 						this.audioShow = true
 					})
 			},
-
-			// 表情
-			showEmj() {
-				let bool = !this.isShowEmj;
-				if (bool) {
-					this.emojiIcon = 'cuIcon-keyboard';
-				} else {
-					this.emojiIcon = 'cuIcon-emoji';
-				}
-
-				this.isShowEmj = bool;
-				this.$emit('show')
-			},
-			InputBlur(e) {
-
-			},
-			InputFocus(e) {
-				this.isShowEmj = false;
-				this.emojiIcon = 'cuIcon-emoji';
-				this.$emit('foc')
-			},
-
-			// 获取点赞数和是否点赞
-			getGoodNum() {
-
-				this.$http
-					.post("book/teach/getLikeCount?teachId=" + this.teachId)
-					.then(res => {
-						if (res.code == 0) {
-							this.contlike = res.count
-						}
-					}).catch((e) => {
-						console.log(e, 'e')
-					})
-
-				this.$http
-					.post("book/teach/ifLike?teachId=" + this.teachId)
-					.then(res => {
-						if (res.code == 0) {
-							this.contlikeYN = res.flag
-						}
-					})
-					.catch((e) => {
-						console.log(e, 'e')
-					})
-
-
-			},
-
-			// 获得书评回复列表
-			getCommPL() {
-
-				$http.request({
-						url: "book/teach/getCommentList",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-						data: {
-							'teachId': this.teachId,
-							'limit': 5,
-							'page': this.pPage,
-						},
-						header: { //默认 无 说明：请求头
-							'Content-Type': 'application/json'
-						},
-					})
-					.then(res => {
-						console.log(res, '书评评论')
-						// this.plList = this.plList.concat(res.page.list)
-						let plList1 = res.page.records
-						this.pTotal = res.page.total
-						this.status = 3
-						// 评论格式化
-						var newarr = []
-						plList1.forEach((item1) => {
-							item1.content = this.getHtmlComment(item1.content)
-							if (item1.userId == this.userInfo.id) {
-								item1.deletUse = true
-							} else {
-								item1.deletUse = false
-							}
-							newarr.push(item1)
-						})
-						this.plList = this.plList.concat(newarr)
-						console.log('改变格式后', this.plList)
-
-					}).catch(e => {
-						console.log(e, 'e')
-					});
-
-			},
-
-			// 获取html格式的评论1
-			getHtmlComment(comment) {
-				// 格式化html
-				//	 console.log(comment,'comment')
-				// 这里处理 链接   换行符
-				let replacedStr = comment.replace(/\[([^(\]|\[)]*)\]/g, (item, index) => {
-					// console.log(item, index)
-					var indexss = emojiList1.findIndex(item1 => item1.alt === item)
-					// console.log(indexss, 'indexss')
-					return '<img src="https://www.nuttyreading.com/emojis/emojis/qq/' + emojiList1[indexss].url +
-						'" width="18rpx">';
-				});
-				// console.log(replacedStr,'replacedStr')
-				return replacedStr.replace(/(\r\n)|(\n)/g, '<br>');
-			},
-
-			// 点赞
-			clickLike(item) {
-				this.$http
-					.post("book/teach/addOrCancelLike?teachId=" + this.teachId)
-					.then(res => {
-						if (res.code == 0) {
-							uni.showToast({
-								title: res.msg,
-								icon: 'success'
-							})
-							this.getGoodNum()
-						}
-					}).catch((e) => {
-						console.log(e, 'e')
-					})
-			},
-
-			// 显示评论框
-			pinglun(val) {
-				console.log('pinglun-val', val)
-				if (val && val.user && val.user.id && val.puser && val.puser.id) {
-					this.Pform.name = val.user.name || ''
-					this.Pform.pid = val.pid
-					this.Pform.puserId = val.user.id || ''
-				} else if (val && val.user && val.user.id) {
-					this.Pform.name = val.user.name || ''
-					this.Pform.pid = val.id
-					this.Pform.puserId = val.user.id || ''
-				} else {
-					// this.pinglunId = val || null
-					this.Pform.pid = ''
-					this.Pform.puserId = ''
-				}
-				this.pingjiaShow = true
-			},
-			// 提交评论
-			submitPJ() {
-				if (this.Pform.comment != '') {
-					$http.request({
-							url: "book/teach/addComment",
-							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-							data: {
-								teachId: this.teachId,
-								content: this.Pform.comment,
-								puserId: 0,
-							},
-							header: { //默认 无 说明：请求头
-								'Content-Type': 'application/json'
-							},
-						})
-						.then(res => {
-							uni.showToast({
-								title: '评论成功！',
-								icon: 'success'
-							})
-							// this.getCommPL()
-							this.pingjiaShow = false
-							this.Pform.comment = ''
-							this.Pform.name = ''
-							this.Pform.pid = ''
-							this.Pform.puserId = ''
-							// this.pinglunId = null
-
-							this.plList = []
-							this.pPage = 1
-							this.getCommPL()
-
-						}).catch(e => {
-							console.log(e, 'e')
-						});
-
-				} else {
-					uni.showToast({
-						title: '请先输入您的评价内容!',
-						icon: 'none'
-					})
-				}
-			},
-
-
-			// 删除评论
-			deleteCont(item) {
-				uni.showModal({
-					title: '提示',
-					content: '确定要删除评论吗？',
-					confirmText: "确定",
-					cancelText: "取消",
-					success: function(res) {
-						let _this = this
-						if (res.confirm) {
-							_this.$http
-								.post("book/teach/delComment?commentId=" + item.id)
-								.then(res => {
-									if (res.code == 0) {
-										uni.showToast({
-											title: '删除成功',
-											icon: 'success'
-										})
-										_this.plList = []
-										_this.pPage = 1
-										_this.getCommPL()
-									}
-								}).catch((e) => {
-									console.log(e, 'e')
-								})
-						}
-					}.bind(this)
-				});
-			},
-
-			closePingjia() {
-				this.pingjiaShow = false
-				this.Pform.comment = ''
-				this.Pform.html = ''
-				this.emoji = []
-			},
-
-			// 获得输入的表情数组
-			handleEmj(i) {
-				console.log(i, 'i---------');
-				this.inputValue = i
-				// console.log(this.inputValue);
-				if (i.emotioni == '[em_98]') {
-					//匹配最后一个表情符号并删除11。
-					this.Pform.comment = this.Pform.comment.replace(/(\[[^\]]+\]|[\s\S])$/, '');
-					if (this.emoji.length > 0) {
-						this.emoji = this.emoji.slice(0, -1)
-					}
-				} else {
-					this.emoji.push({
-						'tag': i.emotion,
-						'name': i.emotioni
-					})
-					// console.log(this.emoji,'this.emoji')
-					this.Pform.comment += i.emotioni;
-					/// this.Pform.html += i.emotion
-				}
-			},
-
-			textareaBInput(e) {
-				console.log(e, 'e')
-				this.Pform.comment = e.detail.value
-				/// this.Pform.html = e.detail.value
-			},
-			showEmj() {
-				let bool = !this.isShowEmj;
-				if (bool) {
-					this.emojiIcon = 'cuIcon-keyboard';
-				} else {
-					this.emojiIcon = 'cuIcon-emoji';
-				}
-
-				this.isShowEmj = bool;
-				this.$emit('show')
-			},
-
-			InputBlur(e) {
-
-			},
-			InputFocus(e) {
-				this.isShowEmj = false;
-				this.emojiIcon = 'cuIcon-emoji';
-				this.$emit('foc')
-			},
-
-			onReachBottom() {
-				console.log('到底了')
-				if (this.pPage + 1 <= this.pTotal) {
-					this.status = 0
-					this.pPage++
-					this.getCommPL()
-				} else {
-					this.status = 3
-				}
-			},
 		},
 		components: {
-			musicPlay,
-			emotion
+			musicPlay
 		},
 	}
 </script>
@@ -727,9 +291,6 @@

 	.btn {
 		margin-right: 20rpx;
-		font-size: 22rpx;
-		justify-content: space-between;
-		align-items: center;

 		text {
 			display: inline-block;
@@ -741,237 +302,43 @@
 			border-radius: 5px;
 		}
 	}
-
-
-	.zanche {
-		font-size: 22rpx;
-		justify-content: space-between;
-		align-items: center;
-
-		.left {
-			width: 300rpx;
-			color: #999;
-			font-size: 24rpx;
-		}
-
-		.right {
-			width: 300rpx;
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
-		}
-
-		.gzicon {
-			margin: 0 0 0 20rpx;
-			height: 40rpx;
-			width: 40rpx;
-			// float:left;
-			// border-radius: 20rpx;
-			// border:1rpx solid #e9e9e9;
-		}
-
-		.opbtns {
-			.pingjia {
-				margin-left: 10px;
-			}
-		}
-	}
-
 	// 自定义播放器样式
-	.audiobox {
-		border: 2rpx solid #d6d5d5;
+	.audiobox{
+		border:  2rpx solid #d6d5d5;
 		border-radius: 8px;
-
-		.audioinfo {
+		.audioinfo{
 			display: flex;
-
-			.audioimg {
+			.audioimg{
 				padding: 10rpx;
 				width: 180rpx;
 				height: 220rpx;
 				border-radius: 5px;
 			}
-
-			.audioimgstart {
+			.audioimgstart{
 				position: absolute;
 				padding: 20rpx;
 				width: 180rpx;
 				height: 220rpx;
 				border-radius: 5px;
 			}
-
-			.audiotitle {
+			.audiotitle{
 				padding: 10rpx;
 				font-size: 28rpx;
 				text-align: left;
 			}
-
-			.audioauthor {
+			.audioauthor{
 				padding: 4rpx;
 				font-size: 24rpx;
 				text-align: left;
 				color: #999;
 			}
-
-			.audioslider {
+			.audioslider{
 				width: 400rpx;
 			}
 		}
-
-
+		
+		
 	}

 	// .opbtn{font-size: 14rpx;}
-	.pinglunMain {
-		.pl-item {
-			margin: 0 0 14rpx 0;
-			padding: 0 0 14rpx 0;
-			border-bottom: 1px solid #f0f0f0;
-
-			.condelt {
-				color: #fd6004;	
-					margin-right: 20rpx;
-			}
-
-			.conhuif {
-		
-				color: #4185c1;
-			}
-
-			.pl-son {
-				margin: 14rpx 0 14rpx 60rpx;
-				padding: 0 14rpx 14rpx 14rpx;
-				background-color: #f0f0f0;
-				border-radius: 10rpx;
-
-				.pl-son-item {
-					font-size: 26rpx;
-					padding-top: 28rpx;
-
-					.pl-son-item-content {}
-
-					.pl-son-atob {
-						color: #a1a1a1;
-					}
-				}
-			}
-		}
-
-		.plusername {
-			font-size: 26rpx;
-			color: #a1a1a1;
-
-			image {
-				width: 40rpx;
-				height: 40rpx;
-				border-radius: 20rpx;
-				display: inline-block;
-				margin-right: 15rpx;
-				vertical-align: sub;
-			}
-		}
-
-		.content {
-			margin: 30rpx 0rpx;
-			line-height: 40rpx;
-			color: #000;
-			font-size: 30rpx;
-		}
-
-		background-color: #fff;
-		padding: 10px;
-
-		// h4{color: #55aa00; font-size: 40rpx;  margin:30rpx 0 ; text-align: center;}
-		.time {
-			color: #888;
-			font-size: 24rpx;
-		}
-
-		.btns {
-			font-size: 22rpx;
-			// justify-content: space-between;
-			align-items: center;
-
-			.left {
-				// width: 300rpx;
-				margin-right: 20rpx;
-				color: #a1a1a1;
-			}
-
-			.right {
-				width: 300rpx;
-				display: flex;
-				justify-content: flex-end;
-				align-items: center;
-			}
-
-			.gzicon {
-				margin: 0 0 0 20rpx;
-				height: 40rpx;
-				width: 40rpx;
-				// float:left;
-				// border-radius: 20rpx;
-				// border:1rpx solid #e9e9e9;
-			}
-
-			.opbtns {
-				.pingjia {
-					margin-left: 10px;
-				}
-			}
-		}
-
-	}
-
-	.quesheng {
-		text-align: center;
-		color: #8b8a91;
-		padding-bottom: 20rpx;
-		padding-top: 20rpx;
-	}
-
-	.tanchu {
-		padding: 40rpx 30rpx 40rpx 30rpx;
-		position: relative;
-
-
-		.dp_title {
-			font-size: 32rpx;
-			margin-bottom: 50rpx;
-			color: #555;
-			text-align: center;
-			font-weight: bold;
-		}
-
-		.dp_add {
-			position: absolute;
-			top: 40rpx;
-			right: 30rpx;
-			font-size: 22rpx;
-			background-color: #fd6004;
-			color: #fff;
-			border-radius: 10rpx;
-			padding: 5rpx 10rpx;
-
-			.u-icon {
-				display: inline-block;
-				margin-right: 5rpx;
-			}
-		}
-	}
-
-	.cuIcon-emoji {
-		background: url(../../static/biaoqing.png) no-repeat;
-		background-size: contain;
-		display: block;
-		margin-right: 20rpx;
-		width: 30px;
-	}
-
-	.cuIcon-keyboard {
-		background: url(../../static/biaoqing.png) no-repeat;
-		background-size: contain;
-		display: block;
-		width: 30px;
-	}
 </style>
--- a/pages/talkBook/talkBookML.vue
+++ b/pages/talkBook/talkBookML.vue
@@ -86,9 +86,6 @@
 		mapState,
 		mapMutations
 	} from 'vuex';
-	import {
-		checkBookRight
-	} from '@/config/utils';
 	export default {
 		components: {
 			//  cxAdudioPlay,
@@ -160,25 +157,10 @@

 			// 查看本书更多书评
 			toMore(val) {
-				// console.log(val, 'val')
-				let data = {
-					'userId': this.userInfo.id,
-					'bookId': this.bookid
-				}
-				checkBookRight(data,res=>{
-					console.log(res)
-					if(res.success){
-						uni.navigateTo({
-							url: '../comments/comments?bookid=' + this.bookid,
-						});
-					}else{
-						uni.showToast({
-							title:'购买本书后方可查看此内容!',
-							icon:'none'
-						})
-					}
-				})
-				
+				console.log(val, 'val')
+				uni.navigateTo({
+					url: '../comments/comments?bookid=' + this.bookid,
+				});
 			},
 			// 去打卡
 			gotoclock() {
@@ -227,7 +209,7 @@
 				this.$http
 					.post('book/teach/getBookTeachItems', {
 						'bookId': this.bookid,
-						'limit': 20,
+						'limit': 10,
 						'page': this.page
 						// 'userid': this.userInfo.id,
 						// 'bookid': 
@@ -240,9 +222,7 @@
 								this.libLIst = this.libLIst.concat(res.page.records)
 								this.status = 3
 								this.totalPage = res.page.pages								
-								if(this.totalPage = res.page.current){
-									this.status = 1
-								}						
+														
 							} else {
 								this.libLIst = []
 								this.totalPage = 0
--- a/pages/user/addAddress.vue
+++ b/pages/user/addAddress.vue
@@ -19,9 +19,9 @@

 				<u-form-item label="所在地区 :" prop="">
 					<view class="add_arrow" @click="addreShow=true">{{addressForm.areaidpathtext}}</view>
-					<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName"
-						@confirm="addconfirm" @change="changeHandler" ></u-picker>
-				</u-form-item>				
+					<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName" -->
+					 @confirm="addconfirm" @change="changeHandler" ></u-picker>				
+				</u-form-item>
 				<u-form-item label="详细地址 :" prop="useraddress">
 					<u-input type="string" v-model="addressForm.useraddress" placeholder="小区楼栋/乡村名称" clearable
 						border="surround" />
@@ -50,7 +50,6 @@
 </template>

 <script>
-	
 	import musicPlay from '@/components/music.vue'
 	import $http from '@/config/requestConfig.js';
 	import addressList1 from "@/static/json/address.json"
@@ -64,14 +63,14 @@
 				// indexp:0,
 				// indexq:0,
 				// indexc:0,
-				playData:{},
+				playData: {},
 				addreShow: false, //是否显示
 				columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据
 				columnData: [], //市数据
 				columnDatas: [], //区地址
 				switchTrue: true,
 				switchFalse: false,
-				addressChanged:false, // 地址修改标记
+				addressChanged: false, // 地址修改标记
 				navName: '', // 顶部导航栏标题
 				provId: '', // 存储省id
 				cityId: '', // 存储市id
@@ -91,6 +90,51 @@
 				isShowDel: false,
 				editIndex: 0,
 				deleteShow: false,
+				list: [{
+						value: 1,
+						label: '中国',
+						children: [{
+								value: 2,
+								label: '广东',
+								children: [{
+										value: 3,
+										label: '深圳'
+									},
+									{
+										value: 4,
+										label: '广州'
+									}
+								]
+							},
+							{
+								value: 5,
+								label: '广西',
+								children: [{
+										value: 6,
+										label: '南宁'
+									},
+									{
+										value: 7,
+										label: '桂林'
+									}
+								]
+							}
+						]
+					},
+					{
+						value: 8,
+						label: '美国',
+						children: [{
+							value: 9,
+							label: '纽约',
+							children: [{
+								value: 10,
+								label: '皇后街区'
+							}]
+						}]
+					}
+
+				],
 				rules: {
 					username: [{
 						required: true,
@@ -137,10 +181,10 @@
 				this.getAddress()
 			}
 			this.initDataPicker() //初始化省份列表
-			
+
 		},
 		onShow() {
-		
+
 		},
 		computed: {
 			...mapState(['userInfo']),
@@ -148,115 +192,113 @@
 		onReady() {
 			this.$refs.addForm.setRules(this.rules)
 		},
-		components:{
-			musicPlay	
+		components: {
+			musicPlay
 		},
-		methods: {						
+		methods: {
 			// 三级联动
 			initDataPicker() {
 				// console.log(this.addressList,'addressList')				
 				// this.$http
-					// .post('api/province/getProvince')
-					// .then(res => {
-					// 	if (res.code == 0) {
-							// this.addressList = res.provinceEntity
-							//此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组
-							let province = []; //初始数据需要展示的省份
-							let province1 = [{
-								"cityId": this.addressList[0].cityList[0].cityId,
-								"provId": this.addressList[0].cityList[0].provId,
-								"cityName": this.addressList[0].cityList[0].cityName,
-								"UName": this.addressList[0].cityList[0].cityName,
-								"createDate": this.addressList[0].cityList[0].createDate,
-								"regionCode": this.addressList[0].cityList[0].regionCode,
-								"countyList": this.addressList[0].cityList[0].countyList
-							}]; //因为第一个市北京市，所以就直接添加北京市下辖的直辖市了 也即初始数据需要展示的市，北京市只有一个市辖区
-							let province2 = []; //初始数据需要展示的区域数据，也即是 北京市市辖区内的区
+				// .post('api/province/getProvince')
+				// .then(res => {
+				// 	if (res.code == 0) {
+				// this.addressList = res.provinceEntity
+				//此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组
+				let province = []; //初始数据需要展示的省份
+				let province1 = [{
+					"cityId": this.addressList[0].cityList[0].cityId,
+					"provId": this.addressList[0].cityList[0].provId,
+					"cityName": this.addressList[0].cityList[0].cityName,
+					"UName": this.addressList[0].cityList[0].cityName,
+					"createDate": this.addressList[0].cityList[0].createDate,
+					"regionCode": this.addressList[0].cityList[0].regionCode,
+					"countyList": this.addressList[0].cityList[0].countyList
+				}]; //因为第一个市北京市，所以就直接添加北京市下辖的直辖市了 也即初始数据需要展示的市，北京市只有一个市辖区
+				let province2 = []; //初始数据需要展示的区域数据，也即是 北京市市辖区内的区


-							for (let i = 0; i < this.addressList.length; i++) {
-								this.addressList[i].UName = this.addressList[i].provName
-								if (this.addressList[i].cityList == null) {   
-									// 如果没有cityList数据，就添加一项，用省份的信息
-									// console.log('存在单一',this.addressList[i].provId)
-									this.addressList[i].cityList = [{
-										"cityId": this.addressList[i].provId,
-										"provId": this.addressList[i].provId,
-										"cityName": this.addressList[i].provName,
-										"UName": this.addressList[i].provName,
-										"createDate": this.addressList[i].createDate,
-										"regionCode": this.addressList[i].regionCode,
-										"countyList": [{
-											"countyId": this.addressList[i].provId,
-											"cityId": this.addressList[i].provId,
-											"countyName": this.addressList[i].provName,
-											"UName": this.addressList[i].provName,
-											"createDate": this.addressList[i].createDate,
-											"regionCode": this.addressList[i].regionCode
-										}]
-									}]
-								} else {
-									for (let j = 0; j < this.addressList[i].cityList.length; j++) {
-										this.addressList[i].cityList[j].UName = this.addressList[i].cityList[j]
-											.cityName
-										for (let k = 0; k < this.addressList[i].cityList[j].countyList.length; k++) {
-											this.addressList[i].cityList[j].countyList[k].UName = this.addressList[i]
-												.cityList[j].countyList[k].countyName
-										}
-									}
-								}
-								province.push(this.addressList[i]);
+				for (let i = 0; i < this.addressList.length; i++) {
+					this.addressList[i].UName = this.addressList[i].provName
+					if (this.addressList[i].cityList == null) {
+						this.addressList[i].cityList = [{
+							"cityId": this.addressList[i].provId,
+							"provId": this.addressList[i].provId,
+							"cityName": this.addressList[i].provName,
+							"UName": this.addressList[i].provName,
+							"createDate": this.addressList[i].createDate,
+							"regionCode": this.addressList[i].regionCode,
+							"countyList": [{
+								"countyId": this.addressList[i].provId,
+								"cityId": this.addressList[i].provId,
+								"countyName": this.addressList[i].provName,
+								"UName": this.addressList[i].provName,
+								"createDate": this.addressList[i].createDate,
+								"regionCode": this.addressList[i].regionCode
+							}]
+						}]
+					} else {
+						for (let j = 0; j < this.addressList[i].cityList.length; j++) {
+							this.addressList[i].cityList[j].UName = this.addressList[i].cityList[j]
+								.cityName
+							for (let k = 0; k < this.addressList[i].cityList[j].countyList.length; k++) {
+								this.addressList[i].cityList[j].countyList[k].UName = this.addressList[i]
+									.cityList[j].countyList[k].countyName
 							}
+						}
+					}
+					province.push(this.addressList[i]);
+				}


-							this.addressList[0].cityList[0].countyList.map(item => {
-								province2.push(item);
-							});
+				this.addressList[0].cityList[0].countyList.map(item => {
+					province2.push(item);
+				});

-							//省数据 因为要做数据初始化，所以是三维数组 
-							// 数据格式 [ [所有的省份数据:{},{}] , [第一个省份下的所有的市:{},{},{}] , [第一个市下面所有的区:{},{},{}] ]
-							this.columns.push(province);
-							this.columns.push(province1);
-							this.columns.push(province2);
+				//省数据 因为要做数据初始化，所以是三维数组 
+				// 数据格式 [ [所有的省份数据:{},{}] , [第一个省份下的所有的市:{},{},{}] , [第一个市下面所有的区:{},{},{}] ]
+				this.columns.push(province);
+				this.columns.push(province1);
+				this.columns.push(province2);

-							// console.log(6666666,this.columns)
+				// console.log(6666666,this.columns)

-							// 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组
-							// 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据
+				// 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组
+				// 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据

-							this.addressList.map(item => {
-								let city = [];
-								item.cityList.map(item1 => {
-									city.push(item1);
-								});
-								this.columnData.push(city);
-							});
+				this.addressList.map(item => {
+					let city = [];
+					item.cityList.map(item1 => {
+						city.push(item1);
+					});
+					this.columnData.push(city);
+				});

-							//区数据数组
-							//数据格式: [ 所有省下面所有市的所有区 [ 第一个省下面所有市的区:[ [第一个省下面第一个市的所有区] , [第一个省下面第二个市的所有区] ,]   ,   [ 第二个省下面所有市的区:[ [第二个省下面第一个市的所有区] , [第二个省下面第二个市的所有区] ,]   ]
+				//区数据数组
+				//数据格式: [ 所有省下面所有市的所有区 [ 第一个省下面所有市的区:[ [第一个省下面第一个市的所有区] , [第一个省下面第二个市的所有区] ,]   ,   [ 第二个省下面所有市的区:[ [第二个省下面第一个市的所有区] , [第二个省下面第二个市的所有区] ,]   ]

-							let area = [];
-							this.addressList.map((item, index) => {
-								let area1 = []; //省下面所有市的初始化
-								item.cityList.map(item1 => {
-									area = []; //市下面的区初始化
-									item1.countyList.map(item2 => {
-										area.push(item2);
-									});
-									area1.push(area); // 每循环一个市，添加该市下面的所有区
-								});
-								this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市
-							});
+				let area = [];
+				this.addressList.map((item, index) => {
+					let area1 = []; //省下面所有市的初始化
+					item.cityList.map(item1 => {
+						area = []; //市下面的区初始化
+						item1.countyList.map(item2 => {
+							area.push(item2);
+						});
+						area1.push(area); // 每循环一个市，添加该市下面的所有区
+					});
+					this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市
+				});

-						// };
-					// }).catch(e => {
-					// 	console.log(e,'e')
-					// })
+				// };
+				// }).catch(e => {
+				// 	console.log(e,'e')
+				// })

 			},
 			changeHandler(e) { //城市选择时触发
-			// console.log(e,'变化了',this.columnData, this.columnDatas)
-			this.addressChanged = true
+				console.log(e, '变化了', this.columnData, this.columnDatas)
+				this.addressChanged = true
 				const {
 					columnIndex, //当前选择的列，省 / 市 / 区
 					value, // 当前选择的数组内容
@@ -268,7 +310,7 @@
 				// 当第一列值发生变化时，变化第二列和第三列的值（省份变更，市和区跟着变更）
 				if (columnIndex === 0) { // 判断当前变更的是省还是市还是区
 					// picker为选择器this实例，变化第二列对应的选项				
-					
+
 					picker.setColumnValues(1, this.columnData[
 						index]); //设置市为该省下面的所有市，index是当前省在省份数组的下标，对应市数组中的下表就是 该省下面的所有市 的数据
 					picker.setColumnValues(2, this.columnDatas[index][0]); // 设置区域为该省下面第一个市下面的所有区域
@@ -280,7 +322,7 @@
 			},

 			addconfirm(e) { //点击确定按钮
-			// console.log(e,'选中的值')
+				console.log(e, '选中的值')
 				this.addressChanged = true
 				this.addreShow = false;
 				this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName
@@ -288,7 +330,7 @@
 				this.cityId = e.value[1].cityId
 				this.countyId = e.value[2].regionCode
 			},
-			
+
 			addcancel() { //点击取消按钮
 				this.addreShow = false;
 			},
@@ -316,7 +358,7 @@
 						// this.addressForm.consigneePhone = this.addressForm.userphone
 						// this.addressForm.consigneeName = this.addressForm.username
 						// this.addressForm.regionCode = ''
-						
+
 						// // this.addressForm.userid = this.userInfo.id
 						// if(this.addressChanged){ // 如果修改过地址区域，就重新赋值，否则保持不变
 						// 	this.addressForm.areaidpath = `${this.provId}_${this.cityId}_${this.countyId}`
@@ -327,15 +369,15 @@

 						// let data = this.addressForm
 						let data = {
-							'id':this.addressForm.addressid,
-							'detailAddress' : this.addressForm.useraddress,
-							'regionCode':this.countyId,
-							'userId':this.userInfo.id,
-							'consigneePhone':this.addressForm.userphone,
+							'id': this.addressForm.addressid,
+							'detailAddress': this.addressForm.useraddress,
+							'regionCode': this.countyId,
+							'userId': this.userInfo.id,
+							'consigneePhone': this.addressForm.userphone,
 							'consigneeName': this.addressForm.username,
-							'isDefault':this.addressForm.isDafault ? 1 : 0
+							'isDefault': this.addressForm.isDafault ? 1 : 0
 						}
-						console.log(data,'保存参数')
+						console.log(data, '保存参数')
 						$http.request({
 							url: link_add,
 							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
@@ -377,16 +419,17 @@
 					.then(res => {
 						if (res.code == 0) {
 							this.addressForm = {
-								'useraddress':res.list[this.editIndex].detailAddress,
-								'userphone':res.list[this.editIndex].consigneePhone,
-								'username':res.list[this.editIndex].consigneeName,
-								'isdefault':res.list[this.editIndex].isDefault,
-								'isDafault':res.list[this.editIndex].isDefault == 1 ? true : false,
-								'areaidpathtext':res.list[this.editIndex].province +'-'+ res.list[this.editIndex].city +'-'+ res.list[this.editIndex].county
-								,'addressid':res.list[this.editIndex].id
+								'useraddress': res.list[this.editIndex].detailAddress,
+								'userphone': res.list[this.editIndex].consigneePhone,
+								'username': res.list[this.editIndex].consigneeName,
+								'isdefault': res.list[this.editIndex].isDefault,
+								'isDafault': res.list[this.editIndex].isDefault == 1 ? true : false,
+								'areaidpathtext': res.list[this.editIndex].province + '-' + res.list[this
+									.editIndex].city + '-' + res.list[this.editIndex].county,
+								'addressid': res.list[this.editIndex].id
 							}
 							this.countyId = res.list[this.editIndex].regionCode
-						//	this.addressForm = res.list[this.editIndex]
+							//	this.addressForm = res.list[this.editIndex]
 							if (this.addressForm.isdefault == 1) {
 								this.addressForm.isDafault = true
 							}
@@ -401,15 +444,15 @@
 				this.deleteShow = false
 				this.$http
 					.get(`book/userAddress/delete?id=${this.addressForm.addressid}`)
-				.then(res => {
-					if (res.code == 0) {
-						uni.showToast({
-							title: '地址删除成功',
-							duration: 1000,
-						});
-						uni.navigateBack()
-					}
-				})
+					.then(res => {
+						if (res.code == 0) {
+							uni.showToast({
+								title: '地址删除成功',
+								duration: 1000,
+							});
+							uni.navigateBack()
+						}
+					})
 			},

 		},
@@ -418,10 +461,19 @@
 </script>

 <style lang="scss" scoped>
-	.flexbox{display: flex;}
-	.selectAdd{ justify-content: space-between;
-		.addItem{ display: block;width: 30%}
+	.flexbox {
+		display: flex;
 	}
+
+	.selectAdd {
+		justify-content: space-between;
+
+		.addItem {
+			display: block;
+			width: 30%
+		}
+	}
+
 	.add_arrow {
 		height: 28px;
 		line-height: 28px;
@@ -497,4 +549,4 @@
 			background-image: linear-gradient(90deg, #bf0c0c 0%, #95110c 100%)
 		}
 	}
-</style>
+</style>
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -15,31 +15,26 @@
 				<!-- <view class="title" :class="{ active: type == 2000 }" @click="type = 2000">验证码登录/注册</view>
 				<view class="title" :class="{ active: type == 1000 }" @click="type = 1000">密码登录</view> -->
 			</view>
-			<view class="flexbox" style=" margin-top: 20rpx;">
-				<view class="input_tit" style="margin-top: 0; margin-right: 20rpx;">手机号</view>
-				<view class="quhao">
-					<uni-data-select class="myselect" placeholder="选择区号" v-model="quCode" :localdata="quCodeList" style="height: 30rpx !important;"
-						@change="quChange"></uni-data-select>
-				</view>
-			</view>
+			<view class="input_tit">手机号</view>
 			<!-- 带区号 -->
-			<view class="flexbox " style="margin:36rpx 0; justify-content: space-between;">
-				<view class="triangle borderBottom phoneNumberInput" style="width: 150rpx;">
-					<input type="number" v-model="quCode" placeholder="区号" placeholder-class="grey" />
-					
+			<!-- <view class="flexbox " style="margin:36rpx 0; justify-content: space-between;">
+				<view class="quhao">					
+					<uni-data-select 
+					      placeholder="区号" model="quCode"
+					      :localdata="quCodeList"
+					      @change="quChange"
+					    ></uni-data-select>
 				</view>
-				<view class="triangle borderBottom phoneNumberInput"
-					:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
-					<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号"
-						placeholder-class="grey" />
+				<view class="triangle borderBottom phoneNumberInput" :clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
+					<input type="number" v-model="phone" @input="onInput"  placeholder="请输入您的手机号" placeholder-class="grey" />
 				</view>
-			</view>
+			</view> -->

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

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

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

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

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

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