diff --git a/components/pda-scan-input/index.vue b/components/pda-scan-input/index.vue
index 32a8943..5b80a6e 100644
--- a/components/pda-scan-input/index.vue
+++ b/components/pda-scan-input/index.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="input-box">
 		<input :adjust-position="false" :focus="isFocus" type="text" v-model.trim="search" @confirm="getInfo" @blur="handlerBlur" />
+		
 		<!-- <input type="text" v-model.trim="search" @confirm="getInfo($event)" /> -->
 	</view>
 </template>
@@ -276,6 +277,8 @@
 <style scoped>
 	.input-box {
 		background-color: #e6e6e6;
+		display: flex;
+		flex-direction: row;
 		/* 	width: 100%;
 	position: absolute;
 	bottom: 0; */
@@ -284,4 +287,8 @@
 		/* visibility: hidden; */
 		/* display:none; */
 	}
+	.input-box input{
+		font-size: 18px;
+		height: 18px;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/outWarehouse/outWarehouse.vue b/pages/outWarehouse/outWarehouse.vue
index 933c328..d761068 100644
--- a/pages/outWarehouse/outWarehouse.vue
+++ b/pages/outWarehouse/outWarehouse.vue
@@ -1,16 +1,10 @@
 <template>
-	<view class="content">
+	<view class="common-nav-container">
+
 		<view class="title-box">
 			<!-- <span class="title-text">出库</span> -->
+
 			<view class="warehoseInfo-box">
-				<view>出库单号：{{ outInfo.shipmentNum }}</view>
-				<view class="row">
-					<view>备注：{{ outInfo.remarks }}</view>
-				</view>
-				<view class="row">
-					<span class="col">已扫货物数：{{ quantityTotal }}</span>
-					<span class="col">已扫箱数：{{ newMaterialList.length }}</span>
-				</view>
 				<view>
 					<view v-if="searchType === 3" class="color1 aciton-box">请扫出库单</view>
 					<view v-if="searchType === 2" class="color2 aciton-box">请扫箱码</view>
@@ -19,6 +13,15 @@
 						<PdaScanInput @getInfo="handleGetInfo" :type="searchType"></PdaScanInput>
 					</view>
 				</view>
+				<view>出库单号：{{ outInfo.shipmentNum }}</view>
+				<view class="row">
+					<view>备注：{{ outInfo.remarks }}</view>
+				</view>
+				<view class="row">
+					<span class="col">已扫货物数：{{ quantityTotal }}</span>
+					<span class="col">已扫箱数：{{ newMaterialList.length }}</span>
+				</view>
+
 			</view>
 		</view>
 		<!-- 选择物料号 -->
@@ -34,371 +37,379 @@
 		</view>
 		<!-- 底部按钮 -->
 		<view class="button-box">
-			<button type="default" @click="handlerDoOut">货物出库</button>
-			<button type="default" @click="handlerSubmit">出库单完成</button>
+			<u-button style="width: 40%" type="primary" @click="handlerDoOut">货物出库</u-button>
+			<u-button style="width: 40%" type="success" @click="handlerSubmit">出库单完成</u-button>
 		</view>
 	</view>
 </template>
 
 <script>
-import materialItem from '@/components/material-item/material-item.vue';
-import packageCard from '@/components/package-card/package-card.vue';
-import * as WarehoseApi from '@/api/warehouse/warehose.js';
-// 入库
-export default {
-	components: {
-		materialItem,
-		packageCard
-	},
-	data() {
-		return {
-			loading: false,
-			// 双击判定
-			touchNum: 0,
-			clearData: {},
-			// 出货单信息
-			outInfo: {
-				id: '',
-				// 出库单号
-				shipmentNum: '',
-				// 备注
-				remarks: '',
-				materialList: []
-			},
-			// 货物信息
-			lastPackageInfo: {
-				// 工单号
-				workoderID: '',
-				// 批次号(工单号+箱号+班组)
-				patchCode: '',
-				// 零件号
-				partNumner: '',
-				// 描述
-				productionDescribe: '',
-				// 出厂日期/生产日期
-				productionTime: '',
-				// 此箱数量
-				quantity: 0
-			},
-			// 新录入货物信息
-			newMaterialList: [],
+	import materialItem from '@/components/material-item/material-item.vue';
+	import packageCard from '@/components/package-card/package-card.vue';
+	import * as WarehoseApi from '@/api/warehouse/warehose.js';
+	// 入库
+	export default {
+		components: {
+			materialItem,
+			packageCard
+		},
+		data() {
+			return {
+				loading: false,
+				// 双击判定
+				touchNum: 0,
+				clearData: {},
+				// 出货单信息
+				outInfo: {
+					id: '',
+					// 出库单号
+					shipmentNum: '',
+					// 备注
+					remarks: '',
+					materialList: []
+				},
+				// 货物信息
+				lastPackageInfo: {
+					// 工单号
+					workoderID: '',
+					// 批次号(工单号+箱号+班组)
+					patchCode: '',
+					// 零件号
+					partNumner: '',
+					// 描述
+					productionDescribe: '',
+					// 出厂日期/生产日期
+					productionTime: '',
+					// 此箱数量
+					quantity: 0
+				},
+				// 新录入货物信息
+				newMaterialList: [],
 
-			//工单计划
-			outOrderPlan: [],
-			// 1-仓库扫码 2-货物扫码 3-出货单扫码
-			searchType: 3,
+				//工单计划
+				outOrderPlan: [],
+				// 1-仓库扫码 2-货物扫码 3-出货单扫码
+				searchType: 3,
 
-			show: false,
-			columns: [['无物料号']],
-			material_id: '无物料号' //物料号
-		};
-	},
-	watch: {},
-	created() {
-		this.init();
-	},
-	computed: {
-		quantityTotal() {
-			let num = 0;
-			for (let index = 0; index < this.newMaterialList.length; index++) {
-				let _num = parseInt(this.newMaterialList[index].quantity);
-				_num = _num || 0;
-				num += _num * 1;
+				show: false,
+				columns: [
+					['无物料号']
+				],
+				material_id: '无物料号' //物料号
+			};
+		},
+		watch: {},
+		created() {
+			this.init();
+		},
+		computed: {
+			quantityTotal() {
+				let num = 0;
+				for (let index = 0; index < this.newMaterialList.length; index++) {
+					let _num = parseInt(this.newMaterialList[index].quantity);
+					_num = _num || 0;
+					num += _num * 1;
+				}
+				return num;
 			}
-			return num;
-		}
-	},
-	methods: {
-		init() {
-			// 需要展示的参数：【零件号[物料号](35233201041) 描述(鲨鱼鳍)  箱号+班组(BNW240312023_18B1) 数量 时间 】
-			// 初始化，并且清空数据
-			this.clearData.outInfo = JSON.parse(JSON.stringify(this.outInfo));
-			this.clearData.newMaterialList = JSON.parse(JSON.stringify(this.newMaterialList));
-			this.clearData.outOrderPlan = JSON.parse(JSON.stringify(this.outOrderPlan));
-			this.searchType = 3;
 		},
-		clear() {
-			this.outInfo = JSON.parse(JSON.stringify(this.clearData.outInfo));
-			this.newMaterialList = JSON.parse(JSON.stringify(this.clearData.newMaterialList));
-			this.outOrderPlan = JSON.parse(JSON.stringify(this.clearData.outOrderPlan));
-			this.searchType = 3;
-		},
-		// 扫码信息录入
-		handleGetInfo(data, type) {
-			if (type === 3) {
-				// 出货单扫完后是扫箱号
-				this.searchType = 2;
-				this.outInfo = data;
-				this.newMaterialList = [];
+		methods: {
+			init() {
+				// 需要展示的参数：【零件号[物料号](35233201041) 描述(鲨鱼鳍)  箱号+班组(BNW240312023_18B1) 数量 时间 】
+				// 初始化，并且清空数据
+				this.clearData.outInfo = JSON.parse(JSON.stringify(this.outInfo));
+				this.clearData.newMaterialList = JSON.parse(JSON.stringify(this.newMaterialList));
+				this.clearData.outOrderPlan = JSON.parse(JSON.stringify(this.outOrderPlan));
+				this.searchType = 3;
+			},
+			clear() {
+				this.outInfo = JSON.parse(JSON.stringify(this.clearData.outInfo));
+				this.newMaterialList = JSON.parse(JSON.stringify(this.clearData.newMaterialList));
+				this.outOrderPlan = JSON.parse(JSON.stringify(this.clearData.outOrderPlan));
+				this.searchType = 3;
+			},
+			// 扫码信息录入
+			handleGetInfo(data, type) {
+				if (type === 3) {
+					// 出货单扫完后是扫箱号
+					this.searchType = 2;
+					this.outInfo = data;
+					this.newMaterialList = [];
 
-				let arry = [];
-				this.columns = [];
+					let arry = [];
+					this.columns = [];
 
-				this.outInfo.materialList.forEach((item) => {
-					arry.push(item.partnumber);
-				});
-				this.columns.push(arry);
-				this.material_id = this.outInfo.materialList[0].partnumber;
-			} else if (type === 2) {
-				if (this.newMaterialList.length > 0) {
+					this.outInfo.materialList.forEach((item) => {
+						arry.push(item.partnumber);
+					});
+					this.columns.push(arry);
+					this.material_id = this.outInfo.materialList[0].partnumber;
+				} else if (type === 2) {
+					if (this.newMaterialList.length > 0) {
+						uni.showModal({
+							title: '提示',
+							content: '当前货物未确认出库，请先点击下方出库按钮，出库当前货物！',
+							showCancel: false,
+							confirmText: '确定'
+						});
+						return;
+					}
+					const checkData = {
+						production_packcode: data.originalCode,
+						shipment_num: this.outInfo.shipmentNum,
+						partnumber: this.material_id
+					};
+					//检查是否可以出货
+					WarehoseApi.checkProductionOut(checkData).then((res) => {
+						if (res.code === 200 && res.data) {
+							this.newMaterialList.push(data);
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: '不可出库:' + res.msg,
+								showCancel: false,
+								confirmText: '确定'
+							});
+						}
+					});
+					// 此时扫描的是箱号
+					// TODO 检查扫描的箱号零件号是否在此工单下
+					// let flag = false;
+					// let list = JSON.parse(JSON.stringify(this.outOrderPlan));
+					// for(let item of list){
+					// 	// 扫描箱的工单号与计划中的批次号对比，数字是否在其中
+					// 	if(!item.Patchcode){
+					// 		continue;
+					// 	}
+					// 	if(item.Patchcode.includes(data.workoderID)){
+					// 		flag = true;
+					// 		break;
+					// 	}
+					// }
+					// if(!flag){
+					// 	// 此箱号不在计划内
+					// 	uni.showModal({
+					// 		title: '提示',
+					// 		content: '当前货物不在出库单计划内，请扫其他货物！',
+					// 		showCancel: false,
+					// 		confirmText: '确定'
+					// 	});
+					// 	return;
+					// }
+					// TODO 箱出库，并关联到此出库单下
+				}
+			},
+			// 货物出库
+			handlerDoOut() {
+				if (this.searchType === 3) {
 					uni.showModal({
 						title: '提示',
-						content: '当前货物未确认出库，请先点击下方出库按钮，出库当前货物！',
+						content: '请先扫出库单！',
 						showCancel: false,
 						confirmText: '确定'
 					});
 					return;
 				}
-				const checkData = {
-					production_packcode: data.originalCode,
-					shipment_num: this.outInfo.shipmentNum,
-					partnumber: this.material_id
-				};
-				//检查是否可以出货
-				WarehoseApi.checkProductionOut(checkData).then((res) => {
-					if (res.code === 200 && res.data) {
-						this.newMaterialList.push(data);
-					} else {
-						uni.showModal({
-							title: '提示',
-							content: '不可出库:' + res.msg,
-							showCancel: false,
-							confirmText: '确定'
-						});
+				if (this.newMaterialList.length === 0) {
+					uni.showModal({
+						title: '提示',
+						content: '当前未扫描货物！',
+						showCancel: false,
+						confirmText: '确定'
+					});
+					return;
+				}
+				uni.showModal({
+					title: '操作',
+					content: '是否确认执行出库操作?',
+					showCancel: true,
+					cancelText: '取消',
+					confirmText: '确认出库',
+					success: (res) => {
+						if (res.confirm) {
+							const data = {
+								shipmentNum: this.outInfo.shipmentNum,
+								patchCode: [this.newMaterialList[0].patchCode]
+							};
+							WarehoseApi.doMaterialOut(data).then((res) => {
+								if (res.code !== 200) {
+									uni.showModal({
+										title: '提示',
+										content: '出库异常',
+										showCancel: false,
+										confirmText: '确认'
+									});
+
+									return;
+								} else {
+									if (res.data.item1 == 100) {
+										uni.showModal({
+											title: '提示',
+											content: '此物料已经出库完成，不可以再出库',
+											showCancel: false,
+											confirmText: '确认'
+										});
+										this.newMaterialList = [];
+									} else if (res.data.item2 == 200) {
+										uni.showModal({
+											title: '提示',
+											content: '不是此物料最早批次，无法出库',
+											showCancel: false,
+											confirmText: '确认'
+										});
+										this.newMaterialList = [];
+									} else {
+										uni.showModal({
+											title: '提示',
+											content: '出库成功',
+											showCancel: false,
+											confirmText: '确认'
+										});
+										this.newMaterialList = [];
+									}
+								}
+							});
+						}
 					}
 				});
-				// 此时扫描的是箱号
-				// TODO 检查扫描的箱号零件号是否在此工单下
-				// let flag = false;
-				// let list = JSON.parse(JSON.stringify(this.outOrderPlan));
-				// for(let item of list){
-				// 	// 扫描箱的工单号与计划中的批次号对比，数字是否在其中
-				// 	if(!item.Patchcode){
-				// 		continue;
-				// 	}
-				// 	if(item.Patchcode.includes(data.workoderID)){
-				// 		flag = true;
-				// 		break;
-				// 	}
-				// }
-				// if(!flag){
-				// 	// 此箱号不在计划内
-				// 	uni.showModal({
-				// 		title: '提示',
-				// 		content: '当前货物不在出库单计划内，请扫其他货物！',
-				// 		showCancel: false,
-				// 		confirmText: '确定'
-				// 	});
-				// 	return;
-				// }
-				// TODO 箱出库，并关联到此出库单下
-			}
-		},
-		// 货物出库
-		handlerDoOut() {
-			if (this.searchType === 3) {
+			},
+			// 出库单完成
+			handlerSubmit() {
 				uni.showModal({
-					title: '提示',
-					content: '请先扫出库单！',
-					showCancel: false,
-					confirmText: '确定'
-				});
-				return;
-			}
-			if (this.newMaterialList.length === 0) {
-				uni.showModal({
-					title: '提示',
-					content: '当前未扫描货物！',
-					showCancel: false,
-					confirmText: '确定'
-				});
-				return;
-			}
-			uni.showModal({
-				title: '操作',
-				content: '是否确认执行出库操作?',
-				showCancel: true,
-				cancelText: '取消',
-				confirmText: '确认出库',
-				success: (res) => {
-					if (res.confirm) {
-						const data = {
-							shipmentNum: this.outInfo.shipmentNum,
-							patchCode: [this.newMaterialList[0].patchCode]
-						};
-						WarehoseApi.doMaterialOut(data).then((res) => {
-							if (res.code !== 200) {
-								uni.showModal({
-									title: '提示',
-									content: '出库异常',
-									showCancel: false,
-									confirmText: '确认'
-								});
-
-								return;
-							} else {
-								if (res.data.item1 == 100) {
+					title: '操作',
+					content: '是否确认执行出库单完成操作?完成后将不可继续出库！',
+					showCancel: true,
+					cancelText: '取消',
+					confirmText: '确认出库单完成',
+					success: (res) => {
+						if (res.confirm) {
+							//TODO 变更出库单状态
+							const data = {
+								shipmentNum: this.outInfo.shipmentNum
+							};
+							WarehoseApi.doOverOutorderplan(data).then((res) => {
+								if (res.code === 200) {
 									uni.showModal({
 										title: '提示',
-										content: '此物料已经出库完成，不可以再出库',
+										content: '此出库单已完成',
 										showCancel: false,
 										confirmText: '确认'
 									});
-									this.newMaterialList = [];
-								} else if (res.data.item2 == 200) {
-									uni.showModal({
-										title: '提示',
-										content: '不是此物料最早批次，无法出库',
-										showCancel: false,
-										confirmText: '确认'
-									});
-									this.newMaterialList = [];
+									this.clear();
 								} else {
 									uni.showModal({
 										title: '提示',
-										content: '出库成功',
+										content: '出库单完成异常！',
 										showCancel: false,
 										confirmText: '确认'
 									});
-									this.newMaterialList = [];
 								}
-							}
-						});
+							});
+						}
 					}
-				}
-			});
-		},
-		// 出库单完成
-		handlerSubmit() {
-			uni.showModal({
-				title: '操作',
-				content: '是否确认执行出库单完成操作?完成后将不可继续出库！',
-				showCancel: true,
-				cancelText: '取消',
-				confirmText: '确认出库单完成',
-				success: (res) => {
-					if (res.confirm) {
-						//TODO 变更出库单状态
-						const data = {
-							shipmentNum: this.outInfo.shipmentNum
-						};
-						WarehoseApi.doOverOutorderplan(data).then((res) => {
-							if (res.code === 200) {
-								uni.showModal({
-									title: '提示',
-									content: '此出库单已完成',
-									showCancel: false,
-									confirmText: '确认'
-								});
-								this.clear();
-							} else {
-								uni.showModal({
-									title: '提示',
-									content: '出库单完成异常！',
-									showCancel: false,
-									confirmText: '确认'
-								});
-							}
-						});
-					}
-				}
-			});
-		},
-		//取消
-		pick_cancel() {
-			this.show = false;
-		},
-		// 确认
-		pick_confirm(e) {
-			console.log(e.value);
-			this.material_id = e.value[0];
-			console.log(this.material_id);
-			this.show = false;
+				});
+			},
+			//取消
+			pick_cancel() {
+				this.show = false;
+			},
+			// 确认
+			pick_confirm(e) {
+				console.log(e.value);
+				this.material_id = e.value[0];
+				console.log(this.material_id);
+				this.show = false;
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style scoped>
-.title-box {
-	margin-top: 54px;
-	margin-bottom: 20px;
-	height: 60px;
-	font-size: 26px;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.warehoseInfo-box {
-	font-size: 20px;
-	width: 94%;
-	margin: 0 auto;
-	padding-left: 10px;
-	padding-right: 10px;
-	background-color: aliceblue;
-	border-radius: 10px;
-	display: flex;
-	flex-direction: column;
-}
-.warehoseInfo-box .row {
-	display: flex;
-	flex-direction: row;
-}
-.warehoseInfo-box .row .col {
-	width: 50%;
-}
-.aciton-box {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-}
-.color1 {
-	color: yellowgreen;
-}
-.color2 {
-	color: orange;
-}
-.pda-search-box {
-	margin-bottom: 5px;
-}
-.list-box {
-	width: 100%;
-}
-.scroll-view-title {
-	font-size: 24px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-.scroll-view-box {
-	width: 94%;
-	margin: 0 auto;
-	margin-top: 50px;
-	height: 360px;
-	padding: 10px;
-	background-color: rgba(179, 179, 179, 0.7);
-	border-radius: 5px;
-}
-.scroll-view-last {
-	width: 100%;
-	height: 60px;
-	font-size: 20px;
-	color: rgba(0, 9, 0, 0.7);
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	margin-top: 10px;
-	padding-left: 10px;
-	padding-right: 10px;
-	border-radius: 10px;
-	background-color: white;
-}
-.button-box {
-	width: 80%;
-	margin: 10px auto;
-	display: flex;
-	flex-direction: row;
-}
-</style>
+	.title-box {
+		/* margin-top: 54px; */
+		/* margin-bottom: 20px; */
+		font-size: 26px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.warehoseInfo-box {
+		width: 100%;
+		font-size: 20px;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.warehoseInfo-box .row {
+		display: flex;
+		flex-direction: row;
+	}
+
+	.warehoseInfo-box .row .col {
+		width: 50%;
+	}
+
+	.aciton-box {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.color1 {
+		color: yellowgreen;
+	}
+
+	.color2 {
+		color: orange;
+	}
+
+	.pda-search-box {
+		margin-bottom: 5px;
+	}
+
+	.list-box {
+		width: 100%;
+	}
+
+	.scroll-view-title {
+		font-size: 24px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.scroll-view-box {
+		width: 98%;
+		margin: 0 auto;
+		margin-top: 50px;
+		height: 200px;
+		padding: 10px;
+		background-color: rgba(179, 179, 179, 0.3);
+		border-radius: 5px;
+	}
+
+	.scroll-view-last {
+		width: 100%;
+		height: 60px;
+		font-size: 20px;
+		color: rgba(0, 9, 0, 0.7);
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		margin-top: 10px;
+		padding-left: 10px;
+		padding-right: 10px;
+		border-radius: 10px;
+		background-color: white;
+	}
+
+	.button-box {
+		width: 80%;
+		margin: 10px auto;
+		display: flex;
+		flex-direction: row;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/user.css b/pages/user/user.css
index e98dcfc..14c4e18 100644
--- a/pages/user/user.css
+++ b/pages/user/user.css
@@ -821,4 +821,8 @@ text {
 
 .out-button-box{
 	padding: 10px;
+}
+
+.card-box{
+	height: 40px !important;
 }
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
index f3678d4..a86a617 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -3,20 +3,15 @@
 		<view class="flex-col page">
 			<view class="flex-col justify-start relative section">
 				<view class="shrink-0 section_2"></view>
-				<u-avatar class="shrink-0 image pos" :showLoading="true" size="64px" src="/static/images/icon/app.png"
+				<u-avatar class="shrink-0 image pos" :showLoading="true" size="64px" :src="avatar"
 					@click="avatarClick"></u-avatar>
-				<text class="text pos_2">{{name}}</text>
-				<view class="flex-row  items-center section_3 pos_3">
-					<image class="image_2"
-						src="https://ide.code.fun/api/image?token=661f6554a17dbc0011549df2&name=e9f03cae38a2e6362ae08df54c42ba39.png" />
-					<text class="text_2">编辑资料</text>
-				</view>
+				<text class="text pos_2">{{nickName}}</text>
 				<view class="flex-row justify-between section_4 pos_4">
-					<text class="font">部门：工程师</text>
-					<text class="font">岗位：工程师</text>
+					<text class="font">部门：{{deptName}}</text>
+					<!-- <text class="font">手机号：{{userInfo.phonenumber}}</text> -->
 				</view>
 			</view>
-			<uni-card>
+			<uni-card class="card-box" is-shadow>
 				<u-grid :border="false" @click="gridClick" col="3">
 					<u-grid-item v-for="(baseListItem,baseListIndex) in gridList" :key="baseListIndex"
 						:name="baseListItem.url">
@@ -26,10 +21,9 @@
 				</u-grid>
 			</uni-card>
 			<u-cell-group>
-				<u-cell icon="setting-fill" title="个人设置"></u-cell>
-				<u-cell icon="integral-fill" title="会员等级" value="新版本"></u-cell>
-				<u-cell icon="setting-fill" title="个人设置"></u-cell>
-				<u-cell icon="integral-fill" title="会员等级" value="新版本"></u-cell>
+				<u-cell :iconStyle="{fontSize:'24px',color:'#2979ff'}" icon="server-man" title="问题反馈" isLink></u-cell>
+				<u-cell :iconStyle="{fontSize:'24px',color:'#909399'}" icon="setting-fill" title="个人设置" isLink></u-cell>
+				<u-cell :iconStyle="{fontSize:'24px',color:'#19be6b'}" icon="level" title="版本号" :value="version"></u-cell>
 			</u-cell-group>
 			<view class="out-button-box">
 				<u-modal :show="outLoginShow" title="退出登录" showCancelButton content='是否注销,并退出登录？'
@@ -55,33 +49,37 @@
 			// 使用对象展开运算符将 getter 混入 computed 对象中
 			...mapGetters([
 				'name',
+				'nickName',
+				'deptName',
 				'avatar',
 			])
 		},
 		onLoad() {
+			
 			console.log(this.name, this.avatar);
 		},
+		onShow() {
+			this.GetInfo();
+		},
 		data() {
 			return {
+				version:'V2.1.0',
 				outLoginShow: false,
-				userInfo: {
-
-				},
 				gridList: [{
 						name: 'photo',
 						title: 'agv',
 						url: '/pages/agv/agv'
 					},
-					{
-						name: 'lock',
-						title: '帮助',
-						url: ''
-					},
-					{
-						name: 'star',
-						title: '客服',
-						url: ''
-					},
+					// {
+					// 	name: 'lock',
+					// 	title: '帮助',
+					// 	url: ''
+					// },
+					// {
+					// 	name: 'star',
+					// 	title: '客服',
+					// 	url: ''
+					// },
 				]
 			};
 		},
diff --git a/store/getters.js b/store/getters.js
index 8854794..f6d9eea 100644
--- a/store/getters.js
+++ b/store/getters.js
@@ -2,6 +2,8 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  nickName: state => state.user.nickName,
+  deptName: state => state.user.deptName,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions
 }
diff --git a/store/modules/user.js b/store/modules/user.js
index 998f595..884d920 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -20,7 +20,9 @@ const user = {
 		name: storage.get(constant.name),
 		avatar: storage.get(constant.avatar),
 		roles: storage.get(constant.roles),
-		permissions: storage.get(constant.permissions)
+		permissions: storage.get(constant.permissions),
+		nickName: storage.get(constant.nickName),
+		deptName: storage.get(constant.deptName)
 	},
 
 	mutations: {
@@ -42,7 +44,15 @@ const user = {
 		SET_PERMISSIONS: (state, permissions) => {
 			state.permissions = permissions
 			storage.set(constant.permissions, permissions)
-		}
+		},
+		SET_NICKNAME: (state, nickName) => {
+			state.nickName = nickName
+			storage.set(constant.nickName, nickName)
+		},
+		SET_DEPTNAME: (state, deptName) => {
+			state.deptName = deptName
+			storage.set(constant.deptName, deptName)
+		},
 	},
 
 	actions: {
@@ -72,18 +82,23 @@ const user = {
 		}) {
 			return new Promise((resolve, reject) => {
 				getInfo().then(res => {
-					const user = res.user
+					const user = res.data.user
 					const avatar = (user == null || user.avatar == "" || user.avatar == null) ?
 						require("@/static/images/profile.jpg") : baseUrl + user.avatar
 					const username = (user == null || user.userName == "" || user.userName ==
 						null) ? "" : user.userName
-					if (res.roles && res.roles.length > 0) {
-						commit('SET_ROLES', res.roles)
-						commit('SET_PERMISSIONS', res.permissions)
+					const nickName = (user == null || user.nickName == "" || user.nickName ==
+						null) ? "" : user.nickName
+					const deptName = (user == null || user.deptName == "" || user.deptName ==
+						null) ? "" : user.deptName
+					if (user.roles && user.roles.length > 0) {
+						commit('SET_ROLES', user.roles)
+						commit('SET_PERMISSIONS', res.roleIds)
 					} else {
 						commit('SET_ROLES', ['ROLE_DEFAULT'])
 					}
-					console.log(res);
+					commit('SET_NICKNAME', user.nickName)
+					commit('SET_DEPTNAME', user.deptName)
 					commit('SET_NAME', username)
 					commit('SET_AVATAR', avatar)
 					resolve(res)
diff --git a/utils/constant.js b/utils/constant.js
index 8becd84..7d96994 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -2,7 +2,9 @@ const constant = {
    avatar: 'vuex_avatar',
    name: 'vuex_name',
    roles: 'vuex_roles',
-   permissions: 'vuex_permissions'
+   permissions: 'vuex_permissions',
+   nickName:'vuex_nickName',
+   deptName:'vuex_deptName'
  }
 
  export default constant