From acc3930f48870bb5e90ef0ddee013a1f10ee72fe Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Wed, 20 Nov 2024 15:12:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/coupon_manage/add_coupon.vue | 10 +++++----- .../components/coupon_details.vue | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue index 4c27a53..33bf501 100644 --- a/src/views/coupon_manage/add_coupon.vue +++ b/src/views/coupon_manage/add_coupon.vue @@ -81,9 +81,9 @@ - + @@ -97,7 +97,7 @@ - 全额满可用 + 金额满可用 @@ -158,9 +158,9 @@ - +
diff --git a/src/views/coupon_manage/components/coupon_details.vue b/src/views/coupon_manage/components/coupon_details.vue index 6e11f0c..c08f4f4 100644 --- a/src/views/coupon_manage/components/coupon_details.vue +++ b/src/views/coupon_manage/components/coupon_details.vue @@ -91,7 +91,7 @@
Date: Thu, 21 Nov 2024 09:23:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/application.js | 11 +++++ src/views/application/index.vue | 76 +++++++++++++++++++++++++++++++- src/views/application/kp.png | Bin 0 -> 746 bytes src/views/lineUp/index.vue | 2 +- 4 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 src/views/application/kp.png diff --git a/src/api/application.js b/src/api/application.js index 8aa460c..ec79ae1 100644 --- a/src/api/application.js +++ b/src/api/application.js @@ -15,6 +15,17 @@ export function tbPrintMachine(data, method = "post") { }); } +// 开票 +export function getbinding(data) { + return request({ + url: "/api/tbShopInfo/binding", + method: "post", + data: { + shopId: localStorage.getItem("shopId"), + ...data + } + }); +} /** * 获取应用中心列表 * @returns diff --git a/src/views/application/index.vue b/src/views/application/index.vue index 272be30..edf3745 100644 --- a/src/views/application/index.vue +++ b/src/views/application/index.vue @@ -2,6 +2,15 @@
应用中心
+
+ +
+
开票
+
+ +
+
+
@@ -12,21 +21,67 @@
+ + + + + + + +
联系区域经理开通
+
更换绑定
+ + + + 取 消 + 确 定 + +
diff --git a/src/views/application/kp.png b/src/views/application/kp.png new file mode 100644 index 0000000000000000000000000000000000000000..aa61e7a48f330e9bf23eca15b286e45476f25d09 GIT binary patch literal 746 zcmVPx%q)9|URA@u(T0M&sQ4~Ed+57>qQoAkeEE2WRQr5~+gzdC&SuD4Z#lqN#VrAh5 zMJz02MYOTe?4rm9#E+;biXS8>Y*_r-Rq;D{bLGxtAUiBG^X|+f8JSlkA#>k*=iGDd zdvBOg=(f_C_82KT0MJfAZFK)1u5W4qs-{R?s2?g+8JpsdVx@f)MCIWE8-PZs@}tSZ zG1bld%~XN!f>oq;tK!VxSpfUeNC3cPRh;>=IJ}+@N-MQk0SXEm=Ia@OL93G~kSP!` z1DS;)CNOe$u>!kBb2zv)htYNRaZ218%Y<_eEzCD8(HJ5E6Wj7O_&6JrIQu{w4=EyW zY3~R&uaA~_FVa_^2;)~e{UK1FEErD|rbDUH4imO2Mx?-61Xg|l%@zM+RcV92Y6B$@ zX7Zrg2{VRQqSzF;{?fwIcYg=40)8qClz_2$Jsm3dHO|+~mr{`eJa>>CObDI6t8wv( zIe4B!On^IA_KaZrCZ{m>U+duMd;cOnIhF@+fW7ThO=I?%418n)<6Cl=+L5>MoLJCk zF8dQ;)p~2-_#KU_FXZ53C17G1jxFET;KFBBxE-#V@4}G@^jgS-z>#^48*ePzPA&mH z3rR?bYrtE?e3tPxBF9o3%dKMp({mcPnoj2D8qRh8-B$u@?Zkd-ILH5NGx!c_@5l!1 z7PFi6zMe)+&q7~+JK*mvt_IK9muB8oTVx><0v~^nZJWnS@q-r^aaaPaZw~n9ACdu| zD1oNg c()zm1KlxUf78_FN0000007*qoM6N<$g2)h7Z~y=R literal 0 HcmV?d00001 diff --git a/src/views/lineUp/index.vue b/src/views/lineUp/index.vue index 840f5cc..306a308 100644 --- a/src/views/lineUp/index.vue +++ b/src/views/lineUp/index.vue @@ -173,7 +173,7 @@ export default { async profilepicture(d) { - this.handleSpeak(d.callNum) + this.handleSpeak('请'+d.callNum+'用餐') let res = await callTablecall({ shopId: localStorage.getItem('shopId'), callQueueId: d.id From 8cb0d999629928484b17db962391ecaf190ff749 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Thu, 21 Nov 2024 10:44:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/application/index.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/views/application/index.vue b/src/views/application/index.vue index edf3745..ebb48f2 100644 --- a/src/views/application/index.vue +++ b/src/views/application/index.vue @@ -22,7 +22,7 @@
- + @@ -72,9 +72,6 @@ export default { methods: { upPop() { this.dialogVisible = true - }, - handleClose() { - }, sumbitEvent() { if (this.forms.account) { From f7e4fd77aa4a443c0ca7559019d6cebfeb4cc6d6 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Thu, 21 Nov 2024 14:50:55 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=90=A5=E9=94=80?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/marketing/index.vue | 109 ++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 src/views/marketing/index.vue diff --git a/src/views/marketing/index.vue b/src/views/marketing/index.vue new file mode 100644 index 0000000..0199326 --- /dev/null +++ b/src/views/marketing/index.vue @@ -0,0 +1,109 @@ + + + + + \ No newline at end of file From 25c030f2a27dc6e34cb7fbef6adacbb0e492c842 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Thu, 21 Nov 2024 15:23:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=90=A5=E9=94=80=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=20=E5=9F=BA=E4=BA=8E=E5=BD=93=E5=89=8Ddev?= =?UTF-8?q?=E5=88=86=E6=94=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/application.js | 5 +- src/views/marketing/index.vue | 108 ++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 src/views/marketing/index.vue diff --git a/src/api/application.js b/src/api/application.js index 8aa460c..4da83fc 100644 --- a/src/api/application.js +++ b/src/api/application.js @@ -19,10 +19,11 @@ export function tbPrintMachine(data, method = "post") { * 获取应用中心列表 * @returns */ -export function appCenterGet() { +export function appCenterGet(params) { return request({ url: "/api/appCenter", - method: "get" + method: "get", + params }); } diff --git a/src/views/marketing/index.vue b/src/views/marketing/index.vue new file mode 100644 index 0000000..5340401 --- /dev/null +++ b/src/views/marketing/index.vue @@ -0,0 +1,108 @@ + + + + + \ No newline at end of file From f266501a7b5ae895d9935c229f40008148032678 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Fri, 22 Nov 2024 14:31:32 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=9A=E8=A7=84=E6=A0=BC=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/product/index.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/product/index.vue b/src/views/product/index.vue index 3499939..38bbe20 100644 --- a/src/views/product/index.vue +++ b/src/views/product/index.vue @@ -189,11 +189,13 @@ style="margin-left: 20px !important;"> 编辑 --> - 编辑 - - 删除 - +
+ 编辑 + + 删除 + +
@@ -244,7 +246,7 @@ import { tbProductListV2, tbShopCategoryGet, tbProductDelete, tbProductIsHot, up import { hasPermission } from '@/utils/limits.js' export default { - name:'product', + name: 'product', components: { BindCons, StockHistory