diff --git a/env.js b/env.js index c33f58a..b87b72a 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/work/order/interceptionLog.vue b/pages/work/order/interceptionLog.vue index a55b1a2..29b7cac 100644 --- a/pages/work/order/interceptionLog.vue +++ b/pages/work/order/interceptionLog.vue @@ -71,6 +71,7 @@ import voice from '@/core/utils/voice'; const map = { '': '未拦截', 'none': '未拦截', + 'requested': '拦截中', 'pending': '拦截中', 'intercepting': '拦截中', 'intercepted': '仓库已拦截', diff --git a/pages/work/order/order-review-comps/OrderList.vue b/pages/work/order/order-review-comps/OrderList.vue index a4225b0..970cbbf 100644 --- a/pages/work/order/order-review-comps/OrderList.vue +++ b/pages/work/order/order-review-comps/OrderList.vue @@ -78,7 +78,7 @@ :class="isPrintDisabled(item) ? 'record-value--print-disabled' : 'record-value--unprinted'" @click.stop="!isPrintDisabled(item) && $emit('printClick', item)" >未打印 - 拦截 + 拦截 @@ -89,6 +89,19 @@