diff --git a/common/style/layout.css b/common/style/layout.css
index f0a01e9..f2bc634 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -12,20 +12,41 @@ uni-page-body {
 /** iconfont */
 @font-face {
   font-family: 'iconfont';
-  src: url('@/static/iconfont/iconfont.woff2?t=1628753103983') format('woff2'),
-       url('@/static/iconfont/iconfont.woff?t=1628753103983') format('woff'),
-       url('@/static/iconfont/iconfont.ttf?t=1628753103983') format('truetype');
+  src: url('@/static/iconfont/iconfont.woff2?t=1665454521636') format('woff2'),
+       url('@/static/iconfont/iconfont.woff?t=1665454521636') format('woff'),
+       url('@/static/iconfont/iconfont.ttf?t=1665454521636') format('truetype');
 }
 .iconfont {
   font-family: "iconfont" !important;
-  font-size: 16rem;
+  font-size: 50rpx;
+  color: #000;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-.open_icon::before {
-	content: '\ec0c'
+.icon_eye_close {
+	color: #bbb;
 }
+.icon_eye_active {
+	color: #ff6a00;
+}
+.icon_unchecked {
+	color: #fff;
+	width: 32rpx;
+	height: 32rpx;
+	background-color: #fff;
+	font-size: 24rpx;
+	border: 1rpx solid #bbb;
+}
+.icon_checked {
+	color: #ff6a00;
+	border: 1rpx solid #ff6a00;
+}
+
+
+/* .open_icon::before {
+	content: '\ec0c'
+} */
 
 /** 内容 */
 .content {
diff --git a/common/style/mixin.styl b/common/style/mixin.styl
index 573a922..f564d40 100644
--- a/common/style/mixin.styl
+++ b/common/style/mixin.styl
@@ -1,4 +1,4 @@
-$red = #e74f1a
+$red = #ff6a00
 $green = #6CBE8B
 $yellow = #E9B451
 $blue = #6798ef
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 61769ec..0eea730 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -7,11 +7,11 @@
 		</view>
 		<div class="input-box">
 			<input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password">
-			<text class="uni-icon" :class="[showPassword ? 'uni-eye-active' : '']" @click="changePassword">&#xe568;</text>
+			<span class="iconfont icon_eye_close" :class="[showPassword ? 'icon_eye_active' : '']" @click="changePassword">&#xe6a0;</span>
 	    </div>
 		<view class="radio-box">
 			<view class="radio-wrap">
-				<view class="iconfont icon-check" :class="{'icon-checked': saveUser}" @click="toSaveUser"></view>
+				<span class="iconfont icon_unchecked" :class="{'icon_checked': saveUser}"  @click="toSaveUser">&#xe66b;</span>
 				<text class="radio-label">记住用户名</text>
 			</view>
 			<text class="setup-text" @click="setup">设置</text>
@@ -46,9 +46,9 @@
 				})
 			},
 			async toLogin() {
-				// uni.redirectTo({
-				// 	url: '/pages/home/home'
-				// })
+				uni.redirectTo({
+					url: '/pages/home/home'
+				})
 				this.disabled = true
 				if (this.user === '') {
 					uni.showToast({
@@ -58,7 +58,7 @@
 					this.disabled = false
 					return
 				}
-				  if (this.password === '') {
+				if (this.password === '') {
 					uni.showToast({
 						title: '密码不能为空',
 						icon: 'none'
@@ -104,13 +104,6 @@
 	_wh(calc(100% - 40rpx), 74rpx)
 	_font(32rpx,74rpx,#999)
 	padding-left 10rpx
-.uni-icon
-	_wh(37rpx,37rpx)
-	font-family uniicons
-	_font(37rpx,37rpx, #999)
-.uni-eye-active {
-	color: #007AFF;
-}
 .radio-box
 	_fj()
 	margin: 25rpx 0 70rpx 0
@@ -118,18 +111,11 @@
 .radio-wrap
 	_fj()
 	height: 34rpx
-.icon-check
-	_wh(30rpx,30rpx)
-	background-color: #ffffff
-	border: 1px solid #d7592f
-	border-radius: 50%
-.icon-checked
-	background-color: #d7592f
 .radio-label
 	_font(28rpx, 28rpx,#333)
-	padding-left: 20rpx
+	padding-left: 10rpx
 .setup-text
-	_font(28rpx, 28rpx,$blue,,right)
+	_font(28rpx, 28rpx,$red,,right)
 .bg
 	_bis('../../static/image/login_bg.png', 100%,,bottom)
 .login-btn
diff --git a/static/.DS_Store b/static/.DS_Store
index b3e36b4..baec853 100644
Binary files a/static/.DS_Store and b/static/.DS_Store differ
diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf
index 5ade409..4ee5e5b 100644
Binary files a/static/iconfont/iconfont.ttf and b/static/iconfont/iconfont.ttf differ
diff --git a/static/iconfont/iconfont.woff b/static/iconfont/iconfont.woff
index 68ffa54..ad3eb79 100644
Binary files a/static/iconfont/iconfont.woff and b/static/iconfont/iconfont.woff differ
diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2
index 46da59c..b169259 100644
Binary files a/static/iconfont/iconfont.woff2 and b/static/iconfont/iconfont.woff2 differ
diff --git a/utils/getData1.js b/utils/getData1.js
new file mode 100644
index 0000000..e69de29
diff --git a/utils/getData2.js b/utils/getData2.js
new file mode 100644
index 0000000..e69de29