打卡签到未购买不可参与打卡

打卡添加分享
.
2023-11-08 13:27:46 +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 · 2023-10-30 13:30:51 +08:00
30 changed files with 24534 additions and 533 deletions
--- a/App.vue
+++ b/App.vue
@@ -17,8 +17,13 @@
 	import updata from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
 	// #endif
 	import Vue from 'vue'
-
+	
 	export default {
+		data(){
+			return{
+				platform:null,  // 系统
+			}
+		},
 		onLaunch: function(e) {
 			// 检测自动更新
 			// #ifdef APP-PLUS
@@ -138,12 +143,11 @@
 				socket.init();
 			}
 			// APPUpdate();
-			// #endif
-
+			// #endif		
+			
 		},
-		onShow: function(e) {
-
-			//	console.log(store.state,'playVisible')
+		onShow: function(e) {			
+					
 			// #ifdef MP-WEIXIN
 			//获取二维码携带的参数
 			let scene = decodeURIComponent(e.query.scene);
@@ -196,8 +200,7 @@
 			})
 			console.log('页面销毁')
 		},
-		methods: {
-
+		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
@@ -6,10 +6,11 @@ if (process.env.NODE_ENV === 'development') {
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "http://59.110.212.44:9200/pb/";
-	// baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
+	baseUrl = "https://testapi.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}$/;
 //邮箱验证正则表达式
 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,23 @@
 						}
 					}
 				}
+        ,{
+            "path" : "pages/bookShop/deliverLIst",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "快递列表",
+                "enablePullDownRefresh": false
+            }
+            
+        },
+        {
+        	"path" : "pages/peanut/chargeDetaill",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "充值详情1",
+        		"enablePullDownRefresh" : false
+        	}
+        }
    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
--- 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 class="time">{{item.acceptTime}}</view>
+								<view class="content">{{item.acceptStation}}</view>
 							</view>
 						</view>
 					</view>
-					</view>
+					
 				</view>
-			</view>
+			</view>			
 		</view>
-		<view class="quesheng" v-else>
-			<image src="../../static/icon/kongbai.png" ></image>
-			<text>- 暂无物流信息 -</text>
+		<view class="quesheng" v-else>			
+			<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']),
@@ -67,7 +81,46 @@
 		components:{
 			musicPlay
 		},
-		methods: {
+		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')
 					})
 			},

@@ -154,8 +217,7 @@
 		.item {
 			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>
 					
@@ -121,7 +123,7 @@
 		</view>
 		<!-- 对话框 -->
 		<u-popup :show="pingjiaShow" :round="10" @close="closePingjia">
-			<view class="tanchu">
+			<view class="tanchu" >
 				<view class="dp_title" v-if="pjType != 'zhuiping'">添加评价</view>
 				<view class="dp_title" v-else>添加追评</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,9 +257,11 @@
 			this.orderSn = e.orderSn
 			console.log(this.orderID,'this.orderID')
 		},
-		
+		onHide() {
+			this.sheetList= []
+		},
 		onShow() {
-			this.getOrderList()
+			this.getOrderList()			
 		},
 		components:{
 			emotion,
@@ -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.orderContet = res.result
+						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,28 +11,30 @@
 		</view>

 		<view class="orderList" v-if="orderList.length > 0">
-			<view class="orderItem" v-for="(ifex,inten) in orderList">
-				<text class="orderState orderState0"  v-if="ifex.orderStatus==0">待支付</text>
+			<view class="orderItem" v-for="(ifex,inten) in orderList" @click="goOrdiCont(ifex)" :key="inten">
+				<text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text>
 				<text class="orderState orderState1" v-if="ifex.orderStatus==1">待发货</text>
 				<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text>
 				<text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text>
 				<text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text>
 				<view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0">
 					<text>剩余支付时间：</text>
-					<uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false" :hour="0" :minute="0" :second="ifex.overTime" @timeup="countDown"></uni-countdown>
+					<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>
 				<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,48 +42,60 @@
 					</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>
 					<br clear="both">
-				</view>				
+				</view>
 				<view class="orderReal">
 					<span style="color: #999; float: left; font-size: 12px;">下单时间：{{ifex.createTime}}</span>
 					<span style="color: #999;margin-right: 10rpx;">实付款 : </span>
-					<span style=" color: #f56c6c;">￥</span><text style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+					<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>
+		<z-navigation></z-navigation>
+		<music-play :playData="playData"></music-play>
 	</view>
 </template>

@@ -90,18 +104,20 @@
 	import $http from '@/config/requestConfig.js';
 	import {
 		setPay,
-		setPayAssign,setWXPay
+		setPayAssign,
+		setWXPay
 	} from '@/config/utils';
-import {
-		mapState,mapMutations
+	import {
+		mapState,
+		mapMutations
 	} from 'vuex';
 	export default {
 		data() {
 			return {
-				playData:{},
+				playData: {},
 				orderTabs: [{
 					name: '全部',
-					value: 9
+					value: null
 				}, {
 					name: '待支付',
 					value: 0
@@ -114,57 +130,90 @@ import {
 				}, {
 					name: '已完成',
 					value: 3
-				},{
+				}, {
 					name: '已超时',
 					value: 5
-				},
-				],
-				orderListTab: 9,
+				}, ],
+				orderListTab: null,
 				orderList: [],
-				iapChannel:{},
-				checking:false,  // 正在检测
-				ComplateRequestArr:null,
-				isAndorid:true
+				iapChannel: {},
+				checking: false, // 正在检测
+				ComplateRequestArr: null,
+				isAndorid: true,
+				status: 3, // 加载状态
+				totalPage: 0,
+				page: 1
 			}
 		},
+		onHide() {
+			this.orderList = [],
+				this.page = 1
+			this.totalPage = 0
+			this.orderListTab = null
+		},
 		onShow() {
 			this.getOrderList()
-			this.checkIapOrders()    //检查未完成的苹果支付订单
+			// this.checkIapOrders() //检查未完成的苹果支付订单
 			this.getOS()
 			// this.countDown()
-			
+
 		},
 		computed: {
 			...mapState(['userInfo']),
 		},
 		// 下拉刷新
 		onPullDownRefresh() {
+			this.orderList = [],
+				this.page = 1
+			this.totalPage = 0
 			this.getOrderList()
 			uni.stopPullDownRefresh()
 		},
-		components:{
-			musicPlay			
+		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.getOrderList()				
+			countDown() {
+				console.log('重新刷新订单')
+				this.totalPage = 0
+				this.page = 1
+				this.orderList = []
+				this.getOrderList()
 			},
 			// 获得操作系统
-			getOS(){
+			getOS() {
 				let oprateOs = ''
 				oprateOs = uni.getSystemInfoSync().platform
 				console.log(oprateOs)
-				if(oprateOs == 'android'){
+				if (oprateOs == 'android') {
 					this.isAndorid = true
-				}else{
+				} else {
 					this.isAndorid = false
 				}
 			},
 			checkIapOrders() {
-				const that = this				
+				const that = this
 				// 如果ios已经绑定支付信息，就直接支付，如果没有绑定，就需要先绑定
 				console.log('检测支付环境...')
 				plus.payment.getChannels((channels) => {
@@ -178,47 +227,81 @@ 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) => {								
-							var seconds = item.timestamp + 30 * 60 + 2    // 过期时间 30分钟+2
+				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);  // 单位秒
+							var nowSeconds = Math.floor(new Date().getTime() / 1000); // 单位秒
 							item.overTime = seconds - nowSeconds
 							// console.log(item.overTime,'item.overTime')
-							
 						})
-						this.orderList = res.page.list
-						console.log(this.orderList,'订单列表')
-					})
+						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) {				
-				uni.navigateTo({
-					url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus + '&orderSn=' + e.orderSn
-				});
+			goOrdiCont(e) {
+				console.log(e, 'e')
+				//let orderId = e.orderId ? e.orderId : e.id
+				if(e.orderType == 'point'){      // 充值订单	
+					console.log('跳转到充值页面')
+					uni.navigateTo({
+						url: '/pages/peanut/chargeDetaill?orderId=' + e.orderId + '&orderSn=' + e.orderSn
+					});
+				}else if(e.orderType == 'order'){	 // 实体订单			
+					uni.navigateTo({
+						url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus  + '&orderSn=' + e.orderSn
+					});
+				}
 			},
-			
+
 			// 跳转到支付页面
-			goPay1(e){	
-				console.log(e,'goPay1')
+			goPay1(e) {
+				console.log(e, 'goPay1')
 				uni.navigateTo({
 					url: '../peanut/reCharge?orderSn=' + e.orderSn
 				});
 			},
-			
+
 			// 取消订单
 			canceOrder(e) {
 				uni.showModal({
@@ -237,6 +320,9 @@ import {
 										icon: 'none',
 										title: '取消订单成功'
 									})
+									this.page = 1
+									this.totalPage = 0
+									this.orderList = []
 									this.getOrderList()
 								})
 						}
@@ -246,91 +332,94 @@ import {

 			// 支付
 			goPay(payItem) {
-				console.log(payItem,'payItem')				
-				if(payItem.paymentMethod == 2){
+				console.log(payItem, 'payItem')
+				if (payItem.paymentMethod == 2) {
 					console.log('阿里支付')
-				setPay({
-					typePay: 'alipay',
-					subject: 'order',
-					totalAmount: payItem.realMoney,
-					type: 2,
-					relevanceoid: payItem.orderSn,
-					customerId: this.userInfo.id,
-				}, res => {
-					if (res.success) {
-						uni.showToast({
-							title: "支付成功"
-						});
-					} else {
-						uni.showToast({
-							title: "支付失败",
-							icon: "none",
-							image: '../../static/icon/ic_close.png'
-						});
-					}
-					this.getOrderList()
-				})
-			} else if(payItem.paymentMethod == 1){
-				console.log('微信支付')
-				// console.log(this.isAndorid)				
-				 if(this.isAndorid == false){
-					 uni.showModal({
-						 title: '提示',
-						 content: '很抱歉，苹果系统暂不支持微信支付',
-						 showCancel:false
-					 })
-					return false
-				 }else{
-					let data1={
-						orderSn:payItem.orderSn,
-						buyOrderId: null,	
-						totalAmount: payItem.realMoney					
-					}
-					console.log(data1,'data1')
-					setWXPay(data1,res => {
+					setPay({
+						typePay: 'alipay',
+						subject: 'order',
+						totalAmount: payItem.realMoney,
+						type: 2,
+						relevanceoid: payItem.orderSn,
+						customerId: this.userInfo.id,
+					}, res => {
 						if (res.success) {
 							uni.showToast({
 								title: "支付成功"
 							});
-						} else {	
-							console.log(res)
-							if(res.data.errMsg.indexOf('User canceled') != -1){
-								uni.showToast({
-									title: "用户取消支付",
-									icon: "none",
-									image: '../../static/icon/ic_close.png'
-								});
-							}else{
+						} else {
 							uni.showToast({
 								title: "支付失败",
 								icon: "none",
 								image: '../../static/icon/ic_close.png'
 							});
-							}
 						}
+						this.orderList = [],
+							this.page = 1
+						this.totalPage = 0
+						this.getOrderList()
 					})
+				} else if (payItem.paymentMethod == 1) {
+					console.log('微信支付')
+					// console.log(this.isAndorid)				
+					if (this.isAndorid == false) {
+						uni.showModal({
+							title: '提示',
+							content: '很抱歉，苹果系统暂不支持微信支付',
+							showCancel: false
+						})
+						return false
+					} else {
+						let data1 = {
+							orderSn: payItem.orderSn,
+							buyOrderId: null,
+							totalAmount: payItem.realMoney
+						}
+						console.log(data1, 'data1')
+						setWXPay(data1, res => {
+							if (res.success) {
+								uni.showToast({
+									title: "支付成功"
+								});
+							} else {
+								console.log(res)
+								if (res.data.errMsg.indexOf('User canceled') != -1) {
+									uni.showToast({
+										title: "用户取消支付",
+										icon: "none",
+										image: '../../static/icon/ic_close.png'
+									});
+								} else {
+									uni.showToast({
+										title: "支付失败",
+										icon: "none",
+										image: '../../static/icon/ic_close.png'
+									});
+								}
+							}
+						})
+					}
+				} else if (payItem.paymentMethod == 3) {
+					// 苹果充值
+					console.log('苹果二次支付')
+					if (this.isAndorid) {
+						uni.showModal({
+							title: '提示',
+							showCancel: false,
+							content: '很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单'
+						})
+					} else {
+						this.iphonepay(payItem)
+					}
 				}
-			}else if(payItem.paymentMethod == 3){
-				// 苹果充值
-				console.log('苹果二次支付')
-				if(this.isAndorid){
-					uni.showModal({
-						title:'提示',
-						showCancel:false,
-						content:'很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单'
-					})
-				}else{
-					this.iphonepay(payItem)
-				}
-			}
 			},
-			iphonepay(payItem) {	
-				console.log(this.userInfo.restoreFlag,'this.userInfo.restoreFlag')
-				if(this.ComplateRequestArr == null || this.ComplateRequestArr == [] ){	
-					this.requestOrder(payItem)						
-				}else{
+			iphonepay(payItem) {
+				console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
+				if (this.ComplateRequestArr == null || this.ComplateRequestArr == []) {
+					this.requestOrder(payItem)
+				} else {
 					uni.showModal({
-						title:'提示',
+						title: '提示',
 						showCancel: false,
 						content: '您的账户存在未完成的支付订单，请稍后重启app留意账户变动。',
 					})
@@ -345,16 +434,16 @@ import {
 				// console.log(productId, 88888888)
 				// ['xxxxx'] 是平台申请拿到的内购商品的id 
 				let IAPOrders = []
-				 IAPOrders.push(payItem.productId+'')
+				IAPOrders.push(payItem.productId + '')
 				console.log(IAPOrders, 'IAPOrders')
-				 // 新建订单
+				// 新建订单
 				that.iapChannel.requestOrder(IAPOrders, function(event) {
 					// uni.hideLoading()
 					console.log(event, 'event')
 					for (var index in event) {
 						var OrderItem = event[index]
 						// console.log(OrderItem, 'OrderItem')
-						console.log(OrderItem.productid,'OrderItem.productid')
+						console.log(OrderItem.productid, 'OrderItem.productid')
 						that.topay(payItem)
 					}
 				}, function(erroemsg) {
@@ -364,97 +453,103 @@ import {
 					})
 				})
 			},
-			topay(payItem) {				
+			topay(payItem) {
 				const that = this
-				uni.hideLoading()	
+				uni.hideLoading()
 				// var restoreFlag = true; // 调用支付接口时标记 restoreFlag = true , 实际应用请将标记存储在 storage 中  
-				this.setUserInfo({restoreFlag:true});
-				console.log(this.userInfo,'更新后的用户信息')				
+				this.setUserInfo({
+					restoreFlag: true
+				});
+				console.log(this.userInfo, '更新后的用户信息')
 				plus.payment.request(that.iapChannel, {
 					productid: payItem.productId,
 					username: payItem.orderSn, // 用户标识/订单标识 					
 					manualFinishTransaction: true // 3.5.1+ 支持，设置此参数后需要开发者主动关闭订单，参见下面的关闭订单方法 finishTransaction()
-					
+
 				}, function(result) {
 					// restoreFlag = false; // 支付成功清除标记 restoreFlag = false 					
 					that.transaction = result
 					// 支付成功，result 为 IAP商品交易信息对象 IAPTransaction 需将返回的支付凭证传给后端进行二次认证  
 					that.iapCheck(result)
 				}, function(e) {
-					if(e.errCode == 2){
+					if (e.errCode == 2) {
 						// 用户未绑定支付方式，app内支付流程结束，系统弹出框引导用户绑定支付方式，此过程将跳转到系统应用 AppStore 进行绑定支付方式，绑定成功同步支付成功，用户成功付款
-						plus.runtime.openURL("https://apps.apple.com/account/billing");
-					}else{
+						// plus.runtime.openURL("https://apps.apple.com/account/billing");
+					} else {
 						// restoreFlag = false; // 支付失败清楚标记					
 						that.finishTransaction(result);
 						//console.log('订单关闭后的用户信息', that.userInfo);
-						 // console.log(e)	
+						// console.log(e)	
 						//console.log(e.message)
 					}
-				});						
-			},			
+				});
+			},
 			// 查询未关闭订单
-			restoreComplateRequest(){				
+			restoreComplateRequest() {
 				let that = this
 				console.log('检测未完成订单')
 				// console.log(that.iapChannel,'this.iapChannel')				
 				that.iapChannel.restoreComplateRequest({
 					manualFinishTransaction: true
-				}, function(results) { 
+				}, function(results) {
 					console.log('进入restoreComplateRequest')
-						// if(!that.checking){
-							// that.checking = true
-							// console.log(that.checking)
-				        // results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证  
-						that.ComplateRequestArr = results
-						console.log(that.ComplateRequestArr,'未完成订单数组')							
-						if(results && results.length>0){							
-						results.map((item,index)=>{
+					// if(!that.checking){
+					// that.checking = true
+					// console.log(that.checking)
+					// results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证  
+					that.ComplateRequestArr = results
+					console.log(that.ComplateRequestArr, '未完成订单数组')
+					if (results && results.length > 0) {
+						results.map((item, index) => {
 							// "0"为正在支付；"1"为支付成功；"2"为支付失败；"3"为支付已恢复。
-							if(item.transactionState == '1'){ 
+							if (item.transactionState == '1') {
 								// 已经支付，但是没有走逻辑的内购订单								
-							    that.iapCheck(item,index)															
-							}else{
+								that.iapCheck(item, index)
+							} else {
 								// 其他状态的内购订单
-								that.finishTransaction(item)	
-								
-							}	
+								that.finishTransaction(item)
+
+							}
 						})
-						}else{
-							this.setUserInfo({restoreFlag:false});
-							console.log('无未处理订单，可以拉起新的支付')
-						}
-						// }
-					});	
-					
-				
+					} else {
+						this.setUserInfo({
+							restoreFlag: false
+						});
+						console.log('无未处理订单，可以拉起新的支付')
+					}
+					// }
+				});
+
+
 			},
 			// 关闭交易订单
-			finishTransaction(trans,index){				
+			finishTransaction(trans, index) {
 				this.iapChannel.finishTransaction(trans, (success) => {
-				      console.log('关闭订单成功',index);
-					  
-					 if(index == this.ComplateRequestArr.length-1){  // 最后一个支付订单
-						this.setUserInfo({restoreFlag:false});	
+					console.log('关闭订单成功', index);
+
+					if (index == this.ComplateRequestArr.length - 1) { // 最后一个支付订单
+						this.setUserInfo({
+							restoreFlag: false
+						});
 						console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
 					}
-					 
-				    }, (fail) => {
-				      console.log('关闭订单失败');
-				    });
+
+				}, (fail) => {
+					console.log('关闭订单失败');
+				});
 			},
-			iapCheck(result,index) {
-				  const that = this
+			iapCheck(result, index) {
+				const that = this
 				console.log('进入后台验证')
 				let data = {
 					transactionId: result.transactionIdentifier, // 支付交易id
-					customerOid: that.userInfo.id, 
+					customerOid: that.userInfo.id,
 					productId: result.payment.productid, // 产品id
 					orderId: result.payment.username, // 系统订单号
-					receiptData: result.transactionReceipt ,// 苹果返回收据
-					loadAnimate:'none', // 请求加载动画
-				}	
-				console.log(data,'data')
+					receiptData: result.transactionReceipt, // 苹果返回收据
+					loadAnimate: 'none', // 请求加载动画
+				}
+				console.log(data, 'data')
 				$http.request({
 					url: "/Ipa/veri",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
@@ -463,54 +558,54 @@ import {
 						'Content-Type': 'application/json'
 					},
 				}).then(res => {
-					console.log(JSON.stringify(res))					
+					console.log(JSON.stringify(res))
 					console.log(res.code)
-					if(res.code == 0){
+					if (res.code == 0) {
 						// uni.hideLoading()
-						console.log('充值订单已处理，请留意账户金额变动....')						
-					// 服务器验证票据有效后在客户端关闭订单
-						that.finishTransaction(result,index)									
-					}else if(res.code == 200){ // 重复验证订单
+						console.log('充值订单已处理，请留意账户金额变动....')
+						// 服务器验证票据有效后在客户端关闭订单
+						that.finishTransaction(result, index)
+					} else if (res.code == 200) { // 重复验证订单
 						console.log('重复验证....')
-						that.finishTransaction(result,index)
+						that.finishTransaction(result, index)
 					}
-				}).catch(e => {					
+				}).catch(e => {
 					console.log('支付验证失败，进入轮询程序...')
-					that.getIapPayResult(result,index)
-				  })
+					that.getIapPayResult(result, index)
+				})
 				console.log('--------------')
 			},
-			
+
 			// 轮询验证支付结果			
-			getIapPayResult(result,index){
+			getIapPayResult(result, index) {
 				// let interval = null
-			this.ComplateRequestInterval = setTimeout(() => {
-					if(this.maxTimes <= 3){
-				    this.iapCheck(result,index)
-					console.log('执行1', this.maxTimes,this.ComplateRequestInterval)
-					this.maxTimes += 1
-					}else{
+				this.ComplateRequestInterval = setTimeout(() => {
+					if (this.maxTimes <= 3) {
+						this.iapCheck(result, index)
+						console.log('执行1', this.maxTimes, this.ComplateRequestInterval)
+						this.maxTimes += 1
+					} else {
 						this.maxTimes = 0
-						console.log('停止轮询', this.maxTimes,this.ComplateRequestInterval, this.maxTimes)
+						console.log('停止轮询', this.maxTimes, this.ComplateRequestInterval, this.maxTimes)
 						this.checking = false
-						this.saveErrorIapOrder(result,index)
+						this.saveErrorIapOrder(result, index)
 						clearTimeout(this.ComplateRequestInterval)
-						
+
 					}
-				},10000)
-				
+				}, 10000)
+
 			},
 			// 轮询失败接口
-			saveErrorIapOrder(result,index){
+			saveErrorIapOrder(result, index) {
 				console.log('提交到充值问题单里面...')
 				let data = {
-					transactionId : result.transactionIdentifier,
+					transactionId: result.transactionIdentifier,
 					failureflag: 1,
-					orderId:result.payment.username,
-					receiptData:result.transactionReceipt,
-					productId:result.payment.productid,
-					customerOid:this.userInfo.id					
-				}				
+					orderId: result.payment.username,
+					receiptData: result.transactionReceipt,
+					productId: result.payment.productid,
+					customerOid: this.userInfo.id
+				}
 				$http.request({
 					url: "Ipa/failure",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
@@ -519,17 +614,17 @@ import {
 						'Content-Type': 'application/json'
 					},
 				}).then(res => {
-					console.log(JSON.stringify(res))					
-					if(res.code == 200){
+					console.log(JSON.stringify(res))
+					if (res.code == 200) {
 						console.log('提交成功，关闭订单')
-						this.finishTransaction(result,index)
+						this.finishTransaction(result, index)
 					}
-				}).catch(e => {					
-					console.log(e)	
-					if(e.statusCode == 0){ // 重复提交，直接关闭订单
-						this.finishTransaction(result,index)
+				}).catch(e => {
+					console.log(e)
+					if (e.statusCode == 0) { // 重复提交，直接关闭订单
+						this.finishTransaction(result, index)
 					}
-				  })
+				})
 			},

 		}
@@ -538,21 +633,32 @@ 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;}
-	.orderTabs { 		
+
+	.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%;		
+		width: 100%;
 		padding: 30rpx 3% 3% 3%;
 		// padding-top: 100rpx;
 		position: fixed;
-		top: 80rpx;		
+		top: 80rpx;
 		background-color: #fff;
 		z-index: 100;

 		view {
-			border-radius: 20rpx; 
-			border:1px solid #d0d0d0 ;
+			border-radius: 20rpx;
+			border: 1px solid #d0d0d0;
 			display: inline-block;
 			padding: 20rpx 0;
 			margin: 0 6rpx;
@@ -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;
-				font-size: 26rpx; 				
+
+			.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;

@@ -663,4 +798,4 @@ import {
 			}
 		}
 	}
-</style>
+</style>
--- 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,8 +189,11 @@
 						</view>
 						<br clear="both">
 					</view>
+					<view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view>
 				</view>
-				<view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view>
+				<view class="" v-else>
+					<u-divider text="暂无可用优惠券哦"></u-divider>
+				</view>				
 			</view>
 		</u-popup>

@@ -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()
 					}
-					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",
+				$http.request({					
+					// 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
@@ -1,5 +1,5 @@
 <template>
-	<view :class="['container', currentDay == linshiDay && taskInfo.id && myword.length == 0 ? 'pb100':'']">
+	<view :class="['container', currentDay == linshiDay && taskInfo.id && myword.length == 0 && bookInfo.isBuy ? 'pb100':'']">
 		<z-nav-bar title="读书打卡"></z-nav-bar>
 		<!-- 仿钉钉打卡日历组件 -->
 		<view class=""
@@ -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,10 +117,11 @@
 								<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>
+											size="18"></u-icon>
 										<text class="time" style="display: inline ;margin-right: 20rpx; ">回复</text>
 									</view>
 									<text class="time">{{item.createTime}}</text>
@@ -126,18 +130,21 @@
 							</view>
 						</view>
 						<!-- 显示追平 -->
-						<view class="zhuiping item" v-if="item.subCommentList.length > 0" style="padding-left: 50px;">							
+						<view class="zhuiping item" v-if="item.subCommentList.length > 0" style="padding-left: 50px;">
 							<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>
+									<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>
 										<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,18 +156,21 @@
 												<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>
-																	
+
 										</view>
-									</view>									
-								</view>								
+									</view>
+								</view>
 							</view>
 						</view>
 					</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">
@@ -190,15 +204,15 @@
 								placeholder-style="font-size:24rpx;color:#aaaaaa;" placeholder="请输入回复内容"></textarea>
 						</view>
 						<view>
-							<u-button type="success" @click="goToHuiFu">提交</u-button>		
+							<u-button type="success" @click="goToHuiFu">提交</u-button>
 						</view>
 					</view>
-		
+
 					<view style="position: relative;">
 						<emotion @emotion="handleEmj" :height="220" v-if="isShowEmj" :windowWidth="windowWidth">
 						</emotion>
 					</view>
-				</view>		
+				</view>
 			</view>
 		</u-popup>
 		<!-- 发布评论弹窗 -->
@@ -240,7 +254,7 @@

 			</view>
 		</u-popup>
-		<view class="leaveBtn" v-if="!addTextShow && currentDay == linshiDay && taskInfo.id && myword.length == 0">
+		<view class="leaveBtn" v-if="!addTextShow && currentDay == linshiDay && taskInfo.id && myword.length == 0 && bookInfo.isBuy">
 			<button style="height: 70rpx; font-size: 28rpx; line-height: 70rpx;" type="primary" plain="true"
 				@click="addTextShow = true">说点什么</button>
 		</view>
@@ -267,8 +281,9 @@
 	export default {
 		data() {
 			return {
-				opPinglun:{},     // 针对的评论对象
-				pinglunShow:false,
+				isAndorid:true,
+				opPinglun: {}, // 针对的评论对象
+				pinglunShow: false,
 				placeholder: '开始输入...',
 				dayCurrent: 0, // 载入页面时的显示页数
 				showBack: false,
@@ -328,21 +343,22 @@
 						}]
 					},
 				},
-				recordPageSize:20,
-				recordPage:1,
-				secondPage:1,
-				
+				recordPageSize: 20,
+				recordPage: 1,
+				secondPage: 1,
+
 			}
 		},
 		onLoad(e) {
 			this.bookid = e.bookid
 			this.windowWidth = uni.getSystemInfoSync().windowWidth;
+			this.getOS()	
 		},
 		onPullDownRefresh() {
 			console.log('下拉刷新了')
 			this.getBookInfo()
 			this.initDay()
-			this.getmySign()		
+			this.getmySign()
 			uni.stopPullDownRefresh();
 		},
 		onShow() {
@@ -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
@@ -379,7 +450,11 @@
 			// 获取书籍信息
 			getBookInfo() {
 				this.$http
-					.post('book/book/appinfo/' + this.bookid + '/' + this.userInfo.id)
+					// .post('book/book/appinfo/' + this.bookid + '/' + this.userInfo.id)
+					.post('book/book/getBookInfo', {
+						'bookId': this.bookid,
+						'userId': this.userInfo.id
+					})
 					.then(res => {
 						if (res.code == 0) {
 							console.log(res, 'res')
@@ -436,9 +511,9 @@
 				console.log(url)
 				uni.previewImage({
 					urls: [url],
-					longPressActions:{
-						itemList:['很抱歉，暂不支持保存图片到本地'],
-						success:function(res){
+					longPressActions: {
+						itemList: ['很抱歉，暂不支持保存图片到本地'],
+						success: function(res) {
 							// console.log(res,'+++++')
 						}
 					}
@@ -491,7 +566,7 @@
 				this.$http
 					// .post('book/clockin/myinfolist?userid=' + this.userInfo.id + '&taskid=' + this.taskInfo.id +
 					// 	'&bookid=' + this.bookid)
-					
+
 					.get('book/clockInForum/getChatList', data)
 					.then(res => {
 						console.log(res, '当天我的打卡内容')
@@ -530,15 +605,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)
+				}
+				this.$http
+					// .post('book/clockin/applist', data)
+					.get('book/clockInForum/getChatList', data)
 					// .get('book/clockInForum/getChatList', data)
 					.then(res => {
 						if (res.code == 0) {
@@ -553,14 +629,14 @@
 									// console.log(pjstr,'pjstr')									
 									//arr1 = arr[i].images.split(',')
 									// arr[i].images = arr1
-									arr[i].phtml = pjstr									
+									arr[i].phtml = pjstr
 									for (var j = 0; j < arr[i].subCommentList.length; j++) {
 										var subpjstr = ''
 										subpjstr = this.getHtmlComment(arr[i].subCommentList[j].content)
 										arr[i].subCommentList[j].phtml = subpjstr
 									}
 								}
-								console.log(arr,'评论处理后的数据结构')
+								console.log(arr, '评论处理后的数据结构')
 								this.commentsList = arr
 							} else {
 								this.commentsList = []
@@ -602,45 +678,62 @@
 						uni.hideLoading()
 					})
 			},
+			gotoBuy(){
+				let that = this
+					uni.showModal({
+						title: '提示',						
+						content: '购买本书后方可参与打卡',
+						confirmText:'立即购买',
+						cancelText:'知道了',
+						success: function (res) {
+							if (res.confirm) {
+								console.log(that.bookInfo,'that.bookInfo');
+								uni.navigateTo({
+									url: '../bookShop/commodityDetail?id=' + that.bookInfo.productId					
+								});
+							} 
+						}
+					});
+			},
 			// 补卡
 			buSign(day) {
-				console.log('正在补卡', this.taskInfo,day)
-				// return false
-				// if (!this.taskInfo.id) {
-				// 	uni.showToast({
-				// 		title: '当天未发布打卡任务，不可补卡哦',
-				// 		icon: 'none'
-				// 	})
-				// 	return
-				// }
+				console.log('正在补卡', this.taskInfo, day)
+				if(!this.bookInfo.isBuy){
+					this.gotoBuy()
+					return
+				}
 				let param = {
 					'bookId': this.bookid,
-					'userId':this.userInfo.id,
-					'day':day
+					'userId': this.userInfo.id,
+					'day': day
 				}
-				 console.log(param, 'param')
-				this.$http								
-				.get('/book/userClockIn/correctClockIn', param)
-				.then(res => {
-					if (res.code == 0) {
-						//console.log(res, '快捷签到')
-						uni.showToast({
-							title: '补卡成功'
-						})
-						setTimeout(()=>{
-							this.addTextShow = false
-							this.formData.content = ''
-							this.formData.images = []
-							this.getmySign()
-						//	this.getAllSign(this.taskInfo)
-						},2000)
-						
-					}
+				console.log(param, 'param')
+				this.$http
+					.get('/book/userClockIn/correctClockIn', param)
+					.then(res => {
+						if (res.code == 0) {
+							//console.log(res, '快捷签到')
+							uni.showToast({
+								title: '补卡成功'
+							})
+							setTimeout(() => {
+								this.addTextShow = false
+								this.formData.content = ''
+								this.formData.images = []
+								this.getmySign()
+								//	this.getAllSign(this.taskInfo)
+							}, 2000)

-				});
+						}
+
+					});
 			},
 			// 快捷签到
 			kuickSign() {
+				if(!this.bookInfo.isBuy){
+					this.gotoBuy()	
+					return
+				}

 				if (!this.taskInfo.id) {
 					uni.showToast({
@@ -678,11 +771,11 @@

 			},
 			// 提交回复评论
-			goToHuiFu(){
+			goToHuiFu() {
 				let myFid = null
-				if(this.opPinglun.fid == 0){
+				if (this.opPinglun.fid == 0) {
 					myFid = this.opPinglun.id
-				}else if (this.opPinglun.fid != 0){
+				} else if (this.opPinglun.fid != 0) {
 					myFid = this.opPinglun.fid
 				}
 				let data = {
@@ -708,7 +801,7 @@
 						'Content-Type': 'application/json'
 					},
 				}).then(res => {
-					
+
 					if (res.code == 0) {
 						this.pinglunShow = false
 						this.opPinglun = {}
@@ -719,25 +812,25 @@
 							title: '回复成功',
 							icon: 'success'
 						})
-						setTimeout(() => {							
+						setTimeout(() => {
 							this.getmySign()
 							this.getTask(this.currentDay)
-						},2000)
+						}, 2000)
 					}
-				
+
 				});
 			},
 			// 说点什么
-			goToSign() {
+			goToSign() {				
 				// images数据处理
-				if(this.formData.images.length > 0){
+				if (this.formData.images.length > 0) {
 					var imgs = []
 					imgs = this.formData.images.map(item => {
 						return item.url

 					})
 				}
-				if(this.formData.content == ''){
+				if (this.formData.content == '') {
 					uni.showToast({
 						title: '请输入内容',
 						icon: 'none'
@@ -780,7 +873,7 @@
 						setTimeout(() => {
 							this.getmySign()
 							this.getTask(this.currentDay)
-						},2000)						
+						}, 2000)

 					}

@@ -911,7 +1004,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;
 	}
@@ -959,7 +1058,7 @@
 			float: right;
 		}
 	}
-	
+
 	.touxiang {
 		width: 50px;
 		overflow: hidden;
@@ -981,10 +1080,18 @@
 			margin-top: 6rpx;
 		}
 	}
-	.subPItem{margin-bottom: 40rpx;}
-	.subPName{padding-left: 10rpx;}
-	.zhuipingTX{
+
+	.subPItem {
+		margin-bottom: 40rpx;
+	}
+
+	.subPName {
+		padding-left: 10rpx;
+	}
+
+	.zhuipingTX {
 		width: 100%;
+
 		image {
 			width: 30px !important;
 			padding: 3px;
@@ -995,6 +1102,7 @@
 			;
 		}
 	}
+
 	.allComments {
 		background-color: #fff;
 		margin-top: 20rpx;
@@ -1313,7 +1421,7 @@
 		}

 		.txt {
-			font-size: 24rpx;
+			font-size: 28rpx;
 			margin-top: 30rpx;
 			color: #666;
 			line-height: 50rpx;
--- a/pages/clock/index.vue
+++ b/pages/clock/index.vue
@@ -74,7 +74,7 @@
 			getfreeBook(){
 				if(this.contentShow == 1){
 				//	this.$http.post('book/clockinPunch/myClockBooks', {	
-					this.$http.post('book/clock/getUserClockBooks', {		
+					this.$http.post('book/clock/getUserClockBooks', {						
 						'userId': this.userInfo.id,	
 						limit: 100,
 						page:1,
--- 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
@@ -321,7 +321,7 @@
 		},
 		// 页面加载完毕
 		onReady() {
-			this.requestIapOrder()
+			// this.requestIapOrder()
 		},
 		// 下拉刷新
 		onPullDownRefresh() {
@@ -329,8 +329,9 @@
 			this.tjProList = []
 			this.getData()
 			this.getTags()
+			// this.requestIapOrder()	
 			uni.stopPullDownRefresh()
-			this.requestIapOrder()			
+					
 		},
 		onReachBottom() {
 			this.loadingNow = true
@@ -476,17 +477,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'){ 
--- 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>

@@ -132,14 +132,19 @@
 				signShow: false,
 				signContent: '是否要退出登录？',
 				playData:{},
-				isAndorid:true,
+				isAndorid:true,	
+				platform : null, // 设备系统
 			};
 		},
 		//第一次加载
 		onLoad(e) {
 			// 隐藏原生的tabbar
-			uni.hideTabBar();
-			this.getOS()
+			uni.hideTabBar();			
+			// #ifdef APP-PLUS
+			this.getOS()			
+			this.platform = uni.getSystemInfoSync().platform
+			// console.log('操纵系统',this.platform)
+			// #endif
 		},
 		computed: {
 			...mapState(['userInfo'])
@@ -157,7 +162,7 @@
 		methods: {
 			// 获得操作系统
 			getOS(){
-				let oprateOs = ''
+				let oprateOs = ''				
 				oprateOs = uni.getSystemInfoSync().platform
 				// console.log(oprateOs)
 				if(oprateOs == 'android'){
@@ -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
@@ -156,7 +156,12 @@
 			// 隐藏原生的tabbar
 			// this.iphonepay()
 			uni.hideTabBar();
-			this.getDevName()		  
+			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");
@@ -376,10 +382,8 @@
 				this.iphonepay()
 			},
 			// 充值
-			goToPay(){
-				
-					this.kaiChar()					
-				
+			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
@@ -20,9 +20,8 @@
 				<u-form-item label="所在地区 :" prop="">
 					<view class="add_arrow" @click="addreShow=true">{{addressForm.areaidpathtext}}</view>
 					<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName"
-						@confirm="addconfirm" @change="changeHandler"></u-picker>
-				</u-form-item>
-
+						@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,9 +137,10 @@
 				this.getAddress()
 			}
 			this.initDataPicker() //初始化省份列表
+			
 		},
 		onShow() {
-
+		
 		},
 		computed: {
 			...mapState(['userInfo']),
@@ -142,15 +151,15 @@
 		components:{
 			musicPlay	
 		},
-		methods: {
+		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, //当前选择的列，省 / 市 / 区
@@ -253,7 +265,8 @@
 				} = e;
 				// 当第一列值发生变化时，变化第二列和第三列的值（省份变更，市和区跟着变更）
 				if (columnIndex === 0) { // 判断当前变更的是省还是市还是区
-					// picker为选择器this实例，变化第二列对应的选项
+					// 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/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: '天医币',
 				}, {
@@ -147,8 +150,7 @@
 					color: '#54a966',
 				},
 			};
-		},
-
+		},		
 		// 返回顶部
 		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/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/unpackage/debug/android_debug.apk
+++ b/unpackage/debug/android_debug.apk
--- a/utils/music.js
+++ b/utils/music.js
@@ -27,8 +27,7 @@ var music = {
        if (!bgm) return;
        if(mute){			
            bgm.pause()				
-        }else{	
-			
+        }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
@@ -123,7 +133,13 @@ var music = {
 			 this.saveIndex()
 			this.saveRate(bgm.musicList[bgm.playIndex])
 			// console.log('历史播放进度，秒数', bgm.htimes)
-			bgm.seek(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 == ''){
@@ -232,7 +267,7 @@ var music = {
 			 $http.post('book/bookchaptercontent/getBooksCatalogue', data)
 			// $http.post('book/bookchaptercontent/getCatal', data)
 			.then(res => {
-				console.log(res,'鉴权结果')				
+				console.log(res,'鉴权结果')	
 				if(res.code == 0){
 					if(res.jq==false ){
 						store.commit('setUserInfo',{'playFlag': false})
@@ -277,7 +312,7 @@ var music = {
 						// 先清除定时器
 						clearInterval(bgm.interval)
 						bgm.interval = null
-						bgm.src = res.chapter.voices						
+						bgm.src = res.chapter.voices 
 						store.commit('setUserInfo',{'playIndex': bgm.playIndex})
 						store.commit('setUserInfo',{'playingInfo':bgm.musicList[bgm.playIndex] })
 					}else{	
@@ -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	d41853aed7	打卡签到未购买不可参与打卡	2023-11-08 13:27:46 +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