From c69b2a0ccd8ed4fe8f11b7bad34bc00b0aa2aaf7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 08 七月 2024 15:39:38 +0800
Subject: [PATCH] #
---
pages/login/login.vue | 185 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 173 insertions(+), 12 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index cfb94da..4c0c546 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">
@@ -76,11 +76,26 @@
<view class="popup-item-left">椤圭洰:</view>
<view class="popup-item-right"><input type="text" v-model="url.project"></view>
</view>
+ <view class="popup-item">
+ <view class="popup-item-left">浠撳簱:</view>
+ <view class="popup-item-right" style="border:none;padding: 0;">
+ <uni-combox style="height: 34rpx;" :candidates="storeList" placeholder="閫夋嫨浠撳簱" v-model="store"
+ @input="getStore" />
+ </view>
+ </view>
<view class="btn">
<view class="btn-left" @click="close">鍙栨秷</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>
@@ -105,7 +120,8 @@
url: {
ip: '',
port: '',
- project: ''
+ project: '',
+ storeId: ''
},
baseUrl: '',
user: {
@@ -116,6 +132,11 @@
loading: false,
btnText: '鐧诲綍'
},
+ msgType: 'success',
+ filename: '',
+ dialogContent: '',
+ storeList: ['瀹佹尝浠�','鏂版槍浠�'],
+ store:''
}
},
onLoad() {
@@ -128,14 +149,16 @@
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
+ this.url.storeId = uni.getStorageSync('store')
+ if (this.url.storeId == 1) {
+ this.store = '瀹佹尝浠�'
+ }
+ if (this.url.storeId == 2) {
+ this.store = '鏂版槍浠�'
+ }
+ },
+ onShow () {
+ this.getVersion()
},
methods: {
// 鏄剧ず/闅愯棌瀵嗙爜
@@ -160,12 +183,28 @@
// 淇濆瓨ip
settingConfirm() {
this.baseUrl = "http://" + this.url.ip + ':' + this.url.port + '/' + this.url.project
+ switch(this.store) {
+ case '瀹佹尝浠�':
+ this.url.storeId = 1
+ break;
+ case '鏂版槍浠�':
+ this.url.storeId = 2
+ break;
+ default:
+ this.url.storeId = null
+ break;
+ }
uni.setStorageSync('baseUrl', this.baseUrl);
uni.setStorageSync('url', this.url);
+ uni.setStorageSync('store',this.url.storeId);
this.$refs.inputDialog.close()
},
onLogin() {
let that = this
+ if (that.url.storeId == null) {
+ uni.showToast({ icon: 'error', title: '璇烽�夋嫨浠撳簱' })
+ return
+ }
uni.request({
url: that.baseUrl + '/login.action',
fail(result) {
@@ -176,7 +215,9 @@
},
data: {
username: that.user.userName,
- password: md5.hex_md5(that.user.password)
+ password: md5.hex_md5(that.user.password),
+ wms: true,
+ ownerId: that.url.storeId
},
header: {
"content-type": "application/json"
@@ -216,7 +257,127 @@
}
},
})
- }
+ },
+ //妫�娴嬪綋鍓嶅钩鍙帮紝濡傛灉鏄畨鍗撳垯鍚姩瀹夊崜鏇存柊
+ getVersion() {
+ let that = this;
+ uni.getSystemInfo({
+ success: (res) => {
+ if (res.platform == "android") {
+ that.AndroidCheckUpdate();
+ }
+ }
+ })
+ },
+ getStore() {
+ },
+ // 鑾峰彇褰撳墠鐗堟湰鍙�
+ 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