diff --git a/src/api/bookInfo/book.js b/src/api/bookInfo/book.js
deleted file mode 100644
index 4101aa3..0000000
--- a/src/api/bookInfo/book.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询列表
-export function listInfo(query) {
-  return request({
-    url: '/system/info/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询详细
-export function getInfo(id) {
-  return request({
-    url: '/system/info/' + id,
-    method: 'get'
-  })
-}
-
-// 新增
-export function addInfo(data) {
-  return request({
-    url: '/system/info',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改
-export function updateInfo(data) {
-  return request({
-    url: '/system/info',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除
-export function delInfo(id) {
-  return request({
-    url: '/system/info/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/api/product/address.js b/src/api/product/address.js
new file mode 100644
index 0000000..fb06cab
--- /dev/null
+++ b/src/api/product/address.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询地区列表
+export function listAddress(query) {
+  return request({
+    url: '/product/address/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询地区详细
+export function getAddress(id) {
+  return request({
+    url: '/product/address/' + id,
+    method: 'get'
+  })
+}
+
+// 新增地区
+export function addAddress(data) {
+  return request({
+    url: '/product/address',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改地区
+export function updateAddress(data) {
+  return request({
+    url: '/product/address',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除地区
+export function delAddress(id) {
+  return request({
+    url: '/product/address/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/as_attribute_group.js b/src/api/product/as_attribute_group.js
new file mode 100644
index 0000000..7e18542
--- /dev/null
+++ b/src/api/product/as_attribute_group.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询属性组中间列表
+export function listAs_attribute_group(query) {
+  return request({
+    url: '/product/as_attribute_group/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询属性组中间详细
+export function getAs_attribute_group(id) {
+  return request({
+    url: '/product/as_attribute_group/' + id,
+    method: 'get'
+  })
+}
+
+// 新增属性组中间
+export function addAs_attribute_group(data) {
+  return request({
+    url: '/product/as_attribute_group',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改属性组中间
+export function updateAs_attribute_group(data) {
+  return request({
+    url: '/product/as_attribute_group',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除属性组中间
+export function delAs_attribute_group(id) {
+  return request({
+    url: '/product/as_attribute_group/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/attribute.js b/src/api/product/attribute.js
new file mode 100644
index 0000000..fef7f30
--- /dev/null
+++ b/src/api/product/attribute.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询属性列表
+export function listAttribute(query) {
+  return request({
+    url: '/product/attribute/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询属性详细
+export function getAttribute(id) {
+  return request({
+    url: '/product/attribute/' + id,
+    method: 'get'
+  })
+}
+
+// 新增属性
+export function addAttribute(data) {
+  return request({
+    url: '/product/attribute',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改属性
+export function updateAttribute(data) {
+  return request({
+    url: '/product/attribute',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除属性
+export function delAttribute(id) {
+  return request({
+    url: '/product/attribute/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/attribute_group.js b/src/api/product/attribute_group.js
new file mode 100644
index 0000000..388ca63
--- /dev/null
+++ b/src/api/product/attribute_group.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询属性组列表
+export function listGroup(query) {
+  return request({
+    url: '/product/group/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询属性组详细
+export function getGroup(id) {
+  return request({
+    url: '/product/group/' + id,
+    method: 'get'
+  })
+}
+
+// 新增属性组
+export function addGroup(data) {
+  return request({
+    url: '/product/group',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改属性组
+export function updateGroup(data) {
+  return request({
+    url: '/product/group',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除属性组
+export function delGroup(id) {
+  return request({
+    url: '/product/group/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/brand.js b/src/api/product/brand.js
new file mode 100644
index 0000000..cbdde93
--- /dev/null
+++ b/src/api/product/brand.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询品牌列表
+export function listBrand(query) {
+  return request({
+    url: '/product/brand/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询品牌详细
+export function getBrand(id) {
+  return request({
+    url: '/product/brand/' + id,
+    method: 'get'
+  })
+}
+
+// 新增品牌
+export function addBrand(data) {
+  return request({
+    url: '/product/brand',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改品牌
+export function updateBrand(data) {
+  return request({
+    url: '/product/brand',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品牌
+export function delBrand(id) {
+  return request({
+    url: '/product/brand/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/category_attribute.js b/src/api/product/category_attribute.js
new file mode 100644
index 0000000..52e549e
--- /dev/null
+++ b/src/api/product/category_attribute.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询品类属性中间列表
+export function listCategory_attribute(query) {
+  return request({
+    url: '/product/category_attribute/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询品类属性中间详细
+export function getCategory_attribute(id) {
+  return request({
+    url: '/product/category_attribute/' + id,
+    method: 'get'
+  })
+}
+
+// 新增品类属性中间
+export function addCategory_attribute(data) {
+  return request({
+    url: '/product/category_attribute',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改品类属性中间
+export function updateCategory_attribute(data) {
+  return request({
+    url: '/product/category_attribute',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品类属性中间
+export function delCategory_attribute(id) {
+  return request({
+    url: '/product/category_attribute/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/category_attribute_group.js b/src/api/product/category_attribute_group.js
new file mode 100644
index 0000000..746ffe3
--- /dev/null
+++ b/src/api/product/category_attribute_group.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询品类属性组中间列表
+export function listCategory_attribute_group(query) {
+  return request({
+    url: '/product/category_attribute_group/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询品类属性组中间详细
+export function getCategory_attribute_group(id) {
+  return request({
+    url: '/product/category_attribute_group/' + id,
+    method: 'get'
+  })
+}
+
+// 新增品类属性组中间
+export function addCategory_attribute_group(data) {
+  return request({
+    url: '/product/category_attribute_group',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改品类属性组中间
+export function updateCategory_attribute_group(data) {
+  return request({
+    url: '/product/category_attribute_group',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品类属性组中间
+export function delCategory_attribute_group(id) {
+  return request({
+    url: '/product/category_attribute_group/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/category_brand.js b/src/api/product/category_brand.js
new file mode 100644
index 0000000..b0d52ed
--- /dev/null
+++ b/src/api/product/category_brand.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询品牌品类中间列表
+export function listCategory_brand(query) {
+  return request({
+    url: '/product/category_brand/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询品牌品类中间详细
+export function getCategory_brand(id) {
+  return request({
+    url: '/product/category_brand/' + id,
+    method: 'get'
+  })
+}
+
+// 新增品牌品类中间
+export function addCategory_brand(data) {
+  return request({
+    url: '/product/category_brand',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改品牌品类中间
+export function updateCategory_brand(data) {
+  return request({
+    url: '/product/category_brand',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品牌品类中间
+export function delCategory_brand(id) {
+  return request({
+    url: '/product/category_brand/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/category_info.js b/src/api/product/category_info.js
new file mode 100644
index 0000000..0a0c3ba
--- /dev/null
+++ b/src/api/product/category_info.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询品类信息列表
+export function listCategory_info(query) {
+  return request({
+    url: '/product/category_info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询品类信息详细
+export function getCategory_info(id) {
+  return request({
+    url: '/product/category_info/' + id,
+    method: 'get'
+  })
+}
+
+// 新增品类信息
+export function addCategory_info(data) {
+  return request({
+    url: '/product/category_info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改品类信息
+export function updateCategory_info(data) {
+  return request({
+    url: '/product/category_info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品类信息
+export function delCategory_info(id) {
+  return request({
+    url: '/product/category_info/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/product_attrbute.js b/src/api/product/product_attrbute.js
new file mode 100644
index 0000000..5ced811
--- /dev/null
+++ b/src/api/product/product_attrbute.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询商品属性中间表列表
+export function listProduct(query) {
+  return request({
+    url: '/product/product/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商品属性中间表详细
+export function getProduct(id) {
+  return request({
+    url: '/product/product/' + id,
+    method: 'get'
+  })
+}
+
+// 新增商品属性中间表
+export function addProduct(data) {
+  return request({
+    url: '/product/product',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改商品属性中间表
+export function updateProduct(data) {
+  return request({
+    url: '/product/product',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商品属性中间表
+export function delProduct(id) {
+  return request({
+    url: '/product/product/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/product_category.js b/src/api/product/product_category.js
new file mode 100644
index 0000000..16f9188
--- /dev/null
+++ b/src/api/product/product_category.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询品类商品中间列表
+export function listProduct_category(query) {
+  return request({
+    url: '/product/product_category/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询品类商品中间详细
+export function getProduct_category(id) {
+  return request({
+    url: '/product/product_category/' + id,
+    method: 'get'
+  })
+}
+
+// 新增品类商品中间
+export function addProduct_category(data) {
+  return request({
+    url: '/product/product_category',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改品类商品中间
+export function updateProduct_category(data) {
+  return request({
+    url: '/product/product_category',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品类商品中间
+export function delProduct_category(id) {
+  return request({
+    url: '/product/product_category/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/product_info.js b/src/api/product/product_info.js
new file mode 100644
index 0000000..0312c2f
--- /dev/null
+++ b/src/api/product/product_info.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询商品;列表
+export function listProduct_info(query) {
+  return request({
+    url: '/product/product/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商品;详细
+export function getProduct_info(id) {
+  return request({
+    url: '/product/product/' + id,
+    method: 'get'
+  })
+}
+
+// 新增商品;
+export function addProduct_info(data) {
+  return request({
+    url: '/product/product',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改商品;
+export function updateProduct_info(data) {
+  return request({
+    url: '/product/product',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商品;
+export function delProduct_info(id) {
+  return request({
+    url: '/product/product/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/product/rule.js b/src/api/product/rule.js
new file mode 100644
index 0000000..286f28d
--- /dev/null
+++ b/src/api/product/rule.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询规格列表
+export function listRule(query) {
+  return request({
+    url: '/product/rule/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询规格详细
+export function getRule(id) {
+  return request({
+    url: '/product/rule/' + id,
+    method: 'get'
+  })
+}
+
+// 新增规格
+export function addRule(data) {
+  return request({
+    url: '/product/rule',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改规格
+export function updateRule(data) {
+  return request({
+    url: '/product/rule',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除规格
+export function delRule(id) {
+  return request({
+    url: '/product/rule/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/system/book.js b/src/api/system/book.js
deleted file mode 100644
index 4101aa3..0000000
--- a/src/api/system/book.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询列表
-export function listInfo(query) {
-  return request({
-    url: '/system/info/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询详细
-export function getInfo(id) {
-  return request({
-    url: '/system/info/' + id,
-    method: 'get'
-  })
-}
-
-// 新增
-export function addInfo(data) {
-  return request({
-    url: '/system/info',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改
-export function updateInfo(data) {
-  return request({
-    url: '/system/info',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除
-export function delInfo(id) {
-  return request({
-    url: '/system/info/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/views/product/address/index.vue b/src/views/product/address/index.vue
new file mode 100644
index 0000000..be7744c
--- /dev/null
+++ b/src/views/product/address/index.vue
@@ -0,0 +1,273 @@
+<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="addressName">
+        <el-input
+          v-model="queryParams.addressName"
+          placeholder="请输入地区名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="子级地区" prop="sonId">
+        <el-input
+          v-model="queryParams.sonId"
+          placeholder="请输入子级地区"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+	    <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:address:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="addressList"
+      row-key="sonId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="地区名" prop="addressName" />
+      <el-table-column label="子级地区" align="center" prop="sonId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['product:address:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['product:address:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['product:address:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改地区对话框 -->
+    <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="addressName">
+          <el-input v-model="form.addressName" placeholder="请输入地区名" />
+        </el-form-item>
+        <el-form-item label="子级地区" prop="sonId">
+          <el-input v-model="form.sonId" 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 { listAddress, getAddress, delAddress, addAddress, updateAddress } from "@/api/product/address";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Address",
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 地区表格数据
+      addressList: [],
+      // 地区树选项
+      addressOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        addressName: null,
+        sonId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        addressName: [
+          { required: true, message: "地区名不能为空", trigger: "blur" }
+        ],
+        sonId: [
+          { required: true, message: "子级地区不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询地区列表 */
+    getList() {
+      this.loading = true;
+      listAddress(this.queryParams).then(response => {
+        this.addressList = this.handleTree(response.data, "sonId", "id");
+        this.loading = false;
+      });
+    },
+    /** 转换地区数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.sonId,
+        label: node.addressName,
+        children: node.children
+      };
+    },
+	/** 查询地区下拉树结构 */
+    getTreeselect() {
+      listAddress().then(response => {
+        this.addressOptions = [];
+        const data = { sonId: 0, addressName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "sonId", "id");
+        this.addressOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        addressName: null,
+        sonId: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.sonId) {
+        this.form.id = row.sonId;
+      } else {
+        this.form.id = 0;
+      }
+      this.open = true;
+      this.title = "添加地区";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.id = row.sonId;
+      }
+      getAddress(row.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) {
+            updateAddress(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAddress(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除地区编号为"' + row.id + '"的数据项？').then(function() {
+        return delAddress(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/product/attribute/index.vue b/src/views/product/attribute/index.vue
new file mode 100644
index 0000000..5c5d8f7
--- /dev/null
+++ b/src/views/product/attribute/index.vue
@@ -0,0 +1,273 @@
+<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="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入属性编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="属性名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入属性名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <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:attribute: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:attribute: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:attribute: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:attribute:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="attributeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="属性编码" align="center" prop="code" />
+      <el-table-column label="属性名" align="center" prop="name" />
+      <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"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['product:attribute:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['product:attribute: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="code">
+          <el-input v-model="form.code" placeholder="请输入属性编码" />
+        </el-form-item>
+        <el-form-item label="属性名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入属性名" />
+        </el-form-item>
+        <el-form-item label="说明" prop="remark">
+          <el-input v-model="form.remark" 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 { listAttribute, getAttribute, delAttribute, addAttribute, updateAttribute } from "@/api/product/attribute";
+
+export default {
+  name: "Attribute",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 属性表格数据
+      attributeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        code: null,
+        name: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        code: [
+          { required: true, message: "属性编码不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "属性名不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询属性列表 */
+    getList() {
+      this.loading = true;
+      listAttribute(this.queryParams).then(response => {
+        this.attributeList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        code: null,
+        name: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      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
+      getAttribute(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) {
+            updateAttribute(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAttribute(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 delAttribute(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('product/attribute/export', {
+        ...this.queryParams
+      }, `attribute_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/product/brand/index.vue b/src/views/product/brand/index.vue
new file mode 100644
index 0000000..fa69933
--- /dev/null
+++ b/src/views/product/brand/index.vue
@@ -0,0 +1,321 @@
+<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-input
+          v-model="queryParams.name"
+          placeholder="请输入品牌名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="品牌启用" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择品牌启用" clearable>
+          <el-option
+            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="addressName">
+        <el-input
+          v-model="queryParams.addressName"
+          placeholder="请输入公司地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <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 v-loading="loading" :data="brandList" @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="logo" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.logo" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="描述" align="center" prop="introduction" />
+      <el-table-column label="品牌启用" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="公司地址" align="center" prop="addressName" />
+      <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"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['product:brand:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            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>
+      {{this.form}}
+      <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="图像标识" prop="logo">
+          <image-upload v-model="form.logo"/>
+        </el-form-item>
+        <el-form-item label="描述" prop="introduction">
+          <el-input v-model="form.introduction" type="textarea" placeholder="请输入内容" />
+        </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="addressName">
+          <el-input v-model="form.addressName" 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 { listBrand, getBrand, delBrand, addBrand, updateBrand } from "@/api/product/brand";
+
+export default {
+  name: "Brand",
+  dicts: ['sys_yes_no'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 品牌表格数据
+      brandList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        logo: null,
+        introduction: null,
+        status: null,
+        addressName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "品牌名称不能为空", trigger: "blur" }
+        ],
+        logo: [
+          { required: true, message: "图像标识不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "品牌启用不能为空", trigger: "change" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询品牌列表 */
+    getList() {
+      this.loading = true;
+      listBrand(this.queryParams).then(response => {
+        this.brandList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        logo: null,
+        introduction: null,
+        status: null,
+        addressName: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      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>
diff --git a/src/views/product/categoryInfo/index.vue b/src/views/product/categoryInfo/index.vue
new file mode 100644
index 0000000..cde4f9f
--- /dev/null
+++ b/src/views/product/categoryInfo/index.vue
@@ -0,0 +1,310 @@
+<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-input
+          v-model="queryParams.name"
+          placeholder="请输入品类名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否启用" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择是否启用" clearable>
+          <el-option
+            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>
+	    <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:category_info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="category_infoList"
+      row-key="id"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="品类名称" prop="name" />
+      <el-table-column label="图片" align="center" prop="image" width="100">
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.image" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="父级品类" align="center" prop="parentId" />
+      <el-table-column label="是否启用" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <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"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['product:category_info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['product:category_info:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['product:category_info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改品类信息对话框 -->
+    <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="图片" prop="image">
+          <image-upload v-model="form.image"/>
+        </el-form-item>
+        <el-form-item label="父级品类" prop="parentId">
+          <treeselect v-model="form.parentId" :options="category_infoOptions" :normalizer="normalizer" placeholder="请选择父级品类" />
+        </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="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 { listCategory_info, getCategory_info, delCategory_info, addCategory_info, updateCategory_info } from "@/api/product/category_info";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Category_info",
+  dicts: ['sys_yes_no'],
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 品类信息表格数据
+      category_infoList: [],
+      // 品类信息树选项
+      category_infoOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        name: null,
+        image: null,
+        parentId: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "品类名称不能为空", trigger: "blur" }
+        ],
+        parentId: [
+          { required: true, message: "父级品类不能为空", trigger: "change" }
+        ],
+        status: [
+          { required: true, message: "是否启用不能为空", trigger: "change" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询品类信息列表 */
+    getList() {
+      this.loading = true;
+      listCategory_info(this.queryParams).then(response => {
+        this.category_infoList = this.handleTree(response.data, "id", "parentId");
+        this.loading = false;
+      });
+    },
+    /** 转换品类信息数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    },
+	/** 查询品类信息下拉树结构 */
+    getTreeselect() {
+      listCategory_info().then(response => {
+        this.category_infoOptions = [];
+        const data = { id: 0, name: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "id", "parentId");
+        this.category_infoOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        image: null,
+        parentId: null,
+        status: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.id) {
+        this.form.parentId = row.id;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加品类信息";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.id;
+      }
+      getCategory_info(row.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) {
+            updateCategory_info(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCategory_info(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除品类信息编号为"' + row.id + '"的数据项？').then(function() {
+        return delCategory_info(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/product/group/index.vue b/src/views/product/group/index.vue
new file mode 100644
index 0000000..2a8c3d1
--- /dev/null
+++ b/src/views/product/group/index.vue
@@ -0,0 +1,360 @@
+<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="states">
+        <el-form-item label="状态" prop="states">
+          <el-select v-model="queryParams.states" placeholder="请选择状态" clearable>
+            <el-option
+              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>
+      <el-form-item>
+        <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:group: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:group: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:group: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:group:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="groupList" @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="name" />
+      <el-table-column label="状态" align="center" prop="states">
+        <template slot-scope="scope">
+          <dict-attribute :options="dict.type.sys_yes_no" :value="scope.row.states"/>
+        </template>
+      </el-table-column>
+      <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"
+            type="text"
+            icon ="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['product:group:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['product:group: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-row>
+          <el-col :span="12">
+            <el-form-item label="组名" prop="name" >
+              <el-input v-model="form.name" type="text" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态" prop="states">
+              <el-radio-group v-model="form.states">
+                <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-col>
+        </el-row>
+        <el-row>
+          <el-col>
+            <el-form-item label="说明" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-card class="box-card" >
+            <div slot="header" class="clearfix">
+              <span>属性关联关系</span>
+            </div>
+            <el-card class="box-card"  >
+              <div slot="header" class="clearfix">
+                <span>已选属性</span>
+              </div>
+              <el-row :gutter="20" style="margin: 0 10px">
+                  <el-tag
+                    v-for="attribute in checkedAttribute"
+                    :key="attribute.id"
+                    closable
+                    @close="handleClose(attribute)">
+                    {{attribute.name}}
+                  </el-tag>
+
+              </el-row>
+
+            </el-card>
+            <el-divider></el-divider>
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>可选属性</span>
+            </div>
+            <el-checkbox-group
+              v-model="checkedAttribute">
+              <el-checkbox
+                v-for="attribute in attributeList"
+                :value="attribute"
+                :key="attribute.id"
+                :label="attribute"
+                @change="handleCheckedAttributeChange(attribute)"
+              >
+                {{attribute.name}}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-card>
+          </el-card>
+        </el-row>
+
+      </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 { listGroup, getGroup, delGroup, addGroup, updateGroup } from "@/api/product/attribute_group";
+import {listAttribute} from "@/api/product/attribute";
+
+export default {
+  name: "Group",
+  dicts: ['sys_yes_no'],
+  data() {
+    return {
+      inputVisible: false,
+      //已选属性数组
+      checkedAttribute: [],
+      //商品属性表
+      attributeList: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 属性组表格数据
+      groupList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        states: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "组名不能为空", trigger: "blur" }
+        ],
+        states: [
+          { required: true, message: "状态不能为空", trigger: "change" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    //属性复选框选择事件
+    handleCheckedAttributeChange(attribute){
+      console.log(this.checkedAttribute)
+      console.log(attribute)
+
+    },
+    //关闭标签
+    handleClose(attribute) {
+      this.checkedAttribute.splice(this.checkedAttribute.indexOf(attribute), 1);
+    },
+    /** 查询属性组列表 */
+    getList() {
+      this.loading = true;
+      listGroup(this.queryParams).then(response => {
+        this.groupList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 查询属性列表 */
+    getAttribute(){
+      listAttribute(this.queryParams).then(response => {
+        this.attributeList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        states: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.getAttribute();
+      this.reset();
+      this.open = true;
+      this.title = "添加属性组";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.getAttribute();
+      this.reset();
+      const id = row.id || this.ids
+      getGroup(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) {
+            updateGroup(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addGroup(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 delGroup(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('product/group/export', {
+        ...this.queryParams
+      }, `group_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/system/book/index.vue b/src/views/product/productInfo/index.vue
similarity index 54%
rename from src/views/system/book/index.vue
rename to src/views/product/productInfo/index.vue
index c612343..3733c8a 100644
--- a/src/views/system/book/index.vue
+++ b/src/views/product/productInfo/index.vue
@@ -1,49 +1,39 @@
 <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="title">
+      <el-form-item label="商品名" prop="name">
         <el-input
-          v-model="queryParams.title"
-          placeholder="请输入书名"
+          v-model="queryParams.name"
+          placeholder="请输入商品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="作者" prop="author">
+      <el-form-item label="商品信息" prop="introduction">
         <el-input
-          v-model="queryParams.author"
-          placeholder="请输入作者"
+          v-model="queryParams.introduction"
+          placeholder="请输入商品信息"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="说明" prop="remak">
+      <el-form-item label="品牌编号" prop="brandId">
         <el-input
-          v-model="queryParams.remak"
-          placeholder="请输入说明"
+          v-model="queryParams.brandId"
+          placeholder="请输入品牌编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="上架时间" prop="beginTime">
-        <div>
-          <el-date-picker
-            v-model="queryParams.beginTime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
-            placeholder="选择日期时间">
-          </el-date-picker>
-        </div>
-      </el-form-item>
-      <el-form-item label="上架时间" prop="endTime">
-        <div>
-          <el-date-picker
-            v-model="queryParams.endTime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetime"
-            placeholder="选择日期时间">
-          </el-date-picker>
-        </div>
+      <el-form-item label="商品状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择商品状态" clearable>
+          <el-option
+            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>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -59,7 +49,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:info:add']"
+          v-hasPermi="['product:product_info:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -70,7 +60,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:info:edit']"
+          v-hasPermi="['product:product_info:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -81,7 +71,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:info:remove']"
+          v-hasPermi="['product:product_info:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -91,26 +81,29 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:info:export']"
+          v-hasPermi="['product:product_info:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="bookList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="product_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="title" />
-      <el-table-column label="作者" align="center" prop="author" />
-      <el-table-column label="类型" align="center" prop="type" />
-      <el-table-column label="图片" 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="brandId" />
+      <el-table-column label="图片" align="center" prop="images" width="100">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.images" :height="50"  :width="50"/>
+          <image-preview :src="scope.row.images" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="说明" align="center" prop="remak" />
-      <el-table-column label="描述信息" align="center" prop="content" />
-      <el-table-column label="上架时间" align="center" prop="grounding" />
+      <el-table-column label="商品状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <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
@@ -118,14 +111,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:info:edit']"
+            v-hasPermi="['product:product_info:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:info:remove']"
+            v-hasPermi="['product:product_info:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -139,43 +132,46 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改system:info:对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <!-- 添加或修改商品;对话框 -->
+    <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="title">
-          <el-input v-model="form.title" placeholder="请输入书名" />
+        <el-form-item label="商品名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入商品名" />
         </el-form-item>
-        <el-form-item label="作者" prop="author">
-          <el-input v-model="form.author" placeholder="请输入作者" />
+        <el-form-item label="商品信息" prop="introduction">
+          <el-input v-model="form.introduction" placeholder="请输入商品信息" />
         </el-form-item>
-        <el-form-item label="类型" prop="type">
-          <el-radio-group v-model="form.type">
+        <el-form-item label="品牌编号" prop="brandId">
+          <el-input v-model="form.brandId" placeholder="请输入品牌编号" />
+        </el-form-item>
+        <el-form-item label="图片" prop="images">
+          <image-upload v-model="form.images"/>
+        </el-form-item>
+        <el-form-item label="商品状态" prop="status">
+          <el-radio-group v-model="form.status">
             <el-radio
-              v-for="dict in dict.type.book_type"
+              v-for="dict in dict.type.sys_yes_no"
               :key="dict.value"
-              :label="dict.value">
-              {{ dict.label }}
-            </el-radio>
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="图片上传" prop="images">
-          <image-upload v-model="form.images" :limit="1"></image-upload>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="说明" prop="remak">
-          <el-input v-model="form.remak" placeholder="请输入说明" />
+        <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="form.createdBy" placeholder="请输入创建人" />
         </el-form-item>
-        <el-form-item label="描述信息">
-          <editor v-model="form.content" :min-height="192"/>
+        <el-form-item label="创建时间" prop="createdTime">
+          <el-date-picker clearable
+            v-model="form.createdTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择创建时间">
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="上架时间" prop="grounding">
-          <div>
-            <el-date-picker
-              v-model="form.grounding"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetime"
-              placeholder="选择日期时间">
-            </el-date-picker>
-          </div>
+        <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="form.updatedBy" placeholder="请输入更新人" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -187,11 +183,11 @@
 </template>
 
 <script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/system/book";
+import { listProduct_info, getProduct_info, delProduct_info, addProduct_info, updateProduct_info } from "@/api/product/product_info";
 
 export default {
-  name: "Info",
-  dicts: ['book_type'],
+  name: "Product_info",
+  dicts: ['sys_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -206,8 +202,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // system:info:表格数据
-      bookList: [],
+      // 商品;表格数据
+      product_infoList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -216,35 +212,25 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        title: null,
-        author: null,
-        type: null,
+        name: null,
+        introduction: null,
+        brandId: null,
         images: null,
-        remak: null,
-        content: null,
-        grounding: null,
+        addressSend: null,
+        status: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        author: [
-          { required: true, message: "作者不能为空", trigger: "blur" }
+        name: [
+          { required: true, message: "商品名不能为空", trigger: "blur" }
         ],
-        type: [
-          { required: true, message: "类型不能为空", trigger: "change" }
+        introduction: [
+          { required: true, message: "商品信息不能为空", trigger: "blur" }
         ],
-        images: [
-          { required: true, message: "图片上传不能为空", trigger: "blur" }
-        ],
-        grounding: [
-          { required: true, message: "上架时间不能为空", trigger: "blur" }
-        ],
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        status: [
+          { required: true, message: "商品状态不能为空", trigger: "change" }
         ],
       }
     };
@@ -253,11 +239,11 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询system:info:列表 */
+    /** 查询商品;列表 */
     getList() {
       this.loading = true;
-      listInfo(this.queryParams).then(response => {
-        this.bookList = response.data.rows;
+      listProduct_info(this.queryParams).then(response => {
+        this.product_infoList = response.data.rows;
         this.total = response.data.total;
         this.loading = false;
       });
@@ -271,17 +257,17 @@ export default {
     reset() {
       this.form = {
         id: null,
-        title: null,
-        author: null,
-        type: null,
+        name: null,
+        introduction: null,
+        brandId: null,
         images: null,
-        remak: null,
-        content: null,
-        grounding: null,
-        createBy: null,
-        createTime: null,
-        updateTime: null,
-        updateBy: null
+        addressSend: null,
+        status: null,
+        remark: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updateTime: null
       };
       this.resetForm("form");
     },
@@ -305,16 +291,16 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加书籍";
+      this.title = "添加商品;";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
-      getInfo(id).then(response => {
+      getProduct_info(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改书籍";
+        this.title = "修改商品;";
       });
     },
     /** 提交按钮 */
@@ -322,13 +308,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateInfo(this.form).then(response => {
+            updateProduct_info(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addInfo(this.form).then(response => {
+            addProduct_info(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -340,8 +326,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then(function() {
-        return delInfo(ids);
+      this.$modal.confirm('是否确认删除商品;编号为"' + ids + '"的数据项？').then(function() {
+        return delProduct_info(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -349,9 +335,9 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/info/export', {
+      this.download('product/product_info/export', {
         ...this.queryParams
-      }, `book_${new Date().getTime()}.xlsx`)
+      }, `product_info_${new Date().getTime()}.xlsx`)
     }
   }
 };
diff --git a/src/views/product/rule/index.vue b/src/views/product/rule/index.vue
new file mode 100644
index 0000000..a979eae
--- /dev/null
+++ b/src/views/product/rule/index.vue
@@ -0,0 +1,257 @@
+<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-input
+          v-model="queryParams.name"
+          placeholder="请输入规格名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <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:rule: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:rule: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:rule: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:rule:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ruleList" @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="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['product:rule:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['product:rule: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="name">
+          <el-input v-model="form.name" 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 { listRule, getRule, delRule, addRule, updateRule } from "@/api/product/rule";
+
+export default {
+  name: "Rule",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 规格表格数据
+      ruleList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "规格名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询规格列表 */
+    getList() {
+      this.loading = true;
+      listRule(this.queryParams).then(response => {
+        this.ruleList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      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
+      getRule(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) {
+            updateRule(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRule(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 delRule(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('product/rule/export', {
+        ...this.queryParams
+      }, `rule_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/system/bookIndex/index.vue b/src/views/system/bookIndex/index.vue
deleted file mode 100644
index 2aff978..0000000
--- a/src/views/system/bookIndex/index.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
-  <div>
-    <h1>卡还是觉得</h1>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "BookIndex"
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index a15ef49..ff38a78 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -194,7 +194,7 @@ export default {
             parentMenuId: genTable.parentMenuId
           };
           updateGenTable(genTable).then(res => {
-            this.$modal.msgSuccess(res.data.msg);
+            this.$modal.msgSuccess(res.msg);
             if (res.code === 200) {
               this.close();
             }
diff --git a/vue.config.js b/vue.config.js
index dd8b15d..f122eba 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://localhost:18080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''