Merge pull request vczero#7 from Raincal/master

fix some bugs

Author: vczero

address_book/server/routes/services/user.js

@@ -65,7 +65,7 @@ var User = {
     var tag = req.param('tag');
     var creater = req.param('creater') || '';
 
-    if(!username || !password || !tel || !email || !partment || !tag || !creater){
+    if(!username || !password || !tel || !email || !partment || !tag){
       return res.send({
         status: 0,
         data: '缺少必要参数'

address_book/views/about/webview.js

@@ -15,7 +15,7 @@ var webview = React.createClass({
 
   render: function(){
     return(
-      <View style={{flex:1}}>
+      <View style={{flex:1, marginBottom: 64}}>
         <WebView url={this.props.url}/>
       </View>
     );

address_book/views/home/address.js

@@ -59,7 +59,7 @@ var Address = React.createClass({
       );
     }
     return (
-      <ScrollView>
+      <ScrollView style={{marginBottom: 64}}>
         {view}
       </ScrollView>
     );

address_book/views/manager/addUser.js

@@ -144,7 +144,6 @@ var AddUser = React.createClass({
     };
     this.setState(obj);
     this.setState(color);
-    this.setState();
     //清除其他选中效果
     delete items[id];
     for(var i in items){

address_book/views/manager/deleteUser.js

@@ -16,7 +16,11 @@ var {
   } = React;
 
 var DeleteUser = React.createClass({
-
+  getInitialState: function () {
+    return {
+      email: ''
+    }
+  },
   render: function(){
     return (
       <ScrollView>
@@ -44,29 +48,33 @@ var DeleteUser = React.createClass({
 
   _deleteUser: function(){
     var that = this;
-    AlertIOS.alert('提示', '确认删除该用户？', [
-      {text: '删除', onPress: function(){
-        var path = Service.host + Service.deleteUser;
-        AsyncStorage.getItem('token', function(err, data){
-          if(!err){
-            Util.post(path,{
-              token: data,
-              email: that.state.email
-            }, function(data){
-              if(data.status){
-                AlertIOS.alert('成功', '删除成功');
+    this.state.email == '' ?
+      AlertIOS.alert('提示', '请输入要删除的用户邮箱') :
+      AlertIOS.alert('提示', '确认删除该用户？', [
+        {
+          text: '删除',
+          onPress: function(){
+            var path = Service.host + Service.deleteUser;
+            AsyncStorage.getItem('token', function(err, data){
+              if(!err){
+                Util.post(path,{
+                  token: data,
+                  email: that.state.email
+                }, function(data){
+                  if(data.status){
+                    AlertIOS.alert('成功', '删除成功');
+                  }else{
+                    AlertIOS.alert('失败', '删除失败');
+                  }
+                });
               }else{
-                AlertIOS.alert('失败', '删除失败');
+                AlertIOS.alert('提示', '没有权限');
               }
             });
-          }else{
-            AlertIOS.alert('提示', '没有权限');
           }
-        });
-        }
-      },
-      {text: '取消', onPress: ()=>null},
-    ]);
+        },
+        {text: '取消', onPress: ()=>null},
+      ]);
   }
 
 });

address_book/views/message.js

@@ -45,7 +45,6 @@ var Message = React.createClass({
         </View>
         <View style={{backgroundColor:'#fff', borderTopWidth:1, borderTopColor:'#ddd'}}>
           {items}
-          <View style={{height:35}}></View>
         </View>
       </ScrollView>
     );
@@ -57,7 +56,8 @@ var styles = StyleSheet.create({
   container:{
     flex:1,
     backgroundColor:'#F5F5F5',
-    flexDirection:'column'
+    flexDirection:'column',
+    marginBottom: 64
   },
   search:{
     height:35,