From 05abad390507d1844f7f005afdeca9e8eebfcb8d Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Wed, 27 Aug 2025 16:15:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98ID=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=92=8C=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor(订单管理): 移除表格边框并优化分页选项

feat(售后订单): 添加关键字搜索字段并移除二维码功能

feat(商品管理): 新增批量操作和审核功能，优化商品列表展示

style: 移除多余的margin-top样式
---
 manager/src/views/goods/goods-info/goods.vue  | 593 +++++++++++++++---
 manager/src/views/member/list/index.vue       |  54 +-
 .../order/after-order/afterSaleOrder.vue      |  69 +-
 manager/src/views/order/order/orderList.vue   |   1 -
 4 files changed, 600 insertions(+), 117 deletions(-)

diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
index cfcef377..27ced1c6 100644
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -36,17 +36,6 @@
             style="width: 240px"
           />
         </Form-item>
-        <Form-item label="状态" prop="status">
-          <Select
-            v-model="searchForm.marketEnable"
-            placeholder="请选择"
-            clearable
-            style="width: 240px"
-          >
-            <Option value="UPPER">上架</Option>
-            <Option value="DOWN">下架</Option>
-          </Select>
-        </Form-item>
         <Form-item label="销售模式" prop="status">
           <Select
             v-model="searchForm.salesModel"
@@ -79,46 +68,67 @@
       </Form>
     </Card>
     <Card>
+
+       <div class="goods-tab">
+        <Tabs v-model="currentStatus" @on-click="goodsStatusClick">
+          <TabPane v-for="(item,index) in goodsStatusWithCount" :key="index" :label="item.title" :name="item.value">
+          </TabPane>
+        </Tabs>
+      </div>
+
+      <!-- 批量操作按钮 -->
+      <div class="batch-operations" style="margin: 10px 0;">
+        <Button 
+          type="success" 
+          :disabled="selectedRows.length === 0"
+          @click="batchUpper"
+          style="margin-right: 10px;"
+        >
+          批量上架
+        </Button>
+        <Button 
+          type="warning" 
+          :disabled="selectedRows.length === 0"
+          @click="batchLower"
+          style="margin-right: 10px;"
+        >
+          批量下架
+        </Button>
+        <Button 
+          v-if="currentStatus === 'TOBEAUDITED'"
+          type="primary" 
+          :disabled="selectedRows.length === 0"
+          @click="batchAudit"
+        >
+          批量审核
+        </Button>
+      </div>
+
       <Table
         :loading="loading"
-        border
         :columns="columns"
         :data="data"
         ref="table"
         class="mt_10"
+        @on-select="onSelect"
+        @on-select-all="onSelectAll"
+        @on-selection-change="onSelectionChange"
       >
+        <!-- 商品图片格式化 -->
+        <template slot="imageSlot" slot-scope="{ row }">
+          <div style="margin-top: 5px;">
+            <img
+              :src="row.original"
+              style="height: 50px; width: 50px; object-fit: cover;"
+            />
+          </div>
+        </template>
+        
         <!-- 商品栏目格式化 -->
         <template slot="goodsSlot" slot-scope="{ row }">
-          <div style="margin: 5px 0px; height: 80px; display: flex">
-            <div style="">
-              <img
-                :src="row.original"
-                style="height: 60px; margin-top: 1px; width: 60px"
-              />
-            </div>
-
-            <div style="margin-left: 13px">
-              <div class="div-zoom">
-                <a @click="linkTo(row.id, row.skuId)">{{ row.goodsName }}</a>
-              </div>
-              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                <div slot="content">
-                  <vue-qr
-                    :text="wapLinkTo(row.id, row.skuId)"
-                    :margin="0"
-                    colorDark="#000"
-                    colorLight="#fff"
-                    :size="150"
-                  ></vue-qr>
-                </div>
-                <img
-                  src="../../../assets/qrcode.svg"
-                  class="hover-pointer"
-                  width="20"
-                  height="20"
-                  alt=""
-                />
-              </Poptip>
+          <div style="margin: 5px 0px; padding: 10px 0px;">
+            <div class="div-zoom">
+              <a @click="linkTo(row.id, row.skuId)">{{ row.goodsName }}</a>
             </div>
           </div>
         </template>
@@ -130,7 +140,7 @@
           :page-size="searchForm.pageSize"
           @on-change="changePage"
           @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
           size="small"
           show-total
           show-elevator
@@ -156,11 +166,61 @@
         >
       </div>
     </Modal>
+    <Modal
+      title="商品审核"
+      v-model="auditModalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="auditForm" :model="goodsAuditForm" :label-width="100">
+        <FormItem label="审核结果" prop="auth_flag">
+          <RadioGroup v-model="goodsAuditForm.auth_flag">
+            <Radio :label="1">审核通过</Radio>
+            <Radio :label="2">审核拒绝</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem label="审核备注" prop="reason" v-if="goodsAuditForm.auth_flag === 2">
+          <Input v-model="goodsAuditForm.reason" type="textarea" :rows="3" placeholder="请输入拒绝原因" />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="auditModalVisible = false">取消</Button>
+        <Button type="primary" @click="confirmAudit">提交审核</Button>
+      </div>
+    </Modal>
+    <!-- 批量审核弹框 -->
+    <Modal
+      title="批量商品审核"
+      v-model="batchAuditModalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="batchAuditForm" :model="batchAuditForm" :label-width="100">
+        <FormItem label="审核结果" prop="auth_flag">
+          <RadioGroup v-model="batchAuditForm.auth_flag">
+            <Radio :label="1">审核通过</Radio>
+            <Radio :label="2">审核拒绝</Radio>
+          </RadioGroup>
+        </FormItem>
+        <FormItem label="审核备注" prop="reason" v-if="batchAuditForm.auth_flag === 2">
+          <Input v-model="batchAuditForm.reason" type="textarea" :rows="3" placeholder="请输入拒绝原因" />
+        </FormItem>
+        <FormItem label="选中商品">
+          <div style="max-height: 200px; overflow-y: auto;">
+            <Tag v-for="item in selectedRows" :key="item.id" style="margin: 2px;">{{item.goodsName}}</Tag>
+          </div>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="batchAuditModalVisible = false">取消</Button>
+        <Button type="primary" @click="submitBatchAudit">提交审核</Button>
+      </div>
+    </Modal>
   </div>
 </template>
 
 <script>
-import { getGoodsListData, upGoods, lowGoods } from "@/api/goods";
+import { getGoodsListData,getGoodsNumerData, upGoods, lowGoods, authGoods } from "@/api/goods";
 import vueQr from "vue-qr";
 export default {
   components: {
@@ -175,7 +235,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "create_time", // 默认排序字段
         order: "desc", // 默认排序方式
       },
@@ -183,28 +243,61 @@ export default {
         // 下架原因
         reason: "",
       },
+      goodsAuditForm: {
+        // 商品审核表单
+        auth_flag: 1,
+      },
+      auditModalVisible: false, // 审核弹框显示状态
+      currentAuditGoods: null, // 当前审核的商品
       submitLoading: false, // 添加或编辑提交状态
       columns: [
+        {
+          type: 'selection',
+          width: 60,
+          align: 'center'
+        },
+        {
+          title: "商品ID",
+          key: "id",
+          width: 180,
+          tooltip: true,
+        },
+        {
+          title: "商品图片",
+          key: "original",
+          width: 180,
+          slot: "imageSlot",
+        },
         {
           title: "商品名称",
           key: "goodsName",
           minWidth: 180,
           slot: "goodsSlot",
         },
-        {
-          title: "商品编号",
-          key: "id",
-          minWidth: 150,
-          tooltip: true,
-        },
         {
           title: "价格",
           key: "price",
-          width: 130,
+          width: 100,
           render: (h, params) => {
             return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} );
           },
         },
+        {
+          title: "销量",
+          key: "buyCount",
+          width: 100,
+          render: (h, params) => {
+            return h("span", params.row.buyCount || 0);
+          },
+        },
+        {
+          title: "库存",
+          key: "quantity",
+          width: 100,
+          render: (h, params) => {
+            return h("span", params.row.quantity || 0);
+          },
+        },
         {
           title: "销售模式",
           key: "salesModel",
@@ -222,7 +315,7 @@ export default {
         {
           title: "商品类型",
           key: "goodsType",
-          width: 130,
+          width: 120,
           render: (h, params) => {
             if (params.row.goodsType === "PHYSICAL_GOODS") {
               return h("Tag", { props: { color: "green" } }, "实物商品");
@@ -236,7 +329,7 @@ export default {
         {
           title: "状态",
           key: "marketEnable",
-          width: 100,
+          width: 120,
           render: (h, params) => {
             if (params.row.marketEnable == "DOWN") {
               return h("Tag", { props: { color: "volcano" } }, "下架");
@@ -248,7 +341,7 @@ export default {
         {
           title: "审核状态",
           key: "authFlag",
-          width: 130,
+          width: 180,
           render: (h, params) => {
             if (params.row.authFlag == "TOBEAUDITED") {
               return h("Tag", { props: { color: "volcano" } }, "待审核");
@@ -262,7 +355,7 @@ export default {
         {
           title: "店铺名称",
           key: "storeName",
-          minWidth: 100,
+          width: 180,  // 使用minWidth替代width
           tooltip: true,
         },
         {
@@ -270,19 +363,61 @@ export default {
           key: "action",
           align: "center",
           fixed: "right",
-          width: 150,
+          width: 200,
           render: (h, params) => {
-            if (params.row.marketEnable == "DOWN") {
+            // 如果是待审核状态，显示审核按钮
+            if (params.row.authFlag === "TOBEAUDITED") {
               return h("div", [
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      type: "info",
-                      size: "small",
-                    },
                     style: {
-                      marginRight: "5px",
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none"
+                    },
+                    on: {
+                      click: () => {
+                        this.openAuditModal(params.row);
+                      },
+                    },
+                  },
+                  "审核"
+                ),
+                h("span", {
+                  style: {
+                    margin: "0 8px",
+                    color: "#dcdee2"
+                  }
+                }, "|"),
+                h(
+                  "a",
+                  {
+                    style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none"
+                    },
+                    on: {
+                      click: () => {
+                        this.showDetail(params.row);
+                      },
+                    },
+                  },
+                  "查看"
+                ),
+              ]);
+            }
+            // 原有的上架/下架逻辑
+            else if (params.row.marketEnable == "DOWN") {
+              return h("div", [
+                h(
+                  "a",
+                  {
+                    style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none"
                     },
                     on: {
                       click: () => {
@@ -292,11 +427,19 @@ export default {
                   },
                   "上架"
                 ),
+                h("span", {
+                  style: {
+                    margin: "0 8px",
+                    color: "#dcdee2"
+                  }
+                }, "|"),
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      size: "small",
+                    style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none"
                     },
                     on: {
                       click: () => {
@@ -310,14 +453,12 @@ export default {
             } else {
               return h("div", [
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      type: "error",
-                      size: "small",
-                    },
                     style: {
-                      marginRight: "5px",
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none"
                     },
                     on: {
                       click: () => {
@@ -327,11 +468,19 @@ export default {
                   },
                   "下架"
                 ),
+                h("span", {
+                  style: {
+                    margin: "0 8px",
+                    color: "#dcdee2"
+                  }
+                }, "|"),
                 h(
-                  "Button",
+                  "a",
                   {
-                    props: {
-                      size: "small",
+                    style: {
+                      color: "#2d8cf0",
+                      cursor: "pointer",
+                      textDecoration: "none"
                     },
                     on: {
                       click: () => {
@@ -348,12 +497,37 @@ export default {
       ],
       data: [], // 表单数据
       total: 0, // 表单数据总数
+      currentStatus: '',
+      goodsNumerData: {},
+      goodsAuditForm: {
+        // 商品编辑表单
+        auth_flag: 1,
+      },
+      selectedRows: [], // 选中的行数据
+      selectAll: false, // 全选状态
+      batchAuditModalVisible: false, // 批量审核弹框显示状态
+      batchAuditForm: {
+        auth_flag: 1,
+        reason: ''
+      },
     };
   },
+  computed: {
+    goodsStatusWithCount() {
+      return [
+        {title: '全部', value: ''},
+        {title: `出售中${this.goodsNumerData.upperGoodsNum ? '(' + this.goodsNumerData.upperGoodsNum + ')' : ''}`, value: 'UPPER'},
+        {title: `仓库中${this.goodsNumerData.downGoodsNum ? '(' + this.goodsNumerData.downGoodsNum + ')' : ''}`, value: 'DOWN'},
+        {title: `待审核${this.goodsNumerData.auditGoodsNum ? '(' + this.goodsNumerData.auditGoodsNum + ')' : ''}`, value: 'TOBEAUDITED'},
+        {title: `审核未通过${this.goodsNumerData.refuseGoodsNum ? '(' + this.goodsNumerData.refuseGoodsNum + ')' : ''}`, value: 'REFUSE'}
+      ];
+    }
+  },
   methods: {
     // 初始化数据
     init() {
       this.getDataList();
+      this.getNumberData();
     },
     // 分页 改变页码
     changePage(v) {
@@ -368,8 +542,9 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
+      this.getNumberData();
     },
     // 获取数据
     getDataList() {
@@ -382,6 +557,15 @@ export default {
         }
       });
     },
+    getNumberData() {
+      // 创建一个不包含goodsStatus字段的搜索参数
+      const { goodsStatus, ...searchParams } = this.searchForm;
+      getGoodsNumerData(searchParams).then((res) => {
+        if (res.success) {
+          this.goodsNumerData = res.result;
+        }
+      })
+    },
     // 编辑
     edit(v) {
       this.id = v.id;
@@ -394,27 +578,36 @@ export default {
     },
     // 下架
     lower() {
-      lowGoods(this.id, this.underForm).then((res) => {
+      let params = {
+        goodsId: this.id,
+        reason:this.underForm.reason
+      };
+      lowGoods(params).then((res) => {
         this.$Modal.remove();
         if (res.success) {
           this.$Message.success("操作成功");
           this.modalVisible = false;
           this.getDataList();
+          this.getNumberData(); // 添加这行
         }
       });
     },
-    // 商家
+    // 上架
     upper(v) {
       this.$Modal.confirm({
         title: "确认上架",
         content: "您确认要上架 " + v.goodsName + " ?",
         loading: true,
         onOk: () => {
-          upGoods(v.id).then((res) => {
+           let params = {
+            goodsId: v.id
+          };
+          upGoods(params).then((res) => {
             this.$Modal.remove();
             if (res.success) {
               this.$Message.success("上架成功");
               this.getDataList();
+              this.getNumberData(); // 添加这行
             }
           });
         },
@@ -429,9 +622,249 @@ export default {
         query: { id: id },
       })
     },
+    
+    // 商品状态筛选
+    goodsStatusClick(item) {
+      // 根据选择的状态设置搜索条件
+      if (item === 0) {
+        // 全部：清除状态筛选
+        delete this.searchForm.goodsStatus;
+      } else {
+        // 其他状态正常赋值
+        this.searchForm.goodsStatus = item;
+      }
+      this.currentStatus = item;
+      
+      // tab切换时清除选中内容
+      this.selectedRows = [];
+      if (this.$refs.table) {
+        this.$refs.table.selectAll(false);
+      }
+      
+      this.getDataList();
+    },
+    examine(v, authFlag) {
+      // 审核商品
+      let examine = "通过";
+      this.goodsAuditForm.authFlag = "PASS";
+      if (authFlag != 1) {
+        examine = "拒绝";
+        this.goodsAuditForm.authFlag = "REFUSE";
+      }
+      this.$Modal.confirm({
+        title: "确认审核",
+        content: "您确认要审核" + examine + " " + v.goodsName + " ?",
+        loading: true,
+        onOk: () => {
+          this.goodsAuditForm.goodsIds=v.id;
+          authGoods(this.goodsAuditForm).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success("审核成功");
+              this.getDataList();
+              this.getNumberData();
+            }
+          });
+        },
+      });
+    },
+    
+    // 打开审核弹框
+    openAuditModal(goods) {
+      this.currentAuditGoods = goods;
+      this.goodsAuditForm.auth_flag = 1;
+      this.goodsAuditForm.reason = '';
+      this.auditModalVisible = true;
+    },
+    
+    // 确认审核（二次确认）
+    confirmAudit() {
+      const auditText = this.goodsAuditForm.auth_flag === 1 ? '通过' : '拒绝';
+      this.$Modal.confirm({
+        title: '确认审核',
+        content: `您确认要审核${auditText} "${this.currentAuditGoods.goodsName}" 吗？`,
+        loading: true,
+        onOk: () => {
+          this.submitAudit();
+        },
+      });
+    },
+    
+    // 提交审核
+    submitAudit() {
+      const auditForm = {
+        authFlag: this.goodsAuditForm.auth_flag === 1 ? 'PASS' : 'REFUSE',
+        reason: this.goodsAuditForm.reason || '',
+        goodsId:this.currentAuditGoods.id
+      };
+      
+      authGoods(auditForm).then((res) => {
+        this.$Modal.remove();
+        if (res.success) {
+          this.$Message.success('审核成功');
+          this.auditModalVisible = false;
+          this.getDataList();
+          this.getNumberData();
+        }
+      });
+    },
+    
+    // 选择框事件处理
+    onSelect(selection, row) {
+      // 单行选择时触发
+    },
+    
+    onSelectAll(selection) {
+      // 全选时触发
+    },
+    
+    onSelectionChange(selection) {
+      this.selectedRows = selection;
+    },
+    
+    // 批量上架
+    batchUpper() {
+      if (this.selectedRows.length === 0) {
+        this.$Message.warning('请先选择要上架的商品');
+        return;
+      }
+      
+      const goodsNames = this.selectedRows.map(item => item.goodsName).join('、');
+      this.$Modal.confirm({
+        title: '确认批量上架',
+        content: `您确认要上架以下商品吗？\n${goodsNames}`,
+        loading: true,
+        onOk: () => {
+          // 提取所有选中商品的ID
+          const goodsIds = this.selectedRows.map(item => item.id);
+          const params = {
+            goodsId: goodsIds // 传递ID数组
+          };
+          
+          upGoods(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success('批量上架成功');
+              this.selectedRows = [];
+              this.selectAll = false;
+              this.getDataList();
+              this.getNumberData();
+            }
+          }).catch(() => {
+            this.$Modal.remove();
+          });
+        }
+      });
+    },
+    
+    // 批量下架
+    batchLower() {
+      if (this.selectedRows.length === 0) {
+        this.$Message.warning('请先选择要下架的商品');
+        return;
+      }
+      
+      const goodsNames = this.selectedRows.map(item => item.goodsName).join('、');
+      this.$Modal.confirm({
+        title: '确认批量下架',
+        content: `您确认要下架以下商品吗？\n${goodsNames}`,
+        loading: true,
+        onOk: () => {
+          // 提取所有选中商品的ID
+          const goodsIds = this.selectedRows.map(item => item.id);
+          const params = {
+            goodsId: goodsIds, // 传递ID数组
+            reason: '批量下架操作' // 可以设置默认下架原因
+          };
+          
+          lowGoods(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success('批量下架成功');
+              this.selectedRows = [];
+              this.selectAll = false;
+              this.getDataList();
+              this.getNumberData();
+            }
+          }).catch(() => {
+            this.$Modal.remove();
+          });
+        }
+      });
+    },
+    
+    // 批量审核
+    batchAudit() {
+      if (this.selectedRows.length === 0) {
+        this.$Message.warning('请先选择要审核的商品');
+        return;
+      }
+      
+      // 重置批量审核表单
+      this.batchAuditForm = {
+        auth_flag: 1,
+        reason: ''
+      };
+      this.batchAuditModalVisible = true;
+    },
+    
+    // 提交批量审核
+    submitBatchAudit() {
+      if (this.selectedRows.length === 0) {
+        this.$Message.warning('请先选择要审核的商品');
+        return;
+      }
+      
+      // 如果是拒绝审核，必须填写原因
+      if (this.batchAuditForm.auth_flag === 2 && !this.batchAuditForm.reason.trim()) {
+        this.$Message.warning('审核拒绝时必须填写拒绝原因');
+        return;
+      }
+      
+      const actionText = this.batchAuditForm.auth_flag === 1 ? '通过' : '拒绝';
+      const goodsNames = this.selectedRows.map(item => item.goodsName).join('、');
+      
+      this.$Modal.confirm({
+        title: `确认批量审核${actionText}`,
+        content: `您确认要${actionText}以下商品的审核吗？\n${goodsNames}`,
+        loading: true,
+        onOk: () => {
+          // 提取所有选中商品的ID
+          const goodsIds = this.selectedRows.map(item => item.id);
+          const params = {
+            goodsId: goodsIds, // 传递ID数组
+            authFlag: this.batchAuditForm.auth_flag === 1 ? 'PASS' : 'REFUSE',
+            reason: this.batchAuditForm.reason || ''
+          };
+          
+          // 修正：直接调用authGoods，不传递'batch'参数
+          authGoods(params).then((res) => {
+            this.$Modal.remove();
+            if (res.success) {
+              this.$Message.success(`批量审核${actionText}成功`);
+              this.selectedRows = [];
+              this.selectAll = false;
+              this.batchAuditModalVisible = false;
+              this.getDataList();
+              this.getNumberData();
+            }
+          }).catch(() => {
+            this.$Modal.remove();
+          });
+        }
+      });
+    }
   },
   mounted() {
     this.init();
   },
 };
 </script>
+<style lang="scss" scoped>
+// Tab组件样式
+.goods-tab {
+  ::v-deep .ivu-tabs-tab {
+    font-size: 14px;
+  }
+}
+</style>
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index d5934577..a4d0ad28 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -3,6 +3,10 @@
     <Card>
       <Row @keydown.enter.native="handleSearch">
         <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
+          <Form-item label="会员ID" prop="id">
+            <Input type="text" v-model="searchForm.id" placeholder="请输入会员ID" clearable style="width: 240px" />
+          </Form-item>
+          
           <Form-item label="会员名称" prop="username">
             <Input type="text" v-model="searchForm.username" placeholder="请输入会员名称" clearable style="width: 240px" />
           </Form-item>
@@ -23,10 +27,10 @@
         <Button @click="addMember" type="primary">添加会员</Button>
       </Row>
 
-      <Table :loading="loading" border :columns="columns" class="mt_10" :data="data" ref="table"></Table>
+      <Table :loading="loading" :columns="columns" class="mt_10" :data="data" ref="table"></Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
-          @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator
+          @on-page-size-change="changePageSize" :page-size-opts="[20, 50, 100]" size="small" show-total show-elevator
           show-sizer></Page>
       </Row>
     </Card>
@@ -131,8 +135,9 @@ export default {
       searchForm: {
         // 请求参数
         pageNumber: 1,
-        pageSize: 10,
+        pageSize: 20,
         order: "desc",
+        id: "",
         username: "",
         mobile: "",
         disabled: "OPEN",
@@ -153,19 +158,47 @@ export default {
       },
       ruleValidate: {}, //修改验证
       columns: [
+        {
+          title: "会员ID",
+          key: "id",
+          minWidth: 120,  // 减少宽度
+          tooltip: true,
+        },
+        {
+          title: "头像",
+          key: "face",
+          minWidth: 80,
+          align: "center",
+          render: (h, params) => {
+            return h("img", {
+              attrs: {
+                src: params.row.face || require('@/assets/default.png'),
+                alt: "头像"
+              },
+              style: {
+                width: "30px",
+                height: "30px",
+                borderRadius: "50%",
+                objectFit: "cover"
+              }
+            });
+          }
+        },
         {
           title: "会员名称",
           key: "username",
           tooltip: true,
+          minWidth: 150,  // 减少宽度
         },
         {
           title: "会员昵称",
           key: "nickName",
           tooltip: true,
+          minWidth: 150,  // 减少宽度
         },
         {
           title: "联系方式",
-          width: 130,
+          minWidth: 130,
           key: "mobile",
           render: (h, params) => {
             if (params.row.mobile == null) {
@@ -178,13 +211,18 @@ export default {
         {
           title: "注册时间",
           key: "createTime",
-          width: 180,
+          minWidth: 160,  // 减少宽度
+        },
+        {
+          title: "最后登录时间",
+          key: "lastLoginDate",
+          minWidth: 160,  // 减少宽度
         },
 
         {
           title: "积分数量",
           align: "left",
-          width: 100,
+          minWidth: 120,  // 增加宽度
           render: (h, params) => {
             return h(
               "div",
@@ -197,7 +235,7 @@ export default {
           title: "操作",
           key: "action",
           align: "center",
-          width: 200,
+          minWidth: 160,
           fixed: "right",
           render: (h, params) => {
             return h(
@@ -375,7 +413,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getData();
     },
     //查看详情修改
diff --git a/manager/src/views/order/after-order/afterSaleOrder.vue b/manager/src/views/order/after-order/afterSaleOrder.vue
index 440fba83..0e18cffc 100644
--- a/manager/src/views/order/after-order/afterSaleOrder.vue
+++ b/manager/src/views/order/after-order/afterSaleOrder.vue
@@ -9,6 +9,16 @@
           :label-width="70"
           class="search-form"
         >
+          <Form-item label="关键字" prop="keywords" style="display: block; width: 100%;">
+            <Input
+              type="text"
+              v-model="searchForm.keywords"
+              placeholder="请输入商品名称、订单编号搜索"
+              clearable
+              style="width: 240px"
+            />
+          </Form-item>
+          <br>
           <Form-item label="订单编号" prop="orderSn">
             <Input
               type="text"
@@ -87,7 +97,6 @@
 
       <Table
         :loading="loading"
-        border
         :columns="columns"
         :data="data"
         ref="table"
@@ -104,24 +113,9 @@
               <div class="div-zoom">
                 <a @click="linkTo(row.goodsId, row.skuId)">{{ row.goodsName }}</a>
               </div>
-              <Poptip trigger="hover" title="扫码在手机中查看" transfer>
-                <div slot="content">
-                  <vue-qr
-                    :text="wapLinkTo(row.goodsId, row.skuId)"
-                    :margin="0"
-                    colorDark="#000"
-                    colorLight="#fff"
-                    :size="150"
-                  ></vue-qr>
-                </div>
-                <img
-                  src="../../../assets/qrcode.svg"
-                  class="hover-pointer"
-                  width="20"
-                  height="20"
-                  alt=""
-                />
-              </Poptip>
+              <div style="color: #999; font-size: 12px; margin-top: 5px;">
+                商品ID: {{ row.goodsId }}
+              </div>
             </div>
           </div>
         </template>
@@ -133,7 +127,7 @@
           :page-size="searchForm.pageSize"
           @on-change="changePage"
           @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
+          :page-size-opts="[20, 50, 100]"
           size="small"
           show-total
           show-elevator
@@ -158,7 +152,7 @@ export default {
       searchForm: {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
-        pageSize: 10, // 页面大小
+        pageSize: 20, // 页面大小
         sort: "createTime", // 默认排序字段
         order: "desc", // 默认排序方式
         startDate: "", // 起始时间
@@ -168,6 +162,7 @@ export default {
         serviceStatus: "",
         storeName: "",
         sn: "",
+        keywords: "", // 新增关键字搜索字段
       },
       selectDate: null, // 选择时间段
       form: {
@@ -191,6 +186,13 @@ export default {
           minWidth: 120,
           tooltip: true,
         },
+        // 移除这个独立的商品ID列
+        // {
+        //   title: "商品ID",
+        //   key: "goodsId",
+        //   minWidth: 120,
+        //   tooltip: true,
+        // },
         {
           title: "商品",
           key: "goodsName",
@@ -198,15 +200,21 @@ export default {
           tooltip: true,
           slot: "goodsSlot",
         },
+        {
+          title: "会员ID",
+          key: "memberId",
+          minWidth: 120,
+          tooltip: true,
+        },
         {
           title: "会员名称",
           key: "memberName",
           width: 140,
         },
         {
-          title: "商家名称",
+          title: "店铺名称",
           key: "storeName",
-          minWidth: 100,
+          width: 100,
           tooltip: true,
         },
         {
@@ -235,7 +243,7 @@ export default {
         {
           title: "售后状态",
           key: "serviceStatus",
-          width: 150,
+          width: 180,
           render: (h, params) => {
             if (params.row.serviceStatus == "APPLY") {
               return h("div", [h("tag", { props: { color: "blue" } }, "申请中")]);
@@ -330,7 +338,7 @@ export default {
     // 搜索
     handleSearch() {
       this.searchForm.pageNumber = 1;
-      this.searchForm.pageSize = 10;
+      this.searchForm.pageSize = 20;
       this.getDataList();
     },
     // 开始结束时间分别赋值
@@ -362,9 +370,15 @@ export default {
       })
     },
     // 售后筛选
+    // 售后筛选
     serviceStatusClick(item) {
-      this.currentStatus = item;  // 使用参数 item
-      this.searchForm.serviceStatus = item;  // 使用参数 item
+      this.currentStatus = item;
+      // 如果是全部（空字符串），则删除serviceStatus字段
+      if (item === 0) {
+        delete this.searchForm.serviceStatus;
+      } else {
+        this.searchForm.serviceStatus = item;
+      }
       this.getDataList();
     },
   },
@@ -376,7 +390,6 @@ export default {
 <style lang="scss" scoped>
 // Tab组件样式
 .order-tab {
-  margin-top: 20px;
   ::v-deep .ivu-tabs-tab {
     font-size: 14px;
   }
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 6d7eda0c..27709699 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -502,7 +502,6 @@ export default {
 
 // Tab组件样式
 .order-tab {
-  margin-top: 20px;
   ::v-deep .ivu-tabs-tab {
     font-size: 14px;
   }