1004749546@qq.com 4 years ago
parent
commit
316354ab3d

+ 2 - 2
manifest.json

@@ -1,7 +1,7 @@
 {
 {
-    "name" : "分类垃圾录入端",
+    "name" : "乐色超人(骑手端)",
     "appid" : "__UNI__778E110",
     "appid" : "__UNI__778E110",
-    "description" : "智享亿家分类垃圾录入端小程序",
+    "description" : "乐色超人(骑手端)小程序",
     "versionName" : "1.0.0",
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "versionCode" : "100",
     "transformPx" : false,
     "transformPx" : false,

+ 4 - 5
pages/login/login.vue

@@ -3,8 +3,8 @@
 		<!-- <view> -->
 		<!-- <view> -->
 			<view>
 			<view>
 				<view class="logo-cont">
 				<view class="logo-cont">
-					<u-image src="/static/login_icon.png" width="160" height="160" class="logo"></u-image>
-					<u-image src="/static/login_slogan.png" mode="aspectFit" width="286" height="36" class="logo_text"></u-image>
+					<u-image src="/static/logo.png" width="160" height="160" class="logo"></u-image>
+					<!-- <u-image src="/static/login_slogan.png" mode="aspectFit" width="286" height="36" class="logo_text"></u-image> -->
 				</view>
 				</view>
 				<view class="login-btns">
 				<view class="login-btns">
 					<u-button shape="circle" :custom-style="wxButton" class="login-btn" type="success" :hair-line="false" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
 					<u-button shape="circle" :custom-style="wxButton" class="login-btn" type="success" :hair-line="false" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
@@ -158,7 +158,7 @@
 	.content{
 	.content{
 		width: 100%;
 		width: 100%;
 		height: 100vh;
 		height: 100vh;
-		padding:0 40upx;
+		padding:0 120upx;
 		margin: 0 auto;
 		margin: 0 auto;
 		.logo-cont{
 		.logo-cont{
 			display: flex;
 			display: flex;
@@ -167,7 +167,7 @@
 		}
 		}
 		.logo{
 		.logo{
 			display: inline-block;
 			display: inline-block;
-			margin:250upx 256upx 24upx;
+			margin:250upx 256upx 120upx;
 		}
 		}
 		.logo_text{
 		.logo_text{
 			display: inline-block;
 			display: inline-block;
@@ -175,7 +175,6 @@
 		}
 		}
 		.login-btn{
 		.login-btn{
 			display: block;
 			display: block;
-			width: 670upx;
 			height: 80upx;
 			height: 80upx;
 		}
 		}
 		.phoneBtn:active{
 		.phoneBtn:active{

+ 2 - 2
pages/login/loginPw.scss

@@ -3,11 +3,11 @@
 	width: 100%;
 	width: 100%;
 	height: 100vh;
 	height: 100vh;
 	box-sizing: border-box;
 	box-sizing: border-box;
-	padding: 0 40upx;
+	padding: 0 120upx;
 	.logo{
 	.logo{
 		display: block;
 		display: block;
 		margin: 0 auto;
 		margin: 0 auto;
-		padding: 200upx 256upx 60upx;
+		padding: 240upx 176upx 80upx;
 	}
 	}
 	.login-form{
 	.login-form{
 		display: block;
 		display: block;

+ 3 - 1
pages/login/phoneLogin.vue

@@ -1,7 +1,9 @@
 <template>
 <template>
 	<view class="login-wrap">
 	<view class="login-wrap">
 		<!-- <view v-if="!buildType" style="text-align: center;color: #999999;padding-top: 40px;">{{ envTips }}</view> -->
 		<!-- <view v-if="!buildType" style="text-align: center;color: #999999;padding-top: 40px;">{{ envTips }}</view> -->
-		<u-image src="/static/login_icon.png" width="160" height="160" class="logo"></u-image>
+		<view class="logo">
+			<u-image src="/static/logo.png" width="160" height="160"></u-image>
+		</view>
 		<form class="login-form" @submit="formSubmit">
 		<form class="login-form" @submit="formSubmit">
 			<view class="form-item">
 			<view class="form-item">
 				<u-image src="/static/user_icon_number.png" width="44" height="44" class="logo_user_icon"></u-image>
 				<u-image src="/static/user_icon_number.png" width="44" height="44" class="logo_user_icon"></u-image>

+ 1 - 1
pages/userCenter/index.vue

@@ -9,7 +9,7 @@
 			<view class="user-info">
 			<view class="user-info">
 				<view v-if="hasLogin" class="user-info-item">{{userData.stationName || ''}}</view>
 				<view v-if="hasLogin" class="user-info-item">{{userData.stationName || ''}}</view>
 				<view v-if="hasLogin" class="user-info-item">{{userData.gatherName||''}} {{userData.gatherPhone || ''}}</view>
 				<view v-if="hasLogin" class="user-info-item">{{userData.gatherName||''}} {{userData.gatherPhone || ''}}</view>
-				<view @click="toLoginPage" v-if="!hasLogin"  class="user-info-item">
+				<view v-if="!hasLogin"  class="user-info-item" @click="toLoginPage">
 					请点击登录
 					请点击登录
 				</view>
 				</view>
 				<!-- <u-button v-else="!hasLogin" plain size="mini" shape="circle" @click="toLoginPage">立即登录</u-button> -->
 				<!-- <u-button v-else="!hasLogin" plain size="mini" shape="circle" @click="toLoginPage">立即登录</u-button> -->

BIN
static/logo.jpg


BIN
static/logo.png