Merge branch 'master' of http://47.114.134.244:3000/chenkainan/yandu_WeChat

pages/user/user.vue

@@ -84,7 +84,7 @@
 					{
 						src: 'https://static.ticket.sz-trip.com/yandu/images/user/dsh.png',
 						title: '待收货',
-						status: 'WAIT_CONFIRM'
+						status: 'POST'
 					},
 					// {
 					// 	src: 'https://static.ticket.sz-trip.com/yandu/images/user/dpj.png',

subPackages/order/trades.vue

@@ -84,7 +84,7 @@ export default {
 					name: '待发货'
 				},
 				{
-					id: 'WAIT_CONFIRM',
+					id: 'POST',
 					name: '待收货'
 				},
 				// {
@@ -299,7 +299,8 @@ export default {
 				status: this.typeList[this.typeIndex].id == 'ALL' ? '' : this.typeList[this.typeIndex].true_id || this.typeList[this.typeIndex].id,
 				offset: this.list.length,
 				limit: 5,
-				name: this.keywords
+				name: this.keywords,
+				type: this.typeList[this.typeIndex].name == '待使用' ? 1 : (this.typeList[this.typeIndex].name == '待发货' ? 2 : '')
 			};
 			this.Post(data, '/api/order/orderList').then(res => {
 				this.list = [...this.list, ...res.data]
@@ -352,6 +353,7 @@ view {
 	margin: auto;
 	color: #666;
 	overflow-x: scroll;
+	overflow-y: hidden;
 	padding: 0 27rpx;
 }