diff --git a/src/views/product/info/index.vue b/src/views/product/info/index.vue
index e564ddb..c231f5c 100644
--- a/src/views/product/info/index.vue
+++ b/src/views/product/info/index.vue
@@ -1,213 +1,243 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryProductReq" ref="queryProductReq" size="small" :inline="true">
-      <el-form-item label="输入搜索：">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="品牌名称" prop="nam">
         <el-input
-          v-model="queryProductReq.productName"
-          placeholder="商品名称"
+          v-model="queryParams.nam"
+          placeholder="请输入品牌名称"
           clearable
-          style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <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-form-item label="是否启用" prop="start">
+        <el-select v-model="queryParams.start" placeholder="请选择是否启用" clearable>
           <el-option
-            label="上架"
-            value="1"
-          />
-          <el-option
-            label="下架"
-            value="2"
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="审核状态：" prop="status">
-        <el-select
-          v-model="queryProductReq.productExamine"
-          placeholder="全部"
-          clearable
-          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:brand: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:brand: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:brand: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:brand:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-    <el-table :data="arr" style="width: 100%"  @selection-change="handleSelectionChange">
-      <el-table-column
-        label="序号"
-        width="180">
+    <el-table v-loading="loading" :data="brandList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="bookId" />
+      <el-table-column label="名称" align="center" prop="bookName" />
+      <el-table-column label="LOGO" align="center" prop="logo" width="100">
         <template slot-scope="scope">
-          <span style="margin-left: 10px">{{ scope.$index +1}}</span>
+          <image-preview :src="scope.row.logo" :width="50" :height="50"/>
         </template>
       </el-table-column>
-
-      <el-table-column
-        label="商品图片"
-        width="180">
+      <el-table-column label="是否启用" align="center" prop="start">
         <template slot-scope="scope">
-          <img :src="scope.row.imagesUrl"  width="100px" height="100px" alt="图片损坏"/>
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.start"/>
         </template>
       </el-table-column>
-
-      <el-table-column
-        label="商品名称"
-        width="180">
-        <template slot-scope="scope">
-          <span style="margin-left: 10px">名稱:{{ scope.row.bookName }}</span><br>
-        </template>
-      </el-table-column>
-
-      <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="操作">
+      <el-table-column label="介绍" align="center" prop="introduction" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
-            @click="handleDetails(scope.row.id)">查看</el-button>
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['product:brand:edit']"
+          >修改</el-button>
           <el-button
             size="mini"
-            type="danger"
-            @click="handleDelete(scope.row.id)">删除</el-button>
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['product:brand:remove']"
+          >删除</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="nam">
+          <el-input v-model="form.nam" placeholder="请输入品牌名称" />
+        </el-form-item>
+        <el-form-item label="LOGO" prop="logo">
+          <image-upload v-model="form.logo" :limit="1" :is-show-tip="false"/>
+        </el-form-item>
+        <el-form-item label="是否启用" prop="start">
+          <el-radio-group v-model="form.start">
+            <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="介绍">
+          <editor v-model="form.introduction" :min-height="192"/>
+        </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, addInfo, delInfo,updateInfo} from "@/api/product/info";
+import { listInfo } from "@/api/product/info";
 
 export default {
-  name: "info",
+  name: "Brand",
+  dicts: ['sys_yes_no'],
   data() {
     return {
-      dialogTableVisible: false,
-      dialogFormVisible: false,
-      formLabelWidth: '120px',
-      brandName: null,
-      options: [{
-        value: '',
-        label: '',
-        children: [{
-          value: '',
-          label: '',
-        }]
-      }],
-      brand: [],
-      queryProductReq: {
-        pageNum: 1,
-        pageSize: 10
-      },
-      arr: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 品牌信息表格数据
+      brandList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        bookName: null,
+        logo: null,
+        start: null,
+        introduction: null,
       },
-      productVo: {}
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        nam: [
+          { required: true, message: "品牌名称不能为空", trigger: "blur" }
+        ],
+        logo: [
+          { required: true, message: "LOGO不能为空", trigger: "blur" }
+        ],
+        start: [
+          { required: true, message: "是否启用不能为空", trigger: "change" }
+        ],
+        createBy: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+      }
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    /**删除**/
-    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(() => {
-        // 用户点击了取消按钮，不执行任何操作
+    /** 查询信息列表 */
+    getList() {
+      this.loading = true;
+      listInfo(this.queryParams).then(response => {
+        this.brandList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
       });
     },
-    /** 查询商品列表 */
-    getList() {
-      listInfo(this.queryProductReq).then(
-        response => {
-          console.log(response)
-          this.arr = response.data.list
-        }
-      )
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        bookName: null,
+        logo: null,
+        start: null,
+        introduction: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -216,16 +246,67 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId)
-      this.single = selection.length != 1
+      this.ids = selection.map(item => item.id)
+      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
+      getBrand(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) {
+            updateBrand(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBrand(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 delBrand(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('product/brand/export', {
+        ...this.queryParams
+      }, `brand_${new Date().getTime()}.xlsx`)
+    }
   }
 };
 </script>