Merge remote-tracking branch 'origin/master'

im-web/src/view/Login.vue

@@ -8,7 +8,7 @@
 				@keyup.enter.native="submitForm('loginForm')">
 				<div class="title">
 					<img class="logo" src="../../public/logo.png" />
-					<div>登录盒子IM</div>
+					<div>登录客服</div>
 				</div>
 				<el-form-item prop="terminal" v-show="false">
 					<el-input type="terminal" v-model="loginForm.terminal" autocomplete="off"></el-input>
@@ -25,12 +25,14 @@
 					<el-button type="primary" @click="submitForm('loginForm')">登录</el-button>
 					<el-button @click="resetForm('loginForm')">清空</el-button>
 				</el-form-item>
+				<!-- 
 				<div class="register">
 					<router-link to="/register">没有账号,前往注册</router-link>
 				</div>
+				 -->
 			</el-form>
 		</div>
-		<icp></icp>
+		<!-- <icp></icp> -->
 	</div>
 </template>