shish 6 лет назад
Родитель
Сommit
3c22c18539
3 измененных файлов с 12 добавлено и 12 удалено
  1. 1 1
      shop/src/mock/userInfo.js
  2. 7 11
      shop/src/views/home.vue
  3. 4 0
      shop/src/views/order/list.vue

+ 1 - 1
shop/src/mock/userInfo.js

@@ -378,7 +378,7 @@ let menu = {
 		{
 		{
 			id: '602',
 			id: '602',
 			parentId: '6',
 			parentId: '6',
-			name: '邀请奖励',
+			name: '奖励设置',
 			type: 1,
 			type: 1,
 			icon: 'iconkehuguanli',
 			icon: 'iconkehuguanli',
 			orderNum: 6,
 			orderNum: 6,

+ 7 - 11
shop/src/views/home.vue

@@ -169,32 +169,28 @@ export default {
 				{
 				{
 					name: '待付款订单',
 					name: '待付款订单',
 					val: 0,
 					val: 0,
-					url: '/order/list'
+					url: '/order/list?status=0'
 				},
 				},
 				{
 				{
 					name: '配送中订单',
 					name: '配送中订单',
 					val: 0,
 					val: 0,
-					url: '/order/list'
+					url: '/order/list?status=2'
 				},
 				},
 				{
 				{
 					name: '已完结订单',
 					name: '已完结订单',
 					val: 0,
 					val: 0,
-					url: '/order/list'
+					url: '/order/list?status=5'
 				},
 				},
 				{
 				{
 					name: '待配送订单',
 					name: '待配送订单',
 					val: 0,
 					val: 0,
-					url: '/order/list'
-				},
-				{
-					name: '待通知订单',
-					val: 0,
-					url: '/order/list'
+					url: '/order/list?status=1'
 				},
 				},
+
 				{
 				{
 					name: '全部订单',
 					name: '全部订单',
 					val: 0,
 					val: 0,
-					url: '/order/list'
+					url: '/order/list?status=-1'
 				}
 				}
 			],
 			],
 			// 快捷入口
 			// 快捷入口
@@ -225,7 +221,7 @@ export default {
 					url: '/goods/list'
 					url: '/goods/list'
 				},
 				},
 				{
 				{
-					name: '邀请有礼',
+					name: '老带新',
 					icon: 'iconyaoqingyouli',
 					icon: 'iconyaoqingyouli',
 					url: '/invite/list'
 					url: '/invite/list'
 				},
 				},

+ 4 - 0
shop/src/views/order/list.vue

@@ -222,6 +222,10 @@ export default {
 		},
 		},
 		onLoad({ ctx, app }) {
 		onLoad({ ctx, app }) {
 			this.app = app;
 			this.app = app;
+
+			//传入参数 shish 2020.5.9
+			this.tabIndex = this.$route.query.status
+
 			ctx.service(this.$service.order)
 			ctx.service(this.$service.order)
 				.set('table', {
 				.set('table', {
 					columns: [
 					columns: [