From 93625c096d5cac73dd8335868cc7bd861ff43ece Mon Sep 17 00:00:00 2001
From: cyy <cuiqian2004@163.com>
Date: 星期日, 18 八月 2024 20:22:59 +0800
Subject: [PATCH] test
---
pages/login/index.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/pages/login/index.vue b/pages/login/index.vue
index ec27e9d..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="translate('input_server')" @confirm="dialogInputConfirm"></uni-popup-dialog>
+ :placeholder="translate('input_server')" @confirm="dialogInputConfirm"></uni-popup-dialog>
</uni-popup>
<!-- 鐗堟湰鍗囩骇寮圭獥寮� -->
<uni-popup ref="promotion" type="center">
@@ -165,7 +165,7 @@
".", ""); //鏈嶅姟绔増鏈彿
// this.downloadUrl = resp.PdaUrl+"/"+VersionName; //app涓嬭浇閾炬帴
- translateSyshis.downloadUrl = rootUrl+ "/Program/" +
+ translateSyshis.downloadUrl = rootUrl + "/Program/" +
VersionName; //app涓嬭浇閾炬帴this.
var isver = translateSyshis.compare(versionNum, version);
if (isver) {
@@ -212,7 +212,7 @@
const VersionCode = resp.VersionCode; //鐗堟湰缂栫爜
const versionNum = resp.Version; //鏈嶅姟绔増鏈彿
// this.downloadUrl = resp.PdaUrl+"/"+VersionName; //app涓嬭浇閾炬帴
- translateSyshis.downloadUrl = rootUrl+
+ translateSyshis.downloadUrl = rootUrl +
"/Program/" +
VersionName; //app涓嬭浇閾炬帴this.
var isver = translateSyshis.compare(versionNum, version);
@@ -334,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({
@@ -419,9 +429,14 @@
if (this.userServer.includes("://")) {
rootUrl = this.userServer
}
+ const mobox3Port = utils.session.getValue('mobox3_port');
//妫�煡 "鐧诲綍鐘舵�/閿佸睆鐘舵�" 缁撴潫
var loginInfo = {
- server:rootUrl,
+ 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,
@@ -491,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