diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
index bbeb2d4..6fdfbce 100644
--- a/src/api/modules/mer_admin.js
+++ b/src/api/modules/mer_admin.js
@@ -51,6 +51,13 @@ export const mer_admin = {
       data
     );
   },
+  //商品分页 V2
+  productV2Page: data => {
+    return $http.post(
+      `/merchant-api/product/v2/page?pageNumber=${data.p.pageNumber}&pageSize=${data.p.pageSize}`,
+      data
+    );
+  },
   //商品规格分页
   getProductSpecificationPage: (data, params) => {
     return $http.request({
@@ -64,6 +71,18 @@ export const mer_admin = {
   getProductOverview: data => {
     return $http.post(`/merchant-api/product/overview`, data);
   },
+  //商品概况 V2
+  productV2Overview: data => {
+    return $http.post(`/merchant-api/product/v2/overview`, data);
+  },
+  //商品详情
+  productDetail: data => {
+    return $http.request({
+      method: 'get',
+      url: '/merchant-api/product/detail',
+      params: data
+    })
+  },
   //商户商品分类
   getProductCategory: data => {
     return $http.request({
diff --git a/src/views/modules/operation-management/commodity/index.vue b/src/views/modules/operation-management/commodity/index.vue
index 854d9f6..ce6f2ba 100644
--- a/src/views/modules/operation-management/commodity/index.vue
+++ b/src/views/modules/operation-management/commodity/index.vue
@@ -1,155 +1,174 @@
 <template>
-  <div>
-    <div v-if="isMerchant" style="height: calc(100vh - 200px)">
-      <obj-table-plus
-        ref="oTable"
-        style="height: 100%"
-        :tableCols="tableCols"
-        :tableProp="tableProp"
-        @query="queryList"
-        v-model="dataList"
-        :tableEvent="tableEvent"
-        :enableAutoQuery="false"
-      >
-        <template slot="tableTop">
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
-            <!-- <el-form-item label="平台分类">
-              <el-select v-model="formInline.region" placeholder="活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
-            </el-form-item> -->
-            <!-- <el-form-item label="商户分类">
-              <el-select v-model="formInline.region" placeholder="活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
-            </el-form-item> -->
-            <el-form-item label="商品搜索">
-              <el-input
-                v-model="formInline.name"
-                placeholder="商品搜索"
-              ></el-input>
-            </el-form-item>
-            <el-form-item v-if="marketList.length > 0" label="菜市场">
-              <el-select
-                @change="getData"
-                v-model="formInline.marketId"
-                placeholder="请选择菜市场"
+  <div class="page-container">
+    <div v-if="isMerchant">
+      <el-card class="search-card" shadow="never">
+        <el-form :model="formInline" ref="searchForm" label-position="top" class="search-form" size="small">
+          <el-row :gutter="15">
+            <el-col :span="6">
+              <el-form-item label="商品名称" prop="name">
+                <el-input v-model="formInline.name" placeholder="请输入商品名称" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" v-if="marketList.length > 0">
+              <el-form-item label="店铺" prop="shopId">
+                <el-select v-model="formInline.shopId" placeholder="请选择店铺" style="width: 100%;">
+                  <el-option v-for="item in storeList" :key="item.shopId" :label="item.shopName" :value="item.shopId"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="状态" prop="status">
+                <el-select v-model="formInline.status" placeholder="请选择状态" style="width: 100%;" clearable>
+                  <el-option label="上架" value="UP"></el-option>
+                  <el-option label="下架" value="DOWN"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="是否折扣" prop="isDiscount">
+                <el-select v-model="formInline.isDiscount" placeholder="请选择是否折扣" style="width: 100%;" clearable>
+                  <el-option label="是" :value="1"></el-option>
+                  <el-option label="否" :value="0"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24" class="search-buttons">
+              <el-button type="primary" @click="handleSearch" icon="el-icon-search" size="small">查询</el-button>
+              <el-button @click="handleReset" icon="el-icon-refresh" size="small">重置</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-card>
+
+      <el-card class="stats-card" shadow="never">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <div class="stat-item">
+              <div class="stat-label">总商品数量(个)</div>
+              <div class="stat-value">{{ overview.productCount || 0 }}</div>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="stat-item">
+              <div class="stat-label">上架中商品数量(个)</div>
+              <div class="stat-value">{{ overview.productOnSaleCount || 0 }}</div>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="stat-item">
+              <div class="stat-label">折扣商品数量(个)</div>
+              <div class="stat-value">{{ overview.productDiscountCount || 0 }}</div>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="stat-item">
+              <div class="stat-label">仓库中商品数量(个)</div>
+              <div class="stat-value">{{ overview.productWarehouseCount || 0 }}</div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-card>
+
+      <el-card class="table-card" shadow="never">
+        <div style="margin-bottom: 15px;">
+          <el-button type="primary" size="small" @click="addProduct">添加商品</el-button>
+          <el-button :disabled="selectList.length <= 0" type="danger" size="small" @click="deleteProduct">批量删除</el-button>
+        </div>
+        <el-table
+          :data="dataList"
+          v-loading="loading"
+          style="width: 100%"
+          @selection-change="handleSelectionChange"
+          size="small"
+        >
+          <el-table-column type="selection" width="55" fixed="left"></el-table-column>
+          <el-table-column label="商品图" align="center" width="80">
+            <template slot-scope="{ row }">
+              <el-image
+                v-if="row.productMainImg"
+                :src="row.productMainImg"
+                :preview-src-list="[row.productMainImg]"
+                style="width: 40px; height: 40px;"
+                fit="cover"
+              ></el-image>
+              <span v-else>暂无商品图</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="商品名称" align="center">
+            <template slot-scope="{ row }">{{ row.name || '-' }}</template>
+          </el-table-column>
+          <el-table-column prop="shopName" label="店铺名称" align="center">
+            <template slot-scope="{ row }">{{ row.shopName || '-' }}</template>
+          </el-table-column>
+          <el-table-column label="商品售价" align="center">
+            <template slot-scope="{ row }">
+              <span style="color: red;">
+                <span v-if="row.minSalePrice == row.maxSalePrice">￥{{ row.minSalePrice || 0 }}</span>
+                <span v-else>￥{{ row.minSalePrice || 0 }}~￥{{ row.maxSalePrice || 0 }}</span>
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="折扣" align="center">
+            <template slot-scope="{ row }">
+              <span v-if="row.isDiscount === 1">{{ row.discount }}折</span>
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="saleNum" label="销量" align="center">
+            <template slot-scope="{ row }">{{ row.saleNum || '-' }}</template>
+          </el-table-column>
+          <el-table-column prop="stockNum" label="库存" align="center">
+            <template slot-scope="{ row }">{{ row.stockNum || '-' }}</template>
+          </el-table-column>
+          <el-table-column label="状态" align="center">
+            <template slot-scope="{ row }">
+              <el-popconfirm
+                :title="row.status == 'DOWN' ? '当前为下架状态，是否更改为上架状态？' : '当前为上架状态，是否更改为下架状态？'"
+                :confirm-button-text="row.status == 'DOWN' ? '确认上架' : '确认下架'"
+                @confirm="toggleStatus(row)"
               >
-                <el-option
-                  v-for="item in marketList"
-                  :key="item.marketId"
-                  :label="item.marketName"
-                  :value="item.marketId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item v-if="marketList.length > 0" label="店铺">
-              <el-select v-model="formInline.shopId" placeholder="请选择店铺">
-                <el-option
-                  v-for="item in storeList"
-                  :key="item.shopId"
-                  :label="item.shopName"
-                  :value="item.shopId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="是否预售商品">
-              <el-select
-                v-model="formInline.isAdvanceSell"
-                placeholder="请选择是否预售"
-              >
-                <el-option label="是" :value="1"></el-option>
-                <el-option label="否" :value="0"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="$refs.oTable.reload()"
-                >查询</el-button
-              >
-              <el-button type="primary" @click="Reset">重置</el-button>
-            </el-form-item>
-          </el-form>
-          <div class="stat-list">
-            <div class="stat-item">
-              <i style="font-size: 22px" class="el-icon-s-goods"></i>
-              <div class="stat-right">
-                <div class="stat-title">总商品数量（个）</div>
-                <div class="stat-value">
-                  <span style="font-size: 20px">{{
-                    overview.productCount
-                  }}</span>
-                </div>
-              </div>
-            </div>
-            <div class="stat-item">
-              <i style="font-size: 22px" class="el-icon-s-shop"></i>
-              <div class="stat-right">
-                <div class="stat-title">上架中商品数量（个）</div>
-                <div class="stat-value">
-                  <span style="font-size: 20px">{{
-                    overview.productOnSaleCount
-                  }}</span>
-                </div>
-              </div>
-            </div>
-            <div class="stat-item">
-              <i style="font-size: 22px" class="el-icon-s-marketing"></i>
-              <div class="stat-right">
-                <div class="stat-title">折扣商品数量（个）</div>
-                <div class="stat-value">
-                  <span style="font-size: 20px">{{
-                    overview.productDiscountCount
-                  }}</span>
-                </div>
-              </div>
-            </div>
-            <div class="stat-item">
-              <i style="font-size: 22px" class="el-icon-s-promotion"></i>
-              <div class="stat-right">
-                <div class="stat-title">仓库中商品数量（个）</div>
-                <div class="stat-value">
-                  <span style="font-size: 20px">{{
-                    overview.productWarehouseCount
-                  }}</span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane label="在售" name="在售"></el-tab-pane>
-            <el-tab-pane label="仓库中" name="仓库中"></el-tab-pane>
-            <el-tab-pane label="折扣" name="折扣"></el-tab-pane>
-          </el-tabs>
-          <div class="mb-2">
-            <el-button type="primary" size="small" @click="addProduct"
-              >添加商品</el-button
-            >
-            <el-button
-              :disabled="selectList.length <= 0"
-              type="danger"
-              size="small"
-              @click="deleteProduct"
-              >批量删除</el-button
-            >
-          </div>
-        </template>
-      </obj-table-plus>
+                <el-tag
+                  slot="reference"
+                  size="mini"
+                  :type="row.status == 'DOWN' ? 'info' : 'success'"
+                  style="cursor: pointer;"
+                >
+                  {{ row.status == "DOWN" ? "已下架" : "上架中" }}
+                </el-tag>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作 (提示：下架后可进行操作)" align="center" width="340" fixed="right">
+            <template slot-scope="{ row }">
+              <el-button size="mini" :disabled="row.status != 'DOWN'" type="primary" @click="editProduct(row)">编辑</el-button>
+              <el-button size="mini" :disabled="row.status != 'DOWN'" type="primary" @click="priceAdjustment(row)">改价</el-button>
+              <el-button size="mini" :disabled="row.status != 'DOWN'" type="primary" @click="changeInventory(row)">改库存</el-button>
+              <el-button size="mini" :disabled="row.status != 'DOWN'" type="primary" @click="setDiscounts(row)">设置折扣</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="pagination.pageNumber"
+          :page-sizes="[10, 20, 30, 50]"
+          :page-size="pagination.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="pagination.total"
+          class="pagination-container"
+        ></el-pagination>
+      </el-card>
+
       <!-- 添加或编辑 -->
-      <add-or-update
-        @queryList="$refs.oTable.reload()"
-        ref="addOrUpdate"
-      ></add-or-update>
+      <add-or-update @queryList="fetchData" ref="addOrUpdate"></add-or-update>
       <!-- 改价格 -->
-      <AddPrice ref="AddPrice" @queryList="$refs.oTable.reload()"></AddPrice>
+      <AddPrice ref="AddPrice" @queryList="fetchData"></AddPrice>
       <!-- 改库存 -->
-      <addStock ref="addStock" @queryList="$refs.oTable.reload()"></addStock>
+      <addStock ref="addStock" @queryList="fetchData"></addStock>
       <!-- 打折扣 -->
-      <AddDiscount
-        ref="AddDiscount"
-        @queryList="$refs.oTable.reload()"
-      ></AddDiscount>
+      <AddDiscount ref="AddDiscount" @queryList="fetchData"></AddDiscount>
     </div>
     <div style="height: calc(100vh - 200px)" v-else>
       <el-empty :image-size="200" description="请先去完成商品哦"></el-empty>
@@ -167,20 +186,18 @@ export default {
   components: { AddOrUpdate, AddPrice, addStock, AddDiscount },
   data() {
     return {
-      activeName: "在售",
       dataList: [],
+      loading: false,
+      pagination: {
+        pageNumber: 1,
+        pageSize: 10,
+        total: 0
+      },
       formInline: {
         name: "",
-        marketId: "",
         shopId: "",
-        isAdvanceSell: 0
-      },
-      tableProp: {
-        "auto-resize": true,
-        border: true,
-        height: "auto",
-        "row-id": "id",
-        "show-overflow": false
+        status: null,
+        isDiscount: null
       },
       productFilterType: "SALE",
       selectList: [],
@@ -190,31 +207,42 @@ export default {
   created() {
     this.formInline = {
       name: "",
-      marketId: this.marketId,
       shopId: this.shopId,
-      isAdvanceSell: 0
+      status: null,
+      isDiscount: null
     };
-    this.$nextTick(() => {
-      this.$refs.oTable.reload();
-    });
+    this.fetchData();
   },
   methods: {
-    //如果有多个菜市场调用
-    getData() {
-      // this.$api.mer_admin
-      //   .storeList({ marketId: this.formInline.marketId })
-      //   .then((res) => {
-      //     this.formInline.shopId = res.data.data[0].shopId;
-      //     this.$nextTick(() => {
-      //       this.$refs.oTable.reload();
-      //     });
-      //   });
+    handleSearch() {
+      this.pagination.pageNumber = 1;
+      this.fetchData();
+    },
+    handleReset() {
+      this.$refs.searchForm.resetFields();
+      this.formInline = {
+        name: "",
+        shopId: this.shopId,
+        status: null,
+        isDiscount: null
+      };
+      this.handleSearch();
+    },
+    handleSizeChange(val) {
+      this.pagination.pageSize = val;
+      this.fetchData();
+    },
+    handleCurrentChange(val) {
+      this.pagination.pageNumber = val;
+      this.fetchData();
+    },
+    handleSelectionChange(val) {
+      this.selectList = val;
     },
     addProduct() {
       this.$refs.addOrUpdate.toggle().add(this.formInline.shopId);
     },
     deleteProduct() {
-      console.log(this.selectList);
       let integers = this.selectList.map(item => {
         return item.id;
       });
@@ -224,9 +252,8 @@ export default {
         type: "warning"
       })
         .then(() => {
-          console.log("111");
           this.$api.mer_admin.BatchDeleteProducts(integers).then(res => {
-            this.$refs.oTable.reload();
+            this.fetchData();
           });
         })
         .catch(() => {
@@ -236,13 +263,13 @@ export default {
           });
         });
     },
-    queryList(pageNo, pageSize) {
-      console.log(this.formInline);
+    fetchData() {
+      this.loading = true;
       this.$api.mer_admin
-        .getProductPage({
+        .productV2Page({
           p: {
-            pageNumber: pageNo,
-            pageSize: pageSize
+            pageNumber: this.pagination.pageNumber,
+            pageSize: this.pagination.pageSize
           },
           ...this.formInline,
           productFilterType: this.productFilterType,
@@ -250,241 +277,46 @@ export default {
           productQuerySortParam: []
         })
         .then(res => {
-          console.log(res);
-          this.$refs.oTable.complete(
-            res.data.data.data,
-            Number(res.data.data.total)
-          );
+          this.dataList = res.data.data.data;
+          this.pagination.total = Number(res.data.data.total);
         })
         .catch(err => {
-          this.$refs.oTable.complete(false);
+          this.dataList = [];
+          this.pagination.total = 0;
+        }).finally(() => {
+          this.loading = false;
         });
-      this.$api.mer_admin.getProductOverview(this.formInline).then(res => {
-        console.log(res, "概况");
+      this.$api.mer_admin.productV2Overview(this.formInline).then(res => {
         this.overview = res.data.data;
       });
     },
-    Reset() {
-      this.formInline = {
-        name: "",
-        marketId: this.marketId,
-        shopId: this.shopId,
-        isAdvanceSell: 0
+    toggleStatus(row) {
+      let data = {
+        ids: [row.id],
+        status: row.status === "UP" ? "DOWN" : "UP"
       };
-      this.$refs.oTable.reload();
+      this.$api.mer_admin.putOnShelvesProducts(data).then(res => {
+        this.fetchData();
+      });
     },
-    handleClick() {
-      switch (this.activeName) {
-        case "在售":
-          this.productFilterType = "SALE";
-          break;
-        case "仓库中":
-          this.productFilterType = "WAREHOUSE";
-          break;
-        case "折扣":
-          this.productFilterType = "DISCOUNT";
-          break;
-      }
-      this.$refs.oTable.reload();
+    async editProduct(row) {
+      const res = await this.$api.mer_admin.productDetail({ id: row.id });
+      this.$refs.addOrUpdate.toggle(res.data.data).update();
+    },
+    async priceAdjustment(row) {
+      const res = await this.$api.mer_admin.productDetail({ id: row.id });
+      this.$refs.AddPrice.toggle(res.data.data).update();
+    },
+    async changeInventory(row) {
+      const res = await this.$api.mer_admin.productDetail({ id: row.id });
+      this.$refs.addStock.toggle(res.data.data).update();
+    },
+    async setDiscounts(row) {
+      const res = await this.$api.mer_admin.productDetail({ id: row.id });
+      this.$refs.AddDiscount.toggle(res.data.data).update();
     }
   },
   computed: {
-    tableCols() {
-      return [
-        { type: "checkbox", width: "60px", fixed: "left" },
-        // { type: "seq", width: "60px", align: "center", title: "序号" },
-        {
-          title: "商品图",
-          field: "productPhotoList",
-          align: "center",
-          width: "80px",
-          type: "jsx",
-          render: ({ row }) => {
-            if (row.productPhotoList.length > 0) {
-              return (
-                <el-image
-                  preview-src-list={row.productPhotoList.map(item => {
-                    return item.url;
-                  })}
-                  src={row.productPhotoList[0].url}
-                ></el-image>
-              );
-            } else {
-              return <span>暂无商品图</span>;
-            }
-          }
-        },
-        {
-          title: "商品名称",
-          align: "center",
-          field: "name"
-        },
-        {
-          title: "商品售价",
-          align: "center",
-          field: "minSalePrice",
-          type: "jsx",
-          render: ({ row }) => {
-            if (row.minSalePrice == row.maxSalePrice) {
-              return <span>￥{row.minSalePrice}</span>;
-            } else {
-              return (
-                <span>
-                  ￥{row.minSalePrice}~￥{row.maxSalePrice}
-                </span>
-              );
-            }
-          }
-        },
-        {
-          title: "折扣",
-          align: "center",
-          field: "discountActivity",
-          type: "jsx",
-          render: ({ row }) => {
-            if (row.discountActivity) {
-              return <span>{row.discountActivity.ruleObject.discount}折</span>;
-            }
-          }
-        },
-        {
-          title: "销量",
-          align: "center",
-          field: "saleNum"
-        },
-        {
-          title: "库存",
-          align: "center",
-          field: "stockNum"
-        },
-        {
-          title: "是否为预售商品",
-          align: "center",
-          field: "isAdvanceSell",
-          type: "jsx",
-          render: ({ row }) => {
-            return <span>{row.isAdvanceSell == 1 ? "是" : "否"}</span>;
-          }
-        },
-        {
-          title: "状态",
-          // fixed: "right",
-          type: "jsx",
-          align: "center",
-          "title-suffix": {
-            message: "点击上架/下架切换责任书状态",
-            icon: "vxe-icon-question-circle-fill"
-          },
-          render: ({ row }) => {
-            let Enable = () => {
-              let data = {
-                ids: [row.id],
-                status: "UP"
-              };
-              if (row.status == "UP") {
-                data.status = "DOWN";
-              } else {
-                data.status = "UP";
-              }
-              this.$api.mer_admin.putOnShelvesProducts(data).then(res => {
-                console.log(res);
-                this.$refs.oTable.reload();
-              });
-            };
-            return (
-              <el-popconfirm
-                title={
-                  row.status == "DOWN"
-                    ? "当前为下架状态，是否更改为上架状态？"
-                    : "当前为上架状态，是否更改为下架状态？"
-                }
-                confirmButtonText={
-                  row.status == "DOWN" ? "确认上架" : "确认下架"
-                }
-                onConfirm={Enable}
-              >
-                <el-button
-                  slot="reference"
-                  size="mini"
-                  plain
-                  type={row.status == "DOWN" ? "info" : "success"}
-                >
-                  {row.status == "DOWN" ? "已下架" : "上架中"}
-                </el-button>
-              </el-popconfirm>
-            );
-          }
-        },
-        {
-          title: "操作 (提示：下架后可进行操作)",
-          fixed: "right",
-          type: "jsx",
-          align: "center",
-          width: "340px",
-          render: ({ row }) => {
-            let edit = () => {
-              this.$refs.addOrUpdate.toggle(row).update();
-            };
-            let priceAdjustment = () => {
-              console.log(row);
-              this.$refs.AddPrice.toggle(row).update();
-            };
-            let changeInventory = () => {
-              this.$refs.addStock.toggle(row).update();
-            };
-            let setDiscounts = () => {
-              this.$refs.AddDiscount.toggle(row).update();
-            };
-            return (
-              <div>
-                <el-button
-                  size="mini"
-                  disabled={row.status != "DOWN"}
-                  type="primary"
-                  onClick={edit}
-                >
-                  编辑
-                </el-button>
-                <el-button
-                  size="mini"
-                  disabled={row.status != "DOWN"}
-                  type="primary"
-                  onClick={priceAdjustment}
-                >
-                  改价
-                </el-button>
-                <el-button
-                  size="mini"
-                  disabled={row.status != "DOWN"}
-                  type="primary"
-                  onClick={changeInventory}
-                >
-                  改库存
-                </el-button>
-                <el-button
-                  size="mini"
-                  disabled={row.status != "DOWN"}
-                  type="primary"
-                  onClick={setDiscounts}
-                >
-                  设置折扣
-                </el-button>
-              </div>
-            );
-          }
-        }
-      ];
-    },
-    tableEvent() {
-      return {
-        "checkbox-all": ({ records, reserves }) => {
-          this.selectList = [...records, ...reserves];
-        },
-        "checkbox-change": ({ records, reserves }) => {
-          this.selectList = [...records, ...reserves];
-        }
-      };
-    },
     ...mapState("userData", [
       "isMerchant",
       "marketList",
@@ -496,27 +328,46 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-.stat-list {
-  display: flex;
-  align-items: center;
-  /* justify-content: space-between; */
-  // flex-wrap: wrap;
-  margin-bottom: 10px;
-  padding: 10px;
-  border: 1px solid #ccc;
+<style scoped>
+.page-container {
+}
+.search-card {
+  margin-bottom: 15px;
+}
+.stats-card {
+  margin-bottom: 15px;
 }
 .stat-item {
-  width: 20%;
-  margin: 20px 20px;
-  display: flex;
-  align-items: center;
+  text-align: center;
+  background-color: #f5f5f5;
+  padding: 15px;
+  border-radius: 4px;
 }
-.stat-right {
-  margin-left: 12px;
-  font-size: 18px;
-}
-.stat-title {
+.stat-label {
+  font-size: 14px;
+  color: #606266;
   margin-bottom: 5px;
 }
+.stat-value {
+  font-size: 20px;
+  font-weight: bold;
+  color: #409EFF;
+}
+.search-form .el-form-item {
+  margin-bottom: 10px;
+}
+.search-buttons {
+  text-align: left;
+}
+.pagination-container {
+  margin-top: 20px;
+  text-align: right;
+}
 </style>
+<style>
+.search-form .el-form-item__label {
+  padding-bottom: 0px !important;
+  font-size: 12px;
+  line-height: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/operation-management/commodity/popup/add-or-update.vue b/src/views/modules/operation-management/commodity/popup/add-or-update.vue
index 4f874d7..f0dcd56 100644
--- a/src/views/modules/operation-management/commodity/popup/add-or-update.vue
+++ b/src/views/modules/operation-management/commodity/popup/add-or-update.vue
@@ -1,15 +1,174 @@
 <template>
   <div>
-    <obj-modal class="obj-modal" ref="modal" labelWidth="120px" :modalCols="modalCols" :modalConfig="modalConfig"
-      :modalData="modalData" :modalHandles="modalHandles">
-      <template slot="dialog__before">
+    <el-dialog
+      :title="modalConfig.title"
+      :visible.sync="modalConfig.show"
+      :width="modalConfig.width"
+      :fullscreen="modalConfig.fullscreen"
+      @close="handleClose"
+      class="obj-modal"
+    >
+      <el-form ref="dataForm" :model="modalData" :rules="rules" label-width="120px">
         <el-tabs :before-leave="beforeTabLeave" v-model="currentPanel">
-          <el-tab-pane label="基础信息" name="基础信息"></el-tab-pane>
-          <el-tab-pane label="销售信息" name="销售信息"></el-tab-pane>
-          <el-tab-pane label="其他信息" name="其他信息"></el-tab-pane>
+          <el-tab-pane label="基础信息" name="基础信息">
+            <el-form-item label="商品图片" prop="productPhotoList">
+              <el-upload
+                class="upload-demo"
+                drag
+                :action="$api.mer_admin.uploadFile()"
+                :on-change="handlePhotoChange"
+                :on-success="handlePhotoSuccess"
+                :on-remove="handlePhotoRemove"
+                :headers="{ token: 'Bearer ' + $cookie.get('token') }"
+                multiple
+                :file-list="fileList"
+                list-type="picture"
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+                <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="商品类目" prop="productCategoryId">
+              <el-select placeholder="请选择商品类目" v-model="modalData.productCategoryId">
+                <el-option
+                  v-for="item in getProductCategory"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="商品名称" prop="name">
+              <el-input v-model="modalData.name" placeholder="请输入商品名称" maxlength="30"></el-input>
+            </el-form-item>
+            <el-form-item label="商品描述" prop="description">
+              <el-input
+                type="textarea"
+                maxlength="100"
+                v-model="modalData.description"
+                placeholder="请简单描述，如别称、口感、用途等"
+              ></el-input>
+            </el-form-item>
+          </el-tab-pane>
+          <el-tab-pane label="销售信息" name="销售信息">
+            <el-form-item label="销售单位" prop="productUnit">
+              <el-select v-model="modalData.productUnit" placeholder="请选择销售单位">
+                <el-option
+                  v-for="item in getSaleUnit"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="规格" prop="productSpecificationList">
+              <el-button @click="addSpecs">若有多规格请在此配置</el-button>
+            </el-form-item>
+            <el-form-item label="成本" prop="costPrice">
+              <el-input
+                :readonly="modalData.specType !== 0"
+                :placeholder="modalData.specType !== 0 ? '多规格商品在规格中设置' : '请输入价格'"
+                v-model="modalData.costPrice"
+              >
+                <template slot="append">单位（元）</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="市场价" prop="marketPrice">
+              <el-input
+                :readonly="modalData.specType !== 0"
+                :placeholder="modalData.specType !== 0 ? '多规格商品在规格中设置' : '请输入市场价'"
+                v-model="modalData.marketPrice"
+              >
+                <template slot="append">单位（元）</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="库存" prop="stockNum">
+              <el-input
+                :readonly="modalData.specType !== 0"
+                :placeholder="modalData.specType !== 0 ? '多规格商品在规格中设置' : '请输入库存'"
+                v-model="modalData.stockNum"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="重量" prop="weight">
+              <el-input
+                :readonly="modalData.specType !== 0"
+                :placeholder="modalData.specType !== 0 ? '多规格商品在规格中设置' : '请输入重量'"
+                v-model="modalData.weight"
+              >
+                <template slot="append">KG</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="体积" prop="volume">
+              <el-input
+                :readonly="modalData.specType !== 0"
+                :placeholder="modalData.specType !== 0 ? '多规格商品在规格中设置' : '请输入体积'"
+                v-model="modalData.volume"
+              >
+                <template slot="append">立方米</template>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="其他属性" prop="otherAttribute">
+              <el-button @click="addAttribute">添加其他属性</el-button>
+            </el-form-item>
+          </el-tab-pane>
+          <el-tab-pane label="其他信息" name="其他信息">
+            <el-form-item label="产地" prop="productPlace">
+              <el-cascader
+                v-model="place"
+                @change="handlePlaceChange"
+                :options="$api.mer_admin.getCityOptions()"
+                :props="{ label: 'name', value: 'name' }"
+                clearable
+              ></el-cascader>
+            </el-form-item>
+            <el-form-item label="保质期" prop="shelfLife">
+              <el-input style="width:150px;" placeholder="请填写保质期" v-model="modalData.shelfLife">
+                <div slot="suffix">天</div>
+              </el-input>
+            </el-form-item>
+            <el-form-item label="商品介绍图" prop="productIntroducePhoto">
+              <el-upload
+                class="upload-demo"
+                drag
+                :action="$api.mer_admin.uploadFile()"
+                :file-list="fileListOne"
+                list-type="picture"
+                :on-success="handleIntroducePhotoSuccess"
+                :on-remove="handleIntroducePhotoRemove"
+                :headers="{ token: 'Bearer ' + $cookie.get('token') }"
+                multiple
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+                <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+              </el-upload>
+            </el-form-item>
+            <el-form-item label="商品视频" prop="productVideo">
+              <el-upload
+                class="upload-demo"
+                drag
+                :action="$api.mer_admin.uploadFile()"
+                :limit="1"
+                :file-list="fileListTwo"
+                accept=".mp4,.avi,.mov,.wmv,.flv"
+                :on-success="handleVideoSuccess"
+                :on-remove="handleVideoRemove"
+                :headers="{ token: 'Bearer ' + $cookie.get('token') }"
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">将视频文件拖到此处，或<em>点击上传</em></div>
+                <div class="el-upload__tip" slot="tip">支持mp4、avi、mov等视频格式，建议不超过50MB</div>
+              </el-upload>
+            </el-form-item>
+          </el-tab-pane>
         </el-tabs>
-      </template>
-    </obj-modal>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleNext" type="primary">{{ currentPanel === '其他信息' ? '保存并上架' : '下一步' }}</el-button>
+        <el-button @click="handleSaveToWarehouse" type="info" :disabled="currentPanel !== '其他信息'">保存并放入仓库</el-button>
+      </span>
+    </el-dialog>
     <!-- 添加规格 -->
     <addSpecifications @getSpecs="getSpecs" ref="addSpecifications"></addSpecifications>
     <!-- 属性 -->
@@ -142,17 +301,193 @@ export default {
       getSaleUnit: []
     };
   },
+  computed: {
+    rules() {
+      const isSingleSpec = this.modalData.specType === 0;
+      return {
+        productPhotoList: [{ required: true, message: "请上传商品图片", trigger: "blur" }],
+        productCategoryId: [{ required: true, message: "请选择商品类目", trigger: "change" }],
+        name: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
+        description: [{ required: true, message: "请填写商品描述", trigger: "blur" }],
+        productUnit: [{ required: true, message: "请选择销售单位", trigger: "change" }],
+        costPrice: [{ required: isSingleSpec, message: "请输入成本价格", trigger: "blur" }],
+        marketPrice: [{ required: isSingleSpec, message: "请输入市场价", trigger: "blur" }],
+        stockNum: [{ required: isSingleSpec, message: "请输入库存", trigger: "blur" }],
+        weight: [{ required: isSingleSpec, message: "请输入重量", trigger: "blur" }],
+        volume: [{ required: isSingleSpec, message: "请输入体积", trigger: "blur" }]
+      };
+    }
+  },
   mounted() {},
   watch: {
     "modalConfig.show"(newVal) {
       if (!newVal) {
         this.currentPanel = "基础信息";
         this.fileList = [];
-        (this.fileListOne = []), (this.fileListTwo = []);
+        this.fileListOne = [];
+        this.fileListTwo = [];
+        this.$refs.dataForm.resetFields();
       }
     }
   },
   methods: {
+    handleClose() {
+      this.modalConfig.show = false;
+    },
+    handlePhotoChange(file, fileList) {
+      // console.log(fileList);
+    },
+    handlePhotoSuccess(res, file, fileList) {
+      console.log(res, fileList);
+      this.modalData.productPhotoList = fileList.map((item, index) => {
+        if (index == 0) {
+          return {
+            isMain: 1,
+            url: item.response ? item.response.data : item.url
+          };
+        } else {
+          return {
+            isMain: 0,
+            url: item.response ? item.response.data : item.url
+          };
+        }
+      });
+      console.log(this.modalData.productPhotoList);
+      this.fileList = fileList.map(item => {
+        return {
+          name: item.name,
+          url: item.response ? item.response.data : item.url
+        };
+      });
+    },
+    handlePhotoRemove(file, fileList) {
+      console.log(file, fileList);
+      this.modalData.productPhotoList = fileList.map((item, index) => {
+        if (index == 0) {
+          return {
+            isMain: 1,
+            url: item.url
+          };
+        } else {
+          return {
+            isMain: 0,
+            url: item.url
+          };
+        }
+      });
+      console.log(this.modalData.productPhotoList);
+      this.fileList = fileList.map(item => {
+        return {
+          name: item.name,
+          url: item.url
+        };
+      });
+    },
+    handlePlaceChange(e) {
+      console.log(e);
+      this.modalData.productPlace = e.join("-");
+    },
+    handleIntroducePhotoSuccess(res, file, fileList) {
+      const urls = fileList
+        .map(item => (item.response ? item.response.data : item.url))
+        .filter(Boolean);
+      this.modalData.productIntroducePhoto = urls.join(",");
+      console.log(this.modalData.productIntroducePhoto);
+    },
+    handleIntroducePhotoRemove(file, fileList) {
+      const urls = fileList
+        .map(item => (item.response ? item.response.data : item.url))
+        .filter(Boolean);
+      this.modalData.productIntroducePhoto = urls.join(",");
+      console.log(this.modalData.productIntroducePhoto);
+    },
+    handleVideoSuccess(res) {
+      this.modalData.productVideo = res.data;
+    },
+    handleVideoRemove() {
+      this.modalData.productVideo = "";
+    },
+    handleNext: debounce(function() {
+      const validations = {
+        "基础信息": ["productPhotoList", "productCategoryId", "name", "description"],
+        "销售信息": () => {
+          const fields = ["productUnit"];
+          if (this.modalData.specType === 0) {
+            fields.push("costPrice", "marketPrice", "stockNum", "weight", "volume");
+          }
+          return fields;
+        }
+      };
+      const fieldsToValidate =
+        this.currentPanel === "销售信息"
+          ? validations["销售信息"]()
+          : validations[this.currentPanel];
+      if (this.currentPanel === "其他信息") {
+        this.$refs.dataForm.validate(valid => {
+          if (valid) {
+            this.saveProduct("UP");
+          }
+        });
+        return;
+      }
+      const validatePromises = fieldsToValidate.map(field => {
+        return new Promise((resolve, reject) => {
+          this.$refs.dataForm.validateField(field, errorMessage => {
+            if (errorMessage) {
+              reject(errorMessage);
+            } else {
+              resolve();
+            }
+          });
+        });
+      });
+      Promise.all(validatePromises)
+        .then(() => {
+          if (this.currentPanel === "基础信息") {
+            this.currentPanel = "销售信息";
+          } else if (this.currentPanel === "销售信息") {
+            this.currentPanel = "其他信息";
+          }
+        })
+        .catch(() => {
+          console.log("validation failed");
+        });
+    }, 300),
+    handleSaveToWarehouse: debounce(function() {
+      this.$refs.dataForm.validate(valid => {
+        if (valid) {
+          this.saveProduct("DOWN");
+        }
+      });
+    }, 300),
+    saveProduct(status) {
+      console.log("请求接口", this.modalData);
+      if (this.modalData.specType == 0) {
+        this.modalData.productAttributeList = [
+          {
+            id: "1821213026050191360",
+            attributeName: "重量",
+            attributeValue: "1斤"
+          }
+        ];
+        this.modalData.productSpecificationList = [
+          {
+            attributeValue: "默认",
+            costPrice: this.modalData.costPrice,
+            marketPrice: this.modalData.marketPrice,
+            stockNum: this.modalData.stockNum,
+            weight: this.modalData.weight,
+            volume: this.modalData.volume
+          }
+        ];
+      }
+      this.modalData.status = status;
+      this.$api.mer_admin.saveProduct(this.modalData).then(res => {
+        console.log(res);
+        this.$emit("queryList");
+        this.toggle();
+      });
+    },
     toggle(e) {
       if (this.modalConfig.show == false) {
         this.modalConfig.show = true;
@@ -325,16 +660,48 @@ export default {
       if (this.passCheck.includes(activeName)) {
         return true;
       }
-      let state = "";
-      this.$refs.modal.validate(valid => {
-        if (valid) {
+      const validations = {
+        "基础信息": ["productPhotoList", "productCategoryId", "name", "description"],
+        "销售信息": () => {
+          const fields = ["productUnit"];
+          if (this.modalData.specType === 0) {
+            fields.push("costPrice", "marketPrice", "stockNum", "weight", "volume");
+          }
+          return fields;
+        },
+        "其他信息": []
+      };
+      const fieldsToValidate =
+        typeof validations[oldActiveName] === "function"
+          ? validations[oldActiveName]()
+          : validations[oldActiveName];
+      if (!fieldsToValidate || fieldsToValidate.length === 0) {
+        if (!this.passCheck.includes(oldActiveName)) {
+          this.passCheck.push(oldActiveName);
+        }
+        return true;
+      }
+      const validatePromises = fieldsToValidate.map(field => {
+        return new Promise((resolve, reject) => {
+          this.$refs.dataForm.validateField(field, errorMessage => {
+            if (errorMessage) {
+              reject(errorMessage);
+            } else {
+              resolve();
+            }
+          });
+        });
+      });
+      return Promise.all(validatePromises)
+        .then(() => {
           if (!this.passCheck.includes(oldActiveName)) {
             this.passCheck.push(oldActiveName);
           }
-        }
-        state = valid;
-      });
-      return state;
+          return true;
+        })
+        .catch(() => {
+          return Promise.reject();
+        });
     },
     getData() {
       this.$api.mer_admin
@@ -349,607 +716,6 @@ export default {
       });
     }
   },
-  computed: {
-    modalCols() {
-      switch (this.currentPanel) {
-        case "基础信息":
-          return [
-            {
-              label: "商品图片",
-              prop: "productPhotoList",
-              required: true,
-              rules: {
-                required: true,
-                message: "请上传商品图片",
-                trigger: "blur"
-              },
-              type: "jsx",
-              render: () => {
-                const handleChange = (file, fileList) => {
-                  // console.log(fileList);
-                };
-                const handleAvatarSuccess = (res, file, fileList) => {
-                  console.log(res, fileList);
-                  this.modalData.productPhotoList = fileList.map(
-                    (item, index) => {
-                      if (index == 0) {
-                        return {
-                          isMain: 1,
-                          url: item.response ? item.response.data : item.url
-                        };
-                      } else {
-                        return {
-                          isMain: 0,
-                          url: item.response ? item.response.data : item.url
-                        };
-                      }
-                    }
-                  );
-                  console.log(this.modalData.productPhotoList);
-                  this.fileList = fileList.map(item => {
-                    return {
-                      name: item.name,
-                      url: item.response ? item.response.data : item.url
-                    };
-                  });
-                };
-                const handleRemove = (file, fileList) => {
-                  console.log(file, fileList);
-                  this.modalData.productPhotoList = fileList.map(
-                    (item, index) => {
-                      if (index == 0) {
-                        return {
-                          isMain: 1,
-                          url: item.url
-                        };
-                      } else {
-                        return {
-                          isMain: 0,
-                          url: item.url
-                        };
-                      }
-                    }
-                  );
-                  console.log(this.modalData.productPhotoList);
-                  this.fileList = fileList.map(item => {
-                    return {
-                      name: item.name,
-                      url: item.url
-                    };
-                  });
-                };
-                return (
-                  <el-upload
-                    class="upload-demo"
-                    drag
-                    action={this.$api.mer_admin.uploadFile()}
-                    {...{
-                      props: {
-                        "on-change": handleChange,
-                        "on-success": handleAvatarSuccess,
-                        "on-remove": handleRemove
-                      }
-                    }}
-                    headers={{
-                      token: "Bearer " + this.$cookie.get("token")
-                    }}
-                    multiple={true}
-                    file-list={this.fileList}
-                    list-type="picture"
-                  >
-                    <i class="el-icon-upload"></i>
-                    <div class="el-upload__text">
-                      将文件拖到此处，或<em>点击上传</em>
-                    </div>
-                    <div class="el-upload__tip" slot="tip">
-                      只能上传jpg/png文件，且不超过500kb
-                    </div>
-                  </el-upload>
-                );
-              }
-            },
-            {
-              label: "商品类目",
-              prop: "productCategoryId",
-              type: "jsx",
-              required: true,
-              rules: {
-                required: true,
-                message: "请选择商品类目",
-                trigger: "blur"
-              },
-              render: () => {
-                return (
-                  <el-select
-                    placeholder="请选择商品类目"
-                    v-model={this.modalData.productCategoryId}
-                  >
-                    {this.getProductCategory.map(item => {
-                      return (
-                        <el-option
-                          label={item.name}
-                          value={item.id}
-                        ></el-option>
-                      );
-                    })}
-                  </el-select>
-                );
-              }
-            },
-            {
-              label: "商品名称",
-              prop: "name",
-              type: "Input",
-              required: true,
-              maxlength: "30",
-              rules: {
-                required: true,
-                message: "请输入商品名称",
-                trigger: "blur"
-              },
-              placeholder: "请输入商品名称"
-            },
-            {
-              label: "商品描述",
-              prop: "description",
-              required: true,
-              rules: {
-                required: true,
-                message: "请填写商品描述",
-                trigger: "blur"
-              },
-              type: "jsx",
-              render: () => {
-                return (
-                  <el-input
-                    type="textarea"
-                    maxlength={100}
-                    v-model={this.modalData.description}
-                    placeholder="请简单描述，如别称、口感、用途等"
-                  />
-                );
-              }
-            }
-            // {
-            //   label: "是否为预售产品",
-            //   prop: "isAdvanceSell",
-            //   required: true,
-            //   rules: {
-            //     required: true,
-            //     message: "是否为预售产品",
-            //     trigger: "blur",
-            //   },
-            //   type: "jsx",
-            //   render: () => {
-            //     return (
-            //       <el-select
-            //         v-model={this.modalData.isAdvanceSell}
-            //         placeholder="请选择销售单位"
-            //       >
-            //         {[
-            //           { label: "是", value: "1" },
-            //           { label: "否", value: "0" },
-            //         ].map((item) => {
-            //           return (
-            //             <el-option
-            //               label={item.label}
-            //               value={item.value}
-            //             ></el-option>
-            //           );
-            //         })}
-            //       </el-select>
-            //     );
-            //   },
-            // },
-          ];
-          break;
-        case "销售信息":
-          return [
-            {
-              label: "销售单位",
-              prop: "productUnit",
-              required: true,
-              rules: {
-                required: true,
-                message: "请选择销售单位",
-                trigger: "blur"
-              },
-              type: "jsx",
-              render: () => {
-                return (
-                  <el-select
-                    v-model={this.modalData.productUnit}
-                    placeholder="请选择销售单位"
-                  >
-                    {this.getSaleUnit.map(item => {
-                      return (
-                        <el-option
-                          label={item.name}
-                          value={item.name}
-                        ></el-option>
-                      );
-                    })}
-                  </el-select>
-                );
-              }
-            },
-            {
-              label: "规格",
-              prop: "productSpecificationList",
-              type: "jsx",
-              render: () => {
-                return (
-                  <el-button onClick={this.addSpecs}>
-                    若有多规格请在此配置
-                  </el-button>
-                );
-              }
-            },
-            {
-              label: "成本",
-              prop: "costPrice",
-              type: "jsx",
-              required: this.modalData.specType === 0,
-              rules: {
-                required: this.modalData.specType === 0,
-                message: "请输入成本价格",
-                trigger: "blur"
-              },
-              render: () => {
-                return (
-                  <el-input
-                    readonly={this.modalData.specType != 0}
-                    placeholder={this.modalData.specType != 0 ? "多规格商品在规格中设置" : "请输入价格"}
-                    v-model={this.modalData.costPrice}
-                  >
-                    <template slot="append">单位（元）</template>
-                  </el-input>
-                );
-              }
-            },
-            {
-              label: "市场价",
-              prop: "marketPrice",
-              type: "jsx",
-              required: this.modalData.specType === 0,
-              rules: {
-                required: this.modalData.specType === 0,
-                message: "请输入市场价",
-                trigger: "blur"
-              },
-              render: () => {
-                return (
-                  <el-input
-                    readonly={this.modalData.specType != 0}
-                    placeholder={this.modalData.specType != 0 ? "多规格商品在规格中设置" : "请输入市场价"}
-                    v-model={this.modalData.marketPrice}
-                  >
-                    <template slot="append">单位（元）</template>
-                  </el-input>
-                );
-              }
-            },
-            {
-              label: "库存",
-              prop: "stockNum",
-              type: "jsx",
-              required: this.modalData.specType === 0,
-              rules: {
-                required: this.modalData.specType === 0,
-                message: "请输入库存",
-                trigger: "blur"
-              },
-              render: () => {
-                return (
-                  <el-input
-                    readonly={this.modalData.specType != 0}
-                    placeholder={this.modalData.specType != 0 ? "多规格商品在规格中设置" : "请输入库存"}
-                    v-model={this.modalData.stockNum}
-                  ></el-input>
-                );
-              }
-            },
-            {
-              label: "重量",
-              prop: "weight",
-              type: "jsx",
-              required: this.modalData.specType === 0,
-              rules: {
-                required: this.modalData.specType === 0,
-                message: "请输入重量",
-                trigger: "blur"
-              },
-              render: () => {
-                return (
-                  <el-input
-                    readonly={this.modalData.specType != 0}
-                    placeholder={this.modalData.specType != 0 ? "多规格商品在规格中设置" : "请输入重量"}
-                    v-model={this.modalData.weight}
-                  >
-                    <template slot="append">KG</template>
-                  </el-input>
-                );
-              }
-            },
-            {
-              label: "体积",
-              prop: "volume",
-              type: "jsx",
-              required: this.modalData.specType === 0,
-              rules: {
-                required: this.modalData.specType === 0,
-                message: "请输入体积",
-                trigger: "blur"
-              },
-              render: () => {
-                return (
-                  <el-input
-                    readonly={this.modalData.specType != 0}
-                    placeholder={this.modalData.specType != 0 ? "多规格商品在规格中设置" : "请输入体积"}
-                    v-model={this.modalData.volume}
-                  >
-                    <template slot="append">立方米</template>
-                  </el-input>
-                );
-              }
-            },
-            {
-              label: "其他属性",
-              prop: "productAttributeList",
-              type: "jsx",
-              render: () => {
-                return (
-                  <el-button onClick={this.addAttribute}>
-                    添加其他属性
-                  </el-button>
-                );
-              }
-            }
-          ];
-          break;
-        case "其他信息":
-          return [
-            {
-              label: "产地",
-              prop: "productPlace",
-              type: "jsx",
-              render: () => {
-                const change = e => {
-                  console.log(e);
-                  this.modalData.productPlace = e.join("-");
-                };
-                return (
-                  <el-cascader
-                    v-model={this.place}
-                    onChange={change}
-                    options={this.$api.mer_admin.getCityOptions()}
-                    props={{
-                      props: {
-                        label: "name",
-                        value: "name"
-                      }
-                    }}
-                    clearable
-                  ></el-cascader>
-                );
-              }
-            },
-            {
-              label: "保质期",
-              prop: "shelfLife",
-              type: "jsx",
-              render: () => {
-                return (
-                  <el-input
-                    style="width:150px;"
-                    placeholder="请填写保质期"
-                    v-model={this.modalData.shelfLife}
-                  >
-                    <div slot="suffix">天</div>
-                  </el-input>
-                );
-              }
-            },
-            {
-              label: "商品介绍图",
-              prop: "productIntroducePhoto",
-              type: "Input",
-              // required: true,
-              // rules: { required: true, message: "商品介绍图", trigger: "blur" },
-              placeholder: "商品介绍图",
-              type: "jsx",
-              render: () => {
-                const handleChange = (file, fileList) => {
-                  // console.log(fileList);
-                };
-                const handleAvatarSuccess = (res, file, fileList) => {
-                  // 拼接所有已上传图片URL，使用逗号分隔
-                  const urls = fileList
-                    .map(item => {
-                      return item.response ? item.response.data : item.url;
-                    })
-                    .filter(Boolean);
-                  this.modalData.productIntroducePhoto = urls.join(",");
-                  console.log(this.modalData.productIntroducePhoto);
-                };
-                const handleRemove = (file, fileList) => {
-                  // 从已上传列表中移除一张图片后，重新拼接剩余的图片URL
-                  const urls = fileList
-                    .map(item => {
-                      return item.response ? item.response.data : item.url;
-                    })
-                    .filter(Boolean);
-                  this.modalData.productIntroducePhoto = urls.join(",");
-                  console.log(this.modalData.productIntroducePhoto);
-                };
-                return (
-                  <el-upload
-                    class="upload-demo"
-                    drag
-                    action={this.$api.mer_admin.uploadFile()}
-                    file-list={this.fileListOne}
-                    list-type="picture"
-                    {...{
-                      props: {
-                        "on-change": handleChange,
-                        "on-success": handleAvatarSuccess,
-                        "on-remove": handleRemove
-                      }
-                    }}
-                    headers={{
-                      token: "Bearer " + this.$cookie.get("token")
-                    }}
-                    multiple
-                  >
-                    <i class="el-icon-upload"></i>
-                    <div class="el-upload__text">
-                      将文件拖到此处，或<em>点击上传</em>
-                    </div>
-                    <div class="el-upload__tip" slot="tip">
-                      只能上传jpg/png文件，且不超过500kb
-                    </div>
-                  </el-upload>
-                );
-              }
-            },
-            {
-              label: "商品视频",
-              prop: "productVideo",
-              // required: true,
-              // rules: {
-              //   required: true,
-              //   message: "请填写商品描述",
-              //   trigger: "blur",
-              // },
-              type: "jsx",
-              render: () => {
-                const handleChange = (file, fileList) => {
-                  console.log(fileList);
-                };
-                const handleAvatarSuccess = res => {
-                  this.modalData.productVideo = res.data;
-                };
-                const handleRemove = () => {
-                  this.modalData.productVideo = "";
-                };
-                return (
-                  <el-upload
-                    class="upload-demo"
-                    drag
-                    action={this.$api.mer_admin.uploadFile()}
-                    limit={1}
-                    file-list={this.fileListTwo}
-                    accept=".mp4,.avi,.mov,.wmv,.flv"
-                    {...{
-                      props: {
-                        "on-change": handleChange,
-                        "on-success": handleAvatarSuccess,
-                        "on-remove": handleRemove
-                      }
-                    }}
-                    headers={{
-                      token: "Bearer " + this.$cookie.get("token")
-                    }}
-                  >
-                    <i class="el-icon-upload"></i>
-                    <div class="el-upload__text">
-                      将视频文件拖到此处，或<em>点击上传</em>
-                    </div>
-                    <div class="el-upload__tip" slot="tip">
-                      支持mp4、avi、mov等视频格式，建议不超过50MB
-                    </div>
-                  </el-upload>
-                );
-              }
-            }
-          ];
-          break;
-
-        default:
-          break;
-      }
-    },
-    modalHandles() {
-      return [
-        {
-          label: this.currentPanel === "其他信息" ? "保存并上架" : "下一步",
-          type: "primary",
-          loading: this.isLoading,
-          submit: true,
-          handle: debounce(() => {
-            if (this.currentPanel === "基础信息") {
-              this.currentPanel = "销售信息";
-            } else if (this.currentPanel == "销售信息") {
-              this.currentPanel = "其他信息";
-            } else {
-              console.log("请求接口", this.modalData);
-              if (this.modalData.specType == 0) {
-                this.modalData.productAttributeList = [
-                  {
-                    id: "1821213026050191360",
-                    attributeName: "重量",
-                    attributeValue: "1斤"
-                  }
-                ];
-                this.modalData.productSpecificationList = [
-                  {
-                    attributeValue: "默认",
-                    costPrice: this.modalData.costPrice,
-                    marketPrice: this.modalData.marketPrice,
-                    stockNum: this.modalData.stockNum,
-                    weight: this.modalData.weight,
-                    volume: this.modalData.volume
-                  }
-                ];
-              }
-              // 明确设置状态为上架
-              this.modalData.status = "UP";
-              this.$api.mer_admin.saveProduct(this.modalData).then(res => {
-                console.log(res);
-                this.$emit("queryList");
-                this.toggle();
-              });
-            }
-          }, 300)
-        },
-        {
-          disabled: () => this.currentPanel != "其他信息",
-          label: "保存并放入仓库",
-          type: "info",
-          loading: this.isLoading,
-          submit: true,
-          handle: debounce(() => {
-            if (this.modalData.specType == 0) {
-              this.modalData.productAttributeList = [
-                {
-                  id: "1821213026050191360",
-                  attributeName: "重量",
-                  attributeValue: "1斤"
-                }
-              ];
-              this.modalData.productSpecificationList = [
-                {
-                  attributeValue: "默认",
-                  costPrice: this.modalData.costPrice,
-                  marketPrice: this.modalData.marketPrice,
-                  stockNum: this.modalData.stockNum,
-                  weight: this.modalData.weight,
-                  volume: this.modalData.volume
-                }
-              ];
-            }
-            // 明确设置状态为下架/放入仓库
-            this.modalData.status = "DOWN";
-            this.$api.mer_admin.saveProduct(this.modalData).then(res => {
-              console.log(res);
-              this.$emit("queryList");
-              this.toggle();
-            });
-          }, 300)
-        }
-      ];
-    }
-  },
   asyncComputed: {
     // async getProductCategory() {
     //   let res = await this.$api.mer_admin.getProductCategory();
diff --git a/src/views/modules/operation-management/order/index.vue b/src/views/modules/operation-management/order/index.vue
index ce84555..26edbdf 100644
--- a/src/views/modules/operation-management/order/index.vue
+++ b/src/views/modules/operation-management/order/index.vue
@@ -100,11 +100,7 @@
       </el-card>
     </div>
 
-    <el-card class="table-card" shadow="never">
-       <div slot="header">
-        <span>订单列表</span>
-      </div>
-      <!-- 表格 -->
+    <!-- 表格 -->
       <el-table
         :data="tableData"
         v-loading="loading"
@@ -135,26 +131,25 @@
                       size="small"
                       style="width: 100%"
                       :show-header="true">
-                      <el-table-column label="序号">
-                        <template slot-scope="productScope">
-                          {{ productScope.$index + 1 }}
-                        </template>
+<el-table-column prop="productName" label="商品名称">
+                        <template slot-scope="productScope">{{ productScope.row.productName || '-' }}</template>
+                      </el-table-column>
+                      <el-table-column prop="productCount" label="商品数量">
+                        <template slot-scope="productScope">{{ productScope.row.productCount || '-' }}</template>
                       </el-table-column>
-                      <el-table-column prop="productName" label="商品名称"></el-table-column>
-                      <el-table-column prop="productCount" label="商品数量"></el-table-column>
                       <el-table-column label="商品原价">
                         <template slot-scope="productScope">
-                          ¥ {{ (productScope.row.originPrice / 100).toFixed(2) }}
+                          ¥ {{ (productScope.row.originPrice / 100).toFixed(2) || '0.00' }}
                         </template>
                       </el-table-column>
                       <el-table-column label="商品终价">
                         <template slot-scope="productScope">
-                          ¥ {{ (productScope.row.finalPrice / 100).toFixed(2) }}
+                          ¥ {{ (productScope.row.finalPrice / 100).toFixed(2) || '0.00' }}
                         </template>
                       </el-table-column>
                       <el-table-column label="商品订单金额">
                         <template slot-scope="productScope">
-                          ¥ {{ (productScope.row.productOrderMoney / 100).toFixed(2) }}
+                          ¥ {{ (productScope.row.productOrderMoney / 100).toFixed(2) || '0.00' }}
                         </template>
                       </el-table-column>
                       <el-table-column prop="productImg" label="商品图片">
@@ -164,6 +159,7 @@
                                     style="width: 40px; height: 40px;"
                                     fit="cover"
                                     :preview-src-list="[productScope.row.productImg]"></el-image>
+                          <span v-else>-</span>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -174,16 +170,18 @@
                     {{ shopScope.$index + 1 }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="shopOrderNo" label="店铺订单号"></el-table-column>
+                <el-table-column prop="shopOrderNo" label="店铺订单号">
+                  <template slot-scope="shopScope">{{ shopScope.row.shopOrderNo || '-' }}</template>
+                </el-table-column>
                 <el-table-column prop="shopName" label="店铺名称">
                   <template slot-scope="shopScope">
-                    {{ shopScope.row.shopName || "暂无" }}
+                    {{ shopScope.row.shopName || "-" }}
                   </template>
                 </el-table-column>
                 <el-table-column prop="status" label="订单状态">
                   <template slot-scope="shopScope">
                     <el-tag :type="getShopStatusType(shopScope.row.status)" size="small">
-                      {{ getShopStatusText(shopScope.row.status) }}
+                      {{ getShopStatusText(shopScope.row.status) || '-' }}
                     </el-tag>
                   </template>
                 </el-table-column>
@@ -198,46 +196,62 @@
             {{ (pagination.pageNumber - 1) * pagination.pageSize + scope.$index + 1 }}
           </template>
         </el-table-column>
-        <el-table-column prop="unitOrderNo" label="结算订单号" min-width="120"></el-table-column>
-        <el-table-column prop="createTime" label="下单时间" width="90"></el-table-column>
-        <el-table-column prop="receiverName" label="收货人姓名" width="80"></el-table-column>
-        <el-table-column prop="receiverPhone" label="收货人电话" width="100"></el-table-column>
-        <el-table-column prop="poi" label="收货人地址" min-width="150"></el-table-column>
+        <el-table-column prop="unitOrderNo" label="结算订单号" min-width="120">
+          <template slot-scope="scope">{{ scope.row.unitOrderNo || '-' }}</template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="下单时间" width="90">
+          <template slot-scope="scope">{{ scope.row.createTime || '-' }}</template>
+        </el-table-column>
+        <el-table-column prop="receiverName" label="收货人姓名" width="80">
+          <template slot-scope="scope">{{ scope.row.receiverName || '-' }}</template>
+        </el-table-column>
+        <el-table-column prop="receiverPhone" label="收货人电话" width="100">
+          <template slot-scope="scope">{{ scope.row.receiverPhone || '-' }}</template>
+        </el-table-column>
+        <el-table-column prop="poi" label="收货人地址" min-width="150">
+          <template slot-scope="scope">{{ scope.row.poi || '-' }}</template>
+        </el-table-column>
         <el-table-column label="市场订单金额" min-width="100">
           <template slot-scope="scope">
-            <span>¥ {{ (scope.row.unitOrderMoney / 100).toFixed(2) }}</span>
+            <span>¥ {{ (scope.row.unitOrderMoney / 100).toFixed(2) || '0.00' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="市场订单商品金额" min-width="120">
           <template slot-scope="scope">
-            <span>¥ {{ (scope.row.productMoney / 100).toFixed(2) }}</span>
+            <span>¥ {{ (scope.row.productMoney / 100).toFixed(2) || '0.00' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="市场订单配送费" min-width="110">
           <template slot-scope="scope">
-            <span>¥ {{ (scope.row.deliveryMoney / 100).toFixed(2) }}</span>
+            <span>¥ {{ (scope.row.deliveryMoney / 100).toFixed(2) || '0.00' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="调度费" width="60">
           <template slot-scope="scope">
-            <span>¥ {{ (scope.row.dispatchMoney / 100).toFixed(2) }}</span>
+            <span>¥ {{ (scope.row.dispatchMoney / 100).toFixed(2) || '0.00' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="包装费" width="60">
           <template slot-scope="scope">
-            <span>¥ {{ (scope.row.packageMoney / 100).toFixed(2) }}</span>
+            <span>¥ {{ (scope.row.packageMoney / 100).toFixed(2) || '0.00' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="status" label="订单状态" width="100">
            <template slot-scope="scope">
             <el-tag :type="getStatusTagType(scope.row.status)" size="small">
-              {{ getStatusText(scope.row.status) }}
+              {{ getStatusText(scope.row.status) || '-' }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="marketId" label="市场编号" width="90"></el-table-column>
-        <el-table-column prop="marketName" label="市场名称" min-width="100"></el-table-column>
-        <el-table-column prop="refundReason" label="申请退款原因" min-width="80"></el-table-column>
+        <el-table-column prop="marketId" label="市场编号" width="90">
+          <template slot-scope="scope">{{ scope.row.marketId || '-' }}</template>
+        </el-table-column>
+        <el-table-column prop="marketName" label="市场名称" min-width="100">
+          <template slot-scope="scope">{{ scope.row.marketName || '-' }}</template>
+        </el-table-column>
+        <el-table-column prop="refundReason" label="申请退款原因" min-width="80">
+          <template slot-scope="scope">{{ scope.row.refundReason || '-' }}</template>
+        </el-table-column>
       </el-table>
 
       <!-- 分页 -->
@@ -251,7 +265,6 @@
         :total="pagination.total"
         class="pagination-container"
       ></el-pagination>
-    </el-card>
   </div>
 </template>