From 3d5efbc419d3ddff189d8d0c36cf743887d28eaa Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 29 七月 2024 13:43:44 +0800
Subject: [PATCH] #
---
pages/login/login.vue | 164 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 144 insertions(+), 20 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index cfb94da..574902a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,7 +9,7 @@
<!-- logo -->
<view class="logo">
<view class="logo-box">
- <image src="../../static/img/logo.png" mode="aspectFit"></image>
+ <image src="../../static/img/logo1.png" mode="aspectFit"></image>
</view>
</view>
<view class="content">
@@ -18,7 +18,7 @@
<view class="box-icon">
<uni-icons type="person" size="20" color="#707070"></uni-icons>
</view>
- <view class="box-text">璐﹀彿:</view>
+ <view class="box-text">璩櫉:</view>
<view class="box-input">
<input type="text" placeholder="璇疯緭鍏ヨ处鍙�" v-model="user.userName"
placeholder-style="font-size:14px;color:#ccc;">
@@ -30,7 +30,7 @@
<view class="box-icon">
<uni-icons type="locked" size="20" color="#707070"></uni-icons>
</view>
- <view class="box-text">瀵嗙爜:</view>
+ <view class="box-text">瀵嗙⒓:</view>
<view class="box-input">
<input :password="!showPassword" placeholder="璇疯緭鍏ュ瘑鐮�" v-model="user.password"
placeholder-style="font-size:14px;color:#ccc;" >
@@ -43,7 +43,7 @@
<!-- 璁颁綇瀵嗙爜 -->
<view class="check">
<view class="check-left">
- <view>璁颁綇瀵嗙爜</view>
+ <view>瑷樹綇瀵嗙⒓</view>
</view>
<view class="check-right">
<switch :checked='remberPassword' color="#FFCC33" style="zoom:.5" @change="remberChange"/>
@@ -73,14 +73,22 @@
<view class="popup-item-right"><input type="text" v-model="url.port"></view>
</view>
<view class="popup-item">
- <view class="popup-item-left">椤圭洰:</view>
+ <view class="popup-item-left">URL:</view>
<view class="popup-item-right"><input type="text" v-model="url.project"></view>
</view>
<view class="btn">
<view class="btn-left" @click="close">鍙栨秷</view>
- <view class="btn-right" @click="settingConfirm">纭</view>
+ <view class="btn-right" @click="settingConfirm">纰鸿獚</view>
</view>
</view>
+ </uni-popup>
+ </view>
+
+ <view>
+ <!-- 鎻愮ず绐楃ず渚� -->
+ <uni-popup ref="upVersion" type="dialog">
+ <uni-popup-dialog :type="msgType" title="閫氱煡" :content="dialogContent" @confirm="dialogConfirm"
+ @close="dialogClose"></uni-popup-dialog>
</uni-popup>
</view>
@@ -114,8 +122,11 @@
},
load: {
loading: false,
- btnText: '鐧诲綍'
+ btnText: '鐧婚寗'
},
+ msgType: 'success',
+ filename: '',
+ dialogContent: ''
}
},
onLoad() {
@@ -128,14 +139,9 @@
if (!this.url) {
this.url = {ip: '',port: '',project: ''}
}
-
- // 鎵嬫満绔増鏈彿
- // #ifdef APP-PLUS
- var that = this
- plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
- that.version = wgtinfo.version
- });
- // #endif
+ },
+ onShow () {
+ this.getVersion()
},
methods: {
// 鏄剧ず/闅愯棌瀵嗙爜
@@ -171,7 +177,7 @@
fail(result) {
uni.showToast({
icon: 'error',
- title: '璇锋眰澶辫触'
+ title: '璜嬫眰澶辨晽'
})
},
data: {
@@ -184,7 +190,7 @@
success(result) {
if (result.statusCode === 404) {
uni.showToast({
- title: '鐧诲綍澶辫触',
+ title: '鐧婚寗澶辨晽',
icon: "error"
})
return
@@ -192,7 +198,7 @@
let res = result.data
if (res.code === 200) {
that.load.loading = true;
- that.load.btnText = '鐧诲綍涓�';
+ that.load.btnText = '鐧婚寗涓�';
uni.setStorageSync('token', res.data.token);
if(that.remberPassword){
uni.setStorageSync('user', that.user);
@@ -201,7 +207,7 @@
}
setTimeout(() => {
uni.showToast({
- title: '鐧诲綍鎴愬姛'
+ title: '鐧婚寗鎴愬姛'
})
setTimeout(() => {
uni.reLaunch({
@@ -216,7 +222,125 @@
}
},
})
- }
+ },
+ //妫�娴嬪綋鍓嶅钩鍙帮紝濡傛灉鏄畨鍗撳垯鍚姩瀹夊崜鏇存柊
+ getVersion() {
+ let that = this;
+ uni.getSystemInfo({
+ success: (res) => {
+ if (res.platform == "android") {
+ that.AndroidCheckUpdate();
+ }
+ }
+ })
+ },
+ // 鑾峰彇褰撳墠鐗堟湰鍙�
+ AndroidCheckUpdate() {
+ let that = this;
+ plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+ that.version = wgtinfo.version //瀹㈡埛绔増鏈彿
+ })
+ setTimeout(()=>{
+ that.getUpdateVersion()
+ },100)
+ },
+ // 鏍￠獙鐗堟湰
+ getUpdateVersion() {
+ let that = this
+ let type = 0
+ if (that.baseUrl == 'http://undefined:undefined/undefined') {
+ return
+ }
+
+ let url = that.baseUrl + '/appVersion/checkUpdate/' + that.version + '/' + type
+ uni.request({
+ url: url,
+ method: 'GET',
+ success(res) {
+ console.log(res);
+ var res = res.data
+ if (res.data) {
+ that.filename = res.data.path
+ that.dialogContent = '鐧肩従鏂扮増鏈�:' + res.data.version + ', 鏄惁绔嬪嵆鏇存柊'
+ that.$refs.upVersion.open()
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ position: 'top'
+ })
+ }
+
+ }
+ })
+ },
+ dialogConfirm() {
+ this.$refs.upVersion.close()
+ this.downWgt()
+ },
+ dialogClose() {
+ this.$refs.upVersion.close()
+ },
+ downWgt() {
+ let that = this;
+ const downloadUrl = that.baseUrl + "/appVersion/downloadApp/" + that.filename
+ uni.showLoading({
+ title: '鏇存柊涓�︹��'
+ })
+ const downloadTask = uni.downloadFile({ //鎵ц涓嬭浇
+ url: downloadUrl, //涓嬭浇鍦板潃
+ timeout: 1000 * 30, //30绉掕秴鏃舵椂闂�
+ success: downloadResult => { //涓嬭浇鎴愬姛
+ console.log(downloadResult);
+ that.showdownLine = false
+ uni.hideLoading();
+ if (downloadResult.statusCode == 200) {
+ uni.showModal({
+ title: '',
+ content: '鏇存柊鎴愬姛锛岀‘瀹氱幇鍦ㄩ噸鍚悧锛�',
+ confirmText: '閲嶅惎',
+ confirmColor: '#EE8F57',
+ success: function(res) {
+ if (res.confirm == true) {
+ plus.runtime.install( //瀹夎
+ downloadResult.tempFilePath, {
+ force: true
+ },
+ function(res) {
+ utils.showToast('鏇存柊鎴愬姛锛岄噸鍚腑');
+ plus.runtime.restart();
+ }
+ );
+ }
+ }
+ });
+ } else {
+ uni.hideLoading();
+ that.showdownLine = false
+ uni.showToast({
+ title:'璇峰厛涓婁紶瀹夎鍖�',
+ icon: 'error'
+ })
+ }
+ },
+ fail: err => {
+ uni.hideLoading();
+ that.showdownLine = false
+ that.$u.toast(downloadResult.errMsg)
+ },
+ complete: com => {
+
+ console.log(com)
+ }
+ });
+
+ // 涓嬭浇杩涘害
+ downloadTask.onProgressUpdate(res => {
+ that.downloadNum = res.progress
+ console.log('涓嬭浇杩涘害' + that.downloadNum);
+ });
+ },
+
}
}
</script>
--
Gitblit v1.9.1