From c54802aead926ec66f2c1263ce1615aee0623728 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 16 八月 2024 17:26:01 +0800
Subject: [PATCH] mobox3 端口配置
---
pages/login/index.vue | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 1afa975..2fef010 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -48,7 +48,7 @@
<!-- 杈撳叆妗嗙ず渚�-->
<uni-popup ref="inputDialog" type="dialog">
<uni-popup-dialog ref="inputClose" mode="input" :title="translateSys('set')" :value="userServer"
- placeholder="璇疯緭鍏ュ唴瀹� @confirm="dialogInputConfirm"></uni-popup-dialog>
+ :placeholder="translate('input_server')" @confirm="dialogInputConfirm"></uni-popup-dialog>
</uni-popup>
<!-- 鐗堟湰鍗囩骇寮圭獥寮� -->
<uni-popup ref="promotion" type="center">
@@ -144,9 +144,13 @@
}
var ser = this.userServer.toLowerCase().split('/');
var translateSyshis = this;
- if (ser[1] == 'mobox3') { //鍒ゆ柇褰撳墠缃戝潃鏄惁鏄痬obox3
- var url = 'http://' + this.userServer + '/Program/version.txt';
- // console.log(url);
+ var rootUrl = 'http://' + this.userServer
+ if (this.userServer.includes("://")) {
+ rootUrl = this.userServer
+ }
+ if (ser[ser.length - 1] == 'mobox3') { //鍒ゆ柇褰撳墠缃戝潃鏄惁鏄痬obox3
+ var url = rootUrl + '/Program/version.txt';
+ console.log(url);
uni.request({
url: url, // 鎸囧畾JS鏂囦欢鐨勫畬鏁磋矾寰� method: 'GET',
@@ -160,8 +164,8 @@
var VersionCode = versionInfo[2].replace(".apk", "").replace(".", "").replace(
".", ""); //鏈嶅姟绔増鏈彿
// this.downloadUrl = resp.PdaUrl+"/"+VersionName; //app涓嬭浇閾炬帴
- translateSyshis.downloadUrl = "http://" + translateSyshis.userServer +
- "/Program/" +
+
+ translateSyshis.downloadUrl = rootUrl + "/Program/" +
VersionName; //app涓嬭浇閾炬帴this.
var isver = translateSyshis.compare(versionNum, version);
if (isver) {
@@ -193,7 +197,7 @@
});
} else {
var dataInfo = {
- server: this.userServer
+ server: rootUrl
};
this.$store.dispatch('GetApkVersionInfo', dataInfo).then(success => {
console.log(success);
@@ -208,7 +212,7 @@
const VersionCode = resp.VersionCode; //鐗堟湰缂栫爜
const versionNum = resp.Version; //鏈嶅姟绔増鏈彿
// this.downloadUrl = resp.PdaUrl+"/"+VersionName; //app涓嬭浇閾炬帴
- translateSyshis.downloadUrl = "http://" + translateSyshis.userServer +
+ translateSyshis.downloadUrl = rootUrl +
"/Program/" +
VersionName; //app涓嬭浇閾炬帴this.
var isver = translateSyshis.compare(versionNum, version);
@@ -330,7 +334,17 @@
// actionLogin:'login'
// }),
inputDialogToggle() {
- this.$refs.inputDialog.open()
+ // this.$refs.inputDialog.open()
+ const $this = this
+ uni.navigateTo({
+ url: "./set",
+ events: {
+ exitSetEvent(val) {
+ $this.userServer = val;
+ $this.query(); //鐗堟湰鍗囩骇
+ }
+ }
+ })
},
clickSetLanguage() {
uni.navigateTo({
@@ -411,9 +425,18 @@
});
return;
}
+ var rootUrl = 'http://' + this.userServer
+ if (this.userServer.includes("://")) {
+ rootUrl = this.userServer
+ }
+ const mobox3Port = utils.session.getValue('mobox3_port');
//妫�煡 "鐧诲綍鐘舵�/閿佸睆鐘舵�" 缁撴潫
var loginInfo = {
- server: this.userServer,
+ server: rootUrl,
+ orgsport: mobox3Port?.org || 5101,
+ moboxsport: mobox3Port?.mobox || 5102,
+ datasport: mobox3Port?.data || 5103,
+ mongodbsport: mobox3Port?.mongodb || 5201,
uname: this.userName,
pwd: this.userPwd,
cname: plus.device.model,
@@ -483,6 +506,9 @@
var url = this.$store.state.url;
var username = this.$store.state.username;
var userpwd = this.$store.state.userpwd;
+
+
+
var ischecked = false;
if (!this.userServer)
this.userServer = url;
--
Gitblit v1.9.1