wms_app.git - Gitblit

			@@ -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)
			}
			});