send 7.28

pageE/order/Index.vue

@@ -8,7 +8,8 @@
 				<scroll-view scroll-y style="height: 100%;" @scrolltolower="reachBottom">
 					<view>
 						<view class="item-container" v-for="order in orderList" :key="order.order_id">
-							<OrderItem :order="order" @refreshOrderList="getOrderList"></OrderItem>
+							<OrderItem :order="order" @refreshOrderList="refreshOrderList" v-if="current != 4"></OrderItem>
+							<TryOrderItem :order="order" @refreshOrderList="refreshOrderList" v-else></TryOrderItem>
 						</view>
 					</view>
 					<u-empty text="暂无订单" mode="order" color="#000000" v-if="!orderList.length"></u-empty>
@@ -20,6 +21,7 @@
 </template>
 <script>
 import OrderItem from '@/components/mine/order-item/index'
+import TryOrderItem from '@/components/mine/order-item/try'
 export default {
 	data() {
 		return {
@@ -48,13 +50,16 @@ export default {
 		}
 	},
 	components: {
-		OrderItem
+		OrderItem,
+		TryOrderItem,
 	},
 	watch: {
-		current(value) {
+		current(value, origin) {
+			if((origin == 4 && value != 4) || (value == 4 && origin != 4)) {
+				this.orderList = [];
+			}
 			this.page = 0;
 			// again 重新请求列表 不然往列表里添加
-			value == 6 ? this.getAfterSaleList({ reload: 'again' }): this.getOrderList({ reload: 'again' });
 			if(value == 6) {
 				this.getAfterSaleList({ reload: 'again' });
 			} else if(value == 4) {
@@ -96,6 +101,16 @@ export default {
 			}
 			return type;
 		},
+		refreshOrderList() {
+			this.page = 0;
+			if(this.current == 6) {
+				this.getAfterSaleList({ reload: 'again' });
+			} else if(this.current == 4) {
+				this.goodsTryOrderList({ reload: 'again' });
+			} else {
+				this.getOrderList({ reload: 'again' });
+			}
+		},
 		async getOrderList({ reload = '' } = {}) {
 			const type = this.setOrderType();
 			const res = await this.$u.api.getOrderList({
@@ -126,8 +141,8 @@ export default {
 			})
 			this.timer = true;
 			if(res.errCode == 0) {
-				if(reload) this.orderList = res.data;
-				else this.orderList.push(...res.data);
+				if(reload) this.orderList = res.data.list;
+				else this.orderList.push(...res.data.list);
 			}
 			return res;
 		},