czg_team/cashier_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: czg_team:2fac00ceebb1fbc212bb433115e66ff67810f5b4
Branches Tags
czg_team:master czg_team:test czg_team:ymf czg_team:gyq czg_team:gaohao czg_team:dwb
...
compare: czg_team:f265c4761727ab4c23506bfb171094412feeb2fe
Branches Tags
czg_team:test czg_team:ymf czg_team:gyq czg_team:gaohao czg_team:master czg_team:dwb

2 Commits
2fac00ceeb ... f265c47617

Author SHA1 Message Date
YeMingfei666
f265c47617 Merge branch 'test' of https://newgitea.sxczgkj.cn/czg_team/cashier_app into test 2025-12-26 13:41:28 +08:00
YeMingfei666
d40ded92b0 修复添加临时菜没有备注问题，修复数签子下单限时折扣问题 2025-12-26 13:41:22 +08:00
4 changed files with 11 additions and 8 deletions
Expand all files Collapse all files

4
http/http.js
View File

@@ -15,8 +15,8 @@ import infoBox from "@/commons/utils/infoBox.js";
import go from "@/commons/utils/go.js"; import go from "@/commons/utils/go.js";
import { reject } from "lodash"; import { reject } from "lodash";
// 设置node环境 // 设置node环境
// envConfig.changeEnv(storageManage.env('production')) //正式 envConfig.changeEnv(storageManage.env('production')) //正式
envConfig.changeEnv(storageManage.env("development")); //测试 // envConfig.changeEnv(storageManage.env("development")); //测试
// 测试服 // 测试服
// #ifdef H5 // #ifdef H5

2
pagesCreateOrder/add-temp-cuisine/add-temp-cuisine.vue
View File

@@ -239,6 +239,7 @@
discount_sale_amount: form.price, //数量 discount_sale_amount: form.price, //数量
pack_number: 0, //数量 pack_number: 0, //数量
is_gift: 0, is_gift: 0,
remark:form.note,
is_temporary: 1, //是否是临时菜 is_temporary: 1, //是否是临时菜
} }
websocketUtil.send(JSON.stringify(params)) websocketUtil.send(JSON.stringify(params))
@@ -247,6 +248,7 @@
name: form.name, name: form.name,
lowPrice: form.price, lowPrice: form.price,
number: form.num, number: form.num,
remark:form.note,
is_temporary: 1, //是否是临时菜 is_temporary: 1, //是否是临时菜
}) })
clearInterval(timer) clearInterval(timer)

5
pagesCreateOrder/index/index.vue
View File

@@ -436,6 +436,7 @@
websocketUtil.offMessage(); websocketUtil.offMessage();
websocketUtil.onMessage(async (res) => { websocketUtil.onMessage(async (res) => {
let msg = JSON.parse(res); let msg = JSON.parse(res);
console.log('收到消息',msg)
let cartItem; let cartItem;
let cartArr = []; let cartArr = [];
// console.log("onMessage===",msg) // console.log("onMessage===",msg)
@@ -1349,13 +1350,13 @@
if (fileRes) { if (fileRes) {
uni.setStorageSync('stickData',{ uni.setStorageSync('stickData',{
table:data.table, table:data.table,
orderInfo:data.orderInfo orderInfo:data.orderInfo,
limitTimeDiscount:data.limitTimeDiscount
}) })
go.to("PAGES_CREATE_ORDER_STICK", { go.to("PAGES_CREATE_ORDER_STICK", {
tableCode: data.table.tableCode, tableCode: data.table.tableCode,
number:fileRes, number:fileRes,
isCreateOrderToDetail:isCreateOrderToDetail.value, isCreateOrderToDetail:isCreateOrderToDetail.value,
limitTimeDiscount:data.limitTimeDiscount
}); });

8
vite.config.js
View File

@@ -8,14 +8,14 @@ export default defineConfig({
server: { server: {
proxy: { proxy: {
'/javaapi': { '/javaapi': {
// target: 'https://cashier.sxczgkj.com', // 目标服务器地址 target: 'https://cashier.sxczgkj.com', // 目标服务器地址
target: 'http://192.168.1.42/', // 目标服务器地址 // target: 'http://192.168.1.42/', // 目标服务器地址
changeOrigin: true, // 是否更改请求源 changeOrigin: true, // 是否更改请求源
rewrite: path => path.replace(/^\/javaapi/, '') rewrite: path => path.replace(/^\/javaapi/, '')
}, },
'/phpapi': { '/phpapi': {
// target: 'https://cashier.sxczgkj.com', // 目标服务器地址 target: 'https://cashier.sxczgkj.com', // 目标服务器地址
target: 'http://192.168.1.42:8787/', // 目标服务器地址 // target: 'http://192.168.1.42:8787/', // 目标服务器地址
changeOrigin: true, // 是否更改请求源 changeOrigin: true, // 是否更改请求源
rewrite: path => path.replace(/^\/phpapi/, '') rewrite: path => path.replace(/^\/phpapi/, '')
} }