Showing
13 changed files
with
36 additions
and
19 deletions
1 | -.commonTop_main{width:100%;height:316rpx}.commonTop_main .top_image{height:100%;width:100%;position:absolute;top:0;left:0;z-index:-1}.commonTop_main .commonTop_text{font-family:PingFangSC-Semibold;font-size:36rpx;color:#323241;padding-left:28rpx;height:248rpx;line-height:248rpx;font-weight:600} | 1 | +.commonTop_main{width:100%;height:316rpx}.commonTop_main .top_image{height:100%;width:100%;position:absolute;top:0;left:0;z-index:-1}.commonTop_main .commonTop_text{font-family:PingFangSC-Semibold;font-size:36rpx;color:#323241;padding-left:28rpx;height:288rpx;line-height:288rpx;font-weight:600} |
@@ -18,8 +18,8 @@ | @@ -18,8 +18,8 @@ | ||
18 | // background: red; | 18 | // background: red; |
19 | // text-align: center; | 19 | // text-align: center; |
20 | padding-left: 28rpx; | 20 | padding-left: 28rpx; |
21 | - height: 248rpx; | ||
22 | - line-height: 248rpx; | 21 | + height: 288rpx; |
22 | + line-height: 288rpx; | ||
23 | font-weight: 600; | 23 | font-weight: 600; |
24 | } | 24 | } |
25 | } | 25 | } |
@@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
17 | font-size: 36rpx; | 17 | font-size: 36rpx; |
18 | color: #323241; | 18 | color: #323241; |
19 | padding-left: 28rpx; | 19 | padding-left: 28rpx; |
20 | - height: 248rpx; | ||
21 | - line-height: 248rpx; | 20 | + height: 288rpx; |
21 | + line-height: 288rpx; | ||
22 | font-weight: 600; | 22 | font-weight: 600; |
23 | } | 23 | } |
@@ -84,7 +84,7 @@ Page({ | @@ -84,7 +84,7 @@ Page({ | ||
84 | }).then((data: any) => { | 84 | }).then((data: any) => { |
85 | wx.clearStorageSync() | 85 | wx.clearStorageSync() |
86 | if (data.success) { | 86 | if (data.success) { |
87 | - wx.navigateTo({ url: "/pages/login/login" }) | 87 | + wx.reLaunch({ url: "/pages/login/login" }) |
88 | } | 88 | } |
89 | }) | 89 | }) |
90 | }, | 90 | }, |
1 | -.home_main{height:100vh;width:100%}.home_main .home-info{width:100%;background:#3499ff;height:160rpx;padding:40rpx 20rpx;margin-top:100rpx;display:flex}.home_main .home-info .home-info-avatar{font-size:48rpx;background:#fff;color:#3499ff;border-radius:50%;width:120rpx;height:120rpx;text-align:center;line-height:120rpx;margin-right:20rpx}.home_main .home-info .mine-info{color:#fff}.home_main .home-info .mine-info .mine-info-basic{font-size:40rpx}.home_main .home-info .mine-info .mine-company{margin-top:20rpx}.home_main .home-info .mine-info .mine-company .mine-company-info{font-size:28rpx} | 1 | +.home_main{height:100vh;width:100%}.home_main .home-info{width:100%;background:#3499ff;height:260rpx;padding:40rpx 20rpx;display:flex;align-items:center}.home_main .home-info .home-info-avatar{font-size:48rpx;background:#fff;color:#3499ff;border-radius:50%;width:120rpx;height:120rpx;text-align:center;line-height:120rpx;margin-right:20rpx}.home_main .home-info .mine-info{color:#fff}.home_main .home-info .mine-info .mine-info-basic{font-size:40rpx}.home_main .home-info .mine-info .mine-company{margin-top:20rpx}.home_main .home-info .mine-info .mine-company .mine-company-info{font-size:28rpx} |
@@ -6,10 +6,11 @@ | @@ -6,10 +6,11 @@ | ||
6 | .home-info { | 6 | .home-info { |
7 | width: 100%; | 7 | width: 100%; |
8 | background: #3499ff; | 8 | background: #3499ff; |
9 | - height: 160rpx; | 9 | + height: 260rpx; |
10 | padding: 40rpx 20rpx; | 10 | padding: 40rpx 20rpx; |
11 | - margin-top: 100rpx; | 11 | + // margin-top: 120rpx; |
12 | display: flex; | 12 | display: flex; |
13 | + align-items: center; | ||
13 | 14 | ||
14 | .home-info-avatar { | 15 | .home-info-avatar { |
15 | font-size: 48rpx; | 16 | font-size: 48rpx; |
@@ -6,10 +6,10 @@ | @@ -6,10 +6,10 @@ | ||
6 | .home_main .home-info { | 6 | .home_main .home-info { |
7 | width: 100%; | 7 | width: 100%; |
8 | background: #3499ff; | 8 | background: #3499ff; |
9 | - height: 160rpx; | 9 | + height: 260rpx; |
10 | padding: 40rpx 20rpx; | 10 | padding: 40rpx 20rpx; |
11 | - margin-top: 100rpx; | ||
12 | display: flex; | 11 | display: flex; |
12 | + align-items: center; | ||
13 | } | 13 | } |
14 | 14 | ||
15 | .home_main .home-info .home-info-avatar { | 15 | .home_main .home-info .home-info-avatar { |
1 | -.login_main{height:100vh;width:100%;background-image:linear-gradient(180deg, rgba(7,54,207,0.08), rgba(0,90,255,0) 48%)}.login_main .login_content{margin:0 20rpx}.login_main .login_content .login_log{display:flex;width:100%;justify-content:center;padding-top:250rpx}.login_main .login_content .login_log .welcome-logo{width:300rpx;height:100rpx}.login_main .login_content .login_form{margin-top:100rpx;padding:0 50rpx;position:relative}.login_main .login_content .login_form .passwordMargin{margin-top:200rpx}.login_main .login_content .login_form .code-img{position:absolute;bottom:120rpx;right:50rpx;width:100rpx;height:80rpx}.login_main .login_content .login_form .login_btn{margin-top:20rpx;display:flex;justify-content:center;align-items:center;border-radius:10rpx;font-size:40rpx;color:#fff;text-align:center;line-height:100rpx;font-weight:400;background:rgba(23,100,255,0.9);box-shadow:0 0 1.06667vw 0 rgba(23,100,255,0.5)} | 1 | +.login_main{height:100vh;width:100%;background-image:linear-gradient(180deg, rgba(7,54,207,0.08), rgba(0,90,255,0) 48%)}.login_main .login_content{margin:0 20rpx}.login_main .login_content .login_log{display:flex;width:100%;justify-content:center;align-items:center;padding-top:250rpx}.login_main .login_content .login_log .welcome-logo{width:60rpx;height:60rpx}.login_main .login_content .login_log .logo_text{font-size:40rpx;margin-left:10rpx;height:60rpx;line-height:60rpx}.login_main .login_content .login_form{margin-top:100rpx;padding:0 50rpx;position:relative}.login_main .login_content .login_form .passwordMargin{margin-top:200rpx}.login_main .login_content .login_form .code-img{position:absolute;bottom:120rpx;right:50rpx;width:100rpx;height:80rpx}.login_main .login_content .login_form .login_btn{margin-top:20rpx;display:flex;justify-content:center;align-items:center;border-radius:10rpx;font-size:40rpx;color:#fff;text-align:center;line-height:100rpx;font-weight:400;background:rgba(23,100,255,0.9);box-shadow:0 0 1.06667vw 0 rgba(23,100,255,0.5)} |
@@ -12,13 +12,20 @@ | @@ -12,13 +12,20 @@ | ||
12 | display: flex; | 12 | display: flex; |
13 | width: 100%; | 13 | width: 100%; |
14 | justify-content: center; | 14 | justify-content: center; |
15 | + align-items: center; | ||
15 | padding-top: 250rpx; | 16 | padding-top: 250rpx; |
16 | 17 | ||
17 | // background-image: linear-gradient(180deg, rgba(225, 233, 252, .05) 12%, #f8f8f9); | 18 | // background-image: linear-gradient(180deg, rgba(225, 233, 252, .05) 12%, #f8f8f9); |
18 | // background: red; | 19 | // background: red; |
19 | .welcome-logo { | 20 | .welcome-logo { |
20 | - width: 300rpx; | ||
21 | - height: 100rpx; | 21 | + width: 60rpx; |
22 | + height: 60rpx; | ||
23 | + } | ||
24 | + .logo_text { | ||
25 | + font-size: 40rpx; | ||
26 | + margin-left: 10rpx; | ||
27 | + height: 60rpx; | ||
28 | + line-height: 60rpx; | ||
22 | } | 29 | } |
23 | } | 30 | } |
24 | .login_form { | 31 | .login_form { |
@@ -7,7 +7,7 @@ Page({ | @@ -7,7 +7,7 @@ Page({ | ||
7 | * 页面的初始数据 | 7 | * 页面的初始数据 |
8 | */ | 8 | */ |
9 | data: { | 9 | data: { |
10 | - logoUrl: "./../../img/qixiao.png", | 10 | + logoUrl: "./../../img/wczd.png", |
11 | checkFlag: true, | 11 | checkFlag: true, |
12 | username: "15556367216",// 用户名 | 12 | username: "15556367216",// 用户名 |
13 | password: "efault",//密码 | 13 | password: "efault",//密码 |
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | <view class="login_content"> | 2 | <view class="login_content"> |
3 | <view class="login_log"> | 3 | <view class="login_log"> |
4 | <image src="{{logoUrl}}" class="welcome-logo" mode="" /> | 4 | <image src="{{logoUrl}}" class="welcome-logo" mode="" /> |
5 | + <view class="logo_text">徽辰智电</view> | ||
5 | </view> | 6 | </view> |
6 | <view class="login_form"> | 7 | <view class="login_form"> |
7 | <van-cell-group> | 8 | <van-cell-group> |
@@ -12,12 +12,20 @@ | @@ -12,12 +12,20 @@ | ||
12 | display: flex; | 12 | display: flex; |
13 | width: 100%; | 13 | width: 100%; |
14 | justify-content: center; | 14 | justify-content: center; |
15 | + align-items: center; | ||
15 | padding-top: 250rpx; | 16 | padding-top: 250rpx; |
16 | } | 17 | } |
17 | 18 | ||
18 | .login_main .login_content .login_log .welcome-logo { | 19 | .login_main .login_content .login_log .welcome-logo { |
19 | - width: 300rpx; | ||
20 | - height: 100rpx; | 20 | + width: 60rpx; |
21 | + height: 60rpx; | ||
22 | +} | ||
23 | + | ||
24 | +.login_main .login_content .login_log .logo_text { | ||
25 | + font-size: 40rpx; | ||
26 | + margin-left: 10rpx; | ||
27 | + height: 60rpx; | ||
28 | + line-height: 60rpx; | ||
21 | } | 29 | } |
22 | 30 | ||
23 | .login_main .login_content .login_form { | 31 | .login_main .login_content .login_form { |
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | position: absolute; | 8 | position: absolute; |
9 | top: 0; | 9 | top: 0; |
10 | left: 0; | 10 | left: 0; |
11 | - height: 316rpx; | 11 | + height: 336rpx; |
12 | width: 100%; | 12 | width: 100%; |
13 | z-index: -1; | 13 | z-index: -1; |
14 | } | 14 | } |
@@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
17 | /* background: red; */ | 17 | /* background: red; */ |
18 | 18 | ||
19 | /* background: #f3f7f7; */ | 19 | /* background: #f3f7f7; */ |
20 | - margin-top: 164rpx; | 20 | + margin-top: 184rpx; |
21 | /* height: 100vh; */ | 21 | /* height: 100vh; */ |
22 | /* width: 100%; */ | 22 | /* width: 100%; */ |
23 | padding: 24rpx 20rpx; | 23 | padding: 24rpx 20rpx; |