guhongwei 2 年之前
父節點
當前提交
8f22065263
共有 2 個文件被更改,包括 17 次插入13 次删除
  1. 10 10
      pages/my/index.vue
  2. 7 3
      pagesMy/order/index.vue

+ 10 - 10
pages/my/index.vue

@@ -28,10 +28,10 @@
 			<view class="two">
 				<view class="two_1">
 					<view class="title">我的订单</view>
-					<!-- 	<view class="title">
+					<view class="title">
 						<text @click="toOrder({route:'pagesMy/order/index',type:'order',status:'-0'})">全部订单</text>
 						<text class="iconfont icon-jiantouyou"></text>
-					</view> -->
+					</view>
 				</view>
 				<view class="two_2">
 					<view class="orderList" v-for="(item, index) in orderList" :key="index" @click="toOrder(item)">
@@ -69,29 +69,29 @@
 				orderList: [ //订单列表
 					{
 						icon: 'icon-daifukuan',
-						title: '全部订单',
-						status: '-0',
+						title: '待付款',
+						status: '0',
 						type: 'order',
 						route: "pagesMy/order/index",
 					},
 					{
-						icon: 'icon-daifukuan',
+						icon: 'icon-daishouhuo',
 						title: '待发货',
-						status: '0',
+						status: '1',
 						type: 'order',
 						route: "pagesMy/order/index",
 					},
 					{
-						icon: 'icon-daishouhuo',
-						title: '邮寄中',
-						status: '1',
+						icon: 'icon-daipinglun',
+						title: '待收货',
+						status: '2',
 						type: 'order',
 						route: "pagesMy/order/index",
 					},
 					{
 						icon: 'icon-daipinglun',
 						title: '已收货',
-						status: '2',
+						status: '3',
 						type: 'order',
 						route: "pagesMy/order/index",
 					},

+ 7 - 3
pagesMy/order/index.vue

@@ -74,16 +74,20 @@
 							active: '-0'
 						},
 						{
-							title: '待发货',
+							title: '待付款',
 							active: '0'
 						},
 						{
-							title: '邮寄中',
+							title: '待发货',
 							active: '1'
 						},
 						{
-							title: '收货',
+							title: '收货',
 							active: '2'
+						},
+						{
+							title: '已收货',
+							active: '3'
 						}
 					]
 				},