weipengfei
/
purchase-let
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev #5

Merged
mkm merged 26 commits from dev into master 2024-12-30 16:22:20 +08:00
Conversation 0 Commits 26 Files Changed 61 +5 -4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a54ba0632e - Show all commits

6
config/app.js
View File

@ -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:

3
pagesOrder/deliveryOrder/index.vue
View File

@ -43,7 +43,7 @@
<view class="card-footer">
<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>
<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
</up-list-item>
@ -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