修改logo

config/.env.dev.js

@@ -5,20 +5,20 @@ const UNI_APP = {
 	BASE_URL: 'https://charging.xiaoxinda.com/electric-manager-api/', //test
 	 BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
 	
-	BASE_URL:'http://192.168.77.162:8081/electric-manager-api/', //sz
+	//BASE_URL:'http://192.168.77.162:8081/electric-manager-api/', //sz
 	//BASE_URL:'http://192.168.77.222:8086/railroad-server/',
 	
 	NODE_ENV :"dev",
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
-	// openId:"1234",//开发人员2
+	 openId:"1234",//开发人员2
 	// openId:"55555",//测试人员 开发环境
 	// openId:"111111", //sz
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
-	 openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
+	// openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
 	// openId:"oLowyuNkSxqovYoobKbeHB1nSkm0", //sz
 	//openId:"oLowyuMxAACLlFRDYcM9-w6v0b6o",
-	openId:"oLowyuB1PliW0qAnJJ56axydeUOM", //sz
+	//openId:"oLowyuB1PliW0qAnJJ56axydeUOM", //sz
 	//openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //wang
 	//openId:"oLowyuBCNjfiU-RXOy8Qv_l_rE-0", //me
 	//openId:"oLowyuFTU3SzpvU4pGNzWk7NC9y0", //wky

pages/login/login.vue

@@ -1,12 +1,13 @@
 <template >
 	<view>
-		<view class="logo">
-			<image class="img" src="@/assets/img/logo.png" mode=""></image>
-			
-		</view>
-		<view  class="logoText">
-			e家能源
-		</view>
+	<view class="logo">
+		<image class="img" src="@/assets/img/logo/logo1.png" mode=""></image>
+		
+	</view>
+	<!-- <view  class="logoText">
+		e家能源
+	</view> -->
+	<!-- 手机号/密码 -->
 		<!-- 手机号/密码 -->
 		<view class="input-box">
 			
@@ -168,17 +169,17 @@
 	}
 	.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;
 		}
 	}
 

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: {