diff --git a/src/views/product/info/index.vue b/src/views/product/info/index.vue
index 257b6f1..e564ddb 100644
--- a/src/views/product/info/index.vue
+++ b/src/views/product/info/index.vue
@@ -1,281 +1,213 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="商品名称" prop="name">
+    <el-form :model="queryProductReq" ref="queryProductReq" size="small" :inline="true">
+      <el-form-item label="输入搜索：">
         <el-input
-          v-model="queryParams.name"
-          placeholder="请输入商品名称"
+          v-model="queryProductReq.productName"
+          placeholder="商品名称"
           clearable
+          style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="商品状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择商品状态" clearable>
+      <el-form-item label="商品货号：">
+        <el-input
+          v-model="queryProductReq.productNumber"
+          placeholder="商品货号"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
+      <el-form-item label="上架状态：" prop="status">
+        <el-select
+          v-model="queryProductReq.productStatus"
+          placeholder="全部"
+          clearable
+          style="width: 240px"
+        >
           <el-option
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+            label="上架"
+            value="1"
+          />
+          <el-option
+            label="下架"
+            value="2"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="规格" prop="ruleId">
-        <el-input
-          v-model="queryParams.ruleId"
-          placeholder="请输入规格"
+      <el-form-item label="审核状态：" prop="status">
+        <el-select
+          v-model="queryProductReq.productExamine"
+          placeholder="全部"
           clearable
-          @keyup.enter.native="handleQuery"
-        />44
-      </el-form-item>
-      <el-form-item label="品牌" prop="brandId">
-        <el-input44
-          v-model="queryParams.brandId"
-          placeholder="请输入品牌"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width: 240px"
+        >
+          <el-option
+            label="审核通过"
+            value="1"
+          />
+          <el-option
+            label="未审核"
+            value="2"
+          />
+        </el-select>
       </el-form-item>
+
+
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询结果</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['product:info:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['product:info:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['product:info:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['product:info:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
-    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="商品名称" align="center" prop="name" />
-      <el-table-column label="商品描述" align="center" prop="introduction" />
-      <el-table-column label="主类型" align="center" prop="mianType" />
-      <el-table-column label="父类型" align="center" prop="parentType" />
-      <el-table-column label="商品类型" align="center" prop="type" />
-      <el-table-column label="商品图片" align="center" prop="image" width="100">
+    <el-table :data="arr" style="width: 100%"  @selection-change="handleSelectionChange">
+      <el-table-column
+        label="序号"
+        width="180">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.image" :width="50" :height="50"/>
+          <span style="margin-left: 10px">{{ scope.$index +1}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="商品轮播图" align="center" prop="carouselImages" width="100">
+
+      <el-table-column
+        label="商品图片"
+        width="180">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.carouselImages" :width="50" :height="50"/>
+          <img :src="scope.row.imagesUrl"  width="100px" height="100px" alt="图片损坏"/>
         </template>
       </el-table-column>
-      <el-table-column label="商品状态" align="center" prop="status">
+
+      <el-table-column
+        label="商品名称"
+        width="180">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
+          <span style="margin-left: 10px">名稱:{{ scope.row.bookName }}</span><br>
         </template>
       </el-table-column>
-      <el-table-column label="规格" align="center" prop="ruleId" />
-      <el-table-column label="品牌" align="center" prop="brandId" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+
+      <el-table-column
+        label="价格/货号"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">价格：￥{{ scope.row.salePrice }}</span><br>
+          <span style="margin-left: 10px">货号：{{ scope.row.productNumber }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        label="标签"
+        width="180">
+        <template slot-scope="scope">
+          上架：<el-switch
+          v-model="scope.row.productStatus"
+          :active-value="1"
+          :inactive-value="0"
+        ></el-switch><br>
+          新品：<el-switch
+          v-model="scope.row.productNew"
+          :active-value="1"
+          :inactive-value="0"
+        ></el-switch><br>
+          推荐：<el-switch
+          v-model="scope.row.productRecommended"
+          :active-value="1"
+          :inactive-value="0"
+        ></el-switch>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column
+        label="审核状态"
+        width="180">
+        <template slot-scope="scope">
+          <span style="margin-left: 10px">{{ scope.row.productExamine==0?'待审核':scope.row.productExamine==1?'通过':'驳回'}}</span><br>
+          <el-link type="primary">审核详情</el-link>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['product:info:edit']"
-          >修改</el-button>
+            @click="handleDetails(scope.row.id)">查看</el-button>
           <el-button
             size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['product:info:remove']"
-          >删除</el-button>
+            type="danger"
+            @click="handleDelete(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改商品信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="商品名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入商品名称" />
-        </el-form-item>
-        <el-form-item label="商品描述">
-          <editor v-model="form.introduction" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="商品图片" prop="image">
-          <image-upload v-model="form.image"/>
-        </el-form-item>
-        <el-form-item label="商品轮播图" prop="carouselImages">
-          <image-upload v-model="form.carouselImages"/>
-        </el-form-item>
-        <el-form-item label="商品状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_yes_no"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="规格" prop="ruleId">
-          <el-input v-model="form.ruleId" placeholder="请输入规格" />
-        </el-form-item>
-        <el-form-item label="品牌" prop="brandId">
-          <el-input v-model="form.brandId" placeholder="请输入品牌" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
-
 <script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/product/info";
+import {listInfo, getInfo, addInfo, delInfo,updateInfo} from "@/api/product/info";
 
 export default {
-  name: "Info",
-  dicts: ['sys_yes_no'],
+  name: "info",
   data() {
     return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 商品信息表格数据
-      infoList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
+      dialogTableVisible: false,
+      dialogFormVisible: false,
+      formLabelWidth: '120px',
+      brandName: null,
+      options: [{
+        value: '',
+        label: '',
+        children: [{
+          value: '',
+          label: '',
+        }]
+      }],
+      brand: [],
+      queryProductReq: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      arr: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
-        name: null,
-        introduction: null,
-        mianType: null,
-        parentType: null,
-        type: null,
-        image: null,
-        carouselImages: null,
-        status: null,
-        ruleId: null,
-        brandId: null,
+        pageSize: 10
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
-      }
+      productVo: {}
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    /** 查询商品信息列表 */
-    getList() {
-      this.loading = true;
-      listInfo(this.queryParams).then(response => {
-        this.infoList = response.data.rows;
-        this.total = response.data.total;
-        this.loading = false;
+    /**删除**/
+    handleDelete(id) {
+      this.$confirm('确认删除此消息吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // 用户点击了确定按钮，执行删除操作
+        delInfo(id).then(response => {
+          this.$message.success(response.msg || '删除成功');
+          this.getList();
+        }).catch(error => {
+          this.$message.error(error.message || '删除失败');
+        });
+      }).catch(() => {
+        // 用户点击了取消按钮，不执行任何操作
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        name: null,
-        introduction: null,
-        mianType: null,
-        parentType: null,
-        type: null,
-        image: null,
-        carouselImages: null,
-        status: null,
-        ruleId: null,
-        brandId: null,
-        remark: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
-      };
-      this.resetForm("form");
+    /** 查询商品列表 */
+    getList() {
+      listInfo(this.queryProductReq).then(
+        response => {
+          console.log(response)
+          this.arr = response.data.list
+        }
+      )
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -284,67 +216,16 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.ids = selection.map(item => item.roleId)
+      this.single = selection.length != 1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加商品信息";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getInfo(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改商品信息";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除商品信息编号为"' + ids + '"的数据项？').then(function() {
-        return delInfo(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('product/info/export', {
-        ...this.queryParams
-      }, `info_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>