From 986da22689dc9a5faef751c02348fb1f47584414 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 21 三月 2025 18:53:01 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/~jt/MES-PDA
---
pages/login/index.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 1cb579e..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>
@@ -91,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
},
@@ -312,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);
}
@@ -336,6 +333,14 @@
// ((expiredays==null)?'':';expires='+exdate.toGMTString());
// },
+ onClickLogin() {
+ this.handleButtonClick((done) => {
+ this.logind()
+ setTimeout(() => {
+ done(); // 閲嶇疆鐘舵�
+ }, 1000);
+ });
+ },
async logind() {
try {
if (!this.userServer) {
@@ -420,7 +425,7 @@
},
onLoad(options) {
//鑾峰彇mac鍦板潃
-
+
var url = utils.session.getValue('server');
var username = utils.session.getValue('account');
var userpwd = utils.session.getValue('password');
@@ -457,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