From fc549ce40b7c58c32daf5238e5e274a15455f651 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 三月 2025 16:30:32 +0800
Subject: [PATCH] 1
---
pages/login/login.vue | 86 ++++++++++++++++++++++++++++++------------
1 files changed, 61 insertions(+), 25 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 69d3dfb..619bde9 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/newLogo.png" mode="aspectFit"></image>
</view>
</view>
<view class="content">
@@ -87,7 +87,7 @@
<view>
<!-- 鎻愮ず绐楃ず渚� -->
<uni-popup ref="upVersion" type="dialog">
- <uni-popup-dialog :type="msgType" title="閫氱煡" content="鍙戠幇鏂扮増鏈�,鏄惁闇�瑕佹洿鏂�" @confirm="dialogConfirm"
+ <uni-popup-dialog :type="msgType" title="閫氱煡" :content="dialogContent" @confirm="dialogConfirm"
@close="dialogClose"></uni-popup-dialog>
</uni-popup>
</view>
@@ -126,6 +126,9 @@
},
msgType: 'success',
filename: '',
+ dialogContent: '',
+ elements: [],
+ colorList: ['cyan','blue','purple','mauve','pink','brown','red','orange','yellow','olive','olive','grey' ]
}
},
onLoad() {
@@ -138,16 +141,8 @@
if (!this.url) {
this.url = {ip: '',port: '',project: ''}
}
- // this.getVersion()
},
onShow () {
- // 鎵嬫満绔増鏈彿
- // // #ifdef APP-PLUS
- // var that = this
- // plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
- // that.version = wgtinfo.version
- // });
- // // #endif
this.getVersion()
},
methods: {
@@ -175,6 +170,7 @@
this.baseUrl = "http://" + this.url.ip + ':' + this.url.port + '/' + this.url.project
uni.setStorageSync('baseUrl', this.baseUrl);
uni.setStorageSync('url', this.url);
+ uni.setStorageSync('project','tzsk')
this.$refs.inputDialog.close()
},
onLogin() {
@@ -195,6 +191,9 @@
"content-type": "application/json"
},
success(result) {
+ // uni.reLaunch({
+ // url: '../home/menuHome'
+ // });
if (result.statusCode === 404) {
uni.showToast({
title: '鐧诲綍澶辫触',
@@ -213,12 +212,13 @@
uni.removeStorageSync('user');
}
setTimeout(() => {
+ that.getAuth2()
uni.showToast({
title: '鐧诲綍鎴愬姛'
})
setTimeout(() => {
uni.reLaunch({
- url: '../home/home'
+ url: '../home/menuHome'
});
}, 300)
}, 700)
@@ -230,12 +230,43 @@
},
})
},
+ getIcon(e) {
+ const ways = ['pakin','orderPakin','orderPutOn']
+ if (ways.includes(e)) {
+ this.icon = 'pullup'
+ }
+ },
+ getAuth2() {
+ let that = this
+ uni.request({
+ url: that.baseUrl + '/menu/pdaAll/auth',
+ data: {level:1,id: '0'},
+ header: { 'token': uni.getStorageSync('token') },
+ method: 'POST',
+ success(res) {
+ res = res.data
+ that.elements = []
+ if (res.code === 200) {
+ uni.setStorageSync('menu', res.data);
+ } else if (res.code === 403) {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' })
+ setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
+ } else if(res.status === 404) {
+ that.elements = that.elements2
+ } else {
+ uni.showToast({ title: res.msg, icon: "none", position: 'top' })
+ }
+ },
+ fail(err) {
+ console.log(err);
+ }
+ })
+ },
//妫�娴嬪綋鍓嶅钩鍙帮紝濡傛灉鏄畨鍗撳垯鍚姩瀹夊崜鏇存柊
getVersion() {
let that = this;
uni.getSystemInfo({
success: (res) => {
- console.log(res.platform);
if (res.platform == "android") {
that.AndroidCheckUpdate();
}
@@ -247,33 +278,35 @@
let that = this;
plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
that.version = wgtinfo.version //瀹㈡埛绔増鏈彿
- console.log('褰撳墠app鐗堟湰淇℃伅锛�' + that.version);
})
setTimeout(()=>{
that.getUpdateVersion()
- },1000)
+ },100)
},
// 鏍￠獙鐗堟湰
getUpdateVersion() {
- console.log(this.version);
let that = this
let type = 0
if (that.baseUrl == 'http://undefined:undefined/undefined') {
return
}
- console.log(2);
let url = that.baseUrl + '/appVersion/checkUpdate/' + that.version + '/' + type
- console.log(url);
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'
+ })
}
}
@@ -289,21 +322,17 @@
downWgt() {
let that = this;
const downloadUrl = that.baseUrl + "/appVersion/downloadApp/" + that.filename
- console.log(downloadUrl);
uni.showLoading({
title: '鏇存柊涓�︹��'
})
- console.log('*************************************');
const downloadTask = uni.downloadFile({ //鎵ц涓嬭浇
url: downloadUrl, //涓嬭浇鍦板潃
timeout: 1000 * 30, //30绉掕秴鏃舵椂闂�
success: downloadResult => { //涓嬭浇鎴愬姛
console.log(downloadResult);
- // that.showdownLine = false
+ that.showdownLine = false
uni.hideLoading();
- console.log('downloadResult.statusCode' + downloadResult.statusCode)
if (downloadResult.statusCode == 200) {
- console.log('鏇存柊涓�')
uni.showModal({
title: '',
content: '鏇存柊鎴愬姛锛岀‘瀹氱幇鍦ㄩ噸鍚悧锛�',
@@ -323,15 +352,22 @@
}
}
});
+ } else {
+ uni.hideLoading();
+ that.showdownLine = false
+ uni.showToast({
+ title:'璇峰厛涓婁紶瀹夎鍖�',
+ icon: 'error'
+ })
}
},
fail: err => {
uni.hideLoading();
that.showdownLine = false
- that.$u.toast(err.errMsg)
- console.log(err)
+ that.$u.toast(downloadResult.errMsg)
},
complete: com => {
+
console.log(com)
}
});
--
Gitblit v1.9.1