From 7335bf9f71207bf3d0f35208040ef696164af589 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 09 九月 2022 13:36:19 +0800
Subject: [PATCH] #
---
pages/basics/matSelect.vue | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/pages/basics/matSelect.vue b/pages/basics/matSelect.vue
index 5b4d679..a8b6db0 100644
--- a/pages/basics/matSelect.vue
+++ b/pages/basics/matSelect.vue
@@ -42,13 +42,10 @@
export default {
data() {
return {
+ commonUrl:null,
condition:null,
tag: [],
data: [],
- baseHttp:'http://',
- baseIP:'',
- basePORT:'',
- baseUrl:'/jkwms'
}
},
onLoad() {
@@ -57,9 +54,8 @@
const eventChannel = this.getOpenerEventChannel();
// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
- eventChannel.on('acceptDataFromOpenerPage', function(data) {
- that.baseIP = data.baseIP
- that.basePORT = data.basePORT
+ eventChannel.on('commonUrl', function(data) {
+ that.commonUrl = data.commonUrl
that.showTag(1)
})
},
@@ -81,7 +77,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
},
@@ -109,21 +105,21 @@
},
showTag(parentId) {
let that = this
- uni.vibrateShort();
uni.showLoading();
uni.request({
- // url: "http://localhost:8081/jkwms/tag/list/pda/auth",
- 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'),
+ },
data: {
limit: 100000,
parentId: parentId
},
- method:"GET",
- header: {
+ header: {
'token':uni.getStorageSync('token'),
- },
+ },
success(result) {
-
+ console.log(result)
that.tag = null
that.data = null
var res = result.data
@@ -153,10 +149,8 @@
if (tagId == null || tagId == '' || tagId == undefined) {
return;
}
- uni.showLoading();
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
},
@@ -165,11 +159,14 @@
'token':uni.getStorageSync('token'),
},
success(result) {
+ console.log(result)
that.tag = null
var res = result.data
if (res.code === 200) {
if (res.data != null && res.data.length > 0) {
+ uni.showLoading();
that.data = res.data
+ uni.hideLoading();
} else {
// that.tagId = parentId
}
@@ -183,7 +180,7 @@
} else {
uni.showToast({title: res.msg, icon: "none",position: 'top'})
}
- uni.hideLoading();
+
}
});
},
--
Gitblit v1.9.1