diff --git a/http/http.js b/http/http.js index eb2d791..2922695 100644 --- a/http/http.js +++ b/http/http.js @@ -15,8 +15,8 @@ import infoBox from "@/commons/utils/infoBox.js"; import go from "@/commons/utils/go.js"; import { reject } from "lodash"; // 设置node环境 -// envConfig.changeEnv(storageManage.env('production')) //正式 -envConfig.changeEnv(storageManage.env("development")); //测试 +envConfig.changeEnv(storageManage.env('production')) //正式 +// envConfig.changeEnv(storageManage.env("development")); //测试 // 测试服 // #ifdef H5 diff --git a/pagesCreateOrder/add-temp-cuisine/add-temp-cuisine.vue b/pagesCreateOrder/add-temp-cuisine/add-temp-cuisine.vue index 4b1642a..2476c13 100644 --- a/pagesCreateOrder/add-temp-cuisine/add-temp-cuisine.vue +++ b/pagesCreateOrder/add-temp-cuisine/add-temp-cuisine.vue @@ -239,6 +239,7 @@ discount_sale_amount: form.price, //数量 pack_number: 0, //数量 is_gift: 0, + remark:form.note, is_temporary: 1, //是否是临时菜 } websocketUtil.send(JSON.stringify(params)) @@ -247,6 +248,7 @@ name: form.name, lowPrice: form.price, number: form.num, + remark:form.note, is_temporary: 1, //是否是临时菜 }) clearInterval(timer) diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue index ebff907..981de4a 100644 --- a/pagesCreateOrder/index/index.vue +++ b/pagesCreateOrder/index/index.vue @@ -436,6 +436,7 @@ websocketUtil.offMessage(); websocketUtil.onMessage(async (res) => { let msg = JSON.parse(res); + console.log('收到消息',msg) let cartItem; let cartArr = []; // console.log("onMessage===",msg) @@ -1349,13 +1350,13 @@ if (fileRes) { uni.setStorageSync('stickData',{ table:data.table, - orderInfo:data.orderInfo + orderInfo:data.orderInfo, + limitTimeDiscount:data.limitTimeDiscount }) go.to("PAGES_CREATE_ORDER_STICK", { tableCode: data.table.tableCode, number:fileRes, isCreateOrderToDetail:isCreateOrderToDetail.value, - limitTimeDiscount:data.limitTimeDiscount }); diff --git a/vite.config.js b/vite.config.js index dbb46b2..821fc63 100644 --- a/vite.config.js +++ b/vite.config.js @@ -8,14 +8,14 @@ export default defineConfig({ server: { proxy: { '/javaapi': { - // target: 'https://cashier.sxczgkj.com', // 目标服务器地址 - target: 'http://192.168.1.42/', // 目标服务器地址 + target: 'https://cashier.sxczgkj.com', // 目标服务器地址 + // target: 'http://192.168.1.42/', // 目标服务器地址 changeOrigin: true, // 是否更改请求源 rewrite: path => path.replace(/^\/javaapi/, '') }, '/phpapi': { - // target: 'https://cashier.sxczgkj.com', // 目标服务器地址 - target: 'http://192.168.1.42:8787/', // 目标服务器地址 + target: 'https://cashier.sxczgkj.com', // 目标服务器地址 + // target: 'http://192.168.1.42:8787/', // 目标服务器地址 changeOrigin: true, // 是否更改请求源 rewrite: path => path.replace(/^\/phpapi/, '') }