From 1232d29074c3c636c904921a306d14b150b46006 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 07 七月 2025 16:59:58 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-admin/src/utils/request.js | 5 ++---
zy-asrs-admin/src/config.js | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-admin/src/config.js b/zy-asrs-admin/src/config.js
index 3d34292..0e963ed 100644
--- a/zy-asrs-admin/src/config.js
+++ b/zy-asrs-admin/src/config.js
@@ -1,7 +1,7 @@
import { reactive, inject } from 'vue';
export const globalState = reactive({
- url: 'http://192.168.8.14:8081/wms',
+ url: 'http://127.0.0.1:8081/wms',
token: '',
user: null,
locale: 'zh_CN', // 榛樿璇█
diff --git a/zy-asrs-admin/src/utils/request.js b/zy-asrs-admin/src/utils/request.js
index 54d11b0..1fd3b6a 100644
--- a/zy-asrs-admin/src/utils/request.js
+++ b/zy-asrs-admin/src/utils/request.js
@@ -7,10 +7,9 @@
})
export const get = async (url, params) => {
- if (params?.condition != null || params?.condition != undefined) {
+ if (params?.condition != null && params?.condition != undefined && params?.condition != "") {
params.current = 1
}
-
return instance({
url: url,
method: 'get',
@@ -22,7 +21,7 @@
}
export const post = async (url, data) => {
- if (data?.condition != null || data?.condition != undefined) {
+ if (data?.condition != null && data?.condition != undefined && data?.condition != "") {
data.current = 1
}
--
Gitblit v1.9.1