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 | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 25 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 69d3dfb..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,6 +76,13 @@
<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>
@@ -87,7 +94,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>
@@ -113,7 +120,8 @@
url: {
ip: '',
port: '',
- project: ''
+ project: '',
+ storeId: ''
},
baseUrl: '',
user: {
@@ -126,6 +134,9 @@
},
msgType: 'success',
filename: '',
+ dialogContent: '',
+ storeList: ['瀹佹尝浠�','鏂版槍浠�'],
+ store:''
}
},
onLoad() {
@@ -138,16 +149,15 @@
if (!this.url) {
this.url = {ip: '',port: '',project: ''}
}
- // this.getVersion()
+ this.url.storeId = uni.getStorageSync('store')
+ if (this.url.storeId == 1) {
+ this.store = '瀹佹尝浠�'
+ }
+ if (this.url.storeId == 2) {
+ this.store = '鏂版槍浠�'
+ }
},
onShow () {
- // 鎵嬫満绔増鏈彿
- // // #ifdef APP-PLUS
- // var that = this
- // plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
- // that.version = wgtinfo.version
- // });
- // // #endif
this.getVersion()
},
methods: {
@@ -173,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) {
@@ -189,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"
@@ -235,36 +263,33 @@
let that = this;
uni.getSystemInfo({
success: (res) => {
- console.log(res.platform);
if (res.platform == "android") {
that.AndroidCheckUpdate();
}
}
})
},
+ getStore() {
+ },
// 鑾峰彇褰撳墠鐗堟湰鍙�
AndroidCheckUpdate() {
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',
@@ -273,7 +298,14 @@
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 +321,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 +351,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