diff --git a/common/js/api.js b/common/js/api.js index 895a8ea..1d2008b 100644 --- a/common/js/api.js +++ b/common/js/api.js @@ -216,5 +216,47 @@ export default { songsinging(data) { // 获取正在演唱的歌曲 return uni.api.get("/song/singing", data, false); }, + + + + /** + * 获取排号信息 + * @param {Object} param + */ + getQueueUpList(param) { + return uni.api.get("/callTable/queue", param); + }, + + /** + * 获取桌型列表 + * @param {Object} param + */ + getQueueUpTablList(param) { + return uni.api.get("/callTable", param); + }, + + /** + * 获取排好状态 + * @param {Object} param + */ + getQueueUpState(param) { + return uni.api.get("/callTable/state", param); + }, + + /** + * 取号 + * @param {Object} data + */ + getTakeNumber(data) { + return uni.api.post("/callTable/takeNumber", data, false); + }, + + /** + * 取消排号 + * @param {Object} data + */ + cancelTakeNumber(data) { + return uni.api.post("/callTable/cancel", data, false); + }, } \ No newline at end of file diff --git a/common/js/api/queueUp.js b/common/js/api/queueUp.js new file mode 100644 index 0000000..6d1c425 --- /dev/null +++ b/common/js/api/queueUp.js @@ -0,0 +1,34 @@ +export default { + + /** + * 获取排号信息 + * @param {Object} param + */ + getQueueUpList(param) { + return uni.api.get("/callTable/queue", param); + }, + + /** + * 获取桌型列表 + * @param {Object} param + */ + getQueueUpTablList(param) { + return uni.api.get("/callTable", param); + }, + + /** + * 取号 + * @param {Object} data + */ + getTakeNumber(data) { + return uni.api.post("/callTable/takeNumber", data, false); + }, + + /** + * 取消排号 + * @param {Object} data + */ + cancelTakeNumber(data) { + return uni.api.post("/callTable", data, false); + }, +} \ No newline at end of file diff --git a/framework/0-conf.js b/framework/0-conf.js index ced77bd..62446e1 100644 --- a/framework/0-conf.js +++ b/framework/0-conf.js @@ -3,9 +3,9 @@ const debug = process.env.NODE_ENV == 'development' ? true : false; const proxyApi = "/api" // #endif // #ifdef MP-WEIXIN || APP || MP-ALIPAY -// const proxyApi = 'http://192.168.2.42:9889/cashierService' // 王伟 +// const proxyApi = 'http://192.168.1.15:9888/cashierService' // 王伟 // const proxyApi = 'http://192.168.1.27:9888/cashierService' // 帆哥 -// const proxyApiwws = 'ws://192.168.1.15:9999/netty' // 测试 +// const proxyApiwws = 'ws://192.168.1.15:9888/netty' // 测试 const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试 const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/netty' // 测试 // #endif diff --git a/pages.json b/pages.json index 046aed7..f8e1719 100644 --- a/pages.json +++ b/pages.json @@ -352,6 +352,19 @@ } } ], + "subPackages": [ + { + "root": "pagesQueueUp", + "pages": [ + { + "path": "index/index", + "style": { + "navigationBarTitleText": "在线排队" + } + } + ] + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "零点八零", diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 8e70b9e..fc1c31f 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -61,7 +61,7 @@ - ¥{{item.lowPrice}}/份 + ¥{{item.lowPrice}}/{{item.unitSnap}} @@ -73,12 +73,12 @@ - ¥{{item.lowPrice}}/份 + ¥{{item.lowPrice}}/{{item.unitSnap}} - {{item.suit}}份起点 + {{item.suit}}{{item.unitSnap}}起点 {{item.cartNumber<99?item.cartNumber:'99+'}} @@ -145,7 +145,6 @@ TOP{{index1+1}} - {{ item1.name }} 本店回头客第{{index1+1}}名 {{item1.shortTitle?item1.shortTitle:''}} @@ -153,7 +152,7 @@ - {{ item1.lowPrice }}/份 + {{ item1.lowPrice }}/{{item1.unitSnap}} 非可售时间 @@ -162,12 +161,12 @@ - {{ item1.lowPrice }}/份 + {{ item1.lowPrice }}/{{item1.unitSnap}} - {{item1.suit}}份起点 + {{item1.suit}}{{item1.unitSnap}}起点 {{item1.cartNumber<99?item1.cartNumber:'99+'}} @@ -353,7 +352,7 @@ {{salePrice}} - /杯 + /{{specifications.unitSnap}} diff --git a/pages/order_food/order_food_search.vue b/pages/order_food/order_food_search.vue index 08365fe..03e9cef 100644 --- a/pages/order_food/order_food_search.vue +++ b/pages/order_food/order_food_search.vue @@ -37,7 +37,7 @@ - {{ item1.lowPrice }}/份 + {{ item1.lowPrice }}/{{item1.unitSnap}} 非可售时间 @@ -46,12 +46,12 @@ - {{ item1.lowPrice }}/份 + {{ item1.lowPrice }}/{{item1.unitSnap}} - {{item1.suit}}份起点 + {{item1.suit}}{{item1.unitSnap}}起点 {{item1.cartNumber<99?item1.cartNumber:'99+'}} @@ -200,7 +200,7 @@ {{salePrice}} - /杯 + /{{specifications.unitSnap}} diff --git a/pagesQueueUp/index/index.vue b/pagesQueueUp/index/index.vue new file mode 100644 index 0000000..7c803be --- /dev/null +++ b/pagesQueueUp/index/index.vue @@ -0,0 +1,571 @@ + + + + + \ No newline at end of file