From 79fb0c430f431007bd829094c15b58f4090870c6 Mon Sep 17 00:00:00 2001
From: yanwenlong <yanwenlong@quesoar.com>
Date: Mon, 20 Nov 2023 14:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bookShop/orderList copy.vue |  801 +++++++++++++++++
 pages/bookShop/orderList.vue      | 1397 +++++++++++++++--------------
 pages/bookShop/orderList1.vue     |  624 +++++++++++++
 3 files changed, 2147 insertions(+), 675 deletions(-)
 create mode 100644 pages/bookShop/orderList copy.vue
 create mode 100644 pages/bookShop/orderList1.vue

diff --git a/pages/bookShop/orderList copy.vue b/pages/bookShop/orderList copy.vue
new file mode 100644
index 0000000..8478adf
--- /dev/null
+++ b/pages/bookShop/orderList copy.vue	
@@ -0,0 +1,801 @@
+<template>
+	<view>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<!-- <z-nav-bar title="我的订单"></z-nav-bar> -->
+		<z-nav-bar backState="2000" title="我的订单"></z-nav-bar>
+
+		<view class="orderTabs flexbox">
+			<view v-for="(item,index) in orderTabs" @click="orderTabCLi(item.value)"
+				:class="orderListTab==item.value?'ordStyle':''">{{item.name}}</view>
+		</view>
+
+		<view class="orderList" v-if="orderList.length > 0">
+			<view class="orderItem" v-for="(ifex,inten) in orderList" @click="goOrdiCont(ifex)" :key="inten">
+				<text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text>
+				<text class="orderState orderState1" v-if="ifex.orderStatus==1">待发货</text>
+				<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text>
+				<text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text>
+				<text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text>
+				<view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0">
+					<text>剩余支付时间：</text>
+					<uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false"
+						:hour="0" :minute="0" :second="ifex.overTime" @timeup="countDown"></uni-countdown>
+				</view>
+				<view class="flexbox orderSn">
+					<text class="">订单编号: {{ifex.orderSn}}</text>
+				</view>
+				<view class="orderContent" :key="index" v-if="ifex.orderType=='order'"
+					v-for="(item,index) in ifex.productList">
+					<image :src="item.product.productImages" mode=""></image>
+					<view class="itemJian">
+						<view class="orderTitle">
+							<text>{{item.product.productName}}</text>
+						</view>
+						<view class="orderPrice">
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{item.product.price}}</text><br>
+							<text style="color: #bbbbbb;font-size: 20rpx;margin-right: 10rpx;">X</text>
+							<text style="color: #bbbbbb;">{{item.quantity}}</text>
+						</view>
+						<br clear="both">
+					</view>
+					<br clear="both">
+				</view>
+				<view class="orderContent" v-if="ifex.orderType=='point'" @click.stop="goOrdiCont(ifex)">
+					<image src="../../static/icon/oder_chong.png" mode="" style="height: 150rpx;"></image>
+					<view class="itemJian">
+						<view class="orderTitle">
+							<text>天医币充值</text>
+						</view>
+						<view class="orderPrice">
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+						</view>
+						<br clear="both">
+					</view>
+					<br clear="both">
+				</view>
+				<view class="orderContent" v-if="ifex.orderType=='vip'" @click.stop="goOrdiCont(ifex)">
+					<image src="../../static/icon/oder_vip.png" mode="" style="height: 150rpx;"></image>
+					<view class="itemJian">
+						<view class="orderTitle">
+							<text>会员充值</text>
+						</view>
+						<view class="orderPrice">
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+						</view>
+						<br clear="both">
+					</view>
+					<br clear="both">
+				</view>
+				<view class="orderReal">
+					<span style="color: #999; float: left; font-size: 12px;">下单时间：{{ifex.createTime}}</span>
+					<span style="color: #999;margin-right: 10rpx;">实付款 : </span>
+					<span style=" color: #f56c6c;">￥</span><text
+						style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+				</view>
+				<view class="orderOper" v-if="ifex.orderStatus==0">
+					<view class="opFix" @click.stop = "canceOrder(ifex)">取消订单</view>
+					<view class="opCan" @click.stop = "getNewIap" v-if="ifex.orderType == 'point' && ifex.paymentMethod == '3'">重新下单</view>
+					<view class="opCan" v-else @click.stop = "goPay(ifex)">去支付</view>
+					
+				</view>
+			</view>
+			<view v-if="status==0" style="text-align: center;">
+				<u-loading-icon style="display: inline-block;"></u-loading-icon>
+				<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+			</view>
+			<view v-if="status==1" style="padding-bottom: 20rpx;">
+				<u-divider text="全部加载完成"></u-divider>
+			</view>
+		</view>
+		<view class="" v-else style=" margin-top: 250rpx;">
+			<u-divider text="暂无订单数据"></u-divider>
+		</view>
+		<z-navigation></z-navigation>
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	import {
+		setPay,
+		setPayAssign,
+		setWXPay
+	} from '@/config/utils';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				playData: {},
+				orderTabs: [{
+					name: '全部',
+					value: null
+				}, {
+					name: '待支付',
+					value: 0
+				}, {
+					name: '待发货',
+					value: 1
+				}, {
+					name: '待收货',
+					value: 2
+				}, {
+					name: '已完成',
+					value: 3
+				}, {
+					name: '已超时',
+					value: 5
+				}, ],
+				orderListTab: null,
+				orderList: [],
+				iapChannel: {},
+				checking: false, // 正在检测
+				ComplateRequestArr: null,
+				isAndorid: true,
+				status: 3, // 加载状态
+				totalPage: 0,
+				page: 1
+			}
+		},
+		onHide() {
+			this.orderList = [],
+				this.page = 1
+			this.totalPage = 0
+			this.orderListTab = null
+		},
+		onShow() {
+			this.getOrderList()
+			// this.checkIapOrders() //检查未完成的苹果支付订单
+			this.getOS()
+			// this.countDown()
+
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.orderList = [],
+				this.page = 1
+			this.totalPage = 0
+			this.getOrderList()
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			console.log('到底了')
+			if (this.page < this.totalPage) {
+				this.page++
+				//	console.log('加载',this.page)
+				this.status = 0
+				this.getOrderList()
+			} else {
+				this.status = 1
+				console.log('加载完成了', this.page)
+				return
+			}
+		},
+		components: {
+			musicPlay
+		},
+		methods: {
+			...mapMutations(['setUserInfo']),
+			// 苹果用户重新下单
+			getNewIap(){
+				uni.navigateTo({
+					url:'/pages/peanut/reCharge'
+				})
+			},
+			// 倒计时回调
+			countDown() {
+				console.log('重新刷新订单')
+				this.totalPage = 0
+				this.page = 1
+				this.orderList = []
+				this.getOrderList()
+			},
+			// 获得操作系统
+			getOS() {
+				let oprateOs = ''
+				oprateOs = uni.getSystemInfoSync().platform
+				console.log(oprateOs)
+				if (oprateOs == 'android') {
+					this.isAndorid = true
+				} else {
+					this.isAndorid = false
+				}
+			},
+			checkIapOrders() {
+				const that = this
+				// 如果ios已经绑定支付信息，就直接支付，如果没有绑定，就需要先绑定
+				console.log('检测支付环境...')
+				plus.payment.getChannels((channels) => {
+					console.log(channels, 'channels')
+					for (var i in channels) {
+						// 判断是否苹果支付1
+						if (channels[i].id === 'appleiap') {
+							that.iapChannel = channels[i]
+							that.restoreComplateRequest() //  检查未关闭订单
+							// that.requestOrder(productId)							
+						}
+					}
+				})
+
+			},
+			// 切换订单状态
+			orderTabCLi(e) {
+				this.orderListTab = e
+				this.totalPage = 0
+				this.page = 1
+				this.orderList = []
+				this.getOrderList()
+			},
+
+			// 获取订单列表
+			getOrderList() {
+				let data = {
+					"userId": "",
+					"orderStatus": this.orderListTab,
+					"page": this.page,
+					"limit": 10,
+					'userId': this.userInfo.id
+				}
+
+				$http.request({
+					// url: "book/buyOrder/orderList",
+					url: "book/buyOrder/getUserOrderList",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					if (res.code == 0) {
+						res.page.records.forEach((item, index) => {
+							var seconds = item.timestamp + 30 * 60 + 2 // 过期时间 30分钟+2
+							// var seconds = item.timestamp + 30 + 2    // 过期时间 30秒
+							var nowSeconds = Math.floor(new Date().getTime() / 1000); // 单位秒
+							item.overTime = seconds - nowSeconds
+							// console.log(item.overTime,'item.overTime')
+						})
+						this.orderList = this.orderList.concat(res.page.records)
+						this.totalPage = res.page.pages
+						if (res.page.pages == this.page) {
+							this.status = 1
+						} else {
+							this.status = 3
+						}
+						console.log(this.orderList, '订单列表')
+					}
+				})
+
+			},
+
+			// 订单详情
+			goOrdiCont(e) {
+				console.log(e, 'e')
+				//let orderId = e.orderId ? e.orderId : e.id
+				if(e.orderType == 'point'){      // 充值订单	
+					console.log('跳转到充值页面')
+					uni.navigateTo({
+						url: '/pages/peanut/chargeDetaill?orderId=' + e.orderId + '&orderSn=' + e.orderSn
+					});
+				}else if(e.orderType == 'order'){	 // 实体订单			
+					uni.navigateTo({
+						url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus  + '&orderSn=' + e.orderSn
+					});
+				}
+			},
+
+			// 跳转到支付页面
+			goPay1(e) {
+				console.log(e, 'goPay1')
+				uni.navigateTo({
+					url: '../peanut/reCharge?orderSn=' + e.orderSn
+				});
+			},
+
+			// 取消订单
+			canceOrder(e) {
+				uni.showModal({
+					title: '提示',
+					content: '确定要取消订单吗？',
+					confirmText: "取消订单",
+					cancelText: "考虑一下",
+					confirmColor: '#c96713',
+					cancelColor: '#555',
+					success: res => {
+						if (res.confirm) {
+							this.$http
+								.post(`book/buyOrder/appDelete?orderId=${e.orderId}`)
+								.then(res => {
+									uni.showToast({
+										icon: 'none',
+										title: '取消订单成功'
+									})
+									this.page = 1
+									this.totalPage = 0
+									this.orderList = []
+									this.getOrderList()
+								})
+						}
+					}
+				});
+			},
+
+			// 支付
+			goPay(payItem) {
+				console.log(payItem, 'payItem')
+				if (payItem.paymentMethod == 2) {
+					console.log('阿里支付')
+					setPay({
+						typePay: 'alipay',
+						subject: 'order',
+						totalAmount: payItem.realMoney,
+						type: 2,
+						relevanceoid: payItem.orderSn,
+						customerId: this.userInfo.id,
+					}, res => {
+						if (res.success) {
+							uni.showToast({
+								title: "支付成功"
+							});
+						} else {
+							uni.showToast({
+								title: "支付失败",
+								icon: "none",
+								image: '../../static/icon/ic_close.png'
+							});
+						}
+						this.orderList = [],
+							this.page = 1
+						this.totalPage = 0
+						this.getOrderList()
+					})
+				} else if (payItem.paymentMethod == 1) {
+					console.log('微信支付')
+					// console.log(this.isAndorid)				
+					if (this.isAndorid == false) {
+						uni.showModal({
+							title: '提示',
+							content: '很抱歉，苹果系统暂不支持微信支付',
+							showCancel: false
+						})
+						return false
+					} else {
+						let data1 = {
+							orderSn: payItem.orderSn,
+							buyOrderId: null,
+							totalAmount: payItem.realMoney
+						}
+						console.log(data1, 'data1')
+						setWXPay(data1, res => {
+							if (res.success) {
+								uni.showToast({
+									title: "支付成功"
+								});
+							} else {
+								console.log(res)
+								if (res.data.errMsg.indexOf('User canceled') != -1) {
+									uni.showToast({
+										title: "用户取消支付",
+										icon: "none",
+										image: '../../static/icon/ic_close.png'
+									});
+								} else {
+									uni.showToast({
+										title: "支付失败",
+										icon: "none",
+										image: '../../static/icon/ic_close.png'
+									});
+								}
+							}
+						})
+					}
+				} else if (payItem.paymentMethod == 3) {
+					// 苹果充值
+					console.log('苹果二次支付')
+					if (this.isAndorid) {
+						uni.showModal({
+							title: '提示',
+							showCancel: false,
+							content: '很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单'
+						})
+					} else {
+						this.iphonepay(payItem)
+					}
+				}
+			},
+			iphonepay(payItem) {
+				console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
+				if (this.ComplateRequestArr == null || this.ComplateRequestArr == []) {
+					this.requestOrder(payItem)
+				} else {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '您的账户存在未完成的支付订单，请稍后重启app留意账户变动。',
+					})
+				}
+			},
+			requestOrder(payItem) {
+				uni.showLoading({
+					title: '获取商品信息',
+					mask: true
+				})
+				const that = this
+				// console.log(productId, 88888888)
+				// ['xxxxx'] 是平台申请拿到的内购商品的id 
+				let IAPOrders = []
+				IAPOrders.push(payItem.productId + '')
+				console.log(IAPOrders, 'IAPOrders')
+				// 新建订单
+				that.iapChannel.requestOrder(IAPOrders, function(event) {
+					// uni.hideLoading()
+					console.log(event, 'event')
+					for (var index in event) {
+						var OrderItem = event[index]
+						// console.log(OrderItem, 'OrderItem')
+						console.log(OrderItem.productid, 'OrderItem.productid')
+						that.topay(payItem)
+					}
+				}, function(erroemsg) {
+					uni.showToast({
+						title: "商品获取失败",
+						icon: 'none'
+					})
+				})
+			},
+			topay(payItem) {
+				const that = this
+				uni.hideLoading()
+				// var restoreFlag = true; // 调用支付接口时标记 restoreFlag = true , 实际应用请将标记存储在 storage 中  
+				this.setUserInfo({
+					restoreFlag: true
+				});
+				console.log(this.userInfo, '更新后的用户信息')
+				plus.payment.request(that.iapChannel, {
+					productid: payItem.productId,
+					username: payItem.orderSn, // 用户标识/订单标识 					
+					manualFinishTransaction: true // 3.5.1+ 支持，设置此参数后需要开发者主动关闭订单，参见下面的关闭订单方法 finishTransaction()
+
+				}, function(result) {
+					// restoreFlag = false; // 支付成功清除标记 restoreFlag = false 					
+					that.transaction = result
+					// 支付成功，result 为 IAP商品交易信息对象 IAPTransaction 需将返回的支付凭证传给后端进行二次认证  
+					that.iapCheck(result)
+				}, function(e) {
+					if (e.errCode == 2) {
+						// 用户未绑定支付方式，app内支付流程结束，系统弹出框引导用户绑定支付方式，此过程将跳转到系统应用 AppStore 进行绑定支付方式，绑定成功同步支付成功，用户成功付款
+						// plus.runtime.openURL("https://apps.apple.com/account/billing");
+					} else {
+						// restoreFlag = false; // 支付失败清楚标记					
+						that.finishTransaction(result);
+						//console.log('订单关闭后的用户信息', that.userInfo);
+						// console.log(e)	
+						//console.log(e.message)
+					}
+				});
+			},
+			// 查询未关闭订单
+			restoreComplateRequest() {
+				let that = this
+				console.log('检测未完成订单')
+				// console.log(that.iapChannel,'this.iapChannel')				
+				that.iapChannel.restoreComplateRequest({
+					manualFinishTransaction: true
+				}, function(results) {
+					console.log('进入restoreComplateRequest')
+					// if(!that.checking){
+					// that.checking = true
+					// console.log(that.checking)
+					// results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证  
+					that.ComplateRequestArr = results
+					console.log(that.ComplateRequestArr, '未完成订单数组')
+					if (results && results.length > 0) {
+						results.map((item, index) => {
+							// "0"为正在支付；"1"为支付成功；"2"为支付失败；"3"为支付已恢复。
+							if (item.transactionState == '1') {
+								// 已经支付，但是没有走逻辑的内购订单								
+								that.iapCheck(item, index)
+							} else {
+								// 其他状态的内购订单
+								that.finishTransaction(item)
+
+							}
+						})
+					} else {
+						this.setUserInfo({
+							restoreFlag: false
+						});
+						console.log('无未处理订单，可以拉起新的支付')
+					}
+					// }
+				});
+
+
+			},
+			// 关闭交易订单
+			finishTransaction(trans, index) {
+				this.iapChannel.finishTransaction(trans, (success) => {
+					console.log('关闭订单成功', index);
+
+					if (index == this.ComplateRequestArr.length - 1) { // 最后一个支付订单
+						this.setUserInfo({
+							restoreFlag: false
+						});
+						console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
+					}
+
+				}, (fail) => {
+					console.log('关闭订单失败');
+				});
+			},
+			iapCheck(result, index) {
+				const that = this
+				console.log('进入后台验证')
+				let data = {
+					transactionId: result.transactionIdentifier, // 支付交易id
+					customerOid: that.userInfo.id,
+					productId: result.payment.productid, // 产品id
+					orderId: result.payment.username, // 系统订单号
+					receiptData: result.transactionReceipt, // 苹果返回收据
+					loadAnimate: 'none', // 请求加载动画
+				}
+				console.log(data, 'data')
+				$http.request({
+					url: "/Ipa/veri",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(JSON.stringify(res))
+					console.log(res.code)
+					if (res.code == 0) {
+						// uni.hideLoading()
+						console.log('充值订单已处理，请留意账户金额变动....')
+						// 服务器验证票据有效后在客户端关闭订单
+						that.finishTransaction(result, index)
+					} else if (res.code == 200) { // 重复验证订单
+						console.log('重复验证....')
+						that.finishTransaction(result, index)
+					}
+				}).catch(e => {
+					console.log('支付验证失败，进入轮询程序...')
+					that.getIapPayResult(result, index)
+				})
+				console.log('--------------')
+			},
+
+			// 轮询验证支付结果			
+			getIapPayResult(result, index) {
+				// let interval = null
+				this.ComplateRequestInterval = setTimeout(() => {
+					if (this.maxTimes <= 3) {
+						this.iapCheck(result, index)
+						console.log('执行1', this.maxTimes, this.ComplateRequestInterval)
+						this.maxTimes += 1
+					} else {
+						this.maxTimes = 0
+						console.log('停止轮询', this.maxTimes, this.ComplateRequestInterval, this.maxTimes)
+						this.checking = false
+						this.saveErrorIapOrder(result, index)
+						clearTimeout(this.ComplateRequestInterval)
+
+					}
+				}, 10000)
+
+			},
+			// 轮询失败接口
+			saveErrorIapOrder(result, index) {
+				console.log('提交到充值问题单里面...')
+				let data = {
+					transactionId: result.transactionIdentifier,
+					failureflag: 1,
+					orderId: result.payment.username,
+					receiptData: result.transactionReceipt,
+					productId: result.payment.productid,
+					customerOid: this.userInfo.id
+				}
+				$http.request({
+					url: "Ipa/failure",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(JSON.stringify(res))
+					if (res.code == 200) {
+						console.log('提交成功，关闭订单')
+						this.finishTransaction(result, index)
+					}
+				}).catch(e => {
+					console.log(e)
+					if (e.statusCode == 0) { // 重复提交，直接关闭订单
+						this.finishTransaction(result, index)
+					}
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+
+	.guoqi {
+		font-size: 28rpx;
+		align-items: center;
+		color: red;
+		float: right;
+		line-height: 40rpx;
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.orderTabs {
+		margin: 60rpx 0 0 0;
+		width: 100%;
+		padding: 30rpx 3% 3% 3%;
+		// padding-top: 100rpx;
+		position: fixed;
+		top: 80rpx;
+		background-color: #fff;
+		z-index: 100;
+
+		view {
+			border-radius: 20rpx;
+			border: 1px solid #d0d0d0;
+			display: inline-block;
+			padding: 20rpx 0;
+			margin: 0 6rpx;
+			// margin: 40rpx 0 15rpx 0;
+			width: 20%;
+			text-align: center;
+			font-size: 30rpx;
+		}
+
+		.ordStyle {
+			background: #f0f9eb;
+			border: 2rpx solid #54a966;
+			color: #54a966;
+			font-weight: bold;
+		}
+	}
+
+	.orderList {
+		padding: 20rpx;
+		margin-top: 130rpx;
+
+		.orderItem {
+			position: relative;
+			padding: 30rpx 10rpx 30rpx 30rpx;
+			background-color: #fff;
+			border-radius: 30rpx;
+			margin-bottom: 30rpx;
+
+			.orderSn {
+				font-size: 26rpx;
+				color: #999;
+				padding-bottom: 20rpx;
+				border-bottom: 1px solid #eee;
+				margin-top: 60rpx;
+				margin-bottom: 30rpx;
+			}
+
+			.orderState {
+				color: #fff;
+
+				position: absolute;
+				left: 0;
+				top: 20rpx;
+				padding: 10rpx;
+				border-radius: 0 24rpx 24rpx 0;
+				font-size: 26rpx;
+				// font-weight: bold;				
+				color: #fff;
+			}
+
+			.orderState0 {
+				background-color: #e6a23c;
+			}
+
+			.orderState1 {
+				background-color: #409eff;
+			}
+
+			.orderState2 {
+				background-color: #f56c6c;
+			}
+
+			.orderState3 {
+				background-color: #67c23a;
+			}
+
+			.orderState5 {
+				background-color: #787878;
+			}
+
+			.orderContent {
+				margin-bottom: 20rpx;
+
+				image {
+					width: 130rpx;
+					height: 140rpx;
+					margin-right: 20rpx;
+					float: left;
+				}
+
+				.itemJian {
+					float: left;
+					width: 470rpx;
+
+					.orderTitle {
+						// font-weight: bold;
+						font-size: 28rpx;
+						margin: 0 0 20rpx 0;
+						float: left;
+						width: 410rpx;
+					}
+
+					.orderPrice {
+						font-size: 28rpx;
+						float: right;
+						width: 60rpx;
+						text-align: right;
+						line-height: 40rpx;
+					}
+				}
+
+
+			}
+
+			.orderReal {
+				border-top: 1px solid #eee;
+				text-align: right;
+				font-size: 30rpx;
+				margin: 30rpx 20rpx 0 0;
+				padding: 30rpx 0 0 0;
+			}
+
+			.orderOper {
+				text-align: right;
+				margin: 30rpx 20rpx 0 0;
+
+				view {
+					margin-left: 20rpx;
+					padding: 10rpx 0;
+					display: inline-block;
+					width: 150rpx;
+					font-size: 25rpx;
+					text-align: center;
+				}
+
+				.opFix {
+					color: #555;
+					border: 1px solid #ddd;
+					border-radius: 30rpx;
+				}
+
+				.opCan {
+					color: #c96713;
+					border: 1px solid #eba00b;
+					border-radius: 30rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index 8478adf..b3bb962 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -1,125 +1,178 @@
 <template>
-	<view>
+	<view class="container">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<!-- <z-nav-bar title="我的订单"></z-nav-bar> -->
-		<z-nav-bar backState="2000" title="我的订单"></z-nav-bar>
-
-		<view class="orderTabs flexbox">
-			<view v-for="(item,index) in orderTabs" @click="orderTabCLi(item.value)"
-				:class="orderListTab==item.value?'ordStyle':''">{{item.name}}</view>
+		<view class="header">
+			<!-- 顶部导航栏 -->
+			<z-nav-bar backState="2000" title="我的订单"></z-nav-bar>
+            <view class="ordersTabs">
+			    <view v-for="(item,index) in ordersTabs" @click="ordersTabCLi(item.value)" :key="index"
+				:class="ordersListTab==item.value?'ordersdefine ordStyle':'ordersdefine'">
+					{{item.name}}
+					<view class="ordersnum" v-if="item.value == 0 && map[item.value] > 0">{{map[item.value]}}</view>
+					<view class="ordersnum" v-if="item.value == 1 && map[item.value] > 0">{{map[item.value]}}</view>
+					<view class="ordersnum" v-if="item.value == 2 && map[item.value] > 0">{{map[item.value]}}</view>
+				</view>
+		    </view>
 		</view>
-
-		<view class="orderList" v-if="orderList.length > 0">
-			<view class="orderItem" v-for="(ifex,inten) in orderList" @click="goOrdiCont(ifex)" :key="inten">
-				<text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text>
-				<text class="orderState orderState1" v-if="ifex.orderStatus==1">待发货</text>
-				<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text>
-				<text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text>
-				<text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text>
-				<view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0">
-					<text>剩余支付时间：</text>
-					<uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false"
-						:hour="0" :minute="0" :second="ifex.overTime" @timeup="countDown"></uni-countdown>
-				</view>
-				<view class="flexbox orderSn">
-					<text class="">订单编号: {{ifex.orderSn}}</text>
-				</view>
-				<view class="orderContent" :key="index" v-if="ifex.orderType=='order'"
-					v-for="(item,index) in ifex.productList">
-					<image :src="item.product.productImages" mode=""></image>
-					<view class="itemJian">
-						<view class="orderTitle">
-							<text>{{item.product.productName}}</text>
-						</view>
-						<view class="orderPrice">
-							<text style="color: #f56c6c;">￥</text><text
-								style="font-weight: bold; color: #f56c6c;">{{item.product.price}}</text><br>
-							<text style="color: #bbbbbb;font-size: 20rpx;margin-right: 10rpx;">X</text>
-							<text style="color: #bbbbbb;">{{item.quantity}}</text>
-						</view>
-						<br clear="both">
-					</view>
-					<br clear="both">
-				</view>
-				<view class="orderContent" v-if="ifex.orderType=='point'" @click.stop="goOrdiCont(ifex)">
-					<image src="../../static/icon/oder_chong.png" mode="" style="height: 150rpx;"></image>
-					<view class="itemJian">
-						<view class="orderTitle">
-							<text>天医币充值</text>
-						</view>
-						<view class="orderPrice">
-							<text style="color: #f56c6c;">￥</text><text
-								style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
-						</view>
-						<br clear="both">
-					</view>
-					<br clear="both">
-				</view>
-				<view class="orderContent" v-if="ifex.orderType=='vip'" @click.stop="goOrdiCont(ifex)">
-					<image src="../../static/icon/oder_vip.png" mode="" style="height: 150rpx;"></image>
-					<view class="itemJian">
-						<view class="orderTitle">
-							<text>会员充值</text>
-						</view>
-						<view class="orderPrice">
-							<text style="color: #f56c6c;">￥</text><text
-								style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
-						</view>
-						<br clear="both">
-					</view>
-					<br clear="both">
-				</view>
-				<view class="orderReal">
-					<span style="color: #999; float: left; font-size: 12px;">下单时间：{{ifex.createTime}}</span>
-					<span style="color: #999;margin-right: 10rpx;">实付款 : </span>
-					<span style=" color: #f56c6c;">￥</span><text
-						style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
-				</view>
-				<view class="orderOper" v-if="ifex.orderStatus==0">
-					<view class="opFix" @click.stop = "canceOrder(ifex)">取消订单</view>
-					<view class="opCan" @click.stop = "getNewIap" v-if="ifex.orderType == 'point' && ifex.paymentMethod == '3'">重新下单</view>
-					<view class="opCan" v-else @click.stop = "goPay(ifex)">去支付</view>
-					
-				</view>
-			</view>
-			<view v-if="status==0" style="text-align: center;">
-				<u-loading-icon style="display: inline-block;"></u-loading-icon>
-				<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
-			</view>
-			<view v-if="status==1" style="padding-bottom: 20rpx;">
-				<u-divider text="全部加载完成"></u-divider>
-			</view>
+        <!-- 站位 -->
+        <view class="ordersTabs" style="z-index:0;position:unset;">
+            <view class="ordersdefine">1</view>
+        </view>
+        <!-- <view v-if="ordersListTab == 1"> -->
+		<view>
+            <view v-if="newList.length > 0">
+                <view class="orderInfo" v-for="(item,index) in newList" :key="index">
+                    <view class="mainContent">
+                        <view class="item" @click.stop="toDetail(item)">
+                            <view class="orderstatus" v-show="item.orderStatus == 0">未付款</view>
+                            <view class="orderstatus" v-show="item.orderStatus == 1">待发货</view>
+                            <view class="orderstatus" v-show="item.orderStatus == 2">已发货</view>
+                            <view class="orderstatus" v-show="item.orderStatus == 3">交易成功</view>
+                            <view class="orderstatus" v-show="item.orderStatus == 4">交易失败</view>
+                            <view class="orderstatus" v-show="item.orderStatus == 5">过期</view>
+							<view v-for="(item1,index1) in item.productList" :key="index1" class="bookinfolist">
+								<image class="feng" v-if="item1.product.productImages" :src="item1.product.productImages" mode="aspectFill"></image>
+								<!-- <view class="description" v-html="item.content">
+								</view> -->
+								<view class="btns flexbox">
+									<span class="booknameleft">{{item1.product.productName}}</span>
+									<span class="right flexbox opbtns">
+										¥{{item1.product.price}}
+									</span>
+								</view>
+								<view class="btns flexbox" style="margin-top:10rpx;padding-bottom: 72rpx;">
+									<span class="left" style="color: #C0C4CC;"></span>
+									<span class="right flexbox opbtns" style="color: #C0C4CC;">
+										×{{item1.quantity}}
+									</span>
+								</view>
+                            </view>
+							<view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;"></span>
+                                <span class="right flexbox opbtns">
+                                    <view style="color: #000;font-size:30rpx;font-weight:700;">实付款</view>
+                                    <view style="color: #000;font-size:30rpx;font-weight:700;">{{'　¥' + item.orderMoney}}</view>
+                                </span>
+                            </view>
+							<view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;" @click.stop="toDetail(item)">订单详情</span>
+                                <span class="right flexbox opbtns">
+                                    <view class="orderstatusbtn" v-if="item.orderStatus == 0" @click.stop="canceOrder(item)">取消订单</view>
+                                    <view class="orderstatusbtn" v-if="item.orderStatus == 0" @click.stop="goPay(item)">付款</view>
+                                    <view class="orderstatusbtn" v-if="item.orderStatus == 1">催发货</view>
+                                    <view class="orderstatusbtn" v-if="item.orderStatus == 2" @click.stop="seeExpressDetail(item)">查看物流</view>
+                                    <view class="orderstatusbtn" v-if="item.orderStatus == 2" @click.stop="OverOrder(item)">确认收货</view>
+                                    <view class="orderstatusbtn" v-if="item.orderStatus == 3">申请售后</view>
+                                    <view class="orderstatusbtn" v-if="item.orderStatus == 3 && userRecordid == null" @click.stop="pingji(item.productId)">评价</view>
+                                    <!-- <view class="orderstatusbtn" v-if="item.orderStatus == 3 && userRecordid != null" @click.stop="showZhuiping(item.productId)">追评</view> -->
+                                </span>
+                            </view>
+                            <view style="border-bottom:2rpx solid #e9e9e9;height:50rpx;" v-if="index<item.length-1"></view>
+                        </view>	
+                    </view>
+                </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 class="" v-else style=" margin-top: 250rpx;">
-			<u-divider text="暂无订单数据"></u-divider>
+		<view v-if="status==1" style="padding-bottom: 20rpx;">
+			<u-divider v-if="newList.length > 0" text="全部加载完成"></u-divider>
+			<u-divider v-else text="暂无订单"></u-divider>
 		</view>
+		
+		<!-- 对话框 -->
+		<u-popup :show="pingjiaShow" :round="10" @close="closePingjia">
+			<view class="tanchu" >
+				<view class="dp_title" v-if="pjType != 'zhuiping'">添加评价</view>
+				<view class="dp_title" v-else>添加追评</view>
+				
+				<view style="max-height: 1000rpx;overflow-y: scroll;">
+					<uni-forms :modelValue="Pform">
+						<!-- 评价图片 -->						
+						<!-- end -->
+								<!-- <uni-forms-item name="comment" label-width="0">
+									<uni-easyinput type="textarea" v-model="Pform.comment" placeholder="请输入您的商品评价"  />
+								</uni-forms-item>		 -->														
+					</uni-forms>
+					<!-- <u-button type="success" @click="submitPJ">提交评价</u-button> -->
+					<!-- 提交 -->
+					<view class="padding-bottom-sm flex padding-lr-sm" style="border-bottom: 1px solid #EEEEEE;">	
+																
+						<view class="mb30" v-if="pjType != 'zhuiping'">
+							<span :class="['star',Pform.star>=1 ? 'starLight': 'starGray']" @click="getStar(1)"></span>
+							<span :class="['star',Pform.star>=2 ? 'starLight': 'starGray']" @click="getStar(2)"></span>
+							<span :class="['star',Pform.star>=3 ? 'starLight': 'starGray']" @click="getStar(3)"></span>
+							<span :class="['star',Pform.star>=4 ? 'starLight': 'starGray']" @click="getStar(4)"></span>
+							<span :class="['star',Pform.star>=5 ? 'starLight': 'starGray']" @click="getStar(5)"></span>
+						</view>
+						<view class="mb30" v-if="pjType != 'zhuiping'">
+							<!-- <uni-file-picker :auto-upload="false" ref="files" @delete="deleteImg" limit="5" @success="upSuccess" @select="select" v-model="Pform.img" fileMediatype="image" :image-styles="imageStyles"/> -->
+							<u-upload :fileList="Pform.img" @afterRead="afterRead" @delete="deletePic" multiple :maxCount="4"
+								width="80" height="80" :previewFullImage="true">
+							</u-upload>
+						</view>
+						<view class="flex-sub flexbox">							
+							<i @click="showEmj()" :class="emojiIcon" ></i>
+							<!-- <input type="text" @focus="InputFocus" @blur="InputBlur" v-model="message"  @input="textareaBInput"  placeholder-style="font-size:24rpx;color:#aaaaaa;"  placeholder="请输入您要发送的内容"></input> -->
+							<textarea class="textarea"  v-model="Pform.comment" @focus="InputFocus" @blur="InputBlur" @input="textareaBInput" placeholder-style="font-size:24rpx;color:#aaaaaa;"  placeholder="请输入您要发送的内容"></textarea>
+						</view>
+						<view class="">
+						<!-- <button class="cu-btn bg-gradual-blue shadow-blur">发送</button> -->
+						<u-button type="success" @click="submitPJ" v-if="pjType != 'zhuiping'">提交评价</u-button>
+						<u-button type="success" @click="zhuiping" v-else>提交追评</u-button>
+						</view>
+					</view>
+							
+					<view style="position: relative;">
+						<emotion @emotion="handleEmj" :height="220" v-if="isShowEmj" :windowWidth="windowWidth"></emotion>
+					</view>
+				</view>				
+			</view>
+		</u-popup>
 		<z-navigation></z-navigation>
 		<music-play :playData="playData"></music-play>
 	</view>
 </template>
 
 <script>
-	import musicPlay from '@/components/music.vue'
-	import $http from '@/config/requestConfig.js';
-	import {
+import $http from '@/config/requestConfig.js';
+import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
+import musicPlay from '@/components/music.vue'
+import {
 		setPay,
-		setPayAssign,
-		setWXPay
+		setPayAssign,setWXPay
 	} from '@/config/utils';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
+import { data } from 'jquery';
+   import {
+   	mapState, mapMutations
+   } from 'vuex';
 	export default {
 		data() {
 			return {
-				playData: {},
-				orderTabs: [{
+				// loadingNow : false,
+				playData:{},
+				emojiIcon:'cuIcon-emoji',
+				windowWidth:0,
+				bookid:null,
+				booklistpage: 1,
+				productList:[],
+				productInfo:{},
+				emoji:[],
+				Files:[],
+				page:1,
+				pageSize:10,
+				total:0,
+				status:3,
+				shupingList:[],
+				bfaid:null,
+                ordersTabs: [{
 					name: '全部',
 					value: null
 				}, {
-					name: '待支付',
+					name: '待付款',
 					value: 0
 				}, {
 					name: '待发货',
@@ -130,211 +183,141 @@
 				}, {
 					name: '已完成',
 					value: 3
-				}, {
-					name: '已超时',
-					value: 5
-				}, ],
-				orderListTab: null,
-				orderList: [],
-				iapChannel: {},
-				checking: false, // 正在检测
-				ComplateRequestArr: null,
-				isAndorid: true,
-				status: 3, // 加载状态
-				totalPage: 0,
-				page: 1
+				}],
+				ordersListTab: 1,
+                newestpage: 1,
+                // hotestpage: 1,
+                // booksetpage: 1,
+                newList:[],
+                // hotList:[],
+                // bookList:[],
+				map: {},
+				userRecordid:null,     // 用户的评价状态
+				pingjiaShow:false, //添加评价 
+				Pform:{ // 评价表单
+					star:0,
+					comment:'',
+					img:[],
+					html:''
+				},
+				isShowEmj: false,
+				pjType:'',
 			}
 		},
-		onHide() {
-			this.orderList = [],
-				this.page = 1
-			this.totalPage = 0
-			this.orderListTab = null
-		},
-		onShow() {
-			this.getOrderList()
-			// this.checkIapOrders() //检查未完成的苹果支付订单
-			this.getOS()
-			// this.countDown()
-
-		},
-		computed: {
-			...mapState(['userInfo']),
-		},
-		// 下拉刷新
 		onPullDownRefresh() {
-			this.orderList = [],
-				this.page = 1
-			this.totalPage = 0
-			this.getOrderList()
-			uni.stopPullDownRefresh()
+			console.log('下拉刷新了')
+			uni.stopPullDownRefresh(); 
+			  
+            this.newestpage = 1
+            // this.hotestpage = 1
+            // this.booksetpage = 1
+            this.newList = []
+            // this.hotList = []
+            // this.bookList = []
+            this.getBookList(this.ordersListTab, false)
+			   
 		},
 		onReachBottom() {
-			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
-			}
+            this.newestpage++
+            // this.hotestpage++
+            // this.booksetpage++
+            this.getBookList(this.ordersListTab, false)
 		},
-		components: {
-			musicPlay
+		onLoad(e) {
+			this.windowWidth = uni.getSystemInfoSync().windowWidth;
+			console.log(e,'onload111')
+			// this.bookid = e.bookid
+			this.getBookList(1, false)
+		},
+		computed:{
+			...mapState(['userInfo']),
 		},
 		methods: {
-			...mapMutations(['setUserInfo']),
-			// 苹果用户重新下单
-			getNewIap(){
+			...mapMutations(['setLoadingShow']),
+            // 切换tab状态
+			ordersTabCLi(e) {
+				this.ordersListTab = e
+                this.newestpage = 1
+                // this.hotestpage = 1
+                // this.booksetpage = 1
+                this.newList = []
+                // this.hotList = []
+                // this.bookList = []
+				this.getBookList(this.ordersListTab, false)
+			},
+			// 查看本书更多书评
+			toMore(val){
+				console.log(val,'val')
 				uni.navigateTo({
-					url:'/pages/peanut/reCharge'
-				})
+					url: '../comments/comments?bookid='+val.id,
+				});
 			},
-			// 倒计时回调
-			countDown() {
-				console.log('重新刷新订单')
-				this.totalPage = 0
-				this.page = 1
-				this.orderList = []
-				this.getOrderList()
+			// 订单详情
+			toDetail(val){
+				console.log(val,'val')
+				// uni.navigateTo({
+				// 	url:'../bookShop/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
+				// })
+				uni.navigateTo({
+					url: './orderLCont?orderId=' + val.orderId + '&orderType=' + val.orderStatus  + '&orderSn=' + val.orderSn
+				});
 			},
-			// 获得操作系统
-			getOS() {
-				let oprateOs = ''
-				oprateOs = uni.getSystemInfoSync().platform
-				console.log(oprateOs)
-				if (oprateOs == 'android') {
-					this.isAndorid = true
-				} else {
-					this.isAndorid = false
-				}
-			},
-			checkIapOrders() {
-				const that = this
-				// 如果ios已经绑定支付信息，就直接支付，如果没有绑定，就需要先绑定
-				console.log('检测支付环境...')
-				plus.payment.getChannels((channels) => {
-					console.log(channels, 'channels')
-					for (var i in channels) {
-						// 判断是否苹果支付1
-						if (channels[i].id === 'appleiap') {
-							that.iapChannel = channels[i]
-							that.restoreComplateRequest() //  检查未关闭订单
-							// that.requestOrder(productId)							
-						}
-					}
-				})
-
-			},
-			// 切换订单状态
-			orderTabCLi(e) {
-				this.orderListTab = e
-				this.totalPage = 0
-				this.page = 1
-				this.orderList = []
-				this.getOrderList()
-			},
-
-			// 获取订单列表
-			getOrderList() {
-				let data = {
-					"userId": "",
-					"orderStatus": this.orderListTab,
-					"page": this.page,
-					"limit": 10,
-					'userId': this.userInfo.id
-				}
+			getBookList(flag, refreshflag){
+				// 根据tab不同，获取最新书评、最热书评、书集列表
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });
 
+				// 顶部红点数量
 				$http.request({
-					// url: "book/buyOrder/orderList",
-					url: "book/buyOrder/getUserOrderList",
-					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-					data,
+					url: "book/buyOrder/getUserOrderStatusNum",
+					method: "POST", 
+					data: {
+						"userId": this.userInfo.id
+					},
 					header: { //默认 无 说明：请求头
 						'Content-Type': 'application/json'
 					},
 				}).then(res => {
-					if (res.code == 0) {
-						res.page.records.forEach((item, index) => {
-							var seconds = item.timestamp + 30 * 60 + 2 // 过期时间 30分钟+2
-							// var seconds = item.timestamp + 30 + 2    // 过期时间 30秒
-							var nowSeconds = Math.floor(new Date().getTime() / 1000); // 单位秒
-							item.overTime = seconds - nowSeconds
-							// console.log(item.overTime,'item.overTime')
-						})
-						this.orderList = this.orderList.concat(res.page.records)
-						this.totalPage = res.page.pages
-						if (res.page.pages == this.page) {
-							this.status = 1
-						} else {
-							this.status = 3
-						}
-						console.log(this.orderList, '订单列表')
-					}
+					this.map = res.map
+				}).catch(e => {
+					console.log(e)
 				})
-
-			},
-
-			// 订单详情
-			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
-					});
+				
+				var params = {
+					"userId": this.userInfo.id,
+					"orderStatus":flag,//传null为全部，订单状态  0-未付款 1-待发货 2-已发货 3-交易成功 4-交易失败 5-过期
+					"limit": 10,
+					"page": this.newestpage
 				}
-			},
-
-			// 跳转到支付页面
-			goPay1(e) {
-				console.log(e, 'goPay1')
-				uni.navigateTo({
-					url: '../peanut/reCharge?orderSn=' + e.orderSn
-				});
-			},
-
-			// 取消订单
-			canceOrder(e) {
-				uni.showModal({
-					title: '提示',
-					content: '确定要取消订单吗？',
-					confirmText: "取消订单",
-					cancelText: "考虑一下",
-					confirmColor: '#c96713',
-					cancelColor: '#555',
-					success: res => {
-						if (res.confirm) {
-							this.$http
-								.post(`book/buyOrder/appDelete?orderId=${e.orderId}`)
-								.then(res => {
-									uni.showToast({
-										icon: 'none',
-										title: '取消订单成功'
-									})
-									this.page = 1
-									this.totalPage = 0
-									this.orderList = []
-									this.getOrderList()
-								})
-						}
+				$http.request({
+					url: "book/buyOrder/getUserOrderList",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: params,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '内容获取成功')
+					if (res.code == 0 && res.page && res.page.records.length > 0) {
+						this.newList = this.newList.concat(res.page.records)
+					} else { // 
+						
 					}
-				});
+					if(res.page.records.length != 10){
+						this.status = 1
+					} else {
+						this.status = 0
+					}
+				}).catch(e => {
+					console.log(e)
+				})
 			},
-
 			// 支付
 			goPay(payItem) {
-				console.log(payItem, 'payItem')
-				if (payItem.paymentMethod == 2) {
-					console.log('阿里支付')
+				console.log(payItem,'订单数据')		
+					if(payItem.paymentMethod == 2){
+						console.log('阿里支付')
 					setPay({
 						typePay: 'alipay',
 						subject: 'order',
@@ -354,448 +337,512 @@
 								image: '../../static/icon/ic_close.png'
 							});
 						}
-						this.orderList = [],
-							this.page = 1
-						this.totalPage = 0
 						this.getOrderList()
 					})
-				} else if (payItem.paymentMethod == 1) {
+				} else if(payItem.paymentMethod == 1){
 					console.log('微信支付')
 					// console.log(this.isAndorid)				
-					if (this.isAndorid == false) {
-						uni.showModal({
-							title: '提示',
-							content: '很抱歉，苹果系统暂不支持微信支付',
-							showCancel: false
-						})
+					 if(this.isAndorid == false){
+						 uni.showModal({
+							 title: '提示',
+							 content: '很抱歉，苹果系统暂不支持微信支付',
+							 showCancel:false
+						 })
 						return false
-					} else {
-						let data1 = {
-							orderSn: payItem.orderSn,
-							buyOrderId: null,
-							totalAmount: payItem.realMoney
+					 }else{
+						let data1={
+							orderSn:payItem.orderSn,
+							buyOrderId: null,	
+							totalAmount: payItem.realMoney					
 						}
-						console.log(data1, 'data1')
-						setWXPay(data1, res => {
+						console.log(data1,'data1')
+						setWXPay(data1,res => {
 							if (res.success) {
 								uni.showToast({
 									title: "支付成功"
 								});
-							} else {
+							} else {	
 								console.log(res)
-								if (res.data.errMsg.indexOf('User canceled') != -1) {
+								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{
+								uni.showToast({
+									title: "支付失败",
+									icon: "none",
+									image: '../../static/icon/ic_close.png'
+								});
 								}
 							}
 						})
 					}
-				} else if (payItem.paymentMethod == 3) {
+				}else if(payItem.paymentMethod == 3){
 					// 苹果充值
 					console.log('苹果二次支付')
-					if (this.isAndorid) {
+					if(this.isAndorid){
 						uni.showModal({
-							title: '提示',
-							showCancel: false,
-							content: '很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单'
+							title:'提示',
+							showCancel:false,
+							content:'很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单'
 						})
-					} else {
+					}else{
 						this.iphonepay(payItem)
 					}
 				}
 			},
-			iphonepay(payItem) {
-				console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
-				if (this.ComplateRequestArr == null || this.ComplateRequestArr == []) {
-					this.requestOrder(payItem)
-				} else {
-					uni.showModal({
-						title: '提示',
-						showCancel: false,
-						content: '您的账户存在未完成的支付订单，请稍后重启app留意账户变动。',
-					})
-				}
-			},
-			requestOrder(payItem) {
-				uni.showLoading({
-					title: '获取商品信息',
-					mask: true
-				})
-				const that = this
-				// console.log(productId, 88888888)
-				// ['xxxxx'] 是平台申请拿到的内购商品的id 
-				let IAPOrders = []
-				IAPOrders.push(payItem.productId + '')
-				console.log(IAPOrders, 'IAPOrders')
-				// 新建订单
-				that.iapChannel.requestOrder(IAPOrders, function(event) {
-					// uni.hideLoading()
-					console.log(event, 'event')
-					for (var index in event) {
-						var OrderItem = event[index]
-						// console.log(OrderItem, 'OrderItem')
-						console.log(OrderItem.productid, 'OrderItem.productid')
-						that.topay(payItem)
-					}
-				}, function(erroemsg) {
-					uni.showToast({
-						title: "商品获取失败",
-						icon: 'none'
-					})
-				})
-			},
-			topay(payItem) {
-				const that = this
-				uni.hideLoading()
-				// var restoreFlag = true; // 调用支付接口时标记 restoreFlag = true , 实际应用请将标记存储在 storage 中  
-				this.setUserInfo({
-					restoreFlag: true
-				});
-				console.log(this.userInfo, '更新后的用户信息')
-				plus.payment.request(that.iapChannel, {
-					productid: payItem.productId,
-					username: payItem.orderSn, // 用户标识/订单标识 					
-					manualFinishTransaction: true // 3.5.1+ 支持，设置此参数后需要开发者主动关闭订单，参见下面的关闭订单方法 finishTransaction()
-
-				}, function(result) {
-					// restoreFlag = false; // 支付成功清除标记 restoreFlag = false 					
-					that.transaction = result
-					// 支付成功，result 为 IAP商品交易信息对象 IAPTransaction 需将返回的支付凭证传给后端进行二次认证  
-					that.iapCheck(result)
-				}, function(e) {
-					if (e.errCode == 2) {
-						// 用户未绑定支付方式，app内支付流程结束，系统弹出框引导用户绑定支付方式，此过程将跳转到系统应用 AppStore 进行绑定支付方式，绑定成功同步支付成功，用户成功付款
-						// plus.runtime.openURL("https://apps.apple.com/account/billing");
-					} else {
-						// restoreFlag = false; // 支付失败清楚标记					
-						that.finishTransaction(result);
-						//console.log('订单关闭后的用户信息', that.userInfo);
-						// console.log(e)	
-						//console.log(e.message)
+			// 取消订单
+			canceOrder(item) {
+				uni.showModal({
+					title: '提示',
+					content: '确定要取消订单吗？',
+					confirmText: "取消订单",
+					cancelText: "考虑一下",
+					confirmColor: '#c96713',
+					cancelColor: '#555',
+					success: res => {
+						if (res.confirm) {
+							this.$http
+								.get('/book/buyOrder/cancelOrder?orderSn=' + item.orderSn)
+								.then(res => {
+									if (res.code == 0) {
+										uni.showToast({
+											icon: 'none',
+											title: '取消订单成功'
+										})
+										// uni.switchTab({
+										// 	url: './orderList'
+										// });
+										
+										this.newestpage = 1
+										this.newList = []
+										this.getBookList(this.ordersListTab, false)
+									}
+								})
+						}
 					}
 				});
 			},
-			// 查询未关闭订单
-			restoreComplateRequest() {
-				let that = this
-				console.log('检测未完成订单')
-				// console.log(that.iapChannel,'this.iapChannel')				
-				that.iapChannel.restoreComplateRequest({
-					manualFinishTransaction: true
-				}, function(results) {
-					console.log('进入restoreComplateRequest')
-					// if(!that.checking){
-					// that.checking = true
-					// console.log(that.checking)
-					// results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证  
-					that.ComplateRequestArr = results
-					console.log(that.ComplateRequestArr, '未完成订单数组')
-					if (results && results.length > 0) {
-						results.map((item, index) => {
-							// "0"为正在支付；"1"为支付成功；"2"为支付失败；"3"为支付已恢复。
-							if (item.transactionState == '1') {
-								// 已经支付，但是没有走逻辑的内购订单								
-								that.iapCheck(item, index)
-							} else {
-								// 其他状态的内购订单
-								that.finishTransaction(item)
-
+			// canceOrder(item) {
+			// 	uni.showModal({
+			// 		title: '提示',
+			// 		content: '确定要取消订单吗？',
+			// 		confirmText: "取消订单",
+			// 		cancelText: "考虑一下",
+			// 		confirmColor: '#c96713',
+			// 		cancelColor: '#555',
+			// 		success: res => {
+			// 			if (res.confirm) {
+			// 				uni.showLoading()
+			// 				$http.request({
+			// 					url: "book/buyOrder/cancelOrder",
+			// 					method: "GET", // POST、GET、PUT、DELETE，具体说明查看官方文档
+			// 					data,
+			// 					header: { //默认 无 说明：请求头
+			// 						'Content-Type': 'application/json'
+			// 					},
+			// 				}).then(res => {
+			// 					if (res.code == 0) {
+			// 						uni.hideLoading()
+			// 						uni.showToast({
+			// 							title: '订单已取消',
+			// 							icon: 'success',
+			// 							duration: 1000
+			// 						})
+			// 						this.getBookList(this.ordersListTab, false)
+			// 					}
+			// 				})
+			// 			} else if (res.cancel) {}
+			// 		}
+			// 	});
+			// },
+			// 查看物流
+			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=" + item.expressList[0].expressOrderSn
+					})
+				// }
+			},
+			// 确认收货
+			OverOrder(item) {
+				uni.showModal({
+					title: '提示',
+					content: '确认收货？',
+					success: res => {
+						let data = {
+							orderId: item.orderId,
+							orderStatus: '3'
+						}
+						if (res.confirm) {
+							uni.showLoading()
+							$http.request({
+								url: "book/buyOrder/update",
+								method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+								data,
+								header: { //默认 无 说明：请求头
+									'Content-Type': 'application/json'
+								},
+							}).then(res => {
+								if (res.code == 0) {
+									uni.hideLoading()
+									uni.showToast({
+										title: '收货成功',
+										icon: 'success',
+										duration: 1000
+									})
+									this.newestpage = 1
+									this.newList = []
+									this.getBookList(this.ordersListTab, false)
+								}
+							})
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			closePingjia(){
+				this.pingjiaShow = false
+				this.Pform.comment = ''
+				this.Pform.html = ''
+				this.emoji = []
+			},
+			// 提交评价
+			submitPJ(){
+				if(this.Pform.comment != ''){					
+					
+					let data={
+						'userid':this.userInfo.id,
+						'orderSn': this.orderSn,
+						'bookid': this.productID,
+						// 'content': this.Pform.html,	
+						'content': this.Pform.comment,						
+						'starLevel':this.Pform.star,
+						'images':this.Pform.img,
+						// 'emoji':this.emoji  // 表情数组
+					}
+					// console.log(data,'data')
+					$http.request({
+						url: "buy/record/UserRecordcomment",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data,
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {												
+							if (res.code == 0) {
+								uni.showToast({
+									title:'评价成功！',
+									icon:'success'
+								})
+								
+								this.pingjiaShow = false
+								this.Pform.comment = ''
+								this.Pform.html = ''
+								this.emoji = []
+								setTimeout(()=>{
+									uni.navigateBack({
+										delta:1
+									})
+								},2000)
 							}
 						})
-					} else {
-						this.setUserInfo({
-							restoreFlag: false
-						});
-						console.log('无未处理订单，可以拉起新的支付')
-					}
-					// }
-				});
-
-
-			},
-			// 关闭交易订单
-			finishTransaction(trans, index) {
-				this.iapChannel.finishTransaction(trans, (success) => {
-					console.log('关闭订单成功', index);
-
-					if (index == this.ComplateRequestArr.length - 1) { // 最后一个支付订单
-						this.setUserInfo({
-							restoreFlag: false
-						});
-						console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
-					}
-
-				}, (fail) => {
-					console.log('关闭订单失败');
-				});
-			},
-			iapCheck(result, index) {
-				const that = this
-				console.log('进入后台验证')
-				let data = {
-					transactionId: result.transactionIdentifier, // 支付交易id
-					customerOid: that.userInfo.id,
-					productId: result.payment.productid, // 产品id
-					orderId: result.payment.username, // 系统订单号
-					receiptData: result.transactionReceipt, // 苹果返回收据
-					loadAnimate: 'none', // 请求加载动画
+				}else{
+					uni.showToast({
+						title:'请先输入您的评价内容 ！',
+						icon:'none'
+					})
 				}
-				console.log(data, 'data')
-				$http.request({
-					url: "/Ipa/veri",
-					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
-					data,
-					header: { //默认 无 说明：请求头
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					console.log(JSON.stringify(res))
-					console.log(res.code)
-					if (res.code == 0) {
-						// uni.hideLoading()
-						console.log('充值订单已处理，请留意账户金额变动....')
-						// 服务器验证票据有效后在客户端关闭订单
-						that.finishTransaction(result, index)
-					} else if (res.code == 200) { // 重复验证订单
-						console.log('重复验证....')
-						that.finishTransaction(result, index)
-					}
-				}).catch(e => {
-					console.log('支付验证失败，进入轮询程序...')
-					that.getIapPayResult(result, index)
-				})
-				console.log('--------------')
 			},
-
-			// 轮询验证支付结果			
-			getIapPayResult(result, index) {
-				// let interval = null
-				this.ComplateRequestInterval = setTimeout(() => {
-					if (this.maxTimes <= 3) {
-						this.iapCheck(result, index)
-						console.log('执行1', this.maxTimes, this.ComplateRequestInterval)
-						this.maxTimes += 1
-					} else {
-						this.maxTimes = 0
-						console.log('停止轮询', this.maxTimes, this.ComplateRequestInterval, this.maxTimes)
-						this.checking = false
-						this.saveErrorIapOrder(result, index)
-						clearTimeout(this.ComplateRequestInterval)
-
-					}
-				}, 10000)
-
+			// 添加评价
+			pingji(id){
+				console.log(id)
+				this.pjType = ''
+				this.productID = id
+				this.pingjiaShow = true
 			},
-			// 轮询失败接口
-			saveErrorIapOrder(result, index) {
-				console.log('提交到充值问题单里面...')
-				let data = {
-					transactionId: result.transactionIdentifier,
-					failureflag: 1,
-					orderId: result.payment.username,
-					receiptData: result.transactionReceipt,
-					productId: result.payment.productid,
-					customerOid: this.userInfo.id
+			getStar(i){
+				this.Pform.star = i
+			},
+			InputBlur(e){
+				
+			},
+			InputFocus(e){
+				this.isShowEmj = false;
+				this.emojiIcon = 'cuIcon-emoji';
+				this.$emit('foc')
+			},
+			textareaBInput(e) {
+				console.log(e,'e')
+				this.Pform.comment = e.detail.value
+				/// this.Pform.html = e.detail.value
+			},
+			showEmj() {
+				let bool = !this.isShowEmj;
+				if(bool) {
+					this.emojiIcon = 'cuIcon-keyboard';
+				} else {
+					this.emojiIcon = 'cuIcon-emoji';
 				}
-				$http.request({
-					url: "Ipa/failure",
-					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
-					data,
-					header: { //默认 无 说明：请求头
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					console.log(JSON.stringify(res))
-					if (res.code == 200) {
-						console.log('提交成功，关闭订单')
-						this.finishTransaction(result, index)
-					}
-				}).catch(e => {
-					console.log(e)
-					if (e.statusCode == 0) { // 重复提交，直接关闭订单
-						this.finishTransaction(result, index)
-					}
-				})
+				
+				this.isShowEmj = bool;
+				this.$emit('show')
 			},
-
+			deletePic() {
+				let that = this
+				that.Pform.img.splice(0, 1)
+				//console.log(that.Pform.img)
+			},
+			afterRead(e) {
+				//console.log(e)
+				let that = this
+				for (var i=0; i< e.file.length; i++) {
+					//console.log(i,e.file[i].url)
+					uni.uploadFile({
+						url: this.$baseUrl + 'oss/fileoss',
+						filePath: e.file[i].url,
+						//files:e.file,
+						 name: 'file',
+						formData: {},
+						success: (res) => {
+							that.Pform.img.push({
+								url: JSON.parse(res.data).url
+							})
+						}
+					});
+				}
+			},
+			// 获得输入的表情数组
+			handleEmj(i) {
+			 console.log(i,'i---------'); 
+				this.inputValue = i
+				// console.log(this.inputValue);
+				if(i.emotioni == '[em_98]') {
+					//匹配最后一个表情符号并删除11。
+					this.Pform.comment = this.Pform.comment.replace(/(\[[^\]]+\]|[\s\S])$/, '');
+					if(this.emoji.length > 0){
+						this.emoji = this.emoji.slice(0,-1)
+					}
+				} else {
+					this.emoji.push({'tag' : i.emotion, 'name':i.emotioni})	
+					// console.log(this.emoji,'this.emoji')
+					this.Pform.comment += i.emotioni;
+					/// this.Pform.html += i.emotion
+				}
+			},
+		},
+		components:{
+			musicPlay,			
+			emotion			
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	@import '@/style/mixin.scss';
+// @import '@/style/mixin.scss';
+.ordersTabs {
+    // margin: 70rpx 0 0 0;
+    width: 730rpx;
+    // padding: 0 3% 3% 3%;
+    position: fixed;
+    // top: 80rpx;
+    background-color: #f7faf9;
+    z-index: 100;
 
-	.guoqi {
-		font-size: 28rpx;
-		align-items: center;
-		color: red;
-		float: right;
-		line-height: 40rpx;
-	}
-
-	.flexbox {
-		display: flex;
-	}
-
-	.orderTabs {
-		margin: 60rpx 0 0 0;
-		width: 100%;
-		padding: 30rpx 3% 3% 3%;
-		// padding-top: 100rpx;
-		position: fixed;
-		top: 80rpx;
-		background-color: #fff;
-		z-index: 100;
-
-		view {
-			border-radius: 20rpx;
-			border: 1px solid #d0d0d0;
-			display: inline-block;
-			padding: 20rpx 0;
-			margin: 0 6rpx;
-			// margin: 40rpx 0 15rpx 0;
-			width: 20%;
-			text-align: center;
-			font-size: 30rpx;
+    .ordersdefine {
+        display: inline-block;
+        padding: 20rpx 0 20rpx 0;
+        // margin: 40rpx 0 15rpx 0;
+        width:140rpx;
+        text-align: center;
+        font-size: 30rpx;
+		position: relative;
+		.ordersnum{
+			position: absolute;
+			top: 8rpx;
+			right: 0rpx;
+			background-color: red;
+            // border:1rpx solid #a3a3a3;
+			border-radius: 40rpx;
+			width: 28rpx;
+			height: 28rpx;
+			font-size: 20rpx;
+			font-weight: 500;
+			color: rgb(255, 255, 255);
 		}
+    }
 
-		.ordStyle {
-			background: #f0f9eb;
-			border: 2rpx solid #54a966;
-			color: #54a966;
+    .ordStyle {
+        // border-bottom: 4rpx solid #54a966;
+        // color: #54a966;
+        font-weight: bold;
+    }
+}
+.orderstatusbtn{
+	color: #000;
+	border:1px solid #999;
+	border-radius: 10rpx;
+	padding: 0 10rpx;
+	margin-left:20rpx;
+	width:140rpx;
+	text-align: center;
+}
+
+
+	.flexbox{display: flex;}
+	.container{padding: 0 10px;}
+	.star{display: inline-block; width: 20px; height: 20px;  margin-right: 10rpx;}
+		.starGray{ background : url(../../static/icon/star_greey.png) no-repeat; background-size: contain; }
+		.starLight{ background : url(../../static/icon/star_light.png) no-repeat;  background-size: contain;}
+		.cuIcon-emoji {
+			background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block; margin-right: 20rpx;
+	width: 30px; 	}
+	.cuIcon-keyboard{background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block;
+	width: 30px; }
+	.tanchu {
+		padding: 40rpx 30rpx 40rpx 30rpx;
+		position: relative;
+	
+	
+		.dp_title {
+			font-size: 32rpx;
+			margin-bottom: 50rpx;
+			color: #555;
+			text-align: center;
 			font-weight: bold;
 		}
+	
+		.dp_add {
+			position: absolute;
+			top: 40rpx;
+			right: 30rpx;
+			font-size: 22rpx;
+			background-color: #fd6004;
+			color: #fff;
+			border-radius: 10rpx;
+			padding: 5rpx 10rpx;
+	
+			.u-icon {
+				display: inline-block;
+				margin-right: 5rpx;
+			}
+		}}
+	
+	.quesheng{text-align: center; margin-top: 100rpx; color: #8b8a91; padding-bottom: 20rpx; padding-top: 20rpx;}
+	.gengduoshuping{text-align: right; color: #0044ff; padding-bottom: 20rpx; padding-top: 20rpx;}
+	.orderInfo{
+		justify-content: space-between;
+		// margin-bottom: 15px;
+		background-color: #fff;
+		padding:20rpx;
+		border: 1px splid #999;
+		box-sizing: border-box;
+		// padding-bottom: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+		.bookinfolist{
+			height: 180rpx;
+		}
 	}
-
-	.orderList {
-		padding: 20rpx;
-		margin-top: 130rpx;
-
-		.orderItem {
-			position: relative;
-			padding: 30rpx 10rpx 30rpx 30rpx;
-			background-color: #fff;
-			border-radius: 30rpx;
-			margin-bottom: 30rpx;
-
-			.orderSn {
-				font-size: 26rpx;
-				color: #999;
-				padding-bottom: 20rpx;
-				border-bottom: 1px solid #eee;
-				margin-top: 60rpx;
-				margin-bottom: 30rpx;
+	.mainContent{
+		background-color: #fff; 
+		.item{
+			// padding: 10px;
+			// margin-bottom: 30rpx;
+			// border: 1px solid #999;
+			box-sizing: border-box;
+			// padding-bottom: 20rpx;
+			border-radius: 20rpx;
+			// margin-bottom: 20rpx;
+		}
+		.feng{
+            margin:0rpx 20rpx 0 0;
+            height: 160rpx;
+            width: 140rpx;
+            float:left;
+            border-radius: 20rpx;
+            border:1rpx solid #e9e9e9;
+        }
+		.orderstatus{font-size: 30rpx; color: red; text-align: right;padding-bottom: 10rpx;}
+		/deep/.description{
+			overflow: hidden;
+			color: #666;
+			text-overflow: -o-ellipsis-lastline;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 5;
+			line-clamp: 5;
+			-webkit-box-orient: vertical;
+			font-size: 26rpx;
+			margin-bottom: 20rpx;
+			margin-top:10rpx;
+			height: 172rpx;
+			img{
+				width: 100% !important;
 			}
-
-			.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;
+		}
+		.btns{
+			font-size: 28rpx;
+			justify-content: space-between;
+			align-items: center;
+			.booknameleft{
+                width: 372rpx;
+                color: #000000;
 			}
-
-			.orderState0 {
-				background-color: #e6a23c;
-			}
-
-			.orderState1 {
-				background-color: #409eff;
-			}
-
-			.orderState2 {
-				background-color: #f56c6c;
-			}
-
-			.orderState3 {
-				background-color: #67c23a;
-			}
-
-			.orderState5 {
-				background-color: #787878;
-			}
-
-			.orderContent {
-				margin-bottom: 20rpx;
-
-				image {
-					width: 130rpx;
-					height: 140rpx;
-					margin-right: 20rpx;
-					float: left;
-				}
-
-				.itemJian {
-					float: left;
-					width: 470rpx;
-
-					.orderTitle {
-						// font-weight: bold;
-						font-size: 28rpx;
-						margin: 0 0 20rpx 0;
-						float: left;
-						width: 410rpx;
-					}
-
-					.orderPrice {
-						font-size: 28rpx;
-						float: right;
-						width: 60rpx;
-						text-align: right;
-						line-height: 40rpx;
-					}
-				}
-
-
-			}
-
-			.orderReal {
-				border-top: 1px solid #eee;
-				text-align: right;
-				font-size: 30rpx;
-				margin: 30rpx 20rpx 0 0;
-				padding: 30rpx 0 0 0;
-			}
-
-			.orderOper {
-				text-align: right;
-				margin: 30rpx 20rpx 0 0;
-
-				view {
-					margin-left: 20rpx;
-					padding: 10rpx 0;
-					display: inline-block;
-					width: 150rpx;
-					font-size: 25rpx;
-					text-align: center;
-				}
-
-				.opFix {
-					color: #555;
-					border: 1px solid #ddd;
-					border-radius: 30rpx;
-				}
-
-				.opCan {
-					color: #c96713;
-					border: 1px solid #eba00b;
-					border-radius: 30rpx;
-				}
+			.left{
+                width: 300rpx;
+                color: #a1a1a1;
+            }
+            .right{
+                width: 350rpx;
+                display: flex;
+                justify-content: flex-end;
+                align-items: center;
+            }
+            .gzicon{
+                margin:0 0 0 20rpx;
+                height: 40rpx;
+                width: 40rpx;
+                // float:left;
+                // border-radius: 20rpx;
+                // border:1rpx solid #e9e9e9;
+            }
+			.opbtns{
+				.pingjia{margin-left: 10px;}
 			}
 		}
 	}
-</style>
\ No newline at end of file
+	.mb30{margin-bottom: 30rpx; overflow: hidden;}
+		
+	.mytabs {
+		// background: url('@/static/icon/bgtushu.png') no-repeat left top;
+		height: 80rpx;
+		// margin-bottom: 30rpx;
+
+		.item {
+			border-radius: 10rpx;
+			background-color: #c6ead0;
+			width: 48%;
+			// margin: 0 10rpx;
+			text-align: center;
+			color: #3c7f56;
+			font-size: 36rpx;
+			line-height: 80rpx;
+		}
+
+		.item.active {
+			background-color: #3c7f56;
+			color: #fff;
+		}
+
+		.item1 {
+			margin-right: 20rpx;
+		}
+	}
+</style>
diff --git a/pages/bookShop/orderList1.vue b/pages/bookShop/orderList1.vue
new file mode 100644
index 0000000..f9203d1
--- /dev/null
+++ b/pages/bookShop/orderList1.vue
@@ -0,0 +1,624 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view class="header">
+			<!-- 顶部导航栏 -->
+			<z-nav-bar backState="2000" title="我的订单"></z-nav-bar>
+            <view class="ordersTabs">
+			    <view v-for="(item,index) in ordersTabs" @click="ordersTabCLi(item.value)" :key="index"
+				:class="ordersListTab==item.value?'ordersdefine ordStyle':'ordersdefine'">
+					{{item.name}}
+					<view class="ordersnum">22</view>
+				</view>
+		    </view>
+		</view>
+        <!-- 站位 -->
+        <view class="ordersTabs" style="z-index:0;position:unset;">
+            <view class="ordersdefine">1</view>
+        </view>
+        <view v-if="ordersListTab == 1">
+            <view v-if="newList.length > 0">
+                <view class="orderInfo" v-for="(item,index) in newList" :key="index">
+                    <view class="mainContent">
+                        <view class="item" @click.stop="toDetail(item)">
+                            <view class="orderstatus">已完成</view>
+							<view>
+								<image class="feng" v-if="item.bookimage" :src="item.bookimage" mode="aspectFill"></image>
+								<!-- <view class="description" v-html="item.content">
+								</view> -->
+								<view class="btns flexbox">
+									<span class="booknameleft">{{item.bookname}}</span>
+									<span class="right flexbox opbtns">
+										¥76
+									</span>
+								</view>
+								<view class="btns flexbox" style="margin-top:10rpx;padding-bottom: 72rpx;">
+									<span class="left" style="color: #C0C4CC;"></span>
+									<span class="right flexbox opbtns" style="color: #C0C4CC;">
+										×1
+									</span>
+								</view>
+                            </view>
+							<view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;"></span>
+                                <span class="right flexbox opbtns">
+                                    <view style="color: #000;font-size:30rpx;font-weight:700;">实付款</view>
+                                    <view style="color: #000;font-size:30rpx;font-weight:700;">{{'　¥' + item.commentNum}}</view>
+                                </span>
+                            </view>
+							<view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;">订单详情</span>
+                                <span class="right flexbox opbtns">
+                                    <view style="color: #000;border:1px solid #999;border-radius: 10rpx;padding: 0 10rpx;">查看物流</view>
+                                    <view style="color: #000;border:1px solid #999;border-radius: 10rpx;padding: 0 10rpx;margin-left:20rpx;width:140rpx;text-align: center;">评价</view>
+                                </span>
+                            </view>
+                            <view style="border-bottom:2rpx solid #e9e9e9;height:50rpx;" v-if="index<item.length-1"></view>
+                        </view>	
+                    </view>
+                </view>
+            </view>
+            <view class="quesheng" v-else>
+                暂无书评内容~
+            </view>
+        </view>
+        <view v-if="ordersListTab == 2">
+            <view v-if="hotList.length > 0">
+                <view class="orderInfo" v-for="(item,index) in hotList" :key="index">
+                    <view class="mainContent">
+                        <view class="item" @click.stop="toDetail(item)">
+                            
+                            <view class="orderstatus">{{item.title}}</view>
+                            <image class="feng" v-if="item.bookimage" :src="item.bookimage" mode="aspectFill"></image>
+                            <view class="description" v-html="item.content">
+                            </view>
+                            <view class="btns flexbox">
+                                <span class="left">{{item.bookname}}</span>
+                                <span class="right flexbox opbtns" style="color:#3c9cff;">
+                                    全文
+                                </span>
+                            </view>
+                            <view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;">{{item.createTime}}</span>
+                                <span class="right flexbox opbtns">
+                                    <image class="gzicon" v-if="item.ilike" src="../../static/icon/gz2.png" mode="aspectFill" @click.stop="clickLike(item)"></image>
+                                    <image class="gzicon" v-else src="../../static/icon/gz.png" mode="aspectFill"></image>
+                                    <view style="color: #C0C4CC;">{{item.contlike}}</view>
+                                    <image class="gzicon" v-if="1" src="../../static/icon/pinglun.png" mode="aspectFill"></image>
+                                    <view style="color: #C0C4CC;">{{item.commentNum}}</view>
+                                </span>
+                            </view>
+                            <view style="border-bottom:2rpx solid #e9e9e9;height:50rpx;" v-if="index<item.length-1"></view>
+                        </view>	
+                    </view>
+                </view>
+            </view>
+            <view class="quesheng" v-else>
+                暂无书评内容~
+            </view>
+        </view>
+        <!-- <view v-if="ordersListTab == 3">
+			<view class="" style="padding:40rpx 20rpx;">
+				<view class="mytabs flexbox">
+					<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
+						已购图书
+					</view>
+					<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+						推荐图书
+					</view>
+				</view>
+			</view>
+            <view v-if="bookList.length > 0">
+                <view class="orderInfo3" v-for="(item,index) in bookList" :key="index">
+                    <view class="mainContent3">
+                        <view class="item">
+                            <view class="btns flexbox" @click.stop="toMore(item)">
+                                <view class="title">{{item.name}}</view>
+                                <view class="pianshuping">{{item.forumNum}}篇书评</view>
+                            </view>
+                            <image class="feng" v-if="item.images" :src="item.images" mode="aspectFill" @click.stop="toMore(item)"></image>
+                            <view class="shupingList">
+                                <view class="description" v-for="(item1,index1) in item.forums" :key="index1" @click.stop="toDetail(item1)">{{item1.title}}</view>
+                            </view>
+                            <view class="btns flexbox" @click.stop="toMore(item)">
+                                <span class="left"></span>
+                                <span class="right flexbox opbtns" style="color:#3c9cff;">
+                                    全部
+                                </span>
+                            </view>
+                        </view>	
+                    </view>
+                </view>
+            </view>
+            <view class="quesheng" v-else>
+                暂无书评内容~
+            </view>
+        </view> -->
+		
+		<view v-if="status==0" style="text-align: center;">
+			<u-loading-icon style="display: inline-block;"></u-loading-icon>
+			<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+		</view>
+		<view v-if="status==1" style="padding-bottom: 20rpx;">
+			<u-divider text="全部加载完成"></u-divider>
+		</view>
+		
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
+   import musicPlay from '@/components/music.vue'
+import { data } from 'jquery';
+   import {
+   	mapState, mapMutations
+   } from 'vuex';
+	export default {
+		data() {
+			return {
+				// loadingNow : false,
+				playData:{},
+				emojiIcon:'cuIcon-emoji',
+				windowWidth:0,
+				bookid:null,
+				booklistpage: 1,
+				productList:[],
+				productInfo:{},
+				pingjiaShow:false, //添加评价 
+				Pform:{ // 评价表单
+					star:0,
+					comment:'',
+					img:[],
+					html:''
+				},
+				emoji:[],
+				Files:[],
+				page:1,
+				pageSize:10,
+				total:0,
+				status:3,
+				shupingList:[],
+				bfaid:null,
+                ordersTabs: [{
+					name: '全部',
+					value: 1
+				}, {
+					name: '待付款',
+					value: 2
+				}, {
+					name: '待发货',
+					value: 3
+				}, {
+					name: '待收货',
+					value: 4
+				}, {
+					name: '已完成',
+					value: 5
+				}],
+				ordersListTab: 1,
+                newestpage: 1,
+                hotestpage: 1,
+                booksetpage: 1,
+                newList:[],
+                hotList:[],
+                bookList:[],
+				contentShow: 1,
+
+			}
+		},
+		onPullDownRefresh() {
+			console.log('下拉刷新了')
+			uni.stopPullDownRefresh(); 
+			  
+            this.newestpage = 1
+            this.hotestpage = 1
+            this.booksetpage = 1
+            this.newList = []
+            this.hotList = []
+            this.bookList = []
+            this.getBookList(this.ordersListTab, false)
+			   
+		},
+		onReachBottom() {
+            this.newestpage++
+            this.hotestpage++
+            this.booksetpage++
+            this.getBookList(this.ordersListTab, false)
+		},
+		onLoad(e) {
+			this.windowWidth = uni.getSystemInfoSync().windowWidth;
+			console.log(e,'onload')
+			// this.bookid = e.bookid
+			this.getBookList(1, false)
+		},
+		computed:{
+			...mapState(['userInfo']),
+		},
+		methods: {
+			...mapMutations(['setLoadingShow']),
+			setData(e) {
+				this.contentShow = e
+				this.getBookList(this.ordersListTab, true)
+			},
+            // 切换tab状态
+			ordersTabCLi(e) {
+				this.ordersListTab = e
+                this.newestpage = 1
+                this.hotestpage = 1
+                this.booksetpage = 1
+                this.newList = []
+                this.hotList = []
+                this.bookList = []
+				this.getBookList(this.ordersListTab, false)
+			},
+			// 查看本书更多书评
+			toMore(val){
+				console.log(val,'val')
+				uni.navigateTo({
+					url: '../comments/comments?bookid='+val.id,
+				});
+			},
+			// 书评详情
+			toDetail(val){
+				console.log(val,'val')
+				// uni.navigateTo({
+				// 	url:'../bookShop/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
+				// })
+				uni.navigateTo({
+					url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus  + '&orderSn=' + e.orderSn
+				});
+			},
+			getBookList(flag, tushuflag){
+				// 根据tab不同，获取最新书评、最热书评、书集列表
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });			
+				
+                var httpurl = "" 
+                if(flag == 1){
+                    httpurl = "forum/articles/getForumsNew?page=" + this.newestpage + '&limit=10'
+                }else if(flag == 2){
+                    httpurl = "forum/articles/getForumsHot?page=" + this.hotestpage + '&limit=10'
+                }else{
+					if(tushuflag){ // 点击切换已购和推荐
+                		this.booksetpage = 1
+                		this.bookList = []
+					}
+					if(this.contentShow == 1){
+                    	httpurl = "forum/articles/getHasForumsAndBook?page=" + this.booksetpage + '&limit=10&userId=' + this.userInfo.id
+					} else {
+						httpurl = "forum/articles/getBestForumsAndBook?page=" + this.booksetpage + '&limit=10&userId=' + this.userInfo.id
+					}
+                }
+				this.$http
+					.post(httpurl)
+					.then(res => {
+
+                        if(flag == 1){
+                            this.newList = this.newList.concat(res.page.records)
+                        }else if(flag == 2){
+                            this.hotList = this.hotList.concat(res.page.records)
+                        }else{
+                            this.bookList = this.bookList.concat(res.page.records)
+                        }
+                        console.log(this.newList,'this.newList')
+						// let list = res.page.records
+						// console.log(list,'list')
+						// for(let i=0; i < list.length; i++){
+						// 	let data = {
+						// 		'page': 1,
+						// 		'limit': 3,
+						// 		'bookid' : list[i].bookid
+						// 	}
+						// 	this.$http
+						// 		.post('forum/articles/descupdatelist', data)
+						// 		.then(res => {
+						// 		// this.total = res.page.totalPage
+						// 		// this.shupingList = this.shupingList.concat(res.page.list)
+						// 		list[i].shupingList = res.page.list
+						// 		console.log(res.page.list,'评论获取成功')
+								
+						// 		console.log(list,'list')
+						// 		this.productList.push(list[i])
+						// 		console.log(this.productList,'productList')
+						// 		// this.status = 3
+						// 	}).catch((e)=>{
+						// 			console.log(e,'e')
+						// 		})
+						// }
+						if(res.page.records.length != 10){
+							this.status = 1
+						} else {
+							this.status = 0
+						}						
+						// uni.hideLoading();
+					}).catch((e)=>{
+						console.log(e,'e')
+					})
+			},	
+			},
+		components:{
+			musicPlay,			
+			emotion			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+// @import '@/style/mixin.scss';
+.ordersTabs {
+    // margin: 70rpx 0 0 0;
+    width: 730rpx;
+    // padding: 0 3% 3% 3%;
+    position: fixed;
+    // top: 80rpx;
+    background-color: #f7faf9;
+    z-index: 100;
+
+    .ordersdefine {
+        display: inline-block;
+        padding: 20rpx 0 20rpx 0;
+        // margin: 40rpx 0 15rpx 0;
+        width:140rpx;
+        text-align: center;
+        font-size: 30rpx;
+		position: relative;
+		.ordersnum{
+			position: absolute;
+			top: 8rpx;
+			right: 0rpx;
+			background-color: red;
+            // border:1rpx solid #a3a3a3;
+			border-radius: 40rpx;
+			width: 28rpx;
+			height: 28rpx;
+			font-size: 20rpx;
+			font-weight: 500;
+			color: rgb(255, 255, 255);
+		}
+    }
+
+    .ordStyle {
+        // border-bottom: 4rpx solid #54a966;
+        // color: #54a966;
+        font-weight: bold;
+    }
+}
+
+
+	.flexbox{display: flex;}
+	.container{padding: 0 10px;}
+	.star{display: inline-block; width: 20px; height: 20px;  margin-right: 10rpx;}
+		.starGray{ background : url(../../static/icon/star_greey.png) no-repeat; background-size: contain; }
+		.starLight{ background : url(../../static/icon/star_light.png) no-repeat;  background-size: contain;}
+		.cuIcon-emoji {
+			background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block; margin-right: 20rpx;
+	width: 30px; 	}
+	.cuIcon-keyboard{background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block;
+	width: 30px; }
+	.tanchu {
+		padding: 40rpx 30rpx 40rpx 30rpx;
+		position: relative;
+	
+	
+		.dp_title {
+			font-size: 32rpx;
+			margin-bottom: 50rpx;
+			color: #555;
+			text-align: center;
+			font-weight: bold;
+		}
+	
+		.dp_add {
+			position: absolute;
+			top: 40rpx;
+			right: 30rpx;
+			font-size: 22rpx;
+			background-color: #fd6004;
+			color: #fff;
+			border-radius: 10rpx;
+			padding: 5rpx 10rpx;
+	
+			.u-icon {
+				display: inline-block;
+				margin-right: 5rpx;
+			}
+		}}
+	
+	.quesheng{text-align: center; margin-top: 100rpx; color: #8b8a91; padding-bottom: 20rpx; padding-top: 20rpx;}
+	.gengduoshuping{text-align: right; color: #0044ff; padding-bottom: 20rpx; padding-top: 20rpx;}
+	.orderInfo{
+		justify-content: space-between;
+		// margin-bottom: 15px;
+		background-color: #fff;
+		padding:20rpx;
+		border: 1px splid #999;
+		box-sizing: border-box;
+		// padding-bottom: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+		
+	}
+	.mainContent{
+		background-color: #fff; 
+		.item{
+			// padding: 10px;
+			// margin-bottom: 30rpx;
+			// border: 1px solid #999;
+			box-sizing: border-box;
+			// padding-bottom: 20rpx;
+			border-radius: 20rpx;
+			// margin-bottom: 20rpx;
+		}
+		.feng{
+            margin:0rpx 20rpx 0 0;
+            height: 160rpx;
+            width: 140rpx;
+            float:left;
+            border-radius: 20rpx;
+            border:1rpx solid #e9e9e9;
+        }
+		.orderstatus{font-size: 30rpx; color: red; text-align: right;padding-bottom: 10rpx;}
+		/deep/.description{
+			overflow: hidden;
+			color: #666;
+			text-overflow: -o-ellipsis-lastline;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 5;
+			line-clamp: 5;
+			-webkit-box-orient: vertical;
+			font-size: 26rpx;
+			margin-bottom: 20rpx;
+			margin-top:10rpx;
+			height: 172rpx;
+			img{
+				width: 100% !important;
+			}
+		}
+		.btns{
+			font-size: 28rpx;
+			justify-content: space-between;
+			align-items: center;
+			.booknameleft{
+                width: 372rpx;
+                color: #000000;
+			}
+			.left{
+                width: 300rpx;
+                color: #a1a1a1;
+            }
+            .right{
+                width: 350rpx;
+                display: flex;
+                justify-content: flex-end;
+                align-items: center;
+            }
+            .gzicon{
+                margin:0 0 0 20rpx;
+                height: 40rpx;
+                width: 40rpx;
+                // float:left;
+                // border-radius: 20rpx;
+                // border:1rpx solid #e9e9e9;
+            }
+			.opbtns{
+				.pingjia{margin-left: 10px;}
+			}
+		}
+	}
+	.mb30{margin-bottom: 30rpx; overflow: hidden;}
+
+    // .orderInfo3{
+    //     justify-content: space-between;
+	// 	// margin-bottom: 15px;
+	// 	background-color: #fff;
+	// 	padding:20rpx;
+	// 	border: 1px splid #999;
+	// 	box-sizing: border-box;
+	// 	// padding-bottom: 20rpx;
+	// 	border-radius: 20rpx;
+	// 	margin-bottom: 20rpx;
+    //     .mainContent3{
+    //         background-color: #fff; 
+    //         .item{
+    //             // padding: 10px;
+    //             // margin-bottom: 30rpx;
+    //             // border: 1px solid #999;
+    //             box-sizing: border-box;
+    //             // padding-bottom: 20rpx;
+    //             border-radius: 20rpx;
+    //             // margin-bottom: 20rpx;
+    //         }
+    //         .feng{
+    //             margin:10rpx 20rpx 0 0;
+    //             height: 240rpx;
+    //             width: 164rpx;
+    //             float:left;
+    //             border-radius: 20rpx;
+    //             border:1rpx solid #e9e9e9;
+    //         }
+    //         .title{font-size: 30rpx; font-weight: 700; color: #000; overflow: hidden;}
+    //         .pianshuping{
+    //             font-size: 24rpx;
+    //             color: red;
+    //         }
+    //         .shupingList{
+    //             min-height: 212rpx;
+    //         }
+    //         /deep/.description{
+    //             overflow: hidden;
+    //             color: #666;
+    //             text-overflow: -o-ellipsis-lastline;
+    //             overflow: hidden;
+    //             text-overflow: ellipsis;
+    //             display: -webkit-box;
+    //             -webkit-line-clamp: 1;
+    //             line-clamp: 1;
+    //             -webkit-box-orient: vertical;
+    //             font-size: 26rpx;
+    //             margin-bottom: 20rpx;
+    //             margin-top:10rpx;
+	// 			img{
+	// 				width: 100% !important;
+	// 			}
+    //         }
+    //         .btns{
+    //             font-size: 22rpx;
+    //             justify-content: space-between;
+    //             align-items: center;
+    //             .left{
+    //                 width: 300rpx;
+    //                 color: #a1a1a1;
+    //             }
+    //             .right{
+    //                 width: 300rpx;
+    //                 display: flex;
+    //                 justify-content: flex-end;
+    //                 align-items: center;
+    //             }
+    //             .gzicon{
+    //                 margin:0 0 0 20rpx;
+    //                 height: 40rpx;
+    //                 width: 40rpx;
+    //                 // float:left;
+    //                 // border-radius: 20rpx;
+    //                 // border:1rpx solid #e9e9e9;
+    //             }
+    //             .opbtns{
+    //                 .pingjia{margin-left: 10px;}
+    //             }
+    //         }
+    //     }
+    // }
+		
+	.mytabs {
+		// background: url('@/static/icon/bgtushu.png') no-repeat left top;
+		height: 80rpx;
+		// margin-bottom: 30rpx;
+
+		.item {
+			border-radius: 10rpx;
+			background-color: #c6ead0;
+			width: 48%;
+			// margin: 0 10rpx;
+			text-align: center;
+			color: #3c7f56;
+			font-size: 36rpx;
+			line-height: 80rpx;
+		}
+
+		.item.active {
+			background-color: #3c7f56;
+			color: #fff;
+		}
+
+		.item1 {
+			margin-right: 20rpx;
+		}
+	}
+</style>