订单发货相关调整

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

pages.json

@@ -476,6 +476,15 @@
 						}
 					}
 				}
+        ,{
+            "path" : "pages/bookShop/deliverLIst",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "快递列表",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/bookShop/deliverDetail.vue

@@ -2,25 +2,26 @@
 	<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">
+		<view v-if="deliverDetails.length > 0">
-			<u-tabs active-color="#2979ff" inactive-color="#606266" bar-height="6" bar-width="40" 
+			<!-- <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>
+				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 class="">
-					<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="kuaidiItem">{{expressCompanyName}} {{expressOrderSn}} 
-					<view class="item" v-for="(item, index) in list.Traces">
+					<u-tag @click="copyData(expressOrderSn)" class="copyCode" text="复制" plain type="success" /></view>
+					<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="time">{{item.acceptTime}}</view>
-								<view class="content">{{item.AcceptStation}}</view>
+								<view class="content">{{item.acceptStation}}</view>
-							</view>
 							</view>
 						</view>
 					</view>
+					
 				</view>
 			</view>			
 		</view>
@@ -29,6 +30,7 @@
 			<text>- 暂无物流信息 -</text>
 		</view>
 		<music-play :playData="playData"></music-play>
+		<public-module></public-module>
 		<!-- <u-loading color="red" :show="loading"></u-loading> -->
 	</view>
 </template>
@@ -50,16 +52,30 @@
 				deliverDetails: [{
 					Traces: []
 				}],
+				express:{},   // 面单
+				consignee:{}, // 收件人信息
+				expressOrderSn:'', // 运单号
+				expressCompanyCode:'', //快递编码
+				expressCompanyName:'' ,// 快递公司
+				orderSn : '',
 				current: 0,
 				deliverList: [],
-				deliverDetailsLength: null
+				deliverDetailsLength: null,
+				orderContet:{},
+				sheetList:[]
 			}
 		},
 		onLoad(e) {
-			this.orderId = e.objId
+			this.expressOrderSn = e.expressOrderSn
+			this.expressCompanyCode = e.expressCompanyCode
+			this.expressCompanyName = e.expressCompanyName
+			//this.express = e.express
+			//this.consignee = e.consignee
+			console.log(e,'传入的参数')
+			this.orderSn = e.orderSn
 		},
 		onShow() {
-			this.getdeliverDetails()
+			this.getOrderList()			
 		},
 		computed: {
 			...mapState(['userInfo']),
@@ -68,6 +84,59 @@
 			musicPlay
 		},
 		methods: {			
+			
+			// 获取订单列表
+			getOrderList() {
+				console.log('this.orderType',this.orderType)
+				this.$http
+					// .get(`book/buyOrder/getOrderInfo?orderId=${this.orderID}`)
+					.get(`/book/buyOrder/orderDetail?orderSn=${this.orderSn}`)
+					.then(res => {
+						console.log('订单详情',res)
+						var seconds = res.result.timestamp + 30 * 60 + 2    // 过期时间
+						var nowSeconds = Math.floor(new Date().getTime() / 1000);
+						res.result.overTime = seconds - nowSeconds
+						
+						this.orderContet = res.result						
+						//this.userRecordid = res.userRecordid
+						this.productIDs = res.result.goodsList.map(item => {
+							return item.buyOrderProductId
+						})
+						// console.log(this.orderContet,'this.orderContet')
+						if (this.orderContet.orderStatus == 0) {
+							this.titleStat = '待支付'
+						} else if (this.orderContet.orderStatus == 1) {
+							this.titleStat = '待发货'
+						} else if (this.orderContet.orderStatus == 2) {
+							this.titleStat = '待收货'
+						} else if (this.orderContet.orderStatus == 3) {
+							this.titleStat = '已完成'
+						}
+						
+						
+						if(parseInt(this.orderContet.orderStatus) >= 2){
+							this.getdeliverDetails()
+							// 查询快递信息
+							// this.getSheetInfo()
+						}
+						console.log(this.orderContet,'订单详情')
+					})
+			},
+			// getSheetInfo(){
+			// 	console.log('查询快递信息')
+			// 	this.$http
+			// 		.get(`express/getPrintTemplateList?expressOrderSn=${this.orderSn}`)
+			// 		.then(res => {
+			// 			if(res.code == 0){
+			// 				this.sheetList = res.result.data
+			// 				console.log(res,'面单信息')
+			// 				this.getdeliverDetails()
+			// 			}
+			// 		}).catch(e => {					
+			// 		console.log('e',e)
+					
+			// 	  })
+			// },
 			// 复制到剪切板
 			copyData(data){
 				uni.setClipboardData({
@@ -84,21 +153,30 @@
 			// 获取物流
 			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/queryExpress?expressOrderSn=${this.expressOrderSn}&expressCompanyCode=${this.expressCompanyCode}&customerName=${subMobile}`)
 					.then(res => {
 						 console.log(res, '物流信息')
 						if (res && res.code === 0) {
 							uni.hideLoading()
-							this.deliverDetails = res.rntStr
+							// this.deliverDetails = res.result.traces
-							// console.log(res.rntStr,'物流信息')
+							console.log(res.result.traces,'物流信息')
-							res.rntStr.forEach((item, index) => {
+							// res.rntStr.forEach((item, index) => {
-								item.Traces = item.Traces.reverse()
+								this.deliverDetails = res.result.traces.reverse()
-									//console.log(item)
+								// item.Traces = item.Traces.reverse()
-								this.deliverList.push({'name':item.ShipperName})
+								// 	//console.log(item)
-							})							
+								// this.deliverList.push({'name':item.ShipperName})
+							// })							
 						}
+					}).catch(e => {
+						console.log(e,'e')
 					})
 			},
 
@@ -155,7 +233,6 @@
 			padding-left: 10px;
 			position: relative;
 		}			
-
 		.item:before {
 			display: inline-block;
 			width: 10px;
@@ -173,18 +250,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 {

pages/bookShop/deliverLIst.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		快递列表页面
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/bookShop/orderLCont.vue

@@ -2,46 +2,39 @@
 	<view class="">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<z-nav-bar :title="titleStat"></z-nav-bar>
+		<z-nav-bar title="订单详情"></z-nav-bar>		
-		<!-- <view class="deliverCntent" v-if="orderType == 2">
+		<view class="adDefault" v-if="consigneeShow">			
-			<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!=''">
 			<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" 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">
+				<view class="" style="position: relative; height: 120rpx;">
-					<text>剩余支付时间：</text>
+					<text class="orderState orderState0"  v-if="orderContet.orderStatus==0">待支付</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>
+					<text class="orderState orderState1" v-if="orderContet.orderStatus==1">待发货</text>
-				</view> -->
+					<text class="orderState orderState2" v-if="orderContet.orderStatus==2">待收货</text>
-				<view class="orderContent" v-for="(item,index) in orderContet.products" :key="index"
+					<text class="orderState orderState3" v-if="orderContet.orderStatus==3">已完成</text>
-					@click="goDetail(item.productId)" v-if="orderContet.products!=''">
+					<text class="orderState orderState5" v-if="orderContet.orderStatus==5">已超时</text>
-					<image :src="item.image" mode=""></image>
+				</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">
 					<span style="color: #666;margin-right: 10rpx;float: left;">运费 : </span>
-					<span>￥</span>{{orderContet.shippingMoney}}
+					<span>￥</span>{{orderContet.shippingPrice}}
 				</view>
 				<view class="orderReal">
 					<span style="color: #666;margin-right: 10rpx;float: left;">优惠券 : </span>
-					<b style="color: #dd3c0c;"><span>-￥</span>{{orderContet.districtMoney}}</b>
+					<b v-if="orderContet.coupon.couponAmount" style="color: #dd3c0c;"><span>-￥</span>{{orderContet.coupon.couponAmount}}</b>
+					<b v-else style="color: #dd3c0c;"><span>-￥</span>0</b>
 				</view>
 				<view class="orderReal">
 					<span style="color: #666;margin-right: 10rpx;float: left;">实付款 : </span>
-					<b style="color: #dd3c0c;"><span>￥</span>{{orderContet.realMoney}}</b>
+					<b style="color: #dd3c0c;"><span>￥</span>{{orderContet.realPrice}}</b>
 				</view>
 				<view class="orderYunf">
 					<span style="color: #666;margin-right: 10rpx;float: left;">订单编号 : </span>
@@ -100,19 +95,26 @@
 					<span style="color: #666;margin-right: 10rpx;float: left;">创建时间 : </span>
 					<text style="font-size: 24rpx;color: #666;">{{orderContet.createTime}}</text>
 				</view>
+				<view class="orderReal" v-if="orderContet.orderStatus >= 1 && orderContet.orderStatus != 5">
+					<span style="color: #666;margin-right: 10rpx;float: left;">付款时间 : </span>
+					<text style="font-size: 24rpx;color: #666;">{{orderContet.paymentDate}}</text>
+				</view>
+				<view class="orderReal" v-if="orderContet.orderStatus >= 2 && orderContet.orderStatus != 5">
+					<span style="color: #666;margin-right: 10rpx;float: left;">发货时间 : </span>
+					<text style="font-size: 24rpx;color: #666;">{{orderContet.shippingTime}}</text>
+				</view>
 				<view class="orderOper">
 					<view  style="width: 100%; text-align: right;">
 						<!-- <u-button text="" type="success" plain ></u-button>
 						<u-button text="" type="primary" plain  >							
 						
 						</u-button> -->
-						<view v-if="orderContet.orderStatus==2"  class="opFix" @click="onPageJump(orderID)">查看物流</view>
+						<view v-if="orderContet.orderStatus>=2 && sheetList.length > 0 && orderContet.orderStatus != 5"  class="opFix" @click="seeExpressDetail(orderContet)">查看物流</view>
 						<view v-if="orderContet.orderStatus==2"  class="opCan" @click="OverOrder" >确认收货</view>
 					
 						<view v-if="orderContet.orderStatus==0" class="opFix" @click="canceOrder">取消订单</view>
 						<view v-if="orderContet.orderStatus==0" class="opCan" @click="goPay(orderContet)">去支付</view>
 											
-						
 						<view class="opCan" @click="kefu">联系客服</view>
 					</view>
 					
@@ -168,6 +170,19 @@
 				</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)">
+						包裹 {{index+1}}
+					</view>
+				</view>
+				
+			</view>
+		</u-popup>
 		<music-play :playData="playData"></music-play>
 	</view>
 </template>
@@ -217,7 +232,7 @@
 				logisticsData: [], // 快递信息列表
 				titleStat: '',
 				orderID: 0,
-				orderSn:null,
+				orderSn:'',
 				orderType: '',
 				orderContet: {},
 				deliverDetails: [{
@@ -227,7 +242,9 @@
 				emoji:[],
 				Files:[],
 				pjType:'',
-				
+				sheetList: [], // 面单数据
+				consigneeShow: false,
+				sheetListShow:false,
 			}
 		},
 		onLoad(e) {
@@ -237,7 +254,9 @@
 			this.orderSn = e.orderSn
 			console.log(this.orderID,'this.orderID')
 		},
-		
+		onHide() {
+			this.sheetList= []
+		},
 		onShow() {
 			this.getOrderList()			
 		},
@@ -250,6 +269,12 @@
 		},
 		
 		methods: {	
+			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 +508,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 + "&expressCompanyCode="+this.sheetList[0].expressCompanyCode + "&expressCompanyName="+this.sheetList[0].expressCompanyName
+					})
+				}
+			},
 			onPageJump(item) {
 				uni.navigateTo({
 					url: "./deliverDetail?objId=" + item
@@ -529,7 +566,8 @@
 			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    // 过期时间
@@ -537,9 +575,10 @@
 						res.result.overTime = seconds - nowSeconds
 						
 						this.orderContet = res.result
-						this.userRecordid = res.userRecordid
+						this.consigneeShow = true
-						this.productIDs = res.result.products.map(item => {
+						//this.userRecordid = res.userRecordid
-							return item.productId
+						this.productIDs = res.result.goodsList.map(item => {
+							return item.buyOrderProductId
 						})
 						// console.log(this.orderContet,'this.orderContet')
 						if (this.orderContet.orderStatus == 0) {
@@ -552,29 +591,62 @@
 							this.titleStat = '已完成'
 						}
 						
+						
+						if(parseInt(this.orderContet.orderStatus) >= 2){
+							// 查询快递信息
+							// this.getSheetInfo()
+							 if(this.orderContet.goodsList.length > 0){
+								 this.sheetList = []
+							            // console.log('存在商品数据', this.orderContet.goodsList.length)
+							            // var ids = []
+							            // ids.push(this.orderContet.goodsList[0].expressInfo.expressOrderSn)
+							            // this.sheetList.push(this.orderContet.goodsList[0].expressInfo)
+							            // for (let index = 1; index < this.orderContet.goodsList.length; index++) {
+							            //   // if (!ids.includes(this.orderContet.goodsList[index].expressInfo.expressOrder)) {
+							            //     ids.push(this.orderContet.goodsList[index].expressInfo.expressOrderSn)
+							            //     this.sheetList.push(this.orderContet.goodsList[index].expressInfo)}
+							            //     console.log(this.orderContet.goodsList[index].expressInfo.expressOrderSn,'expressOrderSn')
+							            //  // }
+							            // console.log(ids,this.sheetList,'this.sheetList')
+							          }
+						}
 						console.log(this.orderContet,'订单详情')
 					})
 			},
-			// 获取物流
+			// getSheetInfo(){
-			getdeliverDetails() {
+			// 	console.log('查询快递信息')
-				this.$http
+			// 	this.$http
-					.post(`/book/buyOrder/queryFMS?orderId=${this.orderID}`)
+			// 		.get(`express/getPrintTemplateList?expressOrderSn=${this.orderSn}`)
-					.then(res => {
+			// 		.then(res => {
-						if (res && res.code === 0) {
+			// 			if(res.code == 0){
-							console.log(res, '物流信息')	
+			// 				this.sheetList = res.result.data
-							// if(res.msg.indexOf('暂未查到物流信息') == -1){
+			// 				console.log(res,'面单信息')
-							// 	this.
 			// 			}
-							res.rntStr.forEach(item => {
+			// 		}).catch(e => {					
-								item.Traces = item.Traces.reverse()
+			// 		console.log('e',e)
-							})
-							this.deliverDetails = res.rntStr
-							this.deliverDetailsLength = this.deliverDetails[0].Traces.length
-						} else {
 					
-						}
+			// 	  })
-					})
+			// },
-			},
+			// 获取物流
+			// 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 +767,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; }

pages/bookShop/orderList.vue

@@ -11,7 +11,7 @@
 		</view>
 
 		<view class="orderList" v-if="orderList.length > 0">
-			<view class="orderItem" v-for="(ifex,inten) in orderList">
+			<view class="orderItem" v-for="(ifex,inten) in orderList" @click="goOrdiCont(ifex)" :key="inten">
 				<text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text>
 				<text class="orderState orderState1" v-if="ifex.orderStatus==1">待发货</text>
 				<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text>
@@ -19,20 +19,22 @@
 				<text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text>
 				<view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0">
 					<text>剩余支付时间：</text>
-					<uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false" :hour="0" :minute="0" :second="ifex.overTime" @timeup="countDown"></uni-countdown>
+					<uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false"
+						:hour="0" :minute="0" :second="ifex.overTime" @timeup="countDown"></uni-countdown>
 				</view>
 				<view class="flexbox orderSn">
 					<text class="">订单编号: {{ifex.orderSn}}</text>
 				</view>
 				<view class="orderContent" :key="index" v-if="ifex.orderType=='order'"
-					v-for="(item,index) in ifex.products" @click="goOrdiCont(ifex)">
+					v-for="(item,index) in ifex.productList">
-					<image :src="item.image" mode=""></image>
+					<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>
@@ -47,7 +49,8 @@
 							<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>
@@ -60,7 +63,8 @@
 							<text>会员充值</text>
 						</view>
 						<view class="orderPrice">
-							<text style="color: #f56c6c;">￥</text><text style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
 						</view>
 						<br clear="both">
 					</view>
@@ -69,16 +73,24 @@
 				<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="opFix" @click.stop="canceOrder(ifex)">取消订单</view>
 					<view class="opCan" @click="goPay(ifex)">去支付</view>
 				</view>
 			</view>
+			<view v-if="status==0" style="text-align: center;">
+				<u-loading-icon style="display: inline-block;"></u-loading-icon>
+				<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+			</view>
+			<view v-if="status==1" style="padding-bottom: 20rpx;">
+				<u-divider text="全部加载完成"></u-divider>
+			</view>
 		</view>
 		<view class="" v-else style=" margin-top: 250rpx;">
-			<u-divider text="暂无列表数据"></u-divider>
+			<u-divider text="暂无订单数据"></u-divider>
 		</view>
 		<z-navigation></z-navigation>
 		<music-play :playData="playData"></music-play>
@@ -90,10 +102,12 @@
 	import $http from '@/config/requestConfig.js';
 	import {
 		setPay,
-		setPayAssign,setWXPay
+		setPayAssign,
+		setWXPay
 	} from '@/config/utils';
 	import {
-		mapState,mapMutations
+		mapState,
+		mapMutations
 	} from 'vuex';
 	export default {
 		data() {
@@ -101,7 +115,7 @@ import {
 				playData: {},
 				orderTabs: [{
 					name: '全部',
-					value: 9
+					value: null
 				}, {
 					name: '待支付',
 					value: 0
@@ -117,16 +131,24 @@ import {
 				}, {
 					name: '已超时',
 					value: 5
-				},
+				}, ],
-				],
+				orderListTab: null,
-				orderListTab: 9,
 				orderList: [],
 				iapChannel: {},
 				checking: false, // 正在检测
 				ComplateRequestArr: null,
-				isAndorid:true
+				isAndorid: true,
+				status: 3, // 加载状态
+				totalPage: 0,
+				page: 1
 			}
 		},
+		onHide() {
+			this.orderList = [],
+				this.page = 1
+			this.totalPage = 0
+			this.orderListTab = null
+		},
 		onShow() {
 			this.getOrderList()
 			this.checkIapOrders() //检查未完成的苹果支付订单
@@ -139,9 +161,25 @@ import {
 		},
 		// 下拉刷新
 		onPullDownRefresh() {
+			this.orderList = [],
+				this.page = 1
+			this.totalPage = 0
 			this.getOrderList()
 			uni.stopPullDownRefresh()
 		},
+		onReachBottom() {
+			console.log('到底了')
+			if (this.page < this.totalPage) {
+				this.page++
+				//	console.log('加载',this.page)
+				this.status = 0
+				this.getOrderList()
+			} else {
+				this.status = 1
+				console.log('加载完成了', this.page)
+				return
+			}
+		},
 		components: {
 			musicPlay
 		},
@@ -150,6 +188,9 @@ import {
 			// 倒计时回调
 			countDown() {
 				console.log('重新刷新订单')
+				this.totalPage = 0
+				this.page = 1
+				this.orderList = []
 				this.getOrderList()
 			},
 			// 获得操作系统
@@ -183,29 +224,56 @@ import {
 			// 切换订单状态
 			orderTabCLi(e) {
 				this.orderListTab = e
+				this.totalPage = 0
+				this.page = 1
+				this.orderList = []
 				this.getOrderList()
 			},
 
 			// 获取订单列表
 			getOrderList() {
-				this.$http
+				let data = {
-					.post(`book/buyOrder/getMyOrderList?userId=${this.userInfo.id}&orderStatus=${this.orderListTab}`)
+					"userId": "",
-					.then(res => {
+					"orderStatus": this.orderListTab,
-						res.page.list.forEach((item,index) => {								
+					"page": this.page,
+					"limit": 10,
+					'userId': this.userInfo.id
+				}
+
+				$http.request({
+					// url: "book/buyOrder/orderList",
+					url: "book/buyOrder/getUserOrderList",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					if (res.code == 0) {
+						res.page.records.forEach((item, index) => {
 							var seconds = item.timestamp + 30 * 60 + 2 // 过期时间 30分钟+2
 							// var seconds = item.timestamp + 30 + 2    // 过期时间 30秒
 							var nowSeconds = Math.floor(new Date().getTime() / 1000); // 单位秒
 							item.overTime = seconds - nowSeconds
 							// console.log(item.overTime,'item.overTime')
-							
 						})
-						this.orderList = res.page.list
+						this.orderList = this.orderList.concat(res.page.records)
+						this.totalPage = res.page.pages
+						if (res.page.pages == this.page) {
+							this.status = 1
+						} else {
+							this.status = 3
+						}
 						console.log(this.orderList, '订单列表')
+					}
 				})
+
 			},
 
 			// 订单详情
 			goOrdiCont(e) {
+				console.log(e, 'e')
+				//let orderId = e.orderId ? e.orderId : e.id
 				uni.navigateTo({
 					url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus + '&orderSn=' + e.orderSn
 				});
@@ -237,6 +305,9 @@ import {
 										icon: 'none',
 										title: '取消订单成功'
 									})
+									this.page = 1
+									this.totalPage = 0
+									this.orderList = []
 									this.getOrderList()
 								})
 						}
@@ -268,6 +339,9 @@ import {
 								image: '../../static/icon/ic_close.png'
 							});
 						}
+						this.orderList = [],
+							this.page = 1
+						this.totalPage = 0
 						this.getOrderList()
 					})
 				} else if (payItem.paymentMethod == 1) {
@@ -368,7 +442,9 @@ import {
 				const that = this
 				uni.hideLoading()
 				// var restoreFlag = true; // 调用支付接口时标记 restoreFlag = true , 实际应用请将标记存储在 storage 中  
-				this.setUserInfo({restoreFlag:true});
+				this.setUserInfo({
+					restoreFlag: true
+				});
 				console.log(this.userInfo, '更新后的用户信息')
 				plus.payment.request(that.iapChannel, {
 					productid: payItem.productId,
@@ -421,7 +497,9 @@ import {
 							}
 						})
 					} else {
-							this.setUserInfo({restoreFlag:false});
+						this.setUserInfo({
+							restoreFlag: false
+						});
 						console.log('无未处理订单，可以拉起新的支付')
 					}
 					// }
@@ -435,7 +513,9 @@ import {
 					console.log('关闭订单成功', index);
 
 					if (index == this.ComplateRequestArr.length - 1) { // 最后一个支付订单
-						this.setUserInfo({restoreFlag:false});	
+						this.setUserInfo({
+							restoreFlag: false
+						});
 						console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
 					}
 
@@ -538,8 +618,19 @@ import {
 
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-	.guoqi{ font-size: 28rpx; align-items: center; color: red; float: right; line-height: 40rpx;}
+
-	.flexbox{display: flex;}
+	.guoqi {
+		font-size: 28rpx;
+		align-items: center;
+		color: red;
+		float: right;
+		line-height: 40rpx;
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
 	.orderTabs {
 		margin: 60rpx 0 0 0;
 		width: 100%;
@@ -580,20 +671,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;
+			.orderSn {
-				padding:10rpx; border-radius: 0 24rpx 24rpx 0;
+				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;}
+			.orderState0 {
-			.orderState2{background-color: #f56c6c;}
+				background-color: #e6a23c;
-			.orderState3{background-color: #67c23a;}
+			}
-			.orderState5{background-color: #787878;}
+
+			.orderState1 {
+				background-color: #409eff;
+			}
+
+			.orderState2 {
+				background-color: #f56c6c;
+			}
+
+			.orderState3 {
+				background-color: #67c23a;
+			}
+
+			.orderState5 {
+				background-color: #787878;
+			}
+
 			.orderContent {
 				margin-bottom: 20rpx;
 

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>
+					v-if="youhuiList.length>0">当前可选{{this.youhuiList.length}}张</text>
-				<text class="dagnqian" v-if="youhuiList.length==0&&youhuiContent.id==undefined"
+				<text class="dagnqian" v-else
 					style="background-color: #999;">暂无优惠券</text>
 				<text class="dagnqian" v-if="youhuiContent.id!=undefined">
 					- ￥{{youhuiContent.coupons.couponAmount}}</text>
@@ -151,7 +151,7 @@
 							<view class="addrContentBottom">
 								<view class="userAddress">
 									{{item.province}} {{item.city}} {{item.county}} 
-									{{item.useraddress}}
+									{{item.detailAddress}}
 								</view>
 							</view>
 						</view>
@@ -166,7 +166,7 @@
 		<u-popup :show="youhuiShow" :round="10" @close="youhuiShow=false">
 			<view class="tanchu">
 				<view class="dp_title">请选择优惠券</view>
-				<view style="max-height: 1000rpx;overflow-y: scroll;">
+				<view style="max-height: 1000rpx;overflow-y: scroll;" v-if="youhuiList.length > 0">
 					<view :class="youhuiIndex === index ? 'youhuiItem youItem_style' : 'youhuiItem'"
 						v-for="(item,index) in youhuiList" :key="index" @click="choseYouhui(index)">
 						<view style="width: 25%;color:#fd6004;text-align: center;">
@@ -189,9 +189,12 @@
 						</view>
 						<br clear="both">
 					</view>
-				</view>
 					<view style="font-size: 20rpx;color: #aaa;margin-top: 30rpx;">* 每笔订单只能使用一张优惠价</view>
 				</view>
+				<view class="" v-else>
+					<u-divider text="暂无可用优惠券哦"></u-divider>
+				</view>				
+			</view>
 		</u-popup>
 
 	<music-play :playData="playData"></music-play>
@@ -357,7 +360,7 @@
 								this.addressList = res.list
 								// console.log(this.addressList,'地址列表')
 								this.adressMoRen = this.addressList[this.adressMoRIndex]
-								// console.log(this.adressMoRen, '默认')
+								console.log(this.adressMoRen, '默认')
 								if(this.adressMoRen != {}){
 									// console.log('运费之前')
 									this.getYunFei()
@@ -459,7 +462,8 @@
 				 console.log(key,'this.adressMoRen.areaidpath')
 				
 				$http.request({
-					url: "book/buyOrder/calculateTransportPrice/",
+					// url: "book/buyOrder/calculateTransportPrice/",
+					url: "book/buyOrder/calculateTransportPrice",
 					// url: "book/buyorder/getTransPrice/" + this.adressMoRen.areaidpath + "?" + dataToString,
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
 					data:{
@@ -473,11 +477,10 @@
 				}).then(res => {					
 					if (res.code == 0) {
 						this.farePrice = res.result
-					}else{
-						this.farePrice = 0
-					}
 						console.log('需要的运费',res.result)
 						this.allPrice()
+					}
+					
 				})
 			},	
 
@@ -613,13 +616,13 @@
 					couponName: youPre.coupons.name, //优惠券名称
 					districtMoney: youPre.coupons.amount, //优惠金额
 					orderStatus: 0, //订单状态
-					products: xiaBiao, //订单列表
+					productList: xiaBiao, //订单列表商品
 					orderType: "order", //订单类型
 					addressId:this.adressMoRen.id    // 地址ID
 				}				
 				$http.request({					
-					// url: "book/buyorder/save",
+					// url: "book/buyOrder/buySave",
-					url: "book/buyOrder/buySave",
+					url: "book/buyOrder/placeOrder",
 					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
 					data,
 					header: { //默认 无 说明：请求头

pages/user/addAddress.vue

@@ -22,7 +22,6 @@
 					<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName"
 						@confirm="addconfirm" @change="changeHandler" ></u-picker>
 				</u-form-item>				
-
 				<u-form-item label="详细地址 :" prop="useraddress">
 					<u-input type="string" v-model="addressForm.useraddress" placeholder="小区楼栋/乡村名称" clearable
 						border="surround" />
@@ -45,18 +44,26 @@
 			@confirm="deleteSub">
 		</u-modal>
 		<music-play :playData="playData"></music-play>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
 	</view>
 </template>
 
 <script>
+	
 	import musicPlay from '@/components/music.vue'
 	import $http from '@/config/requestConfig.js';
+	import addressList1 from "@/static/json/address.json"
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
+				// array: ['中国', '美国', '巴西', '日本'],
+				// indexp:0,
+				// indexq:0,
+				// indexc:0,
 				playData:{},
 				addreShow: false, //是否显示
 				columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据
@@ -119,6 +126,7 @@
 			}
 		},
 		onLoad(e) {
+			this.addressList = addressList1
 			if (e.type == 0) {
 				this.navName = '添加地址'
 				this.isShowDel = false
@@ -129,6 +137,7 @@
 				this.getAddress()
 			}
 			this.initDataPicker() //初始化省份列表
+			
 		},
 		onShow() {
 		
@@ -145,12 +154,12 @@
 		methods: {						
 			// 三级联动
 			initDataPicker() {
-				this.$http
+				// console.log(this.addressList,'addressList')				
-					.post('api/province/getProvince')
+				// this.$http
-					.then(res => {
+					// .post('api/province/getProvince')
-						if (res.code == 0) {
+					// .then(res => {
-							this.addressList = res.provinceEntity
+					// 	if (res.code == 0) {
-
+							// this.addressList = res.provinceEntity
 							//此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组
 							let province = []; //初始数据需要展示的省份
 							let province1 = [{
@@ -208,7 +217,7 @@
 							this.columns.push(province1);
 							this.columns.push(province2);
 
-
+							// console.log(6666666,this.columns)
 
 							// 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组
 							// 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据
@@ -237,11 +246,14 @@
 								this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市
 							});
 
-						};
+						// };
-					})
+					// }).catch(e => {
+					// 	console.log(e,'e')
+					// })
 
 			},
 			changeHandler(e) { //城市选择时触发
+			console.log(e,'变化了',this.columnData, this.columnDatas)
 			this.addressChanged = true
 				const {
 					columnIndex, //当前选择的列，省 / 市 / 区
@@ -254,6 +266,7 @@
 				// 当第一列值发生变化时，变化第二列和第三列的值（省份变更，市和区跟着变更）
 				if (columnIndex === 0) { // 判断当前变更的是省还是市还是区
 					// picker为选择器this实例，变化第二列对应的选项				
+					
 					picker.setColumnValues(1, this.columnData[
 						index]); //设置市为该省下面的所有市，index是当前省在省份数组的下标，对应市数组中的下表就是 该省下面的所有市 的数据
 					picker.setColumnValues(2, this.columnDatas[index][0]); // 设置区域为该省下面第一个市下面的所有区域
@@ -265,6 +278,7 @@
 			},
 
 			addconfirm(e) { //点击确定按钮
+			console.log(e,'选中的值')
 				this.addressChanged = true
 				this.addreShow = false;
 				this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName
@@ -402,6 +416,10 @@
 </script>
 
 <style lang="scss" scoped>
+	.flexbox{display: flex;}
+	.selectAdd{ justify-content: space-between;
+		.addItem{ display: block;width: 30%}
+	}
 	.add_arrow {
 		height: 28px;
 		line-height: 28px;