diff --git a/README.md b/README.md index 68b333a..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 # 检查一下配置文件有没有写错别字之类的小毛病 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/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/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 + + + + + + + + + + + + + + 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) { diff --git a/src/views/product/indexconfig/addgoods.vue b/src/views/product/indexconfig/addgoods.vue index 2b19d2b..2575f5e 100644 --- a/src/views/product/indexconfig/addgoods.vue +++ b/src/views/product/indexconfig/addgoods.vue @@ -63,7 +63,7 @@ -
+
固定套餐 @@ -73,7 +73,7 @@
- +