diff --git a/src/components/CheckAttribute/index.vue b/src/components/CheckAttribute/index.vue
index 5b20ab3..6854f53 100644
--- a/src/components/CheckAttribute/index.vue
+++ b/src/components/CheckAttribute/index.vue
@@ -99,7 +99,9 @@ export default {
   data() {
     return {
       attributeIdList: [],
+      // 选中集合
       checkedAttributeList: [],
+      // 未选属性的查询参数
       attributeQuery: {
         pageNum: 1,
         pageSize: 10,
@@ -107,6 +109,7 @@ export default {
         name: null
       },
       attributeTotal: 0,
+      // 查询出来未选属性的结果
       attributeList: []
     }
   },
diff --git a/src/views/product/attributeGroup/index.vue b/src/views/product/attributeGroup/index.vue
index 4a3b7df..bba261f 100644
--- a/src/views/product/attributeGroup/index.vue
+++ b/src/views/product/attributeGroup/index.vue
@@ -141,7 +141,7 @@
             <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
           </el-form-item>
         </el-row>
-        <CheckAttribute v-model="form.attributeIdList"/>
+        <CheckAttribute v-model="form.attributeIdList" :checked-list="form.attributeList"/>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -258,6 +258,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改属性组";
+        console.log(this.form)
       });
     },
     /** 提交按钮 */
diff --git a/src/views/product/category/index.vue b/src/views/product/category/index.vue
index 977dd35..a34efa5 100644
--- a/src/views/product/category/index.vue
+++ b/src/views/product/category/index.vue
@@ -244,7 +244,8 @@ export default {
   watch: {
     'form.parentId': {
       handler(val){
-        if (val !== undefined && val !== 0){
+        console.log('form.parentId', this.form);
+        if (val !== undefined && val !== null && val !== 0 && this.form.id === null){
           parentCommonElement(val).then(response => {
             this.attributeInfoList = response.data.attributeInfoList;
             this.attributeGroupList = response.data.attributeGroupList;
@@ -342,11 +343,18 @@ export default {
     handleUpdate(row) {
       this.reset();
       this.getTreeselect();
-      if (row != null) {
-        this.form.parentId = row.parentId;
-      }
+
       getCategory(row.id).then(response => {
         this.form = response.data;
+        if (row != null) {
+          this.form.parentId = row.parentId;
+        }
+        console.log(row)
+        parentCommonElement(row.id).then(response => {
+          this.attributeInfoList = response.data.attributeInfoList;
+          this.attributeGroupList = response.data.attributeGroupList;
+          this.brandInfoList = response.data.brandInfoList;
+        })
         this.open = true;
         this.title = "修改品类信息";
       });
diff --git a/src/views/product/info/index.vue b/src/views/product/info/index.vue
index 5e8c755..2505d3c 100644
--- a/src/views/product/info/index.vue
+++ b/src/views/product/info/index.vue
@@ -509,7 +509,6 @@ export default {
             this.categoryCommonElement.attributeList = attributeList;
           })
         }
-
       }
     }
   },
@@ -723,6 +722,12 @@ export default {
       const id = row.id || this.ids
       getInfo(id).then(response => {
         this.form = response.data;
+        this.categoryOptionValue = [
+          this.form.mianType,
+          this.form.parentType,
+          this.form.type
+        ];
+
         this.open = true;
         this.title = "修改商品信息";
       });