diff --git a/common/style/layout.styl b/common/style/layout.styl
index 2d46133..7e5bc48 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -368,7 +368,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	bottom: 0;
 	left: 0;
 	width: 100%;
-	height: calc(100% - var(--status-bar-height) - 72rpx);
+	// height: calc(100% - var(--status-bar-height) - 72rpx);
+	height auto;
+	min-height 30%;
+	max-height: calc(100% - var(--status-bar-height) - 72rpx);
 	background-color: #f6f6f6;
 	box-shadow: 0 -8px 16px 0 rgba(28,31,33,.1);
 	border-top-left-radius: 20rpx;
@@ -454,8 +457,9 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 }
 .font-size-1 {
 	font-size: 30rpx;
-	line-height: 54rpx;
+	line-height: 30rpx;
 	color: #ff6a00;
+	word-break: break-all;
 }
 .font-size-2 {
 	font-size: 30rpx;
diff --git a/pages/common/mater-list.vue b/pages/common/mater-list.vue
index 14c9f5e..0c2e4b7 100644
--- a/pages/common/mater-list.vue
+++ b/pages/common/mater-list.vue
@@ -138,11 +138,4 @@
 			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-@import '../../common/style/mixin.styl';
-.msg_wrapper
-	height auto
-	min-height 30%
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/entry/document.vue b/pages/entry/document.vue
index a81cb74..61eb852 100644
--- a/pages/entry/document.vue
+++ b/pages/entry/document.vue
@@ -155,10 +155,3 @@
 		}
 	}
 </script>
-
-<style lang="stylus">
-@import '../../common/style/mixin.styl';
-.msg_wrapper
-	height auto
-	min-height 30%
-</style>
diff --git a/pages/manage/cbj-carry.vue b/pages/manage/cbj-carry.vue
index a8e5027..e22f3fc 100644
--- a/pages/manage/cbj-carry.vue
+++ b/pages/manage/cbj-carry.vue
@@ -264,11 +264,4 @@
 			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-@import '../../common/style/mixin.styl';
-.msg_wrapper
-	height auto
-	min-height 30%
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/manage/mater-scrap.vue b/pages/manage/mater-scrap.vue
index 43777d3..858a92e 100644
--- a/pages/manage/mater-scrap.vue
+++ b/pages/manage/mater-scrap.vue
@@ -80,10 +80,3 @@
 		}
 	}
 </script>
-
-<style lang="stylus">
-@import '../../common/style/mixin.styl';
-.msg_wrapper
-	height auto
-	min-height 30%
-</style>
diff --git a/pages/manage/press-carry.vue b/pages/manage/press-carry.vue
index 7f7b99f..8899deb 100644
--- a/pages/manage/press-carry.vue
+++ b/pages/manage/press-carry.vue
@@ -146,11 +146,4 @@
 			
 		}
 	}
-</script>
-
-<style lang="stylus">
-@import '../../common/style/mixin.styl';
-.msg_wrapper
-	height auto
-	min-height 30%
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/pick/pick-list.vue b/pages/pick/pick-list.vue
index 8c72df4..0e39c3c 100644
--- a/pages/pick/pick-list.vue
+++ b/pages/pick/pick-list.vue
@@ -139,11 +139,4 @@
 			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-@import '../../common/style/mixin.styl';
-.msg_wrapper
-	height auto
-	min-height 30%
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/pick/pick-task.vue b/pages/pick/pick-task.vue
index 945597c..19f9bd4 100644
--- a/pages/pick/pick-task.vue
+++ b/pages/pick/pick-task.vue
@@ -5,10 +5,10 @@
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
-					<view class="zd-col-8">
+					<view class="zd-col-10">
 						<span class="filter_label">料箱编码</span>
 					</view>
-					<view class="zd-col-16">
+					<view class="zd-col-14">
 						<search-box
 						v-model="val1"
 						@handleChange="handleChange"
@@ -16,69 +16,69 @@
 					</view>
 				</view>
 				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8">
+					<view class="zd-col-10">
 						<span class="filter_label">拣选单据</span>
 					</view>
-					<view class="zd-col-16">
+					<view class="zd-col-14">
 						<input type="text" class="filter_input" v-model="data.code" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8">
+					<view class="zd-col-10">
 						<span class="filter_label">车间</span>
 					</view>
-					<view class="zd-col-16">
+					<view class="zd-col-14">
 						<input type="text" class="filter_input" v-model="data.product_area" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8">
+					<view class="zd-col-10">
 						<span class="filter_label">拣选仓库</span>
 					</view>
-					<view class="zd-col-16">
+					<view class="zd-col-14">
 						<input type="text" class="filter_input" v-model="data.stor_code" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8">
+					<view class="zd-col-10">
 						<span class="filter_label">拣选站台</span>
 					</view>
-					<view class="zd-col-16">
+					<view class="zd-col-14">
 						<input type="text" class="filter_input" v-model="data.point_code" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom filter_input_disabled">
-					<view class="zd-col-8">
+					<view class="zd-col-10">
 						<span class="filter_label">拣选数量</span>
 					</view>
-					<view class="zd-col-16">
+					<view class="zd-col-14">
 						<input type="number" class="filter_input" v-model="data.qty" disabled>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-8">
-						<span class="filter_label">移出料箱</span>
+					<view class="zd-col-10">
+						<span class="filter_label">出库至二楼料箱</span>
 					</view>
-					<view class="zd-col-16">
+					<view class="zd-col-14">
 						<search-box
 						v-model="val2"
 						/>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-8">
+					<view class="zd-col-10">
 						<span class="filter_label">是否机械搬运</span>
 					</view>
-					<view class="relative zd-col-16">
+					<view class="relative zd-col-14">
 						<switch :checked="isChecked" color="#4e6ef2" style="transform:scale(0.8); transform-origin: left;"/>
 						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
 					</view>
 				</view>
 				<view class="zd-row border-bottom">
-					<view class="zd-col-8">
-						<span class="filter_label">移入料箱</span>
+					<view class="zd-col-10">
+						<span class="filter_label">返回至立库料箱</span>
 					</view>
-					<view class="zd-col-16">
+					<view class="zd-col-14">
 						<search-box
 						v-model="val3"
 						/>
@@ -88,8 +88,27 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-16 button-primary" :class="{'button-info': !val1|| !val2 || !val3}" :disabled="disabled" @tap="_savePickTask">拣选确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1|| !val2 || !val3}" :disabled="disabled" @tap="toSure">拣选确认</button>
 		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10 filter_label">出库二楼料箱号为：</view>
+					<view class="zd-col-14 font-size-1">{{val2}}</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-10 filter_label">返回立库料箱号为：</view>
+					<view class="zd-col-14 font-size-1">{{val3}}</view>
+				</view>
+				<view class="filter_label">是否确认？</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false;disabled = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_savePickTask">确定</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
 	</view>
 </template>
 
@@ -109,7 +128,8 @@
 				val3: '',
 				isChecked: true,
 				data: {},
-				disabled: false
+				disabled: false,
+				show: false
 			};
 		},
 		onLoad (options) {
@@ -139,12 +159,14 @@
 				this.isChecked = true
 				this.disabled = false
 			},
-			async _savePickTask () {
-				this.disabled = true
+			toSure () {
 				if (!this.val1|| !this.val2 || !this.val3) {
-					this.disabled = false
 					return
 				}
+				this.show = true
+			},
+			async _savePickTask () {
+				this.disabled = true
 				try {
 					let obj = Object.assign({}, this.data, {is_move: this.isChecked, pick_vehicle_23: this.val2, pick_vehicle_13: this.val3})
 					let res = await savePickTask(obj)
@@ -163,8 +185,4 @@
 			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-
-</style>
+</script>
\ No newline at end of file
diff --git a/pages/task/task-manage.vue b/pages/task/task-manage.vue
index 68711d6..4db8b01 100644
--- a/pages/task/task-manage.vue
+++ b/pages/task/task-manage.vue
@@ -173,11 +173,4 @@
 			}
 		}
 	}
-</script>
-
-<style lang="stylus">
-@import '../../common/style/mixin.styl';
-.msg_wrapper
-	height auto
-	min-height 30%
-</style>
+</script>
\ No newline at end of file