zhengkaixin 10 kuukautta sitten
vanhempi
commit
f9ca8a1793

BIN
assets/img/logo/logo1.png


BIN
assets/img/logo/logo2.png


+ 2 - 2
config/.env.dev.js

@@ -12,9 +12,9 @@ const UNI_APP = {
 	openId:"123",//zq
 	//openId:"oLowyuMMjIkA_bLA4MXzRQ3KJB2E",//test
 	//openId:"oLowyuNkSxqovYoobKbeHB1nSkm0",//测试人员 开发环境
-	openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //王晓春
+	//openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //王晓春
 	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
-	openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
+	//openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
 	//openId:"oLowyuNkSxqovYoobKbeHB1nSkm0", //sz
 	//openId:"oLowyuHCGgMomNBQEXZSbb5SJxfQ",//ys
 	//openId:"oLowyuB1PliW0qAnJJ56axydeUOM",//zq

+ 9 - 9
pages/login/login.vue

@@ -1,12 +1,12 @@
 <template >
 	<view>
 		<view class="logo">
-			<image class="img" src="@/assets/img/logo.png" mode=""></image>
+			<image class="img" src="@/assets/img/logo/logo1.png" mode=""></image>
 			
 		</view>
-		<view  class="logoText">
+		<!-- <view  class="logoText">
 			e家能源
-		</view>
+		</view> -->
 		<!-- 手机号/密码 -->
 		<view class="input-box">
 			
@@ -143,20 +143,20 @@
 	}
 	.logo{
 		margin: 0 auto;
-		width: 160rpx;
-		height: 160rpx;
+		//width: 160rpx;
+		
 		border-radius: 16px;
-		background: linear-gradient(180deg, rgba(31,85,255,1) 0%,rgba(39,171,255,1) 100%);
+		//background: linear-gradient(180deg, rgba(31,85,255,1) 0%,rgba(39,171,255,1) 100%);
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		.img{
 			
-			width: 112rpx;
-			height: 112rpx;
+			width: 282rpx;
+			height: 66rpx;
 		}
 	}
-
+	
 .input-box{
 	padding: 0 58rpx;
 	margin-top: 112rpx;

+ 1 - 1
uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue

@@ -83,7 +83,7 @@
 			// tabbar的高度,默认50px,单位任意,如果为数值,则为rpx单位
 			height: {
 				type: [String, Number],
-				default: '50px'
+				default: '100rpx'
 			},
 			// 非凸起图标的大小,单位任意,数值默认rpx
 			iconSize: {