1. 修改`config/app.js`

- 注释掉生产环境配置,改为使用本地环境配置
	- 更新本地环境的BASE_URL为`http://192.168.1.7:8545`
2. 修改`pagesOrder/deliveryOrder/index.vue`
	- 将按钮文本从“确认已采购”改为“确认已入库”
	- 在日历确认选择日期后重置页码和商品列表,并更新列表数据
This commit is contained in:
mkm 2024-10-07 13:43:34 +08:00
parent 4681988864
commit a54ba0632e
2 changed files with 5 additions and 4 deletions

View File

@ -3,9 +3,9 @@ let WSS_URL
import store from "@/store/user.js" import store from "@/store/user.js"
// 环境 // 环境
// let env = "dev" // let env = "dev"
let env = "prod" // let env = "prod"
// let env = "release"; // let env = "release";
// let env = "local"; let env = "local";
switch (env) { switch (env) {
case 'dev': case 'dev':
@ -17,7 +17,7 @@ switch (env) {
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
break; break;
case 'local': 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' WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
break; break;
default: default:

View File

@ -43,7 +43,7 @@
<view class="card-footer"> <view class="card-footer">
<up-button size="small" type="primary" shape="circle" @click="cancleOrder(item)" <up-button size="small" type="primary" shape="circle" @click="cancleOrder(item)"
v-if="item.status==0">确认已采购</up-button> v-if="item.status==0">确认已入库</up-button>
</view> </view>
<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line> <up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
</up-list-item> </up-list-item>
@ -90,6 +90,7 @@
const calendarConfirm = (e) => { const calendarConfirm = (e) => {
where.value.start_time = e; where.value.start_time = e;
where.value.end_time = e; where.value.end_time = e;
where.value.page_no = 1;
goodsList1.value = [] goodsList1.value = []
getGoodsList() getGoodsList()
calendarShow.value = false calendarShow.value = false