From c281b0a86729430c1752297b493560933de6bb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Wed, 3 Aug 2022 11:20:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E6=AC=BE=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/Login.vue                  |   4 +-
 manager/src/views/order/flow/refundLog.vue | 114 ++++++++++++++++-----
 2 files changed, 89 insertions(+), 29 deletions(-)

diff --git a/buyer/src/pages/Login.vue b/buyer/src/pages/Login.vue
index 1bcfc85e..7a556a26 100644
--- a/buyer/src/pages/Login.vue
+++ b/buyer/src/pages/Login.vue
@@ -13,7 +13,7 @@
       <Carousel loop :autoplay-speed="5000" class="login-carousel" arrow="never">
         <CarouselItem>
           <div class="demo-carousel" @click='$refs.verify.show = false'>
-            <img src="https://wanmi-b2b.oss-cn-shanghai.aliyuncs.com/201811141632252680" />
+            <img src="https://lili-system.oss-cn-beijing.aliyuncs.com/background.jpg" />
           </div>
         </CarouselItem>
       </Carousel>
@@ -96,7 +96,7 @@
       <Row type="flex" justify="center" class="copyright">
         Copyright © {{year}} - Present
         <a href="https://pickmall.cn" target="_blank" style="margin: 0 5px">{{config.title}}</a>
-        版权所有 
+        版权所有
       </Row>
     </div>
   </div>
diff --git a/manager/src/views/order/flow/refundLog.vue b/manager/src/views/order/flow/refundLog.vue
index 594f6d7f..f76187a0 100644
--- a/manager/src/views/order/flow/refundLog.vue
+++ b/manager/src/views/order/flow/refundLog.vue
@@ -2,26 +2,101 @@
   <div class="search">
     <Card>
       <Row @keydown.enter.native="handleSearch">
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+        <Form
+          ref="searchForm"
+          :model="searchForm"
+          inline
+          :label-width="70"
+          class="search-form"
+        >
           <Form-item label="订单号" prop="orderSn">
-            <Input type="text" v-model="searchForm.orderSn" placeholder="订单/交易号" clearable style="width: 200px" />
+            <Input
+              type="text"
+              v-model="searchForm.orderSn"
+              placeholder="订单/交易号"
+              clearable
+              style="width: 200px"
+            />
           </Form-item>
           <Form-item label="退款状态">
-            <Select v-model="searchForm.isRefund" placeholder="请选择" clearable style="width: 200px">
+            <Select
+              v-model="searchForm.isRefund"
+              placeholder="请选择"
+              clearable
+              style="width: 200px"
+            >
               <Option value="false">未退款</Option>
               <Option value="true">已退款</Option>
             </Select>
           </Form-item>
           <Form-item label="退款时间">
-            <DatePicker v-model="selectDate" type="datetimerange" format="yyyy-MM-dd" clearable @on-change="selectDateRange" placeholder="选择起始时间" style="width: 200px"></DatePicker>
+            <DatePicker
+              v-model="selectDate"
+              type="datetimerange"
+              format="yyyy-MM-dd"
+              clearable
+              @on-change="selectDateRange"
+              placeholder="选择起始时间"
+              style="width: 200px"
+            ></DatePicker>
           </Form-item>
-          <Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
+          <Button
+            @click="handleSearch"
+            type="primary"
+            icon="ios-search"
+            class="search-btn"
+            >搜索</Button
+          >
         </Form>
       </Row>
-      <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
+      <Table
+        :loading="loading"
+        border
+        :columns="columns"
+        :data="data"
+        ref="table"
+        class="mt_10"
+      >
+        <template slot-scope="{ row, index }" slot="actions">
+
+          <Tag color="green" v-if="row.isRefund">已退款</Tag>
+          <div v-if="!row.isRefund">
+            <Tag v-if="!row.errorMessage" color="red">未退款</Tag>
+            <Tooltip v-else placement="left">
+              <Tag color="red">未退款<Icon type="md-help" /></Tag>
+              <div
+                slot="content"
+                style="white-space: normal"
+                v-if="row.paymentName == 'WECHAT'"
+              >
+                {{
+                  row.errorMessage ? JSON.parse(row.errorMessage).message : ""
+                }}
+              </div>
+              <div
+                slot="content"
+                style="white-space: normal"
+                v-if="row.paymentName == 'ALIPAY'"
+              >
+                {{ row.errorMessage || "" }}
+              </div>
+            </Tooltip>
+          </div>
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="mt_10">
-        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
-          show-total show-elevator show-sizer></Page>
+        <Page
+          :current="searchForm.pageNumber"
+          :total="total"
+          :page-size="searchForm.pageSize"
+          @on-change="changePage"
+          @on-page-size-change="changePageSize"
+          :page-size-opts="[10, 20, 50]"
+          size="small"
+          show-total
+          show-elevator
+          show-sizer
+        ></Page>
       </Row>
     </Card>
   </div>
@@ -87,29 +162,15 @@ export default {
         {
           title: "申请时间",
           key: "createTime",
-          minWidth: 200,
+          minWidth: 120,
           tooltip: true,
         },
         {
           title: "退款状态",
           key: "isRefund",
-          fixed: "right",
-          width: 120,
-          render: (h, params) => {
-            if (params.row.isRefund == "1") {
-              return h("div", [
-                h("Tag", { props: { color: "green" } }, "已退款"),
-              ]);
-            } else {
-              return h("div", [
-                  h("span", [
-                    h("Tag", { props: { color: "orange" } }, "未退款"),
-                    h("span", params.row.errorMessage || ''),
-                ]),
-                // h("Tag", { props: { color: "orange" } }, "未退款"),
-              ]);
-            }
-          },
+          align:"center",
+          width: 200,
+          slot: "actions",
         },
       ],
       data: [], // 表单数据
@@ -163,4 +224,3 @@ export default {
   },
 };
 </script>
-