diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 2ce9796..1ae0ac6 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -234,8 +234,8 @@
     },
     // 获取品牌所属品类
     fetchBrandCategories() {
-      C_list().then(response => {
-        this.categoryIdList = response
+      C_list().then(res => {
+        this.categoryIdList = res.data
       })
     },
     cancel: function() {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 2ce9796..1ae0ac6 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -234,8 +234,8 @@
     },
     // 获取品牌所属品类
     fetchBrandCategories() {
-      C_list().then(response => {
-        this.categoryIdList = response
+      C_list().then(res => {
+        this.categoryIdList = res.data
       })
     },
     cancel: function() {
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 66ea428..afba9a4 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -18,9 +18,9 @@
       >
         <el-option
           v-for="item in categoryList"
-          :key="item.categoryCode"
+          :key="item.categoryId"
           :label="item.categoryName"
-          :value="item.categoryCode"
+          :value="item.categoryId"
         />
       </el-select>
       <el-button type="primary" icon="el-icon-search" @click="searchClick">
@@ -49,7 +49,7 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="55" />
+        <!--        <el-table-column type="index" label="编号" width="55" />-->
         <el-table-column header-align="center" align="center" prop="id" label="序号" />
         <el-table-column header-align="center" align="center" prop="productCode" label="产品型号" />
         <el-table-column header-align="center" align="center" prop="productName" label="产品名称" />
@@ -84,13 +84,7 @@
       />
     </div>
     <productDetailDialog v-if="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
-    <product-list-add-dialog
-      v-if="isShowDialog"
-      :data-info="dataInfo"
-      :title="dialogTitle"
-      @close="addDialogClose"
-      @refresh="refresh"
-    />
+    <product-list-add-dialog v-show="isShowDialog" ref="addProduct" :title="dialogTitle" @close="addDialogClose" @refresh="refresh" />
     <productBindDialog v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
@@ -157,9 +151,12 @@
     }
   },
   mounted() {
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
+    const params = {
+      categoryCode: '',
+      categoryName: ''
+    }
+    C_list(params).then(res => {
+      this.categoryList = res.data
     })
     this.refresh()
   },
@@ -169,6 +166,7 @@
     addDialog() {
       this.isShowDialog = true
       this.dialogTitle = '新增产品'
+      this.$refs.addProduct.initDialog('add')
     },
     addDialogClose() {
       this.isShowDialog = false
@@ -196,7 +194,7 @@
       console.log(row)
       this.isShowDialog = true
       this.dialogTitle = '编辑产品'
-      this.dataInfo = row
+      this.$refs.addProduct.initDialog('edit', row)
     },
     // 详情
     handleDetail(row) {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 2ce9796..1ae0ac6 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -234,8 +234,8 @@
     },
     // 获取品牌所属品类
     fetchBrandCategories() {
-      C_list().then(response => {
-        this.categoryIdList = response
+      C_list().then(res => {
+        this.categoryIdList = res.data
       })
     },
     cancel: function() {
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 66ea428..afba9a4 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -18,9 +18,9 @@
       >
         <el-option
           v-for="item in categoryList"
-          :key="item.categoryCode"
+          :key="item.categoryId"
           :label="item.categoryName"
-          :value="item.categoryCode"
+          :value="item.categoryId"
         />
       </el-select>
       <el-button type="primary" icon="el-icon-search" @click="searchClick">
@@ -49,7 +49,7 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="55" />
+        <!--        <el-table-column type="index" label="编号" width="55" />-->
         <el-table-column header-align="center" align="center" prop="id" label="序号" />
         <el-table-column header-align="center" align="center" prop="productCode" label="产品型号" />
         <el-table-column header-align="center" align="center" prop="productName" label="产品名称" />
@@ -84,13 +84,7 @@
       />
     </div>
     <productDetailDialog v-if="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
-    <product-list-add-dialog
-      v-if="isShowDialog"
-      :data-info="dataInfo"
-      :title="dialogTitle"
-      @close="addDialogClose"
-      @refresh="refresh"
-    />
+    <product-list-add-dialog v-show="isShowDialog" ref="addProduct" :title="dialogTitle" @close="addDialogClose" @refresh="refresh" />
     <productBindDialog v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
@@ -157,9 +151,12 @@
     }
   },
   mounted() {
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
+    const params = {
+      categoryCode: '',
+      categoryName: ''
+    }
+    C_list(params).then(res => {
+      this.categoryList = res.data
     })
     this.refresh()
   },
@@ -169,6 +166,7 @@
     addDialog() {
       this.isShowDialog = true
       this.dialogTitle = '新增产品'
+      this.$refs.addProduct.initDialog('add')
     },
     addDialogClose() {
       this.isShowDialog = false
@@ -196,7 +194,7 @@
       console.log(row)
       this.isShowDialog = true
       this.dialogTitle = '编辑产品'
-      this.dataInfo = row
+      this.$refs.addProduct.initDialog('edit', row)
     },
     // 详情
     handleDetail(row) {
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 76de3b5..3481108 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -228,7 +228,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 2ce9796..1ae0ac6 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -234,8 +234,8 @@
     },
     // 获取品牌所属品类
     fetchBrandCategories() {
-      C_list().then(response => {
-        this.categoryIdList = response
+      C_list().then(res => {
+        this.categoryIdList = res.data
       })
     },
     cancel: function() {
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 66ea428..afba9a4 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -18,9 +18,9 @@
       >
         <el-option
           v-for="item in categoryList"
-          :key="item.categoryCode"
+          :key="item.categoryId"
           :label="item.categoryName"
-          :value="item.categoryCode"
+          :value="item.categoryId"
         />
       </el-select>
       <el-button type="primary" icon="el-icon-search" @click="searchClick">
@@ -49,7 +49,7 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="55" />
+        <!--        <el-table-column type="index" label="编号" width="55" />-->
         <el-table-column header-align="center" align="center" prop="id" label="序号" />
         <el-table-column header-align="center" align="center" prop="productCode" label="产品型号" />
         <el-table-column header-align="center" align="center" prop="productName" label="产品名称" />
@@ -84,13 +84,7 @@
       />
     </div>
     <productDetailDialog v-if="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
-    <product-list-add-dialog
-      v-if="isShowDialog"
-      :data-info="dataInfo"
-      :title="dialogTitle"
-      @close="addDialogClose"
-      @refresh="refresh"
-    />
+    <product-list-add-dialog v-show="isShowDialog" ref="addProduct" :title="dialogTitle" @close="addDialogClose" @refresh="refresh" />
     <productBindDialog v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
@@ -157,9 +151,12 @@
     }
   },
   mounted() {
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
+    const params = {
+      categoryCode: '',
+      categoryName: ''
+    }
+    C_list(params).then(res => {
+      this.categoryList = res.data
     })
     this.refresh()
   },
@@ -169,6 +166,7 @@
     addDialog() {
       this.isShowDialog = true
       this.dialogTitle = '新增产品'
+      this.$refs.addProduct.initDialog('add')
     },
     addDialogClose() {
       this.isShowDialog = false
@@ -196,7 +194,7 @@
       console.log(row)
       this.isShowDialog = true
       this.dialogTitle = '编辑产品'
-      this.dataInfo = row
+      this.$refs.addProduct.initDialog('edit', row)
     },
     // 详情
     handleDetail(row) {
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 76de3b5..3481108 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -228,7 +228,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 753c739..73da71e 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -220,7 +220,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 2ce9796..1ae0ac6 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -234,8 +234,8 @@
     },
     // 获取品牌所属品类
     fetchBrandCategories() {
-      C_list().then(response => {
-        this.categoryIdList = response
+      C_list().then(res => {
+        this.categoryIdList = res.data
       })
     },
     cancel: function() {
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 66ea428..afba9a4 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -18,9 +18,9 @@
       >
         <el-option
           v-for="item in categoryList"
-          :key="item.categoryCode"
+          :key="item.categoryId"
           :label="item.categoryName"
-          :value="item.categoryCode"
+          :value="item.categoryId"
         />
       </el-select>
       <el-button type="primary" icon="el-icon-search" @click="searchClick">
@@ -49,7 +49,7 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="55" />
+        <!--        <el-table-column type="index" label="编号" width="55" />-->
         <el-table-column header-align="center" align="center" prop="id" label="序号" />
         <el-table-column header-align="center" align="center" prop="productCode" label="产品型号" />
         <el-table-column header-align="center" align="center" prop="productName" label="产品名称" />
@@ -84,13 +84,7 @@
       />
     </div>
     <productDetailDialog v-if="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
-    <product-list-add-dialog
-      v-if="isShowDialog"
-      :data-info="dataInfo"
-      :title="dialogTitle"
-      @close="addDialogClose"
-      @refresh="refresh"
-    />
+    <product-list-add-dialog v-show="isShowDialog" ref="addProduct" :title="dialogTitle" @close="addDialogClose" @refresh="refresh" />
     <productBindDialog v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
@@ -157,9 +151,12 @@
     }
   },
   mounted() {
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
+    const params = {
+      categoryCode: '',
+      categoryName: ''
+    }
+    C_list(params).then(res => {
+      this.categoryList = res.data
     })
     this.refresh()
   },
@@ -169,6 +166,7 @@
     addDialog() {
       this.isShowDialog = true
       this.dialogTitle = '新增产品'
+      this.$refs.addProduct.initDialog('add')
     },
     addDialogClose() {
       this.isShowDialog = false
@@ -196,7 +194,7 @@
       console.log(row)
       this.isShowDialog = true
       this.dialogTitle = '编辑产品'
-      this.dataInfo = row
+      this.$refs.addProduct.initDialog('edit', row)
     },
     // 详情
     handleDetail(row) {
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 76de3b5..3481108 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -228,7 +228,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 753c739..73da71e 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -220,7 +220,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 0904036..36e1a2d 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -145,7 +145,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 2ce9796..1ae0ac6 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -234,8 +234,8 @@
     },
     // 获取品牌所属品类
     fetchBrandCategories() {
-      C_list().then(response => {
-        this.categoryIdList = response
+      C_list().then(res => {
+        this.categoryIdList = res.data
       })
     },
     cancel: function() {
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 66ea428..afba9a4 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -18,9 +18,9 @@
       >
         <el-option
           v-for="item in categoryList"
-          :key="item.categoryCode"
+          :key="item.categoryId"
           :label="item.categoryName"
-          :value="item.categoryCode"
+          :value="item.categoryId"
         />
       </el-select>
       <el-button type="primary" icon="el-icon-search" @click="searchClick">
@@ -49,7 +49,7 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="55" />
+        <!--        <el-table-column type="index" label="编号" width="55" />-->
         <el-table-column header-align="center" align="center" prop="id" label="序号" />
         <el-table-column header-align="center" align="center" prop="productCode" label="产品型号" />
         <el-table-column header-align="center" align="center" prop="productName" label="产品名称" />
@@ -84,13 +84,7 @@
       />
     </div>
     <productDetailDialog v-if="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
-    <product-list-add-dialog
-      v-if="isShowDialog"
-      :data-info="dataInfo"
-      :title="dialogTitle"
-      @close="addDialogClose"
-      @refresh="refresh"
-    />
+    <product-list-add-dialog v-show="isShowDialog" ref="addProduct" :title="dialogTitle" @close="addDialogClose" @refresh="refresh" />
     <productBindDialog v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
@@ -157,9 +151,12 @@
     }
   },
   mounted() {
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
+    const params = {
+      categoryCode: '',
+      categoryName: ''
+    }
+    C_list(params).then(res => {
+      this.categoryList = res.data
     })
     this.refresh()
   },
@@ -169,6 +166,7 @@
     addDialog() {
       this.isShowDialog = true
       this.dialogTitle = '新增产品'
+      this.$refs.addProduct.initDialog('add')
     },
     addDialogClose() {
       this.isShowDialog = false
@@ -196,7 +194,7 @@
       console.log(row)
       this.isShowDialog = true
       this.dialogTitle = '编辑产品'
-      this.dataInfo = row
+      this.$refs.addProduct.initDialog('edit', row)
     },
     // 详情
     handleDetail(row) {
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 76de3b5..3481108 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -228,7 +228,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 753c739..73da71e 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -220,7 +220,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 0904036..36e1a2d 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -145,7 +145,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index fa0e08c..1f84e63 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -176,7 +176,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 2ce9796..1ae0ac6 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -234,8 +234,8 @@
     },
     // 获取品牌所属品类
     fetchBrandCategories() {
-      C_list().then(response => {
-        this.categoryIdList = response
+      C_list().then(res => {
+        this.categoryIdList = res.data
       })
     },
     cancel: function() {
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 66ea428..afba9a4 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -18,9 +18,9 @@
       >
         <el-option
           v-for="item in categoryList"
-          :key="item.categoryCode"
+          :key="item.categoryId"
           :label="item.categoryName"
-          :value="item.categoryCode"
+          :value="item.categoryId"
         />
       </el-select>
       <el-button type="primary" icon="el-icon-search" @click="searchClick">
@@ -49,7 +49,7 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="55" />
+        <!--        <el-table-column type="index" label="编号" width="55" />-->
         <el-table-column header-align="center" align="center" prop="id" label="序号" />
         <el-table-column header-align="center" align="center" prop="productCode" label="产品型号" />
         <el-table-column header-align="center" align="center" prop="productName" label="产品名称" />
@@ -84,13 +84,7 @@
       />
     </div>
     <productDetailDialog v-if="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
-    <product-list-add-dialog
-      v-if="isShowDialog"
-      :data-info="dataInfo"
-      :title="dialogTitle"
-      @close="addDialogClose"
-      @refresh="refresh"
-    />
+    <product-list-add-dialog v-show="isShowDialog" ref="addProduct" :title="dialogTitle" @close="addDialogClose" @refresh="refresh" />
     <productBindDialog v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
@@ -157,9 +151,12 @@
     }
   },
   mounted() {
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
+    const params = {
+      categoryCode: '',
+      categoryName: ''
+    }
+    C_list(params).then(res => {
+      this.categoryList = res.data
     })
     this.refresh()
   },
@@ -169,6 +166,7 @@
     addDialog() {
       this.isShowDialog = true
       this.dialogTitle = '新增产品'
+      this.$refs.addProduct.initDialog('add')
     },
     addDialogClose() {
       this.isShowDialog = false
@@ -196,7 +194,7 @@
       console.log(row)
       this.isShowDialog = true
       this.dialogTitle = '编辑产品'
-      this.dataInfo = row
+      this.$refs.addProduct.initDialog('edit', row)
     },
     // 详情
     handleDetail(row) {
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 76de3b5..3481108 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -228,7 +228,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 753c739..73da71e 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -220,7 +220,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 0904036..36e1a2d 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -145,7 +145,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index fa0e08c..1f84e63 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -176,7 +176,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index 1be9ae3..f573fd8 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -231,7 +231,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 2ce9796..1ae0ac6 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -234,8 +234,8 @@
     },
     // 获取品牌所属品类
     fetchBrandCategories() {
-      C_list().then(response => {
-        this.categoryIdList = response
+      C_list().then(res => {
+        this.categoryIdList = res.data
       })
     },
     cancel: function() {
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 66ea428..afba9a4 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -18,9 +18,9 @@
       >
         <el-option
           v-for="item in categoryList"
-          :key="item.categoryCode"
+          :key="item.categoryId"
           :label="item.categoryName"
-          :value="item.categoryCode"
+          :value="item.categoryId"
         />
       </el-select>
       <el-button type="primary" icon="el-icon-search" @click="searchClick">
@@ -49,7 +49,7 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="55" />
+        <!--        <el-table-column type="index" label="编号" width="55" />-->
         <el-table-column header-align="center" align="center" prop="id" label="序号" />
         <el-table-column header-align="center" align="center" prop="productCode" label="产品型号" />
         <el-table-column header-align="center" align="center" prop="productName" label="产品名称" />
@@ -84,13 +84,7 @@
       />
     </div>
     <productDetailDialog v-if="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
-    <product-list-add-dialog
-      v-if="isShowDialog"
-      :data-info="dataInfo"
-      :title="dialogTitle"
-      @close="addDialogClose"
-      @refresh="refresh"
-    />
+    <product-list-add-dialog v-show="isShowDialog" ref="addProduct" :title="dialogTitle" @close="addDialogClose" @refresh="refresh" />
     <productBindDialog v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
@@ -157,9 +151,12 @@
     }
   },
   mounted() {
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
+    const params = {
+      categoryCode: '',
+      categoryName: ''
+    }
+    C_list(params).then(res => {
+      this.categoryList = res.data
     })
     this.refresh()
   },
@@ -169,6 +166,7 @@
     addDialog() {
       this.isShowDialog = true
       this.dialogTitle = '新增产品'
+      this.$refs.addProduct.initDialog('add')
     },
     addDialogClose() {
       this.isShowDialog = false
@@ -196,7 +194,7 @@
       console.log(row)
       this.isShowDialog = true
       this.dialogTitle = '编辑产品'
-      this.dataInfo = row
+      this.$refs.addProduct.initDialog('edit', row)
     },
     // 详情
     handleDetail(row) {
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 76de3b5..3481108 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -228,7 +228,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 753c739..73da71e 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -220,7 +220,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 0904036..36e1a2d 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -145,7 +145,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index fa0e08c..1f84e63 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -176,7 +176,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index 1be9ae3..f573fd8 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -231,7 +231,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/server/operation.vue b/src/views/server/operation.vue
index 03aca9e..40d80ad 100644
--- a/src/views/server/operation.vue
+++ b/src/views/server/operation.vue
@@ -204,7 +204,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 2ce9796..1ae0ac6 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -234,8 +234,8 @@
     },
     // 获取品牌所属品类
     fetchBrandCategories() {
-      C_list().then(response => {
-        this.categoryIdList = response
+      C_list().then(res => {
+        this.categoryIdList = res.data
       })
     },
     cancel: function() {
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 66ea428..afba9a4 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -18,9 +18,9 @@
       >
         <el-option
           v-for="item in categoryList"
-          :key="item.categoryCode"
+          :key="item.categoryId"
           :label="item.categoryName"
-          :value="item.categoryCode"
+          :value="item.categoryId"
         />
       </el-select>
       <el-button type="primary" icon="el-icon-search" @click="searchClick">
@@ -49,7 +49,7 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="55" />
+        <!--        <el-table-column type="index" label="编号" width="55" />-->
         <el-table-column header-align="center" align="center" prop="id" label="序号" />
         <el-table-column header-align="center" align="center" prop="productCode" label="产品型号" />
         <el-table-column header-align="center" align="center" prop="productName" label="产品名称" />
@@ -84,13 +84,7 @@
       />
     </div>
     <productDetailDialog v-if="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
-    <product-list-add-dialog
-      v-if="isShowDialog"
-      :data-info="dataInfo"
-      :title="dialogTitle"
-      @close="addDialogClose"
-      @refresh="refresh"
-    />
+    <product-list-add-dialog v-show="isShowDialog" ref="addProduct" :title="dialogTitle" @close="addDialogClose" @refresh="refresh" />
     <productBindDialog v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
@@ -157,9 +151,12 @@
     }
   },
   mounted() {
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
+    const params = {
+      categoryCode: '',
+      categoryName: ''
+    }
+    C_list(params).then(res => {
+      this.categoryList = res.data
     })
     this.refresh()
   },
@@ -169,6 +166,7 @@
     addDialog() {
       this.isShowDialog = true
       this.dialogTitle = '新增产品'
+      this.$refs.addProduct.initDialog('add')
     },
     addDialogClose() {
       this.isShowDialog = false
@@ -196,7 +194,7 @@
       console.log(row)
       this.isShowDialog = true
       this.dialogTitle = '编辑产品'
-      this.dataInfo = row
+      this.$refs.addProduct.initDialog('edit', row)
     },
     // 详情
     handleDetail(row) {
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 76de3b5..3481108 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -228,7 +228,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 753c739..73da71e 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -220,7 +220,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 0904036..36e1a2d 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -145,7 +145,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index fa0e08c..1f84e63 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -176,7 +176,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index 1be9ae3..f573fd8 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -231,7 +231,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/server/operation.vue b/src/views/server/operation.vue
index 03aca9e..40d80ad 100644
--- a/src/views/server/operation.vue
+++ b/src/views/server/operation.vue
@@ -204,7 +204,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/supplier/supplierList.vue b/src/views/supplier/supplierList.vue
index 53f6a14..587afa3 100644
--- a/src/views/supplier/supplierList.vue
+++ b/src/views/supplier/supplierList.vue
@@ -177,7 +177,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {

diff --git a/src/App.vue b/src/App.vue
index 68f378d..caf380b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -42,9 +42,6 @@
 .el-message-box{
   width: auto !important;
 }
-.el-table .success-row {
-  background-color: lightgray;
-}
 
 .el-table .el-table__cell {
   text-align: center !important;
diff --git a/src/api/product/category.js b/src/api/product/category.js
index e9d1e39..19ff711 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -1,41 +1,84 @@
 import { instance } from '../request/http'
-
+/**
+ * 品类相关接口
+ */
+import request from '@/utils/request'
 // 获取平类列表
-const C_listPage = (str, data) => {
-  return instance.post(`/categoryInfo/listPage?${str}`, data)
+// 根据部门找其默认区域
+export function C_listPage(str, data) {
+  return request({
+    url: `/categoryInfo/listPage?${str}`,
+    method: 'post',
+    data
+  })
 }
 //  获取品类列表(下拉框)
-const C_list = () => {
-  return instance.post('/categoryInfo/list', {})
+export function C_list(data = { categoryCode: '', categoryName: '' }) {
+  return request({
+    url: `/categoryInfo/list`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类更新
-const detail = (data) => {
-  return instance.post('/categoryInfo/detail', data)
+export function detail(data) {
+  return request({
+    url: `/categoryInfo/detail`,
+    method: 'post',
+    data
+  })
 }
 // 品类更新
-const C_update = (data) => {
-  return instance.post('/categoryInfo/update', data)
+export function C_update(data) {
+  return request({
+    url: `/categoryInfo/update`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类新增
-const C_add = (data) => {
-  return instance.post('/categoryInfo/add', data)
+export function C_add(data) {
+  return request({
+    url: `/categoryInfo/add`,
+    method: 'post',
+    data
+  })
 }
 
 // 平类删除
-const C_delete = (data) => {
-  return instance.post('/categoryInfo/delete', data)
+export function C_delete(data) {
+  return request({
+    url: `/categoryInfo/delete`,
+    method: 'post',
+    data
+  })
 }
 
 // 品类批量删除
-const C_batchDelete = (data) => {
-  return instance.post('/categoryInfo/batchDelete', data)
+export function C_batchDelete(data) {
+  return request({
+    url: '/categoryInfo/batchDelete',
+    method: 'post',
+    data
+  })
 }
 
 // 平类批量导出
-const C_listExport = () => {
-  return instance.post('/categoryInfo/listExport', {})
+export function C_listExport(data) {
+  return request({
+    url: '/categoryInfo/listExport',
+    method: 'post',
+    data
+  })
 }
 
-export { C_listPage, C_update, C_listExport, C_batchDelete, C_delete, C_add, C_list, detail }
+// 品类参数查询
+export function C_paramsList(categoryId) {
+  return request({
+    url: `productParam//list/${categoryId}`,
+    method: 'post'
+  })
+}
+
diff --git a/src/components/mycomponent/dialog/ElbrandDialog.vue b/src/components/mycomponent/dialog/ElbrandDialog.vue
index 90305d9..6511b59 100644
--- a/src/components/mycomponent/dialog/ElbrandDialog.vue
+++ b/src/components/mycomponent/dialog/ElbrandDialog.vue
@@ -158,7 +158,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/brandAddDialog.vue b/src/components/mycomponent/dialog/brandAddDialog.vue
index ebe9a91..952978e 100644
--- a/src/components/mycomponent/dialog/brandAddDialog.vue
+++ b/src/components/mycomponent/dialog/brandAddDialog.vue
@@ -140,7 +140,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
     //  获取供应商列表
     S_list().then(res => {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index e842e37..c48b9cf 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -213,7 +213,7 @@
   },
   mounted() {
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     })
     getCertification().then(res => {
       console.log(res)
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 3ac4407..ad5fd28 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -1,62 +1,101 @@
 <!--品类详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <div class="box">
+        <!--        <div class="item">-->
+        <!--          <div class="title">序号</div>-->
+        <!--          <div class="content"> {{ dataInfo.id }}</div>-->
+        <!--        </div>-->
         <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">编号</div>
-          <div class="content"> {{ dataInfo.categoryCode }}</div>
+          <div class="title">
+            编号
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">品类名称</div>
-          <div class="content"> {{ dataInfo.categoryName }}</div>
+          <div class="title">
+            品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.categoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
+          <div class="title">
+            创建时间
+          </div>
+          <div class="content">
+            {{ dataInfo.createTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">ids</div>
-          <div class="content"> {{ dataInfo.ids }}</div>
+          <div class="title">
+            ids
+          </div>
+          <div class="content">
+            {{ dataInfo.ids }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">父级品类编号</div>
-          <div class="content"> {{ dataInfo.pCategoryCode }}</div>
+          <div class="title">
+            父级品类编号
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryCode }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">父级品类名称</div>
-          <div class="content"> {{ dataInfo.pCategoryName }}</div>
+          <div class="title">
+            父级品类名称
+          </div>
+          <div class="content">
+            {{ dataInfo.pCategoryName }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">供应商id</div>
-          <div class="content"> {{ dataInfo.qualifyIds }}</div>
+          <div class="title">
+            供应商id
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyIds }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">供应商名称</div>
-          <div class="content"> {{ dataInfo.qualifyStr }}</div>
+          <div class="title">
+            供应商名称
+          </div>
+          <div class="content">
+            {{ dataInfo.qualifyStr }}
+          </div>
         </div>
         <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
+          <div class="title">
+            更新时间
+          </div>
+          <div class="content">
+            {{ dataInfo.updateTime }}
+          </div>
         </div>
       </div>
       <div class="box">
         <div class="item">
-          <div class="title">备注</div>
-          <div class="content"> {{ dataInfo.remark }}</div>
+          <div class="title">
+            备注
+          </div>
+          <div class="content">
+            {{ dataInfo.remark }}
+          </div>
         </div>
       </div>
     </div>
@@ -64,7 +103,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/orderAddDialog.vue b/src/components/mycomponent/dialog/orderAddDialog.vue
index a8b36c3..f44a875 100644
--- a/src/components/mycomponent/dialog/orderAddDialog.vue
+++ b/src/components/mycomponent/dialog/orderAddDialog.vue
@@ -139,7 +139,7 @@
     //   获取品类列表
     C_list().then(res => {
       console.log(res, '品类列表')
-      this.categoryList = res
+      this.categoryList = res.data
     })
   },
   methods: {
diff --git a/src/components/mycomponent/dialog/productListAddDialog.vue b/src/components/mycomponent/dialog/productListAddDialog.vue
index 844b770..05ca97c 100644
--- a/src/components/mycomponent/dialog/productListAddDialog.vue
+++ b/src/components/mycomponent/dialog/productListAddDialog.vue
@@ -1,146 +1,111 @@
 <!--产品新增弹窗-->
 <template>
-  <el-dialog :title="title" width="900px" :visible.sync="isShowInfo" append-to-body @close="close">
+  <el-dialog :title="title" width="1200px" :visible.sync="dialogStatus" append-to-body @close="close">
     <div class="productAddDialog">
       <div class="Dialog-title">
         基本信息
       </div>
       <div class="Dialog-input">
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productCode"
-              title="产品型号"
-              placeholder="请输入产品型号"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品牌" class="inputWidth">
-              <el-select v-model="addInfo.brandId" clearable placeholder="请输入产品品牌" style="width:200px">
-                <el-option
-                  v-for="item in brandList"
-                  :key="item.brandCode"
-                  :label="item.brandName"
-                  :value="item.brandCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue title="产品品类" class="inputWidth">
-              <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width:200px">
-                <el-option
-                  v-for="item in categoryList"
-                  :key="item.categoryCode"
-                  :label="item.categoryName"
-                  :value="item.categoryCode"
-                />
-              </el-select>
-            </input-vue>
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productPackageSize"
-              title="包装尺寸"
-              placeholder="请输入包装尺寸"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productStatus"
-              title="产品状态"
-              placeholder="请输入产品状态"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productWeight"
-              title="产品重量"
-              placeholder="请输入产品重量"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
-        <div class="inputContent">
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productName"
-              title="产品名称"
-              placeholder="请输入产品名称"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.internationalCode"
-              title="国际69码"
-              placeholder="请输入国际69码"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productColor"
-              title="产品颜色"
-              placeholder="请输入产品颜色"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productEdition"
-              title="产品版本"
-              placeholder="请输入产品版本"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-          <div class="inputBox">
-            <red-star />
-            <input-vue
-              v-model="addInfo.productMaterialQuality"
-              title="产品材质"
-              placeholder="请输入产品材质"
-              class="inputWidth"
-              width="200px"
-            />
-          </div>
-        </div>
+        <el-form ref="dataForm" :rules="rules" :model="addInfo" class="inputContent" label-position="right" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品型号" prop="productCode">
+                <el-input v-model.trim="addInfo.productCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model.trim="addInfo.productName" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品品牌" prop="brandId">
+                <el-select v-model="addInfo.brandId" clearable placeholder="请选择" style="width: 100%;">
+                  <el-option
+                    v-for="item in brandList"
+                    :key="item.brandCode"
+                    :label="item.brandName"
+                    :value="item.brandCode"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品品类" prop="categoryId">
+                <el-select v-model="addInfo.categoryId" clearable placeholder="请输入产品品类" style="width: 100%;">
+                  <el-option
+                    v-for="item in categoryList"
+                    :key="item.id"
+                    :label="item.categoryName"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品版本" prop="productEdition">
+                <el-input v-model.trim="addInfo.productEdition" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="国际69码" prop="internationalCode">
+                <el-input v-model.trim="addInfo.internationalCode" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="包装尺寸" prop="productPackageSize">
+                <el-input v-model.trim="addInfo.productPackageSize" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品颜色" prop="productColor">
+                <el-input v-model.trim="addInfo.productColor" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品状态" prop="productStatus">
+                <el-input v-model.trim="addInfo.productStatus" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品材质" prop="productMaterialQuality">
+                <el-input v-model.trim="addInfo.productMaterialQuality" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品重量" prop="productWeight">
+                <el-input v-model.trim="addInfo.productWeight" type="text" placeholder="必填" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否为IOT产品" prop="productNetworkMode">
+                <el-radio-group v-model="addInfo.productNetworkMode">
+                  <el-radio :label="1">
+                    是
+                  </el-radio>
+                  <el-radio :label="0">
+                    否
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
         <div class="imageContent">
           <el-upload
             class="avatar-uploader"
             :headers="myHeaders"
-            action="http://111.198.10.15:21403/file/uploadFile"
+            :action="uploadUrl"
             :show-file-list="false"
             :on-success="handleAvatarSuccess"
             :before-upload="beforeAvatarUpload"
@@ -153,7 +118,17 @@
       <div class="Dialog-desc">
         产品参数
       </div>
-      <div class="parameters" />
+      <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>
+          </el-row>
+        </el-form>
+      </div>
       <div class="btnBox">
         <el-button type="primary" class="save" @click="save">
           保存
@@ -168,30 +143,39 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import dialogHeader from './dialogHeader.vue'
-import inputVue from '../input/inputVue.vue'
-import RedStar from '../redStar.vue'
 import { Message } from 'element-ui'
-import { SelectList } from '../../../api/product/brand'
-import { C_list } from '../../../api/product/category'
-import { add, update } from '../../../api/product/product'
+import { SelectList } from '@/api/product/brand'
+import { C_list, C_paramsList } from '@/api/product/category'
+import { add, update } from '@/api/product/product'
 
 export default {
-  components: { inputVue, dialogHeader, RedStar },
   props: {
-    title: '',
-    dataInfo: {
-      type: Object,
-      default: {}
+    title: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
-      isShowInfo: true,
+      dialogStatus: false,
       myHeaders: { token: getToken() },
+      uploadUrl: this.baseConfig.baseUrl + '/file/uploadFile',
       imageUrl: '',
       categoryList: [],
       brandList: [],
+      rules: {
+        productCode: [{ required: true, message: '产品型号不能为空', trigger: ['blur', 'change'] }],
+        productName: [{ required: true, message: '产品名称不能为空', trigger: ['blur', 'change'] }],
+        brandId: [{ required: true, message: '产品品牌不能为空', trigger: ['blur', 'change'] }],
+        categoryId: [{ required: true, message: '产品品类不能为空', trigger: ['blur', 'change'] }],
+        productEdition: [{ required: true, message: '产品版本不能为空', trigger: ['blur', 'change'] }],
+        internationalCode: [{ required: true, message: '国际69码不能为空', trigger: ['blur', 'change'] }],
+        productColor: [{ required: true, message: '产品颜色不能为空', trigger: ['blur', 'change'] }],
+        productPackageSize: [{ required: true, message: '包装尺寸不能为空', trigger: ['blur', 'change'] }],
+        productStatus: [{ required: true, message: '产品状态不能为空', trigger: ['blur', 'change'] }],
+        productMaterialQuality: [{ required: true, message: '产品材质不能为空', trigger: ['blur', 'change'] }],
+        productWeight: [{ required: true, message: '产品重量不能为空', trigger: ['blur', 'change'] }]
+      },
       addInfo: {
         productCode: '',
         brandId: '',
@@ -204,47 +188,78 @@
         internationalCode: '',
         productColor: '',
         productMaterialQuality: '',
+        productNetworkMode: '1',
         productPicture: ''
-      }
+      },
+      paramForm: [
+        // { paramName: '名称', paramOrder: 1, paramRequire: 1, paramValue: '' },
+        // { paramName: '数量', paramOrder: 2, paramRequire: 1, paramValue: '' },
+        // { paramName: '单位', paramOrder: 3, paramRequire: 1, paramValue: '' }
+      ]
     }
   },
   watch: {
-    dataInfo: {
-      handler(vla) {
-        console.log(vla, '==========')
-        if (vla != '') {
-          this.addInfo = {
-            productCode: vla.productCode,
-            brandId: vla.brandId,
-            categoryId: vla.categoryId,
-            productPackageSize: vla.productPackageSize,
-            productStatus: vla.productStatus,
-            productWeight: vla.productWeight,
-            productName: vla.productName,
-            productEdition: vla.productEdition,
-            internationalCode: vla.internationalCode,
-            productColor: vla.productColor,
-            productMaterialQuality: vla.productMaterialQuality,
-            productPicture: vla.productPicture
-          }
-        }
-      },
-      deep: true,
-      immediate: true
+    'addInfo.categoryId'(val) {
+      this.fetchParams(val)
     }
   },
-  mounted() {
-    SelectList().then(res => {
-      this.brandList = res
-    }),
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
-    })
+  created() {
+    this.fetchBrandList()
+    this.fetchCategoryList()
   },
   methods: {
+    initDialog(type, row) {
+      if (type === 'edit') {
+        this.addInfo = {
+          productCode: row.productCode,
+          productName: row.productName,
+          brandId: row.brandId,
+          categoryId: row.categoryId,
+          productPackageSize: row.productPackageSize,
+          productStatus: row.productStatus,
+          productWeight: row.productWeight,
+          productEdition: row.productEdition,
+          internationalCode: row.internationalCode,
+          productColor: row.productColor,
+          productMaterialQuality: row.productMaterialQuality,
+          productNetworkMode: row.productNetworkMode,
+          productPicture: row.productPicture
+        }
+      } else {
+        this.resetForm()
+      }
+      this.dialogStatus = true
+    },
     close() {
       this.$emit('close')
+    },
+    // 获取品牌列表
+    fetchBrandList() {
+      SelectList().then(res => {
+        this.brandList = res
+      })
+    },
+    // 获取品类列表
+    fetchCategoryList() {
+      const params = {
+        categoryCode: '',
+        categoryName: ''
+      }
+      C_list(params).then(res => {
+        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: '' }
+          })
+        }
+      })
+    },
+    // 重置表单
+    resetForm() {
       this.addInfo = {
         productCode: '',
         brandId: '',
@@ -271,7 +286,6 @@
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
-
       if (!isJPG) {
         this.$message.error('上传头像图片只能是 JPG 格式!')
       }
@@ -282,7 +296,7 @@
     },
     // 新增
     save() {
-      if (this.title == '新增产品') {
+      if (this.title === '新增产品') {
         add(this.addInfo).then(res => {
           console.log(res, 'add')
           if (!res.code) {
@@ -308,10 +322,9 @@
 
 <style lang='scss' scoped>
 .productAddDialog {
-  width: 800px;
-
+  width: 100%;
   .Dialog-title {
-    width: 850px;
+    width: 100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -319,31 +332,22 @@
     background-color: #28739e;
     padding-left: 12px;
   }
-
   .Dialog-input {
+    width: 100%;
+    margin-top: 20px;
     padding: 10px 20px;
     display: flex;
-
     .inputContent {
+      flex:1;
       margin-right: 30px;
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-
-      .inputBox {
-        display: flex;
-        justify-content: inherit;
-        align-items: center;
-      }
     }
-
     .imageContent {
-      padding: 20px 10px 0;
+      width: 180px;
     }
   }
 
   .Dialog-desc {
-    width: 850px;
+    width:100%;
     height: 50px;
     line-height: 50px;
     color: white;
@@ -364,7 +368,7 @@
   }
 
   .parameters {
-    height: 180px;
+    padding: 20px;
   }
 
   .btnBox {
@@ -378,22 +382,9 @@
     .close {
       width: 100px;
     }
-
   }
 }
 
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
@@ -409,3 +400,17 @@
   display: block;
 }
 </style>
+<style>
+
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+</style>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 0d1614b..02cd1f2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -74,3 +74,7 @@
   height:48px;
   line-height:48px;
 }
+
+.el-table .success-row {
+  background-color: #EBEBEB;
+}
diff --git a/src/views/business/historyBusiness.vue b/src/views/business/historyBusiness.vue
index a058958..bddce18 100644
--- a/src/views/business/historyBusiness.vue
+++ b/src/views/business/historyBusiness.vue
@@ -144,7 +144,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/business/report.vue b/src/views/business/report.vue
index 9bac0d2..33c1a3d 100644
--- a/src/views/business/report.vue
+++ b/src/views/business/report.vue
@@ -478,7 +478,7 @@
       this.$set(this.showEdit, index, true) // 这里要用$set方法，否则页面状态不更新
       C_list().then(res => {
         console.log(res, '品类')
-        this.categoryList = res
+        this.categoryList = res.data
       })
       SelectList().then(res => {
         console.log(res, '品牌')
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index 17424ba..690ddfd 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -153,7 +153,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/addManagement.vue b/src/views/move/addManagement.vue
index ec66613..de08ec0 100644
--- a/src/views/move/addManagement.vue
+++ b/src/views/move/addManagement.vue
@@ -234,7 +234,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/attestation.vue b/src/views/move/attestation.vue
index 36f7899..ae070d5 100644
--- a/src/views/move/attestation.vue
+++ b/src/views/move/attestation.vue
@@ -224,7 +224,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/bannerConfig.vue b/src/views/move/bannerConfig.vue
index 920914e..8bb613a 100644
--- a/src/views/move/bannerConfig.vue
+++ b/src/views/move/bannerConfig.vue
@@ -221,7 +221,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/branch.vue b/src/views/move/branch.vue
index cc1708a..928250f 100644
--- a/src/views/move/branch.vue
+++ b/src/views/move/branch.vue
@@ -239,7 +239,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 8e58a9a..6e5ee27 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -240,7 +240,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/logManagement.vue b/src/views/move/logManagement.vue
index f258d8f..e2a8d3b 100644
--- a/src/views/move/logManagement.vue
+++ b/src/views/move/logManagement.vue
@@ -184,7 +184,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 8941236..bec59fa 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -192,7 +192,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/operation/alarmList.vue b/src/views/operation/alarmList.vue
index c5a1749..9f49dd7 100644
--- a/src/views/operation/alarmList.vue
+++ b/src/views/operation/alarmList.vue
@@ -155,7 +155,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/retailerList.vue b/src/views/operation/retailerList.vue
index 5d4adc4..4f061c8 100644
--- a/src/views/operation/retailerList.vue
+++ b/src/views/operation/retailerList.vue
@@ -158,7 +158,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/operation/watchList.vue b/src/views/operation/watchList.vue
index 6aaf066..1b06442 100644
--- a/src/views/operation/watchList.vue
+++ b/src/views/operation/watchList.vue
@@ -188,7 +188,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/historyManagement.vue b/src/views/order/historyManagement.vue
index 3f4ef9e..50f00f0 100644
--- a/src/views/order/historyManagement.vue
+++ b/src/views/order/historyManagement.vue
@@ -162,7 +162,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/order/historyOrder.vue b/src/views/order/historyOrder.vue
index 539b76e..55bcea1 100644
--- a/src/views/order/historyOrder.vue
+++ b/src/views/order/historyOrder.vue
@@ -137,7 +137,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/order/orderShop.vue b/src/views/order/orderShop.vue
index f36a3a2..1874202 100644
--- a/src/views/order/orderShop.vue
+++ b/src/views/order/orderShop.vue
@@ -243,7 +243,7 @@
       this.form.provinceList = res
     })
     C_list().then(res => {
-      this.categoryList = res
+      this.categoryList = res.data
     }),
     SelectList().then(res => {
       this.brandList = res
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 06cea85..3157cbb 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -276,7 +276,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 0013d52..78f42bd 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -198,22 +198,20 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
-      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
-        (res) => {
+      C_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
+        debugger
+        if (res.code === 200) {
           // 得到相关数据
-          res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10
-          })
-          this.tableData = res
+          this.tableData = res.data.rows
         }
-      )
+      })
     },
     // 删除
     Cdelete(row) {
       const id = row.id
       C_delete({ id: id }).then((res) => {
         //  删除成功 跟新列表
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -231,7 +229,7 @@
         ids.push(ele.id)
       })
       C_batchDelete({ ids: ids }).then((res) => {
-        if (res != '') {
+        if (res.code === 200) {
           this.$message({
             message: '删除成功',
             type: 'success'
@@ -248,7 +246,7 @@
     },
     exportToExcel() {
       C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.rows)
+        outToExcel(res.data.rows)
       })
     }
   }
@@ -270,7 +268,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 22f27bd..001921f 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -1,4 +1,4 @@
-设备列表
+<!--设备列表-->
 <template>
   <div class="product_container">
     <div class="productData">
@@ -23,35 +23,20 @@
       />
     </div>
 
-    <div class="productFun">
+    <div class="productFun" style="margin-top: 30px">
       <div class="productInput">
         SN码
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.snCode"
-            placeholder="请入SN码"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.snCode" placeholder="请入SN码" clearable class="product-input" />
         </div>
         设备型号
         <div class="inputBox" style="width: 144px">
-          <el-input
-            v-model="selectInfo.productCode"
-            placeholder="请入设备型号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
         设备品类
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选则设备类型">
-            <el-option
-              v-for="item in categoryList"
-              :key="item.id"
-              :label="item.categoryName"
-              :value="item.categoryName"
-            />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
+            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
           </el-select>
         </div>
         设备状态
@@ -78,41 +63,19 @@
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click=" BatchDelete"
-        >
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
           一键解绑
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
-
-        <el-button type="primary" icon="el-icon-refresh-right" @click="Upgrade">
+        <el-button type="primary" @click="Upgrade">
           一键固件升级
         </el-button>
       </div>
@@ -354,7 +317,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
@@ -366,11 +329,11 @@
     }
     .productBtn {
       .btnItem {
-        margin-right: 10px;
+        //margin-right: 10px;
         border-radius: 5px;
         // height: 32px;
         // width: 84px;
-        font-size: 16px;
+        //font-size: 16px;
       }
 
     }
diff --git a/src/views/product/editBrand.vue b/src/views/product/editBrand.vue
index 2ce9796..1ae0ac6 100644
--- a/src/views/product/editBrand.vue
+++ b/src/views/product/editBrand.vue
@@ -234,8 +234,8 @@
     },
     // 获取品牌所属品类
     fetchBrandCategories() {
-      C_list().then(response => {
-        this.categoryIdList = response
+      C_list().then(res => {
+        this.categoryIdList = res.data
       })
     },
     cancel: function() {
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index 66ea428..afba9a4 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -18,9 +18,9 @@
       >
         <el-option
           v-for="item in categoryList"
-          :key="item.categoryCode"
+          :key="item.categoryId"
           :label="item.categoryName"
-          :value="item.categoryCode"
+          :value="item.categoryId"
         />
       </el-select>
       <el-button type="primary" icon="el-icon-search" @click="searchClick">
@@ -49,7 +49,7 @@
         :header-cell-style="{ background: '#2483b3', color: 'white' }"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column type="index" label="编号" width="55" />
+        <!--        <el-table-column type="index" label="编号" width="55" />-->
         <el-table-column header-align="center" align="center" prop="id" label="序号" />
         <el-table-column header-align="center" align="center" prop="productCode" label="产品型号" />
         <el-table-column header-align="center" align="center" prop="productName" label="产品名称" />
@@ -84,13 +84,7 @@
       />
     </div>
     <productDetailDialog v-if="isShowDetail" :data-info="dataInfo" @close="DetailDialogClose" />
-    <product-list-add-dialog
-      v-if="isShowDialog"
-      :data-info="dataInfo"
-      :title="dialogTitle"
-      @close="addDialogClose"
-      @refresh="refresh"
-    />
+    <product-list-add-dialog v-show="isShowDialog" ref="addProduct" :title="dialogTitle" @close="addDialogClose" @refresh="refresh" />
     <productBindDialog v-if="isBindShow" :data-info="dataInfo" @close="BindDialogClose" />
   </div>
 </template>
@@ -157,9 +151,12 @@
     }
   },
   mounted() {
-    C_list().then(res => {
-      console.log(res, '品类列表')
-      this.categoryList = res
+    const params = {
+      categoryCode: '',
+      categoryName: ''
+    }
+    C_list(params).then(res => {
+      this.categoryList = res.data
     })
     this.refresh()
   },
@@ -169,6 +166,7 @@
     addDialog() {
       this.isShowDialog = true
       this.dialogTitle = '新增产品'
+      this.$refs.addProduct.initDialog('add')
     },
     addDialogClose() {
       this.isShowDialog = false
@@ -196,7 +194,7 @@
       console.log(row)
       this.isShowDialog = true
       this.dialogTitle = '编辑产品'
-      this.dataInfo = row
+      this.$refs.addProduct.initDialog('edit', row)
     },
     // 详情
     handleDetail(row) {
diff --git a/src/views/product/snCodeField.vue b/src/views/product/snCodeField.vue
index 76de3b5..3481108 100644
--- a/src/views/product/snCodeField.vue
+++ b/src/views/product/snCodeField.vue
@@ -228,7 +228,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 753c739..73da71e 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -220,7 +220,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/orderList.vue b/src/views/sales/orderList.vue
index 0904036..36e1a2d 100644
--- a/src/views/sales/orderList.vue
+++ b/src/views/sales/orderList.vue
@@ -145,7 +145,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/sales/shop.vue b/src/views/sales/shop.vue
index fa0e08c..1f84e63 100644
--- a/src/views/sales/shop.vue
+++ b/src/views/sales/shop.vue
@@ -176,7 +176,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/server/Management.vue b/src/views/server/Management.vue
index 1be9ae3..f573fd8 100644
--- a/src/views/server/Management.vue
+++ b/src/views/server/Management.vue
@@ -231,7 +231,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/server/operation.vue b/src/views/server/operation.vue
index 03aca9e..40d80ad 100644
--- a/src/views/server/operation.vue
+++ b/src/views/server/operation.vue
@@ -204,7 +204,7 @@
   }
 
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
 
diff --git a/src/views/supplier/supplierList.vue b/src/views/supplier/supplierList.vue
index 53f6a14..587afa3 100644
--- a/src/views/supplier/supplierList.vue
+++ b/src/views/supplier/supplierList.vue
@@ -177,7 +177,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {
diff --git a/src/views/system/certification.vue b/src/views/system/certification.vue
index c85c160..f31a5c7 100644
--- a/src/views/system/certification.vue
+++ b/src/views/system/certification.vue
@@ -283,7 +283,7 @@
     }
   }
   .productFun {
-    margin: 30px 0;
+    margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
     .productInput {