diff --git a/App.vue b/App.vue
index 3d97b1b..58b029a 100644
--- a/App.vue
+++ b/App.vue
@@ -3,7 +3,7 @@
 		onLaunch: function() {
 			// #ifdef APP-PLUS
 			plus.screen.lockOrientation('portrait-primary');
-			plus.navigator.setFullscreen(true);
+			// plus.navigator.setFullscreen(true);
 			// #endif
 		},
 		onHide: function() {
@@ -17,9 +17,8 @@
 	}
 </script>
 
-<style>
+<style lang="stylus">
 	/*每个页面公共css */
 	@import '@/common/style/reset.css';
-	@import '@/common/style/uni.css';
-	@import '@/common/style/layout.css';
+	@import '@/common/style/layout.styl';
 </style>
diff --git a/README.md b/README.md
index f7b1e0a..5f049ea 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
 # 注意事项
 + 原生APP云打包使用自有证书
-+ 证书别名：testalias
\ No newline at end of file
++ 证书别名：testalias
++ 接口在线地址：(https://apifox.com/apidoc/shared-e9d4798e-2db1-493d-a0cb-7a0e881c4bd6/api-160097540)
\ No newline at end of file
diff --git a/common/style/layout.css b/common/style/layout.css
deleted file mode 100644
index e003df6..0000000
--- a/common/style/layout.css
+++ /dev/null
@@ -1,370 +0,0 @@
-page {
-    background-color: #f6f6f6 !important;
-    min-height: 100% !important;
-    height: 100% !important;
-}
-uni-page-body {
-	background-color: #f6f6f6 !important;
-	min-height: 100% !important;
-	height: 100% !important;
-}
-uni-button:after {
-	border: none;
-}
-/** iconfont */
-@font-face {
-  font-family: 'iconfont';
-  src: url('@/static/iconfont/iconfont.woff2?t=1665454521636') format('woff2'),
-       url('@/static/iconfont/iconfont.woff?t=1665454521636') format('woff'),
-       url('@/static/iconfont/iconfont.ttf?t=1665454521636') format('truetype');
-}
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 50rpx;
-  color: #000;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.icon_eye_close {
-	color: #bbb;
-}
-.icon_eye_active {
-	color: #ff6a00;
-}
-.icon_unchecked {
-	color: #fff;
-	width: 32rpx;
-	height: 32rpx;
-	background-color: #fff;
-	font-size: 24rpx;
-	border: 1rpx solid #bbb;
-}
-.icon_checked {
-	color: #ff6a00;
-	border: 1rpx solid #ff6a00;
-}
-.icon_back {
-	font-size: 52rpx;
-	line-height: 52rpx;
-	color: #fff;
-}
-.icon_home {
-	font-size: 52rpx;
-	line-height: 52rpx;
-	color: #fff;
-}
-.icon_scan {
-	width: 42rpx;
-	height: 48rpx;
-	font-size: 40rpx;
-	line-height: 48rpx;
-	color: #323232;
-	text-align: center;
-}
-.icon_phone {
-	width: 48rpx;
-	height: 48rpx;
-	font-size: 36rpx;
-	line-height: 48rpx;
-	color: #323232;
-	text-align: center;
-}
-.icon_del {
-	width: 46rpx;
-	height: 48rpx;
-	font-size: 46rpx;
-	line-height: 48rpx;
-	color: #323232;
-	text-align: center;
-}
-.icon_search {
-	width: 48rpx;
-	height: 48rpx;
-	font-size: 40rpx;
-	color: #323232;
-	line-height: 48rpx;
-}
-.cancel_icon::before {
-	content: "\e6dc";
-}
-.cancel_icon {
-	display: block;
-	width: 100rpx;
-	height: 100rpx;
-	font-size: 50rpx;
-	color: #fff;
-	line-height: 100rpx;
-	text-align: center;
-	background-color: #E9B451;
-}
-
-/** 内容 */
-.zd_container {
-	width: 100%;
-	height: 100%;
-}
-.zd_content {
-	width: 100%;
-	height: auto;
-	padding: 92rpx 15rpx 82rpx 14rpx;
-}
-.zd_wrapper {
-	width: 100%;
-	height: auto;
-	background-color: #fff;
-	border-radius: 24rpx;
-	padding: 14rpx;
-	margin-bottom: 20rpx;
-}
-.filter_item {
-	display: flex;
-	align-items: center;
-	width: 100%;
-	margin-bottom: 10rpx;
-}
-.filter_item:last-child {
-	margin-bottom: 0;
-}
-.filter_label_wraper {
-	flex: none;
-	width: 140rpx;
-	text-align:justify;
-	text-align-last: justify;
-	text-justify: inter-ideograph;/*兼容ie*/
-}
-.filter_label {
-	display: block;
-	width: 140rpx;
-	line-height: 80rpx;
-	font-size: 28rpx;
-	color: #323232;
-	text-align:justify;
-	text-align-last: justify;
-	text-justify: inter-ideograph;/*兼容ie*/
-}
-.filter_label_1 {
-	line-height: 30rpx;
-}
-.filter_search {
-	width: 100rpx;
-	height: 70rpx;
-	line-height: 70rpx;
-	font-size: 28rpx;
-	color: #323232;
-	text-align: center;
-	background-color: #fff;
-	border: 1px solid #ff6a00;
-	border-radius: 10rpx;
-	margin-left: 30rpx;
-}
-.filter_search_disabled {
-	background-color: #dcdfe6;
-	border: 1px solid #dcdfe6;
-	color: #fff;
-}
-.filter_input_wraper {
-	/* flex: 1; */
-	width: calc(100% - 170rpx);
-	height: 80rpx;
-	padding: 5rpx 0;
-	margin-left: 30rpx;
-	display: flex;
-	justify-content: flex-start;
-	align-items: center;
-}
-.filter_input_wraper_1 {
-	height: 30rpx;
-}
-.filter_input_wraper_inn_text {
-	line-height: 30rpx;
-	font-size: 28rpx;
-	color: #606266;
-	margin-left: 10rpx;
-}
-.filter_input {
-	width: 100%;
-	height: 70rpx;
-	line-height: 70rpx;
-	border: 1px solid #dcdfe6;
-	background-color: #fff;
-	padding: 0 15rpx;
-	font-size: 28rpx;
-	color: #606266;
-	border-radius: 10rpx;
-}
-.filter_textarea {
-	width: 100%;
-	height: 210rpx;
-	line-height: 70rpx;
-	border: 1px solid #dcdfe6;
-	background-color: #fff;
-	padding: 0 15rpx;
-	font-size: 28rpx;
-	color: #606266;
-	border-radius: 10rpx;
-}
-.filter_input_disabled {
-	background-color: #eee;
-}
-
-.grid-wraper {
-	width: 100%;
-}
-.slide_new {
-	width: 100%;
-	height: 100%;
-	overflow-y: auto;
-}
-.slide_new table {
-	table-layout: fixed;
-	min-width: 100%;
-	border-collapse: separate;
-	border-spacing: 0;
-	border: 0;
-}
-.slide_new table td, .slide_new table th {
-	box-sizing: border-box;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	padding: 0 20rpx;
-	border-bottom: 10rpx solid #f5f5f5;
-	text-align: center;
-}
-.slide_new table td:first-child, .slide_new table th:first-child{
-	position: sticky;
-	left: 0;
-	z-index: 101;
-}
-.slide_new table thead tr th {
-	position: sticky;
-	top: 0;
-	background: #d7d7d7;
-	font-size: 26rpx;
-	line-height: 98rpx;
-	color: #696969;
-	font-weight: bold;
-	z-index: 100;
-}
-.slide_new table thead tr th:first-child {
-	background: #d7d7d7;
-}
-.slide_new table tbody tr td {
-	font-size: 28rpx;
-	line-height: 98rpx;
-	color: #323232;
-	background: #fff;
-}
-.slide_new table tbody tr.checked td {
-	background-color: #fef6e4;
-}
-
-/** 提交栏 **/
-.submit-bar {
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: flex-end;
-	align-items: center;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	z-index: 200;
-	background-color: #fff;
-	padding-top: 10rpx;
-	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
-}
-.submit-button {
-	font-size: 30rpx;
-	line-height: 62rpx;
-	color: #ff6a00;
-	text-align: center;
-	letter-spacing: 1rpx;
-	padding: 0 22rpx;
-	background-color: #fff;
-	border: 1px solid #ff6a00;
-	margin: 0 40rpx 10rpx 0;
-	border-radius: 30rpx;
-}
-.btn-disabled, .submit-button[disabled] {
-	background-color: #c9c9c9;
-	border: 1px solid #c9c9c9;
-	color: #fff;
-}
-
-/** 下拉框 */
-.uni-select__selector {
-	z-index: 300 !important;
-}
-  
-/** 弹窗 */
-.msg_wrapper {
-	position: fixed;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	text-align: center;
-	z-index: 201;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.msg_wrapper_1 {
-	text-align: left;
-}
-
-.msg_box {
-	width: 90%;
-	padding: 20rpx;
-	background-color: #fff;
-	border-radius: 4px;
-	border: 1px solid #ebeef5;
-	box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-	backface-visibility: hidden;
-}
-
-.msg_mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	opacity: .7;
-	background: #000;
-	z-index: 200;
-}
-
-.msg_btns {
-	width: 100%;
-	max-width: 300px;
-	margin: 40rpx auto 0;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-}
-.msg_btn {
-	border-radius: 10rpx;
-}
-.msg_btn:disabled {
-	background-color: #c9c9c9;
-}
-.uni-select__input-placeholder,.uni-select__selector-empty, .uni-select__selector-item {
-	font-size: 28rpx !important
-}
-.sin_input {
-	width: 150rpx;
-	font-size: 28rpx;
-	line-height: 150rpx;
-	height: 68rpx;
-	color: #323232;
-	padding: 0 .1rem;
-	border: 1px solid #a1a1a1;
-	border-radius: 3px;
-}
-.layout-t tr.checked td .sin_input {
-	color: #8a8a8a;
-	border: 1px solid #ffffff;
-}
\ No newline at end of file
diff --git a/common/style/layout.styl b/common/style/layout.styl
new file mode 100644
index 0000000..c64071b
--- /dev/null
+++ b/common/style/layout.styl
@@ -0,0 +1,447 @@
+@import './mixin.styl';
+page {
+    background-color: #f2f5fa !important;
+    min-height: 100% !important;
+    height: 100% !important;
+}
+uni-page-body {
+	min-height: 100% !important;
+	height: 100% !important;
+}
+uni-button:after {
+	border: none;
+}
+
+/** 内容 */
+.zd_container {
+	width: 100%;
+	height: 100%;
+}
+.zd_content {
+	position: relative;
+	top: calc(var(--status-bar-height) + 72rpx);
+	width: 100%;
+	height: auto;
+	padding: 20rpx 14rpx 140rpx 14rpx;
+}
+.zd_wrapper {
+	width: 100%;
+	height: auto;
+	background-color: #fff;
+	border-radius: 10rpx;
+	padding: 22rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
+}
+.filter_wrapper {
+	position relative
+	left -14rpx
+	width: calc(100% + 28rpx);
+	height: auto;
+	background-color: #fff;
+	padding: 22rpx 22rpx 0 22rpx;
+	margin-bottom: 20rpx;
+}
+.filter_label {
+	display: block;
+	line-height: 80rpx;
+	font-size: 28rpx;
+	color: #323232;
+	font-weight: bold;
+	letter-spacing: 4rpx;
+	padding-left: 10rpx;
+	/* text-align:justify;
+	text-align-last: justify;
+	text-justify: inter-ideograph; */
+}
+/** 筛选选择器样式 */
+.filter_picker .uni-input {
+	width: 100%;
+	line-height: 80rpx;
+	height: 80rpx;
+	font-size: 28rpx;
+	color: #606266;
+}
+/** 筛选下拉框带搜索过滤功能样式 */
+.filter_select .uni-select {
+	line-height: 80rpx !important;
+	height: 80rpx !important;
+	font-size: 28rpx !important;
+	color: #606266;
+	padding: 0 !important;
+	border: 0 !important;
+}
+.filter_input {
+	width: 100%;
+	height: 80rpx;
+	line-height: 80rpx;
+	border: 0;
+	background-color: transparent;
+	font-size: 28rpx;
+	color: #606266;
+}
+.filter_input_disabled {
+	background-color: #eee;
+}
+.filter_input_wraper {
+	/* flex: 1; */
+	width: calc(100% - 170rpx);
+	height: 80rpx;
+	padding: 5rpx 0;
+	margin-left: 30rpx;
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+}
+.tab-line {
+	_wh(32rpx, 10rpx)
+	background-color #fff
+	border-radius 10rpx
+	margin 20rpx auto 0
+}
+.tab-line_active {
+	background-color #4e6ef2
+}
+.font-style-1 {
+	_font(32rpx, 32rpx, #c1c1c3,,center)
+}
+.font-style-2 {
+	_font(32rpx, 32rpx, #000,bold,center)
+}
+.grid-wraper {
+	width: 100%;
+	padding: 10rpx;
+}
+.slide_new {
+	width: 100%;
+	height: 100%;
+	overflow-y: auto;
+}
+.slide_new table {
+	table-layout: fixed;
+	min-width: 100%;
+	border-collapse: separate;
+	-webkit-border-horizontal-spacing: 0px;
+	-webkit-border-vertical-spacing: 10rpx;
+	background-color: #f5f5f5;
+}
+.slide_new table td, .slide_new table th {
+	box-sizing: border-box;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	padding: 0 20rpx;
+	text-align: center;
+}
+.slide_new table td:first-child, .slide_new table th:first-child{
+	position: sticky;
+	left: 0;
+	z-index: 101;
+	box-shadow: inset -3px 0px 3px 0px rgba(160,160,160,0.20);
+}
+.slide_new table thead tr th {
+	position: sticky;
+	top: 0;
+	background: #d7d7d7;
+	font-size: 26rpx;
+	line-height: 98rpx;
+	color: #696969;
+	font-weight: bold;
+	z-index: 100;
+}
+.slide_new table thead tr th:first-child {
+	background: #d7d7d7;
+}
+.slide_new table tbody tr td {
+	font-size: 28rpx;
+	line-height: 98rpx;
+	color: #323232;
+	background: #fff;
+}
+.slide_new table thead tr th.fontcol1,.slide_new table tbody tr td.fontcol1 {
+	color: #4e6ef2;
+	font-weight: bold;
+}
+.slide_new table thead tr th.fontcol2,.slide_new table tbody tr td.fontcol2 {
+	color: #d7592f;
+	font-weight: bold;
+}
+.slide_new table tbody tr.checked td {
+	background-color: #f0c560;
+	color: #fff;
+}
+.slide_new table tbody tr.checked td:first-child {
+	border-left: 6rpx solid #ff8227;
+}
+
+.item-wrapper {
+	width: 100%;
+	height: auto;
+}
+.item-wrap {
+	background-color: #fff;
+	border-radius: 24rpx;
+	padding: 22rpx 14rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
+}
+.item-font-1
+	_font(30rpx,28rpx,#000,,)
+.item-font-2
+	_font(24rpx,40rpx,$red,,)
+.item-font-3
+	width 110rpx
+	_font(24rpx,26rpx,#333,,)
+	text-align:justify;
+	text-align-last: justify;
+	text-justify: inter-ideograph;
+.item-font-4
+	width calc(100% - 110rpx)
+	_font(26rpx,26rpx,#999,,)
+.item-font-5
+	_font(44rpx,60rpx,$green,,center)
+	background-color #f6f6f6
+.item-font-6
+	width calc(50% - 110rpx)
+	_font(24rpx,52rpx,#666,,center)
+	background-color #e5e5e5
+	border-radius 26rpx
+.item-font-7
+	width 110rpx
+	_font(24rpx,52rpx,#666,,center)
+.item-font-8
+	_font(24rpx,52rpx,#666,,center)
+.isChecked
+	box-shadow inset 2px 2px 4px 0px rgba(120, 141, 250, 0.7), inset -2px -2px 4px 0px rgba(120, 141, 250, 0.7)
+/** 提交栏 **/
+.submit-bar {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 200;
+	background-color: #fff;
+	padding: 14rpx;
+	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
+}
+.button-default {
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #ff6a00;
+	text-align: center;
+	letter-spacing: 4rpx;
+	padding: 0;
+	background-color: #fff;
+	border: 2rpx solid #ff6a00;
+	border-radius: 10rpx;
+}
+.button-primary {
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #fff;
+	text-align: center;
+	letter-spacing: 4rpx;
+	padding: 0;
+	background-color: #ff6a00;
+	border: 2rpx solid #ff6a00;
+	border-radius: 10rpx;
+}
+.button-info, .submit-button[disabled] {
+	background-color: #c9c9c9;
+	border: 2rpx solid #c9c9c9;
+	color: #fff;
+}
+uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
+	border: 2rpx solid #c9c9c9;
+}
+.submit-more {
+	width: 20%;
+	font-size: 34rpx;
+	line-height: 34rpx;
+	padding: 27rpx 10rpx;
+	color: #000;
+	text-align: center;
+	background-color: #fff
+}
+.more_btns_wraper {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 201;
+	padding: 0 20rpx 20rpx;
+	transition: all .3s;
+}
+.more-button {
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #ff6a00;
+	text-align: center;
+	border-radius: 0;
+	background-color: transparent;
+}
+.more_btns_items .btn-disabled, .more_btns_items .submit-button_new[disabled] {
+	color: #c9c9c9;
+	border: none;
+}
+.more-button:last-child {
+	border-bottom: none;
+}
+.more_btns_cancle {
+	margin-top: 20rpx;
+	width: 100%;
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #000;
+	text-align: center;
+	background-color: #fff;
+	border-radius: 20rpx;
+}
+.more_btns_items{
+	width: 100%;
+	border-radius: 20rpx;
+	background-color: #fff;
+}
+
+/** 下拉框 */
+.uni-select__selector {
+	z-index: 300 !important;
+}
+  
+/** 弹窗 */
+.popshow {
+	transform: translateY(0);
+}
+.pophide {
+	transform: translateY(100%);
+}
+.msg_wrapper {
+	position: fixed;
+	top: auto;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	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;
+	border-top-right-radius: 20rpx;
+	z-index: 301;
+	transition: all .3s;
+}
+.pop-line {
+	width: 10%;
+	height: 8rpx;
+	margin: 0 auto 14rpx auto;
+	background-color: #d4d4d4;
+	border-radius: 8rpx;
+}
+.msg_content {
+	width: 100%;
+	height: 100%;
+	overflow-y: scroll;
+}
+.msg_box {
+	width: 100%;
+}
+.msg_mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	opacity: .7;
+	background: #000;
+	z-index: 300;
+}
+.msg_btns {
+	width: 100%;
+	margin: 40rpx auto 0;
+}
+.msg_btn {
+	font-size: 34rpx;
+	line-height: 78rpx;
+	color: #fff;
+	background-color: #ff6a00;
+	border: 1rpx solid #ff6a00;
+	border-radius: 44rpx;
+	box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2);
+}
+.msg_btn_cancle {
+	background-color: #fff;
+	border: 1rpx solid #ff6a00;
+	font-size: 34rpx;
+	line-height: 78rpx;
+	border-radius: 44rpx;
+	color: #000;
+	box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2);
+}
+.msg_btn:disabled {
+	background-color: #c9c9c9;
+}
+.uni-select__input-placeholder,.uni-select__selector-empty, .uni-select__selector-item {
+	font-size: 28rpx !important
+}
+.sin_input {
+	width: 150rpx;
+	font-size: 28rpx;
+	line-height: 150rpx;
+	height: 68rpx;
+	color: #323232;
+	padding: 0 .1rem;
+	border: 1px solid #a1a1a1;
+	border-radius: 3px;
+}
+.layout-t tr.checked td .sin_input {
+	color: #8a8a8a;
+	border: 1px solid #ffffff;
+}
+
+.flow_wrapper {
+	width: 100%;
+	background-color: #fff;
+	border-radius: 24rpx;
+	padding: 22rpx 20rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
+}
+.font-size-1 {
+	font-size: 30rpx;
+	line-height: 54rpx;
+	color: #ff6a00;
+}
+.font-size-2 {
+	font-size: 30rpx;
+	line-height: 54rpx;
+	color: #000;
+}
+.flow_start_item {
+	position: relative;
+	background-color: #f3f3f3;
+	border: 1rpx solid #f3f3f3;
+	border-radius: 10rpx;
+}
+.flow_start_item_checked {
+	position: relative;
+	background-color: #fff;
+	border: 1rpx solid #ff6a00;
+}
+.flow_icon_item_1 {
+	width: 46rpx;
+	height: 56rpx;
+}
+.flow_icon_item_2 {
+	width: 46rpx;
+	height: 26rpx;
+}
+// 日历
+.uni-calendar__mask, .uni-calendar--fixed {
+	z-index: 300 !important
+}
+.uni-date-x--border {
+	border-width: 0 !important
+}
+.uni-date-x {
+	background-color: transparent !important
+}
\ No newline at end of file
diff --git a/common/style/reset.css b/common/style/reset.css
index 8355389..8e5b014 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -6,7 +6,7 @@
 	text-decoration: none;
 	border: none;
 	outline: none;
-	font-family: uniicons, Arial, "Microsoft Yahei", "Helvetica Neue", Helvetica, sans-serif;
+	font-family: Arial, "Microsoft Yahei", "Helvetica Neue", Helvetica, sans-serif;
 	box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	-webkit-tap-highlight-color:transparent;
@@ -40,4 +40,116 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
+}
+.flexcol {
+	flex-direction: column;
+}
+.flexstart {
+	align-items: flex-start !important;
+}
+.jcflexstart {
+	justify-content: flex-start !important;
+}
+.jcflexend {
+	justify-content: flex-end !important;
+}
+.jccenter {
+	justify-content: center !important;
+}
+
+.zd-row {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.zd-col-24 {
+	width: 100%;
+}
+.zd-col-23 {
+    width: 95.83333%
+}
+.zd-col-22 {
+    width: 91.66667%
+}
+.zd-col-21 {
+    width: 87.5%
+}
+.zd-col-20 {
+    width: 83.33333%
+}
+.zd-col-19 {
+    width: 79.16667%
+}
+.zd-col-18 {
+    width: 75%
+}
+.zd-col-17 {
+    width: 70.83333%
+}
+.zd-col-16 {
+    width: 66.66667%
+}
+.zd-col-15 {
+    width: 62.5%
+}
+.zd-col-14 {
+    width: 58.33333%
+}
+.zd-col-13 {
+    width: 54.16667%
+}
+.zd-col-12 {
+	width: 50%;
+}
+.zd-col-11 {
+    width: 45.83333%
+}
+.zd-col-10 {
+    width: 41.66667%
+}
+.zd-col-9 {
+    width: 37.5%
+}
+.zd-col-8 {
+    width: 33.33333%
+}
+.zd-col-7 {
+    width: 29.16667%
+}
+.zd-col-6 {
+    width: 25%
+}
+.zd-col-5 {
+    width: 20.83333%
+}
+.zd-col-4 {
+    width: 16.66667%
+}
+.zd-col-3 {
+    width: 12.5%
+}
+.zd-col-2 {
+    width: 8.33333%
+}
+.zd-col-1 {
+    width: 4.16667%
+}
+.border-bottom {
+	border-bottom: 1rpx solid #e5e5e5;
+}
+.mgb10 {
+	margin-bottom: 10rpx;
+}
+.pdl20 {
+	padding-left: 20rpx;
+}
+.pdr20 {
+	padding-right: 20rpx;
+}
+.pdr10 {
+	padding-right: 10rpx;
+}
+.pdt0 {
+	padding-top: 0 !important
 }
\ No newline at end of file
diff --git a/common/style/uni.css b/common/style/uni.css
deleted file mode 100644
index c72ebf0..0000000
--- a/common/style/uni.css
+++ /dev/null
@@ -1,12 +0,0 @@
-@font-face {
-	font-family: uniicons;
-	font-weight: normal;
-	font-style: normal;
-	src: url('~@/static/uni.ttf') format('truetype');
-}
-.iconfont{
-	font-family: uni;
-	text-decoration: none;
-	text-align: center;
-}
-
diff --git a/components/NavBar.vue b/components/NavBar.vue
index a03af93..eeb59d1 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -1,8 +1,12 @@
 <template>
-	<view class="header">
-		<span @tap="goBack" class="iconfont icon_back">&#xe6db;</span>
-		<span class="page_name">{{title}}</span>
-		<span @tap="backHome" class="iconfont icon_home" :class="{'vhide': show1 === false}">&#xe69b;</span>
+	<view class="zd-row jcflexstart header">
+		<view class="zd-col-4">
+			<uni-icons @tap="goBack" type="back" size="26" color="#fff"></uni-icons>
+		</view>
+		<view class="zd-col-16 page_name">{{title}}</view>
+		<view v-if="searchActive" class="zd-col-4" style="text-align: right">
+			<uni-icons @tap="toSearch" type="search" size="26" color="#fff"></uni-icons>
+		</view>
 	</view>
 </template>
 
@@ -22,9 +26,9 @@
 				type: Boolean,
 				default: false
 			},
-			show1: {
+			searchActive: {
 				type: Boolean,
-				default: true
+				default: false
 			}
 		},
 		methods: {
@@ -39,10 +43,8 @@
 					})
 				}
 			},
-			backHome () {
-				uni.redirectTo({
-					url: '/pages/home/home'
-				})
+			toSearch () {
+				this.$emit('toSearch')
 			}
 		}
 	}
@@ -51,12 +53,12 @@
 <style lang="stylus">
 @import '@/common/style/mixin.styl';
 .header
-	_fj()
 	position fixed
-	_wh(100%, 72rpx)
+	_wh(100%, calc(var(--status-bar-height) + 72rpx))
+	// background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%)
 	background-color $red
 	z-index 200
-	padding 0 20rpx
+	padding var(--status-bar-height) 20rpx 0 
 .page_name
 	_font(32rpx, 32rpx, #fff,700,center)
 </style>
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 7525607..239028a 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -2,16 +2,16 @@
 	<view class="search_wraper">
 		<input 
 		type="text" 
-		class="filter_input search_input" 
+		class="filter_input pdr120" 
 		:value="value"
 		:focus="focusState"
 		@blur="handleBlur($event)"
 		@input="handleChange($event)">
-		<view class="buttons_wraper">
-			<view class="iconfont icon_del" @tap="toDel">&#xe6dc;</view>
-			<view class="iconfont icon_scan" :class="{'icon_scan_active': focusState === true}" @tap="toScan">&#xe6e2;</view>
-			<view class="iconfont icon_phone" @tap="toPhone">&#xe663;</view>
-			<view v-show="seaShow" class="iconfont icon_search" @tap="toSearch">&#xe6e1;</view>
+		<view class="zd-row buttons_wraper">
+			<!-- <uni-icons @tap="toDel" type="closeempty" size="20" color="#4e6ef2"></uni-icons> -->
+			<uni-icons class="pdr10" @tap="toScan" type="scan" size="20" :color="focusState ? '#ff6a00' : '#4e6ef2'"></uni-icons>
+			<uni-icons @tap="toPhone" type="camera" size="26" color="#4e6ef2"></uni-icons>
+			<uni-icons v-show="seaShow" @tap="toSearch" type="search" size="20" color="#4e6ef2"></uni-icons>
 		</view>
 	</view>
 </template>
@@ -40,6 +40,11 @@
 				default: false
 			}
 		},
+		watch: {
+			focused() {
+				this.focusState = this.focused
+			},
+		},
 		mounted () {
 		    if (this.focused) {
 				this.focusState = true
@@ -124,15 +129,14 @@
 @import '../common/style/mixin.styl';
 .search_wraper
 	position relative
-	_wh(100%, 70rpx)
-.search_input
-	padding-right: 160rpx;
+	_wh(100%, 80rpx)
+.pdr120
+	padding-right: 120rpx;
 .buttons_wraper
 	position absolute
 	top 0
 	right 10rpx
-	_wh(auto, 70rpx)
-	_fj(flex-end)
-.icon_scan_active
-	color $red
+	_wh(auto, 80rpx)
+.pdr10
+	padding-right 10rpx
 </style>
diff --git a/components/SearchBox1.vue b/components/SearchBox1.vue
deleted file mode 100644
index 63134f7..0000000
--- a/components/SearchBox1.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-	<view class="search_wraper">
-		<input 
-		type="text" 
-		class="filter_input search_input" 
-		:value="value"
-		:focus="focused"
-		@input="handleChange($event)">
-		<view class="buttons_wraper">
-			<span class="iconfont icon-del" @tap="toDel">&#xe6dc;</span>
-			<span class="iconfont icon_scan" @tap="toScan">&#xe6e2;</span>
-			<span v-show="seaShow" class="iconfont icon_search" @tap="toSearch">&#xe6e1;</span>
-		</view>
-	</view>
-</template>
-
-<script>
-	import permision from "@/utils/permission.js"
-	export default {
-		data() {
-			return {
-				cur: ''
-			};
-		},
-		model: {
-			prop: 'value',
-			event: 'input'
-		},
-		props: {
-			value: String,
-			seaShow: {
-			  type: Boolean,
-			  default: false
-			},
-			focused: {
-				type: Boolean,
-				default: false
-			}
-		},
-		methods: {
-			handleChange ($event) {
-				this.cur = $event.target.value
-				this.$emit('input', this.cur)
-				this.$emit('handleChange', this.cur)
-			},
-			toSearch () {
-				this.$emit('toSearch', this.cur)
-			},
-			toDel () {
-				this.$emit('input', '')
-			},
-			async toScan() {
-				// #ifdef APP-PLUS
-				let status = await this.checkPermission();
-				if (status !== 1) {
-				    return;
-				}
-				// #endif
-				uni.scanCode({
-					success: (res) => {
-						this.$emit('input', res.result)
-						this.$emit('handleChange', res.result)
-					},
-					fail: (err) => {
-						// uni.showToast({
-						// 	title: '出错',
-						// 	icon: 'none'
-						// })
-					}
-				});
-			}
-			// #ifdef APP-PLUS
-			,
-			async checkPermission(code) {
-				let status = permision.isIOS ? await permision.requestIOS('camera') :
-					await permision.requestAndroid('android.permission.CAMERA');
-			
-				if (status === null || status === 1) {
-					status = 1;
-				} else {
-					uni.showModal({
-						content: "需要相机权限",
-						confirmText: "设置",
-						success: function(res) {
-							if (res.confirm) {
-								permision.gotoAppSetting();
-							}
-						}
-					})
-				}
-				return status;
-			}
-			// #endif
-		}
-	}
-</script>
-
-<style lang="stylus">
-@import '../common/style/mixin.styl';
-.search_wraper
-	position relative
-	_wh(100%, 70rpx)
-.search_input
-	padding-right: 160rpx;
-.buttons_wraper
-	position absolute
-	top 0
-	right 0
-	_wh(auto, 70rpx)
-</style>
diff --git a/pages.json b/pages.json
index 2329e27..9e1e1ab 100644
--- a/pages.json
+++ b/pages.json
@@ -23,108 +23,36 @@
 		    "style": {
 		    	"navigationStyle": "custom"
 		    }  
-		},
-		{
-		    "path" : "pages/modules/equip-inspection",
-		    "style": {
-		    	"navigationStyle": "custom"
-		    }   
-		}
-        ,{
-            "path" : "pages/modules/equip-operate",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/pallet-bind",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/sort-schedue",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/man-group",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/hunnian-carry",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/forced-rest",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/surplus-mater-instore",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/package-instore",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/call-full-mater",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/call-mupan",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/empty-instore",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/shelf-check",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/press-carry",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
+		}
         ,{
-            "path" : "pages/modules/hunnian-operate",
-            "style": {
-            	"navigationStyle": "custom"
+            "path" : "pages/manage/hn-carry",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/press-carry",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/mater-scrap",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/man-sort",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
             }
             
         }
diff --git a/pages/home/home.vue b/pages/home/home.vue
index cbf2dfd..a8fa0b7 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,35 +1,27 @@
 <template>
-	<view class="zd_content">
-		<view class="header">首页</view>
-		<view class="userInfo-wrap">
-			<view class="userInfo">
-				<text class="p1">{{userName}}</text>
-				<text class="p2">欢迎进入华弘手持系统！</text>
-			</view>
-			<view class="exit" @tap="Quit">
-				<view class="icon-exit"></view>
-				<view class="exit-text">退出</view>
-			</view>
-		</view>
-		<view class="zd_wrapper">
-			<view class="menu-wrap">
-				<view class="menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage1(e)">
-					<image class="menu-img" :src="require('../../static/image/menu/' + e.icon + '.png')" alt="">
-					<view class="menu-name">{{e.name}}</view>
+	<view class="home_wraper">
+		<view class="zd_content">
+			<view class="header">首页</view>
+			<view class="userInfo-wrap">
+				<view class="userInfo">
+					<text v-if="userName !== ''" class="p1">{{userName}}</text>
+					<text class="p2">欢迎进入华弘手持系统！</text>
+				</view>
+				<view class="exit" @tap="Quit">
+					<view class="icon-exit"></view>
+					<view class="exit-text">退出</view>
 				</view>
 			</view>
-		</view>
-		<view v-if="show === true" class="sec_menu_wraper">
-			<view class="sec_menu_w">
-				<view class="menu-item" v-for="(e, i) in secM" :key="i" @click="toPage2(e)">
-					<view class="sec_menu-col_inner">
-						<view class="menu-name menu-name_inner">{{e.name}}</view>
+			<view class="zd_home_wrapper">
+				<view class="menus_wrap">
+					<view class="fir_menu_wrap">
+						<view class="fir_menu-item" v-for="e in menuList" :key="e.id" @tap="toPage(e)">
+							<image class="menu-img" :src="require('../../static/image/menu/' + e.icon + '.png')" alt="">
+							<view class="menu-name">{{e.title}}</view>
+						</view>
 					</view>
 				</view>
 			</view>
-			<view class="cancel">
-				<view class="iconfont cancel_icon" @tap="show = false"></view>
-			</view>
 		</view>
 	</view>
 </template>
@@ -39,36 +31,11 @@
 		data() {
 			return {
 				userName: '',
-				// menuList: [
-				// 	{menu_id: '1', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []},
-				// 	{menu_id: '2', icon: 'RF02', name: '设备操作', path: '/pages/modules/equip-operate', sonTree: []},
-				// 	{menu_id: '3', icon: 'RF03', name: '人工分拣', path: '', sonTree: [
-				// 		{menu_id: '1', name: '分拣排产', path: '/pages/modules/sort-schedue'},
-				// 		{menu_id: '2', name: '剩料入库', path: '/pages/modules/surplus-mater-instore'},
-				// 		{menu_id: '3', name: '托盘绑定', path: '/pages/modules/pallet-bind'},
-				// 		{menu_id: '4', name: '包装入库', path: '/pages/modules/package-instore'},
-				// 	]},
-				// 	{menu_id: '4', icon: 'RF05', name: '人工组盘', path: '/pages/modules/man-group', sonTree: []},
-				// 	{menu_id: '5', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []},
-				// 	{menu_id: '6', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []}
-				// ],
 				menuList: [
-					{menu_id: '1', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []},
-					{menu_id: '2', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []},
-					{menu_id: '3', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []},
-					{menu_id: '4', icon: 'RF05', name: '人工组盘', path: '/pages/modules/man-group', sonTree: []},
-					{menu_id: '5', icon: 'RF09', name: '人工分拣', path: '', sonTree: [
-						{menu_id: '1', name: '分拣排产', path: '/pages/modules/sort-schedue'},
-						{menu_id: '2', name: '剩料入库', path: '/pages/modules/surplus-mater-instore'},
-						{menu_id: '3', name: '托盘绑定', path: '/pages/modules/pallet-bind'},
-						{menu_id: '4', name: '包装入库', path: '/pages/modules/package-instore'},
-						{menu_id: '5', name: '呼叫满料', path: '/pages/modules/call-full-mater'},
-						{menu_id: '6', name: '呼叫木盘', path: '/pages/modules/call-mupan'},
-						{menu_id: '7', name: '空盘入库', path: '/pages/modules/empty-instore'}
-					]},
-					{menu_id: '6', icon: 'RF10', name: '压机搬运', path: '/pages/modules/press-carry', sonTree: []},
-					{menu_id: '7', icon: 'RF08', name: '货架盘点', path: '/pages/modules/shelf-check', sonTree: []},
-					{menu_id: '8', icon: 'RF02', name: '混碾操作', path: '/pages/modules/hunnian-operate', sonTree: []}
+					{id: 1, title: '混碾搬运', icon: 'RF01', path: '/pages/manage/hn-carry'},
+					{id: 2, title: '压机搬运', icon: 'RF02', path: '/pages/manage/press-carry'},
+					{id: 3, title: '物料报废', icon: 'RF03', path: '/pages/manage/mater-scrap'},
+					{id: 4, title: '人工分拣', icon: 'RF04', path: '/pages/manage/man-sort'}
 				],
 				show: false,
 				secM: []
@@ -80,19 +47,13 @@
 			}
 		},
 		methods: {
-			toPage1 (e) {
-				if (e.sonTree.length > 0) {
-					this.show = true
-					this.secM = e.sonTree
-				} else {
-					let url = e.path
-					uni.redirectTo({
-						url: url
-					})
-				}
+			async _authority () {
+				let res = await authority()
+				this.menuList = [...res.sonTree]
+				
 			},
-			toPage2 (e) {
-				let url = e.path
+			toPage (e) {
+				let url = e.path + '?title=' + e.title
 				uni.redirectTo({
 					url: url
 				})	
@@ -109,19 +70,32 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
+.home_wraper
+	_wh(100%, 100%)
+	overflow hidden
 .zd_content
-	padding-top 0
+	padding 0 24rpx
+	height 100%
+	top 0
+	padding-top calc(var(--status-bar-height) + 86rpx)
+	// background linear-gradient(to bottom, #fae2ca 0%, #fff5ea 20%, #fdfdfd 100%)
+	background linear-gradient(to bottom, #f5f6fb 0%, #fff 100%)
 .header
-	height 86rpx
+	position fixed
+	left 0
+	top 0
+	padding-top var(--status-bar-height)
+	z-index 100
+	_wh(100%, calc(var(--status-bar-height) + 86rpx))
 	_font(36rpx,86rpx,#333,,center)
 .userInfo-wrap
 	_fj()
-	_wh(100%,160rpx)
+	_wh(100%,190rpx)
 	padding 0 30rpx
 	background-color $red
 	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
 	border-radius 12rpx
-	margin-bottom 20rpx
+	margin-bottom 24rpx
 .userInfo
 	_fj(,flex-start,column)
 .p1
@@ -131,20 +105,31 @@
 	_font(26rpx,1,#fff)
 .exit
 	_fj()
-	height 47rpx
-	padding 0 15rpx
+	height 50rpx
+	padding 0 20rpx
 	border 1px solid #FF967C
 	border-radius 20rpx
 .icon-exit
 	_wh(22rpx, 22rpx)
 	_bis('../../static/image/exit.png',22rpx)
 .exit-text
-	_font(24rpx,47rpx,#fff,,right)
+	_font(32rpx,50rpx,#fff,,right)
 	padding-left 10rpx
-.menu-wrap
+.zd_home_wrapper
+	_wh(100%, calc(100% - 238rpx))
+	margin-bottom 24rpx
+	background-color #fff
+	border-radius: 12rpx;
+	padding: 14rpx;
+	margin-bottom 24rpx
+	box-shadow: 0 4rpx 10rpx 4rpx rgba(0,0,0,.1)
+	overflow-y scroll
+.menus_wrap
+	width 100%
+.fir_menu_wrap
 	_fj(flex-start,flex-start,,wrap)
 	align-content: flex-start
-.menu-item
+.fir_menu-item
 	_fj()
 	flex-direction column
 	_wh(30%, auto)
@@ -162,41 +147,4 @@
 		margin 0 auto 0.2rpx
 .menu-name
 	_font(28rpx, 38rpx, #444,,center)
-.sec_menu_wraper
-	position fixed
-	top 0
-	left 0
-	_wh(100%, 100%)
-	background-color rgba(0, 0, 0, .9)
-	z-index 2017
-	flex-direction column
-.sec_menu_w
-	_fj()
-	_wh(100%, calc(100% - 100rpx))
-	padding 0 24rpx
-	flex-wrap wrap
-	align-content center
-	&::after
-		content ''
-		display block
-		_wh(30%,0)
-.sec_menu-col
-	background-color transparent
-	border none
-	height auto
-.sec_menu-col_inner
-	_fj(center)
-	_wh(160rpx, 160rpx)
-	border-radius 50%
-	background-color $yellow
-	margin 0 auto
-.menu-name_inner
-	color #fff
-	padding 0 20rpx
-.cancel
-	_wh(100%, 100rpx)
-	  padding 0 24rpx
-	  overflow hidden
-	  background-color rgba(255, 255, 255, .3)
-	  box-shadow 0 1rpx 4rpx 0 rgba(160,160,160,0.9)
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index b457aa7..1373267 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -6,26 +6,24 @@
 			<input class="large-input" type="text" placeholder="请输入用户名" v-model="user">
 		</view>
 		<div class="input-box">
-			<input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password">
-			<span class="iconfont icon_eye_close" :class="[showPassword ? 'icon_eye_active' : '']" @tap="changePassword">&#xe6a0;</span>
+			<input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password" autocomplete=“off”>
+			<uni-icons :type="showPassword ? 'eye-filled' : 'eye'" size="20" :color="showPassword ? '#ff6a00' : '#999'" @tap="showPassword = !showPassword"></uni-icons>
 	    </div>
-		<view class="radio-box">
-			<view class="radio-wrap">
-				<span class="iconfont icon_unchecked" :class="{'icon_checked': saveUser}"  @tap="toSaveUser">&#xe66b;</span>
-				<text class="radio-label">记住用户名</text>
+		<view class="zd-row radio-box">
+			<view class="zd-col-2 zd-row jccenter radio-icon-wrap" :class="{'radio-icon-wrap_checked': saveUser}" @tap="toSaveUser">
+				<uni-icons type="checkmarkempty" size="14" :color="saveUser ? '#ff6a00' : '#fff'"></uni-icons>
 			</view>
-			<text class="setup-text" @tap="setup">设置</text>
-			<text class="setup-text" @tap="isUpdate">升级版本</text>
+			<view class="zd-col-13 radio-label">记住用户名</view>
+			<view class="zd-col-4 setup-text" @tap="setup">设置</view>
+			<view class="zd-col-5 setup-text" @tap="isUpdate">升级版本</view>
 		</view>
 		<button class="login-btn" :disabled="disabled" @tap="toLogin">确认登录</button>
-		<!-- <button class="login-btn" @tap="test">打印</button> -->
 		<view v-if="version !== ''" class="version-name">v{{version}}</view>
 		<Up-grade v-if="grade === true" @closeUpdate="closeUpdate" :androidUrl="androidUrl"></up-grade>
 	</view>
 </template>
 
 <script>
-	// import {getCLodop, getPrinterList} from "@/utils/CLodopfuncs.js"
 	import { RSAencrypt } from '@/utils/jsencrypt.js'
 	import {handLogin, pdaUpdate} from '@/utils/getData2.js'
 	import UpGrade from './upgrade.vue'
@@ -50,7 +48,7 @@
 			//#ifdef APP-PLUS
 				// 获取本地应用资源版本号
 				plus.runtime.getProperty(plus.runtime.appid, (info) => {
-					console.log(JSON.stringify(info));
+					// console.log(JSON.stringify(info));
 					this.version = info.version;
 					this.versionCode = info.versionCode ;
 				}) 
@@ -60,24 +58,9 @@
 			isUpdate () {
 				this._pdaUpdate()
 			},
-			// test() {
-			// 	let LODOP = getCLodop();
-			// 	// 更换为打印服务器ip 不需要加前缀
-			// 	LODOP.PRINT_INIT(null, "192.168.81.198");
-			// 	// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机 
-			// 	LODOP.SET_PRINTER_INDEX(-1);
-			// 	// 设置打印纸大小
-			// 	LODOP.SET_PRINT_PAGESIZE(1, 800, 600, "");
-			// 	// 根据需求插入打印代码
-			// 	LODOP.PRINT();  // 打印
-			// 	// LODOP.PREVIEW()
-			// },
 			toSaveUser() {
 				this.saveUser = !this.saveUser
 			},
-			changePassword() {
-			    this.showPassword = !this.showPassword
-			},
 			setup () {
 				uni.redirectTo({
 					url: '/pages/login/setup'
@@ -123,15 +106,17 @@
 			},
 			async _pdaUpdate () {
 				let res = await pdaUpdate()
-				if (res.versionName === this.version) {
-					uni.showToast({
-						title: '当前为最新版本',
-						icon: 'none'
-					})
-				} else {
-					this.grade = true
-					this.androidUrl = res.url
-				}
+				// if (res.versionName === this.version) {
+				// 	uni.showToast({
+				// 		title: '当前为最新版本',
+				// 		icon: 'none'
+				// 	})
+				// } else {
+				// 	this.grade = true
+				// 	this.androidUrl = res.url
+				// }
+				this.grade = true
+				this.androidUrl = res.url
 			},
 			closeUpdate () {
 				this.grade = false
@@ -143,34 +128,34 @@
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .p1
-  _font(60rpx,75rpx,#444)
-  padding-top: 90rpx
+  _font(40rpx,75rpx,#444,666)
+  padding-top: 190rpx
 .p2
-  _font(50rpx,1,#444)
-  padding: 40rpx 0 25rpx
+  _font(44rpx,1,#444,600)
+  padding: 10rpx 0 55rpx 0
 .input-box
   _fj()
   margin-top 68rpx
   height 75rpx
   border-bottom 1rpx solid #e2e2e2
 .large-input
-	_wh(calc(100% - 40rpx), 74rpx)
+	_wh(calc(100% - 100rpx), 74rpx)
 	_font(32rpx,74rpx,#999)
 	padding-left 10rpx
 .radio-box
-	_fj()
-	margin: 25rpx 0 70rpx 0
-	height: 34rpx
-.radio-wrap
-	_fj(flex-start)
-	height: 34rpx
-	flex: 2
+	margin 25rpx 0 70rpx 0
+.radio-icon-wrap
+	_wh(34rpx, 34rpx)
+	border 1rpx solid #999
+	border-radius 4rpx
+	text-align center
+	line-height 40rpx
+.radio-icon-wrap_checked
+	border-color $red
 .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)
@@ -181,7 +166,12 @@
   background-color $red
 .zd_content
 	position: relative
+	top 0
 	height: 100%
+	padding-left 40rpx
+	padding-right 40rpx
+	background-color: #fff
+	overflow: hidden
 .version-name
 	width 100%
 	position: absolute
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index c196bb1..ef54916 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -1,22 +1,24 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="设置" :inner2="true" @goIn="goIn" :show1="false"></nav-bar>
+		<nav-bar title="设置" :inner2="true" @goIn="goIn"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">服务器地址</view>
+				<view class="setup-item">
+					<view class="setup-label">服务器地址</view>
 					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
 				</view>
-			</view>
-			<view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">刷新时间(s)</view>
-					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				<view class="setup-item">
+					<view class="setup-label">ACS地址</view>
+					<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
 				</view>
+				<!-- <view class="setup-item">
+					<view class="setup-label">刷新时间(s)</view>
+					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				</view> -->
 			</view>
 		</view>
-		<view class="submit-bar">
-		  <button class="submit-button" @click="_submit">确认</button>
+		<view class="zd-row submit-bar">
+		  <button class="zd-col-24 button-primary" @click="_submit">确认</button>
 		</view>
 	</view>
 </template>
@@ -29,9 +31,8 @@
 		},
 		data() {
 			return {
-				options: [],
-				index: '',
 				addrip: this.$store.getters.baseUrl,
+				acsip: this.$store.getters.acsUrl,
 				setTime: this.$store.getters.setTime / 1000
 			};
 		},
@@ -44,7 +45,14 @@
 			_submit () {
 				if (this.addrip === '') {
 					uni.showToast({
-						title: '服务器地址',
+						title: '请填写服务器地址',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.acsip === '') {
+					uni.showToast({
+						title: '请填写ACS地址',
 						icon: 'none'
 					})
 					return
@@ -57,7 +65,7 @@
 					return
 				}
 				// 存值
-				this.$store.dispatch('setConfig',{baseUrl: this.addrip, setTime: this.setTime * 1000, setPrintName: this.index})
+				this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, setTime: this.setTime * 1000})
 				uni.redirectTo({
 					url: '/pages/login/login'
 				})
@@ -68,15 +76,16 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
-.input-wrap
+.setup-item
 	width 100%
-	_fj()
-.input-label
-	wh(200rpx, 58rpx)
-	_font(28rpx,58rpx,#464646)
+	margin-bottom 40rpx
+.setup-label
+	_font(24rpx,40rpx,#000)
 .setup-input
-	_wh(calc(100% - 200rpx), 58rpx)
+	_wh(100%, 80rpx)
 	background #fff
-	_font(28rpx,58rpx,#323232)
-	padding 0 10rpx
+	_font(28rpx,80rpx,#323232)
+	padding 0 28rpx
+	border 2px solid #e9ecf3
+	border-radius 12rpx
 </style>
diff --git a/pages/manage/hn-carry.vue b/pages/manage/hn-carry.vue
new file mode 100644
index 0000000..08f678b
--- /dev/null
+++ b/pages/manage/hn-carry.vue
@@ -0,0 +1,223 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th class="fontcol1">工单编号</th>
+								<th>计划数量</th>
+								<th>实际数量</th>
+								<th>计划重量</th>
+								<th>实际重量</th>
+								<th>物料标识</th>
+								<th>泥料编码</th>
+								<th>批次号</th>
+								<th>生产日期</th>
+								<th>载具类型</th>
+								<th>点位编码</th>
+								<th>点位名称</th>
+								<th>区域编码</th>
+								<th>区域名称</th>
+								<th>工单状态</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toChose(e)" :class="{'checked': e.workorder_code === pkId}">
+								<td class="fontcol1">{{e.workorder_code}}</td>
+								<td>{{e.plan_qty}}</td>
+								<td>{{e.real_qty}}</td>
+								<td>{{e.plan_weight}}</td>
+								<td>{{e.real_weight}}</td>
+								<td>{{e.material_ratio}}</td>
+								<td>{{e.raw_material_code}}</td>
+								<td>{{e.produce_order}}</td>
+								<td>{{e.produce_date}}</td>
+								<td>{{e.vehicle_type}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.point_name}}</td>
+								<td>{{e.region_code}}</td>
+								<td>{{e.region_name}}</td>
+								<td>{{['未生产', '已下发', '生产中', '暂停', '完成', '暂存中'][Number(e.workorder_status) - 1]}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled1" @tap="_hnOrderFinish">工单完成</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" @tap="toPop">料盅入库</button>
+			<button class="zd-col-7 button-primary" @tap="toPop1">呼叫空蛊</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-5">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">创建时间</span>
+					</view>
+					<view class="zd-col-19">
+						<view class="example-body">
+							<uni-datetime-picker type="datetime" v-model="datetimesingle" @change="changeLog" />
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-7 button-default" @tap.stop="closePop">关闭</button>
+				<button class="zd-col-7 button-default" @tap.stop="clearUp">清空</button>
+				<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !datetimesingle}" :disabled="disabled2" @tap="_hnmlTask">料盅入库</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+		<view class="zd_content msg_wrapper" :class="show1 ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<span class="filter_label">确定是否呼叫空蛊？</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show1 = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled3" @tap="_hnqkTask">确定</button>
+			</view>
+		</view>
+		<view v-if="show1" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {hnWorkOrder,hnOrderFinish,hnmlTask,hnqkTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				dataList: [],
+				pkId: '',
+				disabled1: false,
+				disabled2: false,
+				disabled3: false,
+				show: false,
+				val1: '',
+				datetimesingle: '',
+				show1: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._hnWorkOrder()
+		},
+		methods: {
+			changeLog(e) {
+				console.log('----change事件:', e);
+			},
+			/** grid */
+			async _hnWorkOrder () {
+				let res = await hnWorkOrder()
+				this.dataList = [...res]
+			},
+			toChose (e) {
+				this.pkId = this.pkId === e.workorder_code ? '' : e.workorder_code
+			},
+			async _hnOrderFinish () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await hnOrderFinish(this.pkId)
+					this.pkId = ''
+					this.disabled1 = false
+					this._hnWorkOrder()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			toPop () {
+				if (this.pkId) {
+					this.show = true
+				}
+			},
+			closePop () {
+				this.show = false
+				this.clearUp()
+			},
+			clearUp () {
+				this.val1 = ''
+				this.datetimesingle = ''
+			},
+			async _hnmlTask () {
+				this.disabled2 = true
+				if (!this.val1 || !this.datetimesingle) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await hnmlTask(this.pkId, this.val1, this.datetimesingle)
+					this.disabled2 = false
+					this.pkId = ''
+					this.closePop()
+					this._hnWorkOrder()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			toPop1 () {
+				this.show1 = true
+			},
+			async _hnqkTask () {
+				this.disabled3 = true
+				try {
+					let res = await hnqkTask()
+					this.show1 = false
+					this.disabled3 = false
+					this._hnWorkOrder()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled3 = false
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.msg_wrapper
+	height auto
+	min-height 30%
+</style>
diff --git a/pages/manage/man-sort.vue b/pages/manage/man-sort.vue
new file mode 100644
index 0000000..659ca41
--- /dev/null
+++ b/pages/manage/man-sort.vue
@@ -0,0 +1,115 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">人工分拣点位</span>
+					</view>
+					<view class="zd-col-15 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">缓存货架点位</span>
+					</view>
+					<view class="zd-col-15 filter_select">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-default" @tap.stop="clearUp">清空</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled1" @tap="_rgfjqlTask">叫料</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !index1}" :disabled="disabled2" @tap="_rgfjskTask">送空盘</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {rgfjPoint,hchjPoint,rgfjqlTask,rgfjskTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				disabled1: false,
+				disabled2: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._rgfjPoint()
+			this._hchjPoint()
+		},
+		methods: {
+			/** 下拉框*/
+			async _rgfjPoint () {
+				let res = await rgfjPoint()
+				this.options1 = [...res]
+			},
+			async _hchjPoint () {
+				let res = await hchjPoint()
+				this.options2 = [...res]
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+				this.disabled1 = false
+				this.disabled2 = false
+			},
+			async _rgfjqlTask () {
+				this.disabled1 = true
+				if (!this.index1 || !this.index2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await rgfjqlTask(this.index2, this.index1)
+					this.disabled1 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			async _rgfjskTask () {
+				this.disabled2 = true
+				if (!this.index1) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await rgfjskTask(this.index1)
+					this.disabled2 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+</style>
diff --git a/pages/manage/mater-scrap.vue b/pages/manage/mater-scrap.vue
new file mode 100644
index 0000000..43777d3
--- /dev/null
+++ b/pages/manage/mater-scrap.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-22 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toPop">物料报废</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">
+					<view class="zd-col-24">
+						<span class="filter_label">确定是否执行物料报废？</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_materialScrap">确定</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {materialScrap} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				show: false,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toPop () {
+				if (this.val1) {
+					this.show = true
+				}
+			},
+			async _materialScrap () {
+				this.disabled = true
+				try {
+					let res = await materialScrap(this.val1)
+					this.show = false
+					this.disabled = false
+					this.val1 = ''
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</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
new file mode 100644
index 0000000..1e3e842
--- /dev/null
+++ b/pages/manage/press-carry.vue
@@ -0,0 +1,96 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">上料位</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-22 button-primary" :class="{'button-info': !index1}" :disabled="disabled" @tap="toPop">强制回货架</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">
+					<view class="zd-col-24">
+						<span class="filter_label">确定是否强制回货架？</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_qzhhjTask">确定</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {yjslwPointList, qzhhjTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				show: false,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._yjslwPointList()
+		},
+		methods: {
+			/** 下拉框*/
+			async _yjslwPointList () {
+				let res = await yjslwPointList()
+				this.options1 = [...res]
+			},
+			toPop () {
+				if (this.index1) {
+					this.show = true
+				}
+			},
+			async _qzhhjTask () {
+				this.disabled = true
+				try {
+					let res = await qzhhjTask(this.index1)
+					this.show = false
+					this.disabled = false
+					this.index1 = ''
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.msg_wrapper
+	height auto
+	min-height 30%
+</style>
diff --git a/pages/modules/call-full-mater.vue b/pages/modules/call-full-mater.vue
deleted file mode 100644
index d9ce7c4..0000000
--- a/pages/modules/call-full-mater.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="呼叫满料"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>起点</th>
-								<th>终点</th>
-								<th>任务状态</th>
-								<th>备注</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.point_name1}}</td>
-								<td>{{e.point_name2}}</td>
-								<td>{{e.task_status}}</td>
-								<td>{{e.remark}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_callingMaterialTaskShow">刷新</button>
-			<button class="submit-button" :disabled="disabled" @tap="toSure">呼叫满料</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {callingMaterialTaskShow, callingMaterialTask} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				dataList: [],
-				disabled: false
-			};
-		},
-		created () {
-			this._callingMaterialTaskShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _callingMaterialTaskShow () {
-				let res = await callingMaterialTaskShow()
-				this.dataList = [...res]
-			},
-			/** 呼叫满料 */
-			async toSure () {
-				this.disabled = true
-				try {
-					let res = await callingMaterialTask()
-					this.disabled = false
-					this._callingMaterialTaskShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/call-mupan.vue b/pages/modules/call-mupan.vue
deleted file mode 100644
index 9c7e1fa..0000000
--- a/pages/modules/call-mupan.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="呼叫木盘"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>起点</th>
-								<th>终点</th>
-								<th>任务状态</th>
-								<th>备注</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.point_name1}}</td>
-								<td>{{e.point_name2}}</td>
-								<td>{{e.task_status}}</td>
-								<td>{{e.remark}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_callingWoodenPalletTaskShow">刷新</button>
-			<button class="submit-button" :disabled="disabled" @tap="toSure">呼叫木盘</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {callingWoodenPalletTaskShow, callingWoodenPalletTask} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				dataList: [],
-				disabled: false
-			};
-		},
-		created () {
-			this._callingWoodenPalletTaskShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _callingWoodenPalletTaskShow () {
-				let res = await callingWoodenPalletTaskShow()
-				this.dataList = [...res]
-			},
-			/** 呼叫木盘 */
-			async toSure () {
-				this.disabled = true
-				try {
-					let res = await callingWoodenPalletTask()
-					this.disabled = false
-					this._callingWoodenPalletTaskShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/empty-instore.vue b/pages/modules/empty-instore.vue
deleted file mode 100644
index 827a045..0000000
--- a/pages/modules/empty-instore.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="空盘入库"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>起点</th>
-								<th>终点</th>
-								<th>任务状态</th>
-								<th>备注</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.point_name1}}</td>
-								<td>{{e.point_name2}}</td>
-								<td>{{e.task_status}}</td>
-								<td>{{e.remark}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_emptyDiskIntoStorageShow">刷新</button>
-			<button class="submit-button" :disabled="disabled" @tap="toSure">空盘入库</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {emptyDiskIntoStorageShow, emptyDiskIntoStorageTask} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				dataList: [],
-				disabled: false
-			};
-		},
-		created () {
-			this._emptyDiskIntoStorageShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _emptyDiskIntoStorageShow () {
-				let res = await emptyDiskIntoStorageShow()
-				this.dataList = [...res]
-			},
-			/** 空盘入库 */
-			async toSure () {
-				this.disabled = true
-				try {
-					let res = await emptyDiskIntoStorageTask()
-					this.disabled = false
-					this._emptyDiskIntoStorageShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/equip-inspection.vue b/pages/modules/equip-inspection.vue
deleted file mode 100644
index 1440a6a..0000000
--- a/pages/modules/equip-inspection.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="设备点检"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label">设备号</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">状态</span>
-					</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item filter_item_1">
-					<view class="filter_label">备注</view>
-					<view class="filter_input_wraper filter_input_wraper_1">
-						<textarea class="filter_textarea" v-model="remark"></textarea>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {deviceInfo, deviceStatus, deviceCheckVerify} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				remark: '',
-				disabled1: false
-			};
-		},
-		created () {
-			this._deviceInfo()
-			this._deviceStatus()
-		},
-		methods: {
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 获取设备下拉框 */
-			async _deviceInfo () {
-				let res = await deviceInfo()
-				this.options1 = [...res]
-			},
-			/** 获取设备状态下拉框 */
-			async _deviceStatus () {
-				let res = await deviceStatus()
-				this.options2 = [...res]
-			},
-			/** 确定 */
-			async toSure () {
-				this.disabled1 = true
-				if (!this.index1) {
-					uni.showToast({
-						title: '设备号不能为空',
-						icon: 'none'
-					})
-					this.disabled1 = false
-					return
-				}
-				if (!this.index2) {
-					uni.showToast({
-						title: '状态不能为空',
-						icon: 'none'
-					})
-					this.disabled1 = false
-					return
-				}
-				try {
-					let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : ''
-					let res = await deviceCheckVerify(this.index1, userName,this.remark, this.index2)
-					this.disabled1 = false
-					this.index1 = ''
-					this.index2 = ''
-					this.remark = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCancle () {
-				this.disabled1 = false
-				this.index1 = ''
-				this.index2 = ''
-				this.remark = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_item_1, .filter_input_wraper_1
-	align-items: flex-start
-	height 210rpx
-</style>
diff --git a/pages/modules/equip-operate.vue b/pages/modules/equip-operate.vue
deleted file mode 100644
index af5a8eb..0000000
--- a/pages/modules/equip-operate.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="设备操作"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label">设备号</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">动作</span>
-					</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {deviceInfo, deviceStatus, deviceCheckVerify} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				disabled1: false
-			};
-		},
-		created () {
-			this._deviceInfo()
-			this._deviceStatus()
-		},
-		methods: {
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 获取设备下拉框 */
-			async _deviceInfo () {
-				let res = await deviceInfo()
-				this.options1 = [...res]
-			},
-			/** 获取设备状态下拉框 */
-			async _deviceStatus () {
-				let res = await deviceStatus()
-				this.options2 = [...res]
-			},
-			/** 确定 */
-			async toSure () {
-				this.disabled1 = true
-				if (!this.index1) {
-					uni.showToast({
-						title: '设备号不能为空',
-						icon: 'none'
-					})
-					this.disabled1 = false
-					return
-				}
-				if (!this.index2) {
-					uni.showToast({
-						title: '状态不能为空',
-						icon: 'none'
-					})
-					this.disabled1 = false
-					return
-				}
-				try {
-					let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : ''
-					let res = await deviceCheckVerify(this.index1, userName, this.index2)
-					this.disabled1 = false
-					this.index1 = ''
-					this.index2 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCancle () {
-				this.disabled1 = false
-				this.index1 = ''
-				this.index2 = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_item_1, .filter_input_wraper_1
-	align-items: flex-start
-	height 210rpx
-</style>
diff --git a/pages/modules/forced-rest.vue b/pages/modules/forced-rest.vue
deleted file mode 100644
index 4c8523a..0000000
--- a/pages/modules/forced-rest.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="强制静置"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label">静置时间</view>
-					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val1">
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>困料位置</th>
-								<th>设备号</th>
-								<th>静置时间</th>
-								<th>剩余静置时间</th>
-								<th>预计完成时间</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.group_id === pkId}">
-								<td>{{e.point_code}}</td>
-								<td>{{e.device_code}}</td>
-								<td>{{e.standing_time}}</td>
-								<td>{{e.timeDifferenceMinutes}}</td>
-								<td>{{e.estimatedCompletionTimeString}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_forcedRestingShow">刷新</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId}" :disabled="disabled" @tap="toSure">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {forcedRestingShow, forcedRestingSubmit} from '@/utils/getData2.js'
-	import {dateTimeFtt} from '@/utils/utils.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				val1: '',
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				disabled: false
-			};
-		},
-		created () {
-			this._forcedRestingShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _forcedRestingShow () {
-				let res = await forcedRestingShow()
-				this.dataList = [...res]
-			},
-			/** 确认 */
-			async toSure () {
-				this.disabled = true
-				if (!this.val1 || !this.pkId) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await forcedRestingSubmit(this.val1, this.pkId)
-					this.disabled = false
-					this.pkId = ''
-					this.pkObj = {}
-					this.val1 = ''
-					this._forcedRestingShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.group_id ? '' : e.group_id
-				this.pkObj = this.pkId === e.group_id ? e : {}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/hunnian-carry.vue b/pages/modules/hunnian-carry.vue
deleted file mode 100644
index 04cc8e7..0000000
--- a/pages/modules/hunnian-carry.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="混碾搬运"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">载具编码</span>
-					</view>
-					<view class="filter_input_wraper">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">混碾位置</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !index1}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getBlendingCode, sendTask} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				options1: [],
-				index1: '',
-				disabled1: false
-			};
-		},
-		created () {
-			this._getBlendingCode()
-		},
-		methods: {
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			/** 下拉框-混碾位置 */
-			async _getBlendingCode () {
-				let res = await getBlendingCode()
-				this.options1 = [...res]
-			},
-			/** 确定 */
-			async toSure () {
-				this.disabled1 = true
-				if (!this.val1 || !this.index1) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await sendTask(this.val1, this.index1)
-					this.disabled1 = false
-					this.val1 = ''
-					this.index1 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCancle () {
-				this.disabled1 = false
-				this.val1 = ''
-				this.index1 = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_item_1, .filter_input_wraper_1
-	align-items: flex-start
-	height 210rpx
-</style>
diff --git a/pages/modules/hunnian-operate.vue b/pages/modules/hunnian-operate.vue
deleted file mode 100644
index ac4755a..0000000
--- a/pages/modules/hunnian-operate.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="混碾操作"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>压机编号</th>
-								<th>泥料号</th>
-								<th>工单号</th>
-								<th>是否上料</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.record_id === pkId}">
-								<td>{{e.device_code}}</td>
-								<td>{{e.material_id}}</td>
-								<td>{{e.workorder_id}}</td>
-								<td>{{e.is_finish}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_mixRequestInfo">刷新</button>
-			<button class="submit-button" :disabled="disabled" @tap="toSure">删除</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {mixRequestInfo, mixDeleteInfo} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				disabled: false
-			};
-		},
-		created () {
-			this._mixRequestInfo()
-		},
-		methods: {
-			/** grid查询 */
-			async _mixRequestInfo () {
-				let res = await mixRequestInfo()
-				this.dataList = [...res]
-			},
-			/** 删除 */
-			async toSure () {
-				this.disabled = true
-				if (!this.pkId) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await mixDeleteInfo(this.pkObj)
-					this.disabled = false
-					this.pkId = ''
-					this.pkObj = {}
-					this._mixRequestInfo()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.record_id ? '' : e.record_id
-				this.pkObj = this.pkId === e.record_id ? e : {}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/man-group.vue b/pages/modules/man-group.vue
deleted file mode 100644
index ff8d70f..0000000
--- a/pages/modules/man-group.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="人工组盘"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">载具编码</span>
-					</view>
-					<view class="filter_input_wraper">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">载具类型</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">点位编码</span>
-					</view>
-					<view class="filter_input_wraper">
-						<zxz-uni-data-select v-model="index2" filterable :localdata="options2" @inputChange="inputChange" @change="change"></zxz-uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">物料重量</span>
-					</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val2">
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getPressCode, getVehicleType, groupmanual} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				disabled1: false
-			};
-		},
-		created () {
-			this._getPressCode()
-			this._getVehicleType()
-		},
-		methods: {
-			change(e) {
-				// console.log('e:', e);
-			},
-			inputChange(e) {
-				// console.log(e);
-			},
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			// selectChange2(e) {
-			// 	this.index2 = e
-			// },
-			/** 获取载具类型下拉框 */
-			async _getVehicleType () {
-				let res = await getVehicleType()
-				this.options1 = [...res]
-			},
-			/** 获取点位编码下拉框 */
-			async _getPressCode () {
-				let res = await getPressCode()
-				this.options2 = [...res]
-			},
-			/** 确定 */
-			async toSure () {
-				this.disabled1 = true
-				if (!this.index1) {
-					this.disabled1 = false
-					return
-				}
-				if (!this.index2) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await groupmanual(this.val1, this.index1, this.index2, this.val2)
-					this.disabled1 = false
-					this.val1 = ''
-					this.val2 = ''
-					this.index1 = ''
-					this.index2 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCancle () {
-				this.disabled1 = false
-				this.val1 = ''
-				this.val2 = ''
-				this.index1 = ''
-				this.index2 = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_item_1, .filter_input_wraper_1
-	align-items: flex-start
-	height 210rpx
-</style>
diff --git a/pages/modules/package-instore.vue b/pages/modules/package-instore.vue
deleted file mode 100644
index b6bc2cf..0000000
--- a/pages/modules/package-instore.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="包装入库"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label">托盘编码</view>
-					<view class="filter_input_wraper">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">物料数量</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val2">
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">剩余数量</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val3">
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>起点1</th>
-								<th>终点1</th>
-								<th>起点2</th>
-								<th>终点2</th>
-								<th>任务状态</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.point_name1}}</td>
-								<td>{{e.point_name2}}</td>
-								<td>{{e.point_name3}}</td>
-								<td>{{e.point_name4}}</td>
-								<td>{{e.task_status}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_manualSortingPackingTaskShow">刷新</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {manualSortingPackingTaskShow, manualSortingPackingTask} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				val3: '0',
-				dataList: [],
-				disabled: false
-			};
-		},
-		created () {
-			this._manualSortingPackingTaskShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _manualSortingPackingTaskShow () {
-				let res = await manualSortingPackingTaskShow()
-				this.dataList = [...res]
-			},
-			/** 确认 */
-			async toSure () {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await manualSortingPackingTask(this.val1, this.val2, this.val3)
-					this.disabled = false
-					this.val1 = ''
-					this.val2 = ''
-					this.val3 = '0'
-					this._manualSortingPackingTaskShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/pallet-bind.vue b/pages/modules/pallet-bind.vue
deleted file mode 100644
index ce3e1f3..0000000
--- a/pages/modules/pallet-bind.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="托盘绑定"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label">木托盘编码</view>
-					<view class="filter_input_wraper">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">钢托盘编码</span>
-					</view>
-					<view class="filter_input_wraper">
-						<search-box v-model="val2" />
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">清空</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {manualSortingBindingVehicle} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				disabled: false
-			};
-		},
-		methods: {
-			/** 确定 */
-			async toSure () {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await manualSortingBindingVehicle(this.val2, this.val1)
-					this.disabled = false
-					this.val1 = ''
-					this.val2 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toCancle () {
-				this.disabled = false
-				this.val1 = ''
-				this.val2 = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-</style>
diff --git a/pages/modules/press-carry.vue b/pages/modules/press-carry.vue
deleted file mode 100644
index b02b71b..0000000
--- a/pages/modules/press-carry.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="压机搬运"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">载具编码</span>
-					</view>
-					<view class="filter_input_wraper">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">搬运起点</span>
-					</view>
-					<view class="filter_input_wraper">
-						<zxz-uni-data-select v-model="index2" filterable :localdata="options2" @inputChange="inputChange" @change="change"></zxz-uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">砖块数量</span>
-					</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val2">
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index2}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {pressPointList, pressTask} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				options2: [],
-				index2: '',
-				disabled1: false
-			};
-		},
-		created () {
-			this._pressPointList()
-		},
-		methods: {
-			change(e) {
-				// console.log('e:', e);
-			},
-			inputChange(e) {
-				// console.log(e);
-			},
-			// selectChange2(e) {
-			// 	this.index2 = e
-			// },
-			/** 获取下拉框 */
-			async _pressPointList () {
-				let res = await pressPointList()
-				this.options2 = [...res]
-			},
-			/** 确定 */
-			async toSure () {
-				this.disabled1 = true
-				if (!this.index2) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await pressTask(this.index2, this.val1, this.val2)
-					this.disabled1 = false
-					this.val1 = ''
-					this.val2 = ''
-					this.index2 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCancle () {
-				this.disabled1 = false
-				this.val1 = ''
-				this.val2 = ''
-				this.index2 = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_item_1, .filter_input_wraper_1
-	align-items: flex-start
-	height 210rpx
-</style>
diff --git a/pages/modules/shelf-check.vue b/pages/modules/shelf-check.vue
deleted file mode 100644
index b082d79..0000000
--- a/pages/modules/shelf-check.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="货架盘点"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label">库位编码</view>
-					<view class="filter_input_wraper">
-						<input type="text" placeholder="输入货架号码" class="filter_input" v-model="val1">
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">库位状态</span>
-					</view>
-					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
-				<view v-show="index === '2' || index === '3'" class="filter_item">
-					<view class="filter_label">托盘编码</view>
-					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val2">
-					</view>
-				</view>
-				<view v-show="index === '3'" class="filter_item">
-					<view class="filter_label">砖块数量</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val3">
-					</view>
-				</view>
-				<view v-show="index === '3'" class="filter_item">
-					<view class="filter_label">物料编码</view>
-					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val4">
-					</view>
-				</view>
-			</view>
-			<view v-show="index === '3'" class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>物料编码</th>
-								<th>物料名称</th>
-								<th>物料规格</th>
-								<th>物料型号</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.material_id === pkId}">
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_shelfMaterialQuery">查询</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !index || (index === '2' && !val2) || (index === '3' && (!val2 || !val3 || !pkId))}" :disabled="disabled" @tap="toSure">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {shelfMaterialQuery, shelfUpdateData} from '@/utils/getData2.js'
-	import {dateTimeFtt} from '@/utils/utils.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				val1: '',
-				index: '',
-				options: [{value: '1', text: '空位'}, {value: '2', text: '空盘'}, {value: '3', text: '有料'}],
-				val2: '',
-				val3: '',
-				val4: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		methods: {
-			selectChange(e) {
-				this.index = e
-			},
-			/** grid查询 */
-			async _shelfMaterialQuery () {
-				let res = await shelfMaterialQuery(this.val4)
-				this.dataList = [...res]
-			},
-			/** 确认 */
-			async toSure () {
-				this.disabled = true
-				if (!this.val1 || !this.index || (this.index === '2' && !this.val2) || (this.index === '3' && (!this.val2 || !this.val3 || !this.pkId))) {
-					this.disabled = false
-					return
-				}
-				try {
-					let vcode = ''
-					let qty = ''
-					let id = ''
-					if (this.index === '2') {
-						vcode = this.val2
-					}
-					if (this.index === '3') {
-						vcode = this.val2
-						qty = this.val3
-						id = this.pkId
-					}
-					let res = await shelfUpdateData(this.val1, this.index, vcode, qty, id)
-					this.disabled = false
-					this.pkId = ''
-					this.val1 = ''
-					this.index = ''
-					this.val2 = ''
-					this.val3 = ''
-					this.val4 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.material_id ? '' : e.material_id
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/sort-schedue.vue b/pages/modules/sort-schedue.vue
deleted file mode 100644
index 0b3f70c..0000000
--- a/pages/modules/sort-schedue.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="分拣排产"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>工单号</th>
-								<th>物料编码</th>
-								<th>物料名称</th>
-								<th>工单状态</th>
-								<th>开工人</th>
-								<th>创建者</th>
-								<th>计划量</th>
-								<th>实际量</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.workorder_code === pkId}">
-								<td>{{e.workorder_code}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.workorder_status}}</td>
-								<td>{{e.operator}}</td>
-								<td>{{e.create_name}}</td>
-								<td><input type="number" class="sin_input" v-model="e.plan_qty"></td>
-								<td>{{e.real_qty}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="toSure1">开工</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="toSure2">完工</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {manualSortingOrders, manualSortingProductionScheduling, manualSortingProductionComplete} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				disabled1: false,
-				disabled2: false
-			};
-		},
-		created () {
-			this._manualSortingOrders()
-		},
-		methods: {
-			/** grid查询 */
-			async _manualSortingOrders () {
-				let res = await manualSortingOrders()
-				this.dataList = [...res]
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.workorder_code ? '' : e.workorder_code
-				this.pkObj = this.pkId === e.workorder_code ? e : {}
-			},
-			/** 开工 */
-			async toSure1 () {
-				this.disabled1 = true
-				if (!this.pkId) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : ''
-					let res = await manualSortingProductionScheduling(this.pkId, userName)
-					this.disabled1 = false
-					this.pkId = ''
-					this.pkObj = {}
-					this._manualSortingOrders()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			/** 完工 */
-			async toSure2 () {
-				this.disabled2 = true
-				if (!this.pkId) {
-					this.disabled2 = false
-					return
-				}
-				try {
-					let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : ''
-					let res = await manualSortingProductionComplete(this.pkId, userName)
-					this.disabled2 = false
-					this.pkId = ''
-					this.pkObj = {}
-					this._manualSortingOrders()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled2 = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/surplus-mater-instore.vue b/pages/modules/surplus-mater-instore.vue
deleted file mode 100644
index 3cdcd7b..0000000
--- a/pages/modules/surplus-mater-instore.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="剩料入库"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label">托盘编码</view>
-					<view class="filter_input_wraper">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">物料数量</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val2">
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>起点</th>
-								<th>终点</th>
-								<th>任务状态</th>
-								<th>备注</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.point_name1}}</td>
-								<td>{{e.point_name2}}</td>
-								<td>{{e.task_status}}</td>
-								<td>{{e.remark}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_forcedRestingShow">刷新</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {callingResidueMaterialTaskShow, callingResidueMaterialTask} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				dataList: [],
-				disabled: false
-			};
-		},
-		created () {
-			this._callingResidueMaterialTaskShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _callingResidueMaterialTaskShow () {
-				let res = await callingResidueMaterialTaskShow()
-				this.dataList = [...res]
-			},
-			/** 确认 */
-			async toSure () {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await callingResidueMaterialTask(this.val1, this.val2)
-					this.disabled = false
-					this.val1 = ''
-					this.val2 = ''
-					this._callingResidueMaterialTaskShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png
index 5f06944..7fb4f12 100644
Binary files a/static/image/menu/RF01.png and b/static/image/menu/RF01.png differ
diff --git a/static/image/menu/RF02.png b/static/image/menu/RF02.png
index 15c177a..30c871f 100644
Binary files a/static/image/menu/RF02.png and b/static/image/menu/RF02.png differ
diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png
index 1bc47ed..af989ff 100644
Binary files a/static/image/menu/RF03.png and b/static/image/menu/RF03.png differ
diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png
index 775f2e8..d648d05 100644
Binary files a/static/image/menu/RF04.png and b/static/image/menu/RF04.png differ
diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
deleted file mode 100644
index af989ff..0000000
Binary files a/static/image/menu/RF05.png and /dev/null differ
diff --git a/static/image/menu/RF06.png b/static/image/menu/RF06.png
deleted file mode 100644
index 30c871f..0000000
Binary files a/static/image/menu/RF06.png and /dev/null differ
diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png
deleted file mode 100644
index ba6628a..0000000
Binary files a/static/image/menu/RF07.png and /dev/null differ
diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png
deleted file mode 100644
index d2b969b..0000000
Binary files a/static/image/menu/RF08.png and /dev/null differ
diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
deleted file mode 100644
index 972a492..0000000
Binary files a/static/image/menu/RF09.png and /dev/null differ
diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
deleted file mode 100644
index 7e9ddd2..0000000
Binary files a/static/image/menu/RF10.png and /dev/null differ