Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb

http/yskApi/Instead.js

@@ -216,4 +216,76 @@ export function $payOrder(data) {
       ...data
     }
   });
-}
+}
+
+//退单
+export function $returnCart(data) {
+  return request({
+    url: '/api/place/returnCart',
+    method: "put",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+// 选择台桌
+export function $choseTable(data) {
+  return request({
+    url: '/api/place/choseTable',
+    method: "put",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+// 用餐人数
+
+export function $choseCount(data) {
+  return request({
+    url: '/api/place/choseCount',
+    method: "put",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+
+// 批量生成台桌
+export function $fastCreateTable(data) {
+  return request({
+    url: '/api/tbShopTable/generate',
+    method: "post",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+
+//打印当前台桌订单
+export function $printOrder(data) {
+  return request({
+    url: '/api/place/printOrder',
+    method: "post",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+//打印当前台桌菜品
+
+export function $printDishes(data) {
+  return request({
+    url: '/api/place/printDishes',
+    method: "post",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+

http/yskApi/http.js

@@ -23,10 +23,6 @@ const loadingShowTime = 200
 function getHeader(){
 	const headerObject={}
 	headerObject["Authorization"] = storageManage.token()
-	headerObject["Content-Type"] = 'application/json'
-	headerObject["loginname"] = 'admin'
-	headerObject["token"] = 'eyJhbGciOiJIUzI1NiJ9.eyJ1c2VyVHlwZSI6Ik1HIiwiZXhwIjoxNjkwMTgwNzE2LCJ1c2VySWQiOiIyNDQiLCJpYXQiOjE2ODg3MDk0ODcsImxvZ2luTmFtZSI6ImFkbWluIn0.lqxxvv2-FcecQngMBorz4MpkB3mIJQDG-IUULQyV-KQ'
-	headerObject["userId"] = '244'
 	return headerObject
 }
 

http/yskApi/order.js

@@ -0,0 +1,93 @@
+import http from './http.js'
+const request=http.request
+
+/**
+ * 查询订单
+ * @param {*} data
+ * @returns
+ */
+export function tbOrderInfoData(data) {
+  return request({
+    url: "/api/tbOrderInfo/date",
+    method: "post",
+    data: {
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+
+/**
+ * 导出数据
+ * @param {*} data
+ * @returns
+ */
+export function tbOrderInfoDownload(data) {
+  return request({
+    url: "/api/tbOrderInfo/download",
+    method: "post",
+    data: {
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    },
+    responseType: "blob"
+  });
+}
+
+/**
+ * 通过Id查询订单
+ * @param {*} id
+ * @returns
+ */
+export function tbOrderInfoDetail(id) {
+  return request({
+    url: `/api/tbOrderInfo/${id}`,
+    method: "get"
+  });
+}
+
+/**
+ * 通过Id查询订单
+ * @param {*} createdAt
+ * @returns
+ */
+export function payCount(createdAt) {
+  console.log(createdAt);
+  return request({
+    url: `/api/tbOrderInfo/payCount`,
+    method: "post",
+    data: {
+      shopId: uni.getStorageSync('shopId'),
+      createdAt: createdAt
+    }
+  });
+}
+
+/**
+ * 订单列表
+ * @param {*} createdAt
+ * @returns
+ */
+export function tbGroupOrderInfo(params) {
+  return request({
+    url: `/api/tbGroupOrderInfo`,
+    method: "post",
+    data: {
+      shopId: uni.getStorageSync('shopId'),
+      ...params
+    }
+  });
+}
+
+/**
+ * 退单
+ * @param {*} data
+ * @returns
+ */
+export function returnGpOrder(data) {
+  return request({
+    url: `/api/tbGroupOrderInfo/returnGpOrder`,
+    method: "post",
+    data
+  });
+}

http/yskApi/table.js

@@ -10,4 +10,5 @@ import infoBox from '@/commons/utils/infoBox.js'
 /* 台桌区域 */
 export const $tableArea=new $API('/api/tbShopArea',http.req)
 /* 台桌 */
-export const $table=new $API('/api/tbShopTable',http.req)
+export const $table=new $API('/api/tbShopTable',http.req)
+