From c4246ca910f28014efaace64ebf92f47a673a9cf Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 25 Jan 2021 11:47:46 +0800
Subject: [PATCH] gx

---
 hive-app/pages/login/index.vue |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/hive-app/pages/login/index.vue b/hive-app/pages/login/index.vue
index a7614f8..6772133 100644
--- a/hive-app/pages/login/index.vue
+++ b/hive-app/pages/login/index.vue
@@ -5,29 +5,32 @@
 		<view class="status_bar"></view>
 		<!-- #endif -->
 		<view class="login-header">
-			<view class="logo"></view>
-			<text>蜂巢美业</text>
+			<!-- <view class="logo-wrap"> -->
+				<image src="../../static/images/logo.png" mode="widthFix" class="logo"></image>
+			<!-- </view> -->
+			
+			<text>讯聪美业</text>
 		</view>
 		<view class="login-box">
-			<text class="title">登录</text>
+			<!-- <text class="title">登录</text> -->
 			<view class="input-group-row">
-				<input v-model="username" type="text" maxlength="60"  placeholder="请输入账号" placeholder-class='placeholder'/>
+				<input v-model="username" type="text" maxlength="60" :disabled="isDisabled"  placeholder="请输入账号" placeholder-class='placeholder'/>
 			</view>
 			<template v-if="isHidePwd">
 				<view class="input-group-row mt-10">
-					<input v-model="password" type="password" maxlength="60" placeholder="请输入密码" placeholder-class="placeholder" />
+					<input v-model="password" type="password" :disabled="isDisabled" maxlength="60" placeholder="请输入密码" placeholder-class="placeholder" />
 					<text @click="isHidePwd=false" class="iconfont iconyanjing font-18 gray"></text>
 				</view>
 			</template>
 			<template v-else>
 				<view class="input-group-row mt-10">
-					<input v-model="password" type="text" maxlength="60" placeholder="请输入密码" placeholder-class="placeholder" />
+					<input v-model="password" type="text" :disabled="isDisabled" maxlength="60" placeholder="请输入密码" placeholder-class="placeholder" />
 					<text @click="isHidePwd=true" class="iconfont iconyanjing1 gray"></text>
 				</view>
 			</template>
-			<view class="forget-pwd">
+			<navigator class="forget-pwd" url="./forgetPassword" hover-class="none">
 				<text>忘记密码?</text>
-			</view>
+			</navigator>
 			<button :disabled="isDisabled" class="blue-btn" @click="login">登录</button>
 		</view>
 	</view>
@@ -51,7 +54,6 @@
 		methods:{
 			isLogin(){
 				let token = this.$httpUtils.getToken();
-				console.log(token)
 				if(token){
 					uni.switchTab({
 						url: '../workbench/index'
@@ -83,7 +85,8 @@
 						    key: 'userInfo',
 						    data: JSON.stringify({
 								token: mapInfo.token,
-								roleInfo: mapInfo.user
+								roleInfo: mapInfo.user,
+								userFunction: mapInfo.userFunction
 							}),
 						    success: () => {
 						        uni.switchTab({
@@ -114,7 +117,7 @@
 		font-size: 20px;
 		color: #FFFFFF;
 	}
-	.logo{
+	.logo-wrap{
 		display: block;
 		width: 72px;
 		height: 72px;
@@ -122,6 +125,12 @@
 		border-radius: 8px;
 		margin: 0 auto 10px;
 	}
+	.logo{
+		width: 92px;
+		display: block;
+		margin: 0 auto 10px;
+		/* height: 72px; */
+	}
 	.login-box{
 		margin: -50px 10px 0;
 		padding: 30px 20px;

--
Gitblit v1.9.1