diff --git a/.env.development b/.env.development index 949bf9b..666961f 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,8 @@ VITE_APP_BASE_API=/dev-api # VITE_APP_API_URL=https://tapi.cashier.sxczgkj.cn/ # 测试 # VITE_APP_API_URL=https://cashier.sxczgkj.com/ # 正式 - VITE_APP_API_URL=http://192.168.1.42/ # 本地 +# VITE_APP_API_URL=http://192.168.1.42/ # 本地 + VITE_APP_API_URL=https://frp.sxczgkj.com # 本地映射地址 VITE_APP_API_PHP_URL=http://192.168.1.42:8000 #php抖音美团测试环境 VITE_APP_API_PHP_IMPORT_URL=http://192.168.1.42:8789 #本地php批量导入 # VITE_APP_API_PHP_IMPORT_URL=https://diftcs.sxczgkj.com #本地线上php批量导入 @@ -17,7 +18,8 @@ VITE_APP_BASE_API=/dev-api # WebSocket 端点(不配置则关闭),线上 ws://api.youlai.tech/ws ,本地 ws://localhost:8989/ws # VITE_APP_WS_ENDPOINT=wss://sockets.sxczgkj.com/wss # VITE_APP_WS_ENDPOINT=wss://czgeatws.sxczgkj.com/wss # 正式 -VITE_APP_WS_ENDPOINT=ws://192.168.1.42:2348 # 本地 +# VITE_APP_WS_ENDPOINT=ws://192.168.1.42:2348 # 本地 +VITE_APP_WS_ENDPOINT=ws://frp.sxczgkj.com/wss # 本地 # VITE_APP_API_PHP_URL=https://newblockwlx.sxczgkj.cn #php抖音美团正式环境 # 启用 Mock 服务 diff --git a/.env.production b/.env.production index efbe1e1..0bade69 100644 --- a/.env.production +++ b/.env.production @@ -8,6 +8,7 @@ VITE_APP_NAME=production # 接口地址 VITE_APP_BASE_API = https://cashier.sxczgkj.com/ +# VITE_APP_BASE_API = https://frp.sxczgkj.com/ VITE_APP_API_PHP_URL=https://newblockwlx.sxczgkj.cn #php抖音美团正式环境 @@ -18,7 +19,9 @@ VITE_APP_API_PHP_URL=https://newblockwlx.sxczgkj.cn #php抖音美团正式环 # WebSocket 端点(不配置则关闭),线上 ws://api.youlai.tech/ws ,本地 ws://localhost:8989/ws -VITE_APP_WS_ENDPOINT=wss://czgeatws.sxczgkj.com/wss +VITE_APP_WS_ENDPOINT=wss://czgeatws.sxczgkj.com/wss + +# VITE_APP_WS_ENDPOINT=wss://frp.sxczgkj.com/wss # 启用 Mock 服务 VITE_MOCK_DEV_SERVER=false diff --git a/src/views/tool/Instead/components/return-cart.vue b/src/views/tool/Instead/components/return-cart.vue index 59ddd33..9f46e35 100644 --- a/src/views/tool/Instead/components/return-cart.vue +++ b/src/views/tool/Instead/components/return-cart.vue @@ -141,12 +141,12 @@ export default { }, methods: { changeSel(item) { - // item.checked = !item.checked; - if (this.note == '') { - this.note = item.label - } else { - this.note += `,${item.label}` - } + item.checked = !item.checked; + // if (this.note == '') { + // this.note = item.label + // } else { + // this.note += `,${item.label}` + // } }, reset() { this.note = ""; @@ -224,8 +224,10 @@ export default { this.refundNext() }, refundNext() { + const note = this.tags.filter(item => item.checked).map(item => item.label).join(',') + (this.note ? `,${this.note}` : '') + this.$emit("confirm", { - refundReason: this.note, + refundReason: note, refundAmount: 0, refundDetails: toRaw(this.selectData).map(item => ({ id: item.id, @@ -238,13 +240,14 @@ export default { }, // 确认退菜 confirm() { + const note = this.tags.filter(item => item.checked).map(item => item.label).join(',') + (this.note ? `,${this.note}` : '') // const selTag = this.tags // .filter((item) => item.checked) // .map((item) => item.label) // .join(","); // this.note = selTag + (this.note.length > 0 ? "," + this.note : ""); - if (!this.note) { + if (!note) { return ElMessage.error("请输入退菜原因"); }