diff --git a/pages/news/recycling/recoveryList.vue b/pages/news/recycling/recoveryList.vue
index 67f769a..be44fa8 100644
--- a/pages/news/recycling/recoveryList.vue
+++ b/pages/news/recycling/recoveryList.vue
@@ -157,7 +157,10 @@
 					uni.showToast({
 						title: "完成成功"
 					})
-					this.getList(1)
+					this.classifyShow = 2
+					this.pageNum = 1;
+					this.goodsList = []
+					this.getOrderList(1)
 				}
 			},
 			//取消订单
@@ -173,7 +176,9 @@
 					uni.showToast({
 						title: "取消成功"
 					})
-					this.classifyShow = 2
+					this.pageNum = 1;
+					this.goodsList = []
+					this.classifyShow = 3
 					this.getOrderList(1)
 				}
 			},
@@ -188,6 +193,8 @@
 				} = await newFunApi.orderStatus({});
 				if (status == 200) {
 					this.classList = data.list
+					this.pageNum = 1;
+					this.goodsList = []
 					this.getOrderList();
 				}
 			},
diff --git a/pages/news/user/report.vue b/pages/news/user/report.vue
index 6f92c5f..d3e46fa 100644
--- a/pages/news/user/report.vue
+++ b/pages/news/user/report.vue
@@ -1,7 +1,8 @@
-<template>
+<template>
 	<view class="report">
 		<view class="report-tab">
-			<u-tabs :list="list" height="110" font-size="32" active-color="#F34A40" inactive-color="#686868" :is-scroll="false" v-model="tabIndex" @change="change"></u-tabs>
+			<u-tabs :list="list" height="110" font-size="32" active-color="#F34A40" inactive-color="#686868"
+				:is-scroll="false" v-model="tabIndex"></u-tabs>
 		</view>
 		<view class="report-bd" v-if="tabIndex == 0">
 			<view class="module1">
@@ -61,22 +62,19 @@
 		</view>
 		<view class="export" v-if="tabIndex == 1">
 			<view class="a">
-				<view class="item">昨日</view>
-				<view class="item">近7日</view>
-				<view class="item">近15日</view>
-				<view class="item">近30日</view>
+				<view @click="activeTab(index)" class="item" :class="dateIndex==index?'itemActive':''"
+					v-for="(item,index) in dateList" :key="index">{{item}}
+				</view>
 			</view>
 			<view class="b">
-				<picker mode="date" :value="date1" :start="startDate" :end="endDate" @change="bindDateChange">
-					<view class="start timer">{{date1?date1:'开始时间'}}</view>
-				</picker>
+				<view class="start timer" @click="isShow=true">{{startTime?startTime:'开始时间'}}</view>
 				<view class="or">-</view>
-				<picker mode="date" :value="date2" :start="startDate" :end="endDate" @change="bindDateChange">
-					<view class="end timer">{{date2?date2:'结束时间'}}</view>
-				</picker>
+				<view class="end timer" @click="isShow=true">{{endTime?endTime:'结束时间'}}</view>
 			</view>
-			<view class="c">导出</view>
+			<view class="c" :style="{'opacity': (startTime||dateIndex>-1)?1:0.6 }" @click="quantityFilter">筛选</view>
 		</view>
+		<u-calendar v-model="isShow" mode="range" @change="getTime" range-color='#F34A40' range-bg-color='#FFBDBA'
+			active-bg-color='#F34A40'></u-calendar>
 		<view class="report-bd" v-if="tabIndex == 1">
 			<view class="module1">
 				<view class="title">订单数据</view>
@@ -144,274 +142,363 @@
 				</view>
 			</view>
 		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
+	</view>
+</template>
+
+<script>
+	import * as newFunApi from '@/api/newFun'
+	export default {
+		data() {
 			return {
-				list: [{
-					name: '今日数据'
-				}, {
-					name: '历史数据'
+				dateList: ['昨日', '近7日', '近15日', '近30日'],
+				dateIndex: -1,
+				list: [{
+					name: '今日数据'
+				}, {
+					name: '历史数据'
 				}],
-				date1: "",
-				date2: "",
-				tabIndex: 0
-			}
-		},
-		computed: {
-			startDate() {
-				return this.getDate('start');
-			},
-			endDate() {
-				return this.getDate('end');
+				tabIndex: 0,
+				isShow: false,
+				startTime: '',
+				endTime: '',
+				recentDate: ''
 			}
-		},
+		},
+		onLoad() {
+			this.getNumberPages()
+			var yesterday = this.getDay(-1)
+			var th_7 = this.getDay(-7);
+			var th_15 = this.getDay(-15)
+			var th_30 = this.getDay(-30)
+			console.log(yesterday, th_7, th_15, th_30)
+
+		},
 		methods: {
-			change() {
-				
-			},
-			tabItem(index){
+			activeTab(index) {
+				this.dateIndex = index;
+				let day = ''
+				if (this.dateIndex == 0) {
+					day = -1
+				}
+				if (this.dateIndex == 1) {
+					day = -7
+				}
+				if (this.dateIndex == 2) {
+					day = -15
+				}
+				if (this.dateIndex == 3) {
+					day = -30
+				}
+				this.recentDate = this.getDay(day);
+				console.log(this.recentDate)
+			},
+			quantityFilter() {},
+			getTime(e) {
+				this.startTime = e.startDate;
+				this.endTime = e.endDate;
+			},
+			tabItem(index) {
+				this.dateIndex = -1;
+				this.startTime = '';
+				this.endTime = '';
 				this.tabIndex = index
 			},
-			bindDateChange1: function(e) {
-				this.date1 = e.detail.value
+			getNumberPages() {
+				const that = this
+				return new Promise((resolve, reject) => {
+					newFunApi.addressList({
+							user_id: 10006
+						})
+						.then(result => {
+							console.log(result)
+						})
+						.catch(reject)
+				})
 			},
-			bindDateChange2: function(e) {
-				this.date2 = e.detail.value
+			getDay(day) {
+				var today = new Date();
+				var targetday_milliseconds = today.getTime() + 1000 * 60 * 60 * 24 * day;
+				today.setTime(targetday_milliseconds); //注意，这行是关键代码
+
+				var tYear = today.getFullYear();
+				var tMonth = today.getMonth();
+				var tDate = today.getDate();
+				tMonth = this.doHandleMonth(tMonth + 1);
+				tDate = this.doHandleMonth(tDate);
+				return tYear + "-" + tMonth + "-" + tDate;
 			},
-			getDate(type) {
-				const date = new Date();
-				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
-				let day = date.getDate();
-
-				if (type === 'start') {
-					year = year - 60;
-				} else if (type === 'end') {
-					year = year + 2;
+			doHandleMonth(month) {
+				var m = month;
+				if (month.toString().length == 1) {
+					m = "0" + month;
 				}
-				month = month > 9 ? month : '0' + month;
-				day = day > 9 ? day : '0' + day;
-				return `${year}-${month}-${day}`;
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.report{
-	overflow: hidden;
-	&-tab{
-		margin-top: 20rpx;
-		overflow: hidden;
-	}
-	.export{
-		width: 100%;
-		height: 312rpx;
-		background: #FFFFFF;
-		margin-top: 20rpx;
-		padding: 0 40rpx;
-		box-sizing: border-box;
-		.a{
-			overflow: hidden;
-			.item{
-				width: 156rpx;
-				line-height: 64rpx;
-				background: #FFF6F5;
-				border-radius: 4rpx;
-				text-align: center;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #3B3B3B;
-				float: left;
-				margin-top: 20rpx;
-				margin-left: 15rpx;
-				&:first-child{
-					margin-left: 0;
-				}
-			}
-		}
-		.b{
-			overflow: hidden;
-			.timer{
-				width: 288rpx;
-				line-height: 64rpx;
-				background: #FFF6F5;
-				border-radius: 4rpx;
-				text-align: center;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #3B3B3B;
-				float: left;
-				margin-top: 20rpx;
-			}
-			.or{
-				width: 93rpx;
-				height: 64rpx;
-				display: flex;
-				margin-top: 20rpx;
-				align-items: center;
-				justify-content: center;
-				float: left;
-				text-align: center;
-				font-size: 60rpx;
-			}
-		}
-		.c{
-			width: 100%;
-			line-height: 88rpx;
-			background: #FFAAA4;
-			border-radius: 88rpx;
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #FFFFFF;
-			margin-top: 26rpx;
-			text-align: center;
+				return m;
+			},
+			// getDate(type) {
+			// 	const date = new Date();
+			// 	let year = date.getFullYear();
+			// 	let month = date.getMonth() + 1;
+			// 	let day = date.getDate();
+			// 	if (type === 'start') {
+			// 		year = year - 60;
+			// 	} else if (type === 'end') {
+			// 		year = year + 2;
+			// 	}
+			// 	month = month > 9 ? month : '0' + month;
+			// 	day = day > 9 ? day : '0' + day;
+			// 	return `${year}-${month}-${day}`;
+			// }
 		}
 	}
-	&-bd{
-		padding: 0 20rpx 20rpx;
+</script>
+
+<style lang="scss" scoped>
+	::v-deep .u-btn--primary {
+		background-color: #FC3E27 !important;
+		border-color: #FC3E27;
+	}
+
+	.report {
 		overflow: hidden;
-		margin-top: 20rpx;
-		
-		.module1{
+
+		&-tab {
+			margin-top: 20rpx;
+			overflow: hidden;
+		}
+
+		.export {
 			width: 100%;
-			height: 504rpx;
-			background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
-			border-radius: 10rpx;
-			padding: 25rpx 20rpx;
+			height: 312rpx;
+			background: #FFFFFF;
+			margin-top: 20rpx;
+			padding: 0 40rpx;
 			box-sizing: border-box;
-			.title{
-				position: relative;
-				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #3B3B3B;
-				border-left: 3px solid #FF6257;
-				padding-left: 30rpx;
+
+			.a {
+				overflow: hidden;
+
+				.item {
+					width: 156rpx;
+					line-height: 64rpx;
+					background: #FFF6F5;
+					border-radius: 4rpx;
+					text-align: center;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #3B3B3B;
+					float: left;
+					margin-top: 20rpx;
+					margin-left: 15rpx;
+
+					&:first-child {
+						margin-left: 0;
+					}
+				}
+
+				.itemActive {
+					color: #fff;
+					background: #FF6F5F;
+				}
 			}
-			.item{
-				width: 33.3%;
-				float: left;
-				padding: 25rpx 0;
-				text-align: center;
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #ABABAB;
-				text{
-					display: block;
-					font-size: 32rpx;
-					font-weight: 500;
+
+			.b {
+				overflow: hidden;
+
+				.timer {
+					width: 288rpx;
+					line-height: 64rpx;
+					background: #FFF6F5;
+					border-radius: 4rpx;
+					text-align: center;
+					font-size: 28rpx;
+					font-weight: 400;
 					color: #3B3B3B;
+					float: left;
 					margin-top: 20rpx;
+					height: 64rpx;
+				}
+
+				.or {
+					width: 93rpx;
+					height: 64rpx;
+					display: flex;
+					margin-top: 20rpx;
+					align-items: center;
+					justify-content: center;
+					float: left;
+					text-align: center;
+					font-size: 60rpx;
 				}
 			}
-		}
-		.module2{
-			width: 100%;
-			height: 246rpx;
-			margin-top: 20rpx;
-			background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
-			border-radius: 10rpx;
-			padding: 25rpx 20rpx;
-			box-sizing: border-box;
-			.title{
-				position: relative;
+
+			.c {
+				width: 100%;
+				line-height: 88rpx;
+				background: #F34A40;
+				border-radius: 88rpx;
 				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
 				font-weight: 500;
-				color: #3B3B3B;
-				border-left: 3px solid #FF6257;
-				padding-left: 30rpx;
-			}
-			.item{
-				width: 33.3%;
-				float: left;
-				padding: 25rpx 0;
+				color: #FFFFFF;
+				margin-top: 26rpx;
 				text-align: center;
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #ABABAB;
-				text{
-					display: block;
-					font-size: 32rpx;
-					font-weight: 500;
-					color: #3B3B3B;
-					margin-top: 20rpx;
-				}
 			}
 		}
-		.module3{
-			width: 100%;
-			height: 246rpx;
+
+		&-bd {
+			padding: 0 20rpx 20rpx;
+			overflow: hidden;
 			margin-top: 20rpx;
-			background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
-			border-radius: 10rpx;
-			padding: 25rpx 20rpx;
-			box-sizing: border-box;
-			.title{
-				position: relative;
-				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #3B3B3B;
-				border-left: 3px solid #FF6257;
-				padding-left: 30rpx;
+
+			.module1 {
+				width: 100%;
+				height: 504rpx;
+				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
+				border-radius: 10rpx;
+				padding: 25rpx 20rpx;
+				box-sizing: border-box;
+
+				.title {
+					position: relative;
+					font-size: 28rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					color: #3B3B3B;
+					border-left: 3px solid #FF6257;
+					padding-left: 30rpx;
+				}
+
+				.item {
+					width: 33.3%;
+					float: left;
+					padding: 25rpx 0;
+					text-align: center;
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #ABABAB;
+
+					text {
+						display: block;
+						font-size: 32rpx;
+						font-weight: 500;
+						color: #3B3B3B;
+						margin-top: 20rpx;
+					}
+				}
 			}
-			.item{
-				width: 33.3%;
-				float: left;
-				padding: 25rpx 0;
-				text-align: center;
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #ABABAB;
-				text{
-					display: block;
-					font-size: 32rpx;
+
+			.module2 {
+				width: 100%;
+				height: 246rpx;
+				margin-top: 20rpx;
+				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
+				border-radius: 10rpx;
+				padding: 25rpx 20rpx;
+				box-sizing: border-box;
+
+				.title {
+					position: relative;
+					font-size: 28rpx;
+					font-family: PingFang SC, PingFang SC;
 					font-weight: 500;
 					color: #3B3B3B;
-					margin-top: 20rpx;
+					border-left: 3px solid #FF6257;
+					padding-left: 30rpx;
+				}
+
+				.item {
+					width: 33.3%;
+					float: left;
+					padding: 25rpx 0;
+					text-align: center;
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #ABABAB;
+
+					text {
+						display: block;
+						font-size: 32rpx;
+						font-weight: 500;
+						color: #3B3B3B;
+						margin-top: 20rpx;
+					}
 				}
 			}
-		}
-		.module4{
-			width: 100%;
-			height: 246rpx;
-			margin-top: 20rpx;
-			background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
-			border-radius: 10rpx;
-			padding: 25rpx 20rpx;
-			box-sizing: border-box;
-			.title{
-				position: relative;
-				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #3B3B3B;
-				border-left: 3px solid #FF6257;
-				padding-left: 30rpx;
+
+			.module3 {
+				width: 100%;
+				height: 246rpx;
+				margin-top: 20rpx;
+				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
+				border-radius: 10rpx;
+				padding: 25rpx 20rpx;
+				box-sizing: border-box;
+
+				.title {
+					position: relative;
+					font-size: 28rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					color: #3B3B3B;
+					border-left: 3px solid #FF6257;
+					padding-left: 30rpx;
+				}
+
+				.item {
+					width: 33.3%;
+					float: left;
+					padding: 25rpx 0;
+					text-align: center;
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #ABABAB;
+
+					text {
+						display: block;
+						font-size: 32rpx;
+						font-weight: 500;
+						color: #3B3B3B;
+						margin-top: 20rpx;
+					}
+				}
 			}
-			.item{
-				width: 33.3%;
-				float: left;
-				padding: 25rpx 0;
-				text-align: center;
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #ABABAB;
-				text{
-					display: block;
-					font-size: 32rpx;
+
+			.module4 {
+				width: 100%;
+				height: 246rpx;
+				margin-top: 20rpx;
+				background: linear-gradient(180deg, #FEF4F3 0%, #FFFFFF 100%);
+				border-radius: 10rpx;
+				padding: 25rpx 20rpx;
+				box-sizing: border-box;
+
+				.title {
+					position: relative;
+					font-size: 28rpx;
+					font-family: PingFang SC, PingFang SC;
 					font-weight: 500;
 					color: #3B3B3B;
-					margin-top: 20rpx;
+					border-left: 3px solid #FF6257;
+					padding-left: 30rpx;
+				}
+
+				.item {
+					width: 33.3%;
+					float: left;
+					padding: 25rpx 0;
+					text-align: center;
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #ABABAB;
+
+					text {
+						display: block;
+						font-size: 32rpx;
+						font-weight: 500;
+						color: #3B3B3B;
+						margin-top: 20rpx;
+					}
 				}
 			}
 		}
 	}
-}
 </style>
diff --git a/pages/news3/addressList.vue b/pages/news3/addressList.vue
index ca06ec2..5096e05 100644
--- a/pages/news3/addressList.vue
+++ b/pages/news3/addressList.vue
@@ -9,7 +9,8 @@
 						<view class="d">
 							{{item.detail}}
 						</view>
-					<u-icon @click="changeAdd(item)" name="checkbox-mark" :color="addIndex==item.address_id?'#F34A40':'#979797'" size="42"></u-icon>
+						<u-icon @click="changeAdd(item)" name="checkbox-mark"
+							:color="addIndex==item.address_id?'#F34A40':'#979797'" size="42"></u-icon>
 					</view>
 				</view>
 			</view>
@@ -42,39 +43,40 @@
 					}
 				}],
 				addressId: '',
-				addIndex:''
+				addIndex: ''
 			};
 		},
 		onShow() {
 			this.getAddressList()
 		},
 		methods: {
-			changeAdd(item){
-				this.addressData=item
-				this.addIndex=item.address_id
+			changeAdd(item) {
+				this.addressData = item
+				this.addIndex = item.address_id
 			},
 			getAddressList() {
+				let userInfo =uni.getStorageSync('userInfo')
 				const that = this
 				return new Promise((resolve, reject) => {
 					newFunApi.addressList({
-							user_id: 10006
+							user_id: userInfo.user_id
 						})
 						.then(result => {
-							this.addressData=result.data.list[0]
-							that.addIndex=result.data.list[0].address_id
+							this.addressData = result.data.list[0]
+							that.addIndex = result.data.list[0].address_id
 							that.addList = result.data.list
 						})
 						.catch(reject)
 				})
 			},
 			addAddress() {
-				let pages = getCurrentPages()//获取所有页面栈的实例列表
-				    let nowPage = pages[ pages.length - 1 ] //当前页面的实例
-				    let prevPage = pages[ pages.length - 2 ] //上一个页面的实例
-				    prevPage.$vm.addressData = this.addressData //更改上一个页面的数据
-				    uni.navigateBack({
-				        delta:1  //返回上一页
-				    })
+				let pages = getCurrentPages() //获取所有页面栈的实例列表
+				let nowPage = pages[pages.length - 1] //当前页面的实例
+				let prevPage = pages[pages.length - 2] //上一个页面的实例
+				prevPage.$vm.addressData = this.addressData //更改上一个页面的数据
+				uni.navigateBack({
+					delta: 1 //返回上一页
+				})
 			},
 		}
 	}
diff --git a/pages/news3/sendOutGoods.vue b/pages/news3/sendOutGoods.vue
index 24882fc..172b985 100644
--- a/pages/news3/sendOutGoods.vue
+++ b/pages/news3/sendOutGoods.vue
@@ -179,6 +179,10 @@
 		background-color: #F7F8FA;
 	}
 
+	::v-deep .uni-input-wrapper {
+		text-align: left !important;
+	}
+
 	.orderNum {
 
 		font-size: 28upx;
diff --git a/pages/news3/shopOrder.vue b/pages/news3/shopOrder.vue
index 265f66c..8bb7785 100644
--- a/pages/news3/shopOrder.vue
+++ b/pages/news3/shopOrder.vue
@@ -153,7 +153,8 @@
 					</u-upload> -->
 					<view class="tuiAdderss" v-if="audit_status==10">
 						<text>退货地址:</text>
-						<view class="" @click="goJump('/pages/news3/addressList','',0)"><text :style="{'color': addressData?'#303030':'#EAEAEA'}"></text>
+						<view class="" @click="goJump('/pages/news3/addressList','',0)"><text
+								:style="{'color': addressData?'#303030':'#EAEAEA'}"></text>
 							{{addressData?addressData.name+addressData.phone:'请选择退货地址'}}
 							<u-icon name="arrow-right" color="#979797" size="28"></u-icon>
 						</view>
@@ -261,7 +262,6 @@
 				pageNum: 1,
 				keyword: "",
 				total: 1,
-				pageNum: 1,
 				action: '',
 				header: '',
 				refund_image_id: '',
@@ -280,11 +280,24 @@
 				'Access-Token': uni.getStorageSync('AccessToken'),
 				'platform': "MP-WEIXIN",
 			}
-			this.getList()
 		},
 		onLoad(option) {
+			this.classifyShow=option.dataType
 			this.delivery_type = option.delivery_type || '';
-			this.user_id = option.user_id || ''
+			this.user_id = option.user_id || '';
+			this.getList()
+		},
+		onShow() {
+			let that = this
+			uni.$on('refreshData', function(res) {
+				that.pageNum = 1
+				that.goodShopsList = [];
+				that.getList()
+			})
+		},
+		onUnload() {
+			// 移除监听事件  
+			uni.$off('refreshData');
 		},
 		methods: {
 			reset() {
@@ -411,7 +424,7 @@
 				this.afterSale = true;
 			},
 			async submitRefund() {
-				if(this.audit_status==10 &&!this.addressData){
+				if (this.audit_status == 10 && !this.addressData) {
 					return that.$toast('请选择退货地址')
 				}
 				let params = {
@@ -429,8 +442,8 @@
 					data
 				} = await newFunApi.audit(params);
 				if (status == 200) {
+					that.$toast(message)
 					this.afterSale = false
-					uni.hideLoading();
 					this.pageNum = 1
 					this.goodShopsList = [];
 					this.getList()
diff --git a/pages/news3/updatePrice.vue b/pages/news3/updatePrice.vue
index 0e38beb..6add759 100644
--- a/pages/news3/updatePrice.vue
+++ b/pages/news3/updatePrice.vue
@@ -141,11 +141,6 @@
 		background-color: #F7F8FA;
 	}
 
-	::v-deep .u-input {
-		width: 300rpx !important;
-		text-align: right !important;
-	}
-
 	.updatePrice {
 		margin-bottom: 200rpx;
 	}
@@ -237,6 +232,11 @@
 		align-items: center;
 		justify-content: space-between;
 
+		::v-deep .u-input {
+			width: 300rpx !important;
+			text-align: right !important;
+		}
+
 		.left {
 
 			font-size: 28upx;
@@ -298,6 +298,11 @@
 	.modifyInfo {
 		padding: 34upx;
 
+		::v-deep .u-input {
+			width: 300rpx !important;
+			text-align: left !important;
+		}
+
 		.filterTitle {
 			font-size: 32upx;
 			font-family: PingFang SC, PingFang SC;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 185892c..98b6683 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -7,7 +7,7 @@
 			</view>
 		</view>
 		<!-- tab栏 -->
-		<u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="curTab"
+		<u-tabs :list="tabs" bg-color="#fafafa" :is-scroll="true" height="120" font-size="32" :current="current"
 			bar-width="56" bar-height="6" active-color="#3B3B3B" :show-bar='true' :duration="0.2"
 			@change="onChangeTab" />
 		<!-- 订单列表 -->
@@ -203,7 +203,7 @@
 				// tab栏数据
 				tabs,
 				// 当前标签索引
-				curTab: 0,
+				current: 0,
 				// 订单列表数据
 				list: [],
 				keyWords: '',
@@ -271,7 +271,8 @@
 				const app = this
 				if (options.dataType) {
 					const index = app.tabs.findIndex(item => item.value == options.dataType)
-					app.curTab = index > -1 ? index : 0
+					app.current = index > -1 ? index : 0
+					console.log(app.current,'KKKKKKK')
 				}
 			},
 
@@ -300,7 +301,7 @@
 
 			// 获取当前标签项的值
 			getTabValue() {
-				return this.tabs[this.curTab].value
+				return this.tabs[this.current].value
 			},
 
 			// 切换标签项
@@ -308,7 +309,7 @@
 				const app = this
 				app.list = []
 				// 设置当前选中的标签
-				app.curTab = index
+				app.current = index
 				if (index == 6) {
 					uni.navigateTo({
 						url: '/pages/refund/index'
diff --git a/pages/user/index.vue b/pages/user/index.vue
index d5407a3..a673295 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -168,11 +168,11 @@
 				<view class="manageTitle">
 					<text lines="1" class="text_5 titleLeft">商品订单</text>
 					<text lines="1" class="text_6 titleRight"
-						@click="goJump(userInfo.user_type == 40?'/pages/news3/shopOrder':'/pages/order/index')">查看全部</text>
+						@click="goGoodsOrder('all')">查看全部</text>
 					<u-icon style="margin-left: 5rpx; color: #909090; margin-top: -5rpx;" name="arrow-right"></u-icon>
 				</view>
 				<view class="grounding goodsOrder">
-					<view class="image-text_21" @click="goGoodsOrder('payment')">
+					<view class="image-text_21" @click="goGoodsOrder('pay')">
 						<image :src="$picUrl+'/static/user/unpay.png'" class="label_11"></image>
 						<view class="text-group_21">
 							<text class="text_71"
@@ -188,7 +188,7 @@
 							<text class="text_81">待发货</text>
 						</view>
 					</view>
-					<view class="image-text_21" @click="goGoodsOrder('received')">
+					<view class="image-text_21" @click="goGoodsOrder('receipt')">
 						<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
 						<view class="text-group_21">
 							<text class="text_71"
@@ -196,7 +196,7 @@
 							<text class="text_81">待收货</text>
 						</view>
 					</view>
-					<view class="image-text_21" @click="goGoodsOrder('received')">
+					<view class="image-text_21" @click="goGoodsOrder('complete')">
 						<image :src="$picUrl+'/static/user/over.png'" class="label_11"></image>
 						<view class="text-group_21">
 							<text class="text_71"
@@ -250,7 +250,7 @@
 			<view class="goodsManage">
 				<view class="manageTitle">
 					<text lines="1" class="text_5 titleLeft">回收订单</text>
-					<text lines="1" class="text_6 titleRight" @click="toRecovery(0)">查看全部</text>
+					<text lines="1" class="text_6 titleRight" @click="toRecovery('')">查看全部</text>
 					<u-icon style="margin-left: 5rpx; color: #909090; margin-top: -5rpx;" name="arrow-right"></u-icon>
 				</view>
 				<view class="grounding goodsOrder">
@@ -803,7 +803,7 @@
 				// 我的订单
 				if (this.userInfo.user_type == 40) {
 					uni.navigateTo({
-						url: '/pages/news3/shopOrder'
+						url: '/pages/news3/shopOrder?dataType='+val
 					})
 				} else {
 					uni.navigateTo({