From 9ae83a12c2b9c764e28760fb9c3c09fe697c8990 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 22 七月 2024 14:56:00 +0800
Subject: [PATCH] 3018 按钮修改
---
pages/login/index.vue | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 1afa975..ec27e9d 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);
@@ -411,9 +415,13 @@
});
return;
}
+ var rootUrl = 'http://' + this.userServer
+ if (this.userServer.includes("://")) {
+ rootUrl = this.userServer
+ }
//妫�煡 "鐧诲綍鐘舵�/閿佸睆鐘舵�" 缁撴潫
var loginInfo = {
- server: this.userServer,
+ server:rootUrl,
uname: this.userName,
pwd: this.userPwd,
cname: plus.device.model,
--
Gitblit v1.9.1