From 6fdce408c4994419a98ef6441abea51e8f5476e0 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 12 Mar 2024 15:23:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=B8=8B=E6=96=99=E3=80=81?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                    |   5 +-
 common/style/{layout.css => layout.styl}   | 140 ++-------------------
 common/style/reset.css                     |   2 +-
 common/style/uni.css                       |  12 --
 components/NavBar.vue                      |  13 +-
 components/SearchBox.vue                   |  23 ++--
 components/SearchBox1.vue                  | 110 ----------------
 components/SearchBoxMx.vue                 |  88 -------------
 package.json                               |   4 +-
 pages.json                                 |  70 +++--------
 pages/home/home.vue                        |  12 +-
 pages/login/login.vue                      |   9 +-
 pages/manage/{ => back}/in-storage.vue     |   0
 pages/manage/{ => back}/man-group-disk.vue |   0
 pages/manage/{ => back}/out-storage.vue    |   0
 pages/manage/{ => back}/search-mater-1.vue |   0
 pages/manage/{ => back}/search-mater.vue   |   0
 pages/manage/{ => back}/task-flow.vue      |   0
 pages/manage/empty-tray-in.vue             |   8 +-
 pages/manage/empty-tray-out.vue            |   8 +-
 pages/manage/group-in-storage.vue          |  13 +-
 pages/manage/mater-out-storage.vue         |  12 +-
 pages/manage/point-update.vue              | 127 +++++++++++++++++++
 pages/manage/produce-cut.vue               |  99 +++++++++++++++
 static/iconfont/iconfont.ttf               | Bin 3896 -> 0 bytes
 static/iconfont/iconfont.woff              | Bin 2524 -> 0 bytes
 static/iconfont/iconfont.woff2             | Bin 2060 -> 0 bytes
 utils/getData2.js                          |  74 ++++++++---
 utils/request.js                           |   2 +-
 vuex/modules/user.js                       |   1 +
 yarn.lock                                  |   4 -
 31 files changed, 373 insertions(+), 463 deletions(-)
 rename common/style/{layout.css => layout.styl} (78%)
 delete mode 100644 common/style/uni.css
 delete mode 100644 components/SearchBox1.vue
 delete mode 100644 components/SearchBoxMx.vue
 rename pages/manage/{ => back}/in-storage.vue (100%)
 rename pages/manage/{ => back}/man-group-disk.vue (100%)
 rename pages/manage/{ => back}/out-storage.vue (100%)
 rename pages/manage/{ => back}/search-mater-1.vue (100%)
 rename pages/manage/{ => back}/search-mater.vue (100%)
 rename pages/manage/{ => back}/task-flow.vue (100%)
 create mode 100644 pages/manage/point-update.vue
 create mode 100644 pages/manage/produce-cut.vue
 delete mode 100644 static/iconfont/iconfont.ttf
 delete mode 100644 static/iconfont/iconfont.woff
 delete mode 100644 static/iconfont/iconfont.woff2

diff --git a/App.vue b/App.vue
index f6ef8a2..58b029a 100644
--- a/App.vue
+++ b/App.vue
@@ -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/common/style/layout.css b/common/style/layout.styl
similarity index 78%
rename from common/style/layout.css
rename to common/style/layout.styl
index 35239e3..d37891a 100644
--- a/common/style/layout.css
+++ b/common/style/layout.styl
@@ -1,3 +1,4 @@
+@import './mixin.styl';
 page {
     background-color: #f2f5fa !important;
     min-height: 100% !important;
@@ -10,130 +11,6 @@ uni-page-body {
 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_choosed {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	padding: 4rpx 10rpx;
-	line-height: 20rpx;
-	font-size: 20rpx;
-	color: #fff;
-	border: 1rpx solid #ff6a00;
-	background-color: #ff6a00;
-	border-top-left-radius: 10rpx;
-	border-bottom-right-radius: 10rpx;
-}
-.icon_back {
-	font-size: 52rpx;
-	line-height: 52rpx;
-	color: #fff;
-}
-.icon_home {
-	font-size: 52rpx;
-	line-height: 52rpx;
-	color: #fff;
-}
-.icon_scan {
-	width: 60rpx;
-	height: 80rpx;
-	font-size: 48rpx;
-	line-height: 80rpx;
-	color: #4e6ef2;
-	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: "\e6db";
-}
-.cancel_icon {
-	display: block;
-	width: 60rpx;
-	height: 60rpx;
-	font-size: 40rpx;
-	color: #000;
-	line-height: 60rpx;
-	text-align: center;
-	border: 1px solid #999;
-	border-radius: 50%;
-	transform: rotate(-90deg);
-}
-.icon_start_point {
-	width: 46rpx;
-	height: 46rpx;
-	font-size: 26rpx;
-	line-height: 46rpx;
-	background-color: #ff6a00;
-	color: #fff;
-	border-radius: 50%;
-}
-.icon_vdash_line {
-	width: 46rpx;
-	height: 26rpx;
-	font-size: 26rpx;
-	line-height: 26rpx;
-	text-align: center;
-	color: #ff6a00;
-}
-.icon_right {
-	text-align: right;
-	font-size: 28rpx;
-	color: rgb(153, 153, 153);
-}
 
 /** 内容 */
 .zd_container {
@@ -146,8 +23,6 @@ uni-button:after {
 	width: 100%;
 	height: auto;
 	padding: 20rpx 14rpx 140rpx 14rpx;
-	/* background: linear-gradient(to bottom, #ff6400 0%, #fee4d7 30%, #f6f6f6 100%) */
-	background-color: #f6f6f6;
 }
 .zd_wrapper {
 	width: 100%;
@@ -294,9 +169,6 @@ uni-button:after {
 	color: #7d7d7d;
 	background: #fff;
 }
-.slide_new table tbody tr.checked td {
-	background-color: #f9efb6;
-}
 .slide_new table tbody tr td .td_input {
 	width: 150rpx;
 	font-size: 28rpx;
@@ -308,8 +180,9 @@ uni-button:after {
 	box-shadow: 0 0 0 2px rgba(136, 157, 199,.2);
 	border-radius: 10rpx;
 }
-.slide_new table tbody tr td.fontcol1 {
+.slide_new table thead tr th.fontcol1,.slide_new table tbody tr td.fontcol1 {
 	color: #4e6ef2;
+	font-weight: bold;
 }
 .slide_new table tbody tr td.fontcol2 {
 	color: #000;
@@ -334,6 +207,12 @@ uni-button:after {
 	background-color: #f3ccb5;
 	color: #ff5e00;
 }
+.slide_new table tbody tr.checked
+	td
+		background-color: #4e6ef2
+		color #fff
+	td.fontcol1, td.fontcol2
+		color #fff
 .item-wrapper {
 	width: 100%;
 	height: auto;
@@ -517,6 +396,7 @@ uni-button:after {
 	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;
diff --git a/common/style/reset.css b/common/style/reset.css
index edacccf..ed9bb53 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;
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 f9403e8..b556c9c 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 class="zd-col-4" style="text-align: right">
+			<uni-icons @tap="backHome" type="home-filled" size="26" color="#fff" :class="{'vhide': show1 === false}"></uni-icons>
+		</view> -->
 	</view>
 </template>
 
@@ -51,7 +55,6 @@
 <style lang="stylus">
 @import '@/common/style/mixin.styl';
 .header
-	_fj()
 	position fixed
 	_wh(100%, calc(var(--status-bar-height) + 72rpx))
 	// background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%)
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 599d1cb..239028a 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -2,16 +2,16 @@
 	<view class="search_wraper">
 		<input 
 		type="text" 
-		class="filter_input pdr110" 
+		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_scan" @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>
@@ -130,14 +130,13 @@
 .search_wraper
 	position relative
 	_wh(100%, 80rpx)
-.pdr110
-	padding-right: 110rpx;
+.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 f5c42b0..0000000
--- a/components/SearchBox1.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-	<view class="search_wraper">
-		<input 
-		type="text" 
-		class="filter_input pdr160" 
-		: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)
-.pdr160
-	padding-right: 160rpx;
-.buttons_wraper
-	position absolute
-	top 0
-	right 0
-	_wh(auto, 70rpx)
-</style>
diff --git a/components/SearchBoxMx.vue b/components/SearchBoxMx.vue
deleted file mode 100644
index a8abadb..0000000
--- a/components/SearchBoxMx.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<template>
-	<view class="search_wraper">
-		<slot></slot>
-		<view class="buttons_wraper">
-			<view class="iconfont icon_del" @tap="toDel">&#xe6dc;</view>
-			<view class="iconfont icon_scan" :class="{'icon_scan_active': focused === true}" @tap="toScan">&#xe6e2;</view>
-			<view class="iconfont icon_phone" @tap="toPhone">&#xe663;</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import permision from "@/utils/permission.js"
-	export default {
-		props: {
-			focused: {
-				type: Boolean,
-				default: false
-			}
-		},
-		methods: {
-			toDel () {
-				this.$emit('inputDel')
-			},
-			toScan () {
-				this.$emit('inputScan', '')
-			},
-			async toPhone() {
-				// #ifdef APP-PLUS
-				let status = await this.checkPermission();
-				if (status !== 1) {
-				    return;
-				}
-				// #endif
-				uni.scanCode({
-					success: (res) => {
-						this.$emit('toPhone', 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)
-.pdr160
-	padding-right: 160rpx;
-.buttons_wraper
-	position absolute
-	top 0
-	right 10rpx
-	_wh(auto, 70rpx)
-	_fj(flex-end)
-.icon_scan_active
-	color $red
-</style>
diff --git a/package.json b/package.json
index 7542a27..18a1e41 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,3 @@
 {
-  "dependencies": {
-    "jsencrypt": "^3.2.1"
-  }
+  "dependencies": {}
 }
diff --git a/pages.json b/pages.json
index 6b4972a..20e71e0 100644
--- a/pages.json
+++ b/pages.json
@@ -17,60 +17,6 @@
 		    "style": {
 		    	"navigationStyle": "custom"
 		    }  
-		}
-		,{
-		    "path" : "pages/login/upgrade",
-		    "style": {
-		    	"navigationStyle": "custom"
-		    }  
-		}
-        ,{
-            "path" : "pages/manage/man-group-disk",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/in-storage",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/out-storage",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/task-flow",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/search-mater",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        },
-		{
-		    "path" : "pages/manage/search-mater-1",
-		    "style" :                                                                                    
-		    {
-		        "navigationStyle": "custom"
-		    }
-		    
 		}
         ,{
             "path" : "pages/manage/empty-tray-out",
@@ -104,6 +50,22 @@
             }
             
         }
+        ,{
+            "path" : "pages/manage/produce-cut",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/point-update",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index edaadf7..52a4f2e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -48,8 +48,8 @@
 					{id: 2, title: '空托盘入库', icon: 'RF02', path: '/pages/manage/empty-tray-in'},
 					{id: 3, title: '组盘入库', icon: 'RF03', path: '/pages/manage/group-in-storage'},
 					{id: 4, title: '原料出库', icon: 'RF04', path: '/pages/manage/mater-out-storage'},
-					{id: 5, title: '生产下料', icon: 'RF05', path: ''},
-					{id: 6, title: '点位更新', icon: 'RF06', path: ''},
+					{id: 5, title: '生产下料', icon: 'RF05', path: '/pages/manage/produce-cut'},
+					{id: 6, title: '点位更新', icon: 'RF06', path: '/pages/manage/point-update'},
 					{id: 7, title: '定点作业', icon: 'RF07', path: ''},
 					{id: 8, title: '作业管理', icon: 'RF08', path: ''},
 					{id: 9, title: '出库确认', icon: 'RF09', path: ''}
@@ -71,13 +71,13 @@
 				
 			},
 			toPage (e) {
-				let url = e.path
+				let url = e.path + '?title=' + e.title
 				uni.redirectTo({
 					url: url
 				})	
 			},
 			Quit () {
-			  this.$store.dispatch('delUserInfo')
+			  this.$store.dispatch('delUserInfo', '')
 			  uni.redirectTo({
 			  	url: '/pages/login/login'
 			  })
@@ -96,7 +96,8 @@
 	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, #fae2ca 0%, #fff5ea 20%, #fdfdfd 100%)
+	background linear-gradient(to bottom, #f5f6fb 0%, #fff 100%)
 .header
 	position fixed
 	left 0
@@ -104,7 +105,6 @@
 	padding-top var(--status-bar-height)
 	z-index 100
 	_wh(100%, calc(var(--status-bar-height) + 86rpx))
-	background-color  #f8e6db
 	_font(36rpx,86rpx,#333,,center)
 .userInfo-wrap
 	_fj()
diff --git a/pages/login/login.vue b/pages/login/login.vue
index ad528ac..28ef858 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -6,8 +6,8 @@
 			<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">
@@ -61,9 +61,6 @@
 			toSaveUser() {
 				this.saveUser = !this.saveUser
 			},
-			changePassword() {
-			    this.showPassword = !this.showPassword
-			},
 			setup () {
 				uni.redirectTo({
 					url: '/pages/login/setup'
@@ -142,7 +139,7 @@
   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
diff --git a/pages/manage/in-storage.vue b/pages/manage/back/in-storage.vue
similarity index 100%
rename from pages/manage/in-storage.vue
rename to pages/manage/back/in-storage.vue
diff --git a/pages/manage/man-group-disk.vue b/pages/manage/back/man-group-disk.vue
similarity index 100%
rename from pages/manage/man-group-disk.vue
rename to pages/manage/back/man-group-disk.vue
diff --git a/pages/manage/out-storage.vue b/pages/manage/back/out-storage.vue
similarity index 100%
rename from pages/manage/out-storage.vue
rename to pages/manage/back/out-storage.vue
diff --git a/pages/manage/search-mater-1.vue b/pages/manage/back/search-mater-1.vue
similarity index 100%
rename from pages/manage/search-mater-1.vue
rename to pages/manage/back/search-mater-1.vue
diff --git a/pages/manage/search-mater.vue b/pages/manage/back/search-mater.vue
similarity index 100%
rename from pages/manage/search-mater.vue
rename to pages/manage/back/search-mater.vue
diff --git a/pages/manage/task-flow.vue b/pages/manage/back/task-flow.vue
similarity index 100%
rename from pages/manage/task-flow.vue
rename to pages/manage/back/task-flow.vue
diff --git a/pages/manage/empty-tray-in.vue b/pages/manage/empty-tray-in.vue
index 1f572b6..354ac99 100644
--- a/pages/manage/empty-tray-in.vue
+++ b/pages/manage/empty-tray-in.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="空托盘入库"></nav-bar>
+		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
@@ -12,7 +12,7 @@
 							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
 						</picker>
 					</view>
-					<view class="uni-icons icon_right">&#xe6b5;</view>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
@@ -54,6 +54,7 @@
 		},
 		data() {
 			return {
+				title: '',
 				options1: [],
 				index1: '',
 				val1: '',
@@ -61,6 +62,9 @@
 				disabled: false
 			};
 		},
+		onLoad (options) {
+			this.title = options.title
+		},
 		created () {
 			this._getVehicleType()
 		},
diff --git a/pages/manage/empty-tray-out.vue b/pages/manage/empty-tray-out.vue
index 1c61cd0..e076c27 100644
--- a/pages/manage/empty-tray-out.vue
+++ b/pages/manage/empty-tray-out.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="空托盘出库"></nav-bar>
+		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
@@ -12,7 +12,7 @@
 							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
 						</picker>
 					</view>
-					<view class="uni-icons icon_right">&#xe6b5;</view>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
 				<!-- <view class="zd-row">
 					<view class="zd-col-5">
@@ -52,6 +52,7 @@
 		},
 		data() {
 			return {
+				title: '',
 				options1: [],
 				index1: '',
 				// options2: [],
@@ -60,6 +61,9 @@
 				disabled: false
 			};
 		},
+		onLoad (options) {
+			this.title = options.title
+		},
 		created () {
 			this._getVehicleType()
 		},
diff --git a/pages/manage/group-in-storage.vue b/pages/manage/group-in-storage.vue
index fe9efa3..812eac1 100644
--- a/pages/manage/group-in-storage.vue
+++ b/pages/manage/group-in-storage.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="组盘入库"></nav-bar>
+		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
@@ -12,7 +12,7 @@
 							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
 						</picker>
 					</view>
-					<view class="uni-icons icon_right">&#xe6b5;</view>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
@@ -64,7 +64,7 @@
 					<table>
 						<thead>
 							<tr>
-								<th>载具编码</th>
+								<th class="fontcol1">载具编码</th>
 								<th>载具类型</th>
 								<th>物料编码</th>
 								<th>物料名称</th>
@@ -74,7 +74,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toChose(e)" :class="{'checked': e.vehicle_code === pkId}">
+							<tr v-for="(e, i) in dataList" :key="i" @click="toChose(e)" :class="{'checked': e.point_code === pkId}">
 								<td class="fontcol1">{{e.vehicle_code}}</td>
 								<td><view class="fontbg">{{e.vehicle_type}}</view></td>
 								<td class="fontcol2">{{e.material_code}}</td>
@@ -143,6 +143,7 @@
 		},
 		data() {
 			return {
+				title: '',
 				options1: [],
 				index1: '',
 				options2: [],
@@ -163,6 +164,9 @@
 				disabled4: false
 			};
 		},
+		onLoad (options) {
+			this.title = options.title
+		},
 		created () {
 			this._getVehicleType()
 			this._queryMaterial()
@@ -344,5 +348,4 @@
 </script>
 
 <style lang="stylus">
-@import '../../common/style/mixin.styl';
 </style>
diff --git a/pages/manage/mater-out-storage.vue b/pages/manage/mater-out-storage.vue
index ea41803..57d70bf 100644
--- a/pages/manage/mater-out-storage.vue
+++ b/pages/manage/mater-out-storage.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="原料出库"></nav-bar>
+		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
@@ -11,7 +11,7 @@
 						<zxz-uni-data-select v-model="index1" filterable :localdata="options1" @change="selectChange"></zxz-uni-data-select>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
+				<view class="zd-row">
 					<view class="zd-col-5">
 						<span class="filter_label">出库点位</span>
 					</view>
@@ -27,7 +27,7 @@
 					<table>
 						<thead>
 							<tr>
-								<th>点位编码</th>
+								<th class="fontcol1">点位编码</th>
 								<th>点位名称</th>
 								<th>载具编码</th>
 								<th>物料编码</th>
@@ -69,6 +69,7 @@
 		},
 		data() {
 			return {
+				title: '',
 				options1: [],
 				index1: '',
 				val1: '',
@@ -77,6 +78,9 @@
 				disabled: false
 			};
 		},
+		onLoad (options) {
+			this.title = options.title
+		},
 		created () {
 			this._queryMaterial()
 		},
@@ -111,6 +115,7 @@
 					let res = await fullVehicleOut(this.pkId, this.val1)
 					this.pkId = ''
 					this.disabled = false
+					this._queryLinkMaterial(this.index1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -130,4 +135,5 @@
 </script>
 
 <style lang="stylus">
+@import '../../common/style/mixin.styl';
 </style>
diff --git a/pages/manage/point-update.vue b/pages/manage/point-update.vue
new file mode 100644
index 0000000..0e27a71
--- /dev/null
+++ b/pages/manage/point-update.vue
@@ -0,0 +1,127 @@
+<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">
+						<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-17 filter_picker">
+						<picker @change="pickerChange" :value="index1" :range="options1" range-key="text">
+							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
+						</picker>
+					</view>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': index1 === '' || !val1  || !val2}" :disabled="disabled1" @tap="_bindVehicle">绑定</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="_unbindVehicle">解绑</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getVehicleType, bindVehicle, unbindVehicle} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				options1: [],
+				index1: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._getVehicleType()
+		},
+		methods: {
+			/** 载具类型下拉框 */
+			async _getVehicleType () {
+				let res = await getVehicleType()
+				this.options1 = [...res]
+			},
+			pickerChange (e) {
+				this.index1 = e.detail.value
+			},
+			async _bindVehicle () {
+				this.disabled1 = true
+				if (!this.val1 || this.index1 === '' || !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await bindVehicle(this.val1, this.index1, this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			async _unbindVehicle () {
+				this.disabled2 = true
+				if (!this.val1) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await unbindVehicle(this.val1, this.index1, this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled1 = false
+				this.disabled2 = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/manage/produce-cut.vue b/pages/manage/produce-cut.vue
new file mode 100644
index 0000000..05dbb80
--- /dev/null
+++ b/pages/manage/produce-cut.vue
@@ -0,0 +1,99 @@
+<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">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<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-11 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': index1 === '' || !val1}" :disabled="disabled" @tap="_createP2pTask">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryEndPointsByStart, createP2pTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options1: [],
+				index1: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				this._queryEndPointsByStart(e)
+			},
+			/** 下一点位下拉框 */
+			async _queryEndPointsByStart (e) {
+				let res = await queryEndPointsByStart(e)
+				if (res.length > 0) {
+					res.map(el => {
+						this.$set(el, 'value', el.point_code2)
+						this.$set(el, 'text', el.point_name)
+					})
+					this.options1 = [...res]
+					this.index1 = this.options1[0].value
+				}
+			},
+			async _createP2pTask () {
+				this.disabled = true
+				if (!this.val1 || this.index1 === '') {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await createP2pTask(this.val1, this.index1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.options1 = []
+				this.val1 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf
deleted file mode 100644
index 25aa4c6de004ae489076d71145708854b729e566..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3896
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
ChiW4L

diff --git a/static/iconfont/iconfont.woff b/static/iconfont/iconfont.woff
deleted file mode 100644
index 84280a43e9177ed11f9860b793a0848da5ba17f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2524
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
F{R1yRZ!7=+

diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2
deleted file mode 100644
index 9f5269c89ad554100d8391639da1efd46a0f03f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2060
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

diff --git a/utils/getData2.js b/utils/getData2.js
index 97aa96e..25ea460 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -196,6 +196,62 @@ export const queryLinkMaterial = () => {
 ]
 	return res
 }
+// 1.2出库确认
+export const fullVehicleOut = (code1, code2) => request({
+	url:'api/pda/fullVehicleOut',
+	data: {
+		point_code1: code1,
+		point_code2: code2
+	}
+})
+/**
+ * 生产下料
+ */
+// 根据起点查询终点列表
+// export const queryEndPointsByStart = (code) => request({
+// 	url:'api/pda/queryEndPointsByStart',
+// 	data: {
+// 		point_code1: code
+// 	}
+// })
+export const queryEndPointsByStart = (code) => {
+	let res = [
+    {
+        "point_code2": "81",
+        "point_name": "回史就问装作过"
+    }
+]
+	return res
+}
+// 下料
+export const createP2pTask = (code, mcode) => request({
+	url:'api/pda/createP2pTask',
+	data: {
+		point_code1: code,
+		point_code2: mcode
+	}
+})
+/**
+ * 点位更新
+ */
+// 解绑
+export const unbindVehicle = (code, type, vcode) => request({
+	url:'api/pda/unbindVehicle',
+	data: {
+		point_code: code,
+		vehicle_type: type,
+		vehicle_code: vcode
+	}
+})
+// 绑定
+export const bindVehicle = (code, type, vcode) => request({
+	url:'api/pda/bindVehicle',
+	data: {
+		point_code: code,
+		vehicle_type: type,
+		vehicle_code: vcode
+	}
+})
 /**
  * 任务流转
  */
@@ -233,14 +289,7 @@ export const queryAllPoints = () => request({
 // ]
 // 	return res
 // }
-// 1.2生成任务
-export const createP2pTask = (code, mcode) => request({
-	url:'api/pda/createP2pTask',
-	data: {
-		point_code1: code,
-		point_code2: mcode
-	}
-})
+
 
 /**
  * 原材料库入库
@@ -269,14 +318,7 @@ export const queryPoints = (type) => request({
 
 
 
-// 1.2满托出库
-export const fullVehicleOut = (code1, code2) => request({
-	url:'api/pda/fullVehicleOut',
-	data: {
-		point_code1: code1,
-		point_code2: code2
-	}
-})
+
 //1.3余料回库
 export const vehicleGoBack = (code, vcode, num) => request({
 	url:'api/pda/vehicleGoBack',
diff --git a/utils/request.js b/utils/request.js
index fa0020a..015aca8 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -67,7 +67,7 @@ const request = (params) => {
 						content: res[1].data.message,
 						showCancel: false
 					})
-					store.dispatch('delUserInfo')
+					store.dispatch('delUserInfo', '')
 					uni.redirectTo({
 						url: '/pages/login/login'
 					})
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index 30e2f48..5d4c4d0 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -64,6 +64,7 @@ const mutations = {
 	},
 	[types.DEL_USER_INFO] (state, res) {
 		state.userInfo = res
+		state.saveToken = res
 	},
 	[types.SAVE_TOKEN] (state, res) {
 		state.saveToken = res
diff --git a/yarn.lock b/yarn.lock
index 9370773..fb57ccd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,3 @@
 # yarn lockfile v1
 
 
-jsencrypt@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jsencrypt/-/jsencrypt-3.2.1.tgz#09766983cc760088ff26b12fe7e574252af97727"
-  integrity sha512-k1sD5QV0KPn+D8uG9AdGzTQuamt82QZ3A3l6f7TRwMU6Oi2Vg0BsL+wZIQBONcraO1pc78ExMdvmBBJ8WhNYUA==