代客下单修改，登录页面修改，部分页面调整，请求封装调整

http/api/order.js

@@ -1,116 +1,137 @@
-import http from '@/http/yskApi/http.js'
-const request = http.request
-
+import http from "@/http/yskApi/http.js";
+const request = http.request;
+const urlType = "/order";
 /**
  * 获取订单列表
  * @returns
  */
-export function getOrderList(data, urlType = 'order') {
-	return request({
-		url: `/order/admin/order`,
-		method: "GET",
-		data: {
-			...data
-		}
-	})
+export function getOrderList(data) {
+  return request({
+    url: `/order/admin/order`,
+    method: "GET",
+    data: {
+      ...data,
+    },
+  });
 }
 
 /**
  * 订单详情
  * @returns
  */
-export function getOrderById(data, urlType = 'order') {
-	return request({
-		url: `/order/admin/order/getOrderById`,
-		method: "GET",
-		data: {
-			...data
-		}
-	})
+export function getOrderById(data) {
+  return request({
+    url: `/order/admin/order/getOrderById`,
+    method: "GET",
+    data: {
+      ...data,
+    },
+  });
+}
+
+/**
+ * 起菜, 上菜
+ */
+export function upOrderDetail(data) {
+  return request({
+    url: urlType + `/admin/order/upOrderDetail`,
+    method: "PUT",
+    data: {
+      ...data,
+    },
+  });
+}
+// 转桌
+export function mergeOrder(data) {
+  return request({
+    url: urlType + `/admin/order/mergeOrder`,
+    method: "POST",
+    data: {
+      ...data,
+    },
+  });
 }
 
 /**
  * 历史订单(多次下单使用)
  * @returns
  */
-export function getHistoryOrder(data, urlType = '/order') {
-	return request({
-		url: `/order/admin/order/historyOrder`,
-		method: "GET",
-		data: {
-			...data
-		}
-	})
+export function getHistoryOrder(data, urlType = "/order") {
+  return request({
+    url: `/order/admin/order/historyOrder`,
+    method: "GET",
+    data: {
+      ...data,
+    },
+  });
 }
 
 /**
  * 生成订单
  * @returns
  */
-export function createOrder(data, urlType = 'order') {
-	return request({
-		url: `/order/admin/order/createOrder`,
-		method: "POST",
-		data: {
-			...data
-		}
-	})
+export function createOrder(data) {
+  return request({
+    url: `/order/admin/order/createOrder`,
+    method: "POST",
+    data: {
+      ...data,
+    },
+  });
 }
 
 /**
  * 订单退款 只传订单id
  * @returns
  */
-export function refundOrder(data, urlType = 'order') {
-	return request({
-		url: `/order/admin/order/refundOrder`,
-		method: "POST",
-		data: {
-			...data
-		}
-	})
+export function refundOrder(data) {
+  return request({
+    url: `/order/admin/order/refundOrder`,
+    method: "POST",
+    data: {
+      ...data,
+    },
+  });
 }
 
 /**
  * 订单打印
  * @returns
  */
-export function printOrder(data, urlType = 'order') {
-	return request({
-		url: `/order/admin/order/print`,
-		method: "POST",
-		data: {
-			...data
-		}
-	})
+export function printOrder(data) {
+  return request({
+    url: `/order/admin/order/print`,
+    method: "POST",
+    data: {
+      ...data,
+    },
+  });
 }
 
 /**
  * 清空历史订单
  * @returns
  */
-export function cancelOrder(data, urlType = 'order') {
-	return request({
-		url: `/order/admin/order/cancelOrder`,
-		method: "POST",
-		data: {
-			...data
-		}
-	})
+export function cancelOrder(data) {
+  return request({
+    url: `/order/admin/order/cancelOrder`,
+    method: "POST",
+    data: {
+      ...data,
+    },
+  });
 }
 
 /**
  * 清空某一次历史订单
  * @returns
  */
-export function rmPlaceOrder(data, urlType = 'order') {
-	return request({
-		url: `/${urlType}/admin/order/rmPlaceOrder`,
-		method: "POST",
-		data: {
-			...data
-		}
-	})
+export function rmPlaceOrder(data) {
+  return request({
+    url: `/${urlType}/admin/order/rmPlaceOrder`,
+    method: "POST",
+    data: {
+      ...data,
+    },
+  });
 }
-
-