diff --git a/App.vue b/App.vue
index 5e3ff14..15bf233 100644
--- a/App.vue
+++ b/App.vue
@@ -5,7 +5,7 @@
 			plus.screen.lockOrientation('landscape-primary');
 			// plus.navigator.setFullscreen(true);
 			// #endif
-			this.setRem();
+			// this.setRem();
 			window.addEventListener('resize', this.setRem);
 		},
 		onHide: function() {
diff --git a/README.md b/README.md
index 092f10e..f55206d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # 注意事项
 + 原生APP云打包使用自有证书
 + 证书别名：testalias
-+ 屏幕尺寸：1920px * 1280px
++ 屏幕横向尺寸：960px * 567px
 + app图标使用acs
\ No newline at end of file
diff --git a/common/style/layout.css b/common/style/layout.css
index 3345df4..df07407 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -31,10 +31,10 @@ uni-toast .uni-toast {
 	background: url('./static/images/page_bg.jpg') center / cover no-repeat;
 }
 .content {
-	padding: 1.07rem .4rem .4rem .4rem;
+	padding: calc(var(--status-bar-height) + 53.5px) 20px 20px 20px;
 }
 .content_wraper {
-	padding: .37rem .4rem .4rem .4rem;
+	padding: 18.5px 20px 20px 20px;
 	background: url('./static/images/bg-task-r2.png') center / 100% 100% no-repeat;
 }
 .grid_wraper {
@@ -56,33 +56,33 @@ uni-toast .uni-toast {
 	text-align: left;
 	position: sticky;
 	top: -1px;
-	height: .81rem;
-	font-size: .36rem;
+	height: 40.5px;
+	font-size: 18px;
 	font-family: SourceHanSansCN-Bold;
-	line-height: .81rem;
+	line-height: 40.5px;
 	color: #AFBED8;
 	font-weight: bold;
 	font-style: italic;
 	z-index: 99;
-	padding: 0 .25rem;
+	padding: 0 12.5px;
 	background: left center / 1px 81px url('/static/images/th_bg.png') repeat-x;
 }
 .grid_wraper table th div {
-	font-size: .36rem;
+	font-size: 18px;
 	font-family: 'SourceHanSansCN-Bold';
-	line-height: .81rem;
+	line-height: 40.5px;
 	color: #AFBED8;
 	font-weight: bold;
 	font-style: italic;
 }
 .grid_wraper table td {
-	padding: .05rem .05rem .05rem .25rem;
+	padding: 2.5px 2.5px 2.5px 12.5px;
 	background: rgba(31,46,73,1);
 	border-bottom: 2px solid rgba(122,159,224,0.17);
 	text-align: left;
-	font-size: .3rem;
-	line-height:.3rem;
-	height: .82rem;
+	font-size: 15px;
+	line-height:15px;
+	height: 41px;
 	color: #fff;
 }
 .grid_wraper table .tr_selected td {
@@ -109,10 +109,10 @@ uni-toast .uni-toast {
 	z-index: 99;
 }
 .grid_button {
-	font-size: .3rem;
-	line-height: .82rem;
+	font-size: 15px;
+	line-height: 41px;
 	color: #3CC1FF;
-	margin: 0 .1rem;
+	margin: 0 5px;
 	padding: 0;
 	background: transparent;
 	border: 0;
@@ -147,63 +147,63 @@ uni-toast .uni-toast {
 	margin-top: 15vh;
 }
 .dialog__body {
-	padding: 0.4rem;
+	padding: 20px;
 }
 .filter-item {
-	margin-bottom: 0.6rem;
+	margin-bottom: 30px;
 }
 .filter-label {
-	font-size: 0.3rem;
-	line-height: 0.8rem;
+	font-size: 15px;
+	line-height: 40px;
 	color: #fff;
 	font-weight: normal;
 	text-align: left;
 }
 .filter-input {
-	font-size: 0.3rem;
-	line-height: 0.8rem;
-	height: 0.8rem;
+	font-size: 15px;
+	line-height: 40px;
+	height: 40px;
 	color: #fff;
 	border: 1px solid #6fc4e2;
-	padding: 0 .2rem;
+	padding: 0 10px;
 	text-align: center;
 }
 .icon-plus {
 	cursor: pointer;
-	font-size: 0.5rem;
-	line-height: 0.8rem;
-	height: 0.8rem;
+	font-size: 25px;
+	line-height: 40px;
+	height: 40px;
 	color: #999;
 	background-color: #fff;
 	text-align: center;
 }
 .button_cancle {
-	font-size: 0.3rem;
-	line-height: 0.8rem;
-	padding: 0 .3rem;
+	font-size: 15px;
+	line-height: 40px;
+	padding: 0 15px;
 	border: 1px solid #DCDFE6;
 	color: #606266;
-	margin: 0 .4rem;
+	margin: 0 20px;
 }
 .button_primary {
-	font-size: 0.3rem;
-	line-height: 0.8rem;
-	padding: 0 .3rem;
+	font-size: 15px;
+	line-height: 40px;
+	padding: 0 15px;
 	background: #6fc4e2;
 	color: #fff;
-	margin: 0 .4rem;
+	margin: 0 20px;
 }
 .setup-wrap {
-	width: 8.85rem;
+	width: 442.5px;
 	background: linear-gradient(45deg, rgba(28, 95, 161, 70%), rgba(20, 67, 120, 70%));
 	border: 1px solid #6fc4e2;
-	padding: .49rem .48rem;
+	padding: 24.5px 24px;
 }
 .button {
-  width: 3.36rem;
-  font-size: .48rem;
-  line-height: .94rem;
-  height: .94rem;
+  width: 169px;
+  font-size: 24px;
+  line-height: 47px;
+  height: 47px;
   color: #fff;
   background: transparent;
   border: 0;
@@ -212,21 +212,21 @@ uni-toast .uni-toast {
   background: url('/static/images/btn_blue.png') center / 100% 100% no-repeat;
 }
 .uni-select {
-	font-size: 0.3rem !important;
-	height: 0.8rem !important;
+	font-size: 015px !important;
+	height: 40px !important;
 	border-color: #3CC1FF !important;
 }
 .uni-select__input-box {
-	height: 0.8rem !important;
+	height: 40px !important;
 }
 .uni-select__input-placeholder {
-	font-size: 0.3rem !important;
+	font-size: 015px !important;
 }
 .filter-select .uniui-bottom, .filter-select .uniui-top {
-	font-size: 0.3rem !important;
+	font-size: 015px !important;
 }
 .filter-select .uniui-clear {
-	font-size: 0.4rem !important;
+	font-size: 20px !important;
 }
 .uni-select__selector {
 	z-index: 200 !important;
@@ -240,40 +240,50 @@ uni-toast .uni-toast {
 	border-bottom-color: #3CC1FF !important;
 }
 .uni-select__selector-item {
-	font-size: 0.3rem !important;
-	line-height: 0.8rem !important;
+	font-size: 15px !important;
+	line-height: 35px !important;
 	color: #fff;
 }
 .uni-select__input-text {
 	color: #fff !important;
 }
+.uni-select__selector-empty {
+	font-size: 015px !important;
+	line-height: 20px !important;
+	color: #fff !important;
+}
 uni-toast .uni-toast__content {
-	font-size: .3rem;
+	font-size: 15px;
 }
 uni-toast .uni-toast {
-	padding: 0 .4rem;
+	padding: 0 20px;
 }
 uni-modal .uni-modal__bd {
-	font-size: .3rem;
+	font-size: 15px;
 }
 uni-modal .uni-modal__ft {
-	font-size: .4em;
-	line-height: .7rem;
+	font-size: 20px;
+	line-height: 35px;
 }
 .uni-numbox--text {
-	font-size: .3rem !important;
-	line-height: .8rem !important;
+	font-size: 15px !important;
+	line-height: 40px !important;
 	margin-bottom: 0 !important;
 	font-weight: 700 !important;
 }
 .uni-numbox--text span {
-	font-size: .3rem !important;
+	font-size: 15px !important;
 }
 .uni-numbox-btns {
-	padding: 0 .28rem !important;
+	padding: 0 14px !important;
 }
 .uni-numbox__value {
-	font-size: .3rem !important;
-	height: .8rem !important;
-	width: 2rem !important;
+	font-size: 15px !important;
+	height: 40px !important;
+	width: 100px !important;
+}
+uni-modal .uni-modal {
+	background: linear-gradient(45deg, rgba(28,95,161,0.7), rgba(20,67,120,0.7));
+	border: 1px solid #6fc4e2;
+	color: #fff;
 }
\ No newline at end of file
diff --git a/components/NavBar.vue b/components/NavBar.vue
index 7e909e5..c004cdd 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -45,15 +45,15 @@
 @import '@/common/style/mixin.styl';
 .header
 	position fixed
-	top 0
+	top var(--status-bar-height)
 	left 0
-	_wh(100%, .77rem)
-	padding 0 0.4rem
+	_wh(100%, 38.5px)
+	padding 0 20px
 	align-items flex-start
 	justify-content flex-end
 	_bis(,'../static/images/bg_header.png', 100%, 100%,bottom)
 .home_title
-	_font(0.4rem,.77rem, #8DBFEE, bold, center)
+	_font(20px,38.5px, #8DBFEE, bold, center)
 	font-family 'SourceHanSansCN-Bold'
 	font-style italic
 	background linear-gradient(0deg, #A2C3E3 0%, #5E9ED9 11.9140625%, #A2C3E3 100%)
@@ -64,9 +64,9 @@
 .home_userinfo
 	height 100%
 .exit_text
-	height .43rem
-	padding 0 .14rem
+	height 21.5px
+	padding 0 7px
 	border 1px solid #68AFF4
 	background linear-gradient(to bottom, #152B56, #1B4181)
-	_font(.2rem,.43rem, #fff,,)
+	_font(14px,21.5px, #fff,,)
 </style>
diff --git a/pages.json b/pages.json
index af41053..8766cb2 100644
--- a/pages.json
+++ b/pages.json
@@ -38,7 +38,7 @@
         }
     ],
 	"globalStyle": {
-		"navigationBarTextStyle": "black",
+		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 8c3e7a9..e557569 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -42,11 +42,11 @@
 @import '../../common/style/mixin.styl';
 .home_content
 	_wh(100%, 100%)
-	padding 2.07rem 0.4rem 1.4rem 0.4rem
+	padding calc(var(--status-bar-height) + 103.5px) 20px 70px 20px
 	_bis(,'../../static/images/home_bg.jpg', 100%, 100%,bottom)
 .zd_wrapper
 	_wh(100%,100%)
-	padding 0.37rem 0.4rem 0.4rem 0.4rem
+	padding 18.5px 20px 20px 20px
 	_bis(,'../../static/images/bg-task-r2.png', 100%, 100%,center)
 .menu-wrap
 	flex-wrap wrap
@@ -66,6 +66,6 @@
 		opacity 1
 		width 100%
 .menu-name
-	margin-top .6rem
-	_font(.4rem, .4rem, #00a7ea, 700,center)
+	margin-top 30px
+	_font(20px, 20px, #00a7ea, 700,center)
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 590bbf5..e80c6af 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -55,10 +55,20 @@
 				version: '',
 				versionCode: '',
 				grade: false,
-				androidUrl: ''
+				androidUrl: '',
+				width: '',
+				height: ''
 			};
 		},
+		onLoad() {
+			// this.getScreenSize()
+		},
 		methods: {
+			getScreenSize() {
+				const systemInfo = uni.getSystemInfoSync();
+				this.width = systemInfo.screenWidth
+				this.height = systemInfo.screenHeight
+			},
 			toConfig () {
 				let obj = {
 					baseUrl: this.baseUrl,
@@ -99,29 +109,29 @@
 	_bis(#fff,'../../static/images/page_bg.jpg', 100%, 100%,bottom)
 .logo-wrap
 	position fixed
-	_wh(100%, 1.25rem)
-	_bis(,'../../static/images/login_header_bg.png', 16.82rem, 100%,bottom)
+	_wh(100%, 62.5px)
+	_bis(,'../../static/images/login_header_bg.png', 841px, 100%,bottom)
 	h1
-		_font(.8rem, 1rem, #CF6A46,,center)
+		_font(40px, 50px, #CF6A46,,center)
 		font-family 'YouSheBiaoTiHei'
 .login_wrap
 	position fixed
 	left 50%
 	top 50%
-	width 9rem
-	padding .87rem .85rem .82rem .98rem
+	width 450px
+	padding 43.5px 42.5px 41px 49px
 	transform translate3d(-50%, -50%, 0)
 	_bis(,'../../static/images/form_bg.png', 100%, 100%,bottom)
 .login_w
 	_wh(100%, 100%)
 	overflow hidden
 .login_tab
-	height 1.07rem
-	margin-bottom .51rem
+	height 53.5px
+	margin-bottom 25.5px
 	_bis(,'../../static/images/login_tabs_bg.png', 100%, 100%,bottom)
 .login_tab_item
-	_wh(2.7rem, .73rem)
-	_font(.4rem,.73rem,#99B1DD,,center)
+	_wh(135px, 36.5px)
+	_font(20px,36.5px,#99B1DD,,center)
 	font-family 'YouSheBiaoTiHei'
 .login_tab_active
 	color #fff
@@ -130,33 +140,33 @@
 	100%
 .login_card
 	width 100%
-	padding 0 .41rem
+	padding 0 20.5px
 .card_wrap
-	margin-bottom .52rem
+	margin-bottom 26px
 .login_label
-	_font(.3rem, .8rem, #AFBED8,700,)
+	_font(15px, 40px, #AFBED8,700,)
 .inputStyle
-	_font(.3rem, .8rem, #fff,,)
-	_wh(100%, .8rem)
+	_font(15px, 40px, #fff,,)
+	_wh(100%, 40px)
 	background: rgba(45,88,184,0.1);
 	border: 1px solid #4980BD;
-	padding 0 .22rem
+	padding 0 11px
 .inputStyle[focus]
 	background: rgba(45,88,184,0.25);
 	border: 1px solid #21D0F2;
-	line-height .8rem
+	line-height 40px
 .login_icon
 	position absolute
 	top 5px
 	right 10px
 .primary-button
-	_wh(3.36rem, .93rem)
-	_font(.48rem,.93rem,#fff,,center)
+	_wh(168px, 46.5px)
+	_font(24px,46.5px,#fff,,center)
 	font-family 'YouSheBiaoTiHei'
 	_bis(,'../../static/images/button.png', 100%, 100%,bottom)
 .san_text
-	margin-top .4rem
-	_font(0.34rem,0.34rem,#fff,,center)
+	margin-top 20px
+	_font(17px,17px,#fff,,center)
 .drift
 	transition left .3s linear
 .version-name
diff --git a/pages/management/call-task.vue b/pages/management/call-task.vue
index 61acd8a..4eb0982 100644
--- a/pages/management/call-task.vue
+++ b/pages/management/call-task.vue
@@ -48,6 +48,10 @@
 			},
 			async _callTask () {
 				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
 				try {
 					let res = await callTask(this.val1)
 					uni.showToast({
diff --git a/pages/management/order-detail.vue b/pages/management/order-detail.vue
index ae1c508..063c5f5 100644
--- a/pages/management/order-detail.vue
+++ b/pages/management/order-detail.vue
@@ -154,7 +154,7 @@
 
 <style lang="stylus" scoped>
 .btn_wraper
-  width 3.4rem
+  width 170px
 .filter-select
-  width 3.1rem
+  width 155px
 </style>
diff --git a/pages/management/task.vue b/pages/management/task.vue
index 995cf10..a31a57a 100644
--- a/pages/management/task.vue
+++ b/pages/management/task.vue
@@ -62,16 +62,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- <el-dialog :visible.sync="dialogVisible">
-			<div class="zd-row filter-item">
-				<div class="zd-col-6 filter-label">补发桶数</div>
-				<el-input-number class="zd-col-17" v-model="inputNumber" :min="1" label="请输入数字"></el-input-number>
-			</div>
-			<div  class="zd-row jcenter button-wrap">
-				<el-button @click="dialogVisible = false">取 消</el-button>
-				<el-button type="primary" @click="handleConfirm">确 定</el-button>
-			</div>
-		</el-dialog> -->
 	</view>
 </template>
 
@@ -126,9 +116,25 @@
 					this.$set(el, 'checked', false)
 				})
 			},
-			async _sendWork (e) {
+			_sendWork (e) {
 			      this.disabled1 = true
 			      e.checked = true
+				  uni.showModal({
+				  	title: '提示',
+				  	content: '确定下发任务？',
+					cancelColor: '#fff',
+				  	confirmColor: '#6fc4e2',
+				  	success: (res) => {
+				  		if (res.confirm) {
+				  			this.__sendWork(e)
+				  		} else if (res.cancel) {
+				  			this.disabled1 = false
+				  			e.checked = false
+				  		}
+				  	}
+				  })
+			},
+			async __sendWork (e) {
 			      try {
 			        let res = await sendWork(e.work_code)
 			        this._queryWorks()
@@ -160,9 +166,25 @@
 				e.checked = false
 			  }
 			},
-			async _pdaPause (e) {
+			_pdaPause (e) {
 			  this.disabled3 = true
 			  e.checked = true
+			  uni.showModal({
+			  	title: '提示',
+			  	content: '确定暂停任务？',
+				cancelColor: '#fff',
+			  	confirmColor: '#6fc4e2',
+			  	success: (res) => {
+			  		if (res.confirm) {
+			  			this.__pdaPause(e)
+			  		} else if (res.cancel) {
+			  			this.disabled3 = false
+			  			e.checked = false
+			  		}
+			  	}
+			  })
+			},
+			async __pdaPause (e) {
 			  try {
 				let res = await pdaPause(e.work_code)
 				this._queryWorks()
@@ -177,9 +199,25 @@
 				e.checked = false
 			  }
 			},
-			async _finishWork (e) {
+			_finishWork (e) {
 			  this.disabled4 = true
 			  e.checked = true
+			  uni.showModal({
+			  	title: '提示',
+			  	content: '确定完成任务？',
+				cancelColor: '#fff',
+			  	confirmColor: '#6fc4e2',
+			  	success: (res) => {
+			  		if (res.confirm) {
+			  			this.__finishWork(e)
+			  		} else if (res.cancel) {
+			  			this.disabled4 = false
+			  			e.checked = false
+			  		}
+			  	}
+			  })
+			},
+			async __finishWork (e) {
 			  try {
 				let res = await finishWork(e.work_code)
 				this._queryWorks()
@@ -211,5 +249,5 @@
 .grid_wraper
   height 100%
 .btn_wraper
-  width 3.5rem
+  width 170px
 </style>