Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz

src/api/account/shop.ts

@@ -10,6 +10,13 @@ const ShopApi = {
       params: params,
     });
   },
+  getBranchList(params: PageQuery) {
+    return request<any, ShopInfoEditDTO[]>({
+      url: `${baseURL}/branchList`,
+      method: "get",
+      params: params,
+    });
+  },
   add(data: ShopInfoEditDTO) {
     return request<any, ShopInfoEditDTO>({
       url: `${baseURL}`,
@@ -277,4 +284,4 @@ export interface ShopInfo {
   tubeType?: number | null;
   updateTime?: null | string;
   [property: string]: any;
-}
+}

src/api/account/shopBranch.ts

@@ -0,0 +1,51 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/shop/branch";
+
+const ShopBranchApi = {
+  getList(params: any) {
+    return request<any>({
+      url: `${baseURL}/page`,
+      method: "get",
+      params
+    });
+  },
+  setDataSync(id: any) {
+    console.log(id)
+    return request<any>({
+      url: `${baseURL}/setting/dataSyncMethod?dataSyncMethod=${id}`,
+      method: "post",
+    });
+  },
+  dataSync(id: any) {
+    console.log(id)
+    return request<any>({
+      url: `${baseURL}/data/sync/enable?branchShopId=${id}`,
+      method: "post",
+    });
+  },
+  enable(id: any) {
+    console.log(id)
+
+    return request<any>({
+      url: `${baseURL}/account/enable?branchShopId=${id}`,
+      method: "post",
+    });
+  },
+  disable(id: any) {
+    return request<any>({
+      url: `${baseURL}/account/disable?branchShopId=${id}`,
+      method: "post",
+    });
+  },
+};
+
+
+export interface Responseres {
+  code?: number | null;
+  data?: any;
+  msg?: null | string;
+  [property: string]: any;
+}
+
+export default ShopBranchApi;

src/api/account/shopPagePermission.ts

@@ -0,0 +1,46 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+import { get } from "lodash";
+const baseURL = Account_BaseUrl + "/admin/shopPagePermission";
+const Api = {
+  // 获取所有页面路径
+  getPageAll(params: any) {
+    return request<any, object[]>({
+      url: `${baseURL}`,
+      method: "get",
+      params: params,
+    });
+  },
+  // 保存修改权限
+  save(data: any) {
+    return request<any>({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+    });
+  },
+  //获取员工拥有页面路径
+  detail(params: any) {
+    return request<any, PagePath[]>({
+      url: `${baseURL}/detail`,
+      method: "get",
+      params: params,
+    });
+  },
+  //获取当前员工已拥有页面路径
+  mine(params: any) {
+    return request<any>({
+      url: `${baseURL}/mine`,
+      method: "get",
+      params: params,
+    });
+  }
+};
+
+export default Api;
+
+interface PagePath {
+  label: string;
+  value: string;
+  [property: string]: any;
+}

src/api/onlineShop/goodsGroupconfig.ts

@@ -41,6 +41,15 @@ const AuthAPI = {
       data,
     });
   },
+  // 简单修改
+  // /admin/prod/group/update
+  updates(data: Object) {
+    return request<any, Responseres>({
+      url: `${baseURL}/update`,
+      method: "put",
+      data,
+    });
+  },
   // 删除
   deleteByIds(id: number | String) {
     return request<any, Responseres>({

src/api/product/index.ts

@@ -20,6 +20,13 @@ const AuthAPI = {
   },
   // 新增
   addunit(data: any) {
+    console.log(data, '提示121');
+    if (data.images.length == 0) {
+      data.images = null
+    }
+    if (data.proGroupVo.length == 0) {
+      data.proGroupVo = null
+    }
     return request<any, Responseres>({
       url: `${baseURL}`,
       method: "post",

src/api/supplier/index.ts

@@ -0,0 +1,60 @@
+import request from "@/utils/request";
+const baseURL = "/product/admin/product/vendor";
+
+// 供应商账单
+
+const AuthAPI = {
+  /** 供应商账单统计*/
+  getSummary(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/summary`,
+      method: "get",
+      params,
+    });
+  },
+  /** 分页*/
+  getPage(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill`,
+      method: "get",
+      params,
+    });
+  },
+  // 账单记录
+  getRecordList(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill/record`,
+      method: "get",
+      params,
+    });
+  },
+  // 账单付款记录
+  getPayRecordList(params: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill/pay/record`,
+      method: "get",
+      params,
+    });
+  },
+  // 账单付款
+  billPay(data: any) {
+    return request<any, Responseres>({
+      url: `${baseURL}/bill/pay`,
+      method: "post",
+      data,
+    });
+  },
+  
+};
+
+
+
+
+export interface Responseres {
+  code?: number | null;
+  data?: any;
+  msg?: null | string;
+  [property: string]: any;
+}
+
+export default AuthAPI;