From 6ba5c1b5369ee502cbc75dc83343afd22e9fb3c8 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 12 Mar 2025 15:22:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=A0=8F=E7=9B=AE=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=EF=BC=8C=E7=8E=B0=E9=87=91=E5=BF=AB?= =?UTF-8?q?=E6=8D=B7=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tool/Instead/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue index 18b7026..bac81a8 100644 --- a/src/views/tool/Instead/index.vue +++ b/src/views/tool/Instead/index.vue @@ -385,11 +385,15 @@ async function createOrder(key) { showOrder.value = true; if (key == "wx-aiplay") { - refOrder.value.nowPayClick("scanCode"); + nextTick(() => { + refOrder.value.nowPayClick("scanCode"); + }); return; } if (key == "cash") { - refOrder.value.nowPayClick("cash"); + nextTick(() => { + refOrder.value.nowPayClick("cash"); + }); } // oldOrder.value = res; } From 7d0f2a60424586453e2260a611e9a19ae8f8fabd Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 12 Mar 2025 16:40:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=B1=95=E7=A4=BA=E5=89=94=E9=99=A4url?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=8F=B0=E6=A1=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=8B=E8=BD=BD=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/data/index.vue | 76 +++++++++++-------- src/views/shop/log/config/content.ts | 10 +-- .../system-setting/pay-types/config/config.ts | 1 - src/views/tool/table/index.vue | 18 ++++- 4 files changed, 68 insertions(+), 37 deletions(-) diff --git a/src/views/data/index.vue b/src/views/data/index.vue index c99c4ba..c321ac8 100644 --- a/src/views/data/index.vue +++ b/src/views/data/index.vue @@ -53,13 +53,13 @@
- 今天 - 昨天 - 最近7天 - 最近30天 - 本周 - 本月 - 自定义 + 今天 + 昨天 + 最近7天 + 最近30天 + 本周 + 本月 + 自定义
-
{{ formatDecimal(trade.saleAmount || 0) }}
+
{{ formatDecimal(yingyeShiShou || 0) }}
营业实收（元） @@ -88,35 +88,42 @@ 微信小程序
- {{ trade.wechatPayCount }} + {{ trade.wechatPayAmount }}
支付宝小程序
- {{ trade.aliPayCount }} + {{ trade.aliPayAmount }}
主扫收款
- {{ trade.scanPayCount }} + {{ trade.scanPayAmount }}
现金
- {{ trade.cashPayCount }} + {{ trade.cashPayAmount }} +
+
+
+ + 充值 +
+ {{ trade.rechargeAmount }}
挂账
- {{ trade.creditPayCount }} + {{ trade.creditPayAmount }}
@@ -135,7 +142,9 @@ class="gropress l" :style="{ width: `${ - trade.refundAmount ? (trade.refundAmount / trade.saleAmount) * 100 : 0 + trade.saleAmount + ? (trade.saleAmount / (trade.saleAmount * 1 + trade.refundAmount)) * 100 + : 0 }%`, }" >
@@ -143,7 +152,9 @@ class="gropress r" :style="{ width: `${ - trade.refundAmount ? (trade.refundAmount / trade.saleAmount) * 100 : 0 + trade.refundAmount + ? (trade.refundAmount / (trade.saleAmount * 1 + trade.refundAmount)) * 100 + : 0 }%`, }" > @@ -274,8 +285,8 @@ - 近7天 - 30天 + 近7天 + 30天
- 近7天 - 30天 + 近7天 + 30天
@@ -451,6 +462,21 @@ export default { tradeCount: "", }; }, + computed: { + yingyeShiShou() { + if (!this.trade) { + return 0; + } + return ( + this.trade.wechatPayAmount * 1 + + this.trade.aliPayAmount * 1 + + this.trade.aliPayAmount * 1 + + this.trade.memberPayAmount * 1 + + this.trade.scanPayAmount * 1 + + this.trade.cashPayAmount * 1 + ); + }, + }, mounted() { // 增加首页提示是否账号30天过期 let date = dayjs(localStorage.getItem("expireDate")).diff(dayjs().format("YYYY-MM-DD"), "day"); @@ -780,9 +806,7 @@ export default { axisLabel: { rotate: time.length <= 7 ? 0 : 45, interval: 0, - textStyle: { - fontSize: "9", - }, + fontSize: "9", }, }, ], @@ -1113,14 +1137,6 @@ export default { async summaryDateGet(res) { try { console.log(res); - - // const res = await summaryDateGet(this.saleTableActive); - let p1 = [res.map((item) => item.tradeDay), res.map((item) => item.saleNum)]; - let p2 = [res.map((item) => item.tradeDay), res.map((item) => item.saleAmount)]; - - // console.log(p1); - // console.log(p2); - // this.initProduceChart(p1, p2); } catch (error) { console.log(error); diff --git a/src/views/shop/log/config/content.ts b/src/views/shop/log/config/content.ts index 8eece87..9df5700 100644 --- a/src/views/shop/log/config/content.ts +++ b/src/views/shop/log/config/content.ts @@ -51,11 +51,11 @@ const contentConfig: IContentConfig = { align: "center", prop: "operation", }, - { - label: "请求Url", - align: "center", - prop: "requestUri", - }, + // { + // label: "请求Url", + // align: "center", + // prop: "requestUri", + // }, { label: "请求耗时", align: "center", diff --git a/src/views/system-setting/pay-types/config/config.ts b/src/views/system-setting/pay-types/config/config.ts index b788d68..2896fdb 100644 --- a/src/views/system-setting/pay-types/config/config.ts +++ b/src/views/system-setting/pay-types/config/config.ts @@ -16,7 +16,6 @@ const options: optionObject = { { label: "刷卡", value: "deposit" }, { label: "挂单", value: "arrears" }, { label: "刷卡", value: "deposit" }, - { label: "储值", value: "member-account" }, { label: "自定义", value: "virtual" }, ], isIdeal: [ diff --git a/src/views/tool/table/index.vue b/src/views/tool/table/index.vue index 5f717c0..b78be64 100644 --- a/src/views/tool/table/index.vue +++ b/src/views/tool/table/index.vue @@ -227,6 +227,8 @@ From d396309cfe53ddae1b9e2d76633aefd33b14d36d Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 12 Mar 2025 17:22:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20css=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=8E=BB=E9=99=A4=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/application/marketing/share/components/share.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/application/marketing/share/components/share.vue b/src/views/application/marketing/share/components/share.vue index 2022eeb..cf408b1 100644 --- a/src/views/application/marketing/share/components/share.vue +++ b/src/views/application/marketing/share/components/share.vue @@ -359,7 +359,7 @@ export default { background-color: #fff; position: absolute; top: 10px; - right: calc($size / 2 * - 1); + right: calc(-1 * ($size / 2)); transform: rotate(-45deg); }