diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index bc8a76f..3e32010 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -149,7 +149,7 @@ export default {
     },
     // 上传成功回调
     handleUploadSuccess(res, file) {
-      if (res.data.code === 200) {
+      if (res.code === 200) {
         this.uploadList.push({name: res.data.url, url: res.data.url});
         this.uploadedSuccessfully();
       } else {
diff --git a/src/views/product/attribute/index.vue b/src/views/product/attribute/index.vue
index b0229f9..74152d3 100644
--- a/src/views/product/attribute/index.vue
+++ b/src/views/product/attribute/index.vue
@@ -9,14 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="分组" prop="groupId">
-        <el-input
-          v-model="queryParams.groupId"
-          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>
@@ -72,8 +64,8 @@
     <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="id" />
+      <el-table-column label="属性编码" align="center" prop="code" />
       <el-table-column label="属性名称" align="center" prop="name" />
-      <el-table-column label="分组" align="center" prop="groupId" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -94,7 +86,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -106,12 +98,12 @@
     <!-- 添加或修改商品属性对话框 -->
     <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="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="groupId">
-          <el-input v-model="form.groupId" placeholder="请输入分组" />
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -153,18 +145,18 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        name: null,
-        groupId: null,
+        code: null,
+        name: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" }
+        code: [
+          { required: true, message: "属性编码不能为空", trigger: "blur" }
         ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        name: [
+          { required: true, message: "属性名不能为空", trigger: "blur" }
         ],
       }
     };
@@ -177,8 +169,8 @@ export default {
     getList() {
       this.loading = true;
       listAttribute(this.queryParams).then(response => {
-        this.attributeList = response.rows;
-        this.total = response.total;
+        this.attributeList = response.data.rows;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
@@ -191,8 +183,8 @@ export default {
     reset() {
       this.form = {
         id: null,
+        code: null,
         name: null,
-        groupId: null,
         remark: null,
         createBy: null,
         createTime: null,
diff --git a/src/views/product/brand/index.vue b/src/views/product/brand/index.vue
index 1088585..cd3f067 100644
--- a/src/views/product/brand/index.vue
+++ b/src/views/product/brand/index.vue
@@ -10,15 +10,23 @@
         />
       </el-form-item>
       <el-form-item label="是否启用" prop="start">
-        <el-input
-          v-model="queryParams.start"
-          placeholder="请输入是否启用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.start" 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
+          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>
@@ -79,12 +87,18 @@
         </template>
       </el-table-column>
       <el-table-column label="介绍" align="center" prop="introduction" />
+
+
       <el-table-column label="是否启用" align="center" prop="start">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.start"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="备注" align="center" prop="remark">
+          <template slot-scope="scope">
+            <span v-html="scope.row.remark"></span>
+          </template>
+        </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -120,13 +134,19 @@
           <el-input v-model="form.name" placeholder="请输入品牌名称" />
         </el-form-item>
         <el-form-item label="Logo" prop="logo">
-          <image-upload v-model="form.logo"/>
+          <image-upload v-model="form.logo" :limit="1" :is-show-tip="false"/>
         </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="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="备注">
           <editor v-model="form.remark" :min-height="192"/>
@@ -145,6 +165,7 @@ import { listBrand, getBrand, delBrand, addBrand, updateBrand } from "@/api/prod
 
 export default {
   name: "Brand",
+  dicts: ['sys_yes_no'],
   data() {
     return {
       // 遮罩层