diff --git a/framework/0-conf.js b/framework/0-conf.js index 2cc2c99..d002bd2 100644 --- a/framework/0-conf.js +++ b/framework/0-conf.js @@ -6,10 +6,10 @@ const proxyApi = "/api" // 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:9888/netty' // 测试 -const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试 -const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/netty' // 测试 -// const proxyApi = 'https://pre-cashier.sxczgkj.cn/cashierService' // 预发布 -// const proxyApiwws = 'wss://pre-cashier.sxczgkj.cn/netty' // 预发布 +// const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试 +// const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/netty' // 测试 +const proxyApi = 'https://pre-cashier.sxczgkj.cn/cashierService' // 预发布 +const proxyApiwws = 'wss://pre-cashier.sxczgkj.cn/netty' // 预发布 // const proxyApi = 'https://cashier.sxczgkj.cn/cashierService' // 线上 // const proxyApiwws = 'wss://cashier.sxczgkj.cn/netty' // 线上 // #endif diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 94db221..2129c1a 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -408,7 +408,7 @@ shopId: "", tableCode: "", orderAMeal: true, - groupProductldList: [], + groupProductIdList: [], } }, onPageScroll(e) { @@ -727,8 +727,8 @@ "userId": uni.cache.get('userInfo').id, } //套餐数据 - if ( this.groupProductldList.length > 0 ) { - params.groupProductldList = this.groupProductldList; + if ( this.groupProductIdList.length > 0 ) { + params.groupProductIdList = this.groupProductIdList; } if (this.shopInfo.storeInfo.eatModel.indexOf('dine-in') != -1) { params.tableId = this.tableCode;} this.addCart(params); @@ -820,7 +820,7 @@ this.specifications.indexb = index1 this.specifications.typeName = type if ( item1.type == 'package'&&item1.groupType == 1 ) { - this.groupProductldList = []; + this.groupProductIdList = []; this.optionalPackage(item1, index, index1, type) this.hodgepodge(this.specifications, 2) //获取skuid /2查找价格和数量 return; @@ -941,7 +941,7 @@ // 当前分类下选中数量 let number = 0; this.skuidname = []; - this.groupProductldList = [] + this.groupProductIdList = [] this.specifications.tagSnap[index].children.map(v=>{ if ( v.selected ) { number++ } }) @@ -954,7 +954,7 @@ this.specifications.tagSnap.forEach(v=>{ v.children.forEach(v1=>{ if (v1.selected) { - this.groupProductldList.push(v1.proId) + this.groupProductIdList.push(v1.proId) } }) }) diff --git a/pages/order_food/order_food_search.vue b/pages/order_food/order_food_search.vue index 4067f66..a77ded2 100644 --- a/pages/order_food/order_food_search.vue +++ b/pages/order_food/order_food_search.vue @@ -219,7 +219,7 @@ shopId: null, tableCode: null, - groupProductldList: [], + groupProductIdList: [], } }, @@ -430,8 +430,8 @@ "tableId": uni.cache.get('tableCode'), } //套餐数据 - if ( this.groupProductldList.length > 0 ) { - params.groupProductldList = this.groupProductldList; + if ( this.groupProductIdList.length > 0 ) { + params.groupProductIdList = this.groupProductIdList; } this.addCart(params); }, @@ -522,7 +522,7 @@ this.specifications.indexb = index1 this.specifications.typeName = type if ( item1.type == 'package'&&item1.groupType == 1 ) { - this.groupProductldList = []; + this.groupProductIdList = []; this.optionalPackage(item1, index, index1, type) this.hodgepodge(this.specifications, 2) //获取skuid /2查找价格和数量 return; @@ -641,7 +641,7 @@ // 当前分类下选中数量 let number = 0; this.skuidname = []; - this.groupProductldList = [] + this.groupProductIdList = [] this.specifications.tagSnap[index].children.map(v=>{ if ( v.selected ) { number++ } }) @@ -654,7 +654,7 @@ this.specifications.tagSnap.forEach(v=>{ v.children.forEach(v1=>{ if (v1.selected) { - this.groupProductldList.push(v1.proId) + this.groupProductIdList.push(v1.proId) } }) })