From 7ff311b60485367d7926d66bbd23995cbd697162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=91=E7=A8=BD=E5=88=98?= <1073236926@qq.com>
Date: Sat, 27 Jun 2020 15:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=94=AE=E5=90=8E=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-admin/src/views/mall/aftersale.vue |  5 ++-
 litemall-admin/src/views/mall/order.vue     | 35 ++++++++++++++-------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/litemall-admin/src/views/mall/aftersale.vue b/litemall-admin/src/views/mall/aftersale.vue
index e711508b..f4266c91 100644
--- a/litemall-admin/src/views/mall/aftersale.vue
+++ b/litemall-admin/src/views/mall/aftersale.vue
@@ -67,7 +67,10 @@
             <el-tag>{{ aftersaleDetail.amount }}</el-tag>
           </el-form-item>
           <el-form-item label="订单状态">
-            <el-tag>{{ aftersaleDetail.status }}</el-tag>
+            <el-tag v-if="aftersaleDetail.status === 1">已申请,待审核</el-tag>
+            <el-tag v-if="aftersaleDetail.status === 2">审核通过,待退款</el-tag>
+            <el-tag v-if="aftersaleDetail.status === 3">退款成功</el-tag>
+            <el-tag v-if="aftersaleDetail.status === 4">审核不通过,已拒绝</el-tag>
           </el-form-item>
           <el-form-item label="订单用户id">
             <el-tag>{{ aftersaleDetail.userId }}</el-tag>
diff --git a/litemall-admin/src/views/mall/order.vue b/litemall-admin/src/views/mall/order.vue
index 51f412ad..9ad57210 100644
--- a/litemall-admin/src/views/mall/order.vue
+++ b/litemall-admin/src/views/mall/order.vue
@@ -4,6 +4,7 @@
     <!-- 查询和其他操作 -->
     <div class="filter-container">
       <el-input v-model="listQuery.userId" clearable class="filter-item" style="width: 160px;" placeholder="请输入用户ID" />
+      <el-input v-model="listQuery.orderId" clearable class="filter-item" style="width: 160px;" placeholder="请输入订单ID" />
       <el-input v-model="listQuery.orderSn" clearable class="filter-item" style="width: 160px;" placeholder="请输入订单编号" />
       <el-date-picker v-model="listQuery.timeArray" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" class="filter-item" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" />
       <el-select v-model="listQuery.orderStatusArray" multiple style="width: 200px" class="filter-item" placeholder="请选择订单状态">
@@ -190,7 +191,8 @@ export default {
         timeArray: [],
         orderStatusArray: [],
         sort: 'add_time',
-        order: 'desc'
+        order: 'desc',
+        orderId:undefined
       },
       pickerOptions: {
         shortcuts: [{
@@ -256,16 +258,27 @@ export default {
         this.listQuery.start = null
         this.listQuery.end = null
       }
-
-      listOrder(this.listQuery).then(response => {
-        this.list = response.data.data.list
-        this.total = response.data.data.total
-        this.listLoading = false
-      }).catch(() => {
-        this.list = []
-        this.total = 0
-        this.listLoading = false
-      })
+      if(this.listQuery.orderId){
+        detailOrder(this.listQuery.orderId).then(response => {
+          this.list = [];
+          this.list.push(response.data.data.order)
+          this.listLoading = false
+        }).catch(() => {
+          this.list = []
+          this.total = 0
+          this.listLoading = false
+        })
+      }else{
+        listOrder(this.listQuery).then(response => {
+          this.list = response.data.data.list
+          this.total = response.data.data.total
+          this.listLoading = false
+        }).catch(() => {
+          this.list = []
+          this.total = 0
+          this.listLoading = false
+        })
+      }
     },
     getChannel() {
       listChannel().then(response => {