diff --git a/src/api/table.js b/src/api/table.js
index 31b8dfd..246c020 100644
--- a/src/api/table.js
+++ b/src/api/table.js
@@ -118,3 +118,213 @@ export function summaryTableDownload(data) {
});
}
+
+
+/**
+ * 获取当前台桌订单信息
+ * @returns
+ */
+export function getCart(params) {
+ return request({
+ url: `/api/place/cart`,
+ method: "get",
+ params:{
+ shopId: localStorage.getItem("shopId"),
+ ...params
+ }
+ });
+}
+/**
+ * 已上架商品列表
+ * @returns
+ */
+export function getGoodsLists(params) {
+ return request({
+ url: `/api/place/activate`,
+ method: "get",
+ params:{
+ shopId: localStorage.getItem("shopId"),
+ ...params
+ }
+ });
+}
+
+/**
+ * 点单
+ * @returns
+ */
+export function addCart(data) {
+ return request({
+ url: `/api/place/addCart`,
+ method: "post",
+ data:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+
+/**
+ * 清空购物车/支付订单
+ * @returns
+ */
+export function $clearCart(data) {
+ return request({
+ url: `/api/place/clearCart`,
+ method: "delete",
+ data:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+
+/**
+ * 删除购物车某个商品
+ * @returns
+ */
+export function $removeCart(data) {
+ return request({
+ url: `/api/place/removeCart`,
+ method: "delete",
+ data:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+/**
+ * 更新规格
+ * @returns
+ */
+export function $updateCart(data) {
+ return request({
+ url: `/api/place/updateCart`,
+ method: "put",
+ data:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+/**
+ * 批量打包
+ * @returns
+ */
+export function $allPack(data) {
+ return request({
+ url: `/api/place/pack`,
+ method: "put",
+ data:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+/**
+ * 获取取餐号
+ * @returns
+ */
+export function $getMasterId(data) {
+ return request({
+ url: `/api/place/masterId`,
+ method: "get",
+ params:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+/**
+ * 支付方式获取
+ * @returns
+ */
+export function $getPayType(data) {
+ return request({
+ url: `/api/place/payType`,
+ method: "get",
+ params:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+/**
+ * 创建订单
+ * @returns
+ */
+export function $createOrder(data) {
+ return request({
+ url: `/api/place/order`,
+ method: "post",
+ data:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+
+
+/**
+ * 挂起订单
+ * @returns
+ */
+export function $cacheOrder(data) {
+ return request({
+ url: `/api/place/pending`,
+ method: "post",
+ data:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+
+/**
+ * 获取已挂起订单
+ * @returns
+ */
+export function $getCacheOrder(data) {
+ return request({
+ url: `/api/place/pending/cart`,
+ method: "get",
+ params:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+
+// 会员点单/取消会员点单
+export function $setUser(data) {
+ return request({
+ url: `/api/place/updateVip`,
+ method: "put",
+ data:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+// 删除订单
+export function $delOrder(data) {
+ return request({
+ url: `/api/place/order`,
+ method: "delete",
+ data:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
+// 支付订单
+export function $payOrder(data) {
+ return request({
+ url: '/api/place/pay',
+ method: "put",
+ data:{
+ shopId: localStorage.getItem("shopId"),
+ ...data
+ }
+ });
+}
\ No newline at end of file
diff --git a/src/views/application/advertisement.vue b/src/views/application/advertisement.vue
index 08e9740..d9be19a 100644
--- a/src/views/application/advertisement.vue
+++ b/src/views/application/advertisement.vue
@@ -33,7 +33,7 @@
+ @change="showChange(scope.row)">
@@ -179,13 +179,15 @@ export default {
let index = this.fileList.findIndex(ele => ele.url == file.response.data[0])
this.fileList.splice(index, 1);
},
- async showChange(a, d) {
+ async showChange(d) {
if (!d.imgUrl) {
this.form.imgUrl = this.fileList
}
await adput({
- ...d,
- ...this.form
+ imgUrl:d.imgUrl,
+ id: d.id,
+ shopId: this.form.shopId,
+ status: d.status,
})
this.$message({
message: '成功',
diff --git a/src/views/order_manage/components/orderDetail.vue b/src/views/order_manage/components/orderDetail.vue
index 117490d..94cc1c2 100644
--- a/src/views/order_manage/components/orderDetail.vue
+++ b/src/views/order_manage/components/orderDetail.vue
@@ -1,11 +1,5 @@
-
+