diff --git a/env.js b/env.js index b87b72a..c33f58a 100644 --- a/env.js +++ b/env.js @@ -1,4 +1,4 @@ -export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址 -// export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址 +// export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址 +export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址 export const API_URL = `${BASE_URL}/system` //后台接口域名 export const IMG_URL = 'https://ye4s.file.gzxunren.com' //全局网络图片地址变量,css背景图片地址变量在uni.scss diff --git a/pages/packing/packMode.vue b/pages/packing/packMode.vue index 54864f3..07fd528 100644 --- a/pages/packing/packMode.vue +++ b/pages/packing/packMode.vue @@ -575,6 +575,12 @@ export default { this.orderBarcode = c; this.orderInputFocus = false; if (this.groupVerifyingActive && !this.orderBlocked) { + // 团单尚未开始核实时(groupVerifiedCount === 0):扫描其它团购面单直接查询新订单(不弹窗) + if (this.groupVerifiedCount === 0) { + this.resetOrderQuery(); + this.queryOrder(c); + return; + } // 团单核实中:扫描内容按商品条码核实(匹配商品明细条码) this.handleGroupVerifyScan(c); return;