diff --git a/manifest.json b/manifest.json
index ee098e2..a5ec375 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "海亮铜箔",
     "appid" : "__UNI__22404A1",
     "description" : "海亮铜箔手持系统",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "versionName" : "1.0.0",
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 9b6e893..7adc4f4 100644
--- a/pages.json
+++ b/pages.json
@@ -18,6 +18,12 @@
 		    	"navigationStyle": "custom"
 		    }  
 		}
+		,{
+		    "path" : "pages/login/upgrade",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
+		}
 		,{
 			"path" : "pages/ProductManage/SboProdProgress",
 			"style": {
@@ -138,21 +144,6 @@
 		    	"navigationStyle": "custom"
 		    }   
 		}
-    ,{
-    "path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
-    "style": {
-        "app-plus": {
-            "animationDuration": 200,
-            "animationType": "fade-in",
-            "background": "transparent",
-            "backgroundColorTop": "transparent",
-            "popGesture": "none",
-            "scrollIndicator": false,
-            "titleNView": false
-        },
-        "disableScroll": true
-    }
-}
     ,{
             "path" : "pages/ProductManage/EmptyPipeOutStore",
             "style" :                                                                                    
diff --git a/pages/login/login.vue b/pages/login/login.vue
index fe0fe56..55e67ff 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -15,6 +15,7 @@
 				<text class="radio-label">记住用户名</text>
 			</view>
 			<text class="setup-text" @tap="setup">设置</text>
+			<text class="setup-text" @tap="isUpdate">升级版本</text>
 		</view>
 		<button class="login-btn" :disabled="disabled" @tap="toLogin">确认登录</button>
 		<!-- <button class="login-btn" @tap="test">打印</button> -->
@@ -25,132 +26,23 @@
 	import {getCLodop, getPrinterList} from "@/utils/CLodopfuncs.js"
 	import { RSAencrypt } from '@/utils/jsencrypt.js'
 	import {handLogin} from '@/utils/getData2.js'
-	import checkUpdate from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
-	export default {
+	export default {
 		data() {
 			return {
 				user: this.$store.getters.loginName ? this.$store.getters.loginName : '',
 				password: '',
 				showPassword: false,
 				saveUser: this.$store.getters.loginName ? true : false,
-				disabled: false,
-				version: '',
-				versionCode: ''
+				disabled: false
 			}
 		},
 		created () {
-			//#ifdef APP-PLUS
-			// 获取本地应用资源版本号
-			plus.runtime.getProperty(plus.runtime.appid, (info) => {
-				this.version = info.version;
-				this.versionCode = info.versionCode ;
-				if (Number(this.versionCode) < 103) {
-					checkUpdate();
-				}
-			}) 
-			//#endif
 		},
 		methods: {
-			// 检测版本更新
-			async checkUpdates() {
-				// #ifdef APP-PLUS
-				//调用接口获取后台版本信息，检查是否需要更新
-				let versionInfo = await this.$api.login.getAppInfo();
-				console.log('获取后台版本信息', versionInfo);
-				// 待更新版本
-				const currentVersion = versionInfo.versionName;
-				console.log('后台需要更新版本', currentVersion);
-				// 更新地址
-				let androidUrl = versionInfo.url;
-				// 是否强制更新 isMust 0.否 1.强制更新
-				let showCancel = versionInfo.isMust ? true : false;
-				//  比较版本是否不同 当前版本：plus.runtime.version
-				const localVersion = plus.runtime.version.split('.');
-				let current = currentVersion.split('.');
-				// 默认是同一个版本，不需要更新
-				let flag = false;
-				current.forEach((item, i) => {
-					if (item !== localVersion[i]) {
-						// 检测到版本不同，需要更新
-						flag = true;
-					}
-				});
-	
-				if (flag) {
-					uni.showModal({
-						// 更新提醒
-						title: '发现新版本，是否更新',
-						content: '待更新版本号：' + currentVersion ,
-						// showCancel: showCancel,
-						success: res => {
-							if (res.confirm) {
-								this.doUpData(androidUrl);
-								this.showdownLine = true;
-								// plus.runtime.openURL(androidUrl)
-							} else if (res.cancel) {
-								// 不更新强制退出app
-								if (showCancel) {
-									console.log('不更新强制退出app');
-									plus.runtime.quit();
-								}
-							}
-						}
-					});
-				} else {
-					this.$myToast('无更新', 'none');
-				}
-				// #endif
-			},
-			doUpData(Url) {
-				uni.showLoading({
-					title: '更新中……'
-				});
-				const downloadTask = uni.downloadFile({
-					//执行下载
-					url: Url, //下载地址
-					timeout: 1000 * 30, //30秒超时时间
-					success: downloadResult => {
-						//下载成功
-						console.log(downloadResult);
-						this.showdownLine = false;
-						uni.hideLoading();
-						if (downloadResult.statusCode == 200) {
-							plus.runtime.install(
-								//安装软件
-								downloadResult.tempFilePath,
-								{
-									force: true
-								},
-								function(res) {
-									plus.runtime.restart();
-								}
-							);
-						}
-					},
-					fail: err => {
-						uni.hideLoading();
-						this.showdownLine = false;
-						this.$u.toast(err.errMsg);
-						console.log(err);
-					},
-					complete: com => {
-						console.log(com);
-					}
-				});
-	
-				// 下载进度
-				downloadTask.onProgressUpdate(res => {
-					// this.$u.toast(res.progress)
-					this.downloadNum = res.progress;
-					// console.log('下载进度' + res.progress);
-					// console.log('已经下载的数据长度' + res.totalBytesWritten);
-					// console.log('预期需要下载的数据总长度' + res.totalBytesExpectedToWrite);
-	
-					// 满足测试条件，取消下载任务。
-					// if (res.progress > 50) {
-					// 	downloadTask.abort();
-					// }
-				});
+			isUpdate () {
+				uni.navigateTo({
+					url: `/pages/login/upgrade`
+				})
 			},
 			test() {
 				let LODOP = getCLodop();
@@ -239,13 +131,15 @@
 	margin: 25rpx 0 70rpx 0
 	height: 34rpx
 .radio-wrap
-	_fj()
+	_fj(flex-start)
 	height: 34rpx
+	flex: 2
 .radio-label
 	_font(28rpx, 28rpx,#333)
 	padding-left: 10rpx
 .setup-text
 	_font(28rpx, 28rpx,$red,,right)
+	padding-left 25rpx
 .bg
 	background-color: #fff;
 	_bis('../../static/image/login_bg.png', 100%,,bottom)
diff --git a/pages/login/upgrade.vue b/pages/login/upgrade.vue
new file mode 100644
index 0000000..f6e019c
--- /dev/null
+++ b/pages/login/upgrade.vue
@@ -0,0 +1,226 @@
+<template>
+	<view class="mask flex-center">
+		<view class="content botton-radius">
+			<view class="content-top">
+				<text class="content-top-text">升级版本</text>
+				<image class="content-top" style="top: 0;" width="100%" height="100%" src="../../static/image/bg_top.png">
+				</image>
+			</view>
+			<view class="content-header"></view>
+			<view class="content-body">
+				<view class="title">
+					<text>是否升级到最新版本</text>
+				</view>
+				<view class="footer flex-center">
+					<template>
+						<template v-if="!downloadSuccess">
+							<view class="progress-box flex-column" v-if="downloading">
+								<progress class="progress" border-radius="35" :percent="downLoadPercent" activeColor="#3DA7FF" show-info stroke-width="10" />
+								<view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;">
+									<text>安装包下载中，请稍后</text>
+									<text>({{downloadedSize}}/{{packageFileSize}}M)</text>
+								</view>
+							</view>
+							<button v-else class="content-button" style="border: none;color: #fff;" plain @click="updateApp">立即下载更新</button>
+						</template>
+					</template>
+				</view>
+			</view>
+			<image v-if="is_mandatory" class="close-img" src="../../static/image/app_update_close.png" @click.stop="closeUpdate"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data () {
+			return {
+				downloadSuccess: false,
+				downloading: false,
+				downLoadPercent: 0,
+				downloadedSize: 0,
+				packageFileSize: 0,
+				is_mandatory: true
+			}
+		},
+		methods: {
+			updateApp() {
+				this.is_mandatory = false
+				this.downloading = true
+				let androidUrl = `http://192.168.81.187:8012/file/其他/hht-tongbo.apk`
+				this.doUpData(androidUrl);
+			},
+			doUpData(Url) {
+				const downloadTask = uni.downloadFile({
+					url: Url,
+					success: downloadResult => {
+						if (downloadResult.statusCode == 200) {
+							this.downloadSuccess = true;
+							plus.runtime.install(
+								//安装软件
+								downloadResult.tempFilePath,
+								{
+									force: true
+								},
+								function(res) {
+									plus.runtime.restart();
+								}
+							);
+						}
+					},
+					complete: () => {
+						this.downloading = false;
+						this.downLoadPercent = 0
+						this.downloadedSize = 0
+						this.packageFileSize = 0
+					}
+				});
+				// 下载进度
+				downloadTask.onProgressUpdate(res => {
+					this.downLoadPercent = res.progress;
+					this.downloadedSize = (res.totalBytesWritten / Math.pow(1024, 2)).toFixed(2);
+					this.packageFileSize = (res.totalBytesExpectedToWrite / Math.pow(1024, 2)).toFixed(2);
+				});
+			},
+			closeUpdate () {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background: transparent;
+	}
+
+	.flex-center {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+
+	.mask {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .65);
+	}
+
+	.botton-radius {
+		border-bottom-left-radius: 30rpx;
+		border-bottom-right-radius: 30rpx;
+	}
+
+	.content {
+		position: relative;
+		top: 0;
+		width: 600rpx;
+		background-color: #fff;
+		box-sizing: border-box;
+		padding: 0 50rpx;
+		font-family: Source Han Sans CN;
+	}
+
+	.text {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		line-height: 200px;
+		text-align: center;
+		color: #FFFFFF;
+	}
+
+	.content-top {
+		position: absolute;
+		top: -195rpx;
+		left: 0;
+		width: 600rpx;
+		height: 270rpx;
+	}
+
+	.content-top-text {
+		font-size: 45rpx;
+		font-weight: bold;
+		color: #F8F8FA;
+		position: absolute;
+		top: 120rpx;
+		left: 50rpx;
+		z-index: 1;
+	}
+
+	.content-header {
+		height: 70rpx;
+	}
+
+	.title {
+		font-size: 33rpx;
+		font-weight: bold;
+		color: #3DA7FF;
+		line-height: 38px;
+	}
+
+	.footer {
+		height: 150rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+	}
+
+	.box-des-scroll {
+		box-sizing: border-box;
+		padding: 0 40rpx;
+		height: 50rpx;
+		text-align: left;
+	}
+
+	.box-des {
+		font-size: 26rpx;
+		color: #000000;
+		line-height: 50rpx;
+	}
+
+	.progress-box {
+		width: 100%;
+	}
+
+	.progress {
+		width: 90%;
+		height: 40rpx;
+		border-radius: 35px;
+	}
+
+	.close-img {
+		width: 70rpx;
+		height: 70rpx;
+		z-index: 1000;
+		position: absolute;
+		bottom: -120rpx;
+		left: calc(50% - 70rpx / 2);
+	}
+
+	.content-button {
+		text-align: center;
+		flex: 1;
+		font-size: 30rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		border-radius: 40rpx;
+		margin: 0 18rpx;
+
+		height: 80rpx;
+		line-height: 80rpx;
+
+		background: linear-gradient(to right, #1785ff, #3DA7FF);
+	}
+
+	.flex-column {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+</style>
diff --git a/static/image/app_update_close.png b/static/image/app_update_close.png
new file mode 100644
index 0000000..8b2ffe6
Binary files /dev/null and b/static/image/app_update_close.png differ
diff --git a/static/image/bg_top.png b/static/image/bg_top.png
new file mode 100644
index 0000000..015f698
Binary files /dev/null and b/static/image/bg_top.png differ
diff --git a/utils/getData2.js b/utils/getData2.js
index 378f15b..bea3de0 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -1,5 +1,14 @@
 import request from './request.js'
 
+// 版本更新测试
+// export const getAppInfo = () => {
+// 	let res = {
+// 		versionName: '1.0.2',
+// 		url: ''
+// 	}
+// 	return res
+// }
+
 // 登录
 export const handLogin = (user, password) => request({
 	url:'mobile/auth/login',