From 0563e07cdb87f64e72184a83aafaeda321add9c2 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Tue, 15 Apr 2025 18:56:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=94=AE=E7=BD=84=E5=88=A4=E6=96=AD=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=EF=BC=88=E5=95=86=E5=93=81=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E5=BA=93=E5=AD=98=E5=88=87=E4=B8=94=E5=BA=93=E5=AD=98?= =?UTF-8?q?<=3D0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tool/Instead/components/goods-item.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/tool/Instead/components/goods-item.vue b/src/views/tool/Instead/components/goods-item.vue index e44e119..eb31f4c 100644 --- a/src/views/tool/Instead/components/goods-item.vue +++ b/src/views/tool/Instead/components/goods-item.vue @@ -13,10 +13,18 @@
￥{{ item.lowPrice }}
-
+
Date: Wed, 16 Apr 2025 09:37:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20readme=E5=A2=9E=E5=8A=A0=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0linux=E8=BF=9E=E6=8E=A5=E7=9B=B8=E5=85=B3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a959379..051154c 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,16 @@ url: jdbc:mysql://192.168.1.31:3306/czg_cashier?useUnicode=true&characterEncodin username: root password: Chaozg123. +## linux XTerminal连接 + +下载地址 + +连接 +地址：192.168.1.31 +端口号：22 +登录用户：root +登录密码：123456. + ## linux命令 sudo nginx -t # 检查一下配置文件有没有写错别字之类的小毛病 @@ -85,7 +95,7 @@ pnpm run dev # 项目打包 pnpm run build -# 本地测试环境 +# 测试环境 pnpm run build:local # 正式环境 From b9e5713fc16ed80e04630b2b625bf525fbcaadd5 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 16 Apr 2025 09:44:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E5=95=86=E5=93=81=E5=94=AE=E7=BD=84?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=8F=AF=E5=94=AE=EF=BC=8C=E4=B8=8B=E6=9E=B6?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/no-sale.svg | 15 ++++++++++++++- src/assets/icons/shouqing.svg | 15 ++++++++++++++- src/assets/icons/yi-xiajia.svg | 15 ++++++++++++++- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/assets/icons/no-sale.svg b/src/assets/icons/no-sale.svg index 7904492..04e3582 100644 --- a/src/assets/icons/no-sale.svg +++ b/src/assets/icons/no-sale.svg @@ -1 +1,14 @@ - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/src/assets/icons/shouqing.svg b/src/assets/icons/shouqing.svg index ec7dd3e..430a6c7 100644 --- a/src/assets/icons/shouqing.svg +++ b/src/assets/icons/shouqing.svg @@ -1 +1,14 @@ - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/src/assets/icons/yi-xiajia.svg b/src/assets/icons/yi-xiajia.svg index 2435769..8065c14 100644 --- a/src/assets/icons/yi-xiajia.svg +++ b/src/assets/icons/yi-xiajia.svg @@ -1 +1,14 @@ - \ No newline at end of file + + + + + + + + + + + + + + From 90d90c55b8176851b9371b50e4b5d4d122e27b02 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 16 Apr 2025 17:26:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E4=BB=A3=E5=AE=A2=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=B8=8D=E8=B6=B3=E5=9B=BE=E6=A0=87=EF=BC=8C?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8E=92=E5=BA=8F=E5=95=86=E5=93=81=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/stock_null.svg | 14 +++++++++++ .../tool/Instead/components/goods-item.vue | 23 ++++++++++++------- 2 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 src/assets/icons/stock_null.svg diff --git a/src/assets/icons/stock_null.svg b/src/assets/icons/stock_null.svg new file mode 100644 index 0000000..c73177e --- /dev/null +++ b/src/assets/icons/stock_null.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/views/tool/Instead/components/goods-item.vue b/src/views/tool/Instead/components/goods-item.vue index eb31f4c..e8af191 100644 --- a/src/views/tool/Instead/components/goods-item.vue +++ b/src/views/tool/Instead/components/goods-item.vue @@ -22,16 +22,9 @@ (item.isStock && item.stockNumber * 1 <= 0) " > - + +
From 8a9cca4ee28c7a0b2a9f9bd8479a10fdc01980f8 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 16 Apr 2025 17:30:13 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E4=BB=A3=E5=AE=A2=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=97=B6=E5=95=86=E5=93=81=E4=B8=8D=E8=B6=B3=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/carts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/carts.ts b/src/store/modules/carts.ts index 69c4db6..927d2b3 100644 --- a/src/store/modules/carts.ts +++ b/src/store/modules/carts.ts @@ -587,7 +587,7 @@ export const useCartsStore = defineStore("carts", () => { WebSocketManager.subscribeToTopic(initParams, (msg) => { console.log("收到消息：", msg); if (msg.hasOwnProperty('status') && msg.status != 1) { - return ElMessage.error(msg.message || '操作失败') + return ElMessage.error(msg.message || msg.msg || '操作失败') } if (msg && msg.data) { if (Array.isArray(msg.data) && msg.data.length && msg.data[0].table_code) {