diff --git a/src/api/product/info.js b/src/api/product/info.js
index e15e6f7..c668d71 100644
--- a/src/api/product/info.js
+++ b/src/api/product/info.js
@@ -36,9 +36,9 @@ export function addInfo(data) {
 // 修改商品信息
 export function updateInfo(data) {
   return request({
-    url: '/product/info/'+data.id,
+    url: '/product/info/'+data.projectAddModel.id,
     method: 'put',
-    data: data
+    data: data.projectAddModel
   })
 }
 
diff --git a/src/views/product/attribute/index.vue b/src/views/product/attribute/index.vue
index d1b259f..479802a 100644
--- a/src/views/product/attribute/index.vue
+++ b/src/views/product/attribute/index.vue
@@ -218,6 +218,11 @@ export default {
       const id = row.id || this.ids
       getAttribute(id).then(response => {
         this.form = response.data;
+         this.categoryOptionValue=[
+          this.form.mianType,
+          this.form.parentType,
+          this.form.type
+          ];
         this.open = true;
         this.title = "修改商品属性";
       });
diff --git a/src/views/product/attributeGroup/index.vue b/src/views/product/attributeGroup/index.vue
index bba261f..e33a25f 100644
--- a/src/views/product/attributeGroup/index.vue
+++ b/src/views/product/attributeGroup/index.vue
@@ -83,7 +83,14 @@
       </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"/>
+          <el-switch
+            v-model="scope.row.states"
+            active-text="Y"
+            inactive-text="N"
+            active-value="Y"
+            inactive-value="N"
+            @change="changeing(scope.row)"
+          ></el-switch>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
@@ -153,8 +160,8 @@
 
 <script>
 import { listAttributeGroup, getAttributeGroup, delAttributeGroup, addAttributeGroup, updateAttributeGroup } from "@/api/product/attributeGroup";
-
 export default {
+
   name: "AttributeGroup",
   dicts: ['sys_yes_no'],
   data() {
@@ -244,6 +251,14 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    /**设置开关-状态**/
+    changeing(row){
+      var id=row.id
+      var states=row.states
+      this.updateAttributeGroupStates(id,states).then(res => {
+        this.$message.success("修改成功");
+      })
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
@@ -256,11 +271,23 @@ export default {
       const id = row.id || this.ids
       getAttributeGroup(id).then(response => {
         this.form = response.data;
+         this.categoryOptionValue=[
+          this.form.mianType,
+          this.form.parentType,
+          this.form.type
+          ];
         this.open = true;
         this.title = "修改属性组";
         console.log(this.form)
       });
     },
+    //修改属性状态
+     updateAttributeGroupStates(id,states){
+      return request({
+        url:"/product/attributeGroup/"+id+'/'+states,
+        method:'put'
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
diff --git a/src/views/product/brand/index.vue b/src/views/product/brand/index.vue
index 3bc6ffe..c5ddfbf 100644
--- a/src/views/product/brand/index.vue
+++ b/src/views/product/brand/index.vue
@@ -85,7 +85,11 @@
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.start"/>
         </template>
       </el-table-column>
-      <el-table-column label="介绍" align="center" prop="introduction" />
+      <el-table-column label="介绍" align="center" prop="introduction">
+        <template slot-scope="scope">
+          <div v-html="scope.row.introduction"></div>
+        </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">
diff --git a/src/views/product/category/index.vue b/src/views/product/category/index.vue
index a4edc18..fd48516 100644
--- a/src/views/product/category/index.vue
+++ b/src/views/product/category/index.vue
@@ -68,7 +68,7 @@
           <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="parentIds" />
       <el-table-column label="是否启用" align="center" prop="start">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.start"/>
@@ -263,7 +263,21 @@ export default {
     getList() {
       this.loading = true;
       listCategory(this.queryParams).then(response => {
-        this.categoryList = this.handleTree(response.data, "id", "parentId");
+        const idToName = response.data.reduce((acc, node) => {
+          acc[node.id] = node.name;
+          return acc;
+        }, {});
+        console.log(idToName);
+        const updatedTreeData = response.data.map(node => {
+          // 如果 parentId 为 null，说明没有父节点，不需要替换
+          const parentName = node.parentId !== null ? idToName[node.parentId] : null;
+          console.log(parentName);
+          return {
+            ...node,
+            parentIds: parentName
+          };
+        });
+        this.categoryList = this.handleTree(updatedTreeData, "id", "parentId");
         this.loading = false;
       });
     },
@@ -347,6 +361,11 @@ export default {
       }
       getCategory(row.id).then(response => {
         this.form = response.data;
+         this.categoryOptionValue=[
+          this.form.mianType,
+          this.form.parentType,
+          this.form.type
+          ];
         this.open = true;
         this.title = "修改品类信息";
       });
diff --git a/src/views/product/info/index.vue b/src/views/product/info/index.vue
index 5e8c755..997d4d4 100644
--- a/src/views/product/info/index.vue
+++ b/src/views/product/info/index.vue
@@ -92,9 +92,9 @@
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="商品名称" align="center" prop="name" />
       <el-table-column label="商品描述" align="center" prop="introduction" />
-      <el-table-column label="主类型" align="center" prop="mianType" />
-      <el-table-column label="父类型" align="center" prop="parentType" />
-      <el-table-column label="商品类型" align="center" prop="type" />
+      <el-table-column label="主类型" align="center" prop="mianTypeName" />
+      <el-table-column label="父类型" align="center" prop="parentTypeName" />
+      <el-table-column label="商品类型" align="center" prop="typeName" />
       <el-table-column label="商品图片" align="center" prop="image" width="100">
         <template slot-scope="scope">
           <image-preview :src="scope.row.image" :width="50" :height="50"/>
@@ -110,8 +110,8 @@
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="规格" align="center" prop="ruleId" />
-      <el-table-column label="品牌" align="center" prop="brandId" />
+      <el-table-column label="规格" align="center" prop="ruleName" />
+      <el-table-column label="品牌" align="center" prop="brandName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -723,6 +723,11 @@ 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 = "修改商品信息";
       });
diff --git a/src/views/product/rule/index.vue b/src/views/product/rule/index.vue
index 6d23546..8931118 100644
--- a/src/views/product/rule/index.vue
+++ b/src/views/product/rule/index.vue
@@ -77,7 +77,18 @@
 
         </template>
       </el-table-column>
-      <el-table-column label="规格状态" align="center" prop="status" />
+      <el-table-column label="规格状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.status"
+            active-text="Y"
+            inactive-text="N"
+            active-value="Y"
+            inactive-value="N"
+            @change="changeing(scope.row)"
+          ></el-switch>
+        </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">
@@ -86,14 +97,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['product:rule:edit']"
+            :disabled="scope.row.flag"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['product:rule:remove']"
+            :disabled="scope.row.flag"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -361,6 +372,21 @@ export default {
         }
       });
     },
+    /**规格状态开关**/
+    changeing(row){
+      var id=row.id
+      var status=row.status
+      this.updByRuleStatus(id,status).then(res=>{
+        this.$message.success("修改成功");
+      })
+    },
+    /**设置N与Y**/
+    updByRuleStatus(id,status){
+      return request({
+     url:"/product/rule/"+id+"/"+status,
+      methods: "put"
+      })
+},
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;