diff --git a/config/app.js b/config/app.js index d8d8126..4aa7bcc 100644 --- a/config/app.js +++ b/config/app.js @@ -3,9 +3,9 @@ let WSS_URL import store from "@/store/user.js" // 环境 // let env = "dev" -let env = "prod" +// let env = "prod" // let env = "release"; -// let env = "local"; +let env = "local"; switch (env) { case 'dev': @@ -17,7 +17,7 @@ switch (env) { WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; case 'local': - BASE_URL = 'http://192.168.1.22:8545'; + BASE_URL = 'http://192.168.1.7:8545'; WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; default: diff --git a/pagesOrder/deliveryOrder/index.vue b/pagesOrder/deliveryOrder/index.vue index 0e90f88..6d62675 100644 --- a/pagesOrder/deliveryOrder/index.vue +++ b/pagesOrder/deliveryOrder/index.vue @@ -43,7 +43,7 @@ 确认已采购 + v-if="item.status==0">确认已入库 @@ -90,6 +90,7 @@ const calendarConfirm = (e) => { where.value.start_time = e; where.value.end_time = e; + where.value.page_no = 1; goodsList1.value = [] getGoodsList() calendarShow.value = false