Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-manage

src/pages/property/proprietor/Audit.jsx

@@ -122,7 +122,7 @@ export default props => {
         <p style={{color: '#888', fontSize: '0.8em'}}>注意，审核后无法修改审核结果，请仔细确认</p>
       </div>
       <List dataSource={listData} pagination={pagination} loading={loading} rowKey="id">
-        <Table.Column title="姓名" dataIndex="userName" key="userName" />
+        <Table.Column title="姓名" dataIndex="ownerName" key="ownerName" />
         <Table.Column title="手机号" dataIndex="phone" key="phone" />
         <Table.Column title="身份证" dataIndex="idCard" key="idCard" />
         <Table.Column title="性别" dataIndex="gender" key="gender" render={x => x === '2' ? '女' : '男'} />

src/pages/property/proprietor/Detail.jsx

@@ -36,14 +36,14 @@ export default props => {
     buildingDetails({ data: { id } }).then(res => {
       const { taUser = {}, taUserVerify = {}, roomInfoList = [] } = res || {}
       setUserData({
-        userName: taUser.userName,
+        name: taUser.name,
         gender: taUser.gender,
-        loginName : taUser.loginName,
+        phone : taUser.phone,
         nickname : taUser.nickname,
         openid: taUser.openid,
-        idCard: taUser.idCard,
-        headPortrait: taUser.headPortrait,
-        description: taUser.description,
+        idNo: taUser.idNo,
+        avatarurl: taUser.avatarurl,
+        ownerName: taUserVerify.ownerName,
         verifyStatus: taUserVerify.verifyStatus + '',
         status: taUserVerify.verifyStatus + '',
         faceImg: taUserVerify.faceImg,
@@ -62,22 +62,22 @@ export default props => {
     <div>
       <Section title="基本信息">
         <Descriptions column={3}>
-          <Descriptions.Item label="姓名">{userData.userName}</Descriptions.Item>
+          <Descriptions.Item label="姓名">{userData.ownerName}</Descriptions.Item>
           <Descriptions.Item label="性别">{userData.gender === '2' ? '女' : '男'}</Descriptions.Item>
-          <Descriptions.Item label="手机号">{userData.loginName}</Descriptions.Item>
+          <Descriptions.Item label="手机号">{userData.phone}</Descriptions.Item>
           <Descriptions.Item label="微信昵称">{userData.nickname}</Descriptions.Item>
           <Descriptions.Item label="微信ID">{userData.openid}</Descriptions.Item>
-          <Descriptions.Item label="身份证">{userData.idCard}</Descriptions.Item>
+          <Descriptions.Item label="身份证">{userData.idNo}</Descriptions.Item>
           <Descriptions.Item label="头像">
-            <img src={userData.headPortrait} alt="" style={{ width: '128px', height: '128px' }}/>
+            <img src={userData.avatarurl} alt="" style={{ width: '128px', height: '128px' }}/>
           </Descriptions.Item>
         </Descriptions>
       </Section>
       <Section title="在当前房屋" subTitle={roomName} action={<Button type="link" onClick={() => setEditorShow(true)}>修改</Button>}>
         <Descriptions column={3}>
-          <Descriptions.Item label="身份">{userData.description}</Descriptions.Item>
+          <Descriptions.Item label="身份">业主</Descriptions.Item>
           <Descriptions.Item label="审核状态">{VerifyStatusDict[userData.status]}</Descriptions.Item>
-          <Descriptions.Item label="资料手机">{userData.loginName}</Descriptions.Item>
+          <Descriptions.Item label="资料手机">{userData.phone}</Descriptions.Item>
           <Descriptions.Item label="人脸">
             <img src={userData.faceImg} alt="" style={{ width: '128px', height: '128px' }}/>
           </Descriptions.Item>

src/services/buildingOwnerInfo_api.js

@@ -151,13 +151,13 @@ export default prefix => {
 
     //
     uploadBuildingExcel: {
-      url: `${prefix}/${moduleName}/building/uploadExcel`,
+      url: `${prefix}/${moduleName}/uploadExcel`,
       method: 'post',
       action: `admin.${moduleName}.building.uploadExcel`
     },
 
     submitBuildingExcel: {
-      url: `${prefix}/${moduleName}/building/submitExcel`,
+      url: `${prefix}/${moduleName}/submitExcel`,
       method: 'post',
       action: `admin.${moduleName}.building.submitExcel`
     },