From 0ecc402885f332b21923bb12183dc072306f2b39 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 21 三月 2025 18:36:15 +0800
Subject: [PATCH] vue3

---
 pages/login/index.vue |   70 ++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/pages/login/index.vue b/pages/login/index.vue
index c05f07b..de2efe3 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -8,12 +8,6 @@
 
 				<a href="javascript:;" class="SetServer" @click="inputDialogToggle">{{translateSys('set')}}</a>
 				<a href="javascript:;" class="SetServer" @click="clickSetLanguage">{{translateSys('language')}}</a>
-
-				<!-- <div class="mui-input-row">
-					<label class="la_icon"><image class="logo_input" src="../../images/login/svr_30.png"></image></label>
-					<input type="text" class="mui-input" v-model="userServer" placeholder="鏈嶅姟鍣ㄥ湴鍧�>
-					<label class="mui-navigate-right" id="sersel"><image class="logo_icon" src="../../images/login/sel_left.png" ></image></label>
-				</div> -->
 				<div class="mui-input-row">
 					<label class="la_icon">
 						<image class="logo_input" src="../../images/login/person_30.png"></image>
@@ -35,7 +29,8 @@
 					</label>
 				</checkbox-group>
 			</form>
-			<button id='login' type="default" @tap="logind" class="btn_login">{{translateSys("start_login")}}</button>
+			<button id='login' :disabled="btnLoading" type="default" @tap="onClickLogin"
+				class="btn_login">{{translateSys("start_login")}}</button>
 			<p style="float:right; margin: 10px 10px;color:#c8c7cc">
 				<span>{{translateSys('version')}}锛�/span>
 				<span>{{version}}</span>
@@ -70,7 +65,10 @@
 			</uni-popup>
 			<!-- 鐗堟湰鍗囩骇寮圭獥缁撴潫 -->
 		</view>
-
+		<!-- <button @click="onClickWms">鐧诲綍wms</button>
+		<view class="webview">
+			<web-view ref="webview" src="http://115.29.185.26:5000/mobox3/#/"></web-view>
+		</view> -->
 	</view>
 
 </template>
@@ -88,9 +86,11 @@
 		login,
 		getApkVersionInfo
 	} from "@/api/index.js"
+	import buttonClickMixin from '@/mixins/button-click.js';
 
 	import utils from "@/js/utils.js"
 	export default {
+		mixins: [buttonClickMixin],
 		components: {
 			cmdProgress
 		},
@@ -145,19 +145,22 @@
 							title: this.translateSys("tip"),
 							content: this.translate("tip_no_web_server"),
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return;
 					}
 					// var ser = this.userServer.toLowerCase().split('/');
 					const res = await getApkVersionInfo(this.userServer)
 					this.downloadUrl = res.dldUrl || ""
-					var isver = this.compare(res.verNum, version);
-					if (isver) {
-						this.$refs.promotion.open();
-					} else {
-						console.log('褰撳墠宸叉槸鏈�柊鐗堟湰')
+					if (this.downloadUrl) {
+						var isver = this.compare(res.verNum || "", version);
+						if (isver) {
+							this.$refs.promotion.open();
+						} else {
+							console.log('褰撳墠宸叉槸鏈�柊鐗堟湰')
+						}
 					}
+
 				} catch (ex) {
 					// console.log(ex);
 					let exStr = JSON.stringify(ex)
@@ -168,11 +171,11 @@
 						title: this.translateSys("error"),
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 
-	
+
 			},
 			compare(curV, reqV) {
 				var arr1 = curV.toString().split('.');
@@ -306,7 +309,7 @@
 				console.log(e.target);
 				utils.session.setValue('account', '');
 				utils.session.setValue('password', '');
-				if (e.target.value[0] == '1') {
+				if (e.detail.value[0] == '1') {
 					utils.session.setValue('account', this.userName);
 					utils.session.setValue('password', this.userPwd);
 				}
@@ -330,6 +333,14 @@
 			// 	((expiredays==null)?'':';expires='+exdate.toGMTString());
 
 			// },
+			onClickLogin() {
+				this.handleButtonClick((done) => {
+					this.logind()
+					setTimeout(() => {
+						done(); // 閲嶇疆鐘舵�
+					}, 1000);
+				});
+			},
 			async logind() {
 				try {
 					if (!this.userServer) {
@@ -337,7 +348,7 @@
 							title: this.translateSys('tip'),
 							content: this.translate('tip_no_web_server'),
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return;
 					}
@@ -346,7 +357,7 @@
 							title: this.translateSys('tip'),
 							content: this.translate('tip_no_user_account'),
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return;
 					}
@@ -355,7 +366,7 @@
 							title: this.translateSys('tip'),
 							content: this.translate('tip_no_user_password'),
 							showCancel: false,
-							confirmText: this.translateSys('cancel')
+							confirmText: this.translateSys('close')
 						});
 						return;
 					}
@@ -377,7 +388,7 @@
 						pwd: this.userPwd
 					}
 					hideLoading()
-		
+
 					uni.navigateTo({
 						url: '../index/index?args=9999999999'
 					})
@@ -392,10 +403,16 @@
 						title: this.translateSys("error"),
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
-	
+
+			},
+			onClickWms() {
+				let otherAppSchemeURL = "testapp://pages/index/index"; // 鏇挎崲涓虹洰鏍嘺pp鐨剆cheme URL
+				plus.runtime.openURL(otherAppSchemeURL, function(error) {
+					console.error('鎵撳紑搴旂敤澶辫触: ', error);
+				}, "uni.TeatApp");
 			},
 			translate(t) {
 				if (typeof this.$t == "function") return this.$t(`page.${t}`)
@@ -406,12 +423,13 @@
 				else return t;
 			},
 		},
-		onLoad() {
+		onLoad(options) {
 			//鑾峰彇mac鍦板潃
+
 			var url = utils.session.getValue('server');
 			var username = utils.session.getValue('account');
 			var userpwd = utils.session.getValue('password');
-			
+
 			var ischecked = false;
 			if (!this.userServer)
 				this.userServer = url;
@@ -444,7 +462,7 @@
 			console.log('Android璁惧鐨刣eviceId:', deviceId);
 			plus.runtime.getProperty(plus.runtime.appid, (info) => {
 				// console.log(info);
-				this.$data.version = info.version;
+				this.version = info.version;
 			});
 		}
 	}

--
Gitblit v1.9.1