Merge branch 'master' of http://git.ycjcjy.com/xiangsong/miniapp

src/components/ScrollPageRefresh/index.jsx

@@ -33,14 +33,26 @@ export default function ScrollPageRefresh (props) {
     }
     request({ ...RequestBody }).then((res) => {
       if (PageNum === 1) {
-        Refresh([...res[ListName]])
+        if (ListName === null) {
+          Refresh([...res])
+        } else {
+          Refresh([...res[ListName]])
+        }
       } else {
-        Push([...res[ListName]])
+        if (ListName === null) {
+          Push([...res])
+        } else {
+          Push([...res[ListName]])
+        }
       }
-      if (res[ListName].length) {
-        setHasNextPage(res.current - 0 < res.pages - 0)
-      } else if (res.total === 0) {
+      if (ListName === null) {
         setHasNextPage(false)
+      } else {
+        if (res[ListName].length) {
+          setHasNextPage(res.current - 0 < res.pages - 0)
+        } else if (res.total === 0) {
+          setHasNextPage(false)
+        }
       }
       done()
     }).catch(() => {

src/components/WuYeFuWu/index.css

@@ -1,5 +1,6 @@
 .WuYeFuWu {
   width: 100%;
+  height: 100%;
   position: relative;
   overflow: hidden;
 }

src/components/WuYeFuWu/index.jsx

@@ -1,8 +1,7 @@
-import React, { useState, useEffect } from 'react'
-import request, { apis } from '@/utils/request'
+import React, { useState } from 'react'
 import { useModel } from '@/store'
 import WuYeFuWuItem from '@/components/WuYeFuWuItem/index'
-import ScrollPage from '@/components/ScrollPage/index'
+import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -10,55 +9,19 @@ import './index.less'
 export default function WuYeFuWu () {
 
   const { user } = useModel('user')
-  const [IsPullUp, setIsPullUp] = useState(false)
-  const [IsPullDown, setIsPullDown] = useState(false)
-  const [HasNextPage, setHasNextPage] = useState(true)
-  const [PageNum, setPageNum] = useState(1)
   const [PageList, setPageList] = useState([])
 
-  useEffect(() => {
-    GetPageList(() => {
-      setIsPullUp(false)
-    })
-  }, [PageNum])
-
-  const GetPageList = (done = () => { }) => { // 获取列表
-    request({ ...apis.getGongGaoList, args: { orgId: user.orgId }, params: { pageNum: PageNum, pageSize: 10 } }).then((res) => {
-      if (PageNum === 1) {
-        setPageList([...res.records])
-      } else {
-        setPageList(PageList.concat([...res.records]))
-      }
-      setHasNextPage(res.current - 0 < res.pages - 0)
-      done()
-    }).catch(() => {
-      done()
-    })
-  }
-
-  const OnRefresh = () => { // 页面下拉刷新
-    setIsPullDown(true)
-    setHasNextPage(true)
-    setPageNum(1)
-    if (PageNum === 1) {
-      GetPageList(() => {
-        setIsPullDown(false)
-      })
-    } else {
-      setPageNum(1)
-    }
+  const Refresh = (e) => { // 下拉刷新
+    setPageList(e)
   }
 
-  const OnPullUp = () => {
-    if (HasNextPage) {
-      setIsPullUp(true)
-      setPageNum(PageNum + 1)
-    }
+  const Push = (e) => { // 上拉加载
+    setPageList(PageList.concat(e))
   }
 
   return (
     <view className='WuYeFuWu'>
-      <ScrollPage IsPullDown={IsPullDown} IsPullUp={IsPullUp} HasMore={HasNextPage} OnRefresh={OnRefresh} OnPullUp={OnPullUp}>
+      <ScrollPageRefresh ApiName={`getMessageList`} ListName={`list`} RequestUrlData={{ orgId: user.orgId }} Refresh={Refresh} Push={Push}>
         {/* 大图 */}
         <view className='BigImg'>
           <image mode='aspectFill' src={null} className='centerLabel'></image>
@@ -87,7 +50,7 @@ export default function WuYeFuWu () {
             ))
           }
         </view>
-      </ScrollPage>
+      </ScrollPageRefresh>
     </view>
   )
 }

src/components/WuYeFuWu/index.less

@@ -1,5 +1,6 @@
 .WuYeFuWu {
   width: 100%;
+  height: 100%;
   position: relative;
   overflow: hidden;
 

src/pages.js

@@ -185,6 +185,11 @@ const Other = [
       eventType: 'other',
     }
   },
+  {
+    name: '我的-我的认证',
+    page: 'pages/WoDe/WoDeRenZheng/index',
+    type: 'other',
+  },
   {
     name: '我的-业主认证',
     page: 'pages/WoDe/YeZhuRenZheng/index',

src/pages/ShouYe/index.jsx

@@ -23,7 +23,7 @@ export default function Index (props) {
     { icon: 'iconjiaofei', name: '物业缴费', id: 1, router: '/pages/WuYe/index', isTab: true },
     { icon: 'icontongzhi', name: '物业通知', id: 2, router: '/pages/WuYe/index', isTab: true },
     { icon: 'iconbaoxiu', name: '物业报修', id: 3, router: '/pages/WuYe/index', isTab: true },
-    { icon: 'iconrenzheng', name: '业主认证', id: 4, router: '/pages/WoDe/YeZhuRenZheng/index', isTab: false }
+    { icon: 'iconrenzheng', name: '业主认证', id: 4, router: '/pages/WoDe/WoDeRenZheng/index', isTab: false }
   ])
   const [NavList] = useState([
     { icon: 'iconhuodong1', name: '活动', id: 1, router: '/pages/ShouYe/HuoDong/index', isTab: false },

src/pages/WoDe/WoDeRenZheng/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '我的认证'
+}

src/pages/WoDe/WoDeRenZheng/index.css

@@ -0,0 +1,74 @@
+.WoDeRenZheng {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  background: #f8f8f8;
+  overflow: hidden;
+}
+.WoDeRenZheng .Content {
+  padding: 0 30px;
+  position: relative;
+  overflow: hidden;
+}
+.WoDeRenZheng .Content > .ListItem {
+  position: relative;
+  overflow: hidden;
+  margin-bottom: 30px;
+  background: #fff;
+  border-radius: 10px;
+  padding: 20px;
+}
+.WoDeRenZheng .Content > .ListItem:first-child {
+  margin-top: 30px;
+}
+.WoDeRenZheng .Content > .ListItem > text {
+  display: block;
+  font-size: 28px;
+  font-weight: bold;
+  color: #000;
+  line-height: 40px;
+}
+.WoDeRenZheng .Content > .ListItem > .flex-h {
+  align-items: center;
+  position: relative;
+  overflow: hidden;
+  margin-top: 10px;
+}
+.WoDeRenZheng .Content > .ListItem > .flex-h > .flex-item {
+  position: relative;
+  overflow: hidden;
+  margin-right: 10px;
+}
+.WoDeRenZheng .Content > .ListItem > .flex-h > .flex-item > text {
+  display: block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 24px;
+  color: #666;
+  line-height: 40px;
+}
+.WoDeRenZheng .Content > .ListItem > .flex-h > view:last-child > text {
+  font-size: 28px;
+  color: #77A5F0;
+}
+.WoDeRenZheng .Content > .ListItem > .flex-h > view:last-child > text.Red {
+  color: #F35844;
+}
+.WoDeRenZheng .Content > .ListItem > .flex-h > view:last-child > text.Green {
+  color: #44d61f;
+}
+.WoDeRenZheng .Content > .AddBtn {
+  margin-bottom: 30px;
+  position: relative;
+  overflow: hidden;
+}
+.WoDeRenZheng .Content > .AddBtn > text {
+  font-size: 28px;
+  color: #fff;
+  line-height: 80px;
+  border-radius: 80px;
+  background: #F35844;
+  text-align: center;
+  display: block;
+}

src/pages/WoDe/WoDeRenZheng/index.jsx

@@ -0,0 +1,49 @@
+import React, { useState } from 'react'
+import ScrollPageRefresh from '@/components/ScrollPageRefresh'
+import toolclass from '@/utils/toolclass.js'
+import Taro from '@tarojs/taro'
+import '@/assets/css/reset.less'
+import '@/assets/css/iconfont.less'
+import './index.less'
+
+export default function WoDeRenZheng () {
+
+  const [PageList, setPageList] = useState([])
+
+  const Refresh = (e) => { // 下拉刷新
+    setPageList(e)
+  }
+
+  const Push = (e) => { // 上拉加载
+    setPageList(PageList.concat(e))
+  }
+
+
+  return (
+    <view className='WoDeRenZheng'>
+      <ScrollPageRefresh ApiName={`getOwnerVerifyList`} ListName={null} Refresh={Refresh} Push={Push}>
+        <view className='Content Activity'>
+          {
+            PageList.map((item, index) => (
+              <view className='ListItem' key={`RenZhengItem-${index}`} onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuShenHe/index?id=${item.id}` }) }}>
+                <text>{item.phaseName}{item.buildingName}{item.unitName}{item.levelName}{item.roomNoName}</text>
+                <view className='flex-h'>
+                  <view className='flex-item'>
+                    <text>业主：{item.ownerName} {item.phone}</text>
+                    <text>{toolclass.FormatDate(item.createDate)}</text>
+                  </view>
+                  <view>
+                    <text className={item.verifyStatus - 0 === 0 ? '' : item.verifyStatus - 0 === 1 ? 'Green' : 'Red'}>{item.verifyStatus - 0 === 0 ? '审核中' : item.verifyStatus - 0 === 1 ? '审核通过' : '审核未通过'}</text>
+                  </view>
+                </view>
+              </view>
+            ))
+          }
+          <view className='AddBtn'>
+            <text onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuRenZheng/index` }) }}>添加认证</text>
+          </view>
+        </view>
+      </ScrollPageRefresh>
+    </view>
+  )
+}

src/pages/WoDe/WoDeRenZheng/index.less

@@ -0,0 +1,88 @@
+.WoDeRenZheng {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  background: #f8f8f8;
+  overflow: hidden;
+
+  .Content {
+    padding: 0 30px;
+    position: relative;
+    overflow: hidden;
+
+    >.ListItem {
+      position: relative;
+      overflow: hidden;
+      margin-bottom: 30px;
+      background: #fff;
+      border-radius: 10px;
+      padding: 20px;
+
+      &:first-child {
+        margin-top: 30px;
+      }
+
+      >text {
+        display: block;
+        font-size: 28px;
+        font-weight: bold;
+        color: #000;
+        line-height: 40px;
+      }
+
+      >.flex-h {
+        align-items: center;
+        position: relative;
+        overflow: hidden;
+        margin-top: 10px;
+
+        >.flex-item {
+          position: relative;
+          overflow: hidden;
+          margin-right: 10px;
+
+          >text {
+            display: block;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            font-size: 24px;
+            color: #666;
+            line-height: 40px;
+          }
+        }
+
+        >view:last-child {
+          >text {
+            font-size: 28px;
+            color: #77A5F0;
+
+            &.Red {
+              color: #F35844;
+            }
+
+            &.Green {
+              color: #44d61f;
+            }
+          }
+        }
+      }
+    }
+
+    >.AddBtn {
+      margin-bottom: 30px;
+      position: relative;
+      overflow: hidden;
+
+      >text {
+        font-size: 28px;
+        color: #fff;
+        line-height: 80px;
+        border-radius: 80px;
+        background: #F35844;
+        text-align: center;
+        display: block;
+      }
+    }
+  }
+}

src/pages/WoDe/YeZhuRenZheng/index.jsx

@@ -109,22 +109,38 @@ export default function YeZhuRenZheng () {
       setDataLock(false)
       return false
     }
-    request({ ...apis.checkPhoneCode, params: { captcha: PhoneCode, tel: FormData.Phone } }).then(() => {
-      request({
-        ...apis.addOwnerVerify,
-        data: {
-          phaseId: Level2List[Level2Value].id,
-          buildingId: Level3List[Level3Value].id,
-          unitId: Level4List[Level4Value].id,
-          levelId: Level5List[Level5Value].id,
-          roomNoId: Level6List[Level6Value].id,
-          phone: FormData.Phone,
-          ownerName: FormData.RealName,
-          idCard: FormData.IdCard
-        }
-      }).then(() => {
-        Taro.showToast({ title: '添加认证成功', icon: 'none' })
-        setDataLock(false)
+    request({  // 校验业主是否认证某房产
+      ...apis.checkOwnerVerify,
+      params: {
+        orgId: user.orgId,
+        phaseId: Level2List[Level2Value].id,
+        buildingId: Level3List[Level3Value].id,
+        unitId: Level4List[Level4Value].id,
+        levelId: Level5List[Level5Value].id,
+        roomNoId: Level6List[Level6Value].id
+      }
+    }).then(() => {
+      request({ ...apis.checkPhoneCode, params: { captcha: PhoneCode, tel: FormData.Phone } }).then(() => { // 校验验证码
+        request({ // 提交认证数据
+          ...apis.addOwnerVerify,
+          data: {
+            phaseId: Level2List[Level2Value].id,
+            buildingId: Level3List[Level3Value].id,
+            unitId: Level4List[Level4Value].id,
+            levelId: Level5List[Level5Value].id,
+            roomNoId: Level6List[Level6Value].id,
+            phone: FormData.Phone,
+            ownerName: FormData.RealName,
+            idCard: FormData.IdCard
+          }
+        }).then((res) => {
+          Taro.showToast({ title: '添加认证成功', icon: 'none' })
+          Taro.navigateTo({ url: `/pages/WoDe/YeZhuShenHe/index?id=${res.id}` })
+          setDataLock(false)
+        }).catch((res) => {
+          Taro.showToast({ title: res, icon: 'none' })
+          setDataLock(false)
+        })
       }).catch((res) => {
         Taro.showToast({ title: res, icon: 'none' })
         setDataLock(false)

src/pages/WoDe/YeZhuShenHe/index.css

@@ -149,3 +149,39 @@
   line-height: 84px;
   text-align: center;
 }
+.YeZhuShenHe .LianXiPopup {
+  padding: 0 30px;
+  position: relative;
+  overflow: visible;
+  padding-bottom: 40px;
+}
+.YeZhuShenHe .LianXiPopup > text {
+  width: 100%;
+  display: block;
+  font-size: 24px;
+  color: #999;
+  line-height: 40px;
+  text-align: center;
+  margin-bottom: 30px;
+}
+.YeZhuShenHe .LianXiPopup > text:first-child {
+  font-size: 34px;
+  color: #333;
+  margin-bottom: 10px;
+  margin-top: -30px;
+}
+.YeZhuShenHe .LianXiPopup > .flex-h {
+  border-top: 2px solid rgba(0, 0, 0, 0.08);
+}
+.YeZhuShenHe .LianXiPopup > .flex-h > text {
+  font-size: 30px;
+  line-height: 100px;
+  color: #77A5F0;
+}
+.YeZhuShenHe .LianXiPopup > .flex-h > text:first-child {
+  color: #333;
+}
+.YeZhuShenHe .LianXiPopup > .flex-h > text:last-child {
+  font-size: 40px;
+  margin-left: 10px;
+}

src/pages/WoDe/YeZhuShenHe/index.jsx

@@ -1,11 +1,37 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
+import Taro, { Current } from '@tarojs/taro'
+import request, { apis } from '@/utils/request'
+import { useModel } from '@/store'
+import SlidePopup from '@/components/SlidePopup/index'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
 
-export default function YeZhuShenHe (props) {
+export default function YeZhuShenHe () {
 
-  const [Status, setStatus] = useState(1)
+  const { user } = useModel('user')
+  const [Status] = useState(1)
+  const [CurrnetId] = useState(Current.router.params.id) // 当前id
+  const [PhoneList, setPhoneList] = useState([])
+  const [ShowPopup, setShowPopup] = useState(false)
+  const [Detail, setDetail] = useState(null)
+
+  useEffect(() => {
+    GetDetail()
+    GetWuYePhoneList()
+  }, [CurrnetId])
+
+  const GetDetail = () => { // 获取详情
+    request({ ...apis.getRenZhengDetail, args: { id: CurrnetId } }).then((res) => {
+      setDetail(res)
+    })
+  }
+
+  const GetWuYePhoneList = () => { // 获取物业电话
+    request({ ...apis.getWuYePhone }).then((res) => {
+      setPhoneList(res || [])
+    })
+  }
 
   return (
     <view className='YeZhuShenHe'>
@@ -90,7 +116,7 @@ export default function YeZhuShenHe (props) {
         }
 
         <view className='OtherTab'>
-          <view className='flex-h'>
+          <view className='flex-h' onClick={() => { setShowPopup(true) }}>
             <text className='flex-item'>联系物业</text>
             <text className='iconfont iconjiantouright'></text>
           </view>
@@ -98,7 +124,7 @@ export default function YeZhuShenHe (props) {
             <text className='flex-item'>删除当前资料</text>
             <text className='iconfont iconjiantouright'></text>
           </view>
-          <view className='flex-h'>
+          <view className='flex-h' onClick={() => { Taro.redirectTo({ url: `/pages/WoDe/YeZhuRenZheng/index` }) }}>
             <text className='flex-item'>关联其他房产</text>
             <text className='iconfont iconjiantouright'></text>
           </view>
@@ -115,6 +141,22 @@ export default function YeZhuShenHe (props) {
           <text>重新认证</text>
         </view>
       }
+
+      <SlidePopup Close={() => { setShowPopup(false) }} Show={ShowPopup}>
+        <view className='LianXiPopup'>
+          <text>联系物业</text>
+          <text>对此费用有疑问</text>
+          {
+            PhoneList.map((item, index) => (
+              <view className='flex-h' key={`PhoneList-${index}`} onClick={() => { Taro.makePhoneCall({ phoneNumber: item.tel }) }}>
+                <text className='flex-item'>{item.name}</text>
+                <text>{item.tel}</text>
+                <text className='iconfont icondianhua'></text>
+              </view>
+            ))
+          }
+        </view>
+      </SlidePopup>
     </view>
   )
 }

src/pages/WoDe/YeZhuShenHe/index.less

@@ -177,4 +177,46 @@
       text-align: center;
     }
   }
+  .LianXiPopup {
+    padding: 0 30px;
+    position: relative;
+    overflow: visible;
+    padding-bottom: 40px;
+
+    >text {
+      width: 100%;
+      display: block;
+      font-size: 24px;
+      color: #999;
+      line-height: 40px;
+      text-align: center;
+      margin-bottom: 30px;
+
+      &:first-child {
+        font-size: 34px;
+        color: #333;
+        margin-bottom: 10px;
+        margin-top: -30px;
+      }
+    }
+
+    >.flex-h {
+      border-top: 2px solid rgba(0, 0, 0, 0.08);
+
+      >text {
+        font-size: 30px;
+        line-height: 100px;
+        color: #77A5F0;
+
+        &:first-child {
+          color: #333;
+        }
+
+        &:last-child {
+          font-size: 40px;
+          margin-left: 10px;
+        }
+      }
+    }
+  }
 }

src/pages/WoDe/index.jsx

@@ -2,19 +2,18 @@ import React, { useState, useEffect } from 'react'
 import NavHeader from '@/components/NavHeader/index'
 import Taro from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
-import { store, useModel } from '@/store'
+import { useModel } from '@/store'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
 
-export default function WoDe (props) {
+export default function WoDe () {
 
-  const { setUser } = store.getModel('user').getState()
-  const { user } = useModel('user')
+  const { user, setUser } = useModel('user')
   const [IsPull, setIsPull] = useState(false)
   const [UserTab] = useState([
-    { icon: 'iconrenzheng1', name: '业主认证', id: 1, router: '/pages/WoDe/YeZhuRenZheng/index' },
-    { icon: 'iconjifenguize', name: '积分明细', id: 2, router: null },
+    { icon: 'iconrenzheng1', name: '业主认证', id: 1, router: '/pages/WoDe/WoDeRenZheng/index' },
+    { icon: 'iconjifenguize', name: '积分明细', id: 2, router: '/pages/FuLi/JiFenMingXi/index' },
     { icon: 'iconjiaofei', name: '物业缴费', id: 3, router: null },
     { icon: 'iconfuwu1', name: '物业服务', id: 4, router: null }
   ])
@@ -26,12 +25,12 @@ export default function WoDe (props) {
   const [DataLock, setDataLock] = useState(false)
 
   useEffect(() => {
-    if (user !== null) {
-      request({ ...apis.getOwnerVerifyList }).then(() => {
-      }).catch((res) => {
-        Taro.showToast({ title: res, icon: 'none' })
-      })
-    }
+    // if (user !== null) {
+    //   request({ ...apis.getOwnerVerifyList }).then(() => {
+    //   }).catch((res) => {
+    //     Taro.showToast({ title: res, icon: 'none' })
+    //   })
+    // }
   }, [])
 
   const ToSign = () => { // 签到

src/pages/WuYe/GongGaoDetail/index.css

@@ -1,6 +1,59 @@
 .WuYeGongGaoDetail {
   width: 100%;
-  height: 100%;
+  min-height: 100%;
   position: relative;
-  background: #f8f8f8;
+  background: #fff;
+}
+.WuYeGongGaoDetail > .Title {
+  padding: 30px;
+  position: relative;
+  overflow: hidden;
+}
+.WuYeGongGaoDetail > .Title > text {
+  display: block;
+  font-size: 30px;
+  font-weight: bold;
+  text-align: center;
+  line-height: 40px;
+}
+.WuYeGongGaoDetail > .flex-h {
+  padding: 0 30px;
+  align-items: center;
+}
+.WuYeGongGaoDetail > .flex-h > .flex-item {
+  font-size: 0;
+  white-space: nowrap;
+}
+.WuYeGongGaoDetail > .flex-h > .flex-item > text {
+  display: inline-block;
+  vertical-align: middle;
+  font-size: 24px;
+  color: #666;
+  line-height: 40px;
+  margin-right: 10px;
+}
+.WuYeGongGaoDetail > .flex-h > view:last-child {
+  font-size: 0;
+  white-space: nowrap;
+}
+.WuYeGongGaoDetail > .flex-h > view:last-child > text {
+  display: inline-block;
+  vertical-align: middle;
+  font-size: 24px;
+  color: #666;
+  line-height: 40px;
+}
+.WuYeGongGaoDetail > .flex-h > view:last-child > text.iconfont {
+  font-size: 40px;
+  color: #F35844;
+  margin-right: 10px;
+}
+.WuYeGongGaoDetail > .Desc {
+  padding: 30px;
+  position: relative;
+  overflow: hidden;
+}
+.WuYeGongGaoDetail > .Desc > image {
+  width: 100%;
+  margin-top: 10px;
 }

src/pages/WuYe/GongGaoDetail/index.jsx

@@ -1,7 +1,9 @@
 import React, { useState, useEffect } from 'react'
 import Taro, { Current } from '@tarojs/taro'
 import request, { apis } from '@/utils/request'
+import { RichText } from '@tarojs/components'
 import { useModel } from '@/store'
+import toolclass from '@/utils/toolclass.js'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -9,23 +11,38 @@ import './index.less'
 export default function WuYeGongGaoDetail () {
 
   const { user } = useModel('user')
-  const CurrnetId = Current.router.params.id
+  const [CurrnetId] = useState(Current.router.params.id)
   const [DetailInfo, setDetailInfo] = useState(null)
 
   useEffect(() => {
     Init()
-  }, [])
+  }, [CurrnetId])
 
   const Init = () => {
     request({ ...apis.getGongGaoDetail, args: { orgId: user.orgId }, params: { id: CurrnetId } }).then((res) => {
-      console.log(JSON.stringify(res))
       setDetailInfo(res)
     })
   }
 
   return (
     <view className='WuYeGongGaoDetail'>
-
+      <view className='Title'>
+        <text>{DetailInfo === null ? null : DetailInfo.announcementTitle}</text>
+      </view>
+      <view className='flex-h'>
+        <view className='flex-item'>
+          <text>{DetailInfo === null ? null : DetailInfo.createUser}</text>
+          <text>{DetailInfo === null ? null : toolclass.FormatDate(DetailInfo.createDate)}</text>
+        </view>
+        <view>
+          <text className='iconfont iconguankan'></text>
+          <text>{DetailInfo === null ? null : DetailInfo.viewCount}</text>
+        </view>
+      </view>
+      <view className='Desc'>
+        <RichText nodes={DetailInfo === null ? null : DetailInfo.announcementContent}></RichText>
+        <image mode='widthFix' src={DetailInfo === null ? null : DetailInfo.announcementCarouselImg}></image>
+      </view>
     </view>
   )
 }

src/pages/WuYe/GongGaoDetail/index.less

@@ -1,6 +1,69 @@
 .WuYeGongGaoDetail {
   width: 100%;
-  height: 100%;
+  min-height: 100%;
   position: relative;
-  background: #f8f8f8;
+  background: #fff;
+
+  >.Title {
+    padding: 30px;
+    position: relative;
+    overflow: hidden;
+
+    >text {
+      display: block;
+      font-size: 30px;
+      font-weight: bold;
+      text-align: center;
+      line-height: 40px;
+    }
+  }
+
+  >.flex-h {
+    padding: 0 30px;
+    align-items: center;
+
+    >.flex-item {
+      font-size: 0;
+      white-space: nowrap;
+
+      >text {
+        display: inline-block;
+        vertical-align: middle;
+        font-size: 24px;
+        color: #666;
+        line-height: 40px;
+        margin-right: 10px;
+      }
+    }
+
+    >view:last-child {
+      font-size: 0;
+      white-space: nowrap;
+
+      >text {
+        display: inline-block;
+        vertical-align: middle;
+        font-size: 24px;
+        color: #666;
+        line-height: 40px;
+
+        &.iconfont {
+          font-size: 40px;
+          color: #F35844;
+          margin-right: 10px;
+        }
+      }
+    }
+  }
+
+  >.Desc {
+    padding: 30px;
+    position: relative;
+    overflow: hidden;
+
+    >image {
+      width: 100%;
+      margin-top: 10px;
+    }
+  }
 }

src/utils/api.js

@@ -1,6 +1,14 @@
 const prefix = `${HOST}/api/wx`
 
 const $api = {
+  getMessageList: { // 获取小区通知
+    method: 'get',
+    url: `${prefix}/message/:orgId/news`
+  },
+  getRenZhengDetail: { // 获取认证详情
+    method: 'get',
+    url: `${prefix}/user/verify/:id`
+  },
   userSign: { // 用户签到
     method: 'post',
     url: `${prefix}/user/signin`
@@ -13,6 +21,10 @@ const $api = {
     method: 'post',
     url: `${prefix}/user/verify/add`
   },
+  checkOwnerVerify: { // 校验业主是否认证某房产
+    method: 'get',
+    url: `${prefix}/building/has`
+  },
   checkPhoneCode: { // 校验手机验证码
     method: 'post',
     url: `${prefix}/check/captcha`