diff --git a/src/api/product/attribute.js b/src/api/product/attribute.js
index 948166e..bc66f29 100644
--- a/src/api/product/attribute.js
+++ b/src/api/product/attribute.js
@@ -29,7 +29,7 @@ export function addAttribute(data) {
 // 修改商品属性
 export function updateAttribute(data) {
   return request({
-    url: '/product/attribute',
+    url: '/product/attribute/'+data.id,
     method: 'put',
     data: data
   })
diff --git a/src/api/product/attributeGroup.js b/src/api/product/attributeGroup.js
index 97500df..22544a2 100644
--- a/src/api/product/attributeGroup.js
+++ b/src/api/product/attributeGroup.js
@@ -29,7 +29,7 @@ export function addAttributeGroup(data) {
 // 修改属性组
 export function updateAttributeGroup(data) {
   return request({
-    url: '/product/attributeGroup',
+    url: '/product/attributeGroup/'+data.id,
     method: 'put',
     data: data
   })
diff --git a/src/api/product/brand.js b/src/api/product/brand.js
index 7221cc3..a3023a6 100644
--- a/src/api/product/brand.js
+++ b/src/api/product/brand.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询商品品牌列表
+// 查询品牌信息列表
 export function listBrand(query) {
   return request({
     url: '/product/brand/list',
@@ -9,7 +9,7 @@ export function listBrand(query) {
   })
 }
 
-// 查询商品品牌详细
+// 查询品牌信息详细
 export function getBrand(id) {
   return request({
     url: '/product/brand/' + id,
@@ -17,7 +17,7 @@ export function getBrand(id) {
   })
 }
 
-// 新增商品品牌
+// 新增品牌信息
 export function addBrand(data) {
   return request({
     url: '/product/brand',
@@ -26,16 +26,16 @@ export function addBrand(data) {
   })
 }
 
-// 修改商品品牌
+// 修改品牌信息
 export function updateBrand(data) {
   return request({
-    url: '/product/brand',
+    url: '/product/brand/'+data.id,
     method: 'put',
     data: data
   })
 }
 
-// 删除商品品牌
+// 删除品牌信息
 export function delBrand(id) {
   return request({
     url: '/product/brand/' + id,
diff --git a/src/api/product/category.js b/src/api/product/category.js
index d6ef8a4..889eebe 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -17,6 +17,14 @@ export function getCategory(id) {
   })
 }
 
+// 查询品类信息详细
+export function parentCommonElement(id) {
+  return request({
+    url: '/product/category/parentCommonElement/' + id,
+    method: 'get'
+  })
+}
+
 // 新增品类信息
 export function addCategory(data) {
   return request({
@@ -29,7 +37,7 @@ export function addCategory(data) {
 // 修改品类信息
 export function updateCategory(data) {
   return request({
-    url: '/product/category',
+    url: '/product/category/'+data.id,
     method: 'put',
     data: data
   })
diff --git a/src/api/product/comment.js b/src/api/product/comment.js
index c1fe87e..4c19aae 100644
--- a/src/api/product/comment.js
+++ b/src/api/product/comment.js
@@ -29,7 +29,7 @@ export function addComment(data) {
 // 修改商品评论
 export function updateComment(data) {
   return request({
-    url: '/product/comment',
+    url: '/product/comment/'+data.id,
     method: 'put',
     data: data
   })
diff --git a/src/api/product/info.js b/src/api/product/info.js
index 00f7037..80b02c2 100644
--- a/src/api/product/info.js
+++ b/src/api/product/info.js
@@ -29,7 +29,7 @@ export function addInfo(data) {
 // 修改商品信息
 export function updateInfo(data) {
   return request({
-    url: '/product/info',
+    url: '/product/info/'+data.id,
     method: 'put',
     data: data
   })
diff --git a/src/api/product/rule.js b/src/api/product/rule.js
index 18dacc1..f2de650 100644
--- a/src/api/product/rule.js
+++ b/src/api/product/rule.js
@@ -29,7 +29,7 @@ export function addRule(data) {
 // 修改商品规格
 export function updateRule(data) {
   return request({
-    url: '/product/rule',
+    url: '/product/rule/'+data.id,
     method: 'put',
     data: data
   })
diff --git a/src/views/product/attributeGroup/index.vue b/src/views/product/attributeGroup/index.vue
index d663ac9..b9d3caf 100644
--- a/src/views/product/attributeGroup/index.vue
+++ b/src/views/product/attributeGroup/index.vue
@@ -9,8 +9,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+      <el-form-item label="状态" prop="states">
+        <el-select v-model="queryParams.states" placeholder="请选择状态" clearable>
           <el-option
             v-for="dict in dict.type.sys_yes_no"
             :key="dict.value"
@@ -73,11 +73,17 @@
 
     <el-table v-loading="loading" :data="attributeGroupList" @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="status">
+      <el-table-column label="组内属性" align="center" prop="attributeInfoList" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
+          <el-tag v-for="attributeInfo in scope.row.attributeInfoList">
+            {{attributeInfo.name}}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="states">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.states"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
@@ -112,7 +118,6 @@
     <!-- 添加或修改属性组对话框 -->
     <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">
@@ -120,8 +125,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="状态" prop="status">
-              <el-radio-group v-model="form.status">
+            <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"
@@ -136,6 +141,7 @@
             <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
           </el-form-item>
         </el-row>
+
         <el-row>
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -146,9 +152,9 @@
                 <span>已选择属性</span>
               </div>
               <el-row>
-                <el-col :span="2" v-for="(attribute,index) in attributeList">
-                  <el-tag v-if="checkedList.indexOf(attribute.id) > -1"
-                    style="margin: 0 10px"
+                <el-col :span="2" v-for="(attribute, index) in checkedAttributeList">
+                  <el-tag
+                    style="margin: 5px 10px"
                     :key="attribute.name"
                     closable @close="removeChecked(index)">
                     {{attribute.name}}
@@ -157,42 +163,42 @@
               </el-row>
             </el-card>
             <el-divider></el-divider>
-          <el-card class="box-card">
-            <div slot="header" class="clearfix">
-              <span>未选择属性</span>
-            </div>
-            <el-row>
-              <el-form :inline="true" :model="attributeQuery" class="demo-form-inline">
-                <el-form-item label="属性编码">
-                  <el-input v-model="attributeQuery.code" placeholder="属性编码">
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="属性名称">
-                  <el-input v-model="attributeQuery.name" placeholder="属性名称"></el-input>
-                </el-form-item>
-                <el-form-item>
-                  <el-button type="primary" @click="queryAttribute">查询</el-button>
-                </el-form-item>
-              </el-form>
-            </el-row>
-           <el-row>
-             <el-col style="padding: 5px 10px" :span="3" v-for="attribute in attributeList" >
-               <el-checkbox
-                 v-model="checkedList"
-                 :key="attribute.id"
-                 :value="attribute.id"
-                 :label="attribute.id"
-                 border>{{attribute.name}}</el-checkbox>
-             </el-col>
-           </el-row>
-            <pagination
-              v-show="total>0"
-              :total="total"
-              :page.sync="attributeQuery.pageNum"
-              :limit.sync="attributeQuery.pageSize"
-              @pagination="queryAttribute"
-            />
-          </el-card>
+            <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                <span>未选属性</span>
+              </div>
+              <el-row>
+                <el-form :inline="true" :model="attributeQuery" class="demo-form-inline">
+                  <el-form-item label="属性编码">
+                    <el-input v-model="attributeQuery.code" placeholder="属性编码"></el-input>
+                  </el-form-item>
+                  <el-form-item label="属性名称">
+                    <el-input v-model="attributeQuery.name" placeholder="属性名称"></el-input>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button type="primary" @click="queryAttribute">查询</el-button>
+                  </el-form-item>
+                </el-form>
+              </el-row>
+              <el-row>
+                <el-col style="padding: 5px 10px" :span="3" v-for="attribute in attributeList" >
+                  <el-checkbox
+                    v-model="form.attributeIdList"
+                    :key="attribute.id"
+                    :value="attribute.id"
+                    :label="attribute.id"
+                    @change="checkedAttribute(attribute)"
+                    border>{{attribute.name}}</el-checkbox>
+                </el-col>
+              </el-row>
+              <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="attributeQuery.pageNum"
+                :limit.sync="attributeQuery.pageSize"
+                @pagination="queryAttribute"
+              />
+            </el-card>
           </el-card>
         </el-row>
       </el-form>
@@ -236,26 +242,25 @@ export default {
         pageNum: 1,
         pageSize: 10,
         name: null,
-        status: null,
+        states: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" }
+        name: [
+          { required: true, message: "组名称不能为空", trigger: "blur" }
         ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        states: [
+          { required: true, message: "状态不能为空", trigger: "change" }
         ],
       },
       tags: [
-        { name: '标签一'},
-        { name: '标签二'}
+        { name: '标签一' },
+        { name: '标签二' }
       ],
-
-      checkedList:[],
-      attributeQuery:{
+      checkedAttributeList: [],
+      attributeQuery: {
         pageNum: 1,
         pageSize: 10,
         code: null,
@@ -269,11 +274,30 @@ export default {
     this.getList();
   },
   methods: {
-
+    /**
+     * 选中值触发方法
+     */
+    checkedAttribute(attribute){
+      let isCheck = this.form.attributeIdList.indexOf(attribute.id) > -1;
+      if (isCheck){
+        this.checkedAttributeList.push(attribute);
+      }else {
+        // 删除
+        this.checkedAttributeList.splice(
+          this.checkedAttributeList.indexOf(attribute), 1
+        )
+      }
+    },
+    /**
+     * 删除选中值
+     * @param index
+     */
     removeChecked(index){
       console.log(index)
-      this.checkedList.splice(index-1,1)
+      this.checkedAttributeList.splice(index, 1);
+      this.form.attributeIdList.splice(index, 1);
     },
+
     /**
      * 查询属性
      */
@@ -303,13 +327,11 @@ export default {
       this.form = {
         id: null,
         name: null,
-        status: null,
+        states: null,
         remark: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
+        attributeIdList: [],
       };
+      this.checkedAttributeList = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -333,7 +355,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加属性组";
-      this.queryAttribute()
+      this.queryAttribute();
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
diff --git a/src/views/product/brand/index.vue b/src/views/product/brand/index.vue
index cd3f067..d257347 100644
--- a/src/views/product/brand/index.vue
+++ b/src/views/product/brand/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="品牌名称" prop="name">
+      <el-form-item label="品牌名称" prop="nam">
         <el-input
-          v-model="queryParams.name"
+          v-model="queryParams.nam"
           placeholder="请输入品牌名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -80,7 +80,7 @@
     <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="nam" />
       <el-table-column label="Logo" align="center" prop="logo" width="100">
         <template slot-scope="scope">
           <image-preview :src="scope.row.logo" :width="50" :height="50"/>
@@ -130,8 +130,8 @@
     <!-- 添加或修改商品品牌对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" 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 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"/>
@@ -190,7 +190,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        name: null,
+        nam: null,
         logo: null,
         introduction: null,
         start: null,
@@ -230,7 +230,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        name: null,
+        nam: null,
         logo: null,
         introduction: null,
         start: null,
diff --git a/src/views/product/category/index.vue b/src/views/product/category/index.vue
index bdf0ad1..c09dc5e 100644
--- a/src/views/product/category/index.vue
+++ b/src/views/product/category/index.vue
@@ -88,7 +88,7 @@
       </el-table-column>
       <el-table-column label="父级品类" align="center" prop="parentId" />
       <el-table-column label="是否启用" align="center" prop="start" />
-      <el-table-column label="介绍" align="center" prop="introductoin" />
+      <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">
@@ -121,20 +121,27 @@
     <!-- 添加或修改品类信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="父级品类" prop="parentId">
+        <treeselect v-model="form.parentId" :options="categoryOptions" :normalizer="normalizer" 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="image">
           <image-upload v-model="form.image"/>
         </el-form-item>
-        <el-form-item label="父级品类" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请输入父级品类" />
-        </el-form-item>
         <el-form-item label="是否启用" prop="start">
           <el-input v-model="form.start" placeholder="请输入是否启用" />
+          <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="介绍" prop="introductoin">
-          <el-input v-model="form.introductoin" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="介绍" prop="introduction">
+          <el-input v-model="form.introduction" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
@@ -153,6 +160,7 @@ import { listCategory, getCategory, delCategory, addCategory, updateCategory } f
 
 export default {
   name: "Category",
+  dicts: ['sys_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -169,6 +177,8 @@ export default {
       total: 0,
       // 品类信息表格数据
       categoryList: [],
+      // 品类信息树选项
+      categoryOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -181,7 +191,7 @@ export default {
         image: null,
         parentId: null,
         start: null,
-        introductoin: null,
+        introduction: null,
       },
       // 表单参数
       form: {},
@@ -221,6 +231,26 @@ export default {
         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().then(response => {
+        this.categoryOptions = [];
+        const data = { id: 0, name: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "id", "parentId");
+        this.categoryOptions.push(data);
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -234,7 +264,7 @@ export default {
         image: null,
         parentId: null,
         start: null,
-        introductoin: null,
+        introduction: null,
         remark: null,
         createBy: null,
         createTime: null,