From 365a47dee1e2f66b87e60c90e252cb11676e4333 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 22 七月 2022 08:35:03 +0800
Subject: [PATCH] #
---
pages/login/login.vue | 12 ++++++++----
pages/basics/outPakin.vue | 6 +++++-
main.js | 1 -
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/main.js b/main.js
index ce51440..b81e625 100644
--- a/main.js
+++ b/main.js
@@ -5,7 +5,6 @@
// Vue.prototype.baseUrl = "http://localhost:8081/acs"
Vue.prototype.baseHttp = 'http://'
Vue.prototype.basePort = '8080'
-Vue.prototype.baseUrl = '/jkwms'
Vue.prototype.logList = []
Vue.config.productionTip = false
App.mpType = 'app'
diff --git a/pages/basics/outPakin.vue b/pages/basics/outPakin.vue
index 80d97bf..5f0e843 100644
--- a/pages/basics/outPakin.vue
+++ b/pages/basics/outPakin.vue
@@ -120,6 +120,9 @@
this.baseIP = UIP;
const UPORT = uni.getStorageSync('UPORT');
this.basePORT = UPORT
+ const PJO = uni.getStorageSync('PJO');
+ this.baseUrl = PJO
+ console.log(this.baseUrl)
this.getUrl()
},
onLoad() {
@@ -132,7 +135,7 @@
methods: {
// 鑾峰彇url
getUrl() {
- this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + this.baseUrl
+ this.commonUrl = this.baseHttp + this.baseIP + ':' +this.basePORT + "/" +this.baseUrl
},
radioChange(evt) {
for (let i = 0; i < this.origins.length; i++) {
@@ -340,6 +343,7 @@
'token':uni.getStorageSync('token')
},
success(result) {
+ console.log(result)
uni.hideLoading();
// uni.vibrateShort();
let res = result.data
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 40909ff..d47527d 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -127,9 +127,9 @@
userName:'',
password:'',
rember:true,
- IP:'',
+ IP:'10.20.192.200',
PORT:'8080',// 榛樿绔彛鍙�
- PJO:'jkwms'
+ PROJECT:'jkwms'
};
},
mounted() {
@@ -146,7 +146,6 @@
that.userName = '';
that.password = '';
}
-
const UIP = uni.getStorageSync('UIP');
if (UIP) {
that.IP = UIP;
@@ -162,6 +161,8 @@
} else {
that.PORT = '8080';
}
+ const PROJ = uni.getStorageSync('UPROJ');
+ this.baseUrl = PROJ
},
onLoad:function(){
// #ifdef APP-PLUS
@@ -201,6 +202,8 @@
uni.setStorageSync('UIP',this.baseIP)
this.basePORT = this.PORT
uni.setStorageSync('UPORT',this.basePORT)
+ this.baseUrl = this.PROJECT
+ uni.setStorageSync('UPROJ',this.baseUrl)
this.$refs.popup.close()
},
@@ -265,8 +268,9 @@
duration: 1000
});
},6000)
+ console.log(this.baseUrl)
uni.request({
- url: this.baseHttp + this.baseIP + ':' +this.basePORT + this.baseUrl + '/login.action',
+ url: this.baseHttp + this.baseIP + ':' +this.basePORT +"/" +this.baseUrl + '/login.action',
data: {
username:this.userName,
password:md5.hex_md5(this.password)
--
Gitblit v1.9.1