diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index cd5fe5e..f2ddb51 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -1,115 +1,120 @@
 <template>
-  <div class="app-container">
+  <div class="p-2">
     <div v-show="show">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-        <el-form-item label="申请状态" prop="status">
-          <DictRadio v-model="queryParams.status" radioData="oms_aftersale_status" :show-all="'all'" @change="handleQuery"></DictRadio>
-        </el-form-item>
-        <el-form-item label="售后类型" prop="type">
-          <DictRadio v-model="queryParams.type" radioData="oms_aftersale_type" :show-all="'all'" @change="handleQuery"></DictRadio>
-        </el-form-item>
-        <el-form-item label="订单号" prop="orderSn">
-          <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item label="售后单号" prop="id">
-          <el-input v-model.trim="queryParams.id" placeholder="请输入售后单号" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item label="会员手机号" prop="userPhone">
-          <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="Time">
-          <el-date-picker
-            v-model="queryParams.Time"
-            type="datetimerange"
-            :picker-options="pickerOptions"
-            range-separator="至"
-            format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            :default-time="['00:00:00', '23:59:59']"
-            align="right"
-            @change="handleChange"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item class="flex_one tr">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" border :data="omsAftersaleList" @selection-change="handleSelectionChange">
-        <!--      <el-table-column type="selection" width="55" align="center" />-->
-        <el-table-column label="售后单号" prop="id" width="160" />
-        <el-table-column label="申请状态" prop="aftersaleStatus" width="80">
-          <template v-slot="scope">
-            <el-tag effect="plain" size="default" :type="getAftersaleStatusTag(scope.row)">{{ getAftersaleStatusText(scope.row) }} </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="用户信息" prop="nickName" width="120">
-          <template v-slot="scope">
-            <div>{{ scope.row.nickName }}</div>
-            <div>{{ scope.row.phone }}</div>
-            <div>{{ scope.row.mark }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column label="退款金额" prop="applyReturnAmount" width="120" />
-        <el-table-column label="售后类型" prop="applyRefundType" width="80">
-          <template v-slot="scope">
-            <el-tag effect="plain" size="default" :type="getAftersaleTypeTag(scope.row)">{{ getAftersaleTypeText(scope.row) }} </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="申请时间" prop="applyRefundTime" width="180">
-          <template v-slot="scope">
-            <span>{{ parseTime(scope.row.applyRefundTime, '') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="处理时间" prop="handleTime" width="180">
-          <template v-slot="scope">
-            <span>{{ parseTime(scope.row.handleTime, '') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="原因" prop="reason" width="220" />
-        <el-table-column label="处理备注" prop="note" width="150" />
-        <el-table-column label="处理人员" prop="handleMan" width="100" />
-        <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right">
-          <template v-slot="scope">
-            <!--            <div>
+      <el-card shadow="hover" class="mb-[10px]">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+          <el-form-item label="申请状态" prop="status">
+            <DictRadio v-model="queryParams.status" radioData="oms_aftersale_status" :show-all="'all'" @change="handleQuery"></DictRadio>
+          </el-form-item>
+          <el-form-item label="售后类型" prop="type">
+            <DictRadio v-model="queryParams.type" radioData="oms_aftersale_type" :show-all="'all'" @change="handleQuery"></DictRadio>
+          </el-form-item>
+          <el-form-item label="订单号" prop="orderSn">
+            <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单号" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="售后单号" prop="id">
+            <el-input v-model.trim="queryParams.id" placeholder="请输入售后单号" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="会员手机号" prop="userPhone">
+            <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="创建时间" prop="Time">
+            <el-date-picker
+              v-model="queryParams.Time"
+              type="datetimerange"
+              :picker-options="pickerOptions"
+              range-separator="至"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              align="right"
+              @change="handleChange"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item class="flex_one tr">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card shadow="hover">
+        <el-table v-loading="loading" border :data="omsAftersaleList" @selection-change="handleSelectionChange">
+          <!--      <el-table-column type="selection" width="55" align="center" />-->
+          <el-table-column label="售后单号" prop="id" width="160" />
+          <el-table-column label="申请状态" prop="aftersaleStatus" width="80">
+            <template v-slot="scope">
+              <el-tag effect="plain" size="default" :type="getAftersaleStatusTag(scope.row)">{{ getAftersaleStatusText(scope.row) }} </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="用户信息" prop="nickName" width="120">
+            <template v-slot="scope">
+              <div>{{ scope.row.nickName }}</div>
+              <div>{{ scope.row.phone }}</div>
+              <div>{{ scope.row.mark }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="退款金额" prop="applyReturnAmount" width="120" />
+          <el-table-column label="售后类型" prop="applyRefundType" width="80">
+            <template v-slot="scope">
+              <el-tag effect="plain" size="default" :type="getAftersaleTypeTag(scope.row)">{{ getAftersaleTypeText(scope.row) }} </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="申请时间" prop="applyRefundTime" width="180">
+            <template v-slot="scope">
+              <span>{{ parseTime(scope.row.applyRefundTime, '') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="处理时间" prop="handleTime" width="180">
+            <template v-slot="scope">
+              <span>{{ parseTime(scope.row.handleTime, '') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="原因" prop="reason" width="220" />
+          <el-table-column label="处理备注" prop="note" width="150" />
+          <el-table-column label="处理人员" prop="handleMan" width="100" />
+          <el-table-column label="订单编号/操作" class-name="small-padding fixed-width" width="220" fixed="right">
+            <template v-slot="scope">
+              <!--            <div>
               {{ scope.row.orderSn }}
               <el-link @click="copy(scope.row.orderSn)" :underline="false"><i class="el-icon-document-copy el-icon&#45;&#45;right"></i></el-link>
             </div>-->
-            <el-button text type="primary" @click="handleDetail(scope.row.orderId)" v-hasPermi="['oms:aftersale:query']">详情 </el-button>
-            <el-button text type="primary" @click="showLog(scope.row.orderId)" v-hasPermi="['oms:aftersale:log']">日志 </el-button>
-            <el-button
-              text
-              type="primary"
-              @click="approve(scope.row, 1)"
-              v-if="scope.row.aftersaleStatus == 0"
-              v-hasPermi="['manager:oms:aftersale:update']"
-              >同意
-            </el-button>
-            <el-button
-              text
-              type="primary"
-              @click="handleOpen(scope.row, 2)"
-              class="red"
-              v-if="scope.row.aftersaleStatus == 0"
-              v-hasPermi="['manager:oms:aftersale:update']"
-              >拒绝
-            </el-button>
-            <el-button
-              text
-              type="primary"
-              @click="confirmReceive(scope.row, 3)"
-              v-if="scope.row.aftersaleStatus == 1 && scope.row.applyRefundType == 2"
-              v-hasPermi="['manager:oms:aftersale:update']"
-              >确认收货
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+              <el-button text type="primary" @click="handleDetail(scope.row.orderId)" v-hasPermi="['oms:aftersale:query']">详情 </el-button>
+              <el-button text type="primary" @click="showLog(scope.row.orderId)" v-hasPermi="['oms:aftersale:log']">日志 </el-button>
+              <el-button
+                text
+                type="primary"
+                @click="approve(scope.row, 1)"
+                v-if="scope.row.aftersaleStatus == 0"
+                v-hasPermi="['manager:oms:aftersale:update']"
+                >同意
+              </el-button>
+              <el-button
+                text
+                type="primary"
+                @click="handleOpen(scope.row, 2)"
+                class="red"
+                v-if="scope.row.aftersaleStatus == 0"
+                v-hasPermi="['manager:oms:aftersale:update']"
+                >拒绝
+              </el-button>
+              <el-button
+                text
+                type="primary"
+                @click="confirmReceive(scope.row, 3)"
+                v-if="scope.row.aftersaleStatus == 1 && scope.row.applyRefundType == 2"
+                v-hasPermi="['manager:oms:aftersale:update']"
+                >确认收货
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      </el-card>
     </div>
+
     <!--    <SeeAdsComponent ref="seeAdsComponentRef" v-if="!show" @confirmOk="confirmOk"/>-->
 
     <!-- 拒绝对话框 -->
diff --git a/src/views/oms/aftersaleItem/index.vue b/src/views/oms/aftersaleItem/index.vue
index ce83c96..3273814 100644
--- a/src/views/oms/aftersaleItem/index.vue
+++ b/src/views/oms/aftersaleItem/index.vue
@@ -1,50 +1,54 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-      <el-form-item label="MEMBER_ID" prop="memberId">
-        <el-input v-model="queryParams.memberId" placeholder="请输入MEMBER_ID" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="订单id" prop="orderId">
-        <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="子订单id" prop="orderItemId">
-        <el-input v-model="queryParams.orderItemId" placeholder="请输入子订单id" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="退款金额" prop="returnAmount">
-        <el-input v-model="queryParams.returnAmount" placeholder="请输入退款金额" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="退货数量" prop="quantity">
-        <el-input v-model="queryParams.quantity" placeholder="请输入退货数量" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <el-card shadow="hover">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+        <el-form-item label="MEMBER_ID" prop="memberId">
+          <el-input v-model="queryParams.memberId" placeholder="请输入MEMBER_ID" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="订单id" prop="orderId">
+          <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="子订单id" prop="orderItemId">
+          <el-input v-model="queryParams.orderItemId" placeholder="请输入子订单id" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="退款金额" prop="returnAmount">
+          <el-input v-model="queryParams.returnAmount" placeholder="请输入退款金额" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="退货数量" prop="quantity">
+          <el-input v-model="queryParams.quantity" placeholder="请输入退货数量" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oms:aftersaleItem:add']">新增</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" border :data="omsAftersaleItemList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="MEMBER_ID" align="center" prop="memberId" />
-      <el-table-column label="订单id" align="center" prop="orderId" />
-      <el-table-column label="子订单id" align="center" prop="orderItemId" />
-      <el-table-column label="退款金额" align="center" prop="returnAmount" />
-      <el-table-column label="退货数量" align="center" prop="quantity" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oms:aftersaleItem:edit']">修改</el-button>
-          <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:aftersaleItem:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oms:aftersaleItem:add']">新增</el-button>
+          </el-col>
+        </el-row>
+      </template>
+      <el-table v-loading="loading" border :data="omsAftersaleItemList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="MEMBER_ID" align="center" prop="memberId" />
+        <el-table-column label="订单id" align="center" prop="orderId" />
+        <el-table-column label="子订单id" align="center" prop="orderItemId" />
+        <el-table-column label="退款金额" align="center" prop="returnAmount" />
+        <el-table-column label="退货数量" align="center" prop="quantity" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template v-slot="scope">
+            <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oms:aftersaleItem:edit']">修改</el-button>
+            <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:aftersaleItem:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
     <!-- 添加或修改订单售后对话框 -->
     <el-dialog :title="title" v-model="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index 1f520eb..85f431f 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -1,234 +1,237 @@
 <template>
-  <div class="app-container" v-if="show">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-      <el-form-item label="订单类型" prop="orderType">
-        <DictRadio v-model="queryParams.type" radioData="oms_order_type" :radioList="orderTypeMap" :show-all="'all'" @change="handleQuery">
-        </DictRadio>
-      </el-form-item>
-      <el-form-item label="订单状态" prop="status">
-        <DictRadio
-          v-if="orderStatusMap.length > 0"
-          :radioList="orderStatusMap"
-          v-model="queryParams.status"
-          radioData="oms_order_status"
-          :show-all="'all'"
-          :filter="['11', '12', '13', '14']"
-          @change="handleQuery"
-        ></DictRadio>
-      </el-form-item>
-      <el-form-item label="提现状态" prop="withdrawStatus">
-        <DictRadio
-          v-if="orderWithdrawMap.length > 0"
-          v-model="queryParams.withdrawStatus"
-          radioData="oms_withdraw_staus"
-          :radioList="orderWithdrawMap"
-          :show-all="'all'"
-          @change="handleQuery"
-        >
-        </DictRadio>
-      </el-form-item>
-      <el-form-item label="退款状态" prop="aftersaleStatus">
-        <DictRadio
-          v-if="orderAftersaleMap.length > 0"
-          v-model="queryParams.aftersaleStatus"
-          radioData="oms_aftersale_status"
-          :radioList="orderAftersaleMap"
-          :show-all="'all'"
-          @change="handleQuery"
-        >
-        </DictRadio>
-      </el-form-item>
-      <el-form-item label="订单编号" prop="id">
-        <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="交易流水号" prop="orderSn">
-        <el-input v-model.trim="queryParams.userPhone" placeholder="请输入交易流水号" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="会员手机号" prop="userPhone">
-        <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="省市区" prop="provinces">
-        <address-selector v-model="queryParams.provinces"></address-selector>
-      </el-form-item>
-      <el-form-item label="下单时间" prop="Time">
-        <el-date-picker
-          v-model="queryParams.Time"
-          type="datetimerange"
-          :picker-options="pickerOptions"
-          range-separator="至"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
-          align="right"
-          @change="handleChange"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="omsOrderList" border cell-class-name="my-cell">
-      <el-table-column label="推广人信息&买家信息" width="156">
-        <template v-slot="scope">
-          <div>{{ scope.row.memberNickname }}</div>
-          <div>{{ scope.row.memberPhoneEncrypted }}</div>
-        </template>
-      </el-table-column>
-      <!--      <el-table-column label="买家信息" width="116">
+  <div class="p-2" v-if="show">
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+        <el-form-item label="订单类型" prop="orderType">
+          <DictRadio v-model="queryParams.type" radioData="oms_order_type" :radioList="orderTypeMap" :show-all="'all'" @change="handleQuery">
+          </DictRadio>
+        </el-form-item>
+        <el-form-item label="订单状态" prop="status">
+          <DictRadio
+            v-if="orderStatusMap.length > 0"
+            :radioList="orderStatusMap"
+            v-model="queryParams.status"
+            radioData="oms_order_status"
+            :show-all="'all'"
+            :filter="['11', '12', '13', '14']"
+            @change="handleQuery"
+          ></DictRadio>
+        </el-form-item>
+        <el-form-item label="提现状态" prop="withdrawStatus">
+          <DictRadio
+            v-if="orderWithdrawMap.length > 0"
+            v-model="queryParams.withdrawStatus"
+            radioData="oms_withdraw_staus"
+            :radioList="orderWithdrawMap"
+            :show-all="'all'"
+            @change="handleQuery"
+          >
+          </DictRadio>
+        </el-form-item>
+        <el-form-item label="退款状态" prop="aftersaleStatus">
+          <DictRadio
+            v-if="orderAftersaleMap.length > 0"
+            v-model="queryParams.aftersaleStatus"
+            radioData="oms_aftersale_status"
+            :radioList="orderAftersaleMap"
+            :show-all="'all'"
+            @change="handleQuery"
+          >
+          </DictRadio>
+        </el-form-item>
+        <el-form-item label="订单编号" prop="id">
+          <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="交易流水号" prop="orderSn">
+          <el-input v-model.trim="queryParams.userPhone" placeholder="请输入交易流水号" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="会员手机号" prop="userPhone">
+          <el-input v-model.trim="queryParams.userPhone" placeholder="请输入会员手机号" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="省市区" prop="provinces">
+          <address-selector v-model="queryParams.provinces"></address-selector>
+        </el-form-item>
+        <el-form-item label="下单时间" prop="Time">
+          <el-date-picker
+            v-model="queryParams.Time"
+            type="datetimerange"
+            :picker-options="pickerOptions"
+            range-separator="至"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['00:00:00', '23:59:59']"
+            align="right"
+            @change="handleChange"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card shadow="hover">
+      <el-table v-loading="loading" :data="omsOrderList" border cell-class-name="my-cell">
+        <el-table-column label="推广人信息&买家信息" width="156">
+          <template v-slot="scope">
+            <div>{{ scope.row.memberNickname }}</div>
+            <div>{{ scope.row.memberPhoneEncrypted }}</div>
+          </template>
+        </el-table-column>
+        <!--      <el-table-column label="买家信息" width="116">
         <template v-slot="scope">
           <div>{{ scope.row.memberUsername }}</div>
           <div>{{ scope.row.memberPhoneEncrypted }}</div>
         </template>
       </el-table-column>-->
-      <el-table-column label="卖家信息" width="116">
-        <template v-slot="scope">
-          <div>{{ scope.row.tenantContactName }}</div>
-          <div>{{ scope.row.tenantContactPhone }}</div>
-        </template>
-      </el-table-column>
-      <!--      <el-table-column label="代理信息" width="116">
+        <el-table-column label="卖家信息" width="116">
+          <template v-slot="scope">
+            <div>{{ scope.row.tenantContactName }}</div>
+            <div>{{ scope.row.tenantContactPhone }}</div>
+          </template>
+        </el-table-column>
+        <!--      <el-table-column label="代理信息" width="116">
         <template v-slot="scope">
           <div>代理人姓名：{{ scope.row.deliverySn }}</div>
           <div>代理区域：{{ scope.row.deliverySn }}</div>
           <div>代理手机号：{{ scope.row.deliverySn }}</div>
         </template>
       </el-table-column>-->
-      <!--      <el-table-column label="商品信息">
+        <!--      <el-table-column label="商品信息">
         <template v-slot="scope">
           <div>：{{ scope.row.productName }}</div>
         </template>
       </el-table-column>-->
-      <el-table-column label="核销码" width="130">
-        <template v-slot="scope">
-          {{ scope.row.code }}
-          <!--          <el-image :src="scope.row.code" style="width: 100px; height: 100px" />-->
-        </template>
-      </el-table-column>
-      <el-table-column label="商品规格" prop="productList" width="280">
-        <template v-slot="scope">
-          <div v-for="item in scope.row.productList" class="product-container">
-            <el-popover placement="right" trigger="hover">
-              <el-image v-if="item.pic" :src="item.pic" style="width: 350px; height: 350px" />
-              <template v-slot:reference>
-                <el-image v-if="item.pic" class="small-img product-item" :src="item.pic" style="width: 40px; height: 40px" />
-              </template>
-            </el-popover>
-            <div class="product-item" style="margin-left: 5px">
-              <div class="sp-data">
-                <span v-for="(value, key) in JSON.parse(item.spData)">{{ key }}：{{ value }}&nbsp;</span>
-              </div>
-              <div class="product-item quantity">
-                <span style="margin-right: 10px">￥{{ item.salePrice }}</span>
-                <span>x{{ item.buyNum }}</span>
+        <el-table-column label="核销码" width="130">
+          <template v-slot="scope">
+            {{ scope.row.code }}
+            <!--          <el-image :src="scope.row.code" style="width: 100px; height: 100px" />-->
+          </template>
+        </el-table-column>
+        <el-table-column label="商品规格" prop="productList" width="280">
+          <template v-slot="scope">
+            <div v-for="item in scope.row.productList" class="product-container">
+              <el-popover placement="right" trigger="hover">
+                <el-image v-if="item.pic" :src="item.pic" style="width: 350px; height: 350px" />
+                <template v-slot:reference>
+                  <el-image v-if="item.pic" class="small-img product-item" :src="item.pic" style="width: 40px; height: 40px" />
+                </template>
+              </el-popover>
+              <div class="product-item" style="margin-left: 5px">
+                <div class="sp-data">
+                  <span v-for="(value, key) in JSON.parse(item.spData)">{{ key }}：{{ value }}&nbsp;</span>
+                </div>
+                <div class="product-item quantity">
+                  <span style="margin-right: 10px">￥{{ item.salePrice }}</span>
+                  <span>x{{ item.buyNum }}</span>
+                </div>
               </div>
             </div>
-          </div>
-        </template>
-      </el-table-column>
-      <!--      <el-table-column label="分佣信息" prop="couponAmount" width="80"> </el-table-column>-->
-      <el-table-column label="订单类型" prop="couponAmount" width="100">
-        <template v-slot="scope">
-          <el-tag type="primary">
-            {{ getEmulistLabelById(scope.row.type, orderTypeMap) }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="交易编号" prop="id" width="120" align="center">
-        <template v-slot="scope">
-          <el-link type="primary" icon="Copy" link @click="copy(scope.row.id)" :underline="false">
-            {{ scope.row.id }}
-            <el-icon><CopyDocument /></el-icon>
-          </el-link>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单编号" prop="orderSn" width="80"> </el-table-column>
-      <el-table-column label="订单状态" prop="status" width="160">
-        <template v-slot="scope">
-          <div>
-            <el-tag style="margin-right: 10px">
-              {{ getEmulistLabelById(scope.row.status, orderStatusMap) }}
+          </template>
+        </el-table-column>
+        <!--      <el-table-column label="分佣信息" prop="couponAmount" width="80"> </el-table-column>-->
+        <el-table-column label="订单类型" prop="couponAmount" width="100">
+          <template v-slot="scope">
+            <el-tag type="primary">
+              {{ getEmulistLabelById(scope.row.type, orderTypeMap) }}
             </el-tag>
-          </div>
-          <div v-if="scope.row.deliverySn">
-            物流单号：{{ scope.row.deliverySn }}
-            <el-link @click="copy(scope.row.deliverySn)" :underline="false"><i class="el-icon-document-copy el-icon--right"></i></el-link>
-          </div>
-          <div v-if="scope.row.deliveryTime">发货时间：{{ parseTime(scope.row.deliveryTime, '') }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="退款状态" prop="aftersaleStatus" width="100">
-        <template v-slot="scope">
-          <el-tag type="primary">
-            {{ getEmulistLabelById(scope.row.aftersaleStatus, orderAftersaleMap) }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="提现状态" prop="withdrawStatus" width="100">
-        <template v-slot="scope">
-          <el-tag type="primary">
-            {{ getEmulistLabelById(scope.row.withdrawStatus, orderWithdrawMap) }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="收件信息" prop="receiverName" width="280">
-        <template v-slot="scope">
-          <div>
-            <span>{{ scope.row.decrypt ? scope.row.receiverName : getHiddenName(scope.row.receiverName) }} {{ scope.row.receiverPhone }}</span>
-            <el-button text type="primary" @click="handleWatch(scope.row)" style="margin-left: 10px">查看 </el-button>
-            <el-button text type="primary" @click="handleUpdate(scope.row)">修改 </el-button>
-          </div>
-          <div>
-            <span>{{ scope.row.receiverProvince }}{{ scope.row.receiverCity }}{{ scope.row.receiverDistrict }}</span>
-            <span>{{ scope.row.decrypt ? scope.row.receiverDetailAddress : getHiddenDetailAddress(scope.row.receiverDetailAddress) }}</span>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注留言" prop="note" width="160">
-        <template v-slot="scope">
-          <div>
-            <span v-if="scope.row.merchantNote" class="note-title" style="margin-right: 10px">平台备注</span>
-            <el-button text type="primary" @click="handleSaveNote(scope.row)">{{ scope.row.merchantNote ? '修改' : '添加平台备注' }} </el-button>
-          </div>
-          <div v-if="scope.row.merchantNote">{{ scope.row.merchantNote }}</div>
-          <div v-if="scope.row.note" class="note-title">买家备注</div>
-          <div v-if="scope.row.note">{{ scope.row.note }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="下单时间/支付时间" prop="payTime" width="140">
-        <template v-slot="scope">
-          <div v-if="scope.row.createTime">{{ parseTime(scope.row.createTime, '{mm}-{dd} {hh}:{ii}') }} 下单</div>
-          <div v-if="scope.row.payTime">{{ parseTime(scope.row.payTime, '{mm}-{dd} {hh}:{ii}') }} 支付</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="优惠券" prop="couponAmount" width="80">
-        <template v-slot="scope">
-          <div v-if="scope.row.couponAmount">￥{{ scope.row.couponAmount }}</div>
-          <div v-else>无</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="合计" prop="totalAmount" width="140">
-        <template v-slot="scope">
-          <div>
-            <span>总数： </span>
-            <span style="color: red">{{ scope.row.buyNum }}</span>
-          </div>
-          <div>实付： ￥{{ scope.row.payAmount }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" class-name="small-padding fixed-width" width="180" align="center" fixed="right">
-        <template v-slot="scope">
-          <el-button text size="small" type="primary" @click="goDetail(scope.row)" v-hasPermi="['oms:order:query']">详情 </el-button>
-          <el-button text size="small" type="primary" @click="showLog(scope.row.id)" v-hasPermi="['oms:order:log']">记录 </el-button>
-          <el-button text size="small" type="primary" @click="handleDelivery(scope.row)">核销 </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易编号" prop="id" width="120" align="center">
+          <template v-slot="scope">
+            <el-link type="primary" icon="Copy" link @click="copy(scope.row.id)" :underline="false">
+              {{ scope.row.id }}
+              <el-icon><CopyDocument /></el-icon>
+            </el-link>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单编号" prop="orderSn" width="80"> </el-table-column>
+        <el-table-column label="订单状态" prop="status" width="160">
+          <template v-slot="scope">
+            <div>
+              <el-tag style="margin-right: 10px">
+                {{ getEmulistLabelById(scope.row.status, orderStatusMap) }}
+              </el-tag>
+            </div>
+            <div v-if="scope.row.deliverySn">
+              物流单号：{{ scope.row.deliverySn }}
+              <el-link @click="copy(scope.row.deliverySn)" :underline="false"><i class="el-icon-document-copy el-icon--right"></i></el-link>
+            </div>
+            <div v-if="scope.row.deliveryTime">发货时间：{{ parseTime(scope.row.deliveryTime, '') }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="退款状态" prop="aftersaleStatus" width="100">
+          <template v-slot="scope">
+            <el-tag type="primary">
+              {{ getEmulistLabelById(scope.row.aftersaleStatus, orderAftersaleMap) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="提现状态" prop="withdrawStatus" width="100">
+          <template v-slot="scope">
+            <el-tag type="primary">
+              {{ getEmulistLabelById(scope.row.withdrawStatus, orderWithdrawMap) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="收件信息" prop="receiverName" width="280">
+          <template v-slot="scope">
+            <div>
+              <span>{{ scope.row.decrypt ? scope.row.receiverName : getHiddenName(scope.row.receiverName) }} {{ scope.row.receiverPhone }}</span>
+              <el-button text type="primary" @click="handleWatch(scope.row)" style="margin-left: 10px">查看 </el-button>
+              <el-button text type="primary" @click="handleUpdate(scope.row)">修改 </el-button>
+            </div>
+            <div>
+              <span>{{ scope.row.receiverProvince }}{{ scope.row.receiverCity }}{{ scope.row.receiverDistrict }}</span>
+              <span>{{ scope.row.decrypt ? scope.row.receiverDetailAddress : getHiddenDetailAddress(scope.row.receiverDetailAddress) }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注留言" prop="note" width="160">
+          <template v-slot="scope">
+            <div>
+              <span v-if="scope.row.merchantNote" class="note-title" style="margin-right: 10px">平台备注</span>
+              <el-button text type="primary" @click="handleSaveNote(scope.row)">{{ scope.row.merchantNote ? '修改' : '添加平台备注' }} </el-button>
+            </div>
+            <div v-if="scope.row.merchantNote">{{ scope.row.merchantNote }}</div>
+            <div v-if="scope.row.note" class="note-title">买家备注</div>
+            <div v-if="scope.row.note">{{ scope.row.note }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="下单时间/支付时间" prop="payTime" width="140">
+          <template v-slot="scope">
+            <div v-if="scope.row.createTime">{{ parseTime(scope.row.createTime, '{mm}-{dd} {hh}:{ii}') }} 下单</div>
+            <div v-if="scope.row.payTime">{{ parseTime(scope.row.payTime, '{mm}-{dd} {hh}:{ii}') }} 支付</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠券" prop="couponAmount" width="80">
+          <template v-slot="scope">
+            <div v-if="scope.row.couponAmount">￥{{ scope.row.couponAmount }}</div>
+            <div v-else>无</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="合计" prop="totalAmount" width="140">
+          <template v-slot="scope">
+            <div>
+              <span>总数： </span>
+              <span style="color: red">{{ scope.row.buyNum }}</span>
+            </div>
+            <div>实付： ￥{{ scope.row.payAmount }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="180" align="center" fixed="right">
+          <template v-slot="scope">
+            <el-button text size="small" type="primary" @click="goDetail(scope.row)" v-hasPermi="['oms:order:query']">详情 </el-button>
+            <el-button text size="small" type="primary" @click="showLog(scope.row.id)" v-hasPermi="['oms:order:log']">记录 </el-button>
+            <el-button text size="small" type="primary" @click="handleDelivery(scope.row)">核销 </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-if="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
     <!-- 核销对话框 -->
     <el-dialog :title="deliveryObj.title" v-model="deliveryObj.open" width="500px" append-to-body>
       <el-form ref="deliveryForm" :model="deliveryObj.form" :rules="deliveryObj.rules" label-width="100px">
diff --git a/src/views/oms/orderDeliveryHistory/index.vue b/src/views/oms/orderDeliveryHistory/index.vue
index c90317c..30ad359 100644
--- a/src/views/oms/orderDeliveryHistory/index.vue
+++ b/src/views/oms/orderDeliveryHistory/index.vue
@@ -1,44 +1,49 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="140px" size="default" class="ry_form">
-      <el-form-item label="订单id" prop="orderId">
-        <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="物流公司(配送方式)" prop="deliveryCompany">
-        <el-input v-model="queryParams.deliveryCompany" placeholder="请输入物流公司(配送方式)" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="物流单号" prop="deliverySn">
-        <el-input v-model="queryParams.deliverySn" placeholder="请输入物流单号" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oms:orderDeliveryHistory:add']">新增</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" :data="omsOrderDeliveryHistoryList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="订单id" align="center" prop="orderId" />
-      <el-table-column label="物流公司(配送方式)" align="center" prop="deliveryCompany" />
-      <el-table-column label="物流单号" align="center" prop="deliverySn" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oms:orderDeliveryHistory:edit']">修改</el-button>
-          <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:orderDeliveryHistory:remove']"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+  <div class="p-2">
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" size="default" class="ry_form">
+        <el-form-item label="订单id" prop="orderId">
+          <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="物流公司(配送方式)" prop="deliveryCompany">
+          <el-input v-model="queryParams.deliveryCompany" placeholder="请输入物流公司(配送方式)" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="物流单号" prop="deliverySn" width="140px">
+          <el-input v-model="queryParams.deliverySn" placeholder="请输入物流单号" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oms:orderDeliveryHistory:add']">新增</el-button>
+          </el-col>
+        </el-row>
+      </template>
+      <el-table v-loading="loading" :data="omsOrderDeliveryHistoryList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="订单id" align="center" prop="orderId" />
+        <el-table-column label="物流公司(配送方式)" align="center" prop="deliveryCompany" />
+        <el-table-column label="物流单号" align="center" prop="deliverySn" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template v-slot="scope">
+            <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oms:orderDeliveryHistory:edit']"
+              >修改</el-button
+            >
+            <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:orderDeliveryHistory:remove']"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
     <!-- 添加或修改订单发货记录对话框 -->
     <el-dialog :title="title" v-model="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="138px" inline class="dialog-form-two">
@@ -230,3 +235,12 @@ export default {
   }
 };
 </script>
+<style scoped lang="scss">
+::v-deep {
+  .el-form-item--default .el-form-item__label {
+    width: 140px;
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>
diff --git a/src/views/oms/orderOperateHistory/index.vue b/src/views/oms/orderOperateHistory/index.vue
index 2f84ea8..4f72ffa 100644
--- a/src/views/oms/orderOperateHistory/index.vue
+++ b/src/views/oms/orderOperateHistory/index.vue
@@ -1,52 +1,54 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-      <el-form-item label="订单号" prop="orderId">
-        <el-input v-model="queryParams.orderSn" placeholder="请输入订单号" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="订单状态" prop="status">
-        <DictRadio v-model="queryParams.status" radioData="oms_order_status" :show-all="'all'"></DictRadio>
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" border :data="omsOrderOperateHistoryList" @selection-change="handleSelectionChange">
-      <!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="订单号" align="center" prop="orderSn" />
-      <el-table-column label="订单状态" align="center" prop="orderStatus">
-        <template v-slot="scope">
-          <el-tag :type="getOrderTypeTag(scope.row.orderStatus)" style="margin-right: 10px">
-            {{ getOrderTypeText(scope.row.orderStatus) }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="note" />
-      <el-table-column label="操作时间" align="center" prop="createTime">
-        <template v-slot="scope">
-          <div>{{ parseTime(scope.row.createTime, '') }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <!--          <el-button-->
-          <!--            -->
-          <!--            text type="primary"-->
-          <!--            icon="Edit"-->
-          <!--            @click="handleUpdate(scope.row)"-->
-          <!--            v-hasPermi="['oms:orderOperateHistory:edit']"-->
-          <!--          >修改</el-button>-->
-          <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:orderOperateHistory:remove']"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+  <div class="p-2">
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+        <el-form-item label="订单号" prop="orderId">
+          <el-input v-model="queryParams.orderSn" placeholder="请输入订单号" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="订单状态" prop="status">
+          <DictRadio v-model="queryParams.status" radioData="oms_order_status" :show-all="'all'"></DictRadio>
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card shadow="hover">
+      <el-table v-loading="loading" border :data="omsOrderOperateHistoryList" @selection-change="handleSelectionChange">
+        <!--      <el-table-column type="selection" width="55" align="center" />-->
+        <el-table-column label="订单号" align="center" prop="orderSn" />
+        <el-table-column label="订单状态" align="center" prop="orderStatus">
+          <template v-slot="scope">
+            <el-tag :type="getOrderTypeTag(scope.row.orderStatus)" style="margin-right: 10px">
+              {{ getOrderTypeText(scope.row.orderStatus) }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="note" />
+        <el-table-column label="操作时间" align="center" prop="createTime">
+          <template v-slot="scope">
+            <div>{{ parseTime(scope.row.createTime, '') }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template v-slot="scope">
+            <!--          <el-button-->
+            <!--            -->
+            <!--            text type="primary"-->
+            <!--            icon="Edit"-->
+            <!--            @click="handleUpdate(scope.row)"-->
+            <!--            v-hasPermi="['oms:orderOperateHistory:edit']"-->
+            <!--          >修改</el-button>-->
+            <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oms:orderOperateHistory:remove']"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
     <!-- 添加或修改订单操作历史记录对话框 -->
     <el-dialog :title="title" v-model="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index 9d3bad9..cbf4edd 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -1,53 +1,57 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-      <el-form-item label="状态" prop="showStatus">
-        <DictRadio
-          v-model="queryParams.showStatus"
-          @change="handleQuery"
-          :radioList="normalStatusMap"
-          radioData="sys_normal_disable"
-          :showAll="'all'"
-        />
-      </el-form-item>
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="queryParams.nameLike" placeholder="名称" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+        <el-form-item label="状态" prop="showStatus">
+          <DictRadio
+            v-model="queryParams.showStatus"
+            @change="handleQuery"
+            :radioList="normalStatusMap"
+            radioData="sys_normal_disable"
+            :showAll="'all'"
+          />
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="queryParams.nameLike" placeholder="名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" :data="pmsBrandList" @selection-change="handleSelectionChange" border>
-      <el-table-column label="品牌logo" prop="logo">
-        <template v-slot="{ row }">
-          <el-image v-if="row.logo" :src="row.logo" fit="cover" :preview-teleported="true" :preview-src-list="[row.logo]" />
-        </template>
-      </el-table-column>
-      <el-table-column label="名称" prop="name" />
-      <el-table-column label="排序" prop="sort" />
-      <el-table-column label="状态" prop="showStatus">
-        <template v-slot="{ row }">
-          <dict-tag :options="normalStatusMap" :value="row.showStatus" prop-name="sys_normal_disable" />
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
-          <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+          </el-col>
+        </el-row>
+      </template>
+      <el-table v-loading="loading" :data="pmsBrandList" @selection-change="handleSelectionChange" border>
+        <el-table-column label="品牌logo" prop="logo">
+          <template v-slot="{ row }">
+            <el-image v-if="row.logo" :src="row.logo" fit="cover" :preview-teleported="true" :preview-src-list="[row.logo]" />
+          </template>
+        </el-table-column>
+        <el-table-column label="名称" prop="name" />
+        <el-table-column label="排序" prop="sort" />
+        <el-table-column label="状态" prop="showStatus">
+          <template v-slot="{ row }">
+            <dict-tag :options="normalStatusMap" :value="row.showStatus" prop-name="sys_normal_disable" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" class-name="small-padding fixed-width">
+          <template v-slot="scope">
+            <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
+            <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
     <!-- 添加或修改品牌管理对话框 -->
     <el-dialog :title="title" v-model="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-one">
diff --git a/src/views/pms/product/index.vue b/src/views/pms/product/index.vue
index 79824fc..7e40180 100644
--- a/src/views/pms/product/index.vue
+++ b/src/views/pms/product/index.vue
@@ -1,92 +1,97 @@
 <template>
-  <div class="app-container">
+  <div class="p-2">
     <div v-show="show">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-        <el-form-item label="上架状态" prop="publishStatus">
-          <DictRadio v-model="queryParams.publishStatus" @change="handleQuery" radioData="pms_publish_status" :showAll="'all'" />
-        </el-form-item>
-        <el-form-item label="名称" prop="name">
-          <el-input v-model="queryParams.nameLike" placeholder="请输入商品名称" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item label="品牌" prop="brandName">
-          <el-input v-model="queryParams.brandNameLike" placeholder="请输入品牌名称" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item label="分类" prop="productCategoryName">
-          <el-input v-model="queryParams.productCategoryNameLike" placeholder="请输入分类名称" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item label="编码" prop="outProductId">
-          <el-input v-model="queryParams.outProductId" placeholder="请输入商品编码" clearable @keyup.enter="handleQuery" />
-        </el-form-item>
-        <el-form-item class="flex_one tr">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
+      <el-card shadow="hover" class="mb-[10px]">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+          <el-form-item label="上架状态" prop="publishStatus">
+            <DictRadio v-model="queryParams.publishStatus" @change="handleQuery" radioData="pms_publish_status" :showAll="'all'" />
+          </el-form-item>
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="queryParams.nameLike" placeholder="请输入商品名称" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="品牌" prop="brandName">
+            <el-input v-model="queryParams.brandNameLike" placeholder="请输入品牌名称" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="分类" prop="productCategoryName">
+            <el-input v-model="queryParams.productCategoryNameLike" placeholder="请输入分类名称" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="编码" prop="outProductId">
+            <el-input v-model="queryParams.outProductId" placeholder="请输入商品编码" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item class="flex_one tr">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
 
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-        </el-col>
-      </el-row>
+      <el-card shadow="hover">
+        <template #header>
+          <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+              <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            </el-col>
+          </el-row>
+        </template>
 
-      <el-table v-loading="loading" :data="pmsProductList" border>
-        <!--        <el-table-column label="主图" prop="pic">
+        <el-table v-loading="loading" :data="pmsProductList" border>
+          <!--        <el-table-column label="主图" prop="pic">
           <template v-slot="{ row }">
             <el-image v-if="row.pic" :src="row.pic" :preview-src-list="[row.pic]" class="small-img" />
           </template>
         </el-table-column>-->
-        <el-table-column label="店铺名称" min-width="200" prop="contactUserName"> </el-table-column>
-        <el-table-column label="店铺手机号" prop="contactPhone"> </el-table-column>
-        <el-table-column label="配送方式" prop="distribution">
-          <template v-slot="scope">{{ scope.row.distribution == 1 ? '到店核销' : scope.row.distribution == 2 ? '自提' : '配送' }} </template>
-        </el-table-column>
-        <el-table-column label="商品名称" prop="name"> </el-table-column>
-        <!-- <el-table-column label="商品描述" prop="describe"> </el-table-column> -->
-        <el-table-column label="商品类型" prop="type">
-          <template v-slot="scope">{{ scope.row.type == 1 ? '团购' : scope.row.type == 2 ? '拼团' : '秒杀' }} </template>
-        </el-table-column>
-        <el-table-column label="商品分类" prop="productCategoryName"> </el-table-column>
-        <el-table-column label="商品封面图" prop="pic">
-          <template v-slot="scope">
-            <el-image v-if="scope.row.pic" :src="scope.row.pic" class="small-img" />
-          </template>
-        </el-table-column>
-        <el-table-column label="商品轮播图" prop="albumPics">
-          <template v-slot="scope">
-            <el-image
-              v-if="scope.row.albumPics"
-              :src="scope.row.pic"
-              :preview-teleported="true"
-              class="small-img"
-              :preview-src-list="isimgfun(scope.row.albumPics)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column label="商品详情" prop="detailHtml"> </el-table-column>
-        <el-table-column label="原价" prop="price"> </el-table-column>
-        <el-table-column label="优惠金额" prop="discountPrice"> </el-table-column>
-        <el-table-column label="销量" prop="sales"> </el-table-column>
-        <el-table-column label="商品状态" prop="publishStatus" fixed="right">
-          <template v-slot="scope">
-            <el-switch
-              :model-value="scope.row.publishStatus"
-              :active-value="1"
-              :inactive-value="0"
-              active-text="上架"
-              inactive-text="下架"
-              inline-prompt
-              :before-change="
-                () => {
-                  return handleChangeUserStatus(scope.row);
-                }
-              "
-            >
-            </el-switch> </template
-        ></el-table-column>
-        <el-table-column label="审核状态" prop="authFlag" fixed="right">
-          <template v-slot="scope">
-            {{ scope.row.authFlag == 1 ? '待审核' : scope.row.authFlag == 2 ? '审核通过' : '审核驳回' }}
-            <!-- <el-switch
+          <el-table-column label="店铺名称" min-width="200" prop="contactUserName"> </el-table-column>
+          <el-table-column label="店铺手机号" prop="contactPhone"> </el-table-column>
+          <el-table-column label="配送方式" prop="distribution">
+            <template v-slot="scope">{{ scope.row.distribution == 1 ? '到店核销' : scope.row.distribution == 2 ? '自提' : '配送' }} </template>
+          </el-table-column>
+          <el-table-column label="商品名称" prop="name"> </el-table-column>
+          <!-- <el-table-column label="商品描述" prop="describe"> </el-table-column> -->
+          <el-table-column label="商品类型" prop="type">
+            <template v-slot="scope">{{ scope.row.type == 1 ? '团购' : scope.row.type == 2 ? '拼团' : '秒杀' }} </template>
+          </el-table-column>
+          <el-table-column label="商品分类" prop="productCategoryName"> </el-table-column>
+          <el-table-column label="商品封面图" prop="pic">
+            <template v-slot="scope">
+              <el-image v-if="scope.row.pic" :src="scope.row.pic" class="small-img" />
+            </template>
+          </el-table-column>
+          <el-table-column label="商品轮播图" prop="albumPics">
+            <template v-slot="scope">
+              <el-image
+                v-if="scope.row.albumPics"
+                :src="scope.row.pic"
+                :preview-teleported="true"
+                class="small-img"
+                :preview-src-list="isimgfun(scope.row.albumPics)"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="商品详情" prop="detailHtml"> </el-table-column>
+          <el-table-column label="原价" prop="price"> </el-table-column>
+          <el-table-column label="优惠金额" prop="discountPrice"> </el-table-column>
+          <el-table-column label="销量" prop="sales"> </el-table-column>
+          <el-table-column label="商品状态" prop="publishStatus" fixed="right">
+            <template v-slot="scope">
+              <el-switch
+                :model-value="scope.row.publishStatus"
+                :active-value="1"
+                :inactive-value="0"
+                active-text="上架"
+                inactive-text="下架"
+                inline-prompt
+                :before-change="
+                  () => {
+                    return handleChangeUserStatus(scope.row);
+                  }
+                "
+              >
+              </el-switch> </template
+          ></el-table-column>
+          <el-table-column label="审核状态" prop="authFlag" fixed="right">
+            <template v-slot="scope">
+              {{ scope.row.authFlag == 1 ? '待审核' : scope.row.authFlag == 2 ? '审核通过' : '审核驳回' }}
+              <!-- <el-switch
               :model-value="scope.row.authFlag"
               :active-value="1"
               :inactive-value="0"
@@ -100,9 +105,9 @@
               "
             >
             </el-switch> -->
-          </template></el-table-column
-        >
-        <!--        <el-table-column label="名称/编码" min-width="200" prop="outProductId">
+            </template></el-table-column
+          >
+          <!--        <el-table-column label="名称/编码" min-width="200" prop="outProductId">
           <template v-slot="{ row }">
             <div>名称：{{ row.name }}</div>
             <div v-if="row.outProductId">编码：{{ row.outProductId }}</div>
@@ -125,20 +130,20 @@
                         <dict-tag :value="row.publishStatus" prop-name="pms_publish_status" />
           </template>
         </el-table-column>-->
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="150" align="center" fixed="right">
-          <template v-slot="scope">
-            <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
-            <el-button text type="primary" icon="Edit" @click="handleAuth(scope.row)">审核 </el-button>
-            <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-          <!--          <template v-slot="scope">
+          <el-table-column label="操作" class-name="small-padding fixed-width" width="150" align="center" fixed="right">
+            <template v-slot="scope">
+              <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
+              <el-button text type="primary" icon="Edit" @click="handleAuth(scope.row)">审核 </el-button>
+              <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+            </template>
+            <!--          <template v-slot="scope">
             <el-button  text type="primary" @click="showProductEditModal(scope.row)">编辑</el-button>
           </template>-->
-        </el-table-column>
-      </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+          </el-table-column>
+        </el-table>
 
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      </el-card>
       <el-dialog title="商品审核" v-model="isAuthModalOpen" width="600px">
         <el-form label-width="auto" ref="authForm" size="default">
           <el-form-item label="审核状态" prop="authFlag">
diff --git a/src/views/pms/productCategory/index.vue b/src/views/pms/productCategory/index.vue
index 61bdc1c..2f398c6 100644
--- a/src/views/pms/productCategory/index.vue
+++ b/src/views/pms/productCategory/index.vue
@@ -1,53 +1,57 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-      <el-form-item label="状态" prop="showStatus">
-        <DictRadio v-model="queryParams.showStatus" @change="handleQuery" :radioList="showStatusMap" radioData="sys_show_status" :showAll="'all'" />
-      </el-form-item>
-      <el-form-item label="名称" prop="name">
-        <el-input v-model="queryParams.nameLike" placeholder="名称" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+        <el-form-item label="状态" prop="showStatus">
+          <DictRadio v-model="queryParams.showStatus" @change="handleQuery" :radioList="showStatusMap" radioData="sys_show_status" :showAll="'all'" />
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="queryParams.nameLike" placeholder="名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
 
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增 </el-button>
-      </el-col>
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="pmsProductCategoryList"
-      border
-      :tree-props="{ hasChildren: 'hasChildren', children: 'children' }"
-      @selection-change="handleSelectionChange"
-      row-key="id"
-    >
-      <el-table-column label="名称" prop="name" />
-      <el-table-column label="图片" prop="icon">
-        <template v-slot="{ row }">
-          <el-image v-if="row.icon" :src="row.icon" :preview-teleported="true" :preview-src-list="[row.icon]" class="small-img circle-img" />
-        </template>
-      </el-table-column>
-      <el-table-column label="排序" prop="sort" />
-      <el-table-column label="状态" prop="showStatus">
-        <template v-slot="{ row }">
-          <dict-tag :options="showStatusMap" :value="row.showStatus" prop-name="sys_show_status"></dict-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
-          <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd">新增 </el-button>
+          </el-col>
+        </el-row>
+      </template>
+      <el-table
+        v-loading="loading"
+        :data="pmsProductCategoryList"
+        border
+        :tree-props="{ hasChildren: 'hasChildren', children: 'children' }"
+        @selection-change="handleSelectionChange"
+        row-key="id"
+      >
+        <el-table-column label="名称" prop="name" />
+        <el-table-column label="图片" prop="icon">
+          <template v-slot="{ row }">
+            <el-image v-if="row.icon" :src="row.icon" :preview-teleported="true" :preview-src-list="[row.icon]" class="small-img circle-img" />
+          </template>
+        </el-table-column>
+        <el-table-column label="排序" prop="sort" />
+        <el-table-column label="状态" prop="showStatus">
+          <template v-slot="{ row }">
+            <dict-tag :options="showStatusMap" :value="row.showStatus" prop-name="sys_show_status"></dict-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" class-name="small-padding fixed-width">
+          <template v-slot="scope">
+            <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
+            <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
     <!-- 添加或修改商品分类对话框 -->
     <el-dialog :title="title" v-model="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="108px">
diff --git a/src/views/pms/sku/index.vue b/src/views/pms/sku/index.vue
index c9a3331..faaac4d 100644
--- a/src/views/pms/sku/index.vue
+++ b/src/views/pms/sku/index.vue
@@ -1,64 +1,68 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-      <el-form-item label="商品名称" prop="productId">
-        <!--        <el-input v-model="queryParams.productId" placeholder="请输入PRODUCT_ID" clearable @keyup.enter="handleQuery" />-->
-        <el-select
-          v-model="queryParams.productId"
-          placeholder="请选择商品"
-          filterable
-          remote
-          reserve-keyword
-          :remote-method="getProductListByName"
-          :loading="productSelectLoading"
-          clearable
-          style="width: 100%"
-        >
-          <el-option v-for="item in productSelectOption" :key="item.id" :label="item.name" :value="item.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="sku编码" prop="outSkuId">
-        <el-input v-model="queryParams.outSkuId" placeholder="请输入sku编码" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="价格" prop="price">
-        <el-input v-model="queryParams.price" placeholder="请输入价格" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <!--      <el-form-item label="展示图片" prop="pic">
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+        <el-form-item label="商品名称" prop="productId">
+          <!--        <el-input v-model="queryParams.productId" placeholder="请输入PRODUCT_ID" clearable @keyup.enter="handleQuery" />-->
+          <el-select
+            v-model="queryParams.productId"
+            placeholder="请选择商品"
+            filterable
+            remote
+            reserve-keyword
+            :remote-method="getProductListByName"
+            :loading="productSelectLoading"
+            clearable
+            style="width: 100%"
+          >
+            <el-option v-for="item in productSelectOption" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="sku编码" prop="outSkuId">
+          <el-input v-model="queryParams.outSkuId" placeholder="请输入sku编码" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="价格" prop="price">
+          <el-input v-model="queryParams.price" placeholder="请输入价格" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <!--      <el-form-item label="展示图片" prop="pic">
         <el-input v-model="queryParams.pic" placeholder="请输入展示图片" clearable @keyup.enter="handleQuery" />
       </el-form-item>-->
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['pms:sku:add']">新增</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" :data="pmsSkuList" @selection-change="handleSelectionChange">
-      <el-table-column label="商品名称" align="center" prop="productName" />
-      <el-table-column label="sku编码" align="center" prop="outSkuId" />
-      <el-table-column label="价格" align="center" prop="price" />
-      <!--      <el-table-column label="展示图片" align="center" prop="pic" />-->
-      <el-table-column label="展示图片" prop="pic">
-        <template v-slot="{ row }">
-          <el-image v-if="row.pic" :src="row.pic" :preview-teleported="true" :preview-src-list="[row.pic]" class="small-img circle-img" />
-        </template>
-      </el-table-column>
-      <el-table-column label="商品销售属性" align="center" prop="spData" />
-      <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button text type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['pms:sku:edit']">修改</el-button>
-          <el-button text type="primary" @click="handleDelete(scope.row)" v-hasPermi="['pms:sku:remove']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['pms:sku:add']">新增</el-button>
+          </el-col>
+        </el-row>
+      </template>
+      <el-table v-loading="loading" :data="pmsSkuList" @selection-change="handleSelectionChange">
+        <el-table-column label="商品名称" align="center" prop="productName" />
+        <el-table-column label="sku编码" align="center" prop="outSkuId" />
+        <el-table-column label="价格" align="center" prop="price" />
+        <!--      <el-table-column label="展示图片" align="center" prop="pic" />-->
+        <el-table-column label="展示图片" prop="pic">
+          <template v-slot="{ row }">
+            <el-image v-if="row.pic" :src="row.pic" :preview-teleported="true" :preview-src-list="[row.pic]" class="small-img circle-img" />
+          </template>
+        </el-table-column>
+        <el-table-column label="商品销售属性" align="center" prop="spData" />
+        <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+          <template v-slot="scope">
+            <el-button text type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['pms:sku:edit']">修改</el-button>
+            <el-button text type="primary" @click="handleDelete(scope.row)" v-hasPermi="['pms:sku:remove']">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
     <!-- 添加或修改sku信息对话框 -->
     <el-dialog :title="title" v-model="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="138px" inline class="dialog-form-two">
diff --git a/src/views/set/account.vue b/src/views/set/account.vue
index d832518..2d83736 100644
--- a/src/views/set/account.vue
+++ b/src/views/set/account.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="pl">
+  <div class="p-2">
+    <!-- <el-card shadow="hover" class="mb-[10px]"> -->
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="search">
         <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -26,47 +27,56 @@
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-button type="primary" @click="showRefuteDialog = true">创建模板</el-button>
       </div>
     </transition>
-    <el-table
-      ref="categoryTableRef"
-      :data="messList"
-      row-key="categoryId"
-      border
-      :default-expand-all="isExpandAll"
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-    >
-      <el-table-column label="id" prop="id" align="center" width="180" />
-      <el-table-column label="模板名称" prop="templateName" align="center" width="150" />
-      <!-- <el-table-column label="模板名称" prop="templateName" align="center" width="150" /> -->
-      <el-table-column label="模版类型" prop="templateType" align="center" width="150">
-        <template #default="{ row }">
-          {{ row.templateType == 1 ? '公告' : '通知' }}
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" prop="status" align="center" width="150">
-        <template #default="{ row }">
-          {{ row.status == 1 ? '停用' : '正常' }}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-tooltip content="查看" placement="top">
-            <el-button link type="primary" v-hasPermi="['workflow:video:remove']" @click="seachfun(scope.row.id)">查看</el-button>
-          </el-tooltip>
-          <el-tooltip content="编辑" placement="top">
-            <el-button link type="primary" v-hasPermi="['workflow:video:remove']" @click="updatefun(scope.row.id)">编辑</el-button>
-          </el-tooltip>
-          <el-tooltip content="删除" placement="top">
-            <el-button link type="primary" v-hasPermi="['workflow:video:remove']" @click="deltemplatefun(scope.row.id)">删除</el-button>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="block">
-      <pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getlist" />
-    </div>
+    <!-- </el-card> -->
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="showRefuteDialog = true">创建模板</el-button>
+          </el-col>
+        </el-row>
+      </template>
+      <el-table
+        ref="categoryTableRef"
+        :data="messList"
+        row-key="categoryId"
+        border
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+        <el-table-column label="id" prop="id" align="center" width="180" />
+        <el-table-column label="模板名称" prop="templateName" align="center" width="150" />
+        <!-- <el-table-column label="模板名称" prop="templateName" align="center" width="150" /> -->
+        <el-table-column label="模版类型" prop="templateType" align="center" width="150">
+          <template #default="{ row }">
+            {{ row.templateType == 1 ? '公告' : '通知' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" prop="status" align="center" width="150">
+          <template #default="{ row }">
+            {{ row.status == 1 ? '停用' : '正常' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="查看" placement="top">
+              <el-button link type="primary" v-hasPermi="['workflow:video:remove']" @click="seachfun(scope.row.id)">查看</el-button>
+            </el-tooltip>
+            <el-tooltip content="编辑" placement="top">
+              <el-button link type="primary" v-hasPermi="['workflow:video:remove']" @click="updatefun(scope.row.id)">编辑</el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" v-hasPermi="['workflow:video:remove']" @click="deltemplatefun(scope.row.id)">删除</el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getlist" />
+      </div>
+    </el-card>
     <el-dialog v-model="showRefuteDialog" title="创建消息模板">
       <el-form :model="dataparams" :rules="rules">
         <el-form-item label="模板类型">
diff --git a/src/views/set/message.vue b/src/views/set/message.vue
index 302e677..f4e6824 100644
--- a/src/views/set/message.vue
+++ b/src/views/set/message.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="pl">
+  <div class="p-2">
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="search">
         <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -28,44 +28,53 @@
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-button type="primary" @click="showRefuteDialog = true">发送信息</el-button>
       </div>
     </transition>
-    <el-table
-      ref="categoryTableRef"
-      :data="messList"
-      row-key="categoryId"
-      border
-      :default-expand-all="isExpandAll"
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-    >
-      <el-table-column label="id" prop="id" align="center" width="180" />
-      <el-table-column label="发送者ID" prop="senderId" align="center" width="150" />
-      <el-table-column label="标题" prop="title" align="center" width="150" />
-      <el-table-column label="内容" prop="content" align="center" width="150" />
-      <el-table-column label="创建时间" prop="createTime" align="center" width="200" />
-      <!-- <el-table-column label="定时发送时间" prop="scheduledTime" align="center" width="200" /> -->
-      <!-- <el-table-column label="触发类型" prop="title" align="center" width="150">
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10">
+          <el-col :span="1.5">
+            <!-- <el-button type="primary"  @click="handleAdd" v-hasPermi="['oms:orderDeliveryHistory:add']">新增</el-button> -->
+            <el-button type="primary" plain icon="Plus" @click="showRefuteDialog = true">发送信息</el-button>
+          </el-col>
+        </el-row>
+      </template>
+      <el-table
+        ref="categoryTableRef"
+        :data="messList"
+        row-key="categoryId"
+        border
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+        <el-table-column label="id" prop="id" align="center" width="180" />
+        <el-table-column label="发送者ID" prop="senderId" align="center" width="150" />
+        <el-table-column label="标题" prop="title" align="center" width="150" />
+        <el-table-column label="内容" prop="content" align="center" width="150" />
+        <el-table-column label="创建时间" prop="createTime" align="center" width="200" />
+        <!-- <el-table-column label="定时发送时间" prop="scheduledTime" align="center" width="200" /> -->
+        <!-- <el-table-column label="触发类型" prop="title" align="center" width="150">
         <template #default="{ row }">
           {{ row.msgType == 1 ? '手动' : '自动' }}
         </template>
       </el-table-column> -->
-      <el-table-column label="消息类型" prop="title" align="center" width="150">
-        <template #default="{ row }">
-          {{ isSub[row.subType] }}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-tooltip content="撤回" placement="top">
-            <el-button link type="primary" v-hasPermi="['workflow:video:remove']">撤回</el-button>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="block">
-      <pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getlist" />
-    </div>
+        <el-table-column label="消息类型" prop="title" align="center" width="150">
+          <template #default="{ row }">
+            {{ isSub[row.subType] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="撤回" placement="top">
+              <el-button link type="primary" v-hasPermi="['workflow:video:remove']">撤回</el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getlist" />
+      </div>
+    </el-card>
     <el-dialog v-model="showRefuteDialog" title="消息发送" @close="clearFormData">
       <el-form :model="dataparams" :rules="rules">
         <el-form-item label="模板名称">
diff --git a/src/views/system/version/index.vue b/src/views/system/version/index.vue
index 54b0e20..5b203e5 100644
--- a/src/views/system/version/index.vue
+++ b/src/views/system/version/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="p-2">
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="true" class="search">
         <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -15,44 +15,55 @@
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            <el-button icon="Refresh" @click="showRefuteDialog = true">新增</el-button>
           </el-form-item>
         </el-form>
       </div>
     </transition>
-    <el-table :data="devices" border style="width: 100%; height: 100%; font-size: 14px">
-      <el-table-column label="平台类型" align="center" prop="platformType" :show-overflow-tooltip="true" />
-      <el-table-column label="版本号" align="center" prop="versionCode" :show-overflow-tooltip="true" />
-      <el-table-column label="版本名称" align="center" prop="versionName" :show-overflow-tooltip="true" />
-      <el-table-column label="下载地址" align="center" prop="downloadUrl" :show-overflow-tooltip="true" />
-      <el-table-column label="是否强制更新" align="center" prop="isForceUpdate" width="180">
-        <template #default="scope">
-          <span>{{ scope.row.isForceUpdate ? '是' : '否' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="版本说明" align="center" prop="releaseNotes" :show-overflow-tooltip="true" />
-      <el-table-column label="是否启用" align="center" prop="status" width="180">
-        <template #default="scope">
-          <el-switch :model-value="scope.row.status ? true : false" active-text="启用" inactive-text="停用" @click="handleStatusChange(scope.row)" />
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-tooltip content="删除" placement="top">
-            <el-button link type="primary" @click="handldDelOnline(scope.row)">删除</el-button>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="block">
-      <pagination
-        v-if="totalref > 0"
-        :total="totalref"
-        v-model:page="queryParams.current"
-        v-model:limit="queryParams.size"
-        @pagination="getListList"
-      />
-    </div>
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10">
+          <el-col :span="1.5"> <el-button icon="Refresh" @click="showRefuteDialog = true">新增</el-button> </el-col>
+        </el-row>
+      </template>
+      <el-table :data="devices" border style="width: 100%; height: 100%; font-size: 14px">
+        <el-table-column label="平台类型" align="center" prop="platformType" :show-overflow-tooltip="true" />
+        <el-table-column label="版本号" align="center" prop="versionCode" :show-overflow-tooltip="true" />
+        <el-table-column label="版本名称" align="center" prop="versionName" :show-overflow-tooltip="true" />
+        <el-table-column label="下载地址" align="center" prop="downloadUrl" :show-overflow-tooltip="true" />
+        <el-table-column label="是否强制更新" align="center" prop="isForceUpdate" width="180">
+          <template #default="scope">
+            <span>{{ scope.row.isForceUpdate ? '是' : '否' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="版本说明" align="center" prop="releaseNotes" :show-overflow-tooltip="true" />
+        <el-table-column label="是否启用" align="center" prop="status" width="180">
+          <template #default="scope">
+            <el-switch
+              :model-value="scope.row.status ? true : false"
+              active-text="启用"
+              inactive-text="停用"
+              @click="handleStatusChange(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" @click="handldDelOnline(scope.row)">删除</el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <pagination
+          v-if="totalref > 0"
+          :total="totalref"
+          v-model:page="queryParams.current"
+          v-model:limit="queryParams.size"
+          @pagination="getListList"
+        />
+      </div>
+    </el-card>
     <el-dialog v-model="showRefuteDialog" title="添加版本" width="600px" append-to-body>
       <el-form>
         <el-form-item label="平台类型">
diff --git a/src/views/trade/chargeManage/index.vue b/src/views/trade/chargeManage/index.vue
index bd842d4..61480c1 100644
--- a/src/views/trade/chargeManage/index.vue
+++ b/src/views/trade/chargeManage/index.vue
@@ -1,84 +1,87 @@
 <template>
-  <div class="app-container">
+  <div class="p-2">
     <div>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
-        <el-form-item label="充值码" prop="code">
-          <el-input v-model.trim="queryParams.code" placeholder="请输入充值码" clearable />
-        </el-form-item>
-        <el-form-item label="昵称" prop="nickname">
-          <el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable />
-        </el-form-item>
-        <el-form-item label="充值人手机号" prop="phone">
-          <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
-        </el-form-item>
-        <el-form-item label="充值方式" prop="method">
-          <el-select v-model="queryParams.method">
-            <el-option v-for="item in userWithdrawMethodMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="充值类型" prop="type">
-          <el-select v-model="queryParams.type">
-            <el-option v-for="item in userWithdrawTypeMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <!--        <el-form-item label="审核状态" prop="auditStatus">
+      <el-card shadow="hover" class="mb-[10px]">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
+          <el-form-item label="充值码" prop="code">
+            <el-input v-model.trim="queryParams.code" placeholder="请输入充值码" clearable />
+          </el-form-item>
+          <el-form-item label="昵称" prop="nickname">
+            <el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable />
+          </el-form-item>
+          <el-form-item label="充值人手机号" prop="phone">
+            <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
+          </el-form-item>
+          <el-form-item label="充值方式" prop="method">
+            <el-select v-model="queryParams.method">
+              <el-option v-for="item in userWithdrawMethodMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="充值类型" prop="type">
+            <el-select v-model="queryParams.type">
+              <el-option v-for="item in userWithdrawTypeMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <!--        <el-form-item label="审核状态" prop="auditStatus">
           <el-select v-model="queryParams.auditStatus">
             <el-option v-for="item in userWithdrawAuditMap" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>-->
-        <el-form-item label="充值状态" prop="status">
-          <el-select v-model="queryParams.status">
-            <el-option v-for="item in userWithdrawStatusMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item class="flex_one tr">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"  @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
-        </el-form-item>
-      </el-form>
+          <el-form-item label="充值状态" prop="status">
+            <el-select v-model="queryParams.status">
+              <el-option v-for="item in userWithdrawStatusMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="flex_one tr">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"  @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card shadow="hover">
+        <el-table v-loading="userChargeInfoTableLoading" :data="userChargedrawInfo.data" border empty-text="暂无数据">
+          <el-table-column label="充值人" prop="createBy" />
+          <el-table-column label="充值时间" prop="createTime" />
+          <!--        <el-table-column label="提现码" prop="code" />-->
+          <el-table-column label="充值方式" prop="method">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.method, userWithdrawMethodMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="充值类型" prop="type">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.type, userWithdrawTypeMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="充值状态" prop="status">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.status, userWithdrawStatusMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="充值金额" prop="money">
+            <template v-slot="scope"> ￥ {{ scope.row.money || '0.00' }} </template>
+          </el-table-column>
+          <el-table-column label="手续费" prop="fee">
+            <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
+          </el-table-column>
 
-      <el-table v-loading="userChargeInfoTableLoading" :data="userChargedrawInfo.data" border empty-text="暂无数据">
-        <el-table-column label="充值人" prop="createBy" />
-        <el-table-column label="充值时间" prop="createTime" />
-        <!--        <el-table-column label="提现码" prop="code" />-->
-        <el-table-column label="充值方式" prop="method">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.method, userWithdrawMethodMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="充值类型" prop="type">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.type, userWithdrawTypeMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="充值状态" prop="status">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.status, userWithdrawStatusMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="充值金额" prop="money">
-          <template v-slot="scope"> ￥ {{ scope.row.money || '0.00' }} </template>
-        </el-table-column>
-        <el-table-column label="手续费" prop="fee">
-          <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
-        </el-table-column>
-
-        <el-table-column label="实际充值金额" prop="actualMoney">
-          <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-if="userChargedrawInfo.total"
-        :total="userChargedrawInfo.total"
-        v-model:page="chargeDataParams.current"
-        v-model:limit="chargeDataParams.size"
-        @pagination="
-          () => {
-            getList(userChargedrawInfo.record);
-          }
-        "
-      />
+          <el-table-column label="实际充值金额" prop="actualMoney">
+            <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-if="userChargedrawInfo.total"
+          :total="userChargedrawInfo.total"
+          v-model:page="chargeDataParams.current"
+          v-model:limit="chargeDataParams.size"
+          @pagination="
+            () => {
+              getList(userChargedrawInfo.record);
+            }
+          "
+        />
+      </el-card>
     </div>
   </div>
 </template>
diff --git a/src/views/trade/divideManage/index.vue b/src/views/trade/divideManage/index.vue
index 3f5bea9..d65f6a2 100644
--- a/src/views/trade/divideManage/index.vue
+++ b/src/views/trade/divideManage/index.vue
@@ -1,63 +1,66 @@
 <template>
-  <div class="app-container">
+  <div class="p-2">
     <div>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
-        <el-form-item label="订单ID" prop="orderId">
-          <el-input v-model.trim="queryParams.orderId" placeholder="请输入订单ID" clearable />
-        </el-form-item>
-        <el-form-item label="订单编号" prop="orderSn">
-          <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable />
-        </el-form-item>
-        <el-form-item label="分账状态" prop="status">
-          <el-select v-model="queryParams.status">
-            <el-option v-for="item in userStatusMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="分账类型" prop="type">
-          <el-select v-model="queryParams.type">
-            <el-option v-for="item in userTypeMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item class="flex_one tr">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
+      <el-card shadow="hover" class="mb-[10px]">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
+          <el-form-item label="订单ID" prop="orderId">
+            <el-input v-model.trim="queryParams.orderId" placeholder="请输入订单ID" clearable />
+          </el-form-item>
+          <el-form-item label="订单编号" prop="orderSn">
+            <el-input v-model.trim="queryParams.orderSn" placeholder="请输入订单编号" clearable />
+          </el-form-item>
+          <el-form-item label="分账状态" prop="status">
+            <el-select v-model="queryParams.status">
+              <el-option v-for="item in userStatusMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="分账类型" prop="type">
+            <el-select v-model="queryParams.type">
+              <el-option v-for="item in userTypeMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="flex_one tr">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card shadow="hover">
+        <el-table v-loading="tableLoading" :data="userDataInfo.data" border empty-text="暂无数据">
+          <el-table-column label="订单id" prop="orderId" />
+          <el-table-column label="分账规则" prop="ruleName" />
+          <el-table-column label="订单总金额" prop="orderMoney">
+            <template v-slot="scope"> ￥ {{ scope.row.orderMoney || '0.00' }} </template>
+          </el-table-column>
+          <el-table-column label="手续费" prop="fee">
+            <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
+          </el-table-column>
 
-      <el-table v-loading="tableLoading" :data="userDataInfo.data" border empty-text="暂无数据">
-        <el-table-column label="订单id" prop="orderId" />
-        <el-table-column label="分账规则" prop="ruleName" />
-        <el-table-column label="订单总金额" prop="orderMoney">
-          <template v-slot="scope"> ￥ {{ scope.row.orderMoney || '0.00' }} </template>
-        </el-table-column>
-        <el-table-column label="手续费" prop="fee">
-          <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
-        </el-table-column>
-
-        <el-table-column label="实际分账金额" prop="actualMoney">
-          <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
-        </el-table-column>
-        <el-table-column label="分账类型" prop="type">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.type, userTypeMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="状态" prop="status">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.status, userStatusMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="创建部门" prop="createDept" width="100" />
-        <el-table-column label="创建人" prop="createBy" width="100" />
-        <el-table-column label="创建时间" prop="auditTime" width="100" />
-      </el-table>
-      <pagination
-        v-if="userDataInfo.total"
-        :total="userDataInfo.total"
-        v-model:page="dataParams.current"
-        v-model:limit="dataParams.size"
-        @pagination="getList"
-      />
+          <el-table-column label="实际分账金额" prop="actualMoney">
+            <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
+          </el-table-column>
+          <el-table-column label="分账类型" prop="type">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.type, userTypeMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" prop="status">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.status, userStatusMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="创建部门" prop="createDept" width="100" />
+          <el-table-column label="创建人" prop="createBy" width="100" />
+          <el-table-column label="创建时间" prop="auditTime" width="100" />
+        </el-table>
+        <pagination
+          v-if="userDataInfo.total"
+          :total="userDataInfo.total"
+          v-model:page="dataParams.current"
+          v-model:limit="dataParams.size"
+          @pagination="getList"
+        />
+      </el-card>
     </div>
   </div>
 </template>
diff --git a/src/views/trade/divideRuleManage/index.vue b/src/views/trade/divideRuleManage/index.vue
index bf30aba..798ad7a 100644
--- a/src/views/trade/divideRuleManage/index.vue
+++ b/src/views/trade/divideRuleManage/index.vue
@@ -1,66 +1,71 @@
 <template>
   <div class="app-container">
     <div>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
-        <el-form-item label="编号" prop="code">
-          <el-input v-model.trim="queryParams.code" placeholder="编号" clearable />
-        </el-form-item>
-        <el-form-item label="规则名称" prop="name">
-          <el-input v-model.trim="queryParams.name" placeholder="请输入规则名称" clearable />
-        </el-form-item>
-        <el-form-item label="规则状态" prop="status">
-          <el-select v-model="queryParams.status">
-            <el-option v-for="item in userStatusMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
+      <el-card shadow="hover" class="mb-[10px]">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
+          <el-form-item label="编号" prop="code">
+            <el-input v-model.trim="queryParams.code" placeholder="编号" clearable />
+          </el-form-item>
+          <el-form-item label="规则名称" prop="name">
+            <el-input v-model.trim="queryParams.name" placeholder="请输入规则名称" clearable />
+          </el-form-item>
+          <el-form-item label="规则状态" prop="status">
+            <el-select v-model="queryParams.status">
+              <el-option v-for="item in userStatusMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="适用订单类型" prop="type">
+            <el-select v-model="queryParams.type">
+              <el-option v-for="item in userDivideRuleMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="flex_one tr">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card shadow="hover">
+        <template #header>
+          <el-row :gutter="10">
+            <el-col :span="1.5">
+              <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+            </el-col>
+          </el-row>
+        </template>
+        <el-table v-loading="tableLoading" :data="userDataInfo.data" border empty-text="暂无数据">
+          <el-table-column label="编号" prop="code" />
+          <el-table-column label="规则名称" prop="name" />
+          <el-table-column label="是否分配手续费" prop="divideFeeFlag">
+            <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
+          </el-table-column>
 
-        </el-form-item>
-        <el-form-item label="适用订单类型" prop="type">
-          <el-select v-model="queryParams.type">
-            <el-option v-for="item in userDivideRuleMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item class="flex_one tr">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="tableLoading" :data="userDataInfo.data" border empty-text="暂无数据">
-        <el-table-column label="编号" prop="code" />
-        <el-table-column label="规则名称" prop="name" />
-        <el-table-column label="是否分配手续费" prop="divideFeeFlag">
-          <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
-        </el-table-column>
-
-        <el-table-column label="手续费分配方式" prop="feeType">
-          <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
-        </el-table-column>
-        <el-table-column label="状态" prop="status">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.status, userStatusMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="创建部门" prop="createDept" width="100" />
-        <el-table-column label="创建人" prop="createBy" width="100" />
-        <el-table-column label="创建时间" prop="createTime" width="100" />
-        <el-table-column label="操作" width="200">
-          <template v-slot="scope">
-            <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
-            <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-if="userDataInfo.total"
-        :total="userDataInfo.total"
-        v-model:page="dataParams.current"
-        v-model:limit="dataParams.size"
-        @pagination="getList"
-      />
+          <el-table-column label="手续费分配方式" prop="feeType">
+            <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
+          </el-table-column>
+          <el-table-column label="状态" prop="status">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.status, userStatusMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="创建部门" prop="createDept" width="100" />
+          <el-table-column label="创建人" prop="createBy" width="100" />
+          <el-table-column label="创建时间" prop="createTime" width="100" />
+          <el-table-column label="操作" width="200">
+            <template v-slot="scope">
+              <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
+              <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-if="userDataInfo.total"
+          :total="userDataInfo.total"
+          v-model:page="dataParams.current"
+          v-model:limit="dataParams.size"
+          @pagination="getList"
+        />
+      </el-card>
     </div>
     <!-- 添加或修改规则对话框 -->
     <el-dialog :title="title" v-model="open" width="900" append-to-body>
diff --git a/src/views/trade/withdrawManage/index.vue b/src/views/trade/withdrawManage/index.vue
index 645c4f1..7484e66 100644
--- a/src/views/trade/withdrawManage/index.vue
+++ b/src/views/trade/withdrawManage/index.vue
@@ -1,102 +1,105 @@
 <template>
   <div class="app-container">
     <div>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
-        <el-form-item label="提现单号" prop="code">
-          <el-input v-model.trim="queryParams.code" placeholder="请输入会员id" clearable />
-        </el-form-item>
-        <el-form-item label="昵称" prop="nickname">
-          <el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable />
-        </el-form-item>
-        <el-form-item label="提现人手机号" prop="phone">
-          <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
-        </el-form-item>
-        <el-form-item label="提现方式" prop="method">
-          <el-select v-model="queryParams.method">
-            <el-option v-for="item in userWithdrawMethodMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="提现类型" prop="type">
-          <el-select v-model="queryParams.type">
-            <el-option v-for="item in userWithdrawTypeMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="审核状态" prop="auditStatus">
-          <el-select v-model="queryParams.auditStatus">
-            <el-option v-for="item in userWithdrawAuditMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="提现状态" prop="status">
-          <el-select v-model="queryParams.status">
-            <el-option v-for="item in userWithdrawStatusMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item class="flex_one tr">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"  @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
-        </el-form-item>
-      </el-form>
+      <el-card shadow="hover" class="mb-[10px]">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
+          <el-form-item label="提现单号" prop="code">
+            <el-input v-model.trim="queryParams.code" placeholder="请输入会员id" clearable />
+          </el-form-item>
+          <el-form-item label="昵称" prop="nickname">
+            <el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable />
+          </el-form-item>
+          <el-form-item label="提现人手机号" prop="phone">
+            <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
+          </el-form-item>
+          <el-form-item label="提现方式" prop="method">
+            <el-select v-model="queryParams.method">
+              <el-option v-for="item in userWithdrawMethodMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="提现类型" prop="type">
+            <el-select v-model="queryParams.type">
+              <el-option v-for="item in userWithdrawTypeMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审核状态" prop="auditStatus">
+            <el-select v-model="queryParams.auditStatus">
+              <el-option v-for="item in userWithdrawAuditMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="提现状态" prop="status">
+            <el-select v-model="queryParams.status">
+              <el-option v-for="item in userWithdrawStatusMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="flex_one tr">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"  @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card shadow="hover">
+        <el-table v-loading="userWithdrawInfoTableLoading" :data="userWithdrawInfo.data" border empty-text="暂无数据">
+          <el-table-column label="申请人" prop="createBy">
+            <template v-slot="scope">
+              {{ scope.row.member ? scope.row.member.nickname : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="申请时间" prop="createTime" />
+          <el-table-column label="提现码" prop="code" />
+          <el-table-column label="提现金额" prop="money">
+            <template v-slot="scope"> ￥ {{ scope.row.money || '0.00' }} </template>
+          </el-table-column>
+          <el-table-column label="手续费" prop="fee">
+            <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
+          </el-table-column>
 
-      <el-table v-loading="userWithdrawInfoTableLoading" :data="userWithdrawInfo.data" border empty-text="暂无数据">
-        <el-table-column label="申请人" prop="createBy">
-          <template v-slot="scope">
-            {{ scope.row.member ? scope.row.member.nickname : '' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="申请时间" prop="createTime" />
-        <el-table-column label="提现码" prop="code" />
-        <el-table-column label="提现金额" prop="money">
-          <template v-slot="scope"> ￥ {{ scope.row.money || '0.00' }} </template>
-        </el-table-column>
-        <el-table-column label="手续费" prop="fee">
-          <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
-        </el-table-column>
+          <el-table-column label="实际到账金额" prop="actualMoney">
+            <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
+          </el-table-column>
 
-        <el-table-column label="实际到账金额" prop="actualMoney">
-          <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
-        </el-table-column>
-
-        <el-table-column label="提现方式" prop="method">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.method, userWithdrawMethodMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="提现类型" prop="type">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.type, userWithdrawTypeMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="提现状态" prop="status">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.status, userWithdrawStatusMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审批状态" prop="auditStatus">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.auditStatus, userWithdrawAuditMap) }}
-            <el-tooltip v-if="scope.row.auditStatus == '2'" :content="scope.row.auditStatus == '2' ? scope.row.auditReason : null" placement="top">
-              <el-icon>
-                <question-filled />
-              </el-icon>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-        <el-table-column label="审核人" prop="auditBy" width="100" />
-        <el-table-column label="审核时间" prop="auditTime" width="100" />
-        <el-table-column label="操作" fixed="right" align="center" width="100">
-          <template v-slot="scope">
-            <el-button v-if="scope.row.auditStatus == '0'" text type="primary" @click="showAuditModal(scope.row)">审批</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-if="userWithdrawInfo.total"
-        :total="userWithdrawInfo.total"
-        v-model:page="withdrawDataParams.current"
-        v-model:limit="withdrawDataParams.size"
-        @pagination="getList"
-      />
+          <el-table-column label="提现方式" prop="method">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.method, userWithdrawMethodMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="提现类型" prop="type">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.type, userWithdrawTypeMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="提现状态" prop="status">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.status, userWithdrawStatusMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" prop="auditStatus">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.auditStatus, userWithdrawAuditMap) }}
+              <el-tooltip v-if="scope.row.auditStatus == '2'" :content="scope.row.auditStatus == '2' ? scope.row.auditReason : null" placement="top">
+                <el-icon>
+                  <question-filled />
+                </el-icon>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核人" prop="auditBy" width="100" />
+          <el-table-column label="审核时间" prop="auditTime" width="100" />
+          <el-table-column label="操作" fixed="right" align="center" width="100">
+            <template v-slot="scope">
+              <el-button v-if="scope.row.auditStatus == '0'" text type="primary" @click="showAuditModal(scope.row)">审批</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-if="userWithdrawInfo.total"
+          :total="userWithdrawInfo.total"
+          v-model:page="withdrawDataParams.current"
+          v-model:limit="withdrawDataParams.size"
+          @pagination="getList"
+        />
+      </el-card>
     </div>
     <!-- 提现审核-->
     <el-dialog title="提现审核" v-model="auditFormOpen" width="500px" append-to-body>
diff --git a/src/views/ums/account/index.vue b/src/views/ums/account/index.vue
index c94b98d..e23eb18 100644
--- a/src/views/ums/account/index.vue
+++ b/src/views/ums/account/index.vue
@@ -1,33 +1,36 @@
 <template>
-  <div class="app-container">
+  <div class="p-2">
     <div v-show="show">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-        <el-form-item label="名称" prop="name">
-          <el-input v-model.trim="queryParams.id" placeholder="请输入会员名称" clearable />
-        </el-form-item>
-        <el-form-item label="手机号码" prop="phone">
-          <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
-        </el-form-item>
-        <el-form-item class="flex_one tr">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-
-      <el-table v-loading="loading" :data="umsAccountList" border empty-text="暂无数据">
-        <el-table-column label="昵称" prop="name" />
-        <el-table-column label="手机号" prop="phone" />
-        <el-table-column label="钱包" prop="wallet">
-          <template v-slot="scope"> ￥ {{ scope.row.wallet || '0.00' }} </template>
-        </el-table-column>
-        <el-table-column label="营收" prop="revenue">
-          <template v-slot="scope"> ￥ {{ scope.row.revenue || '0.00' }} </template>
-        </el-table-column>
-        <el-table-column label="积分余额" prop="integral">
-          <template v-slot="scope"> ￥ {{ scope.row.integral || '0.00' }} </template>
-        </el-table-column>
-      </el-table>
-      <pagination :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
+      <el-card shadow="hover" class="mb-[10px]">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model.trim="queryParams.id" placeholder="请输入会员名称" clearable />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phone">
+            <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
+          </el-form-item>
+          <el-form-item class="flex_one tr">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card shadow="hover">
+        <el-table v-loading="loading" :data="umsAccountList" border empty-text="暂无数据">
+          <el-table-column label="昵称" prop="name" />
+          <el-table-column label="手机号" prop="phone" />
+          <el-table-column label="钱包" prop="wallet">
+            <template v-slot="scope"> ￥ {{ scope.row.wallet || '0.00' }} </template>
+          </el-table-column>
+          <el-table-column label="营收" prop="revenue">
+            <template v-slot="scope"> ￥ {{ scope.row.revenue || '0.00' }} </template>
+          </el-table-column>
+          <el-table-column label="积分余额" prop="integral">
+            <template v-slot="scope"> ￥ {{ scope.row.integral || '0.00' }} </template>
+          </el-table-column>
+        </el-table>
+        <pagination :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
+      </el-card>
     </div>
   </div>
 </template>
diff --git a/src/views/ums/feedback/index.vue b/src/views/ums/feedback/index.vue
index 1cee5f0..debaac6 100644
--- a/src/views/ums/feedback/index.vue
+++ b/src/views/ums/feedback/index.vue
@@ -1,72 +1,75 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          :clearable="true"
-          :picker-options="pickerOptions"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item label="处理状态">
-        <el-select v-model="queryParams.status" clearable>
-          <el-option value="0" label="未处理" />
-          <el-option value="1" label="已处理" />
-        </el-select>
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="feedbackList" border>
-      <el-table-column label="反馈人" align="left" prop="nickname" width="150">
-        <template v-slot="scope">
-          <p>用户ID：{{ scope.row.createBy }}</p>
-          <p>{{ scope.row.phone }}</p>
-        </template>
-      </el-table-column>
-      <el-table-column label="反馈时间" prop="createTime" width="180">
-        <template v-slot="scope">
-          <div>{{ parseTime(scope.row.createTime) }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="反馈类型" prop="type" />
-      <el-table-column label="具体内容" prop="content" show-overflow-tooltip />
-      <el-table-column label="图片">
-        <template v-slot="scope">
-          <el-image
-            v-if="scope.row.imageList.length"
-            style="width: 60px; height: 60px"
-            v-for="it in scope.row.imageList"
-            :key="it"
-            :src="it"
-            :preview-src-list="[it]"
-          >
-          </el-image>
-        </template>
-      </el-table-column>
-      <el-table-column label="处理状态/时间">
-        <template v-slot="scope">
-          <div v-if="scope.row.handleStatus === 1">已处理</div>
-          <el-switch v-else v-model="scope.row.handleStatus" active-value="1" inactive-value="0" @change="changeStatus(scope.row)" />
-          <div>{{ scope.row.handleTime ? parseTime(scope.row.handleTime) : '' }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注">
-        <template v-slot="scope">
-          <span class="mr10">{{ scope.row.remark }}</span>
-          <i class="el-icon-edit pointer" @click="showUpdateMark(scope.row)"></i>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+  <div class="p-2">
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+        <el-form-item label="创建时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            :clearable="true"
+            :picker-options="pickerOptions"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="处理状态">
+          <el-select v-model="queryParams.status" clearable>
+            <el-option value="0" label="未处理" />
+            <el-option value="1" label="已处理" />
+          </el-select>
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card shadow="hover">
+      <el-table v-loading="loading" :data="feedbackList" border>
+        <el-table-column label="反馈人" align="left" prop="nickname" width="150">
+          <template v-slot="scope">
+            <p>用户ID：{{ scope.row.createBy }}</p>
+            <p>{{ scope.row.phone }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="反馈时间" prop="createTime" width="180">
+          <template v-slot="scope">
+            <div>{{ parseTime(scope.row.createTime) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="反馈类型" prop="type" />
+        <el-table-column label="具体内容" prop="content" show-overflow-tooltip />
+        <el-table-column label="图片">
+          <template v-slot="scope">
+            <el-image
+              v-if="scope.row.imageList.length"
+              style="width: 60px; height: 60px"
+              v-for="it in scope.row.imageList"
+              :key="it"
+              :src="it"
+              :preview-src-list="[it]"
+            >
+            </el-image>
+          </template>
+        </el-table-column>
+        <el-table-column label="处理状态/时间">
+          <template v-slot="scope">
+            <div v-if="scope.row.handleStatus === 1">已处理</div>
+            <el-switch v-else v-model="scope.row.handleStatus" active-value="1" inactive-value="0" @change="changeStatus(scope.row)" />
+            <div>{{ scope.row.handleTime ? parseTime(scope.row.handleTime) : '' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注">
+          <template v-slot="scope">
+            <span class="mr10">{{ scope.row.remark }}</span>
+            <i class="el-icon-edit pointer" @click="showUpdateMark(scope.row)"></i>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
     <el-dialog title="修改备注" v-model="remarkModal.visible" width="30%" append-to-body>
       <el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="remarkModal.remark" />
       <template v-slot:footer>
diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index 3ee2cdb..0bd03fd 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -1,95 +1,97 @@
 <template>
-  <div class="app-container">
+  <div class="p-2">
     <div v-show="show">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-        <el-form-item label="创建时间">
-          <el-date-picker
-            v-model="dateRange"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            :clearable="true"
-            :picker-options="pickerOptions"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="会员ID" prop="id">
-          <el-input v-model.trim="queryParams.id" placeholder="请输入会员id" clearable />
-        </el-form-item>
-        <el-form-item label="昵称" prop="nickname">
-          <el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable />
-        </el-form-item>
-        <el-form-item label="手机号码" prop="phone">
-          <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
-        </el-form-item>
-        <el-form-item label="备注" prop="mark">
-          <el-select v-model="queryParams.hasMark" clearable>
-            <el-option value="1" label="有备注" />
-            <el-option value="0" label="无备注" />
-          </el-select>
-        </el-form-item>
-        <el-form-item class="flex_one tr">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"  @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
-        </el-form-item>
-      </el-form>
-
-      <el-table v-loading="loading" :data="umsMemberList" border empty-text="暂无数据">
-        <!--        <el-table-column label="会员ID" prop="id" width="180" />-->
-        <el-table-column label="昵称" prop="nickname" width="150" />
-        <el-table-column label="手机号" prop="phoneHidden" width="150" />
-        <el-table-column label="注册日期" prop="createTime" width="150" />
-        <!--        <el-table-column label="钱包" prop="phoneHidden" width="150" />
+      <el-card shadow="hover" class="mb-[10px]">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRange"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              :clearable="true"
+              :picker-options="pickerOptions"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="会员ID" prop="id">
+            <el-input v-model.trim="queryParams.id" placeholder="请输入会员id" clearable />
+          </el-form-item>
+          <el-form-item label="昵称" prop="nickname">
+            <el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phone">
+            <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
+          </el-form-item>
+          <el-form-item label="备注" prop="mark">
+            <el-select v-model="queryParams.hasMark" clearable>
+              <el-option value="1" label="有备注" />
+              <el-option value="0" label="无备注" />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="flex_one tr">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"  @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card shadow="hover">
+        <el-table v-loading="loading" :data="umsMemberList" border empty-text="暂无数据">
+          <!--        <el-table-column label="会员ID" prop="id" width="180" />-->
+          <el-table-column label="昵称" prop="nickname" width="150" />
+          <el-table-column label="手机号" prop="phoneHidden" width="150" />
+          <el-table-column label="注册日期" prop="createTime" width="150" />
+          <!--        <el-table-column label="钱包" prop="phoneHidden" width="150" />
         <el-table-column label="营收" prop="phoneHidden" width="150" />
         <el-table-column label="积分" prop="integral" width="150" />
 
         <el-table-column label="实名认证信息" prop="userName" width="150" />
         <el-table-column label="银行卡信息" prop="phoneHidden" width="150" />-->
-        <el-table-column label="账号状态" prop="status" width="150">
-          <template v-slot="scope">
-            <el-switch
-              :model-value="scope.row.status"
-              :active-value="1"
-              :inactive-value="0"
-              active-text="启用"
-              inactive-text="禁用"
-              inline-prompt
-              :before-change="
-                () => {
-                  return handleChangeUserStatus(scope.row);
-                }
-              "
-            >
-            </el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column label="内部账号" prop="userId" width="90">
-          <template v-slot="scope">
-            {{ scope.row.userId ? '内部账号' : '外部账号' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="关注数量" prop="followCount" width="100">
-          <template v-slot="scope">
-            <el-button text type="primary" icon="user" @click="showUserFansListModal(1, scope.row, true)">{{ scope.row.followCount }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="粉丝数量" prop="fansCount" width="100">
-          <template v-slot="scope">
-            <el-button text type="primary" icon="user" @click="showUserFansListModal(2, scope.row, true)">{{ scope.row.fansCount }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="好友数量" prop="friendsCount" width="100">
-          <template v-slot="scope">
-            <el-button text type="primary" icon="user" @click="showUserFansListModal(3, scope.row, true)">{{ scope.row.friendsCount }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="推广码" prop="spreadCode" width="150" />
-        <el-table-column label="推广人" prop="spreadUid" width="150" />
-        <el-table-column label="openId" prop="openId" width="150" />
-        <!--        <el-table-column label="注册时间" prop="createTime" width="180">
+          <el-table-column label="账号状态" prop="status" width="150">
+            <template v-slot="scope">
+              <el-switch
+                :model-value="scope.row.status"
+                :active-value="1"
+                :inactive-value="0"
+                active-text="启用"
+                inactive-text="禁用"
+                inline-prompt
+                :before-change="
+                  () => {
+                    return handleChangeUserStatus(scope.row);
+                  }
+                "
+              >
+              </el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="内部账号" prop="userId" width="90">
+            <template v-slot="scope">
+              {{ scope.row.userId ? '内部账号' : '外部账号' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="关注数量" prop="followCount" width="100">
+            <template v-slot="scope">
+              <el-button text type="primary" icon="user" @click="showUserFansListModal(1, scope.row, true)">{{ scope.row.followCount }}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="粉丝数量" prop="fansCount" width="100">
+            <template v-slot="scope">
+              <el-button text type="primary" icon="user" @click="showUserFansListModal(2, scope.row, true)">{{ scope.row.fansCount }}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="好友数量" prop="friendsCount" width="100">
+            <template v-slot="scope">
+              <el-button text type="primary" icon="user" @click="showUserFansListModal(3, scope.row, true)">{{ scope.row.friendsCount }}</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="推广码" prop="spreadCode" width="150" />
+          <el-table-column label="推广人" prop="spreadUid" width="150" />
+          <el-table-column label="openId" prop="openId" width="150" />
+          <!--        <el-table-column label="注册时间" prop="createTime" width="180">
           <template v-slot="scope">
             <div>{{ parseTime(scope.row.createTime) }}</div>
           </template>
@@ -99,35 +101,36 @@
             <div>{{ parseTime(scope.row.createTime) }}</div>
           </template>
         </el-table-column>-->
-        <el-table-column label="备注">
-          <template v-slot="scope">
-            <span class="mr10">{{ scope.row.mark }}</span>
-            <i class="el-icon-edit pointer" @click="showUpdateMark(scope.row)"></i>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" fixed="right" width="200">
-          <template v-slot="scope">
-            <el-button size="small" text type="primary" @click="showUserAccountModal(scope.row)">账户数据 </el-button>
-            <el-button size="small" text type="primary" @click="showUserBankCardInfoModal(scope.row, true)">银行卡 </el-button>
-            <el-button size="small" text type="primary">充值消费记录 </el-button>
-            <el-button size="small" text type="primary">开通代理 </el-button>
-            <el-button size="small" text type="primary" @click="showUserAccountEditModal(scope.row)">编辑 </el-button>
-            <el-button size="small" text type="primary" @click="showUserBalanceInfoModal(scope.row, true)">余额变更记录 </el-button>
-            <el-button size="small" text type="primary">开通易生支付 </el-button>
-            <el-button size="small" text type="primary" @click="showUserLoginInfoModal(scope.row, true)">登录记录 </el-button>
-            <el-button size="small" text type="primary">操作日志 </el-button>
-            <el-button size="small" text type="primary" @click="showUserBannedInfoModal(scope.row, true)">封禁记录 </el-button>
-            <el-button size="small" text type="primary" @click="showBlackListInfoModal(scope.row)">黑名单 </el-button>
-            <el-button size="small" text type="primary" @click="handleUserDelete(scope.row)">删除 </el-button>
-            <el-button size="small" text type="primary" @click="goWithdrawInfoPage(scope.row)">提现记录 </el-button>
-            <el-button size="small" text type="primary" @click="showChargeInfoModal(scope.row, true)">充值记录 </el-button>
-            <!--            <el-button  text type="primary" @click="showStatistics(scope.row.id)" v-hasPermi="['ums:member:statistics']">查看数据 </el-button>
+          <el-table-column label="备注">
+            <template v-slot="scope">
+              <span class="mr10">{{ scope.row.mark }}</span>
+              <i class="el-icon-edit pointer" @click="showUpdateMark(scope.row)"></i>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" class-name="small-padding fixed-width" fixed="right" width="200">
+            <template v-slot="scope">
+              <el-button size="small" text type="primary" @click="showUserAccountModal(scope.row)">账户数据 </el-button>
+              <el-button size="small" text type="primary" @click="showUserBankCardInfoModal(scope.row, true)">银行卡 </el-button>
+              <el-button size="small" text type="primary">充值消费记录 </el-button>
+              <el-button size="small" text type="primary">开通代理 </el-button>
+              <el-button size="small" text type="primary" @click="showUserAccountEditModal(scope.row)">编辑 </el-button>
+              <el-button size="small" text type="primary" @click="showUserBalanceInfoModal(scope.row, true)">余额变更记录 </el-button>
+              <el-button size="small" text type="primary">开通易生支付 </el-button>
+              <el-button size="small" text type="primary" @click="showUserLoginInfoModal(scope.row, true)">登录记录 </el-button>
+              <el-button size="small" text type="primary">操作日志 </el-button>
+              <el-button size="small" text type="primary" @click="showUserBannedInfoModal(scope.row, true)">封禁记录 </el-button>
+              <el-button size="small" text type="primary" @click="showBlackListInfoModal(scope.row)">黑名单 </el-button>
+              <el-button size="small" text type="primary" @click="handleUserDelete(scope.row)">删除 </el-button>
+              <el-button size="small" text type="primary" @click="goWithdrawInfoPage(scope.row)">提现记录 </el-button>
+              <el-button size="small" text type="primary" @click="showChargeInfoModal(scope.row, true)">充值记录 </el-button>
+              <!--            <el-button  text type="primary" @click="showStatistics(scope.row.id)" v-hasPermi="['ums:member:statistics']">查看数据 </el-button>
             <el-button  text type="primary" @click="goOrder(scope.row.phoneEncrypted)">查看下单</el-button>
             <el-button  text type="primary" @click="goCart(scope.row.phoneEncrypted)">查看购物车</el-button>-->
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
+      </el-card>
     </div>
     <!-- 会员账户详情-->
     <el-dialog :title="userAccountModal.title" v-model="userAccountModal.open" width="500px" append-to-body>
diff --git a/src/views/ums/memberAddress/index.vue b/src/views/ums/memberAddress/index.vue
index f3a1d06..94503df 100644
--- a/src/views/ums/memberAddress/index.vue
+++ b/src/views/ums/memberAddress/index.vue
@@ -1,38 +1,39 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-      <el-form-item label="收货人姓名" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入收货人姓名" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="手机号" prop="phone">
-        <el-input v-model="queryParams.phone" placeholder="请输入手机号" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="邮政编码" prop="postCode">
-        <el-input v-model="queryParams.postCode" placeholder="请输入邮政编码" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="省份/直辖市" prop="province">
-        <el-input v-model="queryParams.province" placeholder="请输入省份/直辖市" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="城市" prop="city">
-        <el-input v-model="queryParams.city" placeholder="请输入城市" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <template v-if="showMoreCondition">
-        <el-form-item label="区" prop="district">
-          <el-input v-model="queryParams.district" placeholder="请输入区" clearable @keyup.enter="handleQuery" />
+  <div class="p-2">
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+        <el-form-item label="收货人姓名" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入收货人姓名" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="详细地址" prop="detailAddress">
-          <el-input v-model="queryParams.detailAddress" placeholder="请输入详细地址" clearable @keyup.enter="handleQuery" />
+        <el-form-item label="手机号" prop="phone">
+          <el-input v-model="queryParams.phone" placeholder="请输入手机号" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-      </template>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" @click="showMoreCondition = !showMoreCondition">{{
-          showMoreCondition ? '收起条件' : '展开条件'
-        }}</el-button>
-      </el-form-item>
-    </el-form>
-
+        <el-form-item label="邮政编码" prop="postCode">
+          <el-input v-model="queryParams.postCode" placeholder="请输入邮政编码" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="省份/直辖市" prop="province">
+          <el-input v-model="queryParams.province" placeholder="请输入省份/直辖市" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="城市" prop="city">
+          <el-input v-model="queryParams.city" placeholder="请输入城市" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <template v-if="showMoreCondition">
+          <el-form-item label="区" prop="district">
+            <el-input v-model="queryParams.district" placeholder="请输入区" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="详细地址" prop="detailAddress">
+            <el-input v-model="queryParams.detailAddress" placeholder="请输入详细地址" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </template>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" @click="showMoreCondition = !showMoreCondition">{{
+            showMoreCondition ? '收起条件' : '展开条件'
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
     <!--    <el-row :gutter="10" class="mb8">-->
     <!--      <el-col :span="1.5">-->
     <!--        <el-button-->
@@ -46,46 +47,46 @@
     <!--      </el-col>-->
     <!--      </el-col>-->
     <!--    </el-row>-->
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-table v-loading="loading" border :data="umsMemberAddressList">
+        <!--      <el-table-column type="selection" width="55" align="center" />-->
+        <el-table-column label="收货人姓名" align="center" prop="name">
+          <template v-slot="scope">
+            <div>{{ getHiddenName(scope.row.name) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="手机号" align="center" prop="phoneHidden" />
+        <el-table-column label="邮政编码" align="center" prop="postCode" />
+        <el-table-column label="省份/直辖市" align="center" prop="province" />
+        <el-table-column label="城市" align="center" prop="city" />
+        <el-table-column label="区" align="center" prop="district" />
+        <el-table-column label="详细地址" align="center" prop="detailAddress" width="250">
+          <template v-slot="scope">
+            <div>{{ getHiddenDetailAddress(scope.row.detailAddress) }}</div>
+          </template>
+        </el-table-column>
+        <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+        <!--        <template slot-scope="scope">-->
+        <!--          <el-button-->
+        <!--            -->
+        <!--            text type="primary"-->
+        <!--            icon="Edit"-->
+        <!--            @click="handleUpdate(scope.row)"-->
+        <!--            v-hasPermi="['ums:memberAddress:edit']"-->
+        <!--          >修改</el-button>-->
+        <!--          <el-button-->
+        <!--            -->
+        <!--            text type="primary"-->
+        <!--            icon="Delete"-->
+        <!--            @click="handleDelete(scope.row)"-->
+        <!--            v-hasPermi="['ums:memberAddress:remove']"-->
+        <!--          >删除</el-button>-->
+        <!--        </template>-->
+        <!--      </el-table-column>-->
+      </el-table>
 
-    <el-table v-loading="loading" border :data="umsMemberAddressList">
-      <!--      <el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="收货人姓名" align="center" prop="name">
-        <template v-slot="scope">
-          <div>{{ getHiddenName(scope.row.name) }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column label="手机号" align="center" prop="phoneHidden" />
-      <el-table-column label="邮政编码" align="center" prop="postCode" />
-      <el-table-column label="省份/直辖市" align="center" prop="province" />
-      <el-table-column label="城市" align="center" prop="city" />
-      <el-table-column label="区" align="center" prop="district" />
-      <el-table-column label="详细地址" align="center" prop="detailAddress" width="250">
-        <template v-slot="scope">
-          <div>{{ getHiddenDetailAddress(scope.row.detailAddress) }}</div>
-        </template>
-      </el-table-column>
-      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <el-button-->
-      <!--            -->
-      <!--            text type="primary"-->
-      <!--            icon="Edit"-->
-      <!--            @click="handleUpdate(scope.row)"-->
-      <!--            v-hasPermi="['ums:memberAddress:edit']"-->
-      <!--          >修改</el-button>-->
-      <!--          <el-button-->
-      <!--            -->
-      <!--            text type="primary"-->
-      <!--            icon="Delete"-->
-      <!--            @click="handleDelete(scope.row)"-->
-      <!--            v-hasPermi="['ums:memberAddress:remove']"-->
-      <!--          >删除</el-button>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
     <!-- 添加或修改会员收货地址对话框 -->
     <el-dialog :title="title" v-model:visible="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
diff --git a/src/views/ums/memberCart/index.vue b/src/views/ums/memberCart/index.vue
index d9fce43..5f4e865 100644
--- a/src/views/ums/memberCart/index.vue
+++ b/src/views/ums/memberCart/index.vue
@@ -1,91 +1,94 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
-      <el-form-item label="用户手机号" prop="phone">
-        <el-input v-model="queryParams.phone" placeholder="用户手机号" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item label="商品名称" prop="productName">
-        <el-input v-model="queryParams.productName" placeholder="商品名称" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <el-form-item class="flex_one tr">
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table v-loading="loading" :data="umsMemberCartList" @selection-change="handleSelectionChange" border cell-class-name="my-cell">
-      <!--      <el-table-column type="selection" width="55"  />-->
-      <el-table-column label="用户信息" prop="phoneHidden">
-        <template v-slot="scope">
-          <p>{{ scope.row.member.phoneHidden }}</p>
-          <p>{{ scope.row.member.nickname }}</p>
-        </template>
-      </el-table-column>
-      <el-table-column label="用户备注" prop="mark">
-        <template v-slot="scope">
-          <p>{{ scope.row.member.mark }}</p>
-        </template>
-      </el-table-column>
-      <el-table-column label="商品名称" prop="productName" />
-      <el-table-column label="商品规格" prop="spData">
-        <template v-slot="scope">
-          <div class="product-container">
-            <el-popover placement="right" trigger="hover">
-              <el-image :src="scope.row.pic" style="width: 350px; height: 350px" />
-              <template v-slot:reference>
-                <el-image class="small-img product-item" :src="scope.row.pic" style="width: 40px; height: 40px" />
-              </template>
-            </el-popover>
-            <div class="product-item" style="margin-left: 5px">
-              <div class="sp-data">
-                <span v-for="(value, key) in JSON.parse(scope.row.spData)">{{ key }}：{{ value }}&nbsp;</span>
-              </div>
-              <div class="product-item quantity">
-                <span style="margin-right: 10px">￥{{ scope.row.price }}</span>
-                <span>x{{ scope.row.quantity }}</span>
+  <div class="p-2">
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
+        <el-form-item label="用户手机号" prop="phone">
+          <el-input v-model="queryParams.phone" placeholder="用户手机号" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="商品名称" prop="productName">
+          <el-input v-model="queryParams.productName" placeholder="商品名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card shadow="hover">
+      <el-table v-loading="loading" :data="umsMemberCartList" @selection-change="handleSelectionChange" border cell-class-name="my-cell">
+        <!--      <el-table-column type="selection" width="55"  />-->
+        <el-table-column label="用户信息" prop="phoneHidden">
+          <template v-slot="scope">
+            <p>{{ scope.row.member.phoneHidden }}</p>
+            <p>{{ scope.row.member.nickname }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户备注" prop="mark">
+          <template v-slot="scope">
+            <p>{{ scope.row.member.mark }}</p>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" prop="productName" />
+        <el-table-column label="商品规格" prop="spData">
+          <template v-slot="scope">
+            <div class="product-container">
+              <el-popover placement="right" trigger="hover">
+                <el-image :src="scope.row.pic" style="width: 350px; height: 350px" />
+                <template v-slot:reference>
+                  <el-image class="small-img product-item" :src="scope.row.pic" style="width: 40px; height: 40px" />
+                </template>
+              </el-popover>
+              <div class="product-item" style="margin-left: 5px">
+                <div class="sp-data">
+                  <span v-for="(value, key) in JSON.parse(scope.row.spData)">{{ key }}：{{ value }}&nbsp;</span>
+                </div>
+                <div class="product-item quantity">
+                  <span style="margin-right: 10px">￥{{ scope.row.price }}</span>
+                  <span>x{{ scope.row.quantity }}</span>
+                </div>
               </div>
             </div>
-          </div>
-        </template>
-      </el-table-column>
-      <!--      <el-table-column label="价格"  prop="price">-->
-      <!--        <template v-slot="scope">-->
-      <!--          <div>{{ scope.row.price.toFixed(2) }}</div>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
-      <el-table-column label="状态" prop="skuIfExist">
-        <template v-slot="scope">
-          <el-tag effect="plain" size="default" :type="scope.row.skuIfExist === 1 ? 'success' : 'error'">
-            {{ scope.row.skuIfExist === 1 ? '有效' : '失效' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="加入时间" prop="createTime">
-        <template v-slot="scope">
-          <div>{{ parseTime(scope.row.createTime, '') }}</div>
-        </template>
-      </el-table-column>
-      <!--      <el-table-column label="操作"  class-name="small-padding fixed-width">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <el-button-->
-      <!--            -->
-      <!--            text type="primary"-->
-      <!--            icon="Edit"-->
-      <!--            @click="handleUpdate(scope.row)"-->
-      <!--            v-hasPermi="['ums:memberCart:edit']"-->
-      <!--          >修改</el-button>-->
-      <!--          <el-button-->
-      <!--            -->
-      <!--            text type="primary"-->
-      <!--            icon="Delete"-->
-      <!--            @click="handleDelete(scope.row)"-->
-      <!--            v-hasPermi="['ums:memberCart:remove']"-->
-      <!--          >删除</el-button>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
-    </el-table>
+          </template>
+        </el-table-column>
+        <!--      <el-table-column label="价格"  prop="price">-->
+        <!--        <template v-slot="scope">-->
+        <!--          <div>{{ scope.row.price.toFixed(2) }}</div>-->
+        <!--        </template>-->
+        <!--      </el-table-column>-->
+        <el-table-column label="状态" prop="skuIfExist">
+          <template v-slot="scope">
+            <el-tag effect="plain" size="default" :type="scope.row.skuIfExist === 1 ? 'success' : 'error'">
+              {{ scope.row.skuIfExist === 1 ? '有效' : '失效' }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="加入时间" prop="createTime">
+          <template v-slot="scope">
+            <div>{{ parseTime(scope.row.createTime, '') }}</div>
+          </template>
+        </el-table-column>
+        <!--      <el-table-column label="操作"  class-name="small-padding fixed-width">-->
+        <!--        <template slot-scope="scope">-->
+        <!--          <el-button-->
+        <!--            -->
+        <!--            text type="primary"-->
+        <!--            icon="Edit"-->
+        <!--            @click="handleUpdate(scope.row)"-->
+        <!--            v-hasPermi="['ums:memberCart:edit']"-->
+        <!--          >修改</el-button>-->
+        <!--          <el-button-->
+        <!--            -->
+        <!--            text type="primary"-->
+        <!--            icon="Delete"-->
+        <!--            @click="handleDelete(scope.row)"-->
+        <!--            v-hasPermi="['ums:memberCart:remove']"-->
+        <!--          >删除</el-button>-->
+        <!--        </template>-->
+        <!--      </el-table-column>-->
+      </el-table>
 
-    <pagination v-if="total" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-if="total" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
   </div>
 </template>
 
diff --git a/src/views/ums/withdrawManage/index.vue b/src/views/ums/withdrawManage/index.vue
index 1cc9044..a9df4bd 100644
--- a/src/views/ums/withdrawManage/index.vue
+++ b/src/views/ums/withdrawManage/index.vue
@@ -1,102 +1,105 @@
 <template>
-  <div class="app-container">
+  <div class="p-2">
     <div>
-      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
-        <el-form-item label="提现单号" prop="code">
-          <el-input v-model.trim="queryParams.code" placeholder="请输入会员id" clearable />
-        </el-form-item>
-        <el-form-item label="昵称" prop="nickname">
-          <el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable />
-        </el-form-item>
-        <el-form-item label="提现人手机号" prop="phone">
-          <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
-        </el-form-item>
-        <el-form-item label="提现方式" prop="method">
-          <el-select v-model="queryParams.method">
-            <el-option v-for="item in userWithdrawMethodMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="提现类型" prop="type">
-          <el-select v-model="queryParams.type">
-            <el-option v-for="item in userWithdrawTypeMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="审核状态" prop="auditStatus">
-          <el-select v-model="queryParams.auditStatus">
-            <el-option v-for="item in userWithdrawAuditMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="提现状态" prop="status">
-          <el-select v-model="queryParams.status">
-            <el-option v-for="item in userWithdrawStatusMap" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item class="flex_one tr">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"  @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
-        </el-form-item>
-      </el-form>
+      <el-card shadow="hover" class="mb-[10px]">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
+          <el-form-item label="提现单号" prop="code">
+            <el-input v-model.trim="queryParams.code" placeholder="请输入会员id" clearable />
+          </el-form-item>
+          <el-form-item label="昵称" prop="nickname">
+            <el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable />
+          </el-form-item>
+          <el-form-item label="提现人手机号" prop="phone">
+            <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
+          </el-form-item>
+          <el-form-item label="提现方式" prop="method">
+            <el-select v-model="queryParams.method">
+              <el-option v-for="item in userWithdrawMethodMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="提现类型" prop="type">
+            <el-select v-model="queryParams.type">
+              <el-option v-for="item in userWithdrawTypeMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="审核状态" prop="auditStatus">
+            <el-select v-model="queryParams.auditStatus">
+              <el-option v-for="item in userWithdrawAuditMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="提现状态" prop="status">
+            <el-select v-model="queryParams.status">
+              <el-option v-for="item in userWithdrawStatusMap" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-form-item class="flex_one tr">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"  @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
+          </el-form-item>
+        </el-form>
+      </el-card>
+      <el-card shadow="hover">
+        <el-table v-loading="userWithdrawInfoTableLoading" :data="userWithdrawInfo.data" border empty-text="暂无数据">
+          <el-table-column label="申请人" prop="createBy">
+            <template v-slot="scope">
+              {{ scope.row.member ? scope.row.member.nickname : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="申请时间" prop="createTime" />
+          <el-table-column label="提现码" prop="code" />
+          <el-table-column label="提现金额" prop="money">
+            <template v-slot="scope"> ￥ {{ scope.row.money || '0.00' }} </template>
+          </el-table-column>
+          <el-table-column label="手续费" prop="fee">
+            <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
+          </el-table-column>
 
-      <el-table v-loading="userWithdrawInfoTableLoading" :data="userWithdrawInfo.data" border empty-text="暂无数据">
-        <el-table-column label="申请人" prop="createBy">
-          <template v-slot="scope">
-            {{ scope.row.member ? scope.row.member.nickname : '' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="申请时间" prop="createTime" />
-        <el-table-column label="提现码" prop="code" />
-        <el-table-column label="提现金额" prop="money">
-          <template v-slot="scope"> ￥ {{ scope.row.money || '0.00' }} </template>
-        </el-table-column>
-        <el-table-column label="手续费" prop="fee">
-          <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
-        </el-table-column>
+          <el-table-column label="实际到账金额" prop="actualMoney">
+            <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
+          </el-table-column>
 
-        <el-table-column label="实际到账金额" prop="actualMoney">
-          <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
-        </el-table-column>
-
-        <el-table-column label="提现方式" prop="method">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.method, userWithdrawMethodMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="提现类型" prop="type">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.type, userWithdrawTypeMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="提现状态" prop="status">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.status, userWithdrawStatusMap) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审批状态" prop="auditStatus">
-          <template v-slot="scope">
-            {{ getEmulistLabelById(scope.row.auditStatus, userWithdrawAuditMap) }}
-            <el-tooltip v-if="scope.row.auditStatus == '2'" :content="scope.row.auditStatus == '2' ? scope.row.auditReason : null" placement="top">
-              <el-icon>
-                <question-filled />
-              </el-icon>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-        <el-table-column label="审核人" prop="auditBy" width="100" />
-        <el-table-column label="审核时间" prop="auditTime" width="100" />
-        <el-table-column label="操作" fixed="right" align="center" width="100">
-          <template v-slot="scope">
-            <el-button v-if="scope.row.auditStatus == '0'" text type="primary" @click="showAuditModal(scope.row)">审批</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-if="userWithdrawInfo.total"
-        :total="userWithdrawInfo.total"
-        v-model:page="withdrawDataParams.current"
-        v-model:limit="withdrawDataParams.size"
-        @pagination="getList"
-      />
+          <el-table-column label="提现方式" prop="method">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.method, userWithdrawMethodMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="提现类型" prop="type">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.type, userWithdrawTypeMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="提现状态" prop="status">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.status, userWithdrawStatusMap) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" prop="auditStatus">
+            <template v-slot="scope">
+              {{ getEmulistLabelById(scope.row.auditStatus, userWithdrawAuditMap) }}
+              <el-tooltip v-if="scope.row.auditStatus == '2'" :content="scope.row.auditStatus == '2' ? scope.row.auditReason : null" placement="top">
+                <el-icon>
+                  <question-filled />
+                </el-icon>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column label="审核人" prop="auditBy" width="100" />
+          <el-table-column label="审核时间" prop="auditTime" width="100" />
+          <el-table-column label="操作" fixed="right" align="center" width="100">
+            <template v-slot="scope">
+              <el-button v-if="scope.row.auditStatus == '0'" text type="primary" @click="showAuditModal(scope.row)">审批</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-if="userWithdrawInfo.total"
+          :total="userWithdrawInfo.total"
+          v-model:page="withdrawDataParams.current"
+          v-model:limit="withdrawDataParams.size"
+          @pagination="getList"
+        />
+      </el-card>
     </div>
     <!-- 提现审核-->
     <el-dialog title="提现审核" v-model="auditFormOpen" width="500px" append-to-body>