#200 email validation

Author: nihgwu

client/app/account/settings/settings.html

@@ -22,6 +22,21 @@ <h2 class="md-subheader">头像</h2>
         <input ng-model="vm.user.name">
       </md-input-container>
     </div>
+    <div layout="row">
+      <md-input-container flex>
+        <label>邮箱</label>
+        <input name="email" type="email" ng-model="vm.user.email">
+        <div ng-messages="updateForm.email.$error" ng-if="updateForm.email.$dirty">
+          <div ng-message="email">输入的邮箱格式不正确</div>
+        </div>
+      </md-input-container>
+    </div>
+    <div layout="row">
+      <md-input-container flex>
+        <label>公司</label>
+        <input ng-model="vm.user.company">
+      </md-input-container>
+    </div>
     <div flex layout="row" layout-align="space-between center">
       <md-button ng-disabled="updateForm.$invalid" ng-click="vm.update()" class="md-raised md-primary">保存</md-button>
     </div>

server/api/user/user.model.js

@@ -34,6 +34,8 @@ var UserDefinition = {
     required: true
   },
   avatar: String,
+  email: String,
+  company: String,
   role: {
     type: String,
     default: 'user',
@@ -260,6 +262,8 @@ function getProfile() {
     'mobile': this.userId,
     'name': this.name,
     'avatar': this.avatar,
+    'email': this.email,
+    'company': this.company,
     'active': this.active,
     'role': this.role,
     'info': this.info,