From aeaace1cf0c48cc9b2dffbc5d5ab9eb4ecfad4a1 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 16 八月 2022 19:30:19 +0800
Subject: [PATCH] Merge branch 'hylywms' of http://47.97.1.152:5880/r/~whycq/wms-app into hylywms
---
pages/basics/matSelect.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pages/basics/matSelect.vue b/pages/basics/matSelect.vue
index 906007d..de4aeff 100644
--- a/pages/basics/matSelect.vue
+++ b/pages/basics/matSelect.vue
@@ -42,6 +42,7 @@
export default {
data() {
return {
+ commonUrl:null,
condition:null,
tag: [],
data: [],
@@ -58,8 +59,7 @@
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
eventChannel.on('acceptDataFromOpenerPage', function(data) {
- that.baseIP = data.baseIP
- that.basePORT = data.basePORT
+ that.commonUrl = data.commonUrl
that.showTag(1)
})
},
@@ -81,7 +81,7 @@
});
uni.request({
// url: "http://localhost:8081/jkwms/tag/list/pda/auth",
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/search/pda/auth',
+ url: that.commonUrl + '/mat/search/pda/auth',
data: {
condition: condition
},
@@ -111,7 +111,7 @@
let that = this
uni.showLoading();
uni.request({
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/tag/list/pda/auth',
+ url: that.commonUrl + '/tag/list/pda/auth',
header: {
'token':uni.getStorageSync('token'),
},
@@ -123,6 +123,7 @@
'token':uni.getStorageSync('token'),
},
success(result) {
+ console.log(result)
that.tag = null
that.data = null
var res = result.data
@@ -154,7 +155,7 @@
}
uni.request({
// url: "http://localhost:8081/jkwms/mat/list/pda/auth",
- url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/mat/list/pda/auth',
+ url: that.commonUrl + '/mat/list/pda/auth',
data: {
tagId: tagId
},
--
Gitblit v1.9.1