Merge branch 'zyh' into zyj

src/api/bxg/storeProductRule.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data, id) {
   return request({
-    url: `api/yxStoreProductRule/save/${id}`,
+    url: `/api/yxStoreProductRule/save/${id}`,
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function edit(data) {
 
 export function info (id) {
   return request({
-    url: `api/yxStoreProductRule/rule/${id}`,
+    url: `/bxg/api/yxStoreProductRule/rule/${id}`,
     method: 'get'
   });
 }

src/api/bxg/yxShippingTemplates.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data,id) {
   return request({
-    url: `api/yxShippingTemplates/save/${id}`,
+    url: `/bxg/api/yxShippingTemplates/save/${id}`,
     method: 'post',
     data
   })

src/api/bxg/yxSystemStore.js

@@ -9,6 +9,7 @@ export function add(data) {
 }
 
 export function get() {
+  console.log(123);
   return request({
     url: '/bxg/api/yxSystemStore',
     method: 'get'

src/api/system/cpUser.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建企业微信成员
+export function createCpUser(data) {
+  return request({
+    url: '/system/cp-user/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新企业微信成员
+export function updateCpUser(data) {
+  return request({
+    url: '/system/cp-user/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除企业微信成员
+export function deleteCpUser(id) {
+  return request({
+    url: '/system/cp-user/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得企业微信成员
+export function getCpUser(id) {
+  return request({
+    url: '/system/cp-user/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得企业微信成员分页
+export function getCpUserPage(query) {
+  return request({
+    url: '/system/cp-user/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出企业微信成员 Excel
+export function exportCpUserExcel(query) {
+  return request({
+    url: '/system/cp-user/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/tools/localStorage.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/localStorage',
+    url: 'bxg/api/localStorage',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/localStorage/',
+    url: 'bxg/api/localStorage/',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/localStorage',
+    url: 'bxg/api/localStorage',
     method: 'put',
     data
   })

src/api/tools/material.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getPage(query) {
   return request({
-    url: 'api/material/page',
+    url: 'bxg/api/material/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function getPage(query) {
 
 export function addObj(obj) {
   return request({
-    url: 'api/material',
+    url: 'bxg/api/material',
     method: 'post',
     data: obj
   })
@@ -18,21 +18,21 @@ export function addObj(obj) {
 
 export function getObj(id) {
   return request({
-    url: 'api/material/' + id,
+    url: 'bxg/api/material/' + id,
     method: 'get'
   })
 }
 
 export function delObj(id) {
   return request({
-    url: 'api/material/' + id,
+    url: 'bxg/api/material/' + id,
     method: 'delete'
   })
 }
 
 export function putObj(obj) {
   return request({
-    url: 'api/material',
+    url: 'bxg/api/material',
     method: 'put',
     data: obj
   })

src/api/tools/materialgroup.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getPage(query) {
   return request({
-    url: 'api/materialgroup/page',
+    url: 'bxg/api/materialgroup/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function getPage(query) {
 
 export function getList(query) {
   return request({
-    url: 'api/materialgroup/list',
+    url: 'bxg/api/materialgroup/list',
     method: 'get',
     params: query
   })
@@ -18,7 +18,7 @@ export function getList(query) {
 
 export function addObj(obj) {
   return request({
-    url: 'api/materialgroup',
+    url: 'bxg/api/materialgroup',
     method: 'post',
     data: obj
   })
@@ -26,21 +26,21 @@ export function addObj(obj) {
 
 export function getObj(id) {
   return request({
-    url: 'api/materialgroup/' + id,
+    url: 'bxg/api/materialgroup/' + id,
     method: 'get'
   })
 }
 
 export function delObj(id) {
   return request({
-    url: 'api/materialgroup/' + id,
+    url: 'bxg/api/materialgroup/' + id,
     method: 'delete'
   })
 }
 
 export function putObj(obj) {
   return request({
-    url: 'api/materialgroup',
+    url: 'bxg/api/materialgroup',
     method: 'put',
     data: obj
   })

src/api/tools/qiniu.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function get() {
   return request({
-    url: 'api/qiNiuContent/config',
+    url: 'bxg/api/qiNiuContent/config',
     method: 'get'
   })
 }
 
 export function update(data) {
   return request({
-    url: 'api/qiNiuContent/config',
+    url: 'bxg/api/qiNiuContent/config',
     data,
     method: 'put'
   })
@@ -17,21 +17,21 @@ export function update(data) {
 
 export function download(id) {
   return request({
-    url: 'api/qiNiuContent/download/' + id,
+    url: 'bxg/api/qiNiuContent/download/' + id,
     method: 'get'
   })
 }
 
 export function sync() {
   return request({
-    url: 'api/qiNiuContent/synchronize',
+    url: 'bxg/api/qiNiuContent/synchronize',
     method: 'post'
   })
 }
 
 export function del(ids) {
   return request({
-    url: 'api/qiNiuContent',
+    url: 'bxg/api/qiNiuContent',
     method: 'delete',
     data: ids
   })