diff --git a/src/views/login/activate.vue b/src/views/login/activate.vue
index 15c2388..0039484 100644
--- a/src/views/login/activate.vue
+++ b/src/views/login/activate.vue
@@ -27,7 +27,9 @@ export default {
 	},
 	created() {
 		let token = this.$route.query.token;
-		this.$TOOL.cookie.set("TOKEN", token)
+		if(token){
+			this.$TOOL.cookie.set("TOKEN", token)
+		}
 	},
 	mounted() {
 
diff --git a/src/views/login/userRegister.vue b/src/views/login/userRegister.vue
index 32e76e7..68bce3b 100644
--- a/src/views/login/userRegister.vue
+++ b/src/views/login/userRegister.vue
@@ -1,6 +1,6 @@
 <template>
 	<common-page title="注册">
-		<el-alert type="info" class="registerAlert" :closable="false">注册账户</el-alert>
+		<el-alert v-if="stepActive<2" type="info" class="registerAlert" :closable="false">注册账户</el-alert>
 <!--		<el-steps :active="stepActive" simple finish-status="success" process-status="finish">-->
 <!--			<el-step title="填写信息" />-->
 <!--			<el-step title="创建账户" />-->
@@ -14,8 +14,8 @@
 <!--				<el-input v-model="form.customer" placeholder="请输入客户名称"></el-input>-->
 <!--			</el-form-item>-->
 <!--		</el-form>-->
-		<el-form ref="stepForm_1" :model="form" :rules="rules" label-position="top">
-			<el-form-item label="客户名称" prop="customer">
+		<el-form v-if="stepActive<2" ref="stepForm_1" :model="form" :rules="rules" label-position="top">
+			<el-form-item label="公司全称" prop="customer">
 				<el-input v-model="form.customer" placeholder="请输入客户名称"></el-input>
 			</el-form-item>
 			<el-form-item label="电子邮箱" prop="email">
@@ -87,7 +87,7 @@
 						{ required: true, message: '请输入邮箱地址'}
 					],
 					login_name:[
-						{ required: true, message: '请输入登录账号'}
+						{ required: false, message: '请输入登录账号'}
 					],
 					name:[
 						{ required: false, message: '请输入用户名'}
@@ -102,7 +102,7 @@
 						{ required: true, message: '请输入公司名称'}
 					],
 					customer: [
-						{ required: true, message: '请输入客户名称'}
+						{ required: true, message: '请输入公司全称'}
 					],
 				}
 			}