From ce47d55a1f313cf577d9698c05e2fc01d391891d Mon Sep 17 00:00:00 2001 From: youmengting <2080639302@qq.com> Date: Wed, 29 Nov 2023 17:41:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A1=8C=E5=8F=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Utils/groupBuying.js | 39 +- pages.json | 5 + pages/welcome/welcome.vue | 4 +- .../categorySetting/categorySetting.vue | 22 +- .../groupBuyingConfiguration.vue | 5 + .../tableMessage/tableMessage.vue | 388 ++++++++++++++++++ uni.scss | 3 + 7 files changed, 450 insertions(+), 16 deletions(-) create mode 100644 subpackages/groupBuyingConfiguration/tableMessage/tableMessage.vue diff --git a/Utils/groupBuying.js b/Utils/groupBuying.js index 61b8009..d6e9ee0 100644 --- a/Utils/groupBuying.js +++ b/Utils/groupBuying.js @@ -108,7 +108,17 @@ export const findStoreExtMsgByStoreId = params => { return POST('POST', `${base}/storeGroup/findStoreExtMsgByStoreId`, params).then(res => res.data); } -/* =编辑分类= */ +//查询获取团购内容code +export const getGroupContentByCode = params => { + return POST('GET', `${hsgCrest}/group/getGroupContentByCode`, params).then(res => res.data); +} + +//核销团购码 +export const gorOrderNotify = params => { + return POST('GET', `${hsgOrder}/groupOrder/gorOrderNotify`, params).then(res => res.data); +} + +/* =分类配置= */ export const editCategory = params => { return POST('POST', `${base}/storeProductCategory/editCategory`, params).then(res => res.data); } @@ -144,13 +154,28 @@ export const getStoreProduct = params => { } -//查询获取团购内容code -export const getGroupContentByCode = params => { - return POST('GET', `${hsgCrest}/group/getGroupContentByCode`, params).then(res => res.data); +/* ==桌台信息== */ +//生成桌台 +export const generateTable = params => { + return POST('POST', `${base}/mealTable/generateTable`, params).then(res => res.data); } -//核销团购码 -export const gorOrderNotify = params => { - return POST('GET', `${hsgOrder}/groupOrder/gorOrderNotify`, params).then(res => res.data); +//编辑桌台 +export const editTable = params => { + return POST('POST', `${base}/mealTable/editTable`, params).then(res => res.data); +} + +// 删除桌台 +export const delTable = params => { + return POST('POST', `${base}/mealTable/delTable`, params).then(res => res.data); +} + +// 查询桌台详情 +export const getTable = params => { + return POST('GET', `${base}/mealTable/getTable`, params).then(res => res.data); } +// 查询桌台列表 +export const getTableList = params => { + return POST('GET', `${base}/mealTable/getTableList`, params).then(res => res.data); +} \ No newline at end of file diff --git a/pages.json b/pages.json index 9a22b1f..85c072f 100644 --- a/pages.json +++ b/pages.json @@ -710,6 +710,11 @@ "style": { "navigationBarTitleText": "核销订单" } + },{ + "path":"groupBuyingConfiguration/tableMessage/tableMessage", + "style": { + "navigationBarTitleText": "桌台信息" + } } ] diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue index 91c110d..05b83cf 100644 --- a/pages/welcome/welcome.vue +++ b/pages/welcome/welcome.vue @@ -17,10 +17,10 @@ }, onLoad(options) { - uni.reLaunch({ + /* uni.reLaunch({ url: '../tabBar/home/home' }) - return + return */ let that = this; diff --git a/subpackages/groupBuyingConfiguration/categorySetting/categorySetting.vue b/subpackages/groupBuyingConfiguration/categorySetting/categorySetting.vue index 1dd6931..cf1e93d 100644 --- a/subpackages/groupBuyingConfiguration/categorySetting/categorySetting.vue +++ b/subpackages/groupBuyingConfiguration/categorySetting/categorySetting.vue @@ -10,15 +10,15 @@ 操作 - + {{item.name}} - 删除 - 编辑 + 删除 + 编辑 更多 @@ -37,12 +37,15 @@ radius="6" :showCloseIcon="true"> 详情 - 分类名称 {{categoryDetail.name}} + + 创建时间 + {{categoryDetail.createTime | timeFormat}} + @@ -181,6 +184,9 @@ title: '删除中' }) delCategory(params).then(res => { + + uni.hideLoading(); + let title; if (res.return_code == '000000') { title = res.return_data; @@ -193,6 +199,8 @@ icon: 'none', duration: 2000 }) + }).catch(()=>{ + uni.hideLoading(); }) } else if (res.cancel) { @@ -227,7 +235,7 @@ editCategory(params).then(res => { uni.hideLoading(); this.formatCategory(); - + this.$refs.inputDialog.close(); if (res.return_code == '000000') { this.getALLCategory(); uni.showToast({ diff --git a/subpackages/groupBuyingConfiguration/groupBuyingConfiguration.vue b/subpackages/groupBuyingConfiguration/groupBuyingConfiguration.vue index 7b40058..39634d6 100644 --- a/subpackages/groupBuyingConfiguration/groupBuyingConfiguration.vue +++ b/subpackages/groupBuyingConfiguration/groupBuyingConfiguration.vue @@ -36,6 +36,11 @@ title: '分类配置', url:'./categorySetting/categorySetting', img: '/static/img/home4.png' + },{ + title: '桌台信息', + url:'./tableMessage/tableMessage', + img: '/static/img/home4.png' + } ], diff --git a/subpackages/groupBuyingConfiguration/tableMessage/tableMessage.vue b/subpackages/groupBuyingConfiguration/tableMessage/tableMessage.vue new file mode 100644 index 0000000..384192c --- /dev/null +++ b/subpackages/groupBuyingConfiguration/tableMessage/tableMessage.vue @@ -0,0 +1,388 @@ + + + + + \ No newline at end of file diff --git a/uni.scss b/uni.scss index ce284c9..dcfdf26 100644 --- a/uni.scss +++ b/uni.scss @@ -808,6 +808,9 @@ $uni-font-size-paragraph:30upx; display: flex; align-items: center; } +.flex-center{ + justify-content: center; +} .flex-sp{ justify-content: space-between; }