静态页面

config/dev.js

@@ -3,7 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xs.ycjcjy.com"'
+    // HOST: '"https://xs.ycjcjy.com"',
+    HOST: '"http://t.ycjcjy.com"',
     // HOST: '"http://127.0.0.1:6060"'
   },
   mini: {

project.config.json

@@ -28,7 +28,7 @@
 		},
 		"bundle": false,
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false,
 		"useMultiFrameRuntime": false,
 		"useApiHook": true,

src/app.js

@@ -55,7 +55,7 @@ class App extends Component {
       success: res => {
         if (res.errMsg === 'login:ok') {
           request({ ...apis.login, params: { code: res.code, from, recommender, scene, mpOpenId } }).then(x => {
-            setUser({ ...x.person, ShowIndexAdv: false, FirstComing: true })
+            setUser({ ...x.person, ShowIndexAdv: false, FirstComing: true, communityId: x.houseList !== null && x.houseList.length ? x.houseList[0].communityId : null, roomId: x.houseList !== null && x.houseList.length ? x.houseList[0].id : null })
             Taro.setStorage({ key: 'token', data: x.token })
             Taro.setStorage({ key: 'sessionKey', data: x.sessionKey })
 

src/components/WuYeBaoXiu/index.jsx

@@ -59,7 +59,7 @@ export default function WuYeBaoXiu (props) {
         ApiName='getGongDanList'
         ListName='pagelist'
         RequestUrlData={{ orgId: user.orgId }}
-        RequestParams={{ type: 2 }}
+        RequestParams={{ type: 2, taUserVerifyId: user.roomId }}
         Refresh={Refresh}
         Push={Push}
         KeepChildren={

src/components/WuYeGongGao/index.jsx

@@ -49,6 +49,7 @@ export default function WuYeGongGao () {
         IsEmpty={IsEmpty}
         ApiName={`getGongGaoList`}
         RequestUrlData={{ orgId: user.orgId }}
+        RequestParams={{ taUserVerifyId: user.communityId }}
         Refresh={Refresh}
         Push={Push}
         KeepChildren={

src/components/WuYeJiaoFei/index.jsx

@@ -3,6 +3,7 @@ import WuYeBanner from '@/components/WuYeBanner/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
 import request, { apis } from '@/utils/request'
 import nav2detail from '@/utils/nav2detail'
+import { useModel } from '@/store'
 import Taro from '@tarojs/taro'
 import { Swiper, SwiperItem } from '@tarojs/components'
 import { Checkbox, CheckboxGroup } from '@tarojs/components'
@@ -25,6 +26,7 @@ const cancelOrder = outTradeNo => {
 
 export default function WuYeJiaoFei () {
 
+  const { user } = useModel('user')
   const [PageList, setPageList] = useState([])
   const [BannerList, setBannerList] = useState([])
   const [checkedIds, setCheckedIds] = useState([])
@@ -135,6 +137,7 @@ export default function WuYeJiaoFei () {
             ApiName={`getJiaoFeiList`}
             ListName={`list`}
             RequestUrlData={{ type: 0 }}
+            RequestParams={{ taUserVerifyId: user.roomId }}
             Refresh={Refresh}
             Push={Push}
             Reset={ToReset}

src/pages/ShouYe/index.jsx

@@ -103,7 +103,7 @@ export default function Index () {
   }
 
   const GetNotice = () => { // 获取通知
-    request({ ...apis.getGongGaoList, args: { orgId: 1 }, params: { annType: 'notice', pageNum: 1, pageSize: 1 } }).then((res) => {
+    request({ ...apis.getGongGaoList, args: { orgId: 1 }, params: { annType: 'notice', pageNum: 1, pageSize: 1, taUserVerifyId: user.communityId } }).then((res) => {
       setNoticeInfo(res.records[0])
       if (res.records !== null && res.records.length > 0) {
         setShowNotice(true)

src/pages/WoDe/WoDeGongDan/index.jsx

@@ -30,7 +30,7 @@ export default function WoDeGongDan () {
   return (
     <Page>
       <view className='WoDeGongDan'>
-      <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGongDanList`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }}  ListName='pagelist' Refresh={Refresh} Push={Push}>
+      <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGongDanList`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2, taUserVerifyId: user.roomId }}  ListName='pagelist' Refresh={Refresh} Push={Push}>
           <view className='Content Activity'>
             {
               PageList.map((item, index) => (

src/pages/WoDe/WoDeRenZheng/index.jsx

@@ -56,6 +56,14 @@ export default function WoDeRenZheng () {
     setPageList(PageList.concat(e))
   }
 
+  const SetDefaultRoom = (item) => {
+    return () => {
+      if (item.id - 0 !== user.roomId - 0) {
+        setUser({ ...user, communityId: item.communityId, roomId: item.id })
+      }
+    }
+  }
+
 
   return (
     <Page>
@@ -64,14 +72,18 @@ export default function WoDeRenZheng () {
           <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='ListItem' key={`RenZhengItem-${index}`}>
+                  <text onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuShenHe/index?id=${item.id}` }) }}>{item.phaseName}{item.buildingName}{item.unitName}{item.levelName}{item.roomNoName}</text>
                   <view className='flex-h'>
-                    <view className='flex-item'>
+                    <view className='flex-item' onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuShenHe/index?id=${item.id}` }) }}>
                       <text>{item.roleName || '户主'}：{item.ownerName} {item.phone}</text>
                       <text>{toolclass.FormatDate(item.createDate)}</text>
                     </view>
                     <view>
+                      {
+                        item.verifyStatus - 0 === 1 &&
+                        <text className={item.id - 0 === user.roomId - 0 ? 'Btn' : 'Btn active'} onClick={SetDefaultRoom(item)}>{item.id - 0 === user.roomId - 0 ? '默认房产' : '设为默认'}</text>
+                      }
                       <text className={item.verifyStatus - 0 === 0 ? '' : item.verifyStatus - 0 === 1 ? 'Green' : 'Red'}>{item.verifyStatus - 0 === 0 ? '审核中' : item.verifyStatus - 0 === 1 ? '审核通过' : '审核未通过'}</text>
                     </view>
                   </view>

src/pages/WoDe/WoDeRenZheng/index.less

@@ -56,6 +56,8 @@
           >text {
             font-size: 28px;
             color: #77A5F0;
+            display: block;
+            text-align: center;
 
             &.Red {
               color: #F35844;
@@ -64,6 +66,18 @@
             &.Green {
               color: #44d61f;
             }
+
+            &.Btn {
+              color: #666;
+              line-height: 50px;
+              padding: 0 20px;
+              border-radius: 25px;
+
+              &.active {
+                color: #fff;
+                background: #F35844;
+              }
+            }
           }
         }
       }
@@ -94,6 +108,7 @@
     bottom: 0;
     background: rgba(0, 0, 0, 0.8);
     display: none;
+
     &.active {
       display: block;
     }

src/pages/WoDe/YeZhuRenZheng/index.jsx

@@ -23,7 +23,8 @@ export default function YeZhuRenZheng () {
     { name: '租客', id: 'TENANT' },
     { name: '家属', id: 'RELATION' }
   ])
-  const [Level1Value] = useState(user.orgId)
+  const [Level1Value, setLevel1Value] = useState(null)
+  const [Level1List, setLevel1List] = useState([])
   const [Level2Value, setLevel2Value] = useState(null)
   const [Level2List, setLevel2List] = useState([])
   const [Level3Value, setLevel3Value] = useState(null)
@@ -41,6 +42,10 @@ export default function YeZhuRenZheng () {
     }
   }, [user])
 
+  useEffect(() => {
+    GetLevel1List()
+  }, [])
+
   useEffect(() => {
     GetLevel2List()
   }, [Level1Value])
@@ -157,6 +162,7 @@ export default function YeZhuRenZheng () {
       ...apis.checkOwnerVerify,
       params: {
         orgId: user.orgId,
+        communityId: Level1List[Level1Value].id,
         phaseId: Level2List[Level2Value].id,
         buildingId: Level3List[Level3Value].id,
         unitId: Level4List[Level4Value].id,
@@ -169,6 +175,7 @@ export default function YeZhuRenZheng () {
         request({ // 提交认证数据
           ...apis.addOwnerVerify,
           data: {
+            communityId: Level1List[Level1Value].id,
             phaseId: Level2List[Level2Value].id,
             buildingId: Level3List[Level3Value].id,
             unitId: Level4List[Level4Value].id,
@@ -206,15 +213,24 @@ export default function YeZhuRenZheng () {
     })
   }
 
-  const GetLevel2List = () => {
-    request({ ...apis.getRenZhengAddressList, params: { orgId: user.orgId } }).then((res) => {
-      setLevel2List(res || [])
+  const GetLevel1List = () => {
+    request({ ...apis.GetCommunityList }).then((res) => {
+      console.log(res.records)
+      setLevel1List(res.records || [])
     })
   }
 
+  const GetLevel2List = () => {
+    if (Level1Value !== null) {
+      request({ ...apis.getRenZhengAddressList, params: { orgId: user.orgId, communityId: Level1List[Level1Value].id } }).then((res) => {
+        setLevel2List(res || [])
+      })
+    }
+  }
+
   const GetLevel3List = () => {
     if (Level2Value !== null) {
-      request({ ...apis.getRenZhengAddressList, params: { orgId: user.orgId, phaseId: Level2List[Level2Value].id } }).then((res) => {
+      request({ ...apis.getRenZhengAddressList, params: { orgId: user.orgId, communityId: Level1List[Level1Value].id, phaseId: Level2List[Level2Value].id } }).then((res) => {
         setLevel3List(res || [])
       })
     } else {
@@ -225,7 +241,7 @@ export default function YeZhuRenZheng () {
 
   const GetLevel4List = () => {
     if (Level3Value !== null) {
-      request({ ...apis.getRenZhengAddressList, params: { orgId: user.orgId, phaseId: Level2List[Level2Value].id, buildingId: Level3List[Level3Value].id } }).then((res) => {
+      request({ ...apis.getRenZhengAddressList, params: { orgId: user.orgId, communityId: Level1List[Level1Value].id, phaseId: Level2List[Level2Value].id, buildingId: Level3List[Level3Value].id } }).then((res) => {
         setLevel4List(res || [])
       })
     } else {
@@ -236,7 +252,7 @@ export default function YeZhuRenZheng () {
 
   const GetLevel5List = () => {
     if (Level4Value !== null) {
-      request({ ...apis.getRenZhengAddressList, params: { orgId: user.orgId, phaseId: Level2List[Level2Value].id, buildingId: Level3List[Level3Value].id, unitId: Level4List[Level4Value].id } }).then((res) => {
+      request({ ...apis.getRenZhengAddressList, params: { orgId: user.orgId, communityId: Level1List[Level1Value].id, phaseId: Level2List[Level2Value].id, buildingId: Level3List[Level3Value].id, unitId: Level4List[Level4Value].id } }).then((res) => {
         setLevel5List(res || [])
       })
     } else {
@@ -247,7 +263,7 @@ export default function YeZhuRenZheng () {
 
   const GetLevel6List = () => {
     if (Level5Value !== null) {
-      request({ ...apis.getRenZhengAddressList, params: { orgId: user.orgId, phaseId: Level2List[Level2Value].id, buildingId: Level3List[Level3Value].id, unitId: Level4List[Level4Value].id, levelId: Level5List[Level5Value].id } }).then((res) => {
+      request({ ...apis.getRenZhengAddressList, params: { orgId: user.orgId, communityId: Level1List[Level1Value].id, phaseId: Level2List[Level2Value].id, buildingId: Level3List[Level3Value].id, unitId: Level4List[Level4Value].id, levelId: Level5List[Level5Value].id } }).then((res) => {
         setLevel6List(res || [])
       })
     } else {
@@ -260,6 +276,15 @@ export default function YeZhuRenZheng () {
     setRoleName(RoleList[e.detail.value].name)
   }
 
+  const Level1Change = (e) => {
+    if (Level1Value !== e.detail.value - 0) {
+      setLevel2Value(null)
+    }
+    if (Level1List.length > 0) {
+      setLevel1Value(e.detail.value - 0)
+    }
+  }
+
   const Level2Change = (e) => {
     if (Level2Value !== e.detail.value - 0) {
       setLevel3Value(null)
@@ -331,6 +356,14 @@ export default function YeZhuRenZheng () {
               </Picker>
             </view>
           </view>
+          <view className='flex-h'>
+            <text>小区</text>
+            <view className='flex-item'>
+              <Picker value={Level1Value} range-key='name' range={Level1List} onChange={Level1Change}>
+                <view className='PickerText'>{Level1List.length > 0 && Level1Value !== null ? Level1List[Level1Value].name : '请选择小区'}</view>
+              </Picker>
+            </view>
+          </view>
           <view className='flex-h'>
             <text>期号</text>
             <view className='flex-item'>

src/pages/WoDe/YeZhuRenZheng/index.less

@@ -63,11 +63,11 @@
   }
 
   >.BottomBtn {
-    padding: 0 30px;
+    padding: 0 30px 30px;
+    margin-top: -40px;
     position: relative;
     overflow: hidden;
     z-index: 2;
-    margin-top: -164px;
 
     >text {
       display: block;

src/pages/WuYe/TianJiaBaoXiu/index.jsx

@@ -10,6 +10,7 @@ import './index.less'
 
 export default function WuYeTianJiaBaoXiu () {
 
+  const { user } = useModel('user')
   const [Title, setTitle] = useState('')
   const [Desc, setDesc] = useState('')
   const [DataLock, setDataLock] = useState(false)
@@ -43,6 +44,7 @@ export default function WuYeTianJiaBaoXiu () {
     setDataLock(true)
     request({
       ...apis.AddGongDan,
+      params: { taUserVerifyId: user.roomId },
       data: {
         ticketTitle: Title,
         ticketContent: Desc,
@@ -87,7 +89,7 @@ export default function WuYeTianJiaBaoXiu () {
 
   useEffect(() => {
     if (rpType) {
-      request({...apis.getRepairTypeDetail, args: {id: rpType}}).then(res => {
+      request({ ...apis.getRepairTypeDetail, args: { id: rpType } }).then(res => {
         setRepairType(res)
       })
     }
@@ -101,7 +103,7 @@ export default function WuYeTianJiaBaoXiu () {
           <Textarea placeholder='描述问题详情，以便我们更好的相处' onInput={TitleChange} value={Title}></Textarea>
           <view className='LabelList'>
             {
-              (repairType || {tags: ''}).tags.split(',').map(tag => <text key={tag} onClick={() => setTitle(Title === '' ? tag : `${Title}，${tag}`)}>{tag}</text>)
+              (repairType || { tags: '' }).tags.split(',').map(tag => <text key={tag} onClick={() => setTitle(Title === '' ? tag : `${Title}，${tag}`)}>{tag}</text>)
             }
           </view>
         </view>

src/utils/api.js

@@ -1,6 +1,10 @@
 const prefix = `${HOST}/api/wx`
 
 const $api = {
+  GetCommunityList: { // 获取小区列表
+    method: 'get',
+    url: `${prefix}/tpCommunity`
+  },
   ReplyTicket: { // 工单回复
     method: 'post',
     url: `${prefix}/ticket/reply/:orgId`