Merge branch 'master' of git://192.168.1.116/bolan-root/frontend/manager-app-sz into wq

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "devDependencies": {
     "babel-eslint": "^8.0.1",
-    "babel-plugin-import": "^1.6.0",
+    "babel-plugin-import": "^1.6.2",
     "babel-preset-flow": "^6.23.0",
     "babel-preset-react-native-stage-0": "^1.0.1",
     "css-loader": "^0.28.7",

src/routes/main/DSRInfoScreeen.js

+import React, { Component } from 'react';
+import { View, Text, ScrollView, StyleSheet } from 'react-native';
+import { Card, WingBlank, WhiteSpace, Button, Icon } from 'antd-mobile';
+import { connect } from 'react-redux';
+
+@connect(({ obligeeInfo, loading }) => ({ obligeeInfo, loading: !!loading.effects['obligeeInfo/getObligeeList'] }))
+class DSRInfoScreeen extends Component {
+
+  render() {
+    return (
+      <Card>
+        <Card.Header
+          extra={
+            <View style={{ flexDirection: 'row' }}>
+              <Button type="primary">新增</Button>
+            </View>
+          }
+        />
+        <Card.Body>
+          <ScrollView >
+            <WingBlank size="lg">
+              <WhiteSpace size="lg" />
+              <Card>
+                <Card.Header
+                  title="张三"
+                  extra={<Text style={Styles.cardText}>&gt;&gt;详情</Text>}
+                />
+                <Card.Body>
+                  <Text style={Styles.cardBodyText}>性别:<Text style={Styles.cardBodyText2}>男</Text></Text>
+                  <Text style={Styles.cardBodyText}>证件号码:<Text style={Styles.cardBodyText2}>350502199210236034</Text></Text>
+                  <Text style={Styles.cardBodyText}>与户主关系:<Text style={Styles.cardBodyText2}>户主</Text></Text>
+                </Card.Body>
+              </Card>
+              <WhiteSpace size="lg" />
+            </WingBlank>
+            <WingBlank size="lg">
+              <WhiteSpace size="lg" />
+              <Card>
+                <Card.Header
+                  title="张三"
+                  extra={<Text style={Styles.cardText}>&gt;&gt;详情</Text>}
+                />
+                <Card.Body>
+                  <Text style={Styles.cardBodyText}>性别:男</Text>
+                  <Text style={Styles.cardBodyText}>证件号码:350502199210236034</Text>
+                  <Text style={Styles.cardBodyText}>与户主关系:户主</Text>
+                </Card.Body>
+              </Card>
+              <WhiteSpace size="lg" />
+            </WingBlank>
+            <WingBlank size="lg">
+              <WhiteSpace size="lg" />
+              <Card>
+                <Card.Header
+                  title="张三"
+                  extra={<Text style={Styles.cardText}>&gt;&gt;详情</Text>}
+                />
+                <Card.Body>
+                  <Text style={Styles.cardBodyText}>性别:男</Text>
+                  <Text style={Styles.cardBodyText}>证件号码:350502199210236034</Text>
+                  <Text style={Styles.cardBodyText}>与户主关系:户主</Text>
+                </Card.Body>
+              </Card>
+              <WhiteSpace size="lg" />
+            </WingBlank>
+            <WingBlank size="lg">
+              <WhiteSpace size="lg" />
+              <Card>
+                <Card.Header
+                  title="张三"
+                  extra={<Text style={Styles.cardText}>&gt;&gt;详情</Text>}
+                />
+                <Card.Body>
+                  <Text style={Styles.cardBodyText}>性别:男</Text>
+                  <Text style={Styles.cardBodyText}>证件号码:350502199210236034</Text>
+                  <Text style={Styles.cardBodyText}>与户主关系:户主</Text>
+                </Card.Body>
+              </Card>
+              <WhiteSpace size="lg" />
+            </WingBlank>
+            <WingBlank size="lg">
+              <WhiteSpace size="lg" />
+              <Card>
+                <Card.Header
+                  title="张三"
+                  extra={<Text style={Styles.cardText}>&gt;&gt;详情</Text>}
+                />
+                <Card.Body>
+                  <Text style={Styles.cardBodyText}>性别:男</Text>
+                  <Text style={Styles.cardBodyText}>证件号码:350502199210236034</Text>
+                  <Text style={Styles.cardBodyText}>与户主关系:户主</Text>
+                </Card.Body>
+              </Card>
+              <WhiteSpace size="lg" />
+            </WingBlank>
+          </ScrollView >
+        </Card.Body>
+      </Card>
+
+    );
+  }
+}
+const Styles = StyleSheet.create({
+  cardText: {
+    color: '#2196F3',
+    textAlign: 'right',
+  },
+  cardBodyText: {
+    marginBottom: 10,
+    marginLeft: 13,
+  },
+});
+export default DSRInfoScreeen;

src/routes/main/fwInfo.js

@@ -9,7 +9,7 @@ import ErJiScreen from './houseinfo/erJiScreen';
 
 class HouseList extends Component {
   state = {
-    value: '美食',
+    value: '',
   };
 
   action = () => {

src/routes/main/index.js

@@ -5,6 +5,7 @@ import userInfoPageScreen from './userinfopage';
 import fwInfo from './fwInfo';
 import chatsIcon from '../../../image/chats-icon.png';
 import Empty from '../empty';
+import DSRInfoScreeen from './DSRInfoScreeen';
 
 const Content = TabNavigator({
   FWInfo: {
@@ -22,7 +23,7 @@ const Content = TabNavigator({
     },
   },
   DSRInfo: {
-    screen: Empty('权利人信息的新增，修改，还可以添加人口信息', 'DSRInfoScreen'),
+    screen: DSRInfoScreeen,
     navigationOptions: {
       lazy: true,
       tabBarLabel: '权利人信息',