Merge branch 'prod' of https://newgitea.sxczgkj.cn/czg_team/cashier-web into prod

src/api/account/points.ts

@@ -1,12 +1,18 @@
 import request from "@/utils/request";
-import { Account_BaseUrl } from "@/api/config";
+import { Account_BaseUrl, Market_BaseUrl } from "@/api/config";
 const baseURL = Account_BaseUrl + "/admin/points";
 const Api = {
   // 002-获取订单可用积分及抵扣金额（支付页面使用）
-
+  // calcOrderUsablePoints(params: any) {
+  //   return request<any>({
+  //     url: `${baseURL}/memberPoints/calcUsablePoints`,
+  //     method: "get",
+  //     params
+  //   });
+  // },
   calcOrderUsablePoints(params: any) {
     return request<any>({
-      url: `${baseURL}/memberPoints/calcUsablePoints`,
+      url: `${Market_BaseUrl}/admin/points/userPoints`,
       method: "get",
       params
     });

src/api/account/quick.ts

@@ -0,0 +1,68 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/quick";
+const API = {
+  getList(data: any) {
+    return request<any, QuickMenu[]>({
+      url: `${baseURL}`,
+      method: "get",
+      params: data
+    });
+  },
+  add(data: any) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+    });
+  },
+  delete(ids: [string | number]) {
+    return request({
+      url: `${baseURL}`,
+      method: "delete",
+      data: ids,
+    });
+  },
+  edit(data: any) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+    });
+  },
+}
+export default API;
+
+
+
+/**
+ * 悬浮窗配置 实体类。
+ *
+ * QuickMenu
+ */
+export interface QuickMenu {
+  createTime?: string;
+  id?: number;
+  /**
+   * 菜单Id
+   */
+  menuId: number;
+  /**
+   * 店铺Id
+   */
+  shopId?: number;
+  /**
+   * 排序
+   */
+  sort?: number;
+  /**
+   * 状态 1-启用 0-禁用
+   */
+  status?: number;
+  updateTime?: string;
+  /**
+   * 菜单图标
+   */
+  url?: string;
+  [property: string]: any;
+}

src/api/order/order.ts

@@ -64,6 +64,14 @@ const OrderApi = {
       data
     });
   },
+  // 订单打印
+  printOrder(data: any) {
+    return request<any>({
+      url: `${baseURL}/print`,
+      method: "post",
+      data
+    });
+  },
 };
 
 export default OrderApi;