diff --git a/public/config/project.config.json b/public/config/project.config.json
index 2e5e3c4..cd629df 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "后台管理系统",
+  "title": "智慧型厨房AIOT物联管理平台",
   "subtitle": "",
   "theme": "blue",
   "baseUrl": "http://111.198.10.15:21403/",
@@ -8,4 +8,4 @@
   "provinceCode": "360000",
   "cityCode": "361000",
   "areaCode": "361024"
-}
\ No newline at end of file
+}

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 2e5e3c4..cd629df 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "后台管理系统",
+  "title": "智慧型厨房AIOT物联管理平台",
   "subtitle": "",
   "theme": "blue",
   "baseUrl": "http://111.198.10.15:21403/",
@@ -8,4 +8,4 @@
   "provinceCode": "360000",
   "cityCode": "361000",
   "areaCode": "361024"
-}
\ No newline at end of file
+}
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c48b9cf..4e547d4 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -29,9 +29,9 @@
               >
                 <el-option
                   v-for="item in categoryList"
-                  :key="item.id"
+                  :key="item.categoryCode"
                   :label="item.categoryName"
-                  :value="item.id"
+                  :value="item.categoryCode"
                 />
               </el-select>
             </input-vue>
@@ -84,7 +84,7 @@
             添加产品参数
           </el-button>
         </div>
-        <div v-for=" ( item,index) in categoryInfo.productParams" :key="index">
+        <div v-for=" (item,index) in categoryInfo.productParams" :key="index">
           <div class="addItem">
             <div class="devName item">
               <red-star />
@@ -97,10 +97,9 @@
               </input-vue>
             </div>
             <div class="isRequire item">
-              <red-star />
               <input-vue title="" class="inputWidth">
-                <el-checkbox v-model="item.paramRequire">
-                  是否必填
+                <el-checkbox v-model="item.paramRequire" true-label="1" false-label="0">
+                  必填
                 </el-checkbox>
               </input-vue>
             </div>
@@ -136,10 +135,8 @@
 export default {
   components: {
     inputVue,
-    dialogHeader,
     InputNumber,
-    RedStar,
-    Message
+    RedStar
   },
   props: {
     isShowInfo: {
@@ -176,33 +173,18 @@
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla !== '') {
           // 编辑操作
           if (!vla.id) return
           detail({ id: vla.id }).then(res => {
-            this.categoryInfo.id = res.id
-            this.categoryInfo.categoryCode = res.categoryCode
-            this.categoryInfo.categoryName = res.categoryName
-            this.categoryInfo.pCategoryCode = res.pCategoryCode
-            this.categoryInfo.remark = res.remark
-            this.categoryInfo.qualifyIds = res.qualifyIds
-            this.categoryInfo.productParams = this.dealAry2(res.productParams)
+            this.categoryInfo.id = res.data.id
+            this.categoryInfo.categoryCode = res.data.categoryCode
+            this.categoryInfo.categoryName = res.data.categoryName
+            this.categoryInfo.pCategoryCode = res.data.pCategoryCode
+            this.categoryInfo.remark = res.data.remark
+            this.categoryInfo.qualifyIds = res.data.qualifyIds
+            this.categoryInfo.productParams = res.data.productParams
           })
-          // this.categoryInfo.id = vla.id
-          // this.categoryInfo.categoryCode=vla.categoryCode
-          // this.categoryInfo.categoryName=vla.categoryName
-          // this.categoryInfo.pCategoryCode=vla.pCategoryCode
-          // this.categoryInfo.remark=vla.remark
-          // this.categoryInfo.qualifyIds=vla.qualifyIds
-          // this.categoryInfo.productParams=this.dealAry2(vla.productParams)
-          // this.categoryInfo = {
-          //   id:vla.id,
-          //   categoryCode:vla.categoryCode,
-          //   categoryName:vla.categoryName,
-          //   pCategoryCode:vla.pCategoryCode,
-          //   remark:vla.qualifyIds,
-          //   qualifyIds:vla.qualifyIds
-          // }
         } else {
           this.resetData()
         }
@@ -226,47 +208,10 @@
       // 重置数据
       // this.resetData()
     },
-    // 数据处理
-    dealAry2(productParams) { //  number 转 boolean
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire == '1') {
-          item.paramRequire = true
-        } else {
-          item.paramRequire = false
-        }
-      })
-      return productParams
-    },
-    dealAry(productParams) { //  boolean 转 number
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire) {
-          item.paramRequire = '1'
-        } else {
-          item.paramRequire = '0'
-        }
-      })
-      return productParams
-    },
     save() {
       if (this.title == '品类新增') {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         C_add(this.categoryInfo).then(res => {
-          console.log(res, res != '')
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '保存成功',
               type: 'success'
@@ -278,10 +223,11 @@
           }
         })
       } else {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
+        // this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         console.log(this.categoryInfo.productParams)
+        debugger
         C_update(this.categoryInfo).then(res => {
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '更新成功',
               type: 'success'
@@ -349,12 +295,12 @@
   }
 
   .AddContent {
-    max-height: 180px;
+    //max-height: 180px;
     overflow: auto;
     border-radius: 5px;
     box-sizing: border-box;
-    border: 1px solid #999;
-    padding: 10px;
+    border: 1px solid #c9c9c9;
+    padding: 10px 10px 20px;
 
     .addBtn {
       margin-bottom: 10px;

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 2e5e3c4..cd629df 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "后台管理系统",
+  "title": "智慧型厨房AIOT物联管理平台",
   "subtitle": "",
   "theme": "blue",
   "baseUrl": "http://111.198.10.15:21403/",
@@ -8,4 +8,4 @@
   "provinceCode": "360000",
   "cityCode": "361000",
   "areaCode": "361024"
-}
\ No newline at end of file
+}
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c48b9cf..4e547d4 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -29,9 +29,9 @@
               >
                 <el-option
                   v-for="item in categoryList"
-                  :key="item.id"
+                  :key="item.categoryCode"
                   :label="item.categoryName"
-                  :value="item.id"
+                  :value="item.categoryCode"
                 />
               </el-select>
             </input-vue>
@@ -84,7 +84,7 @@
             添加产品参数
           </el-button>
         </div>
-        <div v-for=" ( item,index) in categoryInfo.productParams" :key="index">
+        <div v-for=" (item,index) in categoryInfo.productParams" :key="index">
           <div class="addItem">
             <div class="devName item">
               <red-star />
@@ -97,10 +97,9 @@
               </input-vue>
             </div>
             <div class="isRequire item">
-              <red-star />
               <input-vue title="" class="inputWidth">
-                <el-checkbox v-model="item.paramRequire">
-                  是否必填
+                <el-checkbox v-model="item.paramRequire" true-label="1" false-label="0">
+                  必填
                 </el-checkbox>
               </input-vue>
             </div>
@@ -136,10 +135,8 @@
 export default {
   components: {
     inputVue,
-    dialogHeader,
     InputNumber,
-    RedStar,
-    Message
+    RedStar
   },
   props: {
     isShowInfo: {
@@ -176,33 +173,18 @@
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla !== '') {
           // 编辑操作
           if (!vla.id) return
           detail({ id: vla.id }).then(res => {
-            this.categoryInfo.id = res.id
-            this.categoryInfo.categoryCode = res.categoryCode
-            this.categoryInfo.categoryName = res.categoryName
-            this.categoryInfo.pCategoryCode = res.pCategoryCode
-            this.categoryInfo.remark = res.remark
-            this.categoryInfo.qualifyIds = res.qualifyIds
-            this.categoryInfo.productParams = this.dealAry2(res.productParams)
+            this.categoryInfo.id = res.data.id
+            this.categoryInfo.categoryCode = res.data.categoryCode
+            this.categoryInfo.categoryName = res.data.categoryName
+            this.categoryInfo.pCategoryCode = res.data.pCategoryCode
+            this.categoryInfo.remark = res.data.remark
+            this.categoryInfo.qualifyIds = res.data.qualifyIds
+            this.categoryInfo.productParams = res.data.productParams
           })
-          // this.categoryInfo.id = vla.id
-          // this.categoryInfo.categoryCode=vla.categoryCode
-          // this.categoryInfo.categoryName=vla.categoryName
-          // this.categoryInfo.pCategoryCode=vla.pCategoryCode
-          // this.categoryInfo.remark=vla.remark
-          // this.categoryInfo.qualifyIds=vla.qualifyIds
-          // this.categoryInfo.productParams=this.dealAry2(vla.productParams)
-          // this.categoryInfo = {
-          //   id:vla.id,
-          //   categoryCode:vla.categoryCode,
-          //   categoryName:vla.categoryName,
-          //   pCategoryCode:vla.pCategoryCode,
-          //   remark:vla.qualifyIds,
-          //   qualifyIds:vla.qualifyIds
-          // }
         } else {
           this.resetData()
         }
@@ -226,47 +208,10 @@
       // 重置数据
       // this.resetData()
     },
-    // 数据处理
-    dealAry2(productParams) { //  number 转 boolean
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire == '1') {
-          item.paramRequire = true
-        } else {
-          item.paramRequire = false
-        }
-      })
-      return productParams
-    },
-    dealAry(productParams) { //  boolean 转 number
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire) {
-          item.paramRequire = '1'
-        } else {
-          item.paramRequire = '0'
-        }
-      })
-      return productParams
-    },
     save() {
       if (this.title == '品类新增') {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         C_add(this.categoryInfo).then(res => {
-          console.log(res, res != '')
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '保存成功',
               type: 'success'
@@ -278,10 +223,11 @@
           }
         })
       } else {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
+        // this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         console.log(this.categoryInfo.productParams)
+        debugger
         C_update(this.categoryInfo).then(res => {
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '更新成功',
               type: 'success'
@@ -349,12 +295,12 @@
   }
 
   .AddContent {
-    max-height: 180px;
+    //max-height: 180px;
     overflow: auto;
     border-radius: 5px;
     box-sizing: border-box;
-    border: 1px solid #999;
-    padding: 10px;
+    border: 1px solid #c9c9c9;
+    padding: 10px 10px 20px;
 
     .addBtn {
       margin-bottom: 10px;
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index ad5fd28..be10d16 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,7 +1,7 @@
 <!--品类详情弹窗-->
 <template>
   <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="contanier">
+    <div class="contanier" v-if="dataInfo">
       <div class="box">
         <!--        <div class="item">-->
         <!--          <div class="title">序号</div>-->

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 2e5e3c4..cd629df 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "后台管理系统",
+  "title": "智慧型厨房AIOT物联管理平台",
   "subtitle": "",
   "theme": "blue",
   "baseUrl": "http://111.198.10.15:21403/",
@@ -8,4 +8,4 @@
   "provinceCode": "360000",
   "cityCode": "361000",
   "areaCode": "361024"
-}
\ No newline at end of file
+}
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c48b9cf..4e547d4 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -29,9 +29,9 @@
               >
                 <el-option
                   v-for="item in categoryList"
-                  :key="item.id"
+                  :key="item.categoryCode"
                   :label="item.categoryName"
-                  :value="item.id"
+                  :value="item.categoryCode"
                 />
               </el-select>
             </input-vue>
@@ -84,7 +84,7 @@
             添加产品参数
           </el-button>
         </div>
-        <div v-for=" ( item,index) in categoryInfo.productParams" :key="index">
+        <div v-for=" (item,index) in categoryInfo.productParams" :key="index">
           <div class="addItem">
             <div class="devName item">
               <red-star />
@@ -97,10 +97,9 @@
               </input-vue>
             </div>
             <div class="isRequire item">
-              <red-star />
               <input-vue title="" class="inputWidth">
-                <el-checkbox v-model="item.paramRequire">
-                  是否必填
+                <el-checkbox v-model="item.paramRequire" true-label="1" false-label="0">
+                  必填
                 </el-checkbox>
               </input-vue>
             </div>
@@ -136,10 +135,8 @@
 export default {
   components: {
     inputVue,
-    dialogHeader,
     InputNumber,
-    RedStar,
-    Message
+    RedStar
   },
   props: {
     isShowInfo: {
@@ -176,33 +173,18 @@
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla !== '') {
           // 编辑操作
           if (!vla.id) return
           detail({ id: vla.id }).then(res => {
-            this.categoryInfo.id = res.id
-            this.categoryInfo.categoryCode = res.categoryCode
-            this.categoryInfo.categoryName = res.categoryName
-            this.categoryInfo.pCategoryCode = res.pCategoryCode
-            this.categoryInfo.remark = res.remark
-            this.categoryInfo.qualifyIds = res.qualifyIds
-            this.categoryInfo.productParams = this.dealAry2(res.productParams)
+            this.categoryInfo.id = res.data.id
+            this.categoryInfo.categoryCode = res.data.categoryCode
+            this.categoryInfo.categoryName = res.data.categoryName
+            this.categoryInfo.pCategoryCode = res.data.pCategoryCode
+            this.categoryInfo.remark = res.data.remark
+            this.categoryInfo.qualifyIds = res.data.qualifyIds
+            this.categoryInfo.productParams = res.data.productParams
           })
-          // this.categoryInfo.id = vla.id
-          // this.categoryInfo.categoryCode=vla.categoryCode
-          // this.categoryInfo.categoryName=vla.categoryName
-          // this.categoryInfo.pCategoryCode=vla.pCategoryCode
-          // this.categoryInfo.remark=vla.remark
-          // this.categoryInfo.qualifyIds=vla.qualifyIds
-          // this.categoryInfo.productParams=this.dealAry2(vla.productParams)
-          // this.categoryInfo = {
-          //   id:vla.id,
-          //   categoryCode:vla.categoryCode,
-          //   categoryName:vla.categoryName,
-          //   pCategoryCode:vla.pCategoryCode,
-          //   remark:vla.qualifyIds,
-          //   qualifyIds:vla.qualifyIds
-          // }
         } else {
           this.resetData()
         }
@@ -226,47 +208,10 @@
       // 重置数据
       // this.resetData()
     },
-    // 数据处理
-    dealAry2(productParams) { //  number 转 boolean
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire == '1') {
-          item.paramRequire = true
-        } else {
-          item.paramRequire = false
-        }
-      })
-      return productParams
-    },
-    dealAry(productParams) { //  boolean 转 number
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire) {
-          item.paramRequire = '1'
-        } else {
-          item.paramRequire = '0'
-        }
-      })
-      return productParams
-    },
     save() {
       if (this.title == '品类新增') {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         C_add(this.categoryInfo).then(res => {
-          console.log(res, res != '')
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '保存成功',
               type: 'success'
@@ -278,10 +223,11 @@
           }
         })
       } else {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
+        // this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         console.log(this.categoryInfo.productParams)
+        debugger
         C_update(this.categoryInfo).then(res => {
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '更新成功',
               type: 'success'
@@ -349,12 +295,12 @@
   }
 
   .AddContent {
-    max-height: 180px;
+    //max-height: 180px;
     overflow: auto;
     border-radius: 5px;
     box-sizing: border-box;
-    border: 1px solid #999;
-    padding: 10px;
+    border: 1px solid #c9c9c9;
+    padding: 10px 10px 20px;
 
     .addBtn {
       margin-bottom: 10px;
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index ad5fd28..be10d16 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,7 +1,7 @@
 <!--品类详情弹窗-->
 <template>
   <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="contanier">
+    <div class="contanier" v-if="dataInfo">
       <div class="box">
         <!--        <div class="item">-->
         <!--          <div class="title">序号</div>-->
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 05ca97c..ad214c5 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -121,10 +121,11 @@
       <div class="parameters">
         <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
           <el-row :gutter="20">
-            <el-col v-for="param of paramForm" :span="8">
-              <el-form-item :label="param.paramName" prop="internationalCode" :required="param.paramRequire==1">
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" />
-              </el-form-item>
+            <el-col v-for="param of paramValueList" :span="8">
+              <div style="width: 100%; display: flex;align-items: center">
+                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
+                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              </div>
             </el-col>
           </el-row>
         </el-form>
@@ -147,8 +148,10 @@
 import { SelectList } from '@/api/product/brand'
 import { C_list, C_paramsList } from '@/api/product/category'
 import { add, update } from '@/api/product/product'
+import RedStar from '@/components/mycomponent/redStar'
 
 export default {
+  components: { RedStar },
   props: {
     title: {
       type: String,
@@ -191,7 +194,7 @@
         productNetworkMode: '1',
         productPicture: ''
       },
-      paramForm: [
+      paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
         // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
         // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
@@ -225,6 +228,9 @@
           productNetworkMode: row.productNetworkMode,
           productPicture: row.productPicture
         }
+        if (row.categoryId) {
+          this.fetchParams(row.categoryId)
+        }
       } else {
         this.resetForm()
       }
@@ -249,11 +255,12 @@
         this.categoryList = res.data
       })
     },
+    // 获取品类参数列表
     fetchParams(categoryId) {
       C_paramsList(categoryId).then(res => {
         if (res.code === 200) {
-          this.paramForm = res.data.map(item => {
-            return { paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
+          this.paramValueList = res.data.map(item => {
+            return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
           })
         }
       })
@@ -274,6 +281,7 @@
         productMaterialQuality: '',
         productPicture: ''
       }
+      this.paramValueList = []
     },
     // 照片上传
     handleAvatarSuccess(res, file) {
@@ -296,22 +304,27 @@
     },
     // 新增
     save() {
+      this.addInfo.paramValueList = this.paramValueList.map(item => {
+        return {
+          paramId: item.paramId,
+          paramName: item.paramName,
+          paramValue: item.paramValue
+        }
+      })
       if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
-          console.log(res, 'add')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('保存成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       } else {
         update(this.addInfo).then(res => {
-          console.log(res, 'update')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('更新成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       }

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 2e5e3c4..cd629df 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "后台管理系统",
+  "title": "智慧型厨房AIOT物联管理平台",
   "subtitle": "",
   "theme": "blue",
   "baseUrl": "http://111.198.10.15:21403/",
@@ -8,4 +8,4 @@
   "provinceCode": "360000",
   "cityCode": "361000",
   "areaCode": "361024"
-}
\ No newline at end of file
+}
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c48b9cf..4e547d4 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -29,9 +29,9 @@
               >
                 <el-option
                   v-for="item in categoryList"
-                  :key="item.id"
+                  :key="item.categoryCode"
                   :label="item.categoryName"
-                  :value="item.id"
+                  :value="item.categoryCode"
                 />
               </el-select>
             </input-vue>
@@ -84,7 +84,7 @@
             添加产品参数
           </el-button>
         </div>
-        <div v-for=" ( item,index) in categoryInfo.productParams" :key="index">
+        <div v-for=" (item,index) in categoryInfo.productParams" :key="index">
           <div class="addItem">
             <div class="devName item">
               <red-star />
@@ -97,10 +97,9 @@
               </input-vue>
             </div>
             <div class="isRequire item">
-              <red-star />
               <input-vue title="" class="inputWidth">
-                <el-checkbox v-model="item.paramRequire">
-                  是否必填
+                <el-checkbox v-model="item.paramRequire" true-label="1" false-label="0">
+                  必填
                 </el-checkbox>
               </input-vue>
             </div>
@@ -136,10 +135,8 @@
 export default {
   components: {
     inputVue,
-    dialogHeader,
     InputNumber,
-    RedStar,
-    Message
+    RedStar
   },
   props: {
     isShowInfo: {
@@ -176,33 +173,18 @@
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla !== '') {
           // 编辑操作
           if (!vla.id) return
           detail({ id: vla.id }).then(res => {
-            this.categoryInfo.id = res.id
-            this.categoryInfo.categoryCode = res.categoryCode
-            this.categoryInfo.categoryName = res.categoryName
-            this.categoryInfo.pCategoryCode = res.pCategoryCode
-            this.categoryInfo.remark = res.remark
-            this.categoryInfo.qualifyIds = res.qualifyIds
-            this.categoryInfo.productParams = this.dealAry2(res.productParams)
+            this.categoryInfo.id = res.data.id
+            this.categoryInfo.categoryCode = res.data.categoryCode
+            this.categoryInfo.categoryName = res.data.categoryName
+            this.categoryInfo.pCategoryCode = res.data.pCategoryCode
+            this.categoryInfo.remark = res.data.remark
+            this.categoryInfo.qualifyIds = res.data.qualifyIds
+            this.categoryInfo.productParams = res.data.productParams
           })
-          // this.categoryInfo.id = vla.id
-          // this.categoryInfo.categoryCode=vla.categoryCode
-          // this.categoryInfo.categoryName=vla.categoryName
-          // this.categoryInfo.pCategoryCode=vla.pCategoryCode
-          // this.categoryInfo.remark=vla.remark
-          // this.categoryInfo.qualifyIds=vla.qualifyIds
-          // this.categoryInfo.productParams=this.dealAry2(vla.productParams)
-          // this.categoryInfo = {
-          //   id:vla.id,
-          //   categoryCode:vla.categoryCode,
-          //   categoryName:vla.categoryName,
-          //   pCategoryCode:vla.pCategoryCode,
-          //   remark:vla.qualifyIds,
-          //   qualifyIds:vla.qualifyIds
-          // }
         } else {
           this.resetData()
         }
@@ -226,47 +208,10 @@
       // 重置数据
       // this.resetData()
     },
-    // 数据处理
-    dealAry2(productParams) { //  number 转 boolean
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire == '1') {
-          item.paramRequire = true
-        } else {
-          item.paramRequire = false
-        }
-      })
-      return productParams
-    },
-    dealAry(productParams) { //  boolean 转 number
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire) {
-          item.paramRequire = '1'
-        } else {
-          item.paramRequire = '0'
-        }
-      })
-      return productParams
-    },
     save() {
       if (this.title == '品类新增') {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         C_add(this.categoryInfo).then(res => {
-          console.log(res, res != '')
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '保存成功',
               type: 'success'
@@ -278,10 +223,11 @@
           }
         })
       } else {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
+        // this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         console.log(this.categoryInfo.productParams)
+        debugger
         C_update(this.categoryInfo).then(res => {
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '更新成功',
               type: 'success'
@@ -349,12 +295,12 @@
   }
 
   .AddContent {
-    max-height: 180px;
+    //max-height: 180px;
     overflow: auto;
     border-radius: 5px;
     box-sizing: border-box;
-    border: 1px solid #999;
-    padding: 10px;
+    border: 1px solid #c9c9c9;
+    padding: 10px 10px 20px;
 
     .addBtn {
       margin-bottom: 10px;
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index ad5fd28..be10d16 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,7 +1,7 @@
 <!--品类详情弹窗-->
 <template>
   <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="contanier">
+    <div class="contanier" v-if="dataInfo">
       <div class="box">
         <!--        <div class="item">-->
         <!--          <div class="title">序号</div>-->
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 05ca97c..ad214c5 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -121,10 +121,11 @@
       <div class="parameters">
         <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
           <el-row :gutter="20">
-            <el-col v-for="param of paramForm" :span="8">
-              <el-form-item :label="param.paramName" prop="internationalCode" :required="param.paramRequire==1">
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" />
-              </el-form-item>
+            <el-col v-for="param of paramValueList" :span="8">
+              <div style="width: 100%; display: flex;align-items: center">
+                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
+                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              </div>
             </el-col>
           </el-row>
         </el-form>
@@ -147,8 +148,10 @@
 import { SelectList } from '@/api/product/brand'
 import { C_list, C_paramsList } from '@/api/product/category'
 import { add, update } from '@/api/product/product'
+import RedStar from '@/components/mycomponent/redStar'
 
 export default {
+  components: { RedStar },
   props: {
     title: {
       type: String,
@@ -191,7 +194,7 @@
         productNetworkMode: '1',
         productPicture: ''
       },
-      paramForm: [
+      paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
         // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
         // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
@@ -225,6 +228,9 @@
           productNetworkMode: row.productNetworkMode,
           productPicture: row.productPicture
         }
+        if (row.categoryId) {
+          this.fetchParams(row.categoryId)
+        }
       } else {
         this.resetForm()
       }
@@ -249,11 +255,12 @@
         this.categoryList = res.data
       })
     },
+    // 获取品类参数列表
     fetchParams(categoryId) {
       C_paramsList(categoryId).then(res => {
         if (res.code === 200) {
-          this.paramForm = res.data.map(item => {
-            return { paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
+          this.paramValueList = res.data.map(item => {
+            return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
           })
         }
       })
@@ -274,6 +281,7 @@
         productMaterialQuality: '',
         productPicture: ''
       }
+      this.paramValueList = []
     },
     // 照片上传
     handleAvatarSuccess(res, file) {
@@ -296,22 +304,27 @@
     },
     // 新增
     save() {
+      this.addInfo.paramValueList = this.paramValueList.map(item => {
+        return {
+          paramId: item.paramId,
+          paramName: item.paramName,
+          paramValue: item.paramValue
+        }
+      })
       if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
-          console.log(res, 'add')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('保存成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       } else {
         update(this.addInfo).then(res => {
-          console.log(res, 'update')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('更新成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       }
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 9770d3c..7cdd378 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,31 +1,29 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
-      <sidebar class="sidebar-container"  :isCollapse="isCollapse"/>
+      <sidebar class="sidebar-container" :is-collapse="isCollapse" />
       <!--右半部分-->
-      <div :class="{hasTagsView:needTagsView}" class="main-container" >
-
-<!--        <nav-item   v-model="isCollapse" ></nav-item>-->
+      <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <!--        <nav-item   v-model="isCollapse" ></nav-item>-->
         <!--开启固定头部设置-->
         <div v-if="fixedHeader">
           <!--导航(面包屑)-->
-          <navbar v-if="breadcrumb"/>
+          <navbar v-if="breadcrumb" />
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
 
-          <div  :style="{height:(bodyHeight-40)+'px'}" class="no-head-scrollbar"  >
-            <app-main   />
-          </div>
+          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
+            <app-main />
+          </el-scrollbar>
         </div>
         <!--为开始固定头部设置-->
         <div v-else>
           <!--导航，tagsView都包裹在el-scrollbar中-->
-          <el-scrollbar class="has-head-scrollbar"  >
+          <el-scrollbar class="has-head-scrollbar">
             <navbar v-if="breadcrumb" />
             <tags-view v-if="needTagsView" />
             <app-main />
@@ -61,7 +59,7 @@
     AppMain,
     RightPanel,
     NavItem
-},
+  },
   mixins: [ResizeMixin],
   computed: {
     ...mapState({
@@ -75,7 +73,7 @@
     }),
     classObj() {
       return {
-       hideSidebar:this.isCollapse,  // 控制缩放
+        hideSidebar: this.isCollapse, // 控制缩放
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -86,16 +84,16 @@
       }
     }
   },
-  data(){
-    return{
-      isCollapse:false
+  data() {
+    return {
+      isCollapse: false
     }
   },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
-  },
+  }
 
 }
 </script>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 2e5e3c4..cd629df 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "后台管理系统",
+  "title": "智慧型厨房AIOT物联管理平台",
   "subtitle": "",
   "theme": "blue",
   "baseUrl": "http://111.198.10.15:21403/",
@@ -8,4 +8,4 @@
   "provinceCode": "360000",
   "cityCode": "361000",
   "areaCode": "361024"
-}
\ No newline at end of file
+}
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c48b9cf..4e547d4 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -29,9 +29,9 @@
               >
                 <el-option
                   v-for="item in categoryList"
-                  :key="item.id"
+                  :key="item.categoryCode"
                   :label="item.categoryName"
-                  :value="item.id"
+                  :value="item.categoryCode"
                 />
               </el-select>
             </input-vue>
@@ -84,7 +84,7 @@
             添加产品参数
           </el-button>
         </div>
-        <div v-for=" ( item,index) in categoryInfo.productParams" :key="index">
+        <div v-for=" (item,index) in categoryInfo.productParams" :key="index">
           <div class="addItem">
             <div class="devName item">
               <red-star />
@@ -97,10 +97,9 @@
               </input-vue>
             </div>
             <div class="isRequire item">
-              <red-star />
               <input-vue title="" class="inputWidth">
-                <el-checkbox v-model="item.paramRequire">
-                  是否必填
+                <el-checkbox v-model="item.paramRequire" true-label="1" false-label="0">
+                  必填
                 </el-checkbox>
               </input-vue>
             </div>
@@ -136,10 +135,8 @@
 export default {
   components: {
     inputVue,
-    dialogHeader,
     InputNumber,
-    RedStar,
-    Message
+    RedStar
   },
   props: {
     isShowInfo: {
@@ -176,33 +173,18 @@
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla !== '') {
           // 编辑操作
           if (!vla.id) return
           detail({ id: vla.id }).then(res => {
-            this.categoryInfo.id = res.id
-            this.categoryInfo.categoryCode = res.categoryCode
-            this.categoryInfo.categoryName = res.categoryName
-            this.categoryInfo.pCategoryCode = res.pCategoryCode
-            this.categoryInfo.remark = res.remark
-            this.categoryInfo.qualifyIds = res.qualifyIds
-            this.categoryInfo.productParams = this.dealAry2(res.productParams)
+            this.categoryInfo.id = res.data.id
+            this.categoryInfo.categoryCode = res.data.categoryCode
+            this.categoryInfo.categoryName = res.data.categoryName
+            this.categoryInfo.pCategoryCode = res.data.pCategoryCode
+            this.categoryInfo.remark = res.data.remark
+            this.categoryInfo.qualifyIds = res.data.qualifyIds
+            this.categoryInfo.productParams = res.data.productParams
           })
-          // this.categoryInfo.id = vla.id
-          // this.categoryInfo.categoryCode=vla.categoryCode
-          // this.categoryInfo.categoryName=vla.categoryName
-          // this.categoryInfo.pCategoryCode=vla.pCategoryCode
-          // this.categoryInfo.remark=vla.remark
-          // this.categoryInfo.qualifyIds=vla.qualifyIds
-          // this.categoryInfo.productParams=this.dealAry2(vla.productParams)
-          // this.categoryInfo = {
-          //   id:vla.id,
-          //   categoryCode:vla.categoryCode,
-          //   categoryName:vla.categoryName,
-          //   pCategoryCode:vla.pCategoryCode,
-          //   remark:vla.qualifyIds,
-          //   qualifyIds:vla.qualifyIds
-          // }
         } else {
           this.resetData()
         }
@@ -226,47 +208,10 @@
       // 重置数据
       // this.resetData()
     },
-    // 数据处理
-    dealAry2(productParams) { //  number 转 boolean
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire == '1') {
-          item.paramRequire = true
-        } else {
-          item.paramRequire = false
-        }
-      })
-      return productParams
-    },
-    dealAry(productParams) { //  boolean 转 number
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire) {
-          item.paramRequire = '1'
-        } else {
-          item.paramRequire = '0'
-        }
-      })
-      return productParams
-    },
     save() {
       if (this.title == '品类新增') {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         C_add(this.categoryInfo).then(res => {
-          console.log(res, res != '')
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '保存成功',
               type: 'success'
@@ -278,10 +223,11 @@
           }
         })
       } else {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
+        // this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         console.log(this.categoryInfo.productParams)
+        debugger
         C_update(this.categoryInfo).then(res => {
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '更新成功',
               type: 'success'
@@ -349,12 +295,12 @@
   }
 
   .AddContent {
-    max-height: 180px;
+    //max-height: 180px;
     overflow: auto;
     border-radius: 5px;
     box-sizing: border-box;
-    border: 1px solid #999;
-    padding: 10px;
+    border: 1px solid #c9c9c9;
+    padding: 10px 10px 20px;
 
     .addBtn {
       margin-bottom: 10px;
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index ad5fd28..be10d16 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,7 +1,7 @@
 <!--品类详情弹窗-->
 <template>
   <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="contanier">
+    <div class="contanier" v-if="dataInfo">
       <div class="box">
         <!--        <div class="item">-->
         <!--          <div class="title">序号</div>-->
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 05ca97c..ad214c5 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -121,10 +121,11 @@
       <div class="parameters">
         <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
           <el-row :gutter="20">
-            <el-col v-for="param of paramForm" :span="8">
-              <el-form-item :label="param.paramName" prop="internationalCode" :required="param.paramRequire==1">
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" />
-              </el-form-item>
+            <el-col v-for="param of paramValueList" :span="8">
+              <div style="width: 100%; display: flex;align-items: center">
+                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
+                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              </div>
             </el-col>
           </el-row>
         </el-form>
@@ -147,8 +148,10 @@
 import { SelectList } from '@/api/product/brand'
 import { C_list, C_paramsList } from '@/api/product/category'
 import { add, update } from '@/api/product/product'
+import RedStar from '@/components/mycomponent/redStar'
 
 export default {
+  components: { RedStar },
   props: {
     title: {
       type: String,
@@ -191,7 +194,7 @@
         productNetworkMode: '1',
         productPicture: ''
       },
-      paramForm: [
+      paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
         // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
         // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
@@ -225,6 +228,9 @@
           productNetworkMode: row.productNetworkMode,
           productPicture: row.productPicture
         }
+        if (row.categoryId) {
+          this.fetchParams(row.categoryId)
+        }
       } else {
         this.resetForm()
       }
@@ -249,11 +255,12 @@
         this.categoryList = res.data
       })
     },
+    // 获取品类参数列表
     fetchParams(categoryId) {
       C_paramsList(categoryId).then(res => {
         if (res.code === 200) {
-          this.paramForm = res.data.map(item => {
-            return { paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
+          this.paramValueList = res.data.map(item => {
+            return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
           })
         }
       })
@@ -274,6 +281,7 @@
         productMaterialQuality: '',
         productPicture: ''
       }
+      this.paramValueList = []
     },
     // 照片上传
     handleAvatarSuccess(res, file) {
@@ -296,22 +304,27 @@
     },
     // 新增
     save() {
+      this.addInfo.paramValueList = this.paramValueList.map(item => {
+        return {
+          paramId: item.paramId,
+          paramName: item.paramName,
+          paramValue: item.paramValue
+        }
+      })
       if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
-          console.log(res, 'add')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('保存成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       } else {
         update(this.addInfo).then(res => {
-          console.log(res, 'update')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('更新成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       }
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 9770d3c..7cdd378 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,31 +1,29 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
-      <sidebar class="sidebar-container"  :isCollapse="isCollapse"/>
+      <sidebar class="sidebar-container" :is-collapse="isCollapse" />
       <!--右半部分-->
-      <div :class="{hasTagsView:needTagsView}" class="main-container" >
-
-<!--        <nav-item   v-model="isCollapse" ></nav-item>-->
+      <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <!--        <nav-item   v-model="isCollapse" ></nav-item>-->
         <!--开启固定头部设置-->
         <div v-if="fixedHeader">
           <!--导航(面包屑)-->
-          <navbar v-if="breadcrumb"/>
+          <navbar v-if="breadcrumb" />
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
 
-          <div  :style="{height:(bodyHeight-40)+'px'}" class="no-head-scrollbar"  >
-            <app-main   />
-          </div>
+          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
+            <app-main />
+          </el-scrollbar>
         </div>
         <!--为开始固定头部设置-->
         <div v-else>
           <!--导航，tagsView都包裹在el-scrollbar中-->
-          <el-scrollbar class="has-head-scrollbar"  >
+          <el-scrollbar class="has-head-scrollbar">
             <navbar v-if="breadcrumb" />
             <tags-view v-if="needTagsView" />
             <app-main />
@@ -61,7 +59,7 @@
     AppMain,
     RightPanel,
     NavItem
-},
+  },
   mixins: [ResizeMixin],
   computed: {
     ...mapState({
@@ -75,7 +73,7 @@
     }),
     classObj() {
       return {
-       hideSidebar:this.isCollapse,  // 控制缩放
+        hideSidebar: this.isCollapse, // 控制缩放
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -86,16 +84,16 @@
       }
     }
   },
-  data(){
-    return{
-      isCollapse:false
+  data() {
+    return {
+      isCollapse: false
     }
   },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
-  },
+  }
 
 }
 </script>
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index be5bf7a..4bf0d0d 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,9 +1,9 @@
 <template>
   <section class="app-main">
-    <transition name="fade-transform" mode="out-in" >
+    <transition name="fade-transform" mode="out-in">
       <!-- or name="fade" -->
       <!-- <router-view :key="key"></router-view> -->
-      <div >
+      <div>
         <keep-alive>
           <router-view v-if="$route.meta.keepAlive" :key="key" />
         </keep-alive>
@@ -31,10 +31,10 @@
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  /* min-height: calc(100vh - 50px); */
+  /*min-height: calc(100vh - 50px);*/
   position: relative;
-  /* height: 100%; */
-  min-width:1525px;
-  min-width: 1625px;
+  /*height: 100%;*/
+  /*min-width:1525px;*/
+  /*min-width: 1625px;*/
 }
 </style>

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 2e5e3c4..cd629df 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "后台管理系统",
+  "title": "智慧型厨房AIOT物联管理平台",
   "subtitle": "",
   "theme": "blue",
   "baseUrl": "http://111.198.10.15:21403/",
@@ -8,4 +8,4 @@
   "provinceCode": "360000",
   "cityCode": "361000",
   "areaCode": "361024"
-}
\ No newline at end of file
+}
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c48b9cf..4e547d4 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -29,9 +29,9 @@
               >
                 <el-option
                   v-for="item in categoryList"
-                  :key="item.id"
+                  :key="item.categoryCode"
                   :label="item.categoryName"
-                  :value="item.id"
+                  :value="item.categoryCode"
                 />
               </el-select>
             </input-vue>
@@ -84,7 +84,7 @@
             添加产品参数
           </el-button>
         </div>
-        <div v-for=" ( item,index) in categoryInfo.productParams" :key="index">
+        <div v-for=" (item,index) in categoryInfo.productParams" :key="index">
           <div class="addItem">
             <div class="devName item">
               <red-star />
@@ -97,10 +97,9 @@
               </input-vue>
             </div>
             <div class="isRequire item">
-              <red-star />
               <input-vue title="" class="inputWidth">
-                <el-checkbox v-model="item.paramRequire">
-                  是否必填
+                <el-checkbox v-model="item.paramRequire" true-label="1" false-label="0">
+                  必填
                 </el-checkbox>
               </input-vue>
             </div>
@@ -136,10 +135,8 @@
 export default {
   components: {
     inputVue,
-    dialogHeader,
     InputNumber,
-    RedStar,
-    Message
+    RedStar
   },
   props: {
     isShowInfo: {
@@ -176,33 +173,18 @@
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla !== '') {
           // 编辑操作
           if (!vla.id) return
           detail({ id: vla.id }).then(res => {
-            this.categoryInfo.id = res.id
-            this.categoryInfo.categoryCode = res.categoryCode
-            this.categoryInfo.categoryName = res.categoryName
-            this.categoryInfo.pCategoryCode = res.pCategoryCode
-            this.categoryInfo.remark = res.remark
-            this.categoryInfo.qualifyIds = res.qualifyIds
-            this.categoryInfo.productParams = this.dealAry2(res.productParams)
+            this.categoryInfo.id = res.data.id
+            this.categoryInfo.categoryCode = res.data.categoryCode
+            this.categoryInfo.categoryName = res.data.categoryName
+            this.categoryInfo.pCategoryCode = res.data.pCategoryCode
+            this.categoryInfo.remark = res.data.remark
+            this.categoryInfo.qualifyIds = res.data.qualifyIds
+            this.categoryInfo.productParams = res.data.productParams
           })
-          // this.categoryInfo.id = vla.id
-          // this.categoryInfo.categoryCode=vla.categoryCode
-          // this.categoryInfo.categoryName=vla.categoryName
-          // this.categoryInfo.pCategoryCode=vla.pCategoryCode
-          // this.categoryInfo.remark=vla.remark
-          // this.categoryInfo.qualifyIds=vla.qualifyIds
-          // this.categoryInfo.productParams=this.dealAry2(vla.productParams)
-          // this.categoryInfo = {
-          //   id:vla.id,
-          //   categoryCode:vla.categoryCode,
-          //   categoryName:vla.categoryName,
-          //   pCategoryCode:vla.pCategoryCode,
-          //   remark:vla.qualifyIds,
-          //   qualifyIds:vla.qualifyIds
-          // }
         } else {
           this.resetData()
         }
@@ -226,47 +208,10 @@
       // 重置数据
       // this.resetData()
     },
-    // 数据处理
-    dealAry2(productParams) { //  number 转 boolean
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire == '1') {
-          item.paramRequire = true
-        } else {
-          item.paramRequire = false
-        }
-      })
-      return productParams
-    },
-    dealAry(productParams) { //  boolean 转 number
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire) {
-          item.paramRequire = '1'
-        } else {
-          item.paramRequire = '0'
-        }
-      })
-      return productParams
-    },
     save() {
       if (this.title == '品类新增') {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         C_add(this.categoryInfo).then(res => {
-          console.log(res, res != '')
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '保存成功',
               type: 'success'
@@ -278,10 +223,11 @@
           }
         })
       } else {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
+        // this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         console.log(this.categoryInfo.productParams)
+        debugger
         C_update(this.categoryInfo).then(res => {
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '更新成功',
               type: 'success'
@@ -349,12 +295,12 @@
   }
 
   .AddContent {
-    max-height: 180px;
+    //max-height: 180px;
     overflow: auto;
     border-radius: 5px;
     box-sizing: border-box;
-    border: 1px solid #999;
-    padding: 10px;
+    border: 1px solid #c9c9c9;
+    padding: 10px 10px 20px;
 
     .addBtn {
       margin-bottom: 10px;
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index ad5fd28..be10d16 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,7 +1,7 @@
 <!--品类详情弹窗-->
 <template>
   <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="contanier">
+    <div class="contanier" v-if="dataInfo">
       <div class="box">
         <!--        <div class="item">-->
         <!--          <div class="title">序号</div>-->
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 05ca97c..ad214c5 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -121,10 +121,11 @@
       <div class="parameters">
         <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
           <el-row :gutter="20">
-            <el-col v-for="param of paramForm" :span="8">
-              <el-form-item :label="param.paramName" prop="internationalCode" :required="param.paramRequire==1">
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" />
-              </el-form-item>
+            <el-col v-for="param of paramValueList" :span="8">
+              <div style="width: 100%; display: flex;align-items: center">
+                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
+                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              </div>
             </el-col>
           </el-row>
         </el-form>
@@ -147,8 +148,10 @@
 import { SelectList } from '@/api/product/brand'
 import { C_list, C_paramsList } from '@/api/product/category'
 import { add, update } from '@/api/product/product'
+import RedStar from '@/components/mycomponent/redStar'
 
 export default {
+  components: { RedStar },
   props: {
     title: {
       type: String,
@@ -191,7 +194,7 @@
         productNetworkMode: '1',
         productPicture: ''
       },
-      paramForm: [
+      paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
         // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
         // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
@@ -225,6 +228,9 @@
           productNetworkMode: row.productNetworkMode,
           productPicture: row.productPicture
         }
+        if (row.categoryId) {
+          this.fetchParams(row.categoryId)
+        }
       } else {
         this.resetForm()
       }
@@ -249,11 +255,12 @@
         this.categoryList = res.data
       })
     },
+    // 获取品类参数列表
     fetchParams(categoryId) {
       C_paramsList(categoryId).then(res => {
         if (res.code === 200) {
-          this.paramForm = res.data.map(item => {
-            return { paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
+          this.paramValueList = res.data.map(item => {
+            return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
           })
         }
       })
@@ -274,6 +281,7 @@
         productMaterialQuality: '',
         productPicture: ''
       }
+      this.paramValueList = []
     },
     // 照片上传
     handleAvatarSuccess(res, file) {
@@ -296,22 +304,27 @@
     },
     // 新增
     save() {
+      this.addInfo.paramValueList = this.paramValueList.map(item => {
+        return {
+          paramId: item.paramId,
+          paramName: item.paramName,
+          paramValue: item.paramValue
+        }
+      })
       if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
-          console.log(res, 'add')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('保存成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       } else {
         update(this.addInfo).then(res => {
-          console.log(res, 'update')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('更新成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       }
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 9770d3c..7cdd378 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,31 +1,29 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
-      <sidebar class="sidebar-container"  :isCollapse="isCollapse"/>
+      <sidebar class="sidebar-container" :is-collapse="isCollapse" />
       <!--右半部分-->
-      <div :class="{hasTagsView:needTagsView}" class="main-container" >
-
-<!--        <nav-item   v-model="isCollapse" ></nav-item>-->
+      <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <!--        <nav-item   v-model="isCollapse" ></nav-item>-->
         <!--开启固定头部设置-->
         <div v-if="fixedHeader">
           <!--导航(面包屑)-->
-          <navbar v-if="breadcrumb"/>
+          <navbar v-if="breadcrumb" />
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
 
-          <div  :style="{height:(bodyHeight-40)+'px'}" class="no-head-scrollbar"  >
-            <app-main   />
-          </div>
+          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
+            <app-main />
+          </el-scrollbar>
         </div>
         <!--为开始固定头部设置-->
         <div v-else>
           <!--导航，tagsView都包裹在el-scrollbar中-->
-          <el-scrollbar class="has-head-scrollbar"  >
+          <el-scrollbar class="has-head-scrollbar">
             <navbar v-if="breadcrumb" />
             <tags-view v-if="needTagsView" />
             <app-main />
@@ -61,7 +59,7 @@
     AppMain,
     RightPanel,
     NavItem
-},
+  },
   mixins: [ResizeMixin],
   computed: {
     ...mapState({
@@ -75,7 +73,7 @@
     }),
     classObj() {
       return {
-       hideSidebar:this.isCollapse,  // 控制缩放
+        hideSidebar: this.isCollapse, // 控制缩放
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -86,16 +84,16 @@
       }
     }
   },
-  data(){
-    return{
-      isCollapse:false
+  data() {
+    return {
+      isCollapse: false
     }
   },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
-  },
+  }
 
 }
 </script>
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index be5bf7a..4bf0d0d 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,9 +1,9 @@
 <template>
   <section class="app-main">
-    <transition name="fade-transform" mode="out-in" >
+    <transition name="fade-transform" mode="out-in">
       <!-- or name="fade" -->
       <!-- <router-view :key="key"></router-view> -->
-      <div >
+      <div>
         <keep-alive>
           <router-view v-if="$route.meta.keepAlive" :key="key" />
         </keep-alive>
@@ -31,10 +31,10 @@
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  /* min-height: calc(100vh - 50px); */
+  /*min-height: calc(100vh - 50px);*/
   position: relative;
-  /* height: 100%; */
-  min-width:1525px;
-  min-width: 1625px;
+  /*height: 100%;*/
+  /*min-width:1525px;*/
+  /*min-width: 1625px;*/
 }
 </style>
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 25e8631..901c863 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -114,17 +114,13 @@
 }
 .no-head-scrollbar, has-head-scrollbar{
   .el-scrollbar__wrap{
-    // overflow-x: hidden;
+    overflow-x: hidden;
     padding: 10px;
-    background-color: #ebebeb;
-    //margin: 0 !important;
+    background-color: #fff;
   }
 }
 .no-head-scrollbar{
   //height: calc(100vh - 138px);
-  overflow: auto;
-  padding: 20px ;
-  box-sizing: border-box;
 }
 
 .app-body{

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 2e5e3c4..cd629df 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "后台管理系统",
+  "title": "智慧型厨房AIOT物联管理平台",
   "subtitle": "",
   "theme": "blue",
   "baseUrl": "http://111.198.10.15:21403/",
@@ -8,4 +8,4 @@
   "provinceCode": "360000",
   "cityCode": "361000",
   "areaCode": "361024"
-}
\ No newline at end of file
+}
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c48b9cf..4e547d4 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -29,9 +29,9 @@
               >
                 <el-option
                   v-for="item in categoryList"
-                  :key="item.id"
+                  :key="item.categoryCode"
                   :label="item.categoryName"
-                  :value="item.id"
+                  :value="item.categoryCode"
                 />
               </el-select>
             </input-vue>
@@ -84,7 +84,7 @@
             添加产品参数
           </el-button>
         </div>
-        <div v-for=" ( item,index) in categoryInfo.productParams" :key="index">
+        <div v-for=" (item,index) in categoryInfo.productParams" :key="index">
           <div class="addItem">
             <div class="devName item">
               <red-star />
@@ -97,10 +97,9 @@
               </input-vue>
             </div>
             <div class="isRequire item">
-              <red-star />
               <input-vue title="" class="inputWidth">
-                <el-checkbox v-model="item.paramRequire">
-                  是否必填
+                <el-checkbox v-model="item.paramRequire" true-label="1" false-label="0">
+                  必填
                 </el-checkbox>
               </input-vue>
             </div>
@@ -136,10 +135,8 @@
 export default {
   components: {
     inputVue,
-    dialogHeader,
     InputNumber,
-    RedStar,
-    Message
+    RedStar
   },
   props: {
     isShowInfo: {
@@ -176,33 +173,18 @@
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla !== '') {
           // 编辑操作
           if (!vla.id) return
           detail({ id: vla.id }).then(res => {
-            this.categoryInfo.id = res.id
-            this.categoryInfo.categoryCode = res.categoryCode
-            this.categoryInfo.categoryName = res.categoryName
-            this.categoryInfo.pCategoryCode = res.pCategoryCode
-            this.categoryInfo.remark = res.remark
-            this.categoryInfo.qualifyIds = res.qualifyIds
-            this.categoryInfo.productParams = this.dealAry2(res.productParams)
+            this.categoryInfo.id = res.data.id
+            this.categoryInfo.categoryCode = res.data.categoryCode
+            this.categoryInfo.categoryName = res.data.categoryName
+            this.categoryInfo.pCategoryCode = res.data.pCategoryCode
+            this.categoryInfo.remark = res.data.remark
+            this.categoryInfo.qualifyIds = res.data.qualifyIds
+            this.categoryInfo.productParams = res.data.productParams
           })
-          // this.categoryInfo.id = vla.id
-          // this.categoryInfo.categoryCode=vla.categoryCode
-          // this.categoryInfo.categoryName=vla.categoryName
-          // this.categoryInfo.pCategoryCode=vla.pCategoryCode
-          // this.categoryInfo.remark=vla.remark
-          // this.categoryInfo.qualifyIds=vla.qualifyIds
-          // this.categoryInfo.productParams=this.dealAry2(vla.productParams)
-          // this.categoryInfo = {
-          //   id:vla.id,
-          //   categoryCode:vla.categoryCode,
-          //   categoryName:vla.categoryName,
-          //   pCategoryCode:vla.pCategoryCode,
-          //   remark:vla.qualifyIds,
-          //   qualifyIds:vla.qualifyIds
-          // }
         } else {
           this.resetData()
         }
@@ -226,47 +208,10 @@
       // 重置数据
       // this.resetData()
     },
-    // 数据处理
-    dealAry2(productParams) { //  number 转 boolean
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire == '1') {
-          item.paramRequire = true
-        } else {
-          item.paramRequire = false
-        }
-      })
-      return productParams
-    },
-    dealAry(productParams) { //  boolean 转 number
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire) {
-          item.paramRequire = '1'
-        } else {
-          item.paramRequire = '0'
-        }
-      })
-      return productParams
-    },
     save() {
       if (this.title == '品类新增') {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         C_add(this.categoryInfo).then(res => {
-          console.log(res, res != '')
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '保存成功',
               type: 'success'
@@ -278,10 +223,11 @@
           }
         })
       } else {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
+        // this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         console.log(this.categoryInfo.productParams)
+        debugger
         C_update(this.categoryInfo).then(res => {
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '更新成功',
               type: 'success'
@@ -349,12 +295,12 @@
   }
 
   .AddContent {
-    max-height: 180px;
+    //max-height: 180px;
     overflow: auto;
     border-radius: 5px;
     box-sizing: border-box;
-    border: 1px solid #999;
-    padding: 10px;
+    border: 1px solid #c9c9c9;
+    padding: 10px 10px 20px;
 
     .addBtn {
       margin-bottom: 10px;
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index ad5fd28..be10d16 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,7 +1,7 @@
 <!--品类详情弹窗-->
 <template>
   <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="contanier">
+    <div class="contanier" v-if="dataInfo">
       <div class="box">
         <!--        <div class="item">-->
         <!--          <div class="title">序号</div>-->
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 05ca97c..ad214c5 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -121,10 +121,11 @@
       <div class="parameters">
         <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
           <el-row :gutter="20">
-            <el-col v-for="param of paramForm" :span="8">
-              <el-form-item :label="param.paramName" prop="internationalCode" :required="param.paramRequire==1">
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" />
-              </el-form-item>
+            <el-col v-for="param of paramValueList" :span="8">
+              <div style="width: 100%; display: flex;align-items: center">
+                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
+                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              </div>
             </el-col>
           </el-row>
         </el-form>
@@ -147,8 +148,10 @@
 import { SelectList } from '@/api/product/brand'
 import { C_list, C_paramsList } from '@/api/product/category'
 import { add, update } from '@/api/product/product'
+import RedStar from '@/components/mycomponent/redStar'
 
 export default {
+  components: { RedStar },
   props: {
     title: {
       type: String,
@@ -191,7 +194,7 @@
         productNetworkMode: '1',
         productPicture: ''
       },
-      paramForm: [
+      paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
         // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
         // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
@@ -225,6 +228,9 @@
           productNetworkMode: row.productNetworkMode,
           productPicture: row.productPicture
         }
+        if (row.categoryId) {
+          this.fetchParams(row.categoryId)
+        }
       } else {
         this.resetForm()
       }
@@ -249,11 +255,12 @@
         this.categoryList = res.data
       })
     },
+    // 获取品类参数列表
     fetchParams(categoryId) {
       C_paramsList(categoryId).then(res => {
         if (res.code === 200) {
-          this.paramForm = res.data.map(item => {
-            return { paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
+          this.paramValueList = res.data.map(item => {
+            return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
           })
         }
       })
@@ -274,6 +281,7 @@
         productMaterialQuality: '',
         productPicture: ''
       }
+      this.paramValueList = []
     },
     // 照片上传
     handleAvatarSuccess(res, file) {
@@ -296,22 +304,27 @@
     },
     // 新增
     save() {
+      this.addInfo.paramValueList = this.paramValueList.map(item => {
+        return {
+          paramId: item.paramId,
+          paramName: item.paramName,
+          paramValue: item.paramValue
+        }
+      })
       if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
-          console.log(res, 'add')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('保存成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       } else {
         update(this.addInfo).then(res => {
-          console.log(res, 'update')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('更新成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       }
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 9770d3c..7cdd378 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,31 +1,29 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
-      <sidebar class="sidebar-container"  :isCollapse="isCollapse"/>
+      <sidebar class="sidebar-container" :is-collapse="isCollapse" />
       <!--右半部分-->
-      <div :class="{hasTagsView:needTagsView}" class="main-container" >
-
-<!--        <nav-item   v-model="isCollapse" ></nav-item>-->
+      <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <!--        <nav-item   v-model="isCollapse" ></nav-item>-->
         <!--开启固定头部设置-->
         <div v-if="fixedHeader">
           <!--导航(面包屑)-->
-          <navbar v-if="breadcrumb"/>
+          <navbar v-if="breadcrumb" />
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
 
-          <div  :style="{height:(bodyHeight-40)+'px'}" class="no-head-scrollbar"  >
-            <app-main   />
-          </div>
+          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
+            <app-main />
+          </el-scrollbar>
         </div>
         <!--为开始固定头部设置-->
         <div v-else>
           <!--导航，tagsView都包裹在el-scrollbar中-->
-          <el-scrollbar class="has-head-scrollbar"  >
+          <el-scrollbar class="has-head-scrollbar">
             <navbar v-if="breadcrumb" />
             <tags-view v-if="needTagsView" />
             <app-main />
@@ -61,7 +59,7 @@
     AppMain,
     RightPanel,
     NavItem
-},
+  },
   mixins: [ResizeMixin],
   computed: {
     ...mapState({
@@ -75,7 +73,7 @@
     }),
     classObj() {
       return {
-       hideSidebar:this.isCollapse,  // 控制缩放
+        hideSidebar: this.isCollapse, // 控制缩放
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -86,16 +84,16 @@
       }
     }
   },
-  data(){
-    return{
-      isCollapse:false
+  data() {
+    return {
+      isCollapse: false
     }
   },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
-  },
+  }
 
 }
 </script>
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index be5bf7a..4bf0d0d 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,9 +1,9 @@
 <template>
   <section class="app-main">
-    <transition name="fade-transform" mode="out-in" >
+    <transition name="fade-transform" mode="out-in">
       <!-- or name="fade" -->
       <!-- <router-view :key="key"></router-view> -->
-      <div >
+      <div>
         <keep-alive>
           <router-view v-if="$route.meta.keepAlive" :key="key" />
         </keep-alive>
@@ -31,10 +31,10 @@
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  /* min-height: calc(100vh - 50px); */
+  /*min-height: calc(100vh - 50px);*/
   position: relative;
-  /* height: 100%; */
-  min-width:1525px;
-  min-width: 1625px;
+  /*height: 100%;*/
+  /*min-width:1525px;*/
+  /*min-width: 1625px;*/
 }
 </style>
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 25e8631..901c863 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -114,17 +114,13 @@
 }
 .no-head-scrollbar, has-head-scrollbar{
   .el-scrollbar__wrap{
-    // overflow-x: hidden;
+    overflow-x: hidden;
     padding: 10px;
-    background-color: #ebebeb;
-    //margin: 0 !important;
+    background-color: #fff;
   }
 }
 .no-head-scrollbar{
   //height: calc(100vh - 138px);
-  overflow: auto;
-  padding: 20px ;
-  box-sizing: border-box;
 }
 
 .app-body{
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 78f42bd..d01ea1d 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -68,7 +68,7 @@
 
     <el-table
       ref="multipleTable"
-      :data="tableData.rows"
+      :data="tableData"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
         'text-align': 'center',
@@ -183,10 +183,18 @@
     closeAdd() {
       this.isShowAdd = false
     },
-
     addCategory() {
       this.isShowAdd = true
-      this.dataInfo = ''
+      this.dataInfo = {
+        categoryCode: '',
+        categoryName: '',
+        pCategoryCode: '',
+        remark: '',
+        qualifyids: [],
+        productParams: [
+          { paramName: '', paramOrder: 1, paramRequire: 1 }
+        ]
+      }
       this.title = '品类新增'
     },
     reset() {
@@ -194,12 +202,10 @@
         categoryCode: '',
         categoryName: ''
       }
-      // this.queryInfo = { ...this.selectInfo}
     },
     // 获取指定页面
     getListPage(limit, offset) {
       C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        debugger
         if (res.code === 200) {
           // 得到相关数据
           this.tableData = res.data.rows
@@ -280,7 +286,7 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;

diff --git a/public/config/project.config.json b/public/config/project.config.json
index 2e5e3c4..cd629df 100644
--- a/public/config/project.config.json
+++ b/public/config/project.config.json
@@ -1,5 +1,5 @@
 {
-  "title": "后台管理系统",
+  "title": "智慧型厨房AIOT物联管理平台",
   "subtitle": "",
   "theme": "blue",
   "baseUrl": "http://111.198.10.15:21403/",
@@ -8,4 +8,4 @@
   "provinceCode": "360000",
   "cityCode": "361000",
   "areaCode": "361024"
-}
\ No newline at end of file
+}
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index c48b9cf..4e547d4 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -29,9 +29,9 @@
               >
                 <el-option
                   v-for="item in categoryList"
-                  :key="item.id"
+                  :key="item.categoryCode"
                   :label="item.categoryName"
-                  :value="item.id"
+                  :value="item.categoryCode"
                 />
               </el-select>
             </input-vue>
@@ -84,7 +84,7 @@
             添加产品参数
           </el-button>
         </div>
-        <div v-for=" ( item,index) in categoryInfo.productParams" :key="index">
+        <div v-for=" (item,index) in categoryInfo.productParams" :key="index">
           <div class="addItem">
             <div class="devName item">
               <red-star />
@@ -97,10 +97,9 @@
               </input-vue>
             </div>
             <div class="isRequire item">
-              <red-star />
               <input-vue title="" class="inputWidth">
-                <el-checkbox v-model="item.paramRequire">
-                  是否必填
+                <el-checkbox v-model="item.paramRequire" true-label="1" false-label="0">
+                  必填
                 </el-checkbox>
               </input-vue>
             </div>
@@ -136,10 +135,8 @@
 export default {
   components: {
     inputVue,
-    dialogHeader,
     InputNumber,
-    RedStar,
-    Message
+    RedStar
   },
   props: {
     isShowInfo: {
@@ -176,33 +173,18 @@
   watch: {
     dataInfo: {
       handler(vla) {
-        if (vla != '') {
+        if (vla !== '') {
           // 编辑操作
           if (!vla.id) return
           detail({ id: vla.id }).then(res => {
-            this.categoryInfo.id = res.id
-            this.categoryInfo.categoryCode = res.categoryCode
-            this.categoryInfo.categoryName = res.categoryName
-            this.categoryInfo.pCategoryCode = res.pCategoryCode
-            this.categoryInfo.remark = res.remark
-            this.categoryInfo.qualifyIds = res.qualifyIds
-            this.categoryInfo.productParams = this.dealAry2(res.productParams)
+            this.categoryInfo.id = res.data.id
+            this.categoryInfo.categoryCode = res.data.categoryCode
+            this.categoryInfo.categoryName = res.data.categoryName
+            this.categoryInfo.pCategoryCode = res.data.pCategoryCode
+            this.categoryInfo.remark = res.data.remark
+            this.categoryInfo.qualifyIds = res.data.qualifyIds
+            this.categoryInfo.productParams = res.data.productParams
           })
-          // this.categoryInfo.id = vla.id
-          // this.categoryInfo.categoryCode=vla.categoryCode
-          // this.categoryInfo.categoryName=vla.categoryName
-          // this.categoryInfo.pCategoryCode=vla.pCategoryCode
-          // this.categoryInfo.remark=vla.remark
-          // this.categoryInfo.qualifyIds=vla.qualifyIds
-          // this.categoryInfo.productParams=this.dealAry2(vla.productParams)
-          // this.categoryInfo = {
-          //   id:vla.id,
-          //   categoryCode:vla.categoryCode,
-          //   categoryName:vla.categoryName,
-          //   pCategoryCode:vla.pCategoryCode,
-          //   remark:vla.qualifyIds,
-          //   qualifyIds:vla.qualifyIds
-          // }
         } else {
           this.resetData()
         }
@@ -226,47 +208,10 @@
       // 重置数据
       // this.resetData()
     },
-    // 数据处理
-    dealAry2(productParams) { //  number 转 boolean
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire == '1') {
-          item.paramRequire = true
-        } else {
-          item.paramRequire = false
-        }
-      })
-      return productParams
-    },
-    dealAry(productParams) { //  boolean 转 number
-      if (productParams.lenght < 1 || productParams == '') {
-        return [{
-          paramName: '',
-          paramOrder: 0,
-          paramRequire: false
-        }]
-      }
-      productParams.forEach(item => {
-        if (item.paramRequire) {
-          item.paramRequire = '1'
-        } else {
-          item.paramRequire = '0'
-        }
-      })
-      return productParams
-    },
     save() {
       if (this.title == '品类新增') {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         C_add(this.categoryInfo).then(res => {
-          console.log(res, res != '')
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '保存成功',
               type: 'success'
@@ -278,10 +223,11 @@
           }
         })
       } else {
-        this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
+        // this.categoryInfo.productParams = this.dealAry(this.categoryInfo.productParams)
         console.log(this.categoryInfo.productParams)
+        debugger
         C_update(this.categoryInfo).then(res => {
-          if (res != '') {
+          if (res.code === 200) {
             this.$message({
               message: '更新成功',
               type: 'success'
@@ -349,12 +295,12 @@
   }
 
   .AddContent {
-    max-height: 180px;
+    //max-height: 180px;
     overflow: auto;
     border-radius: 5px;
     box-sizing: border-box;
-    border: 1px solid #999;
-    padding: 10px;
+    border: 1px solid #c9c9c9;
+    padding: 10px 10px 20px;
 
     .addBtn {
       margin-bottom: 10px;
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index ad5fd28..be10d16 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,7 +1,7 @@
 <!--品类详情弹窗-->
 <template>
   <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
-    <div class="contanier">
+    <div class="contanier" v-if="dataInfo">
       <div class="box">
         <!--        <div class="item">-->
         <!--          <div class="title">序号</div>-->
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 05ca97c..ad214c5 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -121,10 +121,11 @@
       <div class="parameters">
         <el-form ref="paramsForm" class="inputContent" label-position="right" label-width="120px">
           <el-row :gutter="20">
-            <el-col v-for="param of paramForm" :span="8">
-              <el-form-item :label="param.paramName" prop="internationalCode" :required="param.paramRequire==1">
-                <el-input v-model.trim="param.paramValue" type="text" placeholder="" />
-              </el-form-item>
+            <el-col v-for="param of paramValueList" :span="8">
+              <div style="width: 100%; display: flex;align-items: center">
+                <span style="margin-right: 10px"><red-star v-show="param.paramRequire==1" style="margin-right: 4px" />{{ param.paramName }}</span>
+                <el-input v-model.trim="param.paramValue" type="text" placeholder="" style="flex:1" />
+              </div>
             </el-col>
           </el-row>
         </el-form>
@@ -147,8 +148,10 @@
 import { SelectList } from '@/api/product/brand'
 import { C_list, C_paramsList } from '@/api/product/category'
 import { add, update } from '@/api/product/product'
+import RedStar from '@/components/mycomponent/redStar'
 
 export default {
+  components: { RedStar },
   props: {
     title: {
       type: String,
@@ -191,7 +194,7 @@
         productNetworkMode: '1',
         productPicture: ''
       },
-      paramForm: [
+      paramValueList: [
         // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
         // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
         // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
@@ -225,6 +228,9 @@
           productNetworkMode: row.productNetworkMode,
           productPicture: row.productPicture
         }
+        if (row.categoryId) {
+          this.fetchParams(row.categoryId)
+        }
       } else {
         this.resetForm()
       }
@@ -249,11 +255,12 @@
         this.categoryList = res.data
       })
     },
+    // 获取品类参数列表
     fetchParams(categoryId) {
       C_paramsList(categoryId).then(res => {
         if (res.code === 200) {
-          this.paramForm = res.data.map(item => {
-            return { paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
+          this.paramValueList = res.data.map(item => {
+            return { paramId: item.id, paramName: item.paramName, paramOrder: item.paramOrder, paramRequire: item.paramRequire, paramValue: '' }
           })
         }
       })
@@ -274,6 +281,7 @@
         productMaterialQuality: '',
         productPicture: ''
       }
+      this.paramValueList = []
     },
     // 照片上传
     handleAvatarSuccess(res, file) {
@@ -296,22 +304,27 @@
     },
     // 新增
     save() {
+      this.addInfo.paramValueList = this.paramValueList.map(item => {
+        return {
+          paramId: item.paramId,
+          paramName: item.paramName,
+          paramValue: item.paramValue
+        }
+      })
       if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
-          console.log(res, 'add')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('保存成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       } else {
         update(this.addInfo).then(res => {
-          console.log(res, 'update')
-          if (!res.code) {
-            this.close()
-            this.$emit('refresh')
+          if (res.code === 200) {
             Message.success('更新成功')
+            this.$emit('refresh')
+            this.close()
           }
         })
       }
diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index 9770d3c..7cdd378 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -1,31 +1,29 @@
 <template>
   <el-container :class="classObj" class="app-wrapper">
-
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <app-header id="app-header" class="app-header" />
     <el-main class="app-body">
       <!--侧边栏-->
-      <sidebar class="sidebar-container"  :isCollapse="isCollapse"/>
+      <sidebar class="sidebar-container" :is-collapse="isCollapse" />
       <!--右半部分-->
-      <div :class="{hasTagsView:needTagsView}" class="main-container" >
-
-<!--        <nav-item   v-model="isCollapse" ></nav-item>-->
+      <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <!--        <nav-item   v-model="isCollapse" ></nav-item>-->
         <!--开启固定头部设置-->
         <div v-if="fixedHeader">
           <!--导航(面包屑)-->
-          <navbar v-if="breadcrumb"/>
+          <navbar v-if="breadcrumb" />
           <!--标签栏-->
           <tags-view v-if="needTagsView" />
           <!--主内容包裹在el-scrollbar中-->
 
-          <div  :style="{height:(bodyHeight-40)+'px'}" class="no-head-scrollbar"  >
-            <app-main   />
-          </div>
+          <el-scrollbar :style="{height:bodyHeight+'px'}" class="no-head-scrollbar">
+            <app-main />
+          </el-scrollbar>
         </div>
         <!--为开始固定头部设置-->
         <div v-else>
           <!--导航，tagsView都包裹在el-scrollbar中-->
-          <el-scrollbar class="has-head-scrollbar"  >
+          <el-scrollbar class="has-head-scrollbar">
             <navbar v-if="breadcrumb" />
             <tags-view v-if="needTagsView" />
             <app-main />
@@ -61,7 +59,7 @@
     AppMain,
     RightPanel,
     NavItem
-},
+  },
   mixins: [ResizeMixin],
   computed: {
     ...mapState({
@@ -75,7 +73,7 @@
     }),
     classObj() {
       return {
-       hideSidebar:this.isCollapse,  // 控制缩放
+        hideSidebar: this.isCollapse, // 控制缩放
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile'
@@ -86,16 +84,16 @@
       }
     }
   },
-  data(){
-    return{
-      isCollapse:false
+  data() {
+    return {
+      isCollapse: false
     }
   },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('CloseSideBar', { withoutAnimation: false })
     }
-  },
+  }
 
 }
 </script>
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index be5bf7a..4bf0d0d 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,9 +1,9 @@
 <template>
   <section class="app-main">
-    <transition name="fade-transform" mode="out-in" >
+    <transition name="fade-transform" mode="out-in">
       <!-- or name="fade" -->
       <!-- <router-view :key="key"></router-view> -->
-      <div >
+      <div>
         <keep-alive>
           <router-view v-if="$route.meta.keepAlive" :key="key" />
         </keep-alive>
@@ -31,10 +31,10 @@
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  /* min-height: calc(100vh - 50px); */
+  /*min-height: calc(100vh - 50px);*/
   position: relative;
-  /* height: 100%; */
-  min-width:1525px;
-  min-width: 1625px;
+  /*height: 100%;*/
+  /*min-width:1525px;*/
+  /*min-width: 1625px;*/
 }
 </style>
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 25e8631..901c863 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -114,17 +114,13 @@
 }
 .no-head-scrollbar, has-head-scrollbar{
   .el-scrollbar__wrap{
-    // overflow-x: hidden;
+    overflow-x: hidden;
     padding: 10px;
-    background-color: #ebebeb;
-    //margin: 0 !important;
+    background-color: #fff;
   }
 }
 .no-head-scrollbar{
   //height: calc(100vh - 138px);
-  overflow: auto;
-  padding: 20px ;
-  box-sizing: border-box;
 }
 
 .app-body{
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 78f42bd..d01ea1d 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -68,7 +68,7 @@
 
     <el-table
       ref="multipleTable"
-      :data="tableData.rows"
+      :data="tableData"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
         'text-align': 'center',
@@ -183,10 +183,18 @@
     closeAdd() {
       this.isShowAdd = false
     },
-
     addCategory() {
       this.isShowAdd = true
-      this.dataInfo = ''
+      this.dataInfo = {
+        categoryCode: '',
+        categoryName: '',
+        pCategoryCode: '',
+        remark: '',
+        qualifyids: [],
+        productParams: [
+          { paramName: '', paramOrder: 1, paramRequire: 1 }
+        ]
+      }
       this.title = '品类新增'
     },
     reset() {
@@ -194,12 +202,10 @@
         categoryCode: '',
         categoryName: ''
       }
-      // this.queryInfo = { ...this.selectInfo}
     },
     // 获取指定页面
     getListPage(limit, offset) {
       C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
-        debugger
         if (res.code === 200) {
           // 得到相关数据
           this.tableData = res.data.rows
@@ -280,7 +286,7 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index afba9a4..7eb8d2f 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -2,42 +2,43 @@
 <template>
   <div class="product">
     <div class="product-inputs">
-      产品型号
-      <el-input v-model="productType" style="width: 200px" placeholder="请输入产品型号" clearable class="product-input" />
-
-      产品名称
-      <el-input v-model="productName" style="width: 200px" placeholder="请输入产品名称" clearable class="product-input" />
-
-      产品品类
-      <el-select
-        v-model="productCategory"
-        class="product-select"
-        filterable
-        placeholder="请输入或选择产品品类"
-        style="width: 200px"
-      >
-        <el-option
-          v-for="item in categoryList"
-          :key="item.categoryId"
-          :label="item.categoryName"
-          :value="item.categoryId"
-        />
-      </el-select>
-      <el-button type="primary" icon="el-icon-search" @click="searchClick">
-        搜索
-      </el-button>
-      <el-button type="primary" icon="el-icon-refresh-right" @click="reset">
-        重置
-      </el-button>
-      <el-button type="danger" icon="el-icon-delete" @click="BatchDeleteClick">
-        删除
-      </el-button>
-      <el-button type="success" icon="el-icon-circle-plus-outline" @click="addDialog">
-        新增
-      </el-button>
-      <el-button type="primary" icon="el-icon-folder-opened" @click="exportToExcel">
-        导出
-      </el-button>
+      <div style="margin-top: 10px">
+        <span>产品型号</span>
+        <el-input v-model="productType" placeholder="请输入产品型号" clearable class="product-input" />
+        <span>产品名称</span>
+        <el-input v-model="productName" placeholder="请输入产品名称" clearable class="product-input" />
+        <span>产品品类</span>
+        <el-select
+          v-model="productCategory"
+          class="product-select"
+          filterable
+          placeholder="请选择产品品类"
+        >
+          <el-option
+            v-for="item in categoryList"
+            :key="item.categoryId"
+            :label="item.categoryName"
+            :value="item.categoryId"
+          />
+        </el-select>
+      </div>
+      <div style="margin-top: 10px">
+        <el-button type="primary" icon="el-icon-search" @click="searchClick">
+          搜索
+        </el-button>
+        <el-button type="primary" icon="el-icon-refresh-right" @click="reset">
+          重置
+        </el-button>
+        <el-button type="danger" icon="el-icon-delete" @click="BatchDeleteClick">
+          删除
+        </el-button>
+        <el-button type="success" icon="el-icon-circle-plus-outline" @click="addDialog">
+          新增
+        </el-button>
+        <el-button type="primary" icon="el-icon-folder-opened" @click="exportToExcel">
+          导出
+        </el-button>
+      </div>
     </div>
     <div class="product-list">
       <el-table
@@ -300,16 +301,11 @@
 }
 
 .product-inputs {
-  .product-input {
-    margin: 0 2rem 0 0.5rem;
-  }
-
-  .product-select {
-    margin: 0 14rem 0 0.5rem;
-  }
-
-  .product-button {
-    margin-right: 1rem;
+  display: flex;
+  justify-content: space-between;
+  .product-input, .product-select {
+    margin: 0px 10px;
+    width: 150px;
   }
 }