diff --git a/pages/enterAndExit/enter/add.vue b/pages/enterAndExit/enter/add.vue
index 41f08d4..2dce21c 100644
--- a/pages/enterAndExit/enter/add.vue
+++ b/pages/enterAndExit/enter/add.vue
@@ -729,7 +729,7 @@ page {
 
 .chronic-science {
   width: 100%;
-  height: 40vh;
+  height: 30vh;
   margin-bottom: 100rpx;
 }
 .scroll-view-item {
diff --git a/pages/enterAndExit/enter/index.vue b/pages/enterAndExit/enter/index.vue
index 05ec8d2..f068535 100644
--- a/pages/enterAndExit/enter/index.vue
+++ b/pages/enterAndExit/enter/index.vue
@@ -159,7 +159,7 @@ page {
 
 .content {
   background: #f9fbff;
-  height: 88vh;
+  height: 100vh;
   display: flex;
   flex-wrap: wrap;
   align-content: flex-start;
@@ -185,7 +185,7 @@ page {
 
   .chronic-science {
     width: 100%;
-    height: 84vh;
+    height: 82vh;
 
     .scroll-view-item {
       width: 96%;
diff --git a/pages/enterAndExit/enter/recordDetail.vue b/pages/enterAndExit/enter/recordDetail.vue
index fb38e9c..617e17a 100644
--- a/pages/enterAndExit/enter/recordDetail.vue
+++ b/pages/enterAndExit/enter/recordDetail.vue
@@ -186,7 +186,7 @@ export default {
 <style lang="scss" scoped>
 .content {
   background: #F7F7F7;
-  height: 95vh;
+  height: 100vh;
   display: flex;
   flex-wrap: wrap;
   align-content: flex-start;
@@ -196,8 +196,8 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
-    margin-top: 20rpx;
-    padding: 20rpx;
+    margin-top: 10rpx;
+    padding: 10rpx;
 
     .title {
       width: 25%;
@@ -216,7 +216,7 @@ export default {
 
   .chronic-science {
     width: 100%;
-    height: 55vh;
+    height: 60vh;
 
     .scroll-view-item {
       width: 96%;
diff --git a/pages/enterAndExit/exit/add.vue b/pages/enterAndExit/exit/add.vue
index 7ed1372..0ca3598 100644
--- a/pages/enterAndExit/exit/add.vue
+++ b/pages/enterAndExit/exit/add.vue
@@ -2,7 +2,7 @@
 	<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
 	<view class="health-form">
 		<Navbar title="新增出库" :showRightText="false" :isBack="true" />
-		<scroll-view style="width: 100%;height: calc(100vh - 80px);" scroll-y="true">
+		<scroll-view style="width: 100%;height: calc(100vh - 20px);" scroll-y="true">
 			<u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" style="margin-left: 20rpx;">
 				<u-form-item label="出库单号：" labelWidth="180rpx" style="height: 6vh">
 					<u--input v-model.number="form.outCode" placeholder="自动生成" :disabled="true"
@@ -575,7 +575,7 @@
 
 	.chronic-science {
 		width: 100%;
-		height: 35vh;
+		height: 25vh;
 
 		.scroll-view-item {
 			width: 96%;
diff --git a/pages/enterAndExit/exit/index.vue b/pages/enterAndExit/exit/index.vue
index 7c7a8cc..3822562 100644
--- a/pages/enterAndExit/exit/index.vue
+++ b/pages/enterAndExit/exit/index.vue
@@ -155,15 +155,15 @@ page {
   //从上到下渐变
   min-height: 88vh;
   background-size: 100% 100%;
+
 }
 
 .content {
-  background: #f9fbff;
-  height: 88vh;
+  height: 100vh;
   display: flex;
   flex-wrap: wrap;
   align-content: flex-start;
-
+  background: #f9fbff;
   .search-form {
     display: flex;
     width: 98%;
@@ -185,7 +185,7 @@ page {
 
   .chronic-science {
     width: 100%;
-    height: 84vh;
+    height: 82vh;
 
     .scroll-view-item {
       width: 96%;
diff --git a/pages/enterAndExit/exit/recordDetail.vue b/pages/enterAndExit/exit/recordDetail.vue
index c8874c0..cadf75c 100644
--- a/pages/enterAndExit/exit/recordDetail.vue
+++ b/pages/enterAndExit/exit/recordDetail.vue
@@ -173,7 +173,7 @@ export default {
 <style lang="scss" scoped>
 .content {
   background: #F7F7F7;
-  height: 94.9vh;
+  height: 100vh;
   display: flex;
   flex-wrap: wrap;
   align-content: flex-start;
@@ -183,8 +183,8 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
-    margin-top: 20rpx;
-    padding: 20rpx;
+    margin-top: 10rpx;
+    padding: 10rpx;
 
     .title {
       width: 25%;
@@ -203,7 +203,7 @@ export default {
 
   .chronic-science {
     width: 100%;
-    height: 48vh;
+    height: 52vh;
 
     .scroll-view-item {
       width: 96%;
diff --git a/pages/enterAndExit/goods/index.vue b/pages/enterAndExit/goods/index.vue
index cd95a2f..f7ddfc0 100644
--- a/pages/enterAndExit/goods/index.vue
+++ b/pages/enterAndExit/goods/index.vue
@@ -105,7 +105,7 @@ page {
 
 .content {
   background: #f9fbff;
-  height: 88vh;
+  height: 100vh;
   display: flex;
   flex-wrap: wrap;
   align-content: flex-start;
diff --git a/pages/enterAndExit/mine/index.vue b/pages/enterAndExit/mine/index.vue
index d05bfa3..5196a37 100644
--- a/pages/enterAndExit/mine/index.vue
+++ b/pages/enterAndExit/mine/index.vue
@@ -22,7 +22,7 @@ export default {
   data() {
     return {
       fontValue: uni.getStorageSync('fontSize') || 8,
-      username: Cookies.get('username')
+      username: Cookies.get('username') || uni.getStorageSync('username')
     }
   },
   onLoad() {
@@ -48,7 +48,7 @@ export default {
 <style lang="scss" scoped>
 .content {
   background: #f9fbff;
-  height: 95vh;
+  height: 100vh;
   display: flex;
   flex-wrap: wrap;
   align-content: flex-start;
diff --git a/pages/login.vue b/pages/login.vue
index e721c22..41765bb 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,38 +1,33 @@
 <template>
   <page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
   <view class="normal-login-container">
-    <view class="login-form-content">
+    <view class="login-form-content" style="margin-top: 50px;padding: 10px">
      <view class="input-item">
-       <view style="width: 100%;float:left;display: flex;"><text style="font-size: 40rpx">您好</text></view>
+       <view style="width: 100%;float:left;display: flex;"><text style="font-size: 48rpx">您好</text></view>
        <view style="width: 100%;float:left;display: flex;"><text style="font-size: 40rpx;margin-top: 10rpx;">欢迎使用手持一体机</text></view>
      </view>
       <view class="input-item"  style="margin-top: 30px;">
-        <view style="color: #777;margin-bottom: 4px;font-size: 28rpx;">账号</view>
         <view style="padding: 10rpx;background: #F7F9FC;border-radius: 32rpx;width: 100%;">
-          <uni-easyinput v-model="loginForm.username" placeholder="请输入账号" :inputBorder="false" maxlength="11"
+          <uni-easyinput v-model="loginForm.username" placeholder="请输入账号" :inputBorder="false" maxlength="20" prefixIcon="person"
                          :styles="{backGround:'#F7F9FC'}"/>
         </view>
       </view>
       <view class="input-item flex align-center">
-        <view style="color: #777;margin-bottom: 4px;font-size: 28rpx;">密码</view>
         <view style="padding: 10rpx;background: #F7F9FC;border-radius: 32rpx;width: 100%;">
-          <uni-easyinput type="password" prefixIcon="user" v-model="loginForm.password" placeholder="请输入密码" :inputBorder="false"
+          <uni-easyinput type="password" prefixIcon="locked" v-model="loginForm.password" placeholder="请输入密码" :inputBorder="false"
                          :styles="{backGround:'#F7F9FC'}" />
         </view>
       </view>
       <u-checkbox-group v-model="remember" shape="circle" @change="rememberPassword"
-                        style="margin-bottom: 20px;margin-left: 20rpx;font-size: 28rpx">
+                        style="margin-bottom: 20px;margin-left: 40rpx;font-size: 28rpx">
         <u-checkbox label="记住密码" name="remember"></u-checkbox>
       </u-checkbox-group>
-      <view class="action-btn" style="margin-top: 10vh;">
+      <view class="action-btn" style="margin-top: 8vh;">
         <u-button shape="circle" color="#FFB679" @click="handleLogin"
-                  style="height: 72rpx;font-weight: bold;font-size: 28rpx;">登录
+                  style="height: 90rpx;font-weight: bold;font-size: 28rpx;">登录
         </u-button>
       </view>
     </view>
-    <view style="width: 100%;min-height: 30vh;min-width:  30vw;display: flex;justify-content: center;align-items: center;margin-top: 20px;">
-      <image src="/static/images/handheld/login_bg.png" style="min-width: 30vw;min-height: 30vh;" mode="aspectFit"></image>
-    </view>
   </view>
 </template>
 
@@ -40,11 +35,15 @@
 import { getCodeImg } from '@/api/login'
 import AES from '@/utils/aes'
 import Cookies from 'js-cookie'
+import UniEasyinput from '@/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue'
+import UCheckboxGroup from '@/uni_modules/uview-ui/components/u-checkbox-group/u-checkbox-group.vue'
+import UCheckbox from '@/uni_modules/uview-ui/components/u-checkbox/u-checkbox.vue'
 
 export default {
+  components: { UCheckbox, UCheckboxGroup, UniEasyinput },
   data() {
     return {
-      userIcon: '/static/images/handheld/userIcon.png',
+      userIcon: '/static/images/handheld/ic_user.png',
       fontValue: uni.getStorageSync('fontSize') || 8,
       codeUrl: '',
       captchaEnabled: true,
@@ -182,32 +181,24 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-page {
-  //从上到下渐变
-  background: linear-gradient(180deg, rgba(228, 245, 254, 1) 0%, rgba(255, 255, 255, 0.8) 15%);
-  min-height: 100vh;
-  background-size: 100% 100%;
-}
-
 .forget {
   margin-top: 20px;
   color: $u-primary;
 }
 
 .normal-login-container {
+  background-size: contain;
+  background-image: url("/static/images/handheld/ic_login_bg.jpg");
   //从上到下渐变
   width: 100%;
   height: 100%;
   min-height: 100vh;
   display: flex;
-  justify-content: center;
-  align-items: center;
   flex-direction: column;
-
   .login-form-content {
     text-align: center;
     background: transparent;
-    width: 80%;
+    width: 100%;
     height: 100%;
     .input-item {
       margin: 0 auto 20px;
diff --git a/static/images/handheld/ic_login_bg.jpg b/static/images/handheld/ic_login_bg.jpg
new file mode 100644
index 0000000..330e5f5
Binary files /dev/null and b/static/images/handheld/ic_login_bg.jpg differ
diff --git a/static/images/handheld/ic_password.png b/static/images/handheld/ic_password.png
new file mode 100644
index 0000000..0a3cff2
Binary files /dev/null and b/static/images/handheld/ic_password.png differ
diff --git a/static/images/handheld/ic_title_bg.png b/static/images/handheld/ic_title_bg.png
new file mode 100644
index 0000000..803a35e
Binary files /dev/null and b/static/images/handheld/ic_title_bg.png differ
diff --git a/static/images/handheld/ic_user.png b/static/images/handheld/ic_user.png
new file mode 100644
index 0000000..4604831
Binary files /dev/null and b/static/images/handheld/ic_user.png differ