diff --git a/pages.json b/pages.json
index c5835a2..b4cf49b 100644
--- a/pages.json
+++ b/pages.json
@@ -22,19 +22,12 @@
 			}	
 		},
 		{
-			"path" : "pages/login/login",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{
 					"navigationBarTitleText": "注册",
-					"enablePullDownRefresh": false
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
 			}		
 		},
 		{

diff --git a/pages.json b/pages.json
index c5835a2..b4cf49b 100644
--- a/pages.json
+++ b/pages.json
@@ -22,19 +22,12 @@
 			}	
 		},
 		{
-			"path" : "pages/login/login",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{
 					"navigationBarTitleText": "注册",
-					"enablePullDownRefresh": false
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
 			}		
 		},
 		{
diff --git a/pages/login/login.vue b/pages/login/login.vue
deleted file mode 100644
index 6d57f8c..0000000
--- a/pages/login/login.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * 登录页面
- */
-<template>
-	<view class="login">
-		<!-- 头像部分 -->
-		<view class="avatar">
-			<image v-show="imgUrl" :src="imgUrl" class="img"></image>
-        <button v-show="!imgUrl" open-type="chooseAvatar" bindgetuserinfo="bindGetUserInfo" class="text" @chooseavatar="chooseAvatar">获取头像</button>
-		</view>
-		
-		<!-- 员工号、密码 -->
-		<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-			<u-form-item label="员工号" prop="number" labelWidth="80" class="form-item">
-				<u--input v-model="form.number" border="bottom" placeholder="请输入员工号"></u--input>
-			</u-form-item>
-			<u-form-item label="密码" prop="password" labelWidth="80" class="form-item">
-				<u--input v-model="form.password" border="bottom" password placeholder="请输入员密码"></u--input>
-			</u-form-item>
-		</u--form>
-		<!-- 登录按钮 -->
-		<!-- <view class="login-button" @click="login">登录</view> -->
-		<u-button type="primary"  @click="login" class="login-button">登录</u-button>
-		<!-- 忘记密码、注册部分 -->
-		<view class="bottom">
-			<!-- <view @click="goFindPassword">忘记密码</view> -->
-			<view @click="goRegister">未有账号，点击注册</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { getUserProfile } from '@/utils/auth.js';
-	import loginVue from './login.vue';
-	import store from '@/store';
-	export default {
-		data() {
-			return {
-				imgUrl: '', //头像url
-				form:{
-					number: '', //员工号
-					password: '', //密码
-				},
-				canIUse: wx.canIUse('button.open-type.getUserInfo'),
-				rules:{
-					number:[{required: true,
-					message: '请填写员工号',
-					trigger: ['blur', 'change'],}],
-					password:[{
-						required: true,
-						message: '请填写密码',
-						trigger: ['blur', 'change']
-					},
-					{
-						pattern: /^[0-9a-zA-Z]*$/g,
-						transform(value) {
-							return String(value);
-						},
-						message: '只能包含字母或数字'
-					},
-					{
-						min: 8,
-						max: 15,
-						message: '长度在8-15个字符之间'
-					}]
-				},
-			}
-		},
-		created(){
-	   },
-		methods: {
-			login(){  //点击登录
-				
-			},
-			bindGetUserInfo(e) {
-			    console.log(e.detail.userInfo,'0000');
-             },
-			 getUserInfo() {
-				 const thds = this
-			     // 查看是否授权
-			     wx.getSetting({
-			       success (res){
-			         if (res.authSetting['scope.userInfo']) {
-			           // 已经授权，可以直接调用 getUserInfo 获取头像昵称
-			           wx.getUserInfo({
-			             success: function(res) {
-			               console.log(res.userInfo)
-						   thds.imgUrl = res.userInfo.avatarUrl
-			             }
-			           })
-			         }
-			       }
-				   })
-				   },
-			//跳转注册页面
-			goRegister() {
-				wx.navigateTo({
-					url: '/pages/register/register'
-				})
-			},
-			chooseAvatar(res){
-				this.imgUrl = res.detail.avatarUrl
-			},
-			//点击授权头像昵称
-			authorization() {
-				getUserProfile(this.onAuthSuccess);
-			},
-			// 用户信息授权成功回调
-			async onAuthSuccess(nickName, avatarUrl) {
-				this.$store.commit('setUserInfo', { wxName: nickName, avatarUrl });
-				console.log(this.$store.state.userInfo);
-				const { wxName, avatarUrl: imgUrl } = this.$store.state.userInfo;
-				this.imgUrl = imgUrl;
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.login {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		padding: 50rpx;
-		.avatar {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 200rpx;
-			height: 200rpx;
-			background-color: #999;
-			border-radius: 100rpx;
-			margin-bottom: 80rpx;
-			.img {
-				width: 100%;
-				height: 100%;
-				border-radius: 100rpx;
-			}
-		}
-		.input-area {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-bottom: 32rpx ;
-		}
-		.login-button {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 200rpx;
-			height: 80rpx;
-			background-color: #1076e3;
-			color: #fff;
-			margin-top: 50rpx;
-			border-radius: 16rpx;
-		}
-		.text{
-			width: 100%;
-			height: 100%;
-			text-align: center;
-			line-height: 200rpx;
-			border-radius: 100rpx;
-			// border: none;
-		}
-		.bottom {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			color: blue;
-			margin-top: 32rpx;
-		}
-	}
-</style>

diff --git a/pages.json b/pages.json
index c5835a2..b4cf49b 100644
--- a/pages.json
+++ b/pages.json
@@ -22,19 +22,12 @@
 			}	
 		},
 		{
-			"path" : "pages/login/login",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{
 					"navigationBarTitleText": "注册",
-					"enablePullDownRefresh": false
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
 			}		
 		},
 		{
diff --git a/pages/login/login.vue b/pages/login/login.vue
deleted file mode 100644
index 6d57f8c..0000000
--- a/pages/login/login.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * 登录页面
- */
-<template>
-	<view class="login">
-		<!-- 头像部分 -->
-		<view class="avatar">
-			<image v-show="imgUrl" :src="imgUrl" class="img"></image>
-        <button v-show="!imgUrl" open-type="chooseAvatar" bindgetuserinfo="bindGetUserInfo" class="text" @chooseavatar="chooseAvatar">获取头像</button>
-		</view>
-		
-		<!-- 员工号、密码 -->
-		<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-			<u-form-item label="员工号" prop="number" labelWidth="80" class="form-item">
-				<u--input v-model="form.number" border="bottom" placeholder="请输入员工号"></u--input>
-			</u-form-item>
-			<u-form-item label="密码" prop="password" labelWidth="80" class="form-item">
-				<u--input v-model="form.password" border="bottom" password placeholder="请输入员密码"></u--input>
-			</u-form-item>
-		</u--form>
-		<!-- 登录按钮 -->
-		<!-- <view class="login-button" @click="login">登录</view> -->
-		<u-button type="primary"  @click="login" class="login-button">登录</u-button>
-		<!-- 忘记密码、注册部分 -->
-		<view class="bottom">
-			<!-- <view @click="goFindPassword">忘记密码</view> -->
-			<view @click="goRegister">未有账号，点击注册</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { getUserProfile } from '@/utils/auth.js';
-	import loginVue from './login.vue';
-	import store from '@/store';
-	export default {
-		data() {
-			return {
-				imgUrl: '', //头像url
-				form:{
-					number: '', //员工号
-					password: '', //密码
-				},
-				canIUse: wx.canIUse('button.open-type.getUserInfo'),
-				rules:{
-					number:[{required: true,
-					message: '请填写员工号',
-					trigger: ['blur', 'change'],}],
-					password:[{
-						required: true,
-						message: '请填写密码',
-						trigger: ['blur', 'change']
-					},
-					{
-						pattern: /^[0-9a-zA-Z]*$/g,
-						transform(value) {
-							return String(value);
-						},
-						message: '只能包含字母或数字'
-					},
-					{
-						min: 8,
-						max: 15,
-						message: '长度在8-15个字符之间'
-					}]
-				},
-			}
-		},
-		created(){
-	   },
-		methods: {
-			login(){  //点击登录
-				
-			},
-			bindGetUserInfo(e) {
-			    console.log(e.detail.userInfo,'0000');
-             },
-			 getUserInfo() {
-				 const thds = this
-			     // 查看是否授权
-			     wx.getSetting({
-			       success (res){
-			         if (res.authSetting['scope.userInfo']) {
-			           // 已经授权，可以直接调用 getUserInfo 获取头像昵称
-			           wx.getUserInfo({
-			             success: function(res) {
-			               console.log(res.userInfo)
-						   thds.imgUrl = res.userInfo.avatarUrl
-			             }
-			           })
-			         }
-			       }
-				   })
-				   },
-			//跳转注册页面
-			goRegister() {
-				wx.navigateTo({
-					url: '/pages/register/register'
-				})
-			},
-			chooseAvatar(res){
-				this.imgUrl = res.detail.avatarUrl
-			},
-			//点击授权头像昵称
-			authorization() {
-				getUserProfile(this.onAuthSuccess);
-			},
-			// 用户信息授权成功回调
-			async onAuthSuccess(nickName, avatarUrl) {
-				this.$store.commit('setUserInfo', { wxName: nickName, avatarUrl });
-				console.log(this.$store.state.userInfo);
-				const { wxName, avatarUrl: imgUrl } = this.$store.state.userInfo;
-				this.imgUrl = imgUrl;
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.login {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		padding: 50rpx;
-		.avatar {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 200rpx;
-			height: 200rpx;
-			background-color: #999;
-			border-radius: 100rpx;
-			margin-bottom: 80rpx;
-			.img {
-				width: 100%;
-				height: 100%;
-				border-radius: 100rpx;
-			}
-		}
-		.input-area {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-bottom: 32rpx ;
-		}
-		.login-button {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 200rpx;
-			height: 80rpx;
-			background-color: #1076e3;
-			color: #fff;
-			margin-top: 50rpx;
-			border-radius: 16rpx;
-		}
-		.text{
-			width: 100%;
-			height: 100%;
-			text-align: center;
-			line-height: 200rpx;
-			border-radius: 100rpx;
-			// border: none;
-		}
-		.bottom {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			color: blue;
-			margin-top: 32rpx;
-		}
-	}
-</style>
diff --git a/pages/register/register.vue b/pages/register/register.vue
index bcef374..df006e9 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -3,88 +3,94 @@
 */
 <template>
 	<view class="register">
-		<p class="title">请填写以下信息</p>
-		<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-			<u-form-item label="员工号" prop="number" borderBottom labelWidth="80" class="form-item">
-				<u--input v-model="form.number" border="none" placeholder="请输入员工号"></u--input>
-			</u-form-item>
-			<u-form-item label="姓名" prop="name" borderBottom labelWidth="80" class="form-item">
-				<u--input v-model="form.name" border="none" placeholder="请输入员姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="员工类型" prop="type" borderBottom :borderBottom="false" class="form-item" labelWidth="80">
-				<u-button @click="typeLx" v-model="form.type" >{{form.type || '点击选择'}}</u-button>
-			</u-form-item>
-			<u-form-item label="手机号码" prop="phone" borderBottom labelWidth="80" class="form-item">
-				<u-button v-model="form.phone" 
-				@click="getUserInfo"
-				open-type="getPhoneNumber" 
-				@getphonenumber="getPhoneNumber"
-					border="none">
-					{{form.phone || '获取手机号'}}
-				</u-button>
-			</u-form-item>
-		</u--form>
-		<u-button type="error" text="注册" @click="registerGo"></u-button>
-		<view @click="goRegister" class="link-login">已有账号，点击登录</view>
-		<u-action-sheet :show="show" :actions="list" title="请选择员工类型" description="只能单选" @close="show = false"
-			@select="sexSelect">
-		</u-action-sheet>
-		<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-title"> 微信授权</view>
-				<view class="popup-content">
-					申请获取你微信绑定的手机号{{form.phone}}？
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="reject">
-						拒绝
+		<view class="main">
+			<block>
+				<image class="back-img" src="../../static/back.png"></image>
+				<view class="back-title">环市东院区安防小程序</view>
+			</block>
+			<view class="content">
+				<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
+					<u-form-item label="员工号码" prop="number"  labelWidth="80" class="form-item">
+						<u--input v-model="form.number" border="none" placeholder="请输入员工号码"></u--input>
+					</u-form-item>
+					<u-form-item label="员工姓名" prop="name"  labelWidth="80" class="form-item">
+						<u--input v-model="form.name" border="none" placeholder="请输入员工姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="员工类型" prop="type" borderBottom :borderBottom="false" class="form-item form-item-border" labelWidth="80">
+						<u-button @click="typeLx" v-model="form.type" >{{form.type || '请选择员工类型'}}</u-button>
+					</u-form-item>
+					<u-form-item label="手机号码" prop="phone" borderBottom labelWidth="80" class="form-item">
+						<u-button v-model="form.phone" 
+						@click="getUserInfo"
+						open-type="getPhoneNumber" 
+						@getphonenumber="getPhoneNumber"
+							border="none">
+							{{form.phone || '获取手机号'}}
+						</u-button>
+					</u-form-item>
+				</u--form>
+				<u-button type="error" text="注 册" @click="registerGo"></u-button>
+				<u-action-sheet :show="show" :actions="list" title="请选择员工类型" description="只能单选" @close="show = false"
+					@select="sexSelect">
+				</u-action-sheet>
+				<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-title"> 微信授权</view>
+						<view class="popup-content">
+							申请获取你微信绑定的手机号{{form.phone}}？
+						</view>
+						<view class="popup-buttom">
+							<view class="popup-jujue" @click="reject">
+								拒绝
+							</view>
+							<view class="popup-yunxu" @click="permit">
+								允许
+							</view>
+						</view>
 					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许
+				</u-popup>
+				<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-all-title">
+							拒绝将无法进行注册!
+						</view>
+						<view class="popup-buttom">
+							<view class="popup-jujue" @click="rejectAll">
+								仍要拒绝
+							</view>
+							<view class="popup-yunxu" @click="permit">
+								允许授权
+							</view>
+						</view>
 					</view>
-				</view>
+				</u-popup>
+				<u-popup :show="successShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-all-title">
+							注册成功!
+						</view>
+						<!-- <view class="popup-login" @click="goRegister">
+							返回登录
+						</view> -->
+					</view>
+				</u-popup>
+				<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-error-title">
+							注册失败！请重新填写信息或联系管理人员
+						</view>
+						<view class="popup-buttom">
+							<view class="popup-jujue popup-jujue-fanhui" @click="errorFh">
+								返回
+							</view>
+							<view class="popup-yunxu popup-jujue-queren" @click="errorQr">
+								确认
+							</view>
+						</view>
+					</view>
+				</u-popup>
 			</view>
-		</u-popup>
-		<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					拒绝将无法进行注册!
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="rejectAll">
-						仍要拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许授权
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="successShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					注册成功!
-				</view>
-				<view class="popup-login" @click="goRegister">
-					返回登录
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-error-title">
-					注册失败！请重新填写信息或联系管理人员
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue popup-jujue-fanhui" @click="errorFh">
-						返回
-					</view>
-					<view class="popup-yunxu popup-jujue-queren" @click="errorQr">
-						确认
-					</view>
-				</view>
-			</view>
-		</u-popup>
+		</view>
 	</view>
 </template>
 
@@ -216,110 +222,156 @@
 				}, 30)
 				// this.$refs.form1.validateField('userInfo.sex')
 			},
-			//跳转登录页面
-			goRegister() {
-				this.successShow = false
-				wx.navigateTo({
-					url: '/pages/login/login'
-				})
-			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
 	.register {
-		padding: 50rpx;
-
-		.title {
-			font-size: 42rpx;
-			font-weight: 500;
-			margin-bottom: 32rpx;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		height: 100%;
+		padding: 32rpx;
+		padding-bottom: 44rpx;
+		box-sizing: border-box;
+		.back-img {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 400rpx;
 		}
-		.form-item {
-			// white-space: nowrap;
-			width: 390rpx;
-			color: red;
+		.back-title {
+			font-size: 38rpx;
+			font-weight: 900;
+			color: #000;
+			text-align: center;
+			margin-top: 410rpx;
+			margin-bottom: 120rpx;
 		}
-
-		.popup {
-			width: 700rpx;
-			height: 450rpx;
-
-			.popup-title {
-				text-align: center;
-				font-size: 36rpx;
-				margin: 35rpx;
-			}
-
-			.popup-content {
-				width: 70%;
-				margin-left: 135rpx;
-				line-height: 54rpx;
-			}
-
-			.popup-error-title {
-				margin-left: 36rpx;
-				margin-right: 36rpx;
-				margin-top: 80rpx;
-				font-size: 38rpx
-			}
-
-			.popup-login {
-				margin-left: 240rpx;
-				margin-top: 120rpx;
-				width: 180rpx;
-				height: 52rpx;
-				background-color: skyblue;
-				border-radius: 8rpx;
-				line-height: 52rpx;
-				border: #000 1px solid;
-				text-align: center;
-				color: #fff;
-
-			}
-
-			.popup-buttom {
-				padding: 70rpx;
-				margin-top: 72rpx;
-				display: flex;
-				justify-content: space-between;
-			}
-
-			.popup-jujue-fanhui {
-				border: none;
-				border-radius: 8rpx;
-				background-color: gray;
-				color: #fff;
-			}
-
-			.popup-jujue-queren {
-				border: none;
-				border-radius: 8rpx;
-				background-color: skyblue;
-				color: #fff;
-			}
-
-			.popup-buttom view {
-				width: 180rpx;
-				height: 56rpx;
-				text-align: center;
-				line-height: 56rpx;
-				border-radius: 6rpx;
-				border: 1px #000 solid;
-			}
-
-			.popup-all-title {
-				text-align: center;
+		.main {
+			height: 100%;
+			background-color: #fff;
+			border-radius: 50rpx;
+		}
+		.content {
+			flex: 1;
+			padding: 0 54rpx;
+			margin-top: 30rpx;
+			background-color: #fff;
+			.title {
 				font-size: 42rpx;
-				margin-top: 142rpx;
+				font-weight: 500;
+				margin-bottom: 32rpx;
+			}
+			.form-item {
+				// white-space: nowrap;
+				width: 390rpx;
+			}
+			.popup {
+				width: 700rpx;
+				height: 450rpx;
+			
+				.popup-title {
+					text-align: center;
+					font-size: 36rpx;
+					margin: 35rpx;
+				}
+			
+				.popup-content {
+					width: 70%;
+					margin-left: 135rpx;
+					line-height: 54rpx;
+				}
+			
+				.popup-error-title {
+					margin-left: 36rpx;
+					margin-right: 36rpx;
+					margin-top: 80rpx;
+					font-size: 38rpx
+				}
+			
+				.popup-login {
+					margin-left: 240rpx;
+					margin-top: 120rpx;
+					width: 180rpx;
+					height: 52rpx;
+					background-color: skyblue;
+					border-radius: 8rpx;
+					line-height: 52rpx;
+					border: #000 1px solid;
+					text-align: center;
+					color: #fff;
+			
+				}
+			
+				.popup-buttom {
+					padding: 70rpx;
+					margin-top: 72rpx;
+					display: flex;
+					justify-content: space-between;
+				}
+			
+				.popup-jujue-fanhui {
+					border: none;
+					border-radius: 8rpx;
+					background-color: gray;
+					color: #fff;
+				}
+			
+				.popup-jujue-queren {
+					border: none;
+					border-radius: 8rpx;
+					background-color: skyblue;
+					color: #fff;
+				}
+			
+				.popup-buttom view {
+					width: 180rpx;
+					height: 56rpx;
+					text-align: center;
+					line-height: 56rpx;
+					border-radius: 6rpx;
+					border: 1px #000 solid;
+				}
+			
+				.popup-all-title {
+					text-align: center;
+					font-size: 42rpx;
+					margin-top: 142rpx;
+				}
 			}
 		}
 	}
 
-	.link-login {
-		margin-top: 20rpx;
-		float: right;
-		color: blue;
-	}
 </style>
+
+<style lang="scss">
+	.register {
+		.u-button {
+			justify-content: left !important;
+		}
+		.u-button--normal {
+			padding-left: 0 !important;
+			font-size: 30rpx !important;
+			color: #c4c7cf !important;
+		}
+		.u-button--info {
+			border: 0 !important;
+			font-weight: 500;
+		}
+		.u-form-item {
+			border-bottom: 1rpx solid #f2f2f2;
+			margin-bottom: 20rpx;
+		}
+		.u-button--error {
+			justify-content: center !important;
+			background-color: #c5000a !important;
+			border-color: #c5000a !important;
+			color: #fff !important;
+			margin-top: 120rpx;
+			font-weight: 600;
+		}
+	}
+</style>
\ No newline at end of file

diff --git a/pages.json b/pages.json
index c5835a2..b4cf49b 100644
--- a/pages.json
+++ b/pages.json
@@ -22,19 +22,12 @@
 			}	
 		},
 		{
-			"path" : "pages/login/login",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{
 					"navigationBarTitleText": "注册",
-					"enablePullDownRefresh": false
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
 			}		
 		},
 		{
diff --git a/pages/login/login.vue b/pages/login/login.vue
deleted file mode 100644
index 6d57f8c..0000000
--- a/pages/login/login.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * 登录页面
- */
-<template>
-	<view class="login">
-		<!-- 头像部分 -->
-		<view class="avatar">
-			<image v-show="imgUrl" :src="imgUrl" class="img"></image>
-        <button v-show="!imgUrl" open-type="chooseAvatar" bindgetuserinfo="bindGetUserInfo" class="text" @chooseavatar="chooseAvatar">获取头像</button>
-		</view>
-		
-		<!-- 员工号、密码 -->
-		<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-			<u-form-item label="员工号" prop="number" labelWidth="80" class="form-item">
-				<u--input v-model="form.number" border="bottom" placeholder="请输入员工号"></u--input>
-			</u-form-item>
-			<u-form-item label="密码" prop="password" labelWidth="80" class="form-item">
-				<u--input v-model="form.password" border="bottom" password placeholder="请输入员密码"></u--input>
-			</u-form-item>
-		</u--form>
-		<!-- 登录按钮 -->
-		<!-- <view class="login-button" @click="login">登录</view> -->
-		<u-button type="primary"  @click="login" class="login-button">登录</u-button>
-		<!-- 忘记密码、注册部分 -->
-		<view class="bottom">
-			<!-- <view @click="goFindPassword">忘记密码</view> -->
-			<view @click="goRegister">未有账号，点击注册</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { getUserProfile } from '@/utils/auth.js';
-	import loginVue from './login.vue';
-	import store from '@/store';
-	export default {
-		data() {
-			return {
-				imgUrl: '', //头像url
-				form:{
-					number: '', //员工号
-					password: '', //密码
-				},
-				canIUse: wx.canIUse('button.open-type.getUserInfo'),
-				rules:{
-					number:[{required: true,
-					message: '请填写员工号',
-					trigger: ['blur', 'change'],}],
-					password:[{
-						required: true,
-						message: '请填写密码',
-						trigger: ['blur', 'change']
-					},
-					{
-						pattern: /^[0-9a-zA-Z]*$/g,
-						transform(value) {
-							return String(value);
-						},
-						message: '只能包含字母或数字'
-					},
-					{
-						min: 8,
-						max: 15,
-						message: '长度在8-15个字符之间'
-					}]
-				},
-			}
-		},
-		created(){
-	   },
-		methods: {
-			login(){  //点击登录
-				
-			},
-			bindGetUserInfo(e) {
-			    console.log(e.detail.userInfo,'0000');
-             },
-			 getUserInfo() {
-				 const thds = this
-			     // 查看是否授权
-			     wx.getSetting({
-			       success (res){
-			         if (res.authSetting['scope.userInfo']) {
-			           // 已经授权，可以直接调用 getUserInfo 获取头像昵称
-			           wx.getUserInfo({
-			             success: function(res) {
-			               console.log(res.userInfo)
-						   thds.imgUrl = res.userInfo.avatarUrl
-			             }
-			           })
-			         }
-			       }
-				   })
-				   },
-			//跳转注册页面
-			goRegister() {
-				wx.navigateTo({
-					url: '/pages/register/register'
-				})
-			},
-			chooseAvatar(res){
-				this.imgUrl = res.detail.avatarUrl
-			},
-			//点击授权头像昵称
-			authorization() {
-				getUserProfile(this.onAuthSuccess);
-			},
-			// 用户信息授权成功回调
-			async onAuthSuccess(nickName, avatarUrl) {
-				this.$store.commit('setUserInfo', { wxName: nickName, avatarUrl });
-				console.log(this.$store.state.userInfo);
-				const { wxName, avatarUrl: imgUrl } = this.$store.state.userInfo;
-				this.imgUrl = imgUrl;
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.login {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		padding: 50rpx;
-		.avatar {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 200rpx;
-			height: 200rpx;
-			background-color: #999;
-			border-radius: 100rpx;
-			margin-bottom: 80rpx;
-			.img {
-				width: 100%;
-				height: 100%;
-				border-radius: 100rpx;
-			}
-		}
-		.input-area {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-bottom: 32rpx ;
-		}
-		.login-button {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 200rpx;
-			height: 80rpx;
-			background-color: #1076e3;
-			color: #fff;
-			margin-top: 50rpx;
-			border-radius: 16rpx;
-		}
-		.text{
-			width: 100%;
-			height: 100%;
-			text-align: center;
-			line-height: 200rpx;
-			border-radius: 100rpx;
-			// border: none;
-		}
-		.bottom {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			color: blue;
-			margin-top: 32rpx;
-		}
-	}
-</style>
diff --git a/pages/register/register.vue b/pages/register/register.vue
index bcef374..df006e9 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -3,88 +3,94 @@
 */
 <template>
 	<view class="register">
-		<p class="title">请填写以下信息</p>
-		<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-			<u-form-item label="员工号" prop="number" borderBottom labelWidth="80" class="form-item">
-				<u--input v-model="form.number" border="none" placeholder="请输入员工号"></u--input>
-			</u-form-item>
-			<u-form-item label="姓名" prop="name" borderBottom labelWidth="80" class="form-item">
-				<u--input v-model="form.name" border="none" placeholder="请输入员姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="员工类型" prop="type" borderBottom :borderBottom="false" class="form-item" labelWidth="80">
-				<u-button @click="typeLx" v-model="form.type" >{{form.type || '点击选择'}}</u-button>
-			</u-form-item>
-			<u-form-item label="手机号码" prop="phone" borderBottom labelWidth="80" class="form-item">
-				<u-button v-model="form.phone" 
-				@click="getUserInfo"
-				open-type="getPhoneNumber" 
-				@getphonenumber="getPhoneNumber"
-					border="none">
-					{{form.phone || '获取手机号'}}
-				</u-button>
-			</u-form-item>
-		</u--form>
-		<u-button type="error" text="注册" @click="registerGo"></u-button>
-		<view @click="goRegister" class="link-login">已有账号，点击登录</view>
-		<u-action-sheet :show="show" :actions="list" title="请选择员工类型" description="只能单选" @close="show = false"
-			@select="sexSelect">
-		</u-action-sheet>
-		<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-title"> 微信授权</view>
-				<view class="popup-content">
-					申请获取你微信绑定的手机号{{form.phone}}？
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="reject">
-						拒绝
+		<view class="main">
+			<block>
+				<image class="back-img" src="../../static/back.png"></image>
+				<view class="back-title">环市东院区安防小程序</view>
+			</block>
+			<view class="content">
+				<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
+					<u-form-item label="员工号码" prop="number"  labelWidth="80" class="form-item">
+						<u--input v-model="form.number" border="none" placeholder="请输入员工号码"></u--input>
+					</u-form-item>
+					<u-form-item label="员工姓名" prop="name"  labelWidth="80" class="form-item">
+						<u--input v-model="form.name" border="none" placeholder="请输入员工姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="员工类型" prop="type" borderBottom :borderBottom="false" class="form-item form-item-border" labelWidth="80">
+						<u-button @click="typeLx" v-model="form.type" >{{form.type || '请选择员工类型'}}</u-button>
+					</u-form-item>
+					<u-form-item label="手机号码" prop="phone" borderBottom labelWidth="80" class="form-item">
+						<u-button v-model="form.phone" 
+						@click="getUserInfo"
+						open-type="getPhoneNumber" 
+						@getphonenumber="getPhoneNumber"
+							border="none">
+							{{form.phone || '获取手机号'}}
+						</u-button>
+					</u-form-item>
+				</u--form>
+				<u-button type="error" text="注 册" @click="registerGo"></u-button>
+				<u-action-sheet :show="show" :actions="list" title="请选择员工类型" description="只能单选" @close="show = false"
+					@select="sexSelect">
+				</u-action-sheet>
+				<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-title"> 微信授权</view>
+						<view class="popup-content">
+							申请获取你微信绑定的手机号{{form.phone}}？
+						</view>
+						<view class="popup-buttom">
+							<view class="popup-jujue" @click="reject">
+								拒绝
+							</view>
+							<view class="popup-yunxu" @click="permit">
+								允许
+							</view>
+						</view>
 					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许
+				</u-popup>
+				<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-all-title">
+							拒绝将无法进行注册!
+						</view>
+						<view class="popup-buttom">
+							<view class="popup-jujue" @click="rejectAll">
+								仍要拒绝
+							</view>
+							<view class="popup-yunxu" @click="permit">
+								允许授权
+							</view>
+						</view>
 					</view>
-				</view>
+				</u-popup>
+				<u-popup :show="successShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-all-title">
+							注册成功!
+						</view>
+						<!-- <view class="popup-login" @click="goRegister">
+							返回登录
+						</view> -->
+					</view>
+				</u-popup>
+				<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-error-title">
+							注册失败！请重新填写信息或联系管理人员
+						</view>
+						<view class="popup-buttom">
+							<view class="popup-jujue popup-jujue-fanhui" @click="errorFh">
+								返回
+							</view>
+							<view class="popup-yunxu popup-jujue-queren" @click="errorQr">
+								确认
+							</view>
+						</view>
+					</view>
+				</u-popup>
 			</view>
-		</u-popup>
-		<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					拒绝将无法进行注册!
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="rejectAll">
-						仍要拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许授权
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="successShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					注册成功!
-				</view>
-				<view class="popup-login" @click="goRegister">
-					返回登录
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-error-title">
-					注册失败！请重新填写信息或联系管理人员
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue popup-jujue-fanhui" @click="errorFh">
-						返回
-					</view>
-					<view class="popup-yunxu popup-jujue-queren" @click="errorQr">
-						确认
-					</view>
-				</view>
-			</view>
-		</u-popup>
+		</view>
 	</view>
 </template>
 
@@ -216,110 +222,156 @@
 				}, 30)
 				// this.$refs.form1.validateField('userInfo.sex')
 			},
-			//跳转登录页面
-			goRegister() {
-				this.successShow = false
-				wx.navigateTo({
-					url: '/pages/login/login'
-				})
-			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
 	.register {
-		padding: 50rpx;
-
-		.title {
-			font-size: 42rpx;
-			font-weight: 500;
-			margin-bottom: 32rpx;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		height: 100%;
+		padding: 32rpx;
+		padding-bottom: 44rpx;
+		box-sizing: border-box;
+		.back-img {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 400rpx;
 		}
-		.form-item {
-			// white-space: nowrap;
-			width: 390rpx;
-			color: red;
+		.back-title {
+			font-size: 38rpx;
+			font-weight: 900;
+			color: #000;
+			text-align: center;
+			margin-top: 410rpx;
+			margin-bottom: 120rpx;
 		}
-
-		.popup {
-			width: 700rpx;
-			height: 450rpx;
-
-			.popup-title {
-				text-align: center;
-				font-size: 36rpx;
-				margin: 35rpx;
-			}
-
-			.popup-content {
-				width: 70%;
-				margin-left: 135rpx;
-				line-height: 54rpx;
-			}
-
-			.popup-error-title {
-				margin-left: 36rpx;
-				margin-right: 36rpx;
-				margin-top: 80rpx;
-				font-size: 38rpx
-			}
-
-			.popup-login {
-				margin-left: 240rpx;
-				margin-top: 120rpx;
-				width: 180rpx;
-				height: 52rpx;
-				background-color: skyblue;
-				border-radius: 8rpx;
-				line-height: 52rpx;
-				border: #000 1px solid;
-				text-align: center;
-				color: #fff;
-
-			}
-
-			.popup-buttom {
-				padding: 70rpx;
-				margin-top: 72rpx;
-				display: flex;
-				justify-content: space-between;
-			}
-
-			.popup-jujue-fanhui {
-				border: none;
-				border-radius: 8rpx;
-				background-color: gray;
-				color: #fff;
-			}
-
-			.popup-jujue-queren {
-				border: none;
-				border-radius: 8rpx;
-				background-color: skyblue;
-				color: #fff;
-			}
-
-			.popup-buttom view {
-				width: 180rpx;
-				height: 56rpx;
-				text-align: center;
-				line-height: 56rpx;
-				border-radius: 6rpx;
-				border: 1px #000 solid;
-			}
-
-			.popup-all-title {
-				text-align: center;
+		.main {
+			height: 100%;
+			background-color: #fff;
+			border-radius: 50rpx;
+		}
+		.content {
+			flex: 1;
+			padding: 0 54rpx;
+			margin-top: 30rpx;
+			background-color: #fff;
+			.title {
 				font-size: 42rpx;
-				margin-top: 142rpx;
+				font-weight: 500;
+				margin-bottom: 32rpx;
+			}
+			.form-item {
+				// white-space: nowrap;
+				width: 390rpx;
+			}
+			.popup {
+				width: 700rpx;
+				height: 450rpx;
+			
+				.popup-title {
+					text-align: center;
+					font-size: 36rpx;
+					margin: 35rpx;
+				}
+			
+				.popup-content {
+					width: 70%;
+					margin-left: 135rpx;
+					line-height: 54rpx;
+				}
+			
+				.popup-error-title {
+					margin-left: 36rpx;
+					margin-right: 36rpx;
+					margin-top: 80rpx;
+					font-size: 38rpx
+				}
+			
+				.popup-login {
+					margin-left: 240rpx;
+					margin-top: 120rpx;
+					width: 180rpx;
+					height: 52rpx;
+					background-color: skyblue;
+					border-radius: 8rpx;
+					line-height: 52rpx;
+					border: #000 1px solid;
+					text-align: center;
+					color: #fff;
+			
+				}
+			
+				.popup-buttom {
+					padding: 70rpx;
+					margin-top: 72rpx;
+					display: flex;
+					justify-content: space-between;
+				}
+			
+				.popup-jujue-fanhui {
+					border: none;
+					border-radius: 8rpx;
+					background-color: gray;
+					color: #fff;
+				}
+			
+				.popup-jujue-queren {
+					border: none;
+					border-radius: 8rpx;
+					background-color: skyblue;
+					color: #fff;
+				}
+			
+				.popup-buttom view {
+					width: 180rpx;
+					height: 56rpx;
+					text-align: center;
+					line-height: 56rpx;
+					border-radius: 6rpx;
+					border: 1px #000 solid;
+				}
+			
+				.popup-all-title {
+					text-align: center;
+					font-size: 42rpx;
+					margin-top: 142rpx;
+				}
 			}
 		}
 	}
 
-	.link-login {
-		margin-top: 20rpx;
-		float: right;
-		color: blue;
-	}
 </style>
+
+<style lang="scss">
+	.register {
+		.u-button {
+			justify-content: left !important;
+		}
+		.u-button--normal {
+			padding-left: 0 !important;
+			font-size: 30rpx !important;
+			color: #c4c7cf !important;
+		}
+		.u-button--info {
+			border: 0 !important;
+			font-weight: 500;
+		}
+		.u-form-item {
+			border-bottom: 1rpx solid #f2f2f2;
+			margin-bottom: 20rpx;
+		}
+		.u-button--error {
+			justify-content: center !important;
+			background-color: #c5000a !important;
+			border-color: #c5000a !important;
+			color: #fff !important;
+			margin-top: 120rpx;
+			font-weight: 600;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/static/back.png b/static/back.png
new file mode 100644
index 0000000..af33831
--- /dev/null
+++ b/static/back.png
Binary files differ

diff --git a/pages.json b/pages.json
index c5835a2..b4cf49b 100644
--- a/pages.json
+++ b/pages.json
@@ -22,19 +22,12 @@
 			}	
 		},
 		{
-			"path" : "pages/login/login",
-			"style" :                                                                                    
-			{
-				"navigationBarTitleText": "登录",
-				"enablePullDownRefresh": false
-			}	
-		},
-		{
 			"path" : "pages/register/register",
 			"style" :                                                                                    
 			{
 					"navigationBarTitleText": "注册",
-					"enablePullDownRefresh": false
+					"enablePullDownRefresh": false,
+					"navigationStyle": "custom"
 			}		
 		},
 		{
diff --git a/pages/login/login.vue b/pages/login/login.vue
deleted file mode 100644
index 6d57f8c..0000000
--- a/pages/login/login.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * 登录页面
- */
-<template>
-	<view class="login">
-		<!-- 头像部分 -->
-		<view class="avatar">
-			<image v-show="imgUrl" :src="imgUrl" class="img"></image>
-        <button v-show="!imgUrl" open-type="chooseAvatar" bindgetuserinfo="bindGetUserInfo" class="text" @chooseavatar="chooseAvatar">获取头像</button>
-		</view>
-		
-		<!-- 员工号、密码 -->
-		<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-			<u-form-item label="员工号" prop="number" labelWidth="80" class="form-item">
-				<u--input v-model="form.number" border="bottom" placeholder="请输入员工号"></u--input>
-			</u-form-item>
-			<u-form-item label="密码" prop="password" labelWidth="80" class="form-item">
-				<u--input v-model="form.password" border="bottom" password placeholder="请输入员密码"></u--input>
-			</u-form-item>
-		</u--form>
-		<!-- 登录按钮 -->
-		<!-- <view class="login-button" @click="login">登录</view> -->
-		<u-button type="primary"  @click="login" class="login-button">登录</u-button>
-		<!-- 忘记密码、注册部分 -->
-		<view class="bottom">
-			<!-- <view @click="goFindPassword">忘记密码</view> -->
-			<view @click="goRegister">未有账号，点击注册</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { getUserProfile } from '@/utils/auth.js';
-	import loginVue from './login.vue';
-	import store from '@/store';
-	export default {
-		data() {
-			return {
-				imgUrl: '', //头像url
-				form:{
-					number: '', //员工号
-					password: '', //密码
-				},
-				canIUse: wx.canIUse('button.open-type.getUserInfo'),
-				rules:{
-					number:[{required: true,
-					message: '请填写员工号',
-					trigger: ['blur', 'change'],}],
-					password:[{
-						required: true,
-						message: '请填写密码',
-						trigger: ['blur', 'change']
-					},
-					{
-						pattern: /^[0-9a-zA-Z]*$/g,
-						transform(value) {
-							return String(value);
-						},
-						message: '只能包含字母或数字'
-					},
-					{
-						min: 8,
-						max: 15,
-						message: '长度在8-15个字符之间'
-					}]
-				},
-			}
-		},
-		created(){
-	   },
-		methods: {
-			login(){  //点击登录
-				
-			},
-			bindGetUserInfo(e) {
-			    console.log(e.detail.userInfo,'0000');
-             },
-			 getUserInfo() {
-				 const thds = this
-			     // 查看是否授权
-			     wx.getSetting({
-			       success (res){
-			         if (res.authSetting['scope.userInfo']) {
-			           // 已经授权，可以直接调用 getUserInfo 获取头像昵称
-			           wx.getUserInfo({
-			             success: function(res) {
-			               console.log(res.userInfo)
-						   thds.imgUrl = res.userInfo.avatarUrl
-			             }
-			           })
-			         }
-			       }
-				   })
-				   },
-			//跳转注册页面
-			goRegister() {
-				wx.navigateTo({
-					url: '/pages/register/register'
-				})
-			},
-			chooseAvatar(res){
-				this.imgUrl = res.detail.avatarUrl
-			},
-			//点击授权头像昵称
-			authorization() {
-				getUserProfile(this.onAuthSuccess);
-			},
-			// 用户信息授权成功回调
-			async onAuthSuccess(nickName, avatarUrl) {
-				this.$store.commit('setUserInfo', { wxName: nickName, avatarUrl });
-				console.log(this.$store.state.userInfo);
-				const { wxName, avatarUrl: imgUrl } = this.$store.state.userInfo;
-				this.imgUrl = imgUrl;
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.login {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		padding: 50rpx;
-		.avatar {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 200rpx;
-			height: 200rpx;
-			background-color: #999;
-			border-radius: 100rpx;
-			margin-bottom: 80rpx;
-			.img {
-				width: 100%;
-				height: 100%;
-				border-radius: 100rpx;
-			}
-		}
-		.input-area {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-bottom: 32rpx ;
-		}
-		.login-button {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 200rpx;
-			height: 80rpx;
-			background-color: #1076e3;
-			color: #fff;
-			margin-top: 50rpx;
-			border-radius: 16rpx;
-		}
-		.text{
-			width: 100%;
-			height: 100%;
-			text-align: center;
-			line-height: 200rpx;
-			border-radius: 100rpx;
-			// border: none;
-		}
-		.bottom {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			color: blue;
-			margin-top: 32rpx;
-		}
-	}
-</style>
diff --git a/pages/register/register.vue b/pages/register/register.vue
index bcef374..df006e9 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -3,88 +3,94 @@
 */
 <template>
 	<view class="register">
-		<p class="title">请填写以下信息</p>
-		<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
-			<u-form-item label="员工号" prop="number" borderBottom labelWidth="80" class="form-item">
-				<u--input v-model="form.number" border="none" placeholder="请输入员工号"></u--input>
-			</u-form-item>
-			<u-form-item label="姓名" prop="name" borderBottom labelWidth="80" class="form-item">
-				<u--input v-model="form.name" border="none" placeholder="请输入员姓名"></u--input>
-			</u-form-item>
-			<u-form-item label="员工类型" prop="type" borderBottom :borderBottom="false" class="form-item" labelWidth="80">
-				<u-button @click="typeLx" v-model="form.type" >{{form.type || '点击选择'}}</u-button>
-			</u-form-item>
-			<u-form-item label="手机号码" prop="phone" borderBottom labelWidth="80" class="form-item">
-				<u-button v-model="form.phone" 
-				@click="getUserInfo"
-				open-type="getPhoneNumber" 
-				@getphonenumber="getPhoneNumber"
-					border="none">
-					{{form.phone || '获取手机号'}}
-				</u-button>
-			</u-form-item>
-		</u--form>
-		<u-button type="error" text="注册" @click="registerGo"></u-button>
-		<view @click="goRegister" class="link-login">已有账号，点击登录</view>
-		<u-action-sheet :show="show" :actions="list" title="请选择员工类型" description="只能单选" @close="show = false"
-			@select="sexSelect">
-		</u-action-sheet>
-		<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-title"> 微信授权</view>
-				<view class="popup-content">
-					申请获取你微信绑定的手机号{{form.phone}}？
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="reject">
-						拒绝
+		<view class="main">
+			<block>
+				<image class="back-img" src="../../static/back.png"></image>
+				<view class="back-title">环市东院区安防小程序</view>
+			</block>
+			<view class="content">
+				<u--form labelPosition="left" :model="form" :rules="rules" ref="form1">
+					<u-form-item label="员工号码" prop="number"  labelWidth="80" class="form-item">
+						<u--input v-model="form.number" border="none" placeholder="请输入员工号码"></u--input>
+					</u-form-item>
+					<u-form-item label="员工姓名" prop="name"  labelWidth="80" class="form-item">
+						<u--input v-model="form.name" border="none" placeholder="请输入员工姓名"></u--input>
+					</u-form-item>
+					<u-form-item label="员工类型" prop="type" borderBottom :borderBottom="false" class="form-item form-item-border" labelWidth="80">
+						<u-button @click="typeLx" v-model="form.type" >{{form.type || '请选择员工类型'}}</u-button>
+					</u-form-item>
+					<u-form-item label="手机号码" prop="phone" borderBottom labelWidth="80" class="form-item">
+						<u-button v-model="form.phone" 
+						@click="getUserInfo"
+						open-type="getPhoneNumber" 
+						@getphonenumber="getPhoneNumber"
+							border="none">
+							{{form.phone || '获取手机号'}}
+						</u-button>
+					</u-form-item>
+				</u--form>
+				<u-button type="error" text="注 册" @click="registerGo"></u-button>
+				<u-action-sheet :show="show" :actions="list" title="请选择员工类型" description="只能单选" @close="show = false"
+					@select="sexSelect">
+				</u-action-sheet>
+				<u-popup :show="sqShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-title"> 微信授权</view>
+						<view class="popup-content">
+							申请获取你微信绑定的手机号{{form.phone}}？
+						</view>
+						<view class="popup-buttom">
+							<view class="popup-jujue" @click="reject">
+								拒绝
+							</view>
+							<view class="popup-yunxu" @click="permit">
+								允许
+							</view>
+						</view>
 					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许
+				</u-popup>
+				<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-all-title">
+							拒绝将无法进行注册!
+						</view>
+						<view class="popup-buttom">
+							<view class="popup-jujue" @click="rejectAll">
+								仍要拒绝
+							</view>
+							<view class="popup-yunxu" @click="permit">
+								允许授权
+							</view>
+						</view>
 					</view>
-				</view>
+				</u-popup>
+				<u-popup :show="successShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-all-title">
+							注册成功!
+						</view>
+						<!-- <view class="popup-login" @click="goRegister">
+							返回登录
+						</view> -->
+					</view>
+				</u-popup>
+				<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
+					<view class="popup">
+						<view class="popup-error-title">
+							注册失败！请重新填写信息或联系管理人员
+						</view>
+						<view class="popup-buttom">
+							<view class="popup-jujue popup-jujue-fanhui" @click="errorFh">
+								返回
+							</view>
+							<view class="popup-yunxu popup-jujue-queren" @click="errorQr">
+								确认
+							</view>
+						</view>
+					</view>
+				</u-popup>
 			</view>
-		</u-popup>
-		<u-popup :show="jujueShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					拒绝将无法进行注册!
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue" @click="rejectAll">
-						仍要拒绝
-					</view>
-					<view class="popup-yunxu" @click="permit">
-						允许授权
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="successShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-all-title">
-					注册成功!
-				</view>
-				<view class="popup-login" @click="goRegister">
-					返回登录
-				</view>
-			</view>
-		</u-popup>
-		<u-popup :show="errorShow" mode="center" :round="10" :closeOnClickOverlay="false" @close="close" @open="open">
-			<view class="popup">
-				<view class="popup-error-title">
-					注册失败！请重新填写信息或联系管理人员
-				</view>
-				<view class="popup-buttom">
-					<view class="popup-jujue popup-jujue-fanhui" @click="errorFh">
-						返回
-					</view>
-					<view class="popup-yunxu popup-jujue-queren" @click="errorQr">
-						确认
-					</view>
-				</view>
-			</view>
-		</u-popup>
+		</view>
 	</view>
 </template>
 
@@ -216,110 +222,156 @@
 				}, 30)
 				// this.$refs.form1.validateField('userInfo.sex')
 			},
-			//跳转登录页面
-			goRegister() {
-				this.successShow = false
-				wx.navigateTo({
-					url: '/pages/login/login'
-				})
-			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
 	.register {
-		padding: 50rpx;
-
-		.title {
-			font-size: 42rpx;
-			font-weight: 500;
-			margin-bottom: 32rpx;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		height: 100%;
+		padding: 32rpx;
+		padding-bottom: 44rpx;
+		box-sizing: border-box;
+		.back-img {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 400rpx;
 		}
-		.form-item {
-			// white-space: nowrap;
-			width: 390rpx;
-			color: red;
+		.back-title {
+			font-size: 38rpx;
+			font-weight: 900;
+			color: #000;
+			text-align: center;
+			margin-top: 410rpx;
+			margin-bottom: 120rpx;
 		}
-
-		.popup {
-			width: 700rpx;
-			height: 450rpx;
-
-			.popup-title {
-				text-align: center;
-				font-size: 36rpx;
-				margin: 35rpx;
-			}
-
-			.popup-content {
-				width: 70%;
-				margin-left: 135rpx;
-				line-height: 54rpx;
-			}
-
-			.popup-error-title {
-				margin-left: 36rpx;
-				margin-right: 36rpx;
-				margin-top: 80rpx;
-				font-size: 38rpx
-			}
-
-			.popup-login {
-				margin-left: 240rpx;
-				margin-top: 120rpx;
-				width: 180rpx;
-				height: 52rpx;
-				background-color: skyblue;
-				border-radius: 8rpx;
-				line-height: 52rpx;
-				border: #000 1px solid;
-				text-align: center;
-				color: #fff;
-
-			}
-
-			.popup-buttom {
-				padding: 70rpx;
-				margin-top: 72rpx;
-				display: flex;
-				justify-content: space-between;
-			}
-
-			.popup-jujue-fanhui {
-				border: none;
-				border-radius: 8rpx;
-				background-color: gray;
-				color: #fff;
-			}
-
-			.popup-jujue-queren {
-				border: none;
-				border-radius: 8rpx;
-				background-color: skyblue;
-				color: #fff;
-			}
-
-			.popup-buttom view {
-				width: 180rpx;
-				height: 56rpx;
-				text-align: center;
-				line-height: 56rpx;
-				border-radius: 6rpx;
-				border: 1px #000 solid;
-			}
-
-			.popup-all-title {
-				text-align: center;
+		.main {
+			height: 100%;
+			background-color: #fff;
+			border-radius: 50rpx;
+		}
+		.content {
+			flex: 1;
+			padding: 0 54rpx;
+			margin-top: 30rpx;
+			background-color: #fff;
+			.title {
 				font-size: 42rpx;
-				margin-top: 142rpx;
+				font-weight: 500;
+				margin-bottom: 32rpx;
+			}
+			.form-item {
+				// white-space: nowrap;
+				width: 390rpx;
+			}
+			.popup {
+				width: 700rpx;
+				height: 450rpx;
+			
+				.popup-title {
+					text-align: center;
+					font-size: 36rpx;
+					margin: 35rpx;
+				}
+			
+				.popup-content {
+					width: 70%;
+					margin-left: 135rpx;
+					line-height: 54rpx;
+				}
+			
+				.popup-error-title {
+					margin-left: 36rpx;
+					margin-right: 36rpx;
+					margin-top: 80rpx;
+					font-size: 38rpx
+				}
+			
+				.popup-login {
+					margin-left: 240rpx;
+					margin-top: 120rpx;
+					width: 180rpx;
+					height: 52rpx;
+					background-color: skyblue;
+					border-radius: 8rpx;
+					line-height: 52rpx;
+					border: #000 1px solid;
+					text-align: center;
+					color: #fff;
+			
+				}
+			
+				.popup-buttom {
+					padding: 70rpx;
+					margin-top: 72rpx;
+					display: flex;
+					justify-content: space-between;
+				}
+			
+				.popup-jujue-fanhui {
+					border: none;
+					border-radius: 8rpx;
+					background-color: gray;
+					color: #fff;
+				}
+			
+				.popup-jujue-queren {
+					border: none;
+					border-radius: 8rpx;
+					background-color: skyblue;
+					color: #fff;
+				}
+			
+				.popup-buttom view {
+					width: 180rpx;
+					height: 56rpx;
+					text-align: center;
+					line-height: 56rpx;
+					border-radius: 6rpx;
+					border: 1px #000 solid;
+				}
+			
+				.popup-all-title {
+					text-align: center;
+					font-size: 42rpx;
+					margin-top: 142rpx;
+				}
 			}
 		}
 	}
 
-	.link-login {
-		margin-top: 20rpx;
-		float: right;
-		color: blue;
-	}
 </style>
+
+<style lang="scss">
+	.register {
+		.u-button {
+			justify-content: left !important;
+		}
+		.u-button--normal {
+			padding-left: 0 !important;
+			font-size: 30rpx !important;
+			color: #c4c7cf !important;
+		}
+		.u-button--info {
+			border: 0 !important;
+			font-weight: 500;
+		}
+		.u-form-item {
+			border-bottom: 1rpx solid #f2f2f2;
+			margin-bottom: 20rpx;
+		}
+		.u-button--error {
+			justify-content: center !important;
+			background-color: #c5000a !important;
+			border-color: #c5000a !important;
+			color: #fff !important;
+			margin-top: 120rpx;
+			font-weight: 600;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/static/back.png b/static/back.png
new file mode 100644
index 0000000..af33831
--- /dev/null
+++ b/static/back.png
Binary files differ
diff --git a/static/logo.png b/static/logo.png
deleted file mode 100644
index b5771e2..0000000
--- a/static/logo.png
+++ /dev/null
Binary files differ