Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/ecw/productBrank.js

+import request from '@/utils/request'
+
+// 创建品牌
+export function createProductBrank(data) {
+  return request({
+    url: '/ecw/product-brank/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新品牌
+export function updateProductBrank(data) {
+  return request({
+    url: '/ecw/product-brank/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品牌
+export function deleteProductBrank(id) {
+  return request({
+    url: '/ecw/product-brank/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得品牌
+export function getProductBrank(id) {
+  return request({
+    url: '/ecw/product-brank/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得品牌分页
+export function getProductBrankPage(query) {
+  return request({
+    url: '/ecw/product-brank/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出品牌 Excel
+export function exportProductBrankExcel(query) {
+  return request({
+    url: '/ecw/product-brank/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/utils/dict.js

@@ -78,7 +78,8 @@ export const DICT_TYPE = {
   CUSTOMER_COMPLAINT_STATUS: 'customer_complaint_status',
   ECW_MESSAGE_LEAVE_TYPE: 'ecw_message_leave_type',
   ECW_MESSAGE_LEAVE_STATUS: 'ecw_message_leave_status',
-  PWD_TYPE: 'pwd_type'
+  PWD_TYPE: 'pwd_type',
+  BRAND_REG_TYPE: 'brand_registry_type',
 
 }