穴位

经穴检索
打卡添加分享
2023-11-08 13:36:51 +08:00 · 2023-11-07 17:13:44 +08:00 · 2023-11-02 13:12:04 +08:00 · 2023-11-01 17:41:16 +08:00 · 2023-11-01 17:08:54 +08:00 · 2023-10-31 16:50:02 +08:00
54 changed files with 26488 additions and 555 deletions
--- a/App.vue
+++ b/App.vue
@@ -19,6 +19,11 @@
 	import Vue from 'vue'
 	
 	export default {
+		data(){
+			return{
+				platform:null,  // 系统
+			}
+		},
 		onLaunch: function(e) {
 			// 检测自动更新
 			// #ifdef APP-PLUS
@@ -143,7 +148,6 @@
 		},
 		onShow: function(e) {			
 					
-			//	console.log(store.state,'playVisible')
 			// #ifdef MP-WEIXIN
 			//获取二维码携带的参数
 			let scene = decodeURIComponent(e.query.scene);
@@ -197,7 +201,6 @@
 			console.log('页面销毁')
 		},
 		methods: {			
-
 		}
 	};
 </script>
--- a/components/cx-audio-play/cx-audio-play.vue
+++ b/components/cx-audio-play/cx-audio-play.vue
@@ -263,7 +263,7 @@
 	.fengmianBox:after{
 		content: ''; display: inline-block; left:0; top:0; z-index: 0;width: 400rpx; height: 400rpx; position: absolute; border-radius: 400rpx; box-shadow: rgba(177, 235, 202, 0.8) 0px 0px 29px 0px;
 	}
-	.fengmianBox.defaultBg{background-image: url('@/static/icon/home_icon_0.png');}
+	.fengmianBox.defaultBg{background-image: url('@/static/icon/home_icon_0.png'); background-size: cover;}
 	
 	page {
 		background-color: #F6F6F8;
--- a/components/music.vue
+++ b/components/music.vue
@@ -217,7 +217,7 @@

 <style lang="scss" scoped>
 	
-	.fengImg{ border-radius: 100%; }
+	.fengImg{ border-radius: 100%; background-size: cover; }
 	@-webkit-keyframes rotation {	
 	   from {
 	       -webkit-transform: rotate(0deg);         
@@ -258,7 +258,7 @@
 		.times{ }
 	 }
 	
-	.fengmianBox .defaultBg{  margin: 0 auto;border-radius: 200rpx; margin: 0 auto; 
+	.fengmianBox .defaultBg{ width: 100%; margin: 0 auto;border-radius: 200rpx; margin: 0 auto; 
 	margin-bottom: 20rpx; background-size: cover; 
 	background-repeat: no-repeat; 
 	background-image: url('@/static/icon/home_icon_0.png'); 
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -7,9 +7,10 @@ if (process.env.NODE_ENV === 'development') {
 	// 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://api.nuttyreading.com/";   // 线上正式
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
-	  baseUrl = "http://192.168.110.38:9200/pb/";        // 吴春磊笔记本1
+	// baseUrl = "http://192.168.110.110:9200/pb/";
+	  // baseUrl = "http://192.168.110.38:9200/pb/";        // 吴春磊笔记本1
 	// socketUrl = "ws://8.129.186.35:6001/";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境11
@@ -44,7 +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 mailRegular = /^\w+@\w+(\.[a-zA-Z]{2,3}){1,2}$/;
 //密码验证正则表达式
--- a/main.js
+++ b/main.js
@@ -10,7 +10,9 @@ Vue.prototype.$bgm = bgm
 // Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/"
 // Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/"
 Vue.prototype.$baseUrl = "https://api.nuttyreading.com/" 
-
+ // 安卓安卓包下载地址
+// Vue.prototype.$apkUrl = "https://www.nuttyreading.com/nuttyreading.apk"
+Vue.prototype.$apkUrl = "https://www.nuttyreading.com/nuttyreading.apk"


 // uView组件库
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
            "src" : "图片路径"
        }
    ],
-    "versionName" : "1.2.6",
-    "versionCode" : 126,
+    "versionName" : "1.2.10",
+    "versionCode" : 1210,
    "app-plus" : {
        "compatible" : {
            "ignoreVersion" : true
@@ -95,7 +95,7 @@
                    },
                    "appleiap" : {},
                    "weixin" : {
-                        "__platform__" : [ "android" ],
+                        "__platform__" : [ "ios", "android" ],
                        "appid" : "wx47134a8f15083734",
                        "UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__9788EB5/"
                    }
--- a/pages.json
+++ b/pages.json
@@ -476,6 +476,39 @@
 						}
 					}
 				}
+        ,{
+            "path" : "pages/bookShop/deliverLIst",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "快递列表",
+                "enablePullDownRefresh": false
+            }
+            
+        },
+        {
+        	"path" : "pages/peanut/chargeDetaill",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "充值详情1",
+        		"enablePullDownRefresh" : false
+        	}
+        },
+        {
+        	"path" : "pages/acupoint/acupoint",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "穴位检索",
+        		"enablePullDownRefresh" : false
+        	}
+        },
+        {
+        	"path" : "pages/acupoint/acupointDetail",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "脉穴详情",
+        		"enablePullDownRefresh" : false
+        	}
+        }
    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
--- a/pages/acupoint/acupoint.vue
+++ b/pages/acupoint/acupoint.vue
@@ -0,0 +1,327 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module> -->
+		<z-nav-bar title="穴位检索"></z-nav-bar>
+		<!-- <uni-search-bar @confirm="search" :focus="true" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
+			@cancel="cancel" @clear="clear">
+		</uni-search-bar> -->
+		<view class="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">
+			<!-- <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>	
+			<!-- </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 :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="search_box flexbox" @click="">
+			<view class="search">
+				<text class="icon_search"></text>
+				<text class="prompt">请输入穴位名</text>
+			</view>
+		</view> -->
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	export default {
+		data() {
+			return {
+				playData: {},
+				searchValue: '',
+				oneCateList: [], // 一级分类标题1
+				twoCateList: [], // 二级分类标题
+				titleList:[], // 穴位标题
+				curOneCateIndex:0, // 当前选中的一级分类
+				curTwoCateIndex:0 , // 当前选中的二级分类
+				searchList:[], // 搜索结果数组
+				showSearchList: false, 
+			}
+		},
+		onLoad() {
+			this.getCateList()
+		},	
+			onHide() {
+				this.showSearchList = false
+				this.searchList = []
+			},
+		methods: {
+			// 穴位详情
+			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>
+	.searchList{
+		.item{font-size: 28rpx; padding: 20rpx; border-bottom: 1px solid #dadbde; }
+	}
+	.scroll-view_H{background-color: #fff;white-space: nowrap;
+		 padding:10rpx ; }
+	.contentBox {
+		.oneCateList{ justify-content: space-between;
+			text{ text-align: center;
+				display: inline-block; width: 32%;  padding: 20rpx 0; font-size: 34rpx;  border-radius: 10rpx; 
+			}
+			.cur{background-color:#55aa7f; color: #fff; }
+		}
+		.twoCateList{
+			font-size: 28rpx; margin-top: 20rpx;
+			.grid-text{padding:30rpx 20rpx; text-align: center; }
+			.cur{
+				color: #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; height: 100vh;
+		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/acupoint/acupointDetail.vue
+++ b/pages/acupoint/acupointDetail.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar :title="'穴位详情-' + acupointDetail.title"></z-nav-bar>
+		<view class="uni-margin-wrap" v-if="acupointDetail && acupointDetail.imageList.length > 0">
+			<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
+				:duration="duration">
+				<swiper-item v-for="(item, index) in acupointDetail.imageList" :key="index">
+					<view class="swiper-item">
+						<image :src="item" mode="aspectFit"></image>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="contentBox">			
+			<view class="content">
+				<uni-section class="mb-10" titleFontSize="18px" title="穴位名称" type="line">
+					<view class="item">
+						{{acupointDetail.title}}
+					</view>
+				</uni-section>
+				<uni-section class="mb-10" titleFontSize="18px" title="别名" type="line">
+					<view class="item" v-if="acupointDetail.alias && acupointDetail.alias != ''">
+						{{acupointDetail.alias}}
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="所属经络" type="line">
+					<view class="item">
+						{{acupointDetail.meridian}}
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="定位" type="line">
+					<view class="item">
+						{{acupointDetail.position}}
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="解剖" type="line">
+					<view class="item" v-if="acupointDetail.anatomy && acupointDetail.anatomy != ''">
+						{{acupointDetail.anatomy}}
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="主治" type="line">
+					<view class="item">
+						{{acupointDetail.indication}}
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="配伍" type="line">
+					<view class="item" v-if="acupointDetail.compatibility && acupointDetail.compatibility != ''">
+						{{acupointDetail.compatibility}}
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="文献" type="line">
+					<view class="item" v-if="acupointDetail.literature && acupointDetail.literature != ''">
+						{{acupointDetail.literature}}
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section>
+				
+			</view>
+		</view>
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	export default {
+		data() {
+			return {
+				playData: {},
+				acupointDetail: {
+					imageList:[]
+				},
+				acupointId: null,
+				indicatorDots: true,
+				autoplay: true,
+				interval: 5000,
+				duration: 500
+			}
+		},
+		onLoad(e) {
+			this.acupointId = e.id
+		},
+		onShow() {
+			this.getDetail()
+		},
+		methods: {
+			// 穴位详情
+			getDetail() {
+				$http.request({
+					url: "book/point/getPointDetail",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						// loadAnimate: 'none', // 请求加载动画
+						'pointId': this.acupointId
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '内容获取成功')
+					if (res.code == 0) {
+						this.acupointDetail = res.point
+					}
+				}).catch(e => {
+					// this.titleList = []		
+					console.log(e)
+				})
+			}
+		},
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.contentBox{padding-bottom: 20rpx;}
+	.mb-10{ margin-bottom: 10px;}
+	.content{font-size: 28rpx;}
+	.swiper-item{
+		image{margin: 0 auto; height:200rpx;}
+		
+	}
+	.uni-margin-wrap{ margin-bottom: 20rpx; padding-top: 20rpx;
+		background-color: #fff;
+	}
+	.container {
+		padding: 10rpx;
+		// background-color: #fff;
+		.item{color: #666; padding:10rpx 20rpx; padding-bottom: 20rpx; line-height: 46rpx;}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+	
+	/deep/ .uni-section-header__decoration.line{background-color: #18bc37;}
+</style>
--- a/pages/bookShop/deliverDetail.vue
+++ b/pages/bookShop/deliverDetail.vue
@@ -2,33 +2,36 @@
 	<view class="">
 		<view class="header">
 			<!-- 顶部导航栏 -->
-			<z-nav-bar title="物流详情" bgColor="red"></z-nav-bar>			
+			<z-nav-bar  title="物流详情"></z-nav-bar>		
 		</view>
-		<view v-if="deliverList.length > 0">
-			<u-tabs active-color="#2979ff" inactive-color="#606266" bar-height="6" bar-width="40" 
-				name="name" :list="deliverList" :is-scroll="false" :current="current" @change="tabchange"></u-tabs>
+		<view class="" style="margin-bottom: 20rpx; font-size: 28rpx;">
+			<view class="kuaidiItem">运单号： {{expressOrderSn}}
+			<u-tag @click="copyData(expressOrderSn)" class="copyCode" text="复制" plain type="success" /></view>
+		</view>
+		<view v-if="deliverDetails.length > 0">
+			<!-- <u-tabs active-color="#2979ff" inactive-color="#606266" bar-height="6" bar-width="40" 
+				name="name" :list="deliverList" :is-scroll="false" :current="current" @change="tabchange"></u-tabs> -->
 			<view class="deliverCntent">
-				<view class="" v-for="(list, index1) in deliverDetails" :key="index1">
-					<view v-show="index1 == current">
-					<view class="kuaidiItem">{{list.ShipperName}} {{list.LogisticCode}} <u-tag @click="copyData(list.LogisticCode)" class="copyCode" text="复制" plain type="success" /></view>
-					<view class="item" v-for="(item, index) in list.Traces">
+				<view class="">				
+					
+					<view  v-for="(item, index) in deliverDetails" :class="['item',index == 0 ? 'first':'' ]">
 						<view class="flexbox">
 							<view class="img_icon "></view>
 							<view class="wuliu">
-								<view class="time">{{item.AcceptTime}}</view>
-								<view class="content">{{item.AcceptStation}}</view>
-							</view>
+								<view class="time">{{item.acceptTime}}</view>
+								<view class="content">{{item.acceptStation}}</view>
 							</view>
 						</view>
 					</view>
+					
 				</view>
 			</view>			
 		</view>
 		<view class="quesheng" v-else>			
-			<image src="../../static/icon/kongbai.png" ></image>
-			<text>- 暂无物流信息 -</text>
+			<u-divider text="- 暂无物流信息 -"></u-divider>
 		</view>
 		<music-play :playData="playData"></music-play>
+		<public-module></public-module>
 		<!-- <u-loading color="red" :show="loading"></u-loading> -->
 	</view>
 </template>
@@ -47,19 +50,30 @@
 				playData:{},
 				loading: false,
 				orderId: null,
-				deliverDetails: [{
-					Traces: []
-				}],
+				deliverDetails: [],
+				express:{},   // 面单
+				consignee:{}, // 收件人信息
+				expressOrderSn:'', // 运单号
+				// expressCompanyCode:'', //快递编码
+				// expressCompanyName:'' ,// 快递公司
+				orderSn : '',
 				current: 0,
 				deliverList: [],
-				deliverDetailsLength: null
+				deliverDetailsLength: null,
+				orderContet:{},				
 			}
 		},
 		onLoad(e) {
-			this.orderId = e.objId
+			this.expressOrderSn = e.expressOrderSn
+			// this.expressCompanyCode = e.expressCompanyCode
+			// this.expressCompanyName = e.expressCompanyName
+			//this.express = e.express
+			//this.consignee = e.consignee
+			console.log(e,'传入的参数')
+			this.orderSn = e.orderSn
 		},
 		onShow() {
-			this.getdeliverDetails()
+			this.getOrderList()			
 		},
 		computed: {
 			...mapState(['userInfo']),
@@ -68,6 +82,45 @@
 			musicPlay
 		},
 		methods: {			
+			
+			// 获取订单列表
+			getOrderList() {
+				console.log('this.orderType',this.orderType)
+				this.$http
+					// .get(`book/buyOrder/getOrderInfo?orderId=${this.orderID}`)
+					.get(`/book/buyOrder/orderDetail?orderSn=${this.orderSn}`)
+					.then(res => {
+						console.log('订单详情',res)
+						var seconds = res.result.timestamp + 30 * 60 + 2    // 过期时间
+						var nowSeconds = Math.floor(new Date().getTime() / 1000);
+						res.result.overTime = seconds - nowSeconds
+						
+						this.orderContet = res.result						
+						//this.userRecordid = res.userRecordid
+						this.productIDs = res.result.goodsList.map(item => {
+							return item.buyOrderProductId
+						})
+						// console.log(this.orderContet,'this.orderContet')
+						if (this.orderContet.orderStatus == 0) {
+							this.titleStat = '待支付'
+						} else if (this.orderContet.orderStatus == 1) {
+							this.titleStat = '待发货'
+						} else if (this.orderContet.orderStatus == 2) {
+							this.titleStat = '待收货'
+						} else if (this.orderContet.orderStatus == 3) {
+							this.titleStat = '已完成'
+						}
+						
+						
+						if(parseInt(this.orderContet.orderStatus) >= 2){
+							this.getdeliverDetails()
+							// 查询快递信息
+							// this.getSheetInfo()
+						}
+						console.log(this.orderContet,'订单详情')
+					})
+			},
+			
 			// 复制到剪切板
 			copyData(data){
 				uni.setClipboardData({
@@ -84,21 +137,31 @@
 			// 获取物流
 			getdeliverDetails() {
 				this.deliverList = []
+				// var strLength = this.orderContet.consignee.consigneeMobile.length
+				// var subMobile = this.orderContet.consignee.consigneeMobile.substring(strLength-4,strLength)
+				// this.expressOrderSn = 'SF1504651506851'
+				// this.expressCompanyCode = 'SF'
+				// subMobile = '9277'
 				uni.showLoading()
 				this.$http
-					.post(`/book/buyOrder/queryFMS?orderId=${this.orderId}`)
+					//.post(`/book/buyOrder/queryFMS?orderId=${this.orderId}`)
+					.get(`/book/buyOrder/searchExpress?expressOrderSn=${this.expressOrderSn}`)
 					.then(res => {
 						 console.log(res, '物流信息')
 						if (res && res.code === 0) {
 							uni.hideLoading()
-							this.deliverDetails = res.rntStr
-							// console.log(res.rntStr,'物流信息')
-							res.rntStr.forEach((item, index) => {
-								item.Traces = item.Traces.reverse()
-									//console.log(item)
-								this.deliverList.push({'name':item.ShipperName})
-							})							
+							// this.deliverDetails = res.result.traces
+							   console.log(res.express.traces,'物流信息')	
+							if(res.express.traces.length > 0){
+								this.deliverDetails = res.express.traces.reverse()	
+							}else{
+								this.deliverDetails = []
 							}
+																					
+						}
+					}).catch(e => {
+						uni.hideLoading()
+						console.log(e,'e')
 					})
 			},

@@ -155,7 +218,6 @@
 			padding-left: 10px;
 			position: relative;
 		}			
-
 		.item:before {
 			display: inline-block;
 			width: 10px;
@@ -173,18 +235,19 @@
 			font-size: 28rpx;
 			margin-bottom: 5px
 		}
-
+		.first{			
+			color: #55aa7f;
+		}
 		.content {
 			padding-bottom: 14px;
 		}
 	}
-
 	.flexbox {
 		display: flex;
 	}

 	.img_icon {
-		padding-right: 5px;
+		padding-right: 30rpx;
 	}

 	.moreBtnF {
--- a/pages/bookShop/deliverLIst.vue
+++ b/pages/bookShop/deliverLIst.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		快递列表页面
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -2,46 +2,39 @@
 	<view class="">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<z-nav-bar :title="titleStat"></z-nav-bar>
-		<!-- <view class="deliverCntent" v-if="orderType == 2">
-			<view v-if="deliverDetails">
-				<view v-for="(item, index) in deliverDetails[0].Traces">
-					<view class="flexbox" v-if="index == 0">
-						<view class="img_icon "><img width="20px" src="../../static/icon/icon-truck.svg" alt=""></view>
-						<view class="wuliu">
-							<view class="content">{{item.AcceptStation}}</view>
-							<view class="time">{{item.AcceptTime}}</view>
-						</view>
-					</view>
-				</view>
-			</view>			
-		</view> -->
-		<view class="adDefault" v-if="orderContet.products!=''">
+		<z-nav-bar title="订单详情"></z-nav-bar>		
+		<view class="adDefault" v-if="consigneeShow && orderContet.orderType == 'order'">			
 			<view class="defalTop">
 				<text class="userName">
-					{{orderContet.shippingUser}}
+					{{orderContet.consignee.consigneeName}}
 				</text>
 				<text class="userTel">
-					{{orderContet.userPhone}}
+					{{orderContet.consignee.consigneeMobile}}
 				</text>
 			</view>
 			<view class="defalBottom">
 				<text class="userAddress">
-					{{orderContet.province}} {{orderContet.city}} {{orderContet.district}} {{orderContet.address}}
+					{{orderContet.consignee.province}} {{orderContet.consignee.city}} {{orderContet.consignee.county}} {{orderContet.consignee.address}}
 				</text>
 			</view>
 			<u-icon name="map" color="#aaa" size="25" class="defalLeft"></u-icon>
 		</view>

-		<view class="orderList">
+		<view class="orderList" v-if="consigneeShow">
+			<view class="" v-if="sheetList.length > 1 && orderContet.orderStatus==2" style="background-color: rgb(113, 213, 161); margin-bottom: 20rpx; border-radius: 20rpx; color: #fff; font-size: 28rpx; padding: 10rpx;">
+				订单已被拆分成 {{sheetList.length}} 个包裹
+			</view>
 			<view class="orderItem">
-				<!-- <view class="guoqi flexbox" v-if="orderContet.orderStatus==0 && orderContet.overTime > 0">
-					<text>剩余支付时间：</text>
-					<uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false" :hour="0" :minute="0" :second="orderContet.overTime" @timeup="countDown"></uni-countdown>
-				</view> -->
-				<view class="orderContent" v-for="(item,index) in orderContet.products" :key="index"
-					@click="goDetail(item.productId)" v-if="orderContet.products!=''">
-					<image :src="item.image" mode=""></image>
+				<view class="" style="position: relative; height: 120rpx;">
+					<text class="orderState orderState0"  v-if="orderContet.orderStatus==0">待支付</text>
+					<text class="orderState orderState1" v-if="orderContet.orderStatus==1">待发货</text>
+					<text class="orderState orderState2" v-if="orderContet.orderStatus==2">待收货</text>
+					<text class="orderState orderState3" v-if="orderContet.orderStatus==3">已完成</text>
+					<text class="orderState orderState5" v-if="orderContet.orderStatus==5">已超时</text>
+				</view>				
+				<view class="orderContent" v-for="(item,index) in orderContet.goodsList" :key="index"
+					@click="goDetail(item.productId)" v-if="orderContet.goodsList.length > 0">
+					<image :src="item.productImage" mode=""></image>
 					<view class="itemJian">
 						<view class="orderTitle">
 							<text>{{item.productName}}</text>
@@ -53,6 +46,7 @@
 						</view>
 						<br clear="both">
 					</view>
+					
 					<!-- <view class="orderOper" v-if="orderContet.orderStatus=='3'"> -->
 					<view class="orderOper" v-if="item.orderStatus == 3">
 						<view  style="width: 100%; text-align: right;">						
@@ -78,19 +72,20 @@
 				</view>
 				<view class="orderallpri">
 					<span style="color: #666;margin-right: 10rpx;float: left;">商品总价 : </span>
-					<span>￥</span>{{orderContet.orderMoney}}
+					<span>￥</span>{{orderContet.orderPrice}}
 				</view>
-				<view class="orderReal">
+				<view class="orderReal" v-if="orderContet.orderType == 'order'">
 					<span style="color: #666;margin-right: 10rpx;float: left;">运费 : </span>
-					<span>￥</span>{{orderContet.shippingMoney}}
+					<span>￥</span>{{orderContet.shippingPrice}}
 				</view>
 				<view class="orderReal">
 					<span style="color: #666;margin-right: 10rpx;float: left;">优惠券 : </span>
-					<b style="color: #dd3c0c;"><span>-￥</span>{{orderContet.districtMoney}}</b>
+					<b v-if="orderContet.coupon.couponAmount" style="color: #dd3c0c;"><span>-￥</span>{{orderContet.coupon.couponAmount}}</b>
+					<b v-else style="color: #dd3c0c;"><span>-￥</span>0</b>
 				</view>
 				<view class="orderReal">
 					<span style="color: #666;margin-right: 10rpx;float: left;">实付款 : </span>
-					<b style="color: #dd3c0c;"><span>￥</span>{{orderContet.realMoney}}</b>
+					<b style="color: #dd3c0c;"><span>￥</span>{{orderContet.realPrice}}</b>
 				</view>
 				<view class="orderYunf">
 					<span style="color: #666;margin-right: 10rpx;float: left;">订单编号 : </span>
@@ -100,19 +95,26 @@
 					<span style="color: #666;margin-right: 10rpx;float: left;">创建时间 : </span>
 					<text style="font-size: 24rpx;color: #666;">{{orderContet.createTime}}</text>
 				</view>
+				<view class="orderReal" v-if="orderContet.orderStatus >= 1 && orderContet.orderStatus != 5">
+					<span style="color: #666;margin-right: 10rpx;float: left;">付款时间 : </span>
+					<text style="font-size: 24rpx;color: #666;">{{orderContet.paymentDate}}</text>
+				</view>
+				<!-- <view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">
+					<span style="color: #666;margin-right: 10rpx;float: left;">发货时间 : </span>
+					<text style="font-size: 24rpx;color: #666;">{{orderContet.shippingTime}}</text>
+				</view> -->
 				<view class="orderOper">
 					<view  style="width: 100%; text-align: right;">
 						<!-- <u-button text="" type="success" plain ></u-button>
 						<u-button text="" type="primary" plain  >							
 						
 						</u-button> -->
-						<view v-if="orderContet.orderStatus==2"  class="opFix" @click="onPageJump(orderID)">查看物流</view>
+						<view v-if="orderContet.orderStatus==2 && sheetList.length > 0 && orderContet.orderStatus != 5"  class="opFix" @click="seeExpressDetail(orderContet)">查看物流</view>
 						<view v-if="orderContet.orderStatus==2"  class="opCan" @click="OverOrder" >确认收货</view>
 					
 						<view v-if="orderContet.orderStatus==0" class="opFix" @click="canceOrder">取消订单</view>
 						<view v-if="orderContet.orderStatus==0" class="opCan" @click="goPay(orderContet)">去支付</view>
 											
-						
 						<view class="opCan" @click="kefu">联系客服</view>
 					</view>
 					
@@ -168,6 +170,22 @@
 				</view>				
 			</view>
 		</u-popup>
+		<u-popup mode="bottom" :show="sheetListShow" :round="10" @close="sheetListShow=false">
+			<view class="tanchu expresslist" style="height: 500rpx; overflow-y: scroll;">
+				<view class="title">
+					请选择要查看包裹
+				</view>
+				<view class="list">					
+					<view class="item" v-for="(item,index) in sheetList" @click="seeExpressDetails(item)">
+						<h4 style="margin-bottom: 10rpx;">包裹 {{index+1}}</h4>
+						<view class="">运单号：{{item.expressOrderSn}} 
+						<u-tag @click="copyData(item.expressOrderSn)" size="mini" class="copyCode" text="复制单号" plain type="success" /></view>
+						<view class="">发货时间：{{item.createTime}}</view>						
+					</view>
+				</view>
+				
+			</view>
+		</u-popup>
 		<music-play :playData="playData"></music-play>
 	</view>
 </template>
@@ -217,7 +235,7 @@
 				logisticsData: [], // 快递信息列表
 				titleStat: '',
 				orderID: 0,
-				orderSn:null,
+				orderSn:'',
 				orderType: '',
 				orderContet: {},
 				deliverDetails: [{
@@ -227,7 +245,9 @@
 				emoji:[],
 				Files:[],
 				pjType:'',
-				
+				sheetList: [], // 面单数据
+				consigneeShow: false,
+				sheetListShow:false,
 			}
 		},
 		onLoad(e) {
@@ -237,7 +257,9 @@
 			this.orderSn = e.orderSn
 			console.log(this.orderID,'this.orderID')
 		},
-		
+		onHide() {
+			this.sheetList= []
+		},
 		onShow() {
 			this.getOrderList()			
 		},
@@ -250,6 +272,21 @@
 		},
 		
 		methods: {	
+			// 复制到剪切板
+			copyData(data){
+				uni.setClipboardData({
+					data,
+					success: function () {
+						console.log('success');
+					}
+				});
+			},
+			seeExpressDetails(item){
+				console.log(item,'item')
+				uni.navigateTo({
+					url: "./deliverDetail?orderSn=" + this.orderContet.orderSn + "&expressOrderSn=" + item.expressOrderSn + "&expressCompanyCode="+item.expressCompanyCode + "&expressCompanyName="+item.expressCompanyName
+				})
+			},
 			// 倒计时回调
 			countDown(){				
 					console.log('重新刷新订单')
@@ -483,6 +520,18 @@
 						}
 				})
 			},
+			// 查看物流
+			seeExpressDetail(item){
+				console.log(item, this.sheetList.length)
+				if(this.sheetList.length > 1){
+					this.sheetListShow = true					
+				}else if(this.sheetList.length == 1){
+					// 直接展示详情
+					uni.navigateTo({						
+						url: "./deliverDetail?orderSn=" + item.orderSn + "&expressOrderSn=" + this.sheetList[0].expressOrderSn
+					})
+				}
+			},
 			onPageJump(item) {
 				uni.navigateTo({
 					url: "./deliverDetail?objId=" + item
@@ -525,21 +574,23 @@
 			orderTabCLi(e) {
 				this.orderListTab = e
 			},
-			// 获取订单列表
+			// 获取订单详情
 			getOrderList() {
 				console.log('this.orderType',this.orderType)
 				this.$http
-					.get(`book/buyOrder/getOrderInfo?orderId=${this.orderID}`)
+					// .get(`book/buyOrder/getOrderInfo?orderId=${this.orderID}`)
+					.get(`/book/buyOrder/orderDetail?orderSn=${this.orderSn}`)
 					.then(res => {
 						console.log('订单详情',res)
-						var seconds = res.result.timestamp + 30 * 60 + 2    // 过期时间
-						var nowSeconds = Math.floor(new Date().getTime() / 1000);
-						res.result.overTime = seconds - nowSeconds
+						// var seconds = res.result.timestamp + 30 * 60 + 2    // 过期时间
+						// var nowSeconds = Math.floor(new Date().getTime() / 1000);
+						// res.result.overTime = seconds - nowSeconds
 						
 						this.orderContet = res.result
-						this.userRecordid = res.userRecordid
-						this.productIDs = res.result.products.map(item => {
-							return item.productId
+						this.consigneeShow = true
+						//this.userRecordid = res.userRecordid
+						this.productIDs = res.result.goodsList.map(item => {
+							return item.buyOrderProductId
 						})
 						// console.log(this.orderContet,'this.orderContet')
 						if (this.orderContet.orderStatus == 0) {
@@ -551,30 +602,15 @@
 						} else if (this.orderContet.orderStatus == 3) {
 							this.titleStat = '已完成'
 						}
-						
+						if(this.orderContet.orderStatus >= 2 && this.orderContet.orderType == 'order'){
+						 this.sheetList = this.orderContet.expressOrders
+						}else{
+							this.sheetList = []
+						}						
 						console.log(this.orderContet,'订单详情')
 					})
 			},		
-			// 获取物流
-			getdeliverDetails() {
-				this.$http
-					.post(`/book/buyOrder/queryFMS?orderId=${this.orderID}`)
-					.then(res => {
-						if (res && res.code === 0) {
-							console.log(res, '物流信息')	
-							// if(res.msg.indexOf('暂未查到物流信息') == -1){
-							// 	this.
-							// }
-							res.rntStr.forEach(item => {
-								item.Traces = item.Traces.reverse()
-							})
-							this.deliverDetails = res.rntStr
-							this.deliverDetailsLength = this.deliverDetails[0].Traces.length
-						} else {
 			
-						}
-					})
-			},
 			// 取消订单
 			canceOrder() {
 				uni.showModal({
@@ -695,6 +731,23 @@
 </script>

 <style lang="scss" scoped>
+	.expresslist{font-size: 28rpx; color: #666;
+	.title{text-align: center;}
+		.item{padding: 30rpx; border-bottom: 1px solid #eee;}
+	}
+	.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;}
 	.guoqi{ font-size: 28rpx; align-items: center; color: red; float: right; line-height: 40rpx;}
 	.star{display: inline-block; width: 20px; height: 20px;  margin-right: 10rpx;}
 	.starGray{ background : url(../../static/icon/star_greey.png) no-repeat; background-size: contain; }
@@ -949,7 +1002,7 @@
 			}
 		}
 	}
-
+    .copyCode{display: inline-block; margin-left: 20rpx; }
 	.deliverCntent {
 		padding: 32rpx;
 		position: relative;
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -11,7 +11,7 @@
 		</view>

 		<view class="orderList" v-if="orderList.length > 0">
-			<view class="orderItem" v-for="(ifex,inten) in orderList">
+			<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>
@@ -19,20 +19,22 @@
 				<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>
+					<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.products" @click="goOrdiCont(ifex)">
-					<image :src="item.image" mode=""></image>
+					v-for="(item,index) in ifex.productList">
+					<image :src="item.product.productImages" mode=""></image>
 					<view class="itemJian">
 						<view class="orderTitle">
-							<text>{{item.productName}}</text>
+							<text>{{item.product.productName}}</text>
 						</view>
 						<view class="orderPrice">
-							<text style="color: #f56c6c;">￥</text><text style="font-weight: bold; color: #f56c6c;">{{item.productPrice}}</text><br>
+							<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>
@@ -40,27 +42,29 @@
 					</view>
 					<br clear="both">
 				</view>
-				<view class="orderContent" v-if="ifex.orderType=='point'" @click="goOrdiCont(ifex)">
+				<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>
+							<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="goOrdiCont(ifex)">
+				<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>
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
 						</view>
 						<br clear="both">
 					</view>
@@ -69,16 +73,26 @@
 				<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>
+					<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="canceOrder(ifex)">取消订单</view>
-					<view class="opCan" @click="goPay(ifex)">去支付</view>
+					<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>
+			<u-divider text="暂无订单数据"></u-divider>
 		</view>
 		<z-navigation></z-navigation>
 		<music-play :playData="playData"></music-play>
@@ -90,10 +104,12 @@
 	import $http from '@/config/requestConfig.js';
 	import {
 		setPay,
-		setPayAssign,setWXPay
+		setPayAssign,
+		setWXPay
 	} from '@/config/utils';
 	import {
-		mapState,mapMutations
+		mapState,
+		mapMutations
 	} from 'vuex';
 	export default {
 		data() {
@@ -101,7 +117,7 @@ import {
 				playData: {},
 				orderTabs: [{
 					name: '全部',
-					value: 9
+					value: null
 				}, {
 					name: '待支付',
 					value: 0
@@ -117,19 +133,27 @@ import {
 				}, {
 					name: '已超时',
 					value: 5
-				},
-				],
-				orderListTab: 9,
+				}, ],
+				orderListTab: null,
 				orderList: [],
 				iapChannel: {},
 				checking: false, // 正在检测
 				ComplateRequestArr: null,
-				isAndorid:true
+				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.checkIapOrders() //检查未完成的苹果支付订单
 			this.getOS()
 			// this.countDown()

@@ -139,17 +163,42 @@ import {
 		},
 		// 下拉刷新
 		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()
 			},
 			// 获得操作系统
@@ -183,32 +232,66 @@ import {
 			// 切换订单状态
 			orderTabCLi(e) {
 				this.orderListTab = e
+				this.totalPage = 0
+				this.page = 1
+				this.orderList = []
 				this.getOrderList()
 			},

 			// 获取订单列表
 			getOrderList() {
-				this.$http
-					.post(`book/buyOrder/getMyOrderList?userId=${this.userInfo.id}&orderStatus=${this.orderListTab}`)
-					.then(res => {
-						res.page.list.forEach((item,index) => {								
+				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 = res.page.list
+						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
 					});
+				}
 			},

 			// 跳转到支付页面
@@ -237,6 +320,9 @@ import {
 										icon: 'none',
 										title: '取消订单成功'
 									})
+									this.page = 1
+									this.totalPage = 0
+									this.orderList = []
 									this.getOrderList()
 								})
 						}
@@ -268,6 +354,9 @@ import {
 								image: '../../static/icon/ic_close.png'
 							});
 						}
+						this.orderList = [],
+							this.page = 1
+						this.totalPage = 0
 						this.getOrderList()
 					})
 				} else if (payItem.paymentMethod == 1) {
@@ -368,7 +457,9 @@ import {
 				const that = this
 				uni.hideLoading()
 				// var restoreFlag = true; // 调用支付接口时标记 restoreFlag = true , 实际应用请将标记存储在 storage 中  
-				this.setUserInfo({restoreFlag:true});
+				this.setUserInfo({
+					restoreFlag: true
+				});
 				console.log(this.userInfo, '更新后的用户信息')
 				plus.payment.request(that.iapChannel, {
 					productid: payItem.productId,
@@ -383,7 +474,7 @@ import {
 				}, function(e) {
 					if (e.errCode == 2) {
 						// 用户未绑定支付方式，app内支付流程结束，系统弹出框引导用户绑定支付方式，此过程将跳转到系统应用 AppStore 进行绑定支付方式，绑定成功同步支付成功，用户成功付款
-						plus.runtime.openURL("https://apps.apple.com/account/billing");
+						// plus.runtime.openURL("https://apps.apple.com/account/billing");
 					} else {
 						// restoreFlag = false; // 支付失败清楚标记					
 						that.finishTransaction(result);
@@ -421,7 +512,9 @@ import {
 							}
 						})
 					} else {
-							this.setUserInfo({restoreFlag:false});
+						this.setUserInfo({
+							restoreFlag: false
+						});
 						console.log('无未处理订单，可以拉起新的支付')
 					}
 					// }
@@ -435,7 +528,9 @@ import {
 					console.log('关闭订单成功', index);

 					if (index == this.ComplateRequestArr.length - 1) { // 最后一个支付订单
-						this.setUserInfo({restoreFlag:false});	
+						this.setUserInfo({
+							restoreFlag: false
+						});
 						console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
 					}

@@ -538,8 +633,19 @@ import {

 <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;}
+
+	.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%;
@@ -580,20 +686,49 @@ import {
 			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;
+			.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;}
+
+			.orderState0 {
+				background-color: #e6a23c;
+			}
+
+			.orderState1 {
+				background-color: #409eff;
+			}
+
+			.orderState2 {
+				background-color: #f56c6c;
+			}
+
+			.orderState3 {
+				background-color: #67c23a;
+			}
+
+			.orderState5 {
+				background-color: #787878;
+			}
+
 			.orderContent {
 				margin-bottom: 20rpx;

--- a/pages/bookShop/settlement.vue
+++ b/pages/bookShop/settlement.vue
@@ -21,7 +21,7 @@
 			</view>
 			<view class="defalBottom">
 				<text class="userAddress">
-					{{adressMoRen.province}} {{adressMoRen.city}} {{adressMoRen.county}} {{adressMoRen.useraddress}}
+					{{adressMoRen.province}} {{adressMoRen.city}} {{adressMoRen.county}} {{adressMoRen.detailAddress}}
 				</text>
 			</view>

@@ -56,8 +56,8 @@
 				优惠券
 				<u-icon name="arrow-right" color="#aaa" size="18" class="yqRight"></u-icon>
 				<text class="dagnqian"
-					v-if="youhuiList.length>0&&youhuiContent.id==undefined">当前可选{{this.youhuiList.length}}张</text>
-				<text class="dagnqian" v-if="youhuiList.length==0&&youhuiContent.id==undefined"
+					v-if="youhuiList.length>0">当前可选{{this.youhuiList.length}}张</text>
+				<text class="dagnqian" v-else
 					style="background-color: #999;">暂无优惠券</text>
 				<text class="dagnqian" v-if="youhuiContent.id!=undefined">
 					- ￥{{youhuiContent.coupons.couponAmount}}</text>
@@ -151,7 +151,7 @@
 							<view class="addrContentBottom">
 								<view class="userAddress">
 									{{item.province}} {{item.city}} {{item.county}} 
-									{{item.useraddress}}
+									{{item.detailAddress}}
 								</view>
 							</view>
 						</view>
@@ -166,7 +166,7 @@
 		<u-popup :show="youhuiShow" :round="10" @close="youhuiShow=false">
 			<view class="tanchu">
 				<view class="dp_title">请选择优惠券</view>
-				<view style="max-height: 1000rpx;overflow-y: scroll;">
+				<view style="max-height: 1000rpx;overflow-y: scroll;" v-if="youhuiList.length > 0">
 					<view :class="youhuiIndex === index ? 'youhuiItem youItem_style' : 'youhuiItem'"
 						v-for="(item,index) in youhuiList" :key="index" @click="choseYouhui(index)">
 						<view style="width: 25%;color:#fd6004;text-align: center;">
@@ -189,9 +189,12 @@
 						</view>
 						<br clear="both">
 					</view>
-				</view>
 					<view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view>
 				</view>
+				<view class="" v-else>
+					<u-divider text="暂无可用优惠券哦"></u-divider>
+				</view>				
+			</view>
 		</u-popup>

 	<music-play :playData="playData"></music-play>
@@ -261,11 +264,11 @@
 						id: 2,
 						img: '../../static/icon/pay_1.png'
 					},					
-					// {
-					// 	title: '微信',
-					// 	id: 1,
-					// 	img: '../../static/icon/pay_2.png'
-					// },
+					{
+						title: '微信',
+						id: 1,
+						img: '../../static/icon/pay_2.png'
+					},
 					{
 							title: '天医币购买',
 							id: 4,
@@ -357,7 +360,7 @@
 								this.addressList = res.list
 								// console.log(this.addressList,'地址列表')
 								this.adressMoRen = this.addressList[this.adressMoRIndex]
-								// console.log(this.adressMoRen, '默认')
+								console.log(this.adressMoRen, '默认')
 								if(this.adressMoRen != {}){
 									// console.log('运费之前')
 									this.getYunFei()
@@ -459,7 +462,8 @@
 				 console.log(key,'this.adressMoRen.areaidpath')
 				
 				$http.request({
-					url: "book/buyOrder/calculateTransportPrice/",
+					// url: "book/buyOrder/calculateTransportPrice/",
+					url: "book/buyOrder/calculateTransportPrice",
 					// url: "book/buyorder/getTransPrice/" + this.adressMoRen.areaidpath + "?" + dataToString,
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
 					data:{
@@ -473,11 +477,10 @@
 				}).then(res => {					
 					if (res.code == 0) {
 						this.farePrice = res.result
-					}else{
-						this.farePrice = 0
-					}
 						console.log('需要的运费',res.result)
 						this.allPrice()
+					}
+					
 				})
 			},	

@@ -613,13 +616,13 @@
 					couponName: youPre.coupons.name, //优惠券名称
 					districtMoney: youPre.coupons.amount, //优惠金额
 					orderStatus: 0, //订单状态
-					products: xiaBiao, //订单列表
+					productList: xiaBiao, //订单列表商品
 					orderType: "order", //订单类型
 					addressId:this.adressMoRen.id    // 地址ID
 				}				
 				$http.request({					
-					// url: "book/buyorder/save",
-					url: "book/buyOrder/buySave",
+					// url: "book/buyOrder/buySave",
+					url: "book/buyOrder/placeOrder",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
 					data,
 					header: { //默认 无 说明：请求头
--- a/pages/clock/clock.vue
+++ b/pages/clock/clock.vue
@@ -17,8 +17,7 @@
 						<text>返回今天</text>
 					</view>
 					<!-- <u-icon name="checkbox-mark" color="#55aa7f" size="14" style="display: inline;"></u-icon> -->
-					<view class="dakaBtn" @tap="buSign(linshiDay)"
-						v-if="currentDay > linshiDay">
+					<view class="dakaBtn" @tap="buSign(linshiDay)" v-if="currentDay > linshiDay">
 						<text style="font-size: 24rpx;">补卡</text>
 					</view>
 					<view class="dakaBtn" @tap="kuickSign()"
@@ -67,6 +66,10 @@
 						mode="aspectFit"></image>
 				</view>
 				<view class="txt" v-if="taskInfo.content" v-html="taskInfo.content"></view>
+				<view class="share flexbox" @click="newOnShare()" v-if="isAndorid">
+					<text>分享</text>
+					<image src="/static/share.png" class="per_mes_img" style="width: 40rpx; height: 40rpx; "></image>
+				</view>
 			</view>
 			<view v-else>
 				<u-divider text="今天未发布打卡任务"></u-divider>
@@ -114,7 +117,8 @@
 								<view class="content" style="width: 100%;" @click="showPingLun(item)">
 									<view class="" v-html="item.phtml"></view>
 								</view>
-								<view class="flexbox" style="text-align: right; align-items: center; justify-content: space-between;">
+								<view class="flexbox"
+									style="text-align: right; align-items: center; justify-content: space-between;">
 									<view class="flexbox" @click="showPingLun(item)" style="align-items: center; ">
 										<u-icon style="display: inline ;margin-left: 10rpx; " name="chat" color="#999"
 											size="18"></u-icon>
@@ -130,14 +134,17 @@
 							<view class="subPItem" v-for="item2 in item.subCommentList" :key="item2.key">
 								<view class="touxiang zhuipingTX flexbox">
 									<view class="left">
-										<image v-if="!item2.avatar || item2.avatar == ''" src="../../static/icon/morenAvavter.png"
-											mode="aspectFit"></image>
+										<image v-if="!item2.avatar || item2.avatar == ''"
+											src="../../static/icon/morenAvavter.png" mode="aspectFit"></image>
 										<image v-else :src="item2.avatar" mode="aspectFit"></image>
 									</view>
 									<view class="neirong" style="text-align: left;">
-										<text class="username nowrap subPName">{{item2.nickName?item2.nickName:'匿名用户'}}</text>
-										<text class="username nowrap" style="padding: 0 10rpx; color: #c7c7c7;">回复了</text>
-										<text class="username nowrap">{{item2.puserNickName?item2.puserNickName:'匿名用户'}}</text>
+										<text
+											class="username nowrap subPName">{{item2.nickName?item2.nickName:'匿名用户'}}</text>
+										<text class="username nowrap"
+											style="padding: 0 10rpx; color: #c7c7c7;">回复了</text>
+										<text
+											class="username nowrap">{{item2.puserNickName?item2.puserNickName:'匿名用户'}}</text>
 										<view class="contentBox" style="width: 100% !important; padding-left: 3px;">
 											<!-- <div class="pjimgs flexbox">
 												<view class="item" v-for="(item1,index) in item2.imageList">
@@ -149,11 +156,14 @@
 												<view class="" v-html="item2.phtml"></view>
 												<!-- <view class="" v-html="item2.content"></view> -->
 											</view>
-											<view class="flexbox" style="text-align: right; align-items: center; justify-content: space-between;">
-												<view class="flexbox" @click="showPingLun(item2)" style="align-items: center;justify-content: space-between; ">
-													<u-icon style="display: inline ;margin-left: 10rpx; " name="chat" color="#999"
-														size="18" ></u-icon>
-													<text class="time" style="display: inline ;margin-right: 20rpx; ">回复</text>
+											<view class="flexbox"
+												style="text-align: right; align-items: center; justify-content: space-between;">
+												<view class="flexbox" @click="showPingLun(item2)"
+													style="align-items: center;justify-content: space-between; ">
+													<u-icon style="display: inline ;margin-left: 10rpx; " name="chat"
+														color="#999" size="18"></u-icon>
+													<text class="time"
+														style="display: inline ;margin-right: 20rpx; ">回复</text>
 												</view>
 												<text class="time">{{item2.createTime}}</text>
 											</view>
@@ -170,6 +180,10 @@
 			</view>

 		</view>
+		<!-- 分享弹窗 -->
+		<uni-popup ref="share" type="share" safeArea backgroundColor="#fff">
+			<uni-popup-share @select="haveSelected"></uni-popup-share>
+		</uni-popup>
 		<!-- 回复评论弹窗 -->
 		<u-popup mode="bottom" :show="pinglunShow" :round="10" @close="pinglunShow=false">
 			<view class="tanchu">
@@ -267,6 +281,7 @@
 	export default {
 		data() {
 			return {
+				isAndorid:true,
 				opPinglun: {}, // 针对的评论对象
 				pinglunShow: false,
 				placeholder: '开始输入...',
@@ -337,6 +352,7 @@
 		onLoad(e) {
 			this.bookid = e.bookid
 			this.windowWidth = uni.getSystemInfoSync().windowWidth;
+			this.getOS()	
 		},
 		onPullDownRefresh() {
 			console.log('下拉刷新了')
@@ -359,11 +375,66 @@
 			...mapState(['userInfo'])
 		},
 		methods: {
+			// 获得操作系统
+			getOS(){
+				let oprateOs = ''				
+				oprateOs = uni.getSystemInfoSync().platform
+				// console.log(oprateOs)
+				if(oprateOs == 'android'){
+					this.isAndorid = true
+				}else{
+					this.isAndorid = false
+				}
+			},
+			haveSelected(data){
+				let image = ''
+				this.taskInfo.image && this.taskInfo.image !=  '' ? image = this.taskInfo.image : image = 'static/fengziIcon.jpg'
+				console.log(data,' 选择的是')				
+				if(data.index == 0){    
+					// 分享到好友
+					uni.share({
+						provider: "weixin",
+						scene: "WXSceneSession",
+						type: 0,
+						href: this.$apkUrl,
+						title: `我正在参与疯子读书读书打卡：${this.taskInfo.title}`,
+						summary: `${this.taskInfo.content}`,
+						imageUrl: image,
+						success: function (res) {
+							console.log("success:" + JSON.stringify(res));
+						},
+						fail: function (err) {
+							console.log("fail:" + JSON.stringify(err));
+						}
+					});
+				}else if(data.index == 1){
+					// 分享到朋友圈
+					uni.share({
+						provider: "weixin",
+						scene: "WXSceneTimeline",
+						type: 0,
+						href: this.$apkUrl,
+						title: `我正在参与疯子读书读书打卡：${this.taskInfo.title}`,
+						summary: `${this.taskInfo.content}`,
+						imageUrl: image,
+						success: function (res) {
+							console.log("success:" + JSON.stringify(res));
+						},
+						fail: function (err) {
+							console.log("fail:" + JSON.stringify(err));
+						}
+					});
+				}
+			},
+			// 新写分享
+			newOnShare(){
+				this.$refs.share.open()
+			},	
 			showPingLun(item) {
 				// 回复评论
 				this.opPinglun = item
 				this.pinglunShow = true
-				console.log('item45456', this.opPinglun)				
+				// console.log('item45456', this.opPinglun)
 			},
 			onEditorReady() {
 				// #ifdef MP-BAIDU
@@ -530,15 +601,16 @@
 			// 获取某天的签到列表信息
 			getAllSign(val) {
 				console.log(val, '-----------')
-				let param = {
-					'entryId': val.id,					
-					// 'userId': null,
-					'currentPage': this.recordPage,
-					'pageSize': this.recordPageSize,
+				let data = {
+					'entryId': val.id
+					// 'bookid': this.bookid,
+					// 'limit': 5,
+					// 'page': this.page,
 					// 'taskid': val.id
 				}
 				this.$http
-					.get('book/clockInForum/getChatList', param)
+					// .post('book/clockin/applist', data)
+					.get('book/clockInForum/getChatList', data)
 					// .get('book/clockInForum/getChatList', data)
 					.then(res => {
 						if (res.code == 0) {
@@ -911,7 +983,13 @@
 </script>

 <style lang="scss" scoped>
-	.pingjiaBox{margin-bottom: 20rpx;}
+	.share{font-size: 28rpx;  float: right; padding-bottom:20rpx ;
+	.per_mes_img{width: 40rpx; height: 40rpx; margin-left: 10rpx;}
+	}
+	.pingjiaBox {
+		margin-bottom: 20rpx;
+	}
+
 	.ql-editor {
 		min-height: 50rpx;
 	}
@@ -981,10 +1059,18 @@
 			margin-top: 6rpx;
 		}
 	}
-	.subPItem{margin-bottom: 40rpx;}
-	.subPName{padding-left: 10rpx;}
+
+	.subPItem {
+		margin-bottom: 40rpx;
+	}
+
+	.subPName {
+		padding-left: 10rpx;
+	}
+
 	.zhuipingTX {
 		width: 100%;
+
 		image {
 			width: 30px !important;
 			padding: 3px;
@@ -995,6 +1081,7 @@
 			;
 		}
 	}
+
 	.allComments {
 		background-color: #fff;
 		margin-top: 20rpx;
@@ -1313,7 +1400,7 @@
 		}

 		.txt {
-			font-size: 24rpx;
+			font-size: 28rpx;
 			margin-top: 30rpx;
 			color: #666;
 			line-height: 50rpx;
--- a/pages/peanut/chargeDetaill.vue
+++ b/pages/peanut/chargeDetaill.vue
@@ -0,0 +1,275 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<!-- <z-nav-bar title="我的订单"></z-nav-bar> -->
+		<z-nav-bar title="充值详情"></z-nav-bar>
+
+		<view class="leve1">
+			<view class="item flexbox" v-if="orderDetail.orderStatus == 3">
+				<view class="">
+					<view class="img">
+						<image @click="" style="width: 120rpx; height: 120rpx; margin-top: 0;" class=""
+							src="/static/icon/cgts.png" mode="aspectFill"></image>
+					</view>
+					<view class="txt">
+						<text>充值成功</text>
+					</view>
+					<view class="">
+						<text style="font-size: 30rpx;">充值金额：</text><text style=" color: #ff5500;">￥</text>
+						<text class="price">{{orderDetail.orderPrice}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="item flexbox" v-if="orderDetail.orderStatus == 0">
+				<view class="">
+					<view class="img">
+						<image @click="" style="width: 120rpx; height: 120rpx; margin-top: 0;" class=""
+							src="/static/icon/noPay.png" mode="aspectFill"></image>
+					</view>
+					<view class="txt">
+						<text>待付款</text>
+					</view>
+					<view class="">
+						<text style="font-size: 30rpx;">充值金额：</text><text style=" color: #ff5500;">￥</text>
+						<text class="price">{{orderDetail.orderPrice}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="item flexbox" v-if="orderDetail.orderStatus > 3">
+				<view class="">
+					<view class="img">
+						<image @click="" style="width: 120rpx; height: 120rpx; margin-top: 0;" class=""
+							src="/static/icon/fail.png" mode="aspectFill"></image>
+					</view>
+					<view class="txt">
+						<text>充值失败</text>
+					</view>
+					<view class="">
+						<text style="font-size: 30rpx;">充值金额：</text><text style=" color: #ff5500;">￥</text>
+						<text class="price">{{orderDetail.orderPrice}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="leve2">				
+				<view class="times">
+					<view class="flexbox">
+						<text>订单编号：</text><text>{{orderDetail.orderSn}}</text>
+					</view>
+					<view class="flexbox">
+						<text>订单创建时间：</text><text>{{orderDetail.createTime}}</text>
+					</view>
+					<view class="flexbox"  v-if="orderDetail.orderStatus > 0">
+						<text>到账时间：</text><text>{{orderDetail.createTime}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="leve3 flexbox">
+				<view class="item">
+					<button v-if="orderDetail.orderStatus == 3" @click="goHome" class="mini-btn" type="primary" style="backgroundColor:#1AAD19;borderColor:#1AAD19" >完成</button>					
+					<button v-if="orderDetail.orderStatus == 0" @click="goPay" class="mini-btn" type="warn"  >去支付</button>
+				</view>
+				<view class="item" v-if="orderDetail.orderStatus == 3">
+					<button class="mini-btn" type="primary" @click="goCharge">继续充值</button>
+				</view>
+			</view>
+		</view>
+		<z-navigation></z-navigation>
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import {
+		setPay,
+		setPayAssign,
+		setWXPay
+	} from '@/config/utils';
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				playData: {},
+				orderId: null,
+				orderSn: '',
+				orderDetail: {},
+				titleStat: '',
+			}
+		},
+		onLoad(e) {
+			this.orderId = e.orderId
+			this.orderSn = e.orderSn
+		},
+		onShow() {
+			this.getOrderDetail()
+		},
+		components: {
+			musicPlay
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		methods: {
+			// 支付
+			goPay() {
+				let payItem = this.orderDetail
+				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: "支付成功"
+							});
+							setTimeout(()=>{
+								uni.navigateTo({
+									url:'/pages/user/persCount'
+								})
+							},2000)
+						} else {
+							uni.showToast({
+								title: "支付失败",
+								icon: "none",
+								image: '../../static/icon/ic_close.png'
+							});
+						}						
+						this.getOrderDetail()
+					})
+				} 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: "支付成功"
+								});
+								setTimeout(()=>{
+									uni.navigateTo({
+										url:'/pages/user/persCount'
+									})
+								},2000)
+							} 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)
+					}
+				}
+			},
+			goCharge(){
+				uni.navigateTo({
+					url:'./reCharge'
+				})
+			},
+			goHome(){
+				uni.switchTab({
+					url:'/pages/peanut/home'
+				})
+			},
+			getOrderDetail() {
+				this.$http
+					.get(`/book/buyOrder/orderDetail?orderSn=${this.orderSn}`)
+					.then(res => {
+						console.log('订单详情', res)
+						this.orderDetail = res.result
+						this.consigneeShow = true
+						// console.log(this.orderContet,'this.orderContet')
+						if (this.orderDetail.orderStatus == 0) {
+							this.titleStat = '待支付'
+						} else if (this.orderDetail.orderStatus == 1) {
+							this.titleStat = '待发货'
+						} else if (this.orderDetail.orderStatus == 2) {
+							this.titleStat = '待收货'
+						} else if (this.orderDetail.orderStatus == 3) {
+							this.titleStat = '已完成'
+						}
+
+					})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.flexbox{display: flex;}
+	.container {
+		height: 100vh;
+		background-color: #fff;
+		padding: 10rpx;
+	}
+
+	.leve1 {
+		.item {
+			text-align: center;
+			height: 400rpx;
+			    justify-content: center;
+			    align-items: center;
+			.txt{margin-bottom: 20rpx;}
+			.price{font-size: 50rpx; color: #ff5500; }
+			.img { margin-bottom: 20rpx;
+				image {
+					margin: 0 auto;
+				}
+			}
+		}
+	}
+	.leve2{ text-align: center; font-size: 30rpx;
+		
+		.times{ padding: 20rpx; font-size: 28rpx; line-height: 60rpx;
+			.flexbox{width: 100%; justify-content:space-between;}
+		}
+	}
+	.leve3{width: 100%; justify-content: space-around; margin-top: 50rpx;
+	.item{width: 40%;}
+	}
+</style>
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -9,12 +9,34 @@
 				<view class="hehan">
 					<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
 				</view>	
-				<view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
+				<view class="fiveIcon flexbox" >
+					<div class="item item1" @click="onPageJump('../acupoint/acupoint')">
+						<image src="../../static/icon/five1.png" mode="aspectFit" ></image>
+						<text>经穴检索</text>
+					</div>
+					<div class="item item1">
+						<image src="../../static/icon/five2.png" mode="aspectFit"></image>
+						<text>方药检索</text>
+					</div>
+					<div class="item item1" @click="onPageJump('../peanut/searchFor')">
+						<image src="../../static/icon/five3.png" mode="aspectFit"></image>
+						<text>书名检索</text>
+					</div>
+					<div class="item item1">
+						<image src="../../static/icon/five4.png" mode="aspectFit"></image>
+						<text>五运六气</text>
+					</div>
+					<div class="item item1">
+						<image src="../../static/icon/five5.png" mode="aspectFit"></image>
+						<text>吴门医述</text>
+					</div>
+				</view>
+				<!-- <view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
 					<view class="search">
 						<text class="icon_search"></text>
 						<text class="prompt">请输入书名</text>
 					</view>				
-				</view>
+				</view> -->
 				<!-- <view class="searBtn flexbox">
 					<text>搜索</text>
 				</view> -->
@@ -321,7 +343,7 @@
 		},
 		// 页面加载完毕
 		onReady() {
-			this.requestIapOrder()
+			// this.requestIapOrder()
 		},
 		// 下拉刷新
 		onPullDownRefresh() {
@@ -329,8 +351,9 @@
 			this.tjProList = []
 			this.getData()
 			this.getTags()
+			// this.requestIapOrder()	
 			uni.stopPullDownRefresh()
-			this.requestIapOrder()			
+					
 		},
 		onReachBottom() {
 			this.loadingNow = true
@@ -476,17 +499,7 @@
 						that.ComplateRequestArr = results
 						console.log(that.ComplateRequestArr,'未完成订单数组')							
 						if(results && results.length>0){
-							// for(var j = 0; j<results.length; j++){
-							// 	if(results[j].transactionState == '1'){
-							// 			// 已经支付，但是没有走逻辑的内购订单								
-							// 		 that.iapCheck(results[j])
-							// 		 // that.iapCheck(repciptData)									 							
-							// 		}else{
-							// 			// 其他状态的内购订单 直接关闭
-							// 			that.finishTransaction(results[j])	
 							
-							// 		}
-							// }
 						results.map((item,index)=>{
 							// "0"为正在支付；"1"为支付成功；"2"为支付失败；"3"为支付已恢复。
 							if(item.transactionState == '1'){ 
@@ -696,6 +709,12 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
+	.fiveIcon{justify-content: space-between; text-align: center;
+		text{
+			font-size: 28rpx;  color: #11a669;
+		}	
+			image{width: 60rpx; height: 60rpx; margin: 0 auto; }
+	}
 	.hehan{width: 80%; margin: 10rpx auto;}
 	.zhekou{
 		.goodsName{margin-bottom: 20rpx;}
--- a/pages/peanut/mine.vue
+++ b/pages/peanut/mine.vue
@@ -50,7 +50,7 @@
 					优惠券
 				</view>
 				<!-- <b class="chong_btn" @click="onPageJump('../sdkDemo/pay')">充 值</b> -->
-				<b class="chong_btn" @click="onPageJump('./reCharge')">充 值</b>
+				<b class="chong_btn" v-if="platform != 'ios'" @click="onPageJump('./reCharge')">充 值</b>
 			</view>
 		</view>

@@ -133,13 +133,18 @@
 				signContent: '是否要退出登录？',
 				playData:{},
 				isAndorid:true,	
+				platform : null, // 设备系统
 			};
 		},
 		//第一次加载
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();			
+			// #ifdef APP-PLUS
 			this.getOS()			
+			this.platform = uni.getSystemInfoSync().platform
+			// console.log('操纵系统',this.platform)
+			// #endif
 		},
 		computed: {
 			...mapState(['userInfo'])
@@ -174,7 +179,7 @@
 						provider: "weixin",
 						scene: "WXSceneSession",
 						type: 0,
-						href: "https://www.nuttyreading.com/nuttyreading.apk",
+						href: this.$apkUrl,
 						title: "疯子读书",
 						summary: "我正在使用疯子读书提升自己，赶紧跟我一起来体验吧！",
 						imageUrl: "static/fengziIcon.jpg",
@@ -191,7 +196,7 @@
 						provider: "weixin",
 						scene: "WXSceneTimeline",
 						type: 0,
-						href: "https://www.nuttyreading.com/nuttyreading.apk",
+						href: this.$apkUrl,
 						title: "疯子读书",
 						summary: "我正在使用疯子读书提升自己，赶紧跟我一起来体验吧！",
 						imageUrl: "static/fengziIcon.jpg",
--- a/pages/peanut/reCharge.vue
+++ b/pages/peanut/reCharge.vue
@@ -157,6 +157,11 @@
 			// this.iphonepay()
 			uni.hideTabBar();
 			this.getDevName()	
+			// setTimeout(()=>{
+			// 	uni.navigateTo({
+			// 		url:'/pages/user/persCount'
+			// 	})
+			// },2000)
 		},
 		computed: {
 			...mapState(['userInfo']),
@@ -261,6 +266,7 @@
 					// 支付成功，result 为 IAP商品交易信息对象 IAPTransaction 需将返回的支付凭证传给后端进行二次认证  
 					that.iapCheck(result)
 				}, function(e) {
+					console.log('错误回调', e)
 					if(e.errCode == 2){
 						// 用户未绑定支付方式，app内支付流程结束，系统弹出框引导用户绑定支付方式，此过程将跳转到系统应用 AppStore 进行绑定支付方式，绑定成功同步支付成功，用户成功付款
 						plus.runtime.openURL("https://apps.apple.com/account/billing");
@@ -377,9 +383,7 @@
 			},
 			// 充值
 			goToPay(){				
-				
 				this.kaiChar()
-				
 			},
 			// 正常充值
 			kaiChar() {  // 常规充值
@@ -424,6 +428,11 @@
 										uni.showToast({
 											title: "支付成功"
 										});
+										setTimeout(()=>{
+											uni.navigateTo({
+												url:'/pages/user/persCount'
+											})
+										},2000)
 									} else {										
 										uni.showToast({
 											title: "支付失败",
@@ -450,6 +459,11 @@
 												uni.showToast({
 													title: "支付成功"
 												});
+												setTimeout(()=>{
+													uni.navigateTo({
+														url:'/pages/user/persCount'
+													})
+												},2000)
 											} else {	
 												console.log(res)
 												if(res.data.errMsg.indexOf('User canceled') != -1){
--- a/pages/talkBook/talkBookDetail.vue
+++ b/pages/talkBook/talkBookDetail.vue
@@ -4,7 +4,7 @@
 		<view class="mainContent">
 			<view class="title">{{talkBookDetail.title}}</view>
 			<view class="voices" v-if="talkBookDetail.voices != '' && audioShow">
-				<audio style="text-align: left;  overflow: hidden;" :src="talkBookDetail.voices"
+				<audio style="text-align: left;  overflow: hidden;" :src="talkBookDetail.voices" @play="audioPlay"
 					poster="../../static/icon/home_icon_0.png" :name="talkBookDetail.title"
 					:author="bookInfo.author.authorName" :action="audioAction" controls></audio>
 			</view>
@@ -85,6 +85,11 @@
 		},
 		methods: {
 			...mapMutations(['setUserInfo']),
+			audioPlay(){
+				console.log('播放讲书',this.$music)				
+				this.$music.setCloseBgm()	 // 关闭听书音频
+				this.setUserInfo({'playFlag': false})				
+			},
 			// 购买
 			gotoBuy() {
 				uni.navigateTo({
--- a/pages/user/addAddress.vue
+++ b/pages/user/addAddress.vue
@@ -22,7 +22,6 @@
 					<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" />
@@ -45,18 +44,26 @@
 			@confirm="deleteSub">
 		</u-modal>
 		<music-play :playData="playData"></music-play>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
 	</view>
 </template>

 <script>
+	
 	import musicPlay from '@/components/music.vue'
 	import $http from '@/config/requestConfig.js';
+	import addressList1 from "@/static/json/address.json"
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
+				// array: ['中国', '美国', '巴西', '日本'],
+				// indexp:0,
+				// indexq:0,
+				// indexc:0,
 				playData:{},
 				addreShow: false, //是否显示
 				columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据
@@ -119,6 +126,7 @@
 			}
 		},
 		onLoad(e) {
+			this.addressList = addressList1
 			if (e.type == 0) {
 				this.navName = '添加地址'
 				this.isShowDel = false
@@ -129,6 +137,7 @@
 				this.getAddress()
 			}
 			this.initDataPicker() //初始化省份列表
+			
 		},
 		onShow() {
 		
@@ -145,12 +154,12 @@
 		methods: {						
 			// 三级联动
 			initDataPicker() {
-				this.$http
-					.post('api/province/getProvince')
-					.then(res => {
-						if (res.code == 0) {
-							this.addressList = res.provinceEntity
-
+				// 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 = [{
@@ -208,7 +217,7 @@
 							this.columns.push(province1);
 							this.columns.push(province2);

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

 							// 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组
 							// 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据
@@ -237,11 +246,14 @@
 								this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市
 							});

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

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

 			addconfirm(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
@@ -402,6 +416,10 @@
 </script>

 <style lang="scss" scoped>
+	.flexbox{display: flex;}
+	.selectAdd{ justify-content: space-between;
+		.addItem{ display: block;width: 30%}
+	}
 	.add_arrow {
 		height: 28px;
 		line-height: 28px;
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -16,9 +16,26 @@
 				<view class="title" :class="{ active: type == 1000 }" @click="type = 1000">密码登录</view> -->
 			</view>
 			<view class="input_tit">手机号</view>
-			<view class="input_box triangle" :clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
+			<!-- 带区号 -->
+			<!-- <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>
+			</view> -->
+
+			<!-- 不带区号 -->
+			<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 class="input_tit" v-if="type == 1000">密码</view>
 			<view class="input_box" v-if="type == 1000">
 				<input class="input_item" v-model="password" @input="onInput" :password="!isSee" placeholder="请输入密码"
@@ -171,7 +188,19 @@
 				xieyi: {
 					title: '',
 					Content: ''
+				},
+				quShow: false,
+				quCodeList: [{
+						value: '1',
+						text: '江'
+					},
+					{
+						value: '2',
+						text: '湖'
 					}
+				],
+				quCode: null,
+
 			};
 		},
 		//第一次加载
@@ -192,6 +221,9 @@
 		methods: {
 			...mapMutations(['setUserInfo']),
 			...mapMutations(['setHealthMes']),
+			quChange(e) {
+				console.log(e, 'e')
+			},
 			// 修改密码
 			resetPassWord() {
 				console.log('重置密码')
@@ -603,7 +635,34 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-.highlight{color: $themeColor;}
+
+	.phoneNumberInput {
+		width: calc(100% - 130rpx);
+		width: 100%;
+		height: 67rpx;
+
+		input {
+			font-size: 28rpx;
+			margin: 20rpx 0;
+		}
+	}
+
+	.borderBottom {
+		border-bottom: 1px solid #efeef4;
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.quhao {
+		width: 120rpx;
+	}
+
+	.highlight {
+		color: $themeColor;
+	}
+
 	.tanchu {
 		padding: 40rpx 30rpx 40rpx 30rpx;
 		position: relative;
@@ -620,6 +679,7 @@


 	}
+
 	.logo_bg {
 		background-image: url('@/static/icon/login_bg.png');
 		// background-position: center center;
@@ -771,6 +831,7 @@

 		.btn_box {
 			margin-top: 40rpx;
+
 			button {
 				font-size: 32rpx;
 				background-color: #e5e5e5;
--- a/pages/user/persCount.vue
+++ b/pages/user/persCount.vue
@@ -11,7 +11,9 @@
 				<view class="AC_mes">
 					<view style="font-size: 50rpx;font-weight: bold;">{{userMes.peanutCoin}}</view>
 					<view style="color: #888;font-size: 30rpx;margin-top: 10rpx;">天医币</view>
-					<text class="AC_chong" @click="buPoint()">充值</text>
+					
+					<text v-if="platform != 'ios'" class="AC_chong" @click="buPoint()">充值</text>
+					
 				</view>

 				<view class="AC_con">
@@ -112,6 +114,7 @@
 		data() {
 			return {
 				playData:{},
+				platform:null,
 				tab_list: [{
 					name: '天医币',
 				}, {
@@ -148,7 +151,6 @@
 				},
 			};
 		},		
-
 		// 返回顶部
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -181,6 +183,10 @@
 		onLoad(e) {
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
+			// #ifdef APP-PLUS
+			this.platform = uni.getSystemInfoSync().platform
+			console.log('操纵系统',this.platform)
+			// #endif
 		},
 		computed: {
 			...mapState(['userInfo'])
--- a/static/b
+++ b/static/b
--- a/static/icon/cgts.png
+++ b/static/icon/cgts.png
--- a/static/icon/fail.png
+++ b/static/icon/fail.png
--- a/static/icon/five1.png
+++ b/static/icon/five1.png
--- a/static/icon/five2.png
+++ b/static/icon/five2.png
--- a/static/icon/five3.png
+++ b/static/icon/five3.png
--- a/static/icon/five4.png
+++ b/static/icon/five4.png
--- a/static/icon/five5.png
+++ b/static/icon/five5.png
--- a/static/icon/noPay.png
+++ b/static/icon/noPay.png
--- a/static/json/address.json
+++ b/static/json/address.json
--- a/static/share.png
+++ b/static/share.png
--- a/static/z
+++ b/static/z
--- a/uni_modules/uni-data-select/changelog.md
+++ b/uni_modules/uni-data-select/changelog.md
@@ -0,0 +1,35 @@
+## 1.0.6（2023-04-12）
+- 修复 微信小程序点击时会改变背景颜色的 bug
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化
--- a/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
+++ b/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue
@@ -0,0 +1,517 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{current}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<view v-if="current && clear && !disabled" @click.stop="clearVal" >
+						<uni-icons type="clear" color="#c0c4cc" size="24"/>
+					</view>
+					<view v-else>
+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					</view>
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-data-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom(){
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			}
+		},
+		methods: {
+			debounce(fn, time = 100){
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query(){
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange(){
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+          if (defValue || defValue === 0) {
+					  this.emit(defValue)
+          }
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					this.removeCache()
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				this.$emit('change', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`,"g"),item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData(){
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey(){
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	@media (min-width: 768px) {
+		.uni-select__selector-scroll {
+			max-height: 600px;
+		}
+	}
+	/* #endif */
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		z-index: 2;
+	}
+</style>
--- a/uni_modules/uni-data-select/package.json
+++ b/uni_modules/uni-data-select/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "1.0.6",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/uni-data-select/readme.md
+++ b/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
--- a/uni_modules/uni-search-bar/changelog.md
+++ b/uni_modules/uni-search-bar/changelog.md
@@ -0,0 +1,35 @@
+## 1.2.4（2023-05-09）
+- 修复 i18n 国际化不正确的 Bug
+## 1.2.3（2022-05-24）
+- 新增 readonly 属性，组件只读
+## 1.2.2（2022-05-06）
+- 修复  vue3 input 事件不生效的bug
+## 1.2.1（2022-05-06）
+- 修复 多余代码导致的bug
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-search-bar](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+## 1.1.2（2021-08-30）
+- 修复 value 属性与 modelValue 属性不兼容的Bug
+## 1.1.1（2021-08-24）
+- 新增 支持国际化
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.9（2021-05-12）
+- 新增 项目示例地址
+## 1.0.8（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.7（2021-04-15）
+- uni-ui 新增 uni-search-bar 的 focus 事件
+
+## 1.0.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持双向绑定
+- 更改 input 事件的返回值，e={value:Number} --> e=value
+- 新增 支持图标插槽
+- 新增 支持 clear、blur 事件
+- 新增 支持 focus 属性
+- 去掉组件背景色
--- a/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "cancel",
+	"uni-search-bar.placeholder": "Search enter content"
+}
--- a/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
--- a/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "取消",
+	"uni-search-bar.placeholder": "请输入搜索内容"
+}
--- a/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json
@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "取消",
+	"uni-search-bar.placeholder": "請輸入搜索內容"
+}
--- a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
@@ -0,0 +1,298 @@
+<template>
+	<view class="uni-searchbar">
+		<view :style="{borderRadius:radius+'px',backgroundColor: bgColor}" class="uni-searchbar__box"
+			@click="searchClick">
+			<view class="uni-searchbar__box-icon-search">
+				<slot name="searchIcon">
+					<uni-icons color="#c0c4cc" size="18" type="search" />
+				</slot>
+			</view>
+			<input v-if="show || searchVal" :focus="showSync" :disabled="readonly" :placeholder="placeholderText" :maxlength="maxlength"
+				class="uni-searchbar__box-search-input" confirm-type="search" type="text" v-model="searchVal"
+				@confirm="confirm" @blur="blur" @focus="emitFocus" />
+			<text v-else class="uni-searchbar__text-placeholder">{{ placeholder }}</text>
+			<view v-if="show && (clearButton==='always'||clearButton==='auto'&&searchVal!=='') &&!readonly"
+				class="uni-searchbar__box-icon-clear" @click="clear">
+				<slot name="clearIcon">
+					<uni-icons color="#c0c4cc" size="20" type="clear" />
+				</slot>
+			</view>
+		</view>
+		<text @click="cancel" class="uni-searchbar__cancel"
+			v-if="cancelButton ==='always' || show && cancelButton ==='auto'">{{cancelTextI18n}}</text>
+	</view>
+</template>
+
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * SearchBar 搜索栏
+	 * @description 搜索栏组件，通常用于搜索商品、文章等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=866
+	 * @property {Number} radius 搜索栏圆角
+	 * @property {Number} maxlength 输入最大长度
+	 * @property {String} placeholder 搜索栏Placeholder
+	 * @property {String} clearButton = [always|auto|none] 是否显示清除按钮
+	 * 	@value always 一直显示
+	 * 	@value auto 输入框不为空时显示
+	 * 	@value none 一直不显示
+	 * @property {String} cancelButton = [always|auto|none] 是否显示取消按钮
+	 * 	@value always 一直显示
+	 * 	@value auto 输入框不为空时显示
+	 * 	@value none 一直不显示
+	 * @property {String} cancelText 取消按钮的文字
+	 * @property {String} bgColor 输入框背景颜色
+	 * @property {Boolean} focus 是否自动聚焦
+	 * @property {Boolean} readonly 组件只读，不能有任何操作，只做展示
+	 * @event {Function} confirm uniSearchBar 的输入框 confirm 事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} input uniSearchBar 的 value 改变时触发事件，返回参数为uniSearchBar的value，e=value
+	 * @event {Function} cancel 点击取消按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} clear 点击清除按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} blur input失去焦点时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 */
+
+	export default {
+		name: "UniSearchBar",
+		emits: ['input', 'update:modelValue', 'clear', 'cancel', 'confirm', 'blur', 'focus'],
+		props: {
+			placeholder: {
+				type: String,
+				default: ""
+			},
+			radius: {
+				type: [Number, String],
+				default: 5
+			},
+			clearButton: {
+				type: String,
+				default: "auto"
+			},
+			cancelButton: {
+				type: String,
+				default: "auto"
+			},
+			cancelText: {
+				type: String,
+				default: ""
+			},
+			bgColor: {
+				type: String,
+				default: "#F8F8F8"
+			},
+			maxlength: {
+				type: [Number, String],
+				default: 100
+			},
+			value: {
+				type: [Number, String],
+				default: ""
+			},
+			modelValue: {
+				type: [Number, String],
+				default: ""
+			},
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				show: false,
+				showSync: false,
+				searchVal: ''
+			}
+		},
+		computed: {
+			cancelTextI18n() {
+				return this.cancelText || t("uni-search-bar.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-search-bar.placeholder")
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal) {
+					this.searchVal = newVal
+					if (newVal) {
+						this.show = true
+					}
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal) {
+					this.searchVal = newVal
+					if (newVal) {
+						this.show = true
+					}
+				}
+			},
+			// #endif
+			focus: {
+				immediate: true,
+				handler(newVal) {
+					if (newVal) {
+						if(this.readonly) return
+						this.show = true;
+						this.$nextTick(() => {
+							this.showSync = true
+						})
+					}
+				}
+			},
+			searchVal(newVal, oldVal) {
+				this.$emit("input", newVal)
+				// #ifdef VUE3
+				this.$emit("update:modelValue", newVal)
+				// #endif
+			}
+		},
+		methods: {
+			searchClick() {
+				if(this.readonly) return
+				if (this.show) {
+					return
+				}
+				this.show = true;
+				this.$nextTick(() => {
+					this.showSync = true
+				})
+			},
+			clear() {
+				this.$emit("clear", {
+					value: this.searchVal
+				})
+				this.searchVal = ""
+			},
+			cancel() {
+				if(this.readonly) return
+				this.$emit("cancel", {
+					value: this.searchVal
+				});
+				this.searchVal = ""
+				this.show = false
+				this.showSync = false
+				// #ifndef APP-PLUS
+				uni.hideKeyboard()
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+			},
+			confirm() {
+				// #ifndef APP-PLUS
+				uni.hideKeyboard();
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				this.$emit("confirm", {
+					value: this.searchVal
+				})
+			},
+			blur() {
+				// #ifndef APP-PLUS
+				uni.hideKeyboard();
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				this.$emit("blur", {
+					value: this.searchVal
+				})
+			},
+			emitFocus(e) {
+				this.$emit("focus", e.detail)
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-searchbar-height: 36px;
+
+	.uni-searchbar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		position: relative;
+		padding: 10px;
+		// background-color: #fff;
+	}
+
+	.uni-searchbar__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		overflow: hidden;
+		position: relative;
+		flex: 1;
+		justify-content: center;
+		flex-direction: row;
+		align-items: center;
+		height: $uni-searchbar-height;
+		padding: 5px 8px 5px 0px;
+	}
+
+	.uni-searchbar__box-icon-search {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 32px;
+		padding: 0 8px;
+		justify-content: center;
+		align-items: center;
+		color: #B3B3B3;
+	}
+
+	.uni-searchbar__box-search-input {
+		flex: 1;
+		font-size: 14px;
+		color: #333;
+	}
+
+	.uni-searchbar__box-icon-clear {
+		align-items: center;
+		line-height: 24px;
+		padding-left: 8px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-searchbar__text-placeholder {
+		font-size: 14px;
+		color: #B3B3B3;
+		margin-left: 5px;
+	}
+
+	.uni-searchbar__cancel {
+		padding-left: 10px;
+		line-height: $uni-searchbar-height;
+		font-size: 14px;
+		color: #333333;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+</style>
--- a/uni_modules/uni-search-bar/package.json
+++ b/uni_modules/uni-search-bar/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-search-bar",
+  "displayName": "uni-search-bar 搜索栏",
+  "version": "1.2.4",
+  "description": "搜索栏组件，通常用于搜索商品、文章等",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "搜索框",
+    "搜索栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/uni-search-bar/readme.md
+++ b/uni_modules/uni-search-bar/readme.md
@@ -0,0 +1,14 @@
+
+
+## SearchBar 搜索栏
+
+> **组件名：uni-search-bar**
+> 代码块： `uSearchBar`
+
+
+搜索栏组件
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
--- a/uni_modules/uni-section/changelog.md
+++ b/uni_modules/uni-section/changelog.md
@@ -0,0 +1,2 @@
+## 0.0.1（2022-07-22）
+- 初始化
--- a/uni_modules/uni-section/components/uni-section/uni-section.vue
+++ b/uni_modules/uni-section/components/uni-section/uni-section.vue
@@ -0,0 +1,167 @@
+<template>
+	<view class="uni-section">
+		<view class="uni-section-header" @click="onClick">
+				<view class="uni-section-header__decoration" v-if="type" :class="type" />
+        <slot v-else name="decoration"></slot>
+
+        <view class="uni-section-header__content">
+          <text :style="{'font-size':titleFontSize,'color':titleColor}" class="uni-section__content-title" :class="{'distraction':!subTitle}">{{ title }}</text>
+          <text v-if="subTitle" :style="{'font-size':subTitleFontSize,'color':subTitleColor}" class="uni-section-header__content-sub">{{ subTitle }}</text>
+        </view>
+
+        <view class="uni-section-header__slot-right">
+          <slot name="right"></slot>
+        </view>
+		</view>
+
+		<view class="uni-section-content" :style="{padding: _padding}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * Section 标题栏
+	 * @description 标题栏
+	 * @property {String} type = [line|circle|square] 标题装饰类型
+	 * 	@value line 竖线
+	 * 	@value circle 圆形
+	 * 	@value square 正方形
+	 * @property {String} title 主标题
+	 * @property {String} titleFontSize 主标题字体大小
+	 * @property {String} titleColor 主标题字体颜色
+	 * @property {String} subTitle 副标题
+	 * @property {String} subTitleFontSize 副标题字体大小
+	 * @property {String} subTitleColor 副标题字体颜色
+	 * @property {String} padding 默认插槽 padding
+	 */
+
+	export default {
+		name: 'UniSection',
+    emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				required: true,
+				default: ''
+			},
+      titleFontSize: {
+        type: String,
+        default: '14px'
+      },
+			titleColor:{
+				type: String,
+				default: '#333'
+			},
+			subTitle: {
+				type: String,
+				default: ''
+			},
+      subTitleFontSize: {
+        type: String,
+        default: '12px'
+      },
+      subTitleColor: {
+        type: String,
+        default: '#999'
+      },
+			padding: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+    computed:{
+      _padding(){
+        if(typeof this.padding === 'string'){
+          return this.padding
+        }
+
+        return this.padding?'10px':''
+      }
+    },
+		watch: {
+			title(newVal) {
+				if (uni.report && newVal !== '') {
+					uni.report('title', newVal)
+				}
+			}
+		},
+    methods: {
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	$uni-primary: #2979ff !default;
+
+	.uni-section {
+		background-color: #fff;
+    .uni-section-header {
+      position: relative;
+      /* #ifndef APP-NVUE */
+      display: flex;
+      /* #endif */
+      flex-direction: row;
+      align-items: center;
+      padding: 12px 10px;
+      font-weight: normal;
+
+      &__decoration{
+        margin-right: 6px;
+        background-color: $uni-primary;
+        &.line {
+          width: 4px;
+          height: 12px;
+          border-radius: 10px;
+        }
+
+        &.circle {
+          width: 8px;
+          height: 8px;
+          border-top-right-radius: 50px;
+          border-top-left-radius: 50px;
+          border-bottom-left-radius: 50px;
+          border-bottom-right-radius: 50px;
+        }
+
+        &.square {
+          width: 8px;
+          height: 8px;
+        }
+      }
+
+      &__content {
+        /* #ifndef APP-NVUE */
+        display: flex;
+        /* #endif */
+        flex-direction: column;
+        flex: 1;
+        color: #333;
+
+        .distraction {
+          flex-direction: row;
+          align-items: center;
+        }
+        &-sub {
+          margin-top: 2px;
+        }
+      }
+
+      &__slot-right{
+        font-size: 14px;
+      }
+    }
+
+    .uni-section-content{
+      font-size: 14px;
+    }
+	}
+</style>
--- a/uni_modules/uni-section/package.json
+++ b/uni_modules/uni-section/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-section",
+  "displayName": "uni-section 标题栏",
+  "version": "0.0.1",
+  "description": "标题栏组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "标题栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-scss"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
--- a/uni_modules/uni-section/readme.md
+++ b/uni_modules/uni-section/readme.md
@@ -0,0 +1,8 @@
+## Section 标题栏
+> **组件名：uni-section**
+> 代码块： `uSection`
+
+uni-section 组件主要用于文章、列表详情等标题展示
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-section)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
--- a/unpackage/debug/android_debug.apk
+++ b/unpackage/debug/android_debug.apk
--- a/utils/music.js
+++ b/utils/music.js
@@ -28,7 +28,6 @@ var music = {
        if(mute){			
            bgm.pause()				
        }else{				
-			
 			// bgm.src = bgm.musicList[bgm.playIndex].url			
 			// 判断播放列表是否空			
 			if(bgm.musicList.length == 0){				
@@ -50,11 +49,21 @@ var music = {
 			// 没有就添加添加url到播放器，播放新的
 			if(bgm.src == ''){	
 				console.log(bgm.playIndex,'播放的索引',store.state.userInfo.playIndex,'播放的时长',store.state.userInfo.playTimes)
-				store.commit('setUserInfo',{'playTitle': bgm.musicList[bgm.playIndex].chapterName})
+				store.commit('setUserInfo',{'playTitle': bgm.musicList[bgm.playIndex].chapter})
 				store.commit('setUserInfo',{'fengImg': bgm.musicList[bgm.playIndex].bookImage})
 				store.commit('setUserInfo',{'playingInfo': bgm.musicList[bgm.playIndex]})
 				console.log(store.state.userInfo,'chapterName',bgm.playIndex)
 				store.state.userInfo.playTimes ? bgm.htimes = store.state.userInfo.playTimes : ''
+				
+				// 设置默认原生播放组件的显示标题和图片
+				// bgm.title = bgm.musicList[bgm.playIndex].chapter
+				bgm.title = '正在播放'
+				console.log('应该显示的title',bgm.musicList[bgm.playIndex].chapter)
+				// bgm.artist = '暂无'
+				//bgm.singer = '暂无'
+				bgm.coverImgUrl = 'https://www.nuttyreading.com/images/logo.png'
+				bgm.image = 'https://www.nuttyreading.com/images/logo.png'
+				
 				this.getChartUrl()	
 				// 获取历史秒数
 				
@@ -64,6 +73,7 @@ var music = {
        }        
        bgm.onPause(()=>{
            console.log('暂停背景音乐');
+			bgm.title = '未在播放'
 			this.saveTimes()
 			clearInterval(bgm.interval)
 			bgm.interval = null
@@ -124,6 +134,12 @@ var music = {
 			this.saveRate(bgm.musicList[bgm.playIndex])
 			// console.log('历史播放进度，秒数', bgm.htimes)
 			bgm.seek(bgm.htimes)
+			bgm.title = '正在播放'
+			console.log('应该显示的title', bgm.musicList[bgm.playIndex].chapter)
+			bgm.artist = '暂无'
+			//bgm.singer = '暂无'
+			bgm.coverImgUrl = 'https://www.nuttyreading.com/images/logo.png'
+			bgm.image = 'https://www.nuttyreading.com/images/logo.png'
 			// console.log(bgm,'bgm')			
 		})
 		bgm.onEnded(() => {		
@@ -133,6 +149,22 @@ var music = {
 			store.commit('setUserInfo',{'playFlag': false})			
 			this.setPlayIndex('next')   // 下一首			
 		}) 
+		bgm.onPrev(() => {
+			console.log('点了上一曲')
+			if(bgm.playIndex - 1 >= 0){
+				this.setPlayIndex('prve')   // 上一首				
+			}else{
+				console.log('没有上一首了')
+			}
+		})
+		bgm.onNext(() => {
+			console.log('点了下一曲')
+			if(bgm.playIndex + 1 <= bgm.musicList.length){
+				this.setPlayIndex('next')   // 下一首				
+			}else{
+				console.log('没有下一首了，到头了')
+			}
+		})
    },
 	// 添加播放列表
 	setList(list,op,playindex,time){
@@ -151,6 +183,7 @@ var music = {
 		if(playindex){			
 			bgm.playIndex = playindex
 			console.log(playindex,'传值了')
+			 
 			if(time){ // 如果传了历史播放秒数
 				bgm.htimes = time				
 			}else{
@@ -162,6 +195,8 @@ var music = {
 			bgm.htimes = 0
 			bgm.playIndex = 0
 		}
+		
+		
 		if(op == 'autoPlay'){
 			store.commit('setUserInfo',{'playTimes': 0})
 			if(bgm._options.src == ''){
@@ -363,6 +398,7 @@ var music = {
 				bgm.playIndex += 1
 				console.log('下一首',bgm.playIndex,bgm.oldIndex, store.state.userInfo.playIndex)
 				// bgm.stop()
+				bgm.htimes = 0
 				this.getChartUrl() // 获取章节url
 				//this.playBgm({'mute':false})
 			    //	store.commit('setUserInfo',{'playFlag': false})
@@ -378,6 +414,7 @@ var music = {
 			bgm.oldIndex = bgm.playIndex
 			bgm.playIndex -= 1		
 			console.log('上一首',bgm.playIndex)
+			bgm.htimes = 0
 			this.getChartUrl() // 获取章节url
 						
 		}
Author	SHA1	Message	Date
@fawn-nine	1065f5cbf6	穴位	2023-11-08 13:36:51 +08:00
@fawn-nine	84fca53ebe	经穴检索	2023-11-07 17:13:44 +08:00
@fawn-nine	454b2803c2	打卡添加分享	2023-11-02 13:12:04 +08:00
@fawn-nine	ef91d4f789	.	2023-11-01 17:41:16 +08:00
@fawn-nine	50b66b6c02	订单完善	2023-11-01 17:08:54 +08:00
@fawn-nine	8da1734b17	发货+兼容苹果	2023-10-31 16:50:02 +08:00
@fawn-nine	0a3bf99719	ios 功能校对	2023-10-30 13:30:51 +08:00
@fawn-nine	75b5c6ae0f	订单发货相关调整	2023-10-27 15:51:16 +08:00
@fawn-nine	cdc801e32f	充值成功跳转到账户页面	2023-10-23 15:31:22 +08:00
@fawn-nine	db265757a0	补卡，图书列表接口替换	2023-10-23 14:57:00 +08:00