diff --git a/App.vue b/App.vue
index 09d3153..6efffeb 100644
--- a/App.vue
+++ b/App.vue
@@ -1,63 +1,119 @@
 <script>
-import config from './config';
-import store from '@/store';
-import { getToken } from '@/utils/auth';
+	import config from './config';
+	import store from '@/store';
+	import {
+		getToken
+	} from '@/utils/auth';
 
-export default {
-	onLaunch: function () {
-		this.initApp();
-	},
-	data() {
-		return {
-			width: '--width:300px;',
-			height: '--height:712px;'
-		};
-	},
-	methods: {
-		// 初始化应用
-		initApp() {
-			// 初始化应用配置
-			this.initConfig();
-			// 检查用户登录状态
-			//#ifdef H5
-			this.checkLogin();
-			//#endif
+	export default {
+		onLaunch: function() {
+			this.initApp();
 		},
-		initConfig() {
-			const _windowsWidth = uni.getWindowInfo().windowWidth;
-			const _windowsHeight = uni.getWindowInfo().windowHeight;
-			// console.log(_windowsWidth,_windowsHeight);
-			this.globalData.config = config;
-			// 设置页面初始大小
-			// this.'--width' = _windowsWidth + 'px;';
-			// this.'--height' =  (_windowsHeight - 50) + 'px;';
+		data() {
+			return {
+				width: '--width:300px;',
+				height: '--height:712px;'
+			};
 		},
-		checkLogin() {
-			if (!getToken()) {
-				this.$tab.reLaunch('/pages/login');
+		methods: {
+			// 初始化应用
+			initApp() {
+				// 初始化应用配置
+				this.initConfig();
+				// 检查用户登录状态
+				//#ifdef H5
+				this.checkLogin();
+				//#endif
+			},
+			initConfig() {
+				const _windowsWidth = uni.getWindowInfo().windowWidth;
+				const _windowsHeight = uni.getWindowInfo().windowHeight;
+				// console.log(_windowsWidth,_windowsHeight);
+				this.globalData.config = config;
+				// 设置页面初始大小
+				// this.'--width' = _windowsWidth + 'px;';
+				// this.'--height' =  (_windowsHeight - 50) + 'px;';
+			},
+			checkLogin() {
+				if (!getToken()) {
+					this.$tab.reLaunch('/pages/login');
+				}
 			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
-@import '@/uni_modules/uview-ui/index.scss';
-.content {
-	display: flex;
-	flex-direction: column;
-	background-image: linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)), url('static/images/background/background.png');
-	background-size: cover;
-	//filter: opacity(50%);
-	font-size: 36px;
-	font-weight: 700;
-	width: 360px;
-	height: 662px;
-}
-.main-box {
-	width: 100%;
-	height: 100%;
-}
-@import '@/static/scss/index.scss';
+	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
+	@import '@/uni_modules/uview-ui/index.scss';
+
+	/* 无顶部nav无tab通用主容器 可使用高度 */
+	.common-container {
+		width: 360px;
+		height: 712px;
+		background-color: white;
+	}
+
+	/* 存在顶部nav与tab通用主容器 可使用高度 */
+	.common-nav-container {
+		width: 360px;
+		height: 644px;
+		background-color: white;
+	}
+
+	/* 通用测试边框 */
+	.border {
+		border: 1px solid black;
+	}
+
+	.content {
+		display: flex;
+		flex-direction: column;
+		background-image: linear-gradient(rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0.1)), url('static/images/background/background.png');
+		background-size: cover;
+		//filter: opacity(50%);
+		font-size: 36px;
+		font-weight: 700;
+		width: 360px;
+		height: 662px;
+	}
+
+	.main-box {
+		width: 100%;
+		height: 100%;
+	}
+
+	.gap-5 {
+		margin: 0;
+		padding: 0;
+		width: 5px;
+		height: 5px;
+		background-color: transparent;
+	}
+
+	.gap-10 {
+		margin: 0;
+		padding: 0;
+		width: 10px;
+		height: 10px;
+		background-color: transparent;
+	}
+
+	.gap-20 {
+		margin: 0;
+		padding: 0;
+		width: 20px;
+		height: 20px;
+		background-color: transparent;
+	}
+
+	.gap-40 {
+		margin: 0;
+		padding: 0;
+		width: 40px;
+		height: 40px;
+		background-color: transparent;
+	}
+
+	@import '@/static/scss/index.scss';
 </style>
\ No newline at end of file
diff --git a/components/material-item/material-item.vue b/components/material-item/material-item.vue
index 1fc7441..b87d7ee 100644
--- a/components/material-item/material-item.vue
+++ b/components/material-item/material-item.vue
@@ -1,50 +1,53 @@
 <template>
 	<view class="material-box">
-		<view class="title left">{{materialInfo.packageCode}}</view>
-		<view class="title right">{{materialInfo.entryWarehouseTime}}</view>
+		<uni-card :title="materialInfo.patchCode" :is-full="true">
+			<template v-slot:extra>
+				<u-tag v-if="index===0" text="主箱" plain size="mini" type="error"></u-tag>
+				<u-tag v-else text="次箱" plain size="mini" type="info"></u-tag>
+			</template>
+		</uni-card>
+
+		<!-- 		<view class="title left">{{materialInfo.patchCode}}</view>
+		<view class="title right">{{materialInfo.productionTime}}</view> -->
 	</view>
 </template>
 
 <script>
 	export default {
-		name:"material-item",
-		props:{
-			materialInfo:{
-				default:{
-					packageCode:'未知货物',
-					entryWarehouseTime:'未知入库时间'
+		name: "material-item",
+		props: {
+			index: {
+				default: -1,
+			},
+			materialInfo: {
+				default: {
+					// 原始编码
+					originalCode: "",
+					// 批次号
+					patchCode: "",
+					// 班组
+					team: "",
+					// 零件号
+					partNumner: "",
+					// 工单号
+					workoderID: "",
+					// 数量
+					quantity: 0,
+					//生产时间
+					productionTime: "",
+					// 产品描述
+					productionDescribe: ""
 				}
+			},
+			data() {
+				return {
+
+				};
 			}
 		},
-		data() {
-			return {
-				
-			};
-		}
 	}
 </script>
 
 <style scoped>
-.material-box{
-	width: 100%;
-	height: 100px;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-top: 10px;
-	padding-left: 10px;
-	padding-right: 10px;
-	border-radius: 10px;
-}
-.material-box .title{
-	font-size: 20px;
-	font-weight: 600;
-}
-.right{
-	text-align: right;
-}
-.material-box .time{
-	font-size: 16px;
-	font-weight: 600;
-}
+	.material-box {}
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index b22c19a..310d015 100644
--- a/pages.json
+++ b/pages.json
@@ -1,13 +1,12 @@
 {
 	"globalStyle": {
-		"navigationBarTextStyle": "black",
+		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "DOAN",
-		"navigationBarBackgroundColor": "#FFFFFF"
-
+		"navigationBarBackgroundColor": "#2b85e4"
 	},
 	"tabBar": {
-		"color": "#7A7E83",
-		"selectedColor": "#3cc51f",
+		"color": "#8a8a8a",
+		"selectedColor": "#409eff",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
@@ -17,10 +16,10 @@
 				"text": "仓库"
 			},
 			{
-				"pagePath": "pages/agv/agv",
-				"iconPath": "static/images/tabbar/work.png",
-				"selectedIconPath": "static/images/tabbar/work_.png",
-				"text": "AGV"
+				"pagePath": "pages/user/user",
+				"iconPath": "static/images/tabbar/mine.png",
+				"selectedIconPath": "static/images/tabbar/mine_.png",
+				"text": "用户"
 			}
 		]
 	},
@@ -33,8 +32,8 @@
 		}, {
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "DOAN",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "DOAN"
+				// "navigationStyle": "custom"
 			}
 		},
 		{
@@ -138,6 +137,31 @@
 				"navigationBarTitleText" : "货物详情",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/consolidation/consolidation",
+			"style" : 
+			{
+				"navigationBarTitleText" : "拼箱",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/menuChouse/menuChouse",
+			"style" : 
+			{
+				"navigationBarTitleText" : "功能选择",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/user/user",
+			"style" : 
+			{
+				"navigationBarTitleText" : "用户中心",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh" : false
+			}
 		}
 	]
 
diff --git a/pages/agv/agv.vue b/pages/agv/agv.vue
index f8d23c9..a3f0b94 100644
--- a/pages/agv/agv.vue
+++ b/pages/agv/agv.vue
@@ -25,6 +25,10 @@
 						name: '出料',
 						icon: 'upload-filled'
 					},
+					// {
+					// 	name: '出料',
+					// 	icon: 'upload-filled'
+					// },
 
 				]
 			}
diff --git a/pages/consolidation/consolidation.vue b/pages/consolidation/consolidation.vue
new file mode 100644
index 0000000..c110b21
--- /dev/null
+++ b/pages/consolidation/consolidation.vue
@@ -0,0 +1,304 @@
+<template>
+	<view class="content">
+		<view class="title-box">
+			<!-- <span class="title-text">拼箱</span> -->
+			<view class="warehoseInfo-box">
+				<view class="row">
+					<span class="col">已扫货物数：{{ quantityTotal }}</span>
+					<span class="col">已扫箱数：{{ newMaterialList.length }}</span>
+				</view>
+				<view>
+					<view v-if="searchType === 2" class="color2 aciton-box">操作指示-请扫货物码</view>
+					<!-- 扫描操作 -->
+					<view class="pda-search-box">
+						<PdaScanInput @getInfo="handleGetInfo" :type="searchType" :hasFocus="false"></PdaScanInput>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 货物列表 -->
+		<view class="scroll-view-box">
+			<view class="scroll-view-title">拼箱清单</view>
+			<scroll-view class="scroll-view-box" :scroll-y="true">
+				<view v-for="(item, index) in newMaterialList">
+					<materialItem style="background-color: whitesmoke" :index="index" :materialInfo="item" @click.native="handleDeleteItem(item, index)"></materialItem>
+				</view>
+			</scroll-view>
+			<!-- <packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard> -->
+		</view>
+		<!-- 底部按钮 -->
+		<view class="button-box">
+			<button type="default" @click="clear">清空</button>
+			<button type="default" @click="handlerSubmit">拼箱</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';
+import * as GoodsNowApi from '@/api/warehouse/wmGoodsNowProduction.js';
+// 拼箱
+export default {
+	components: {
+		materialItem,
+		packageCard
+	},
+	data() {
+		return {
+			loading: false,
+			// 双击判定
+			touchNum: 0,
+			clearData: {},
+			// 货物信息
+			packageInfo: {
+				// id
+				id: '',
+				// 工单号
+				workoderID: '',
+				// 批次号(工单号+箱号+班组)
+				patchCode: '',
+				// 零件号
+				partNumner: '',
+				// 标签数量
+				goodsNumLogic: 0,
+				// 盘点数量（实际）
+				goodsNumAction: 0,
+				// 描述
+				productionDescribe: '',
+				// 出厂日期/生产日期
+				productionTime: '',
+				// 此箱数量
+				quantity: 0
+			},
+			// 新录入货物信息
+			newMaterialList: [],
+			// 1-仓库扫码 2-货物扫码 3-出货单扫码
+			searchType: 2
+		};
+	},
+	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;
+		}
+	},
+	methods: {
+		init() {
+			// 需要展示的参数：【零件号[物料号](35233201041) 描述(鲨鱼鳍)  箱号+班组(BNW240312023_18B1) 数量 时间 】
+			// 初始化，并且清空数据
+			this.clearData.packageInfo = JSON.parse(JSON.stringify(this.packageInfo));
+			this.clearData.newMaterialList = JSON.parse(JSON.stringify(this.newMaterialList));
+			this.searchType = 2;
+		},
+		clear() {
+			this.packageInfo = JSON.parse(JSON.stringify(this.clearData.packageInfo));
+			this.newMaterialList = JSON.parse(JSON.stringify(this.clearData.newMaterialList));
+			this.searchType = 2;
+		},
+		// 长按弹出删除
+		handleDeleteItem(item, index) {
+			// 双击判定
+			this.touchNum++;
+			setTimeout(() => {
+				if (this.touchNum >= 2) {
+					uni.showModal({
+						title: '删除提示',
+						content: '是否从拼箱列表中删除此货物?',
+						showCancel: true,
+						cancelText: '取消',
+						confirmText: '删除',
+						success: (res) => {
+							if (res.confirm) {
+								this.newMaterialList.splice(index, 1);
+							}
+						}
+					});
+				}
+				this.touchNum = 0;
+			}, 250);
+		},
+		// 扫码信息录入
+		handleGetInfo(data, type) {
+			if (type === 2) {
+				// 此时扫描的是箱号
+				// if (this.newMaterialList.length > 1) {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		content: '盘点仅支持单个货物盘点',
+				// 		showCancel: false,
+				// 		confirmText: '确定'
+				// 	});
+				// 	return;
+				// }
+				const checkData = {
+					originalCode: data.originalCode
+				};
+				// 是否在库
+				WarehoseApi.isExistedWarehouse(checkData).then((res) => {
+					if (res.code !== 200 || !res.data) {
+						uni.showModal({
+							title: '提示',
+							content: '货物异常或未入库！',
+							showCancel: false,
+							confirmText: '确定'
+						});
+						return;
+					}
+					this.newMaterialList.push(data);
+					const searchInfoData = {
+						patchCode: data.patchCode
+					};
+					// 获取解析结果
+					WarehoseApi.getInfoByPatchCode(searchInfoData).then((res) => {
+						if (res.code === 200) {
+							this.packageInfo = res.data;
+						} else {
+							uni.showModal({
+								title: '提示',
+								content: '货物数据异常',
+								showCancel: false,
+								confirmText: '确定'
+							});
+							return;
+						}
+					});
+				});
+			}
+		},
+		// 点击拼箱
+		handlerSubmit() {
+			uni.showModal({
+				title: '操作',
+				content: '是否确认此修改',
+				showCancel: true,
+				cancelText: '取消',
+				confirmText: '拼箱',
+				success: (res) => {
+					if (res.confirm) {
+						let data = {
+							id: this.packageInfo.id,
+							goodsNumAction: this.packageInfo.goodsNumAction
+						};
+						// GoodsNowApi.updateWmGoodsNowProduction(data).then((res) => {
+						// 	if (res.code === 200) {
+						// 		uni.showModal({
+						// 			title: '提示',
+						// 			content: '盘点已完成',
+						// 			showCancel: false,
+						// 			confirmText: '确认'
+						// 		});
+						// 		this.clear();
+						// 	} else {
+						// 		uni.showToast({
+						// 			icon: 'error',
+						// 			title: '盘点失败！'
+						// 		});
+						// 	}
+						// });
+					}
+				}
+			});
+		}
+	}
+};
+</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;
+}
+.changeInput {
+	font-size: 20px;
+	background-color: gainsboro;
+	border:1px solid grey;
+}
+</style>
diff --git a/pages/demo/demo.vue b/pages/demo/demo.vue
index e0dbc6e..727aaf2 100644
--- a/pages/demo/demo.vue
+++ b/pages/demo/demo.vue
@@ -6,15 +6,19 @@
 
 <script>
 	import packageCard from '@/components/package-card/package-card.vue'
-export default {
-	components: {
-		packageCard
-	},
-	data() {
-		return {};
-	},
-	methods: {}
-};
+	export default {
+		components: {
+			packageCard
+		},
+		mounted() {
+			// console.log('屏幕宽度', uni.getWindowInfo().screenWidth)
+			// console.log('可用高度', uni.getWindowInfo().windowHeight)
+		},
+		data() {
+			return {};
+		},
+		methods: {}
+	};
 </script>
 
-<style></style>
+<style></style>
\ No newline at end of file
diff --git a/pages/inWarehouse/inWarehouse.vue b/pages/inWarehouse/inWarehouse.vue
index f47f7b8..ac0d8b6 100644
--- a/pages/inWarehouse/inWarehouse.vue
+++ b/pages/inWarehouse/inWarehouse.vue
@@ -13,8 +13,8 @@
 					<span class="col">总箱数：{{ newMaterialList.length }}</span>
 				</view>
 				<view>
-					<view v-if="searchType === 1" class="color1 aciton-box">操作指示-请扫仓库码</view>
-					<view v-if="searchType === 2" class="color2 aciton-box">操作指示-请扫货物码</view>
+					<view v-if="searchType === 1" class="color1 aciton-box">请扫仓库码</view>
+					<view v-if="searchType === 2" class="color2 aciton-box">请扫箱码</view>
 					<!-- 扫描操作 -->
 					<view class="pda-search-box">
 						<PdaScanInput @getInfo="handleGetInfo" :type="searchType" :warehouseInfo="warehouseInfo"></PdaScanInput>
diff --git a/pages/index/index-backups.vue b/pages/index/index-backups.vue
new file mode 100644
index 0000000..31c520d
--- /dev/null
+++ b/pages/index/index-backups.vue
@@ -0,0 +1,207 @@
+<template>
+	<view class="content background">
+		<view>
+			<u-notice-bar text="上海干巷车镜实业有限公司是上海市高新技术企业、上海市文明单位、上海市优秀企业形象单位、国家汽车零部件出口基地企业。"></u-notice-bar>
+			<image src="@/static/images/banner/banber.jpg" class="title-box"></image>
+		</view>
+
+		<view class="grid-box">
+			<uni-grid :column="3" @change="gridCheck" :showBorder="false" :highlight="false">
+				<uni-grid-item v-for="(item, index) in gridItemList" :index="item.index">
+					<view class="item">
+						<uni-icons :type="item.icon" :size="40" color="#00aaff" />
+						<text class="text">{{ item.name }}</text>
+					</view>
+				</uni-grid-item>
+			</uni-grid>
+		</view>
+		<!-- 扫描操作 -->
+		<!-- <view>
+			<PdaScanInput @getInfo="handleWareHouseChange"></PdaScanInput>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				gridItemList: [{
+						name: '入库',
+						icon: 'download-filled',
+						index: 1
+					},
+					{
+						name: '出库',
+						icon: 'upload-filled',
+						index: 2
+					},
+					{
+						name: '盘点',
+						icon: 'wallet-filled',
+						index: 3
+					},
+					// {
+					// 	name: '移库',
+					// 	icon: 'cart-filled',
+					// 	index: 4
+					// },
+					// {
+					// 	name: '退库',
+					// 	icon: 'undo-filled',
+					// 	index: 5
+					// },
+					{
+						name: '拼箱',
+						icon: 'folder-add-filled',
+						index: 6
+					},
+					// {
+					// 	name: '拆箱',
+					// 	icon: 'folder-add-filled',
+					// 	index: 6
+					// },
+					{
+						name: '货物查看',
+						icon: 'eye-filled',
+						index: 7
+					},
+					// {
+					// 	name: '入库记录',
+					// 	icon: 'list',
+					// 	index: 8
+					// },
+					// {
+					// 	name: '出库记录',
+					// 	icon: 'list',
+					// 	index: 9
+					// },
+					{
+						name: '注销',
+						icon: 'redo-filled',
+						index: 10
+					}
+				]
+			};
+		},
+		onLoad: function() {},
+		mounted() {
+			// setInterval(function () {
+			// 	uni.hideKeyboard(); //隐藏软键盘
+			// 	// plus.key.hideSoftKeybord();
+			// }, 60);
+		},
+
+		methods: {
+			gridCheck(item) {
+				const index = item.detail?.index;
+				switch (index) {
+					case 1:
+						uni.navigateTo({
+							url: '/pages/inWarehouse/inWarehouse'
+						});
+						break;
+					case 2:
+						uni.navigateTo({
+							url: '/pages/outWarehouse/outWarehouse'
+						});
+						break;
+					case 3:
+						uni.navigateTo({
+							url: '/pages/stocktake/stocktake'
+						});
+						break;
+					case 4:
+						uni.navigateTo({
+							url: '/pages/relocation/relocation'
+						});
+						break;
+					case 5:
+						uni.navigateTo({
+							url: '/pages/returnWarehose/returnWarehose'
+						});
+						break;
+					case 6:
+						// 拼箱
+						uni.navigateTo({
+							url: '/pages/consolidation/consolidation'
+						});
+						break;
+					case 7:
+						// 货物查看
+						uni.navigateTo({
+							url: '/pages/watchGoods/watchGoods'
+						});
+						break;
+					case 8:
+						break;
+					case 9:
+						break;
+					case 10:
+						// 注销
+						uni.showModal({
+							title: '注销',
+							content: '是否注销当前账户?',
+							showCancel: true,
+							cancelText: '取消',
+							confirmText: '注销',
+							success: (res) => {
+								if (res.confirm) {
+									uni.reLaunch({
+										url: '/pages/login/login'
+									});
+								}
+							}
+						});
+						break;
+					default:
+						break;
+				}
+			},
+			handleWareHouseChange(data) {
+				uni.showToast({
+					title: '扫描成功',
+					icon: 'success'
+				});
+				// console.log('handleWareHouseChange', data);
+			}
+		}
+	};
+</script>
+
+<style scoped>
+	@import url('index.css');
+	.background {
+		margin-top: 20px;
+		height: 692px;
+		/* background-color: #4671d5; */
+	}
+	
+	.title-box {
+		width: 100%;
+		height: 150px;
+	}
+	
+	.grid-box {
+		width: 100%;
+		height: 100%;
+	}
+	
+	.grid-box .item {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+	
+	.item {
+		background-color: rgba(128, 128, 128, 0.5);
+	}
+	
+	.text {
+		font-size: 24px;
+		color: white;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.scss b/pages/index/index.scss
new file mode 100644
index 0000000..62959bc
--- /dev/null
+++ b/pages/index/index.scss
@@ -0,0 +1,34 @@
+.gap{
+	border-radius: ;
+}
+.home-container {
+	width: 360px;
+	height: 594px;
+	background-color: white;
+}
+.home-banner-box {
+	width: 360px;
+	height: 180px;
+}
+.home-button-box{
+	padding: 20px;
+	width: 360px;
+	height: 310px;
+}
+.home-button-action:active{
+	border: 1px solid #b6b6b6;
+	opacity: .70;
+}
+.box-1{
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	
+}
+.box-2{
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+}
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 538402e..723444d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,212 +1,179 @@
 <template>
-	<view class="content background">
-		<view>
-			<u-notice-bar text="上海干巷车镜实业有限公司是上海市高新技术企业、上海市文明单位、上海市优秀企业形象单位、国家汽车零部件出口基地企业。"></u-notice-bar>
-			<image src="@/static/images/banner/banber.jpg" class="title-box"></image>
+	<view class="home-container">
+		<!-- 顶部图片 -->
+		<view class="home-banner-box">
+			<u--image :showLoading="true" src="/static/images/ui/home-banner.png" width="360px"
+				height="180px"></u--image>
 		</view>
-
-		<view class="grid-box">
-			<uni-grid :column="3" @change="gridCheck" :showBorder="false" :highlight="false">
-				<uni-grid-item v-for="(item, index) in gridItemList" :index="index + 1">
-					<view class="item">
-						<uni-icons :type="item.icon" :size="40" color="#00aaff" />
-						<text class="text">{{ item.name }}</text>
+		<!-- 按钮区域 -->
+		<view class="home-button-box">
+			<u-row>
+				<u-col span="3">
+					<u-row>
+						<view :style="[$u.addStyle(buttonData[0].style)]" class="box-1 home-button-action"
+							@click="toMenuChouse(0)">
+							<u-icon :name="buttonData[0].icon" :color="buttonData[0].style.color" size="100"></u-icon>
+							<text>{{buttonData[0].text}}</text>
+						</view>
+						<view class="gap-10"></view>
+					</u-row>
+				</u-col>
+				<u-col span="9">
+					<view>
+						<u-row>
+							<u-col span="6">
+								<view :style="[$u.addStyle(buttonData[1].style)]" class="box-1 home-button-action"
+									@click="toMenuChouse(1)">
+									<u-icon :name="buttonData[1].icon" :color="buttonData[1].style.color"
+										size="100"></u-icon>
+									<text>{{buttonData[1].text}}</text>
+								</view>
+							</u-col>
+							<u-col span="6">
+								<view :style="[$u.addStyle(buttonData[2].style)]" class="box-1 home-button-action"
+									@click="toMenuChouse(2)">
+									<u-icon :name="buttonData[2].icon" :color="buttonData[2].style.color"
+										size="100"></u-icon>
+									<text>{{buttonData[2].text}}</text>
+								</view>
+							</u-col>
+						</u-row>
+						<view class="gap-10"></view>
+						<u-row>
+							<u-col span="12">
+								<view :style="[$u.addStyle(buttonData[3].style)]" class="box-2 home-button-action"
+									@click="toMenuChouse(3)">
+									<u-icon :name="buttonData[3].icon" :color="buttonData[3].style.color"
+										size="100"></u-icon>
+									<view class="gap-10"></view>
+									<text>{{buttonData[3].text}}</text>
+								</view>
+							</u-col>
+						</u-row>
 					</view>
-				</uni-grid-item>
-			</uni-grid>
+
+				</u-col>
+			</u-row>
+			<view class="gap-10"></view>
+			<u-row>
+				<u-col span="12">
+					<view :style="[$u.addStyle(buttonData[4].style)]" class="box-2 home-button-action"
+						@click="toMenuChouse(4)">
+						<u-icon :name="buttonData[4].icon" :color="buttonData[4].style.color" size="100"></u-icon>
+						<view class="gap-10"></view>
+						<text>{{buttonData[4].text}}</text>
+					</view>
+				</u-col>
+			</u-row>
 		</view>
-		<!-- 扫描操作 -->
-		<!-- <view>
-			<PdaScanInput @getInfo="handleWareHouseChange"></PdaScanInput>
-		</view> -->
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			gridItemList: [
-				{
-					name: '入库',
-					icon: 'download-filled',
-					index: 0
-				},
-				{
-					name: '出库',
-					icon: 'upload-filled',
-					index: 1
-				},
-				{
-					name: '盘点',
-					icon: 'wallet-filled',
-					index: 2
-				},
-				{
-					name: '移库',
-					icon: 'cart-filled',
-					index: 3
-				},
-				{
-					name: '退库',
-					icon: 'undo-filled',
-					index: 4
-				},
-				{
-					name: '拼箱',
-					icon: 'folder-add-filled',
-					index: 5
-				},
-				{
-					name: '拆箱',
-					icon: 'folder-add-filled',
-					index: 6
-				},
-				{
-					name: '货物查看',
-					icon: 'eye-filled',
-					index: 7
-				},
-				{
-					name: '入库记录',
-					icon: 'list',
-					index: 8
-				},
-				{
-					name: '出库记录',
-					icon: 'list',
-					index: 9
-				},
-				{
-					name: '注销',
-					icon: 'redo-filled',
-					index: 10
-				}
-			]
-		};
-	},
-	onLoad: function () {},
-	mounted() {
-		// setInterval(function () {
-		// 	uni.hideKeyboard(); //隐藏软键盘
-		// 	// plus.key.hideSoftKeybord();
-		// }, 60);
-	},
-
-	methods: {
-		gridCheck(item) {
-			const index = item.detail?.index;
-			switch (index) {
-				case 1:
-					uni.navigateTo({
-						url: '/pages/inWarehouse/inWarehouse'
-					});
-					break;
-				case 2:
-					uni.navigateTo({
-						url: '/pages/outWarehouse/outWarehouse'
-					});
-					break;
-				case 3:
-					uni.navigateTo({
-						url: '/pages/stocktake/stocktake'
-					});
-					break;
-				case 4:
-					uni.navigateTo({
-						url: '/pages/relocation/relocation'
-					});
-					break;
-				case 5:
-					uni.navigateTo({
-						url: '/pages/returnWarehose/returnWarehose'
-					});
-					break;
-				case 6:
-					//TODO 拼箱
-					// uni.navigateTo({
-					// 	url: '/pages/returnWarehose/returnWarehose'
-					// });
-					break;
-				case 7:
-
-				case 8:
-					//货物查看
-					uni.navigateTo({
-						url: '/pages/watchGoods/watchGoods'
-					});
-					break;
-				case 9:
-					// 货物查看
-					// uni.navigateTo({
-					// 	url: '/pages/returnWarehose/returnWarehose'
-					// });
-					break;
-				case 11:
-					// 注销
-					uni.showModal({
-						title: '注销',
-						content: '是否注销当前账户?',
-						showCancel: true,
-						cancelText: '取消',
-						confirmText: '注销',
-						success: (res) => {
-							if (res.confirm) {
-								uni.reLaunch({
-									url: '/pages/login/login'
-								});
-							}
+	import {
+		mapActions
+	} from 'vuex'
+	export default {
+		data() {
+			return {
+				// 页面按钮参数
+				buttonData: [{
+						index: 0,
+						text: '入库',
+						icon: '/static/images/icon/入库.svg',
+						style: {
+							width: '80px',
+							height: '180px',
+							fontSize: '20px',
+							backgroundImage: 'linear-gradient(to bottom right, #fe9a9c 0%, #fe7a7c 100%)',
+							color: 'white',
+							borderRadius: '10px'
 						}
-					});
+					},
+					{
+						index: 1,
+						text: '移库',
+						icon: '/static/images/icon/移库.svg',
+						style: {
+							width: '110px',
+							height: '90px',
+							fontSize: '20px',
+							backgroundImage: 'linear-gradient(to bottom right, #fdb886 0%, #fdad6d 100%)',
+							color: 'white',
+							borderRadius: '10px'
+						}
+					},
+					{
+						index: 2,
+						text: '盘点',
+						icon: '/static/images/icon/盘点.svg',
+						style: {
 
-					break;
-				default:
-					break;
-			}
+							width: '110px',
+							height: '90px',
+							fontSize: '20px',
+							backgroundImage: 'linear-gradient(to bottom right, #67e5f5 0% , #52cee2 100%)',
+							color: 'white',
+							borderRadius: '10px'
+						}
+					},
+					{
+						index: 3,
+						text: '出库',
+						icon: '/static/images/icon/出库.svg',
+						style: {
+							width: '100%',
+							height: '80px',
+							fontSize: '20px',
+							backgroundImage: 'linear-gradient(to bottom right, #a4a1f9 0%, #8180f9 100%)',
+							color: 'white',
+							borderRadius: '10px'
+						}
+					},
+					{
+						index: 4,
+						text: '仓库管理',
+						icon: '/static/images/icon/仓库管理.svg',
+						style: {
+							width: '100%',
+							height: '80px',
+							fontSize: '20px',
+							backgroundImage: 'linear-gradient(to bottom right, #59affe 0%, #4d92fe 100%)',
+							color: 'white',
+							borderRadius: '10px'
+						}
+					}
+				]
+			};
 		},
-		handleWareHouseChange(data) {
-			uni.showToast({
-				title: '扫描成功',
-				icon: 'success'
-			});
-			// console.log('handleWareHouseChange', data);
+		onLoad: function() {
+			this.GetInfo();
+		},
+		mounted() {
+			// console.log('屏幕宽度', uni.getWindowInfo().screenWidth)
+			// console.log('可用高度', uni.getWindowInfo().windowHeight)
+		},
+
+		methods: {
+			...mapActions([
+				'LogOut',
+				'GetInfo'
+			]),
+			toMenuChouse(type) {
+				uni.navigateTo({
+					url: '/pages/menuChouse/menuChouse',
+					success: function(res) {
+						// 向按钮列表页传递消息
+						res.eventChannel.emit('setMenuType', {
+							data: type
+						})
+					}
+				});
+			},
 		}
-	}
-};
+	};
 </script>
 
-<style scoped>
-.background {
-	margin-top: 20px;
-	height: 692px;
-	/* background-color: #4671d5; */
-}
-
-.title-box {
-	width: 100%;
-	height: 150px;
-}
-
-.grid-box {
-	width: 100%;
-	height: 100%;
-}
-
-.grid-box .item {
-	width: 100%;
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-
-.item {
-	background-color: rgba(128, 128, 128, 0.5);
-}
-
-.text {
-	font-size: 24px;
-	color: white;
-}
-</style>
+<style lang="scss" scoped>
+	@import url('index.scss');
+</style>
\ No newline at end of file
diff --git a/pages/login/login-backups.vue b/pages/login/login-backups.vue
new file mode 100644
index 0000000..4736cfe
--- /dev/null
+++ b/pages/login/login-backups.vue
@@ -0,0 +1,272 @@
+<template>
+	<view class="normal-login-container">
+		<u-no-network></u-no-network>
+		<view class="logo-content align-center justify-center flex">
+			<image style="width: 100rpx; height: 100rpx" src="@/static/images/icon/icon1.png" mode="widthFix"></image>
+			<text class="title" style="color: #10298D;">WMS-移动端</text>
+		</view>
+		<view class="login-form-content">
+			<view class="input-item flex align-center">
+				<view class="iconfont icon-user icon"></view>
+				<input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
+			</view>
+			<view class="input-item flex align-center">
+				<view class="iconfont icon-password icon"></view>
+				<input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
+			</view>
+			<view class="input-item flex align-center">
+				<input v-model="BaseUrl" type="text" class="input" placeholder="请输入连接地址如127.0.0.1:8888"
+					@confirm="handlerBaseUrlConfirm" />
+			</view>
+			<view class="input-item flex align-center" style="width: 60%; margin: 0px" v-if="captchaEnabled">
+				<view class="iconfont icon-code icon"></view>
+				<input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
+				<view class="login-code">
+					<image :src="codeUrl" @click="getCode" class="login-code-img"></image>
+				</view>
+			</view>
+			<view class="action-btn">
+				<button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
+			</view>
+			<view class="reg text-center" v-if="register">
+				<text class="text-grey1">没有账号？</text>
+				<text @click="handleUserRegister" class="text-blue">立即注册</text>
+			</view>
+			<view class="xieyi text-center">
+				<text class="text-white">登录即代表同意</text>
+				<text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
+				<text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getCodeImg
+	} from '@/api/login';
+	import {
+		getToken,
+		setToken,
+		removeToken
+	} from '@/utils/auth';
+	import {
+		getBaseUrl,
+		setBaseUrl,
+		removeBaseUrl
+	} from '@/utils/baseUrl';
+	import config from '@/config';
+	export default {
+		data() {
+			return {
+				codeUrl: '',
+				captchaEnabled: false,
+				// 用户注册开关
+				register: false,
+				globalConfig: getApp().globalData.config,
+				BaseUrl: '127.0.0.1:8888',
+				loginForm: {
+					username: 'admin',
+					password: '123456',
+					code: '',
+					uuid: ''
+				}
+			};
+		},
+		created() {
+			this.init();
+			this.getCode();
+		},
+		methods: {
+			init() {
+				// 初始化链接地址设计
+				let baseUrl = getBaseUrl();
+				if (!baseUrl) {
+					baseUrl = '192.168.60.251:8888';
+					setBaseUrl(baseUrl);
+				}
+				this.BaseUrl = baseUrl;
+			},
+			// 用户注册
+			handleUserRegister() {
+				this.$tab.redirectTo(`/pages/register`);
+			},
+			// 隐私协议
+			handlePrivacy() {
+				// let site = this.globalConfig.appInfo.agreements[0];
+				// this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`);
+			},
+			// 用户协议
+			handleUserAgrement() {
+				// let site = this.globalConfig.appInfo.agreements[1];
+				// this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`);
+			},
+			// 获取图形验证码
+			getCode() {
+				getCodeImg().then((res) => {
+					if (res.code !== 200) {
+						uni.showToast({
+							title: '获取验证码失败！请检查网络！',
+							icon: 'error'
+						});
+						return;
+					}
+					const result = res.data;
+					if (result.captchaOff === 'off') {
+						this.captchaEnabled = false;
+						return;
+					} else {
+						this.captchaEnabled = true;
+					}
+					this.codeUrl = 'data:image/gif;base64,' + result.img;
+					this.loginForm.uuid = result.uuid;
+				});
+			},
+			// 登录方法
+			async handleLogin() {
+				// debug快速登录
+				if (this.loginForm.username === 'debug') {
+					setToken('123');
+					this.$tab.reLaunch('/pages/index/index');
+					return;
+				}
+				if (this.loginForm.username === '') {
+					this.$modal.msgError('请输入您的账号');
+				} else if (this.loginForm.password === '') {
+					this.$modal.msgError('请输入您的密码');
+				} else if (this.loginForm.code === '' && this.captchaEnabled) {
+					this.$modal.msgError('请输入验证码');
+				} else {
+					this.$modal.loading('登录中，请耐心等待...');
+					this.pwdLogin();
+				}
+			},
+			// 密码登录
+			async pwdLogin() {
+				this.$store
+					.dispatch('Login', this.loginForm)
+					.then(() => {
+						this.$modal.closeLoading();
+						this.loginSuccess();
+					})
+					.catch(() => {
+						if (this.captchaEnabled) {
+							this.getCode();
+						}
+					});
+			},
+			// 登录成功后，处理函数
+			loginSuccess(result) {
+				// 获取户信息
+				this.$store.dispatch('GetInfo').then((res) => {
+					this.$tab.reLaunch('/pages/index/index');
+				});
+			},
+			// 确认修改链接地址
+			handlerBaseUrlConfirm() {
+				const baseUrl = this.BaseUrl;
+				console.log('confirm', baseUrl);
+				uni.showToast({
+					title: '链接地址已修改：' + baseUrl,
+					icon: 'none'
+				});
+				setBaseUrl(baseUrl);
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #ffffff;
+	}
+
+	.text-white {
+		color: white;
+	}
+
+	.text-blue {
+		color: #5500ff;
+	}
+
+	.normal-login-container {
+		background-image: linear-gradient(rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.1)), url('@/static/images/background/login2.png');
+		width: 100%;
+
+		background-size: cover;
+		background-repeat: no-repeat;
+
+		background-position: center;
+
+		height: 712px;
+
+		.logo-content {
+			width: 100%;
+			font-size: 21px;
+			text-align: center;
+			padding-top: 15%;
+
+			image {
+				border-radius: 4px;
+			}
+
+			.title {
+				margin-left: 10px;
+			}
+		}
+
+		.login-form-content {
+			text-align: center;
+			margin: 20px auto;
+			margin-top: 15%;
+			width: 80%;
+
+			.input-item {
+				margin: 20px auto;
+				background-color: #f5f6f7;
+				height: 45px;
+				border-radius: 20px;
+
+				.icon {
+					font-size: 38rpx;
+					margin-left: 10px;
+					color: #999;
+				}
+
+				.input {
+					width: 100%;
+					font-size: 14px;
+					line-height: 20px;
+					text-align: left;
+					padding-left: 15px;
+				}
+			}
+
+			.login-btn {
+				margin-top: 40px;
+				height: 45px;
+			}
+
+			.reg {
+				margin-top: 15px;
+			}
+
+			.xieyi {
+				color: #333;
+				margin-top: 20px;
+			}
+
+			.login-code {
+				height: 38px;
+				float: right;
+
+				.login-code-img {
+					height: 38px;
+					position: absolute;
+					margin-left: 10px;
+					width: 200rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/login/login.scss b/pages/login/login.scss
new file mode 100644
index 0000000..fdca680
--- /dev/null
+++ b/pages/login/login.scss
@@ -0,0 +1,9 @@
+.login-banner-box {
+	width: 360px;
+	height: 240px;
+}
+
+.login-form-box {
+	padding-left: 40px;
+	padding-right: 40px;
+}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 48802be..c18a319 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,256 +1,166 @@
 <template>
-	<view class="normal-login-container">
+	<view class="common-container">
+		<!-- 登录图片 -->
+		<view class="login-banner-box">
+			<u--image :showLoading="true" src="/static/images/ui/login.png" width="360px" height="240px"></u--image>
+		</view>
+		<!-- 登录框 -->
+		<view class="login-form-box">
+			<!-- 登录表单 -->
+			<u--form labelPosition="left" :model="loginForm" ref="uForm">
+				<u-form-item prop="username" borderBottom>
+					<u--input v-model="loginForm.username" border="none" placeholder="账号" prefixIcon="account"
+						prefixIconStyle="font-size: 22px;color: #909399"></u--input>
+				</u-form-item>
+				<u-form-item prop="password" borderBottom>
+					<u--input v-model="loginForm.password" border="none" placeholder="密码" prefixIcon="lock"
+						prefixIconStyle="font-size: 22px;color: #909399"></u--input>
+				</u-form-item>
+				<u-form-item prop="BaseUrl" borderBottom>
+					<u-input v-model="BaseUrl" border="none" placeholder="连接地址,例:127.0.0.1:8888"
+						prefixIcon="ie" prefixIconStyle="font-size: 22px;color: #909399">
+						<template slot="suffix">
+							<u-button type="primary" size="mini" text="修改地址" @click="handlerBaseUrlConfirm"
+								shape="circle"></u-button>
+						</template>
+					</u-input>
+				</u-form-item>
+				<u-form-item prop="button" style="margin-top: 60px;">
+					<u-button @click="handleLogin" type="primary" :color="buttonColor" text="登录" shape="circle"></u-button>
+				</u-form-item>
+			</u--form>
+		</view>
+		<!-- 无网络处理 -->
 		<u-no-network></u-no-network>
-		<view class="logo-content align-center justify-center flex">
-			<image style="width: 100rpx; height: 100rpx" src="@/static/images/icon/icon1.png" mode="widthFix"></image>
-			<text class="title" style="color: #10298D;">WMS-移动端</text>
-		</view>
-		<view class="login-form-content">
-			<view class="input-item flex align-center">
-				<view class="iconfont icon-user icon"></view>
-				<input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
-			</view>
-			<view class="input-item flex align-center">
-				<view class="iconfont icon-password icon"></view>
-				<input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
-			</view>
-			<view class="input-item flex align-center">
-				<input v-model="BaseUrl" type="text" class="input" placeholder="请输入连接地址如127.0.0.1:8888" @confirm="handlerBaseUrlConfirm" />
-			</view>
-			<view class="input-item flex align-center" style="width: 60%; margin: 0px" v-if="captchaEnabled">
-				<view class="iconfont icon-code icon"></view>
-				<input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
-				<view class="login-code">
-					<image :src="codeUrl" @click="getCode" class="login-code-img"></image>
-				</view>
-			</view>
-			<view class="action-btn">
-				<button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
-			</view>
-			<view class="reg text-center" v-if="register">
-				<text class="text-grey1">没有账号？</text>
-				<text @click="handleUserRegister" class="text-blue">立即注册</text>
-			</view>
-			<view class="xieyi text-center">
-				<text class="text-white">登录即代表同意</text>
-				<text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
-				<text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
-			</view>
-		</view>
 	</view>
 </template>
 
 <script>
-import { getCodeImg } from '@/api/login';
-import { getToken, setToken, removeToken } from '@/utils/auth';
-import { getBaseUrl, setBaseUrl, removeBaseUrl } from '@/utils/baseUrl';
-import config from '@/config';
-export default {
-	data() {
-		return {
-			codeUrl: '',
-			captchaEnabled: false,
-			// 用户注册开关
-			register: false,
-			globalConfig: getApp().globalData.config,
-			BaseUrl: '127.0.0.1:8888',
-			loginForm: {
-				username: 'admin',
-				password: '123456',
-				code: '',
-				uuid: ''
-			}
-		};
-	},
-	created() {
-		this.init();
-		this.getCode();
-	},
-	methods: {
-		init() {
-			// 初始化链接地址设计
-			let baseUrl = getBaseUrl();
-			if (!baseUrl) {
-				baseUrl = '192.168.60.251:8888';
+	import {
+		getCodeImg
+	} from '@/api/login';
+	import {
+		getToken,
+		setToken,
+		removeToken
+	} from '@/utils/auth';
+	import {
+		getBaseUrl,
+		setBaseUrl,
+		removeBaseUrl
+	} from '@/utils/baseUrl';
+	import config from '@/config';
+	export default {
+		data() {
+			return {
+				codeUrl: '',
+				captchaEnabled: false,
+				// 用户注册开关
+				register: false,
+				globalConfig: getApp().globalData.config,
+				BaseUrl: '127.0.0.1:8888',
+				buttonColor: 'linear-gradient(to right, #3296F9, #235FF5)',
+				loginForm: {
+					username: 'admin',
+					password: '123456',
+					code: '',
+					uuid: ''
+				}
+			};
+		},
+		created() {
+			this.init();
+			// this.getCode();
+		},
+		methods: {
+			init() {
+				// 初始化链接地址设计
+				let baseUrl = getBaseUrl();
+				if (!baseUrl) {
+					baseUrl = '192.168.60.251:8888';
+					setBaseUrl(baseUrl);
+				}
+				this.BaseUrl = baseUrl;
+			},
+			// 获取图形验证码
+			getCode() {
+				getCodeImg().then((res) => {
+					if (res.code !== 200) {
+						uni.showToast({
+							title: '获取验证码失败！请检查网络！',
+							icon: 'error'
+						});
+						return;
+					}
+					const result = res.data;
+					if (result.captchaOff === 'off') {
+						this.captchaEnabled = false;
+						return;
+					} else {
+						this.captchaEnabled = true;
+					}
+					this.codeUrl = 'data:image/gif;base64,' + result.img;
+					this.loginForm.uuid = result.uuid;
+				});
+			},
+			// 登录方法
+			async handleLogin() {
+				// debug快速登录
+				if (this.loginForm.username === 'debug') {
+					setToken('123');
+					this.$tab.reLaunch('/pages/index/index');
+					return;
+				}
+				if (this.loginForm.username === '') {
+					this.$modal.msgError('请输入您的账号');
+				} else if (this.loginForm.password === '') {
+					this.$modal.msgError('请输入您的密码');
+				} else if (this.loginForm.code === '' && this.captchaEnabled) {
+					this.$modal.msgError('请输入验证码');
+				} else {
+					this.$modal.loading('登录中，请耐心等待...');
+					setTimeout(()=>{
+						this.$modal.closeLoading();
+					},30000)
+					this.pwdLogin();
+				}
+			},
+			// 密码登录
+			async pwdLogin() {
+				this.$store
+					.dispatch('Login', this.loginForm)
+					.then(() => {
+						this.$modal.closeLoading();
+						this.loginSuccess();
+					})
+					.catch(() => {
+						this.$modal.closeLoading();
+						if (this.captchaEnabled) {
+							this.getCode();
+						}
+					});
+			},
+			// 登录成功后，处理函数
+			loginSuccess(result) {
+				// 获取户信息
+				this.$store.dispatch('GetInfo').then((res) => {
+					this.$tab.reLaunch('/pages/index/index');
+				});
+			},
+			// 确认修改链接地址
+			handlerBaseUrlConfirm() {
+				const baseUrl = this.BaseUrl;
+				console.log('changeBaseUrl', baseUrl);
+				uni.showToast({
+					title: '链接地址已修改：' + baseUrl,
+					icon: 'none'
+				});
 				setBaseUrl(baseUrl);
 			}
-			this.BaseUrl = baseUrl;
-		},
-		// 用户注册
-		handleUserRegister() {
-			this.$tab.redirectTo(`/pages/register`);
-		},
-		// 隐私协议
-		handlePrivacy() {
-			// let site = this.globalConfig.appInfo.agreements[0];
-			// this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`);
-		},
-		// 用户协议
-		handleUserAgrement() {
-			// let site = this.globalConfig.appInfo.agreements[1];
-			// this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`);
-		},
-		// 获取图形验证码
-		getCode() {
-			getCodeImg().then((res) => {
-				if (res.code !== 200) {
-					uni.showToast({
-						title: '获取验证码失败！请检查网络！',
-						icon: 'error'
-					});
-					return;
-				}
-				const result = res.data;
-				if (result.captchaOff === 'off') {
-					this.captchaEnabled = false;
-					return;
-				} else {
-					this.captchaEnabled = true;
-				}
-				this.codeUrl = 'data:image/gif;base64,' + result.img;
-				this.loginForm.uuid = result.uuid;
-			});
-		},
-		// 登录方法
-		async handleLogin() {
-			// debug快速登录
-			if (this.loginForm.username === 'debug') {
-				setToken('123');
-				this.$tab.reLaunch('/pages/index/index');
-				return;
-			}
-			if (this.loginForm.username === '') {
-				this.$modal.msgError('请输入您的账号');
-			} else if (this.loginForm.password === '') {
-				this.$modal.msgError('请输入您的密码');
-			} else if (this.loginForm.code === '' && this.captchaEnabled) {
-				this.$modal.msgError('请输入验证码');
-			} else {
-				this.$modal.loading('登录中，请耐心等待...');
-				this.pwdLogin();
-			}
-		},
-		// 密码登录
-		async pwdLogin() {
-			this.$store
-				.dispatch('Login', this.loginForm)
-				.then(() => {
-					this.$modal.closeLoading();
-					this.loginSuccess();
-				})
-				.catch(() => {
-					if (this.captchaEnabled) {
-						this.getCode();
-					}
-				});
-		},
-		// 登录成功后，处理函数
-		loginSuccess(result) {
-			// 获取户信息
-			this.$store.dispatch('GetInfo').then((res) => {
-				this.$tab.reLaunch('/pages/index/index');
-			});
-		},
-		// 确认修改链接地址
-		handlerBaseUrlConfirm() {
-			const baseUrl = this.BaseUrl;
-			console.log('confirm', baseUrl);
-			uni.showToast({
-				title: '链接地址已修改：' + baseUrl,
-				icon: 'none'
-			});
-			setBaseUrl(baseUrl);
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	background-color: #ffffff;
-}
-.text-white{
-	color: white;
-}
-.text-blue{
-	color:#5500ff;
-}
-.normal-login-container {
-	background-image:linear-gradient(rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.1)), url('@/static/images/background/login2.png');
-	width: 100%;
-	
-	background-size: cover;
-	background-repeat: no-repeat;
-
-	background-position: center;
-	
-	height: 712px;
-	.logo-content {
-		width: 100%;
-		font-size: 21px;
-		text-align: center;
-		padding-top: 15%;
-		image {
-			border-radius: 4px;
-		}
-
-		.title {
-			margin-left: 10px;
-		}
-	}
-
-	.login-form-content {
-		text-align: center;
-		margin: 20px auto;
-		margin-top: 15%;
-		width: 80%;
-
-		.input-item {
-			margin: 20px auto;
-			background-color: #f5f6f7;
-			height: 45px;
-			border-radius: 20px;
-
-			.icon {
-				font-size: 38rpx;
-				margin-left: 10px;
-				color: #999;
-			}
-
-			.input {
-				width: 100%;
-				font-size: 14px;
-				line-height: 20px;
-				text-align: left;
-				padding-left: 15px;
-			}
-		}
-
-		.login-btn {
-			margin-top: 40px;
-			height: 45px;
-		}
-
-		.reg {
-			margin-top: 15px;
-		}
-
-		.xieyi {
-			color: #333;
-			margin-top: 20px;
-		}
-
-		.login-code {
-			height: 38px;
-			float: right;
-
-			.login-code-img {
-				height: 38px;
-				position: absolute;
-				margin-left: 10px;
-				width: 200rpx;
-			}
-		}
-	}
-}
-</style>
+	@import url("login.scss");
+</style>
\ No newline at end of file
diff --git a/pages/menuChouse/menuChouse.vue b/pages/menuChouse/menuChouse.vue
new file mode 100644
index 0000000..64bf097
--- /dev/null
+++ b/pages/menuChouse/menuChouse.vue
@@ -0,0 +1,237 @@
+<template>
+	<view class="common-nav-container">
+		<u--form labelPosition="left" ref="uForm" class="menu-chouse-from-box">
+			<view v-for="item in menuButtonList">
+				<u-form-item v-if="item.isShow && item.isShowType === type">
+					<u-button size="large" :text="item.name" :color="item.color"
+						@click="handlerClick(item.url)"></u-button>
+				</u-form-item>
+			</view>
+		</u--form>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad: function(option) {
+			const that = this;
+			const eventChannel = this.getOpenerEventChannel();
+			eventChannel.on('setMenuType', function(res) {
+				that.type = res.data;
+			})
+		},
+		data() {
+			return {
+				// 菜单类型
+				type: -1,
+				menuButtonList: [{
+						//展示时机
+						isShowType: 0,
+						isShow: true,
+						name: '成品入库',
+						// 触发跳转
+						url: '/pages/inWarehouse/inWarehouse',
+						icon: '',
+						color: 'linear-gradient(to right, #ff5858 0%, #f09819 100%)'
+					},
+					{
+						//展示时机
+						isShowType: 0,
+						isShow: true,
+						name: '油漆入库',
+						// 触发跳转
+						url: '',
+						icon: '',
+						color: 'linear-gradient(to right, #6a11cb 0%, #2575fc 100%)'
+					},
+					{
+						//展示时机
+						isShowType: 0,
+						isShow: true,
+						name: '毛坯入库',
+						// 触发跳转
+						url: '',
+						icon: '',
+						color: 'linear-gradient(to right, #0ba360 0%, #3cba92 100%)'
+					},
+					{
+						//展示时机
+						isShowType: 0,
+						isShow: true,
+						name: '备品备件',
+						// 触发跳转
+						url: '',
+						icon: '',
+						color: 'linear-gradient(to right, #BCC5CE, #929EAD)'
+					},
+					{
+						//展示时机
+						isShowType: 1,
+						isShow: true,
+						name: '移库',
+						// 触发跳转
+						url: '/pages/relocation/relocation',
+						icon: '',
+						color: 'linear-gradient(to right, #f6d365 0%, #fda085 100%)'
+					},
+					{
+						isShowType: 2,
+						isShow: true,
+						name: '盘点',
+						// 触发跳转
+						url: '/pages/stocktake/stocktake',
+						icon: '',
+						color: 'linear-gradient(to right, #6a11cb 0%, #2575fc 100%)'
+					},
+					{
+						isShowType: 2,
+						isShow: true,
+						name: '盘点记录',
+						// 触发跳转
+						url: '/pages/relocation/relocation',
+						icon: '',
+						color: 'linear-gradient(to top, #0ba360 0%, #3cba92 100%)'
+					},
+					{
+						isShowType: 3,
+						isShow: true,
+						name: '出库单出库',
+						// 触发跳转
+						url: '/pages/outWarehouse/outWarehouse',
+						icon: '',
+						color: 'linear-gradient(to right, #ff5858 0%, #f09819 100%)'
+					},
+					{
+						isShowType: 3,
+						isShow: true,
+						name: '无出库单出库',
+						// 触发跳转
+						url: '/pages/returnWarehose/returnWarehose',
+						icon: '',
+						color: 'linear-gradient(to right, #6a11cb 0%, #2575fc 100%)'
+					},
+					{
+						isShowType: 3,
+						isShow: true,
+						name: '出库单查看',
+						// 触发跳转
+						url: '/pages/relocation/relocation',
+						icon: '',
+						color: 'linear-gradient(to top, #0ba360 0%, #3cba92 100%)'
+					},
+					{
+						isShowType: 4,
+						isShow: true,
+						name: '拼箱',
+						// 触发跳转
+						url: '/pages/consolidation/consolidation',
+						icon: '',
+						color: 'linear-gradient(to top, #243949 0%, #517fa4 100%)'
+					},
+					{
+						isShowType: 4,
+						isShow: true,
+						name: '拆箱',
+						// 触发跳转
+						url: '',
+						icon: '',
+						color: 'linear-gradient(to bottom, #243949 0%, #517fa4 100%)'
+					},
+					{
+						isShowType: 4,
+						isShow: true,
+						name: '库存查询',
+						// 触发跳转
+						url: '/pages/watchGoods/watchGoods',
+						icon: '',
+						color: 'linear-gradient(to top, #0ba360 0%, #3cba92 100%)'
+					}
+				]
+			}
+		},
+		methods: {
+			handlerClick(url) {
+				uni.navigateTo({
+					url
+				});
+			},
+			buttonCheck(action) {
+				switch (action) {
+					case 1:
+						// 成品入库
+						uni.navigateTo({
+							url: '/pages/inWarehouse/inWarehouse'
+						});
+						break;
+					case 2:
+						// 成品出库
+						uni.navigateTo({
+							url: '/pages/outWarehouse/outWarehouse'
+						});
+						break;
+					case 3:
+						// 盘点
+						uni.navigateTo({
+							url: '/pages/stocktake/stocktake'
+						});
+						break;
+					case 4:
+						// 移库
+						uni.navigateTo({
+							url: '/pages/relocation/relocation'
+						});
+						break;
+					case 5:
+						// 退库
+						uni.navigateTo({
+							url: '/pages/returnWarehose/returnWarehose'
+						});
+						break;
+					case 6:
+						// 拼箱
+						uni.navigateTo({
+							url: '/pages/consolidation/consolidation'
+						});
+						break;
+					case 7:
+						// 货物查看
+						uni.navigateTo({
+							url: '/pages/watchGoods/watchGoods'
+						});
+						break;
+					case 8:
+
+						break;
+					case 9:
+
+						break;
+					case 10:
+						// 注销
+						uni.showModal({
+							title: '注销',
+							content: '是否注销当前账户?',
+							showCancel: true,
+							cancelText: '取消',
+							confirmText: '注销',
+							success: (res) => {
+								if (res.confirm) {
+									uni.reLaunch({
+										url: '/pages/login/login'
+									});
+								}
+							}
+						});
+						break;
+					default:
+						break;
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.menu-chouse-from-box {
+		padding: 10px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/outWarehouse/outWarehouse.vue b/pages/outWarehouse/outWarehouse.vue
index be04b61..933c328 100644
--- a/pages/outWarehouse/outWarehouse.vue
+++ b/pages/outWarehouse/outWarehouse.vue
@@ -12,8 +12,8 @@
 					<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>
+					<view v-if="searchType === 3" class="color1 aciton-box">请扫出库单</view>
+					<view v-if="searchType === 2" class="color2 aciton-box">请扫箱码</view>
 					<!-- 扫描操作 -->
 					<view class="pda-search-box">
 						<PdaScanInput @getInfo="handleGetInfo" :type="searchType"></PdaScanInput>
diff --git a/pages/user/user.css b/pages/user/user.css
new file mode 100644
index 0000000..4b448de
--- /dev/null
+++ b/pages/user/user.css
@@ -0,0 +1,824 @@
+/************************************************************
+** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
+** 否则页面将无法正常显示                                  **
+************************************************************/
+/* 无顶部nav有tab通用主容器 可使用高度 */
+.user-container {
+	width: 360px;
+	height: 662px;
+	background-color: white;
+}
+
+html {
+	font-size: 16px;
+}
+
+body {
+	margin: 0;
+	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
+		'Droid Sans', 'Helvetica Neue', 'Microsoft Yahei', sans-serif;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+view,
+image,
+text {
+	box-sizing: border-box;
+	flex-shrink: 0;
+}
+
+#app {
+	width: 100vw;
+	/* height: 100vh; */
+}
+
+.flex-row {
+	display: flex;
+	flex-direction: row;
+}
+
+.flex-col {
+	display: flex;
+	flex-direction: column;
+}
+
+.justify-start {
+	justify-content: flex-start;
+}
+
+.justify-end {
+	justify-content: flex-end;
+}
+
+.justify-center {
+	justify-content: center;
+}
+
+.justify-between {
+	justify-content: space-between;
+}
+
+.justify-around {
+	justify-content: space-around;
+}
+
+.justify-evenly {
+	justify-content: space-evenly;
+}
+
+.items-start {
+	align-items: flex-start;
+}
+
+.items-end {
+	align-items: flex-end;
+}
+
+.items-center {
+	align-items: center;
+}
+
+.items-baseline {
+	align-items: baseline;
+}
+
+.items-stretch {
+	align-items: stretch;
+}
+
+.self-start {
+	align-self: flex-start;
+}
+
+.self-end {
+	align-self: flex-end;
+}
+
+.self-center {
+	align-self: center;
+}
+
+.self-baseline {
+	align-self: baseline;
+}
+
+.self-stretch {
+	align-self: stretch;
+}
+
+.flex-1 {
+	flex: 1 1 0%;
+}
+
+.flex-auto {
+	flex: 1 1 auto;
+}
+
+.grow {
+	flex-grow: 1;
+}
+
+.grow-0 {
+	flex-grow: 0;
+}
+
+.shrink {
+	flex-shrink: 1;
+}
+
+.shrink-0 {
+	flex-shrink: 0;
+}
+
+.relative {
+	position: relative;
+}
+
+.ml-2 {
+	margin-left: 2px;
+}
+
+.mt-2 {
+	margin-top: 2px;
+}
+
+.ml-4 {
+	margin-left: 4px;
+}
+
+.mt-4 {
+	margin-top: 4px;
+}
+
+.ml-6 {
+	margin-left: 6px;
+}
+
+.mt-6 {
+	margin-top: 6px;
+}
+
+.ml-8 {
+	margin-left: 8px;
+}
+
+.mt-8 {
+	margin-top: 8px;
+}
+
+.ml-10 {
+	margin-left: 10px;
+}
+
+.mt-10 {
+	margin-top: 10px;
+}
+
+.ml-12 {
+	margin-left: 12px;
+}
+
+.mt-12 {
+	margin-top: 12px;
+}
+
+.ml-14 {
+	margin-left: 14px;
+}
+
+.mt-14 {
+	margin-top: 14px;
+}
+
+.ml-16 {
+	margin-left: 16px;
+}
+
+.mt-16 {
+	margin-top: 16px;
+}
+
+.ml-18 {
+	margin-left: 18px;
+}
+
+.mt-18 {
+	margin-top: 18px;
+}
+
+.ml-20 {
+	margin-left: 20px;
+}
+
+.mt-20 {
+	margin-top: 20px;
+}
+
+.ml-22 {
+	margin-left: 22px;
+}
+
+.mt-22 {
+	margin-top: 22px;
+}
+
+.ml-24 {
+	margin-left: 24px;
+}
+
+.mt-24 {
+	margin-top: 24px;
+}
+
+.ml-26 {
+	margin-left: 26px;
+}
+
+.mt-26 {
+	margin-top: 26px;
+}
+
+.ml-28 {
+	margin-left: 28px;
+}
+
+.mt-28 {
+	margin-top: 28px;
+}
+
+.ml-30 {
+	margin-left: 30px;
+}
+
+.mt-30 {
+	margin-top: 30px;
+}
+
+.ml-32 {
+	margin-left: 32px;
+}
+
+.mt-32 {
+	margin-top: 32px;
+}
+
+.ml-34 {
+	margin-left: 34px;
+}
+
+.mt-34 {
+	margin-top: 34px;
+}
+
+.ml-36 {
+	margin-left: 36px;
+}
+
+.mt-36 {
+	margin-top: 36px;
+}
+
+.ml-38 {
+	margin-left: 38px;
+}
+
+.mt-38 {
+	margin-top: 38px;
+}
+
+.ml-40 {
+	margin-left: 40px;
+}
+
+.mt-40 {
+	margin-top: 40px;
+}
+
+.ml-42 {
+	margin-left: 42px;
+}
+
+.mt-42 {
+	margin-top: 42px;
+}
+
+.ml-44 {
+	margin-left: 44px;
+}
+
+.mt-44 {
+	margin-top: 44px;
+}
+
+.ml-46 {
+	margin-left: 46px;
+}
+
+.mt-46 {
+	margin-top: 46px;
+}
+
+.ml-48 {
+	margin-left: 48px;
+}
+
+.mt-48 {
+	margin-top: 48px;
+}
+
+.ml-50 {
+	margin-left: 50px;
+}
+
+.mt-50 {
+	margin-top: 50px;
+}
+
+.ml-52 {
+	margin-left: 52px;
+}
+
+.mt-52 {
+	margin-top: 52px;
+}
+
+.ml-54 {
+	margin-left: 54px;
+}
+
+.mt-54 {
+	margin-top: 54px;
+}
+
+.ml-56 {
+	margin-left: 56px;
+}
+
+.mt-56 {
+	margin-top: 56px;
+}
+
+.ml-58 {
+	margin-left: 58px;
+}
+
+.mt-58 {
+	margin-top: 58px;
+}
+
+.ml-60 {
+	margin-left: 60px;
+}
+
+.mt-60 {
+	margin-top: 60px;
+}
+
+.ml-62 {
+	margin-left: 62px;
+}
+
+.mt-62 {
+	margin-top: 62px;
+}
+
+.ml-64 {
+	margin-left: 64px;
+}
+
+.mt-64 {
+	margin-top: 64px;
+}
+
+.ml-66 {
+	margin-left: 66px;
+}
+
+.mt-66 {
+	margin-top: 66px;
+}
+
+.ml-68 {
+	margin-left: 68px;
+}
+
+.mt-68 {
+	margin-top: 68px;
+}
+
+.ml-70 {
+	margin-left: 70px;
+}
+
+.mt-70 {
+	margin-top: 70px;
+}
+
+.ml-72 {
+	margin-left: 72px;
+}
+
+.mt-72 {
+	margin-top: 72px;
+}
+
+.ml-74 {
+	margin-left: 74px;
+}
+
+.mt-74 {
+	margin-top: 74px;
+}
+
+.ml-76 {
+	margin-left: 76px;
+}
+
+.mt-76 {
+	margin-top: 76px;
+}
+
+.ml-78 {
+	margin-left: 78px;
+}
+
+.mt-78 {
+	margin-top: 78px;
+}
+
+.ml-80 {
+	margin-left: 80px;
+}
+
+.mt-80 {
+	margin-top: 80px;
+}
+
+.ml-82 {
+	margin-left: 82px;
+}
+
+.mt-82 {
+	margin-top: 82px;
+}
+
+.ml-84 {
+	margin-left: 84px;
+}
+
+.mt-84 {
+	margin-top: 84px;
+}
+
+.ml-86 {
+	margin-left: 86px;
+}
+
+.mt-86 {
+	margin-top: 86px;
+}
+
+.ml-88 {
+	margin-left: 88px;
+}
+
+.mt-88 {
+	margin-top: 88px;
+}
+
+.ml-90 {
+	margin-left: 90px;
+}
+
+.mt-90 {
+	margin-top: 90px;
+}
+
+.ml-92 {
+	margin-left: 92px;
+}
+
+.mt-92 {
+	margin-top: 92px;
+}
+
+.ml-94 {
+	margin-left: 94px;
+}
+
+.mt-94 {
+	margin-top: 94px;
+}
+
+.ml-96 {
+	margin-left: 96px;
+}
+
+.mt-96 {
+	margin-top: 96px;
+}
+
+.ml-98 {
+	margin-left: 98px;
+}
+
+.mt-98 {
+	margin-top: 98px;
+}
+
+.ml-100 {
+	margin-left: 100px;
+}
+
+.mt-100 {
+	margin-top: 100px;
+}
+
+.mt-7 {
+	margin-top: 7px;
+}
+
+.mt-29 {
+	margin-top: 29px;
+}
+
+.ml-3 {
+	margin-left: 3px;
+}
+
+.mt-138 {
+	margin-top: 138px;
+}
+
+.mt-19 {
+	margin-top: 19px;
+}
+
+.page {
+	background-color: #ffffff;
+	width: 100%;
+	overflow-y: auto;
+	overflow-x: hidden;
+	height: 100%;
+}
+
+.section {
+	overflow: hidden;
+	background-image: url('https://ide.code.fun/api/image?token=661f6554a17dbc0011549df2&name=ad157cc0204af4f71837e19bb893c054.png');
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+}
+
+.section_2 {
+	background-image: url('https://ide.code.fun/api/image?token=661f6554a17dbc0011549df2&name=ad157cc0204af4f71837e19bb893c054.png');
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+	height: 216px;
+}
+
+.image {
+	border-radius: 50%;
+	width: 60px;
+	height: 60px;
+}
+
+.pos {
+	position: absolute;
+	left: 50%;
+	top: 35px;
+	transform: translateX(-50%);
+}
+
+.text {
+	color: #ffffff;
+	font-size: 18px;
+	font-family: Roboto;
+}
+
+.pos_2 {
+	position: absolute;
+	left: 50%;
+	top: 98px;
+	transform: translateX(-50%);
+}
+
+.section_3 {
+	padding: 3.5px 6.5px 5px 9px;
+	background-color: #ffffff4d;
+	border-radius: 23px;
+	width: 80px;
+}
+
+.pos_3 {
+	position: absolute;
+	left: 50%;
+	top: 120px;
+	transform: translateX(-50%);
+}
+
+.image_2 {
+	width: 11px;
+	height: 11px;
+}
+
+.text_2 {
+	color: #ffffff;
+	font-size: 12px;
+	font-family: Roboto;
+}
+
+.section_4 {
+	padding: 26.5px 22px 52px 32px;
+	background-color: #ffffff2b;
+	border-radius: 12px;
+	box-shadow: 0px 2px 37px #00000017;
+	backdrop-filter: blur(12.5px);
+}
+
+.pos_4 {
+	position: absolute;
+	left: 5px;
+	right: 5px;
+	top: 147px;
+}
+
+.font {
+	font-size: 20px;
+	font-family: SourceHanSansCN;
+	color: #ffffff;
+}
+
+.group {
+	padding: 9px 0 15px 5px;
+}
+
+.section_5 {
+	margin-left: 1px;
+	margin-right: 4px;
+	padding: 8px 0 69px;
+	background-color: #ffffff;
+	box-shadow: 0px 8.5px 25.5px #e9eff5;
+}
+
+.font_2 {
+	font-size: 14px;
+	font-family: Roboto;
+	color: #ffffff;
+}
+
+.equal-division {
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+}
+
+.group_2 {
+	padding: 3.5px 16px 0;
+}
+
+.equal-division-item {
+	flex: 1 1 79px;
+}
+
+.group_3 {
+	padding: 5px 0 5px 8.5px;
+}
+
+.group_16 {
+	padding-bottom: 35.5px;
+}
+
+.image_3 {
+	width: 46px;
+	height: 46px;
+}
+
+.pos_5 {
+	position: absolute;
+	left: 0;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
+.font_3 {
+	font-size: 14px;
+	font-family: Roboto;
+	color: #6f7278;
+}
+
+.text_6 {
+	margin-left: 10px;
+	font-size: 13px;
+}
+
+.group_1 {
+	padding: 7px 0 5px;
+}
+
+.text_7 {
+	font-size: 13px;
+}
+
+.group_5 {
+	padding: 7px 0 5px;
+}
+
+.text_8 {
+	font-size: 13px;
+}
+
+.group_4 {
+	padding: 5px 6.5px 5px 15px;
+}
+
+.group_15 {
+	padding-bottom: 35.5px;
+}
+
+.pos_6 {
+	position: absolute;
+	right: 0;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
+.text_9 {
+	font-size: 13px;
+}
+
+.group_6 {
+	overflow-x: hidden;
+}
+
+.section_6 {
+	padding-left: 30px;
+	padding-bottom: 16px;
+	background-color: #ffffff;
+	box-shadow: 0px 8.5px 25.5px #e9eff5;
+	width: 350px;
+	height: 218px;
+}
+
+.group_7 {
+	margin-left: 1px;
+	padding: 22px 0 17px;
+	width: 73.5px;
+}
+
+.image_4 {
+	width: 18px;
+	height: 16px;
+}
+
+.group_9 {
+	padding: 14px 0 16px;
+	width: 291.5px;
+}
+
+.image_6 {
+	width: 18px;
+	height: 19px;
+}
+
+.image_7 {
+	width: 8px;
+	height: 14px;
+}
+
+.group_11 {
+	padding: 12px 0 12px;
+}
+
+.image_10 {
+	width: 18px;
+	height: 17px;
+}
+
+.font_4 {
+	font-size: 14px;
+	font-family: Roboto;
+	color: #363b47;
+}
+
+.group_8 {
+	overflow-x: hidden;
+	width: 2px;
+}
+
+.image_5 {
+	width: 6px;
+	height: 12px;
+}
+
+.text-wrapper {
+	margin-right: 5px;
+	padding: 15px 0 20px;
+	background-image: linear-gradient(123.7deg, #7ad7ff -275.3%, #347bf1 358.8%);
+	box-shadow: 0px 8.5px 25.5px #e9eff5;
+}
+
+.out-button-box{
+	padding: 10px;
+}
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
new file mode 100644
index 0000000..40b055e
--- /dev/null
+++ b/pages/user/user.vue
@@ -0,0 +1,113 @@
+<template>
+	<view class="user-container">
+		<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="https://ide.code.fun/api/image?token=661f6554a17dbc0011549df2&name=055ef08294dae92828d52aa51229e3b9.png"
+					@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>
+				<view class="flex-row justify-between section_4 pos_4">
+					<text class="font">部门：工程师</text>
+					<text class="font">岗位：工程师</text>
+				</view>
+			</view>
+			<uni-card>
+				<u-grid :border="false" @click="gridClick" col="3">
+					<u-grid-item v-for="(baseListItem,baseListIndex) in gridList" :key="baseListIndex">
+						<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="baseListItem.name" :size="48"></u-icon>
+						<text class="grid-text">{{baseListItem.title}}</text>
+					</u-grid-item>
+				</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-group>
+			<view class="out-button-box">
+				<u-modal :show="outLoginShow" title="退出登录" showCancelButton content='是否注销,并退出登录？'
+					@cancel="outLoginShow = false" @confirm="outLogin"></u-modal>
+				<u-button type="primary" text="退出登录" @click="outLoginShow = true"></u-button>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		mapGetters
+	} from 'vuex'
+	import {
+		mapActions
+	} from 'vuex'
+	export default {
+		components: {},
+		props: {},
+		computed: {
+			// 使用对象展开运算符将 getter 混入 computed 对象中
+			...mapGetters([
+				'name',
+				'avatar',
+			])
+		},
+		onLoad() {
+			console.log(this.name, this.avatar);
+		},
+		data() {
+			return {
+				outLoginShow: false,
+				userInfo: {
+
+				},
+				gridList: [{
+						name: 'photo',
+						title: '消息'
+					},
+					{
+						name: 'lock',
+						title: '帮助'
+					},
+					{
+						name: 'star',
+						title: '客服'
+					},
+				]
+			};
+		},
+
+		methods: {
+			...mapActions([
+				'LogOut',
+				'GetInfo'
+			]),
+			avatarClick() {
+
+			},
+			gridClick() {
+
+			},
+			// 退出登录
+			outLogin() {
+				this.LogOut();
+				this.outLoginShow = false;
+				setTimeout(() => {
+					uni.reLaunch({
+						url: '/pages/login/login'
+					});
+				}, 500)
+			}
+		},
+	};
+</script>
+
+<style scoped>
+	@import url("user.css");
+</style>
\ No newline at end of file
diff --git a/static/images/icon/user-update.png b/static/images/icon/user-update.png
new file mode 100644
index 0000000..a96b117
Binary files /dev/null and b/static/images/icon/user-update.png differ
diff --git a/static/images/icon/仓库管理.svg b/static/images/icon/仓库管理.svg
new file mode 100644
index 0000000..72a7696
--- /dev/null
+++ b/static/images/icon/仓库管理.svg
@@ -0,0 +1,51 @@
+<svg width="128" height="128" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" baseProfile="tiny" style="font-size: 128px; color: rgb(255, 255, 255);">
+<title style="fill: rgb(255, 255, 255);">Qt SVG Document</title>
+<desc style="fill: rgb(255, 255, 255);">Generated with Qt</desc>
+<defs style="fill: rgb(255, 255, 255);">
+</defs>
+<g fill="none" stroke="black" stroke-width="1" fill-rule="evenodd" stroke-linecap="square" stroke-linejoin="bevel" style="fill: rgb(255, 255, 255);">
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0.933333,0.933333)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="#333333" fill-opacity="1" stroke="none" transform="matrix(9.14048,0,0,9.14048,-18.281,-18.281)" font-family="Arial" font-size="16" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+<path vector-effect="none" fill-rule="evenodd" d="M2,16 C2,8.26801 8.26801,2 16,2 C23.732,2 30,8.26801 30,16 C30,23.732 23.732,30 16,30 C8.26801,30 2,23.732 2,16 M23.1577,24.1767 C23.7202,24.1767 24.1778,23.702 24.1778,23.1182 L24.1778,8.1696 C24.1778,7.58613 23.7202,7.11111 23.1577,7.11111 L8.84338,7.11111 C8.28053,7.11111 7.82222,7.58613 7.82222,8.1696 L7.82222,23.1182 C7.82222,23.702 8.28053,24.1767 8.84338,24.1767 L9.99431,24.1767 C10.068,24.1769 10.1385,24.2063 10.1905,24.2585 C10.2424,24.3108 10.2715,24.3815 10.2713,24.4551 L10.2713,24.6105 C10.2711,24.6841 10.3002,24.7548 10.3521,24.8071 C10.4041,24.8593 10.4746,24.8887 10.5483,24.8889 L11.4571,24.8889 C11.5307,24.8887 11.6013,24.8593 11.6532,24.8071 C11.7052,24.7548 11.7342,24.6841 11.734,24.6105 L11.734,24.4551 C11.7339,24.3815 11.7629,24.3108 11.8149,24.2585 C11.8668,24.2063 11.9374,24.1769 12.011,24.1767 L19.989,24.1767 C20.0627,24.1768 20.1333,24.2062 20.1852,24.2584 C20.2372,24.3107 20.2662,24.3814 20.266,24.4551 L20.266,24.6105 C20.2658,24.7639 20.3899,24.8885 20.5433,24.8889 L21.4517,24.8889 C21.6052,24.8885 21.7293,24.7639 21.7291,24.6105 L21.7291,24.4551 C21.7288,24.3814 21.7578,24.3107 21.8098,24.2584 C21.8618,24.2062 21.9324,24.1768 22.006,24.1767 L23.1577,24.1767 M22.7563,8.79822 L22.7563,12.171 C22.7574,12.2412 22.7306,12.309 22.6817,12.3595 C22.6328,12.4099 22.5659,12.4388 22.4956,12.4398 L9.50436,12.4398 C9.36036,12.4398 9.24373,12.3196 9.24373,12.171 L9.24373,8.79822 C9.24259,8.728 9.26942,8.66021 9.31831,8.60979 C9.3672,8.55936 9.43413,8.53045 9.50436,8.52942 L22.4956,8.52942 C22.5659,8.53045 22.6328,8.55936 22.6817,8.60979 C22.7306,8.66021 22.7574,8.728 22.7563,8.79822 M22.7563,14.1084 L22.7563,17.5335 C22.7563,17.669 22.6396,17.7788 22.4956,17.7788 L9.50436,17.7788 C9.36036,17.7788 9.24373,17.669 9.24373,17.5335 L9.24373,14.1084 C9.24373,13.973 9.36036,13.8631 9.50436,13.8631 L22.4956,13.8631 C22.6396,13.8631 22.7563,13.973 22.7563,14.1084 M22.4956,19.2014 C22.6396,19.2014 22.7563,19.3028 22.7563,19.4279 C22.7563,19.4279 22.7335,22.1892 22.7556,22.4 C22.7776,22.6108 22.5845,22.7186 22.4,22.7449 C22.1099,22.7712 9.6,22.7449 9.6,22.7449 C9.45636,22.7449 9.24373,22.6571 9.24373,22.5319 L9.24373,19.4279 C9.24373,19.3028 9.36036,19.2014 9.50436,19.2014 L22.4956,19.2014 M21.6807,21.3298 C21.8809,21.3298 22.042,21.1335 22.042,20.891 L22.042,20.3484 C22.0427,20.107 21.8816,19.9104 21.6825,19.9097 L19.5623,19.9097 C19.3632,19.909 19.2014,20.1045 19.2007,20.346 L19.2007,20.3484 L19.2007,20.891 C19.2007,21.1335 19.3618,21.3298 19.5623,21.3298 L21.6807,21.3298 M21.6807,16.0007 C21.8809,16.0007 22.042,15.8044 22.042,15.562 L22.042,15.0197 C22.0427,14.778 21.8816,14.5813 21.6825,14.5806 L19.5623,14.5806 C19.3632,14.5799 19.2014,14.7755 19.2007,15.0169 L19.2007,15.0197 L19.2007,15.562 C19.2007,15.8044 19.3618,16.0007 19.5623,16.0007 L21.6807,16.0007 M21.6807,10.6706 C21.8809,10.6706 22.042,10.4743 22.042,10.2318 L22.042,9.68924 C22.0427,9.44782 21.8816,9.2512 21.6825,9.25049 L19.5623,9.25049 C19.3632,9.24978 19.2014,9.44533 19.2007,9.68676 L19.2007,9.68924 L19.2007,10.2318 C19.2007,10.4743 19.3618,10.6706 19.5623,10.6706 L21.6807,10.6706" style="fill: rgb(255, 255, 255);"></path>
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0.933333,0.933333)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/static/images/icon/入库.svg b/static/images/icon/入库.svg
new file mode 100644
index 0000000..5a02958
--- /dev/null
+++ b/static/images/icon/入库.svg
@@ -0,0 +1,11 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" height="128" width="128" version="1.1" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" style="font-size: 128px; color: rgb(255, 255, 255);">
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title style="fill: rgb(255, 255, 255);">入库</title>
+    <desc style="fill: rgb(255, 255, 255);">Created with Sketch.</desc>
+    <g transform="matrix(1.3913043,0,0,1.3913043,-50.086957,-50.086957)" style="fill: rgb(255, 255, 255);">
+        <g stroke="none" fill-rule="evenodd" id="Page-1" stroke-width="1" fill="none" style="fill: rgb(255, 255, 255);">
+            <g id="页面" style="fill: rgb(255, 255, 255);"></g>
+            <path d="M191.154177,48 L64.8725624,48 C61.8806389,48 59.1387732,49.6694971 57.7653089,52.3275419 L36.933255,92.6435054 C36.347083,93.7779152 36.0409721,95.0361581 36.0405089,96.3130617 L36.0000011,191.994197 C35.9967959,200.830752 43.1576411,207.996794 51.9941965,207.999999 C51.996131,208 51.9980655,208 52,208 L204,207.999974 C212.836556,207.999974 220,200.83653 220,191.999974 C220,191.998049 220,191.996123 219.999999,191.994197 L219.959495,95.821769 C219.959029,94.5327119 219.647072,93.2628565 219.050184,92.1203185 L198.244865,52.2956607 C196.865458,49.655257 194.133186,48 191.154177,48 Z M102.543643,152.002605 L112.001138,152.002605 C114.210277,152.002605 116.001138,150.211744 116.001138,148.002605 L116.001138,123.997672 C116.001138,121.788533 117.791999,119.997672 120.001138,119.997672 L136.001011,119.997672 C138.21015,119.997672 140.001011,121.788533 140.001011,123.997672 L140.001011,148.002605 C140.001011,150.211744 141.791872,152.002605 144.001011,152.002605 L153.488133,152.002605 C155.697272,152.002605 157.488133,153.793466 157.488133,156.002605 C157.488133,157.143706 157.000777,158.230485 156.148697,158.989477 L130.726976,181.633933 C129.212708,182.982771 126.928661,182.98502 125.411739,181.639168 L99.8889687,158.994713 C98.2364736,157.528577 98.0853997,155.000426 99.5515357,153.347931 C100.310672,152.492302 101.399795,152.002605 102.543643,152.002605 Z M65.7917384,84.4301908 L73.7916108,68.4336558 C75.146861,65.7236993 77.916796,64.0119389 80.9467412,64.0119389 L175.055279,64.0119389 C178.085393,64.0119389 180.855452,65.7238881 182.210619,68.4340751 L190.209319,84.4306101 C192.185319,88.3823953 190.583628,93.1878143 186.631843,95.1638139 C185.520959,95.7192859 184.295999,96.0084739 183.053979,96.0084739 L72.9468688,96.0084739 C68.5285908,96.0084739 64.9468688,92.4267519 64.9468688,88.0084739 C64.9468688,86.7662962 65.2361305,85.5411837 65.7917384,84.4301908 Z" id="Fill-1" fill="#868686" style="fill: rgb(255, 255, 255);"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/icon/出库.svg b/static/images/icon/出库.svg
new file mode 100644
index 0000000..1f13725
--- /dev/null
+++ b/static/images/icon/出库.svg
@@ -0,0 +1,55 @@
+<svg width="128" height="128" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" baseProfile="tiny" style="font-size: 128px; color: rgb(255, 255, 255);">
+<title style="fill: rgb(255, 255, 255);">Qt SVG Document</title>
+<desc style="fill: rgb(255, 255, 255);">Generated with Qt</desc>
+<defs style="fill: rgb(255, 255, 255);">
+</defs>
+<g fill="none" stroke="black" stroke-width="1" fill-rule="evenodd" stroke-linecap="square" stroke-linejoin="bevel" style="fill: rgb(255, 255, 255);">
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0.933333,0.933333)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="#333333" fill-opacity="1" stroke="none" transform="matrix(8.77334,0,0,8.77334,5.45481,-0.103375)" font-family="Arial" font-size="16" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+<path vector-effect="none" fill-rule="evenodd" d="M26.6179,29.1835 L1.31025,29.1835 C0.587192,29.1835 0.00122081,28.5686 0.00122081,27.8103 L0.00122081,19.1137 C0.00122081,19.1135 0.00122081,19.1133 0.00122081,19.113 C0.00122081,18.9393 0.0323037,18.7733 0.0883297,18.6203 L3.56923,9.03447 C3.75106,8.50538 4.23384,8.12702 4.80097,8.12702 L6.98263,8.12702 L11.346,8.12702 L11.346,9.04259 L11.346,10.8735 L6.98263,10.8735 L5.70302,10.8735 L3.20967,17.7397 L6.15359,17.7397 L7.41894,17.7397 C8.14191,17.7397 8.72801,18.3546 8.72801,19.113 L8.72801,20.4863 L19.2001,20.4863 L19.2001,19.113 C19.2001,18.3546 19.7862,17.7397 20.5091,17.7397 L21.8182,17.7397 L24.7184,17.7397 L22.2251,10.8735 L20.9455,10.8735 L16.5821,10.8735 L16.5821,9.04259 L16.5821,8.12702 L20.9455,8.12702 L23.1272,8.12702 C23.6943,8.12702 24.1771,8.50538 24.3589,9.03447 L27.8399,18.6203 C27.8958,18.7733 27.927,18.9393 27.927,19.113 L27.927,27.8103 C27.927,28.5686 27.341,29.1835 26.6179,29.1835 " style="fill: rgb(255, 255, 255);"></path>
+</g>
+
+<g fill="#333333" fill-opacity="1" stroke="none" transform="matrix(8.77334,0,0,8.77334,5.45481,-0.103375)" font-family="Arial" font-size="16" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+<path vector-effect="none" fill-rule="evenodd" d="M18.3524,4.63217 C18.3524,4.24939 18.2051,3.90281 17.9669,3.652 L14.895,0.417716 C14.6567,0.166878 14.3276,0.0117829 13.964,0.0117829 C13.6005,0.0117829 13.2714,0.16691 13.0331,0.417716 L9.96135,3.652 C9.72308,3.90281 9.57569,4.24939 9.57569,4.63217 C9.57569,5.39764 10.1651,6.01824 10.8922,6.01824 C11.2558,6.01824 11.5849,5.86305 11.8231,5.61227 L12.6475,4.74422 L12.6475,9.71458 L12.6475,11.1008 L12.6475,13.411 C12.6475,14.1765 13.2369,14.7971 13.964,14.7971 C14.6911,14.7971 15.2805,14.1765 15.2805,13.411 L15.2805,10.6387 L15.2805,10.1767 L15.2805,4.74422 L16.105,5.61227 C16.3432,5.86305 16.6723,6.01824 17.0358,6.01824 C17.7631,6.01824 18.3524,5.39764 18.3524,4.63217 " style="fill: rgb(255, 255, 255);"></path>
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0.933333,0.933333)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/static/images/icon/盘点.svg b/static/images/icon/盘点.svg
new file mode 100644
index 0000000..cf1b51a
--- /dev/null
+++ b/static/images/icon/盘点.svg
@@ -0,0 +1,15 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" height="128" width="128" viewBox="0 0 256 256" xmlns:xlink="http://www.w3.org/1999/xlink" style="font-size: 128px; color: rgb(255, 255, 255);">
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title style="fill: rgb(255, 255, 255);">验货</title>
+    <desc style="fill: rgb(255, 255, 255);">Created with Sketch.</desc>
+    <g transform="matrix(9.1465942,0,0,9.1465942,-18.345664,-18.413243)" style="fill: rgb(255, 255, 255);">
+        <g stroke="none" stroke-width="1" fill-rule="evenodd" fill="none" id="Page-1" style="fill: rgb(255, 255, 255);">
+            <g fill-rule="nonzero" transform="translate(0.000000, -192.000000)" fill="#262626" id="分组-167" style="fill: rgb(255, 255, 255);">
+                <g transform="translate(2.000000, 195.000000)" id="yanhuo" style="fill: rgb(255, 255, 255);">
+                    <path d="M0.00573716064,6.2347384 L0.00573716064,1.71971697 C0.00573716064,0.783785844 0.784185908,0.0241328282 1.75681943,0.0241328282 L26.2432148,0.0241328282 C27.2106509,0.0241328282 27.994297,0.782064572 27.994297,1.71971697 L27.994297,6.2347384 L0.00573716064,6.2347384 Z M13.9999658,20.9110134 C11.7451794,20.9110134 9.91890563,19.1412122 9.91890563,16.9587791 C9.91890563,14.7763461 11.7451794,13.0082662 13.9999658,13.0082662 C16.2548548,13.0082662 18.0811286,14.7763461 18.0811286,16.9587791 C18.0811285,19.1412122 16.2548548,20.9110133 13.9999658,20.9110134 Z M26.8275813,24.2917191 C26.8275813,25.2293377 26.0455423,25.9906782 25.0851842,25.9906782 L24.565751,25.9906782 L18.6951409,20.3066457 C19.408793,19.3708833 19.8303302,18.2123011 19.8303302,16.9587791 C19.8303302,13.8422712 17.2204103,11.314437 13.9999658,11.314437 C10.7796239,11.314437 8.16970399,13.8422712 8.16970396,16.9587791 C8.16970396,20.0770083 10.7796239,22.6031212 13.9999658,22.6031212 C15.2944968,22.6031212 16.490995,22.1956194 17.4582943,21.5049184 L22.0921947,25.9906782 L2.91485001,25.9906782 C1.9526455,25.9906782 1.17245286,25.2379103 1.17245288,24.2917191 L1.17245288,7.92688003 L26.8275813,7.92688003 L26.8275813,24.2917191 Z" id="形状" style="fill: rgb(255, 255, 255);"></path>
+                </g>
+            </g>
+            <g transform="translate(0.000000, -192.000000)" id="IIIII-Copy-24" style="fill: rgb(255, 255, 255);"></g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/images/icon/移库.svg b/static/images/icon/移库.svg
new file mode 100644
index 0000000..aef8e4d
--- /dev/null
+++ b/static/images/icon/移库.svg
@@ -0,0 +1,51 @@
+<svg width="128" height="128" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" baseProfile="tiny" style="font-size: 128px; color: rgb(255, 255, 255);">
+<title style="fill: rgb(255, 255, 255);">Qt SVG Document</title>
+<desc style="fill: rgb(255, 255, 255);">Generated with Qt</desc>
+<defs style="fill: rgb(255, 255, 255);">
+</defs>
+<g fill="none" stroke="black" stroke-width="1" fill-rule="evenodd" stroke-linecap="square" stroke-linejoin="bevel" style="fill: rgb(255, 255, 255);">
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0.933333,0.933333)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="#333333" fill-opacity="1" stroke="none" transform="matrix(9.15204,0,0,9.15204,-0.215796,36.5551)" font-family="Arial" font-size="16" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+<path vector-effect="none" fill-rule="nonzero" d="M6.01263,14.6627 C4.63326,14.6627 3.51326,15.792 3.51326,17.1887 C3.51326,18.5854 4.63326,19.7147 6.01263,19.7147 C7.392,19.7147 8.512,18.5854 8.512,17.1887 C8.512,15.792 7.392,14.6627 6.01263,14.6627 M26.4909,0 L15.0021,0 C14.1768,0 13.5048,0.677563 13.5048,1.5156 L13.5048,15.1679 C13.5048,16.0059 14.1768,16.6835 15.0021,16.6835 L16.5347,16.6835 C16.7823,14.6865 18.4564,13.1471 20.496,13.1471 C22.5356,13.1471 24.2097,14.6924 24.4573,16.6835 L26.4909,16.6835 C27.3162,16.6835 27.9882,16.0059 27.9882,15.1679 L27.9882,1.5156 C27.9882,0.677563 27.3221,0 26.4909,0 M20.6257,14.6627 C19.1756,14.6627 18.0025,15.8514 18.0025,17.3195 C18.0025,18.7875 19.1756,19.9762 20.6257,19.9762 C22.0758,19.9762 23.2488,18.7875 23.2488,17.3195 C23.2429,15.8514 22.0699,14.6627 20.6257,14.6627 M11.0055,3.0312 L5.01642,3.0312 C3.43663,3.0312 0.0235789,8.08915 0.0235789,10.11 L0.0235789,15.6731 C0.0235789,16.2318 0.471579,16.6835 1.01979,16.6835 L2.05137,16.6835 C2.29895,14.6865 3.97305,13.1471 6.01263,13.1471 C8.05221,13.1471 9.72632,14.6924 9.97389,16.6835 L11.0055,16.6835 C11.5596,16.6835 12.0017,16.2318 12.0017,15.6731 L12.0017,4.04755 C12.0076,3.48886 11.5596,3.0312 11.0055,3.0312 M9.01305,10.6152 L2.51705,10.6152 L2.51705,10.11 C2.51705,8.57058 4.73937,5.59287 5.54695,5.55721 C7.43916,5.48588 9.01305,5.55721 9.01305,5.55721 L9.01305,10.6152" style="fill: rgb(255, 255, 255);"></path>
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0,0)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+
+<g fill="none" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="square" stroke-linejoin="bevel" transform="matrix(0.0666667,0,0,0.0666667,0.933333,0.933333)" font-family="微软雅黑" font-size="12" font-weight="400" font-style="normal" style="fill: rgb(255, 255, 255);">
+</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/static/images/ui/home-banner.png b/static/images/ui/home-banner.png
new file mode 100644
index 0000000..7c24f33
Binary files /dev/null and b/static/images/ui/home-banner.png differ
diff --git a/static/images/ui/login.png b/static/images/ui/login.png
new file mode 100644
index 0000000..becd180
Binary files /dev/null and b/static/images/ui/login.png differ
diff --git a/static/images/ui/user.png b/static/images/ui/user.png
new file mode 100644
index 0000000..0414438
Binary files /dev/null and b/static/images/ui/user.png differ
diff --git a/static/images/ui/入库.jpg b/static/images/ui/入库.jpg
new file mode 100644
index 0000000..d2402f5
Binary files /dev/null and b/static/images/ui/入库.jpg differ
diff --git a/static/images/ui/运货.jpg b/static/images/ui/运货.jpg
new file mode 100644
index 0000000..9cb0131
Binary files /dev/null and b/static/images/ui/运货.jpg differ
diff --git a/static/scss/global.scss b/static/scss/global.scss
index ac636bd..7e58368 100644
--- a/static/scss/global.scss
+++ b/static/scss/global.scss
@@ -1,3 +1,4 @@
+
 .text-center {
 	text-align: center;
 }
@@ -87,4 +88,4 @@
         color: #999;
       }
     }
-  }
+  }
\ No newline at end of file
diff --git a/store/index.js b/store/index.js
index 83a9db5..94be1f0 100644
--- a/store/index.js
+++ b/store/index.js
@@ -6,10 +6,10 @@ import getters from './getters'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
-  modules: {
-    user
-  },
-  getters
+	modules: {
+		user
+	},
+	getters
 })
 
-export default store
+export default store
\ No newline at end of file
diff --git a/store/modules/user.js b/store/modules/user.js
index a1eb26e..998f595 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -83,6 +83,7 @@ const user = {
 					} else {
 						commit('SET_ROLES', ['ROLE_DEFAULT'])
 					}
+					console.log(res);
 					commit('SET_NAME', username)
 					commit('SET_AVATAR', avatar)
 					resolve(res)