feats

config/dev.js

@@ -4,8 +4,8 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"https://xs.ycjcjy.com"',
-    HOST: '"http://t.ycjcjy.com"',
-    // HOST: '"http://127.0.0.1:6060"'
+    // HOST: '"http://t.ycjcjy.com"',
+    HOST: '"http://127.0.0.1:6060"'
   },
   mini: {
     debugReact: 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, communityId: x.houseList !== null && x.houseList.length ? x.houseList[0].communityId : null, roomId: x.houseList !== null && x.houseList.length ? x.houseList[0].id : null, roleId: x.houseList !== null && x.houseList.length ? x.houseList[0].roleId : null })
+            setUser({ ...x.person, ShowIndexAdv: false, FirstComing: true, houseList: x.houseList, communityId: x.houseList !== null && x.houseList.length ? x.houseList[0].communityId : null, roomId: x.houseList !== null && x.houseList.length ? x.houseList[0].id : null, roleId: x.houseList !== null && x.houseList.length ? x.houseList[0].roleId : null })
             Taro.setStorage({ key: 'token', data: x.token })
             Taro.setStorage({ key: 'sessionKey', data: x.sessionKey })
 

src/pages/HuoDong/HuoDongDetail/index.jsx

@@ -7,6 +7,7 @@ import Page from '@/layouts'
 import toolclass from '@/utils/toolclass.js'
 import { getShareObject } from '@/utils/share.js'
 import GetUserPhone from '@/components/GetUserPhone/index'
+import Picker from '@/components/Picker'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -23,12 +24,17 @@ export default function HuoDongDetail () {
   // const [JoinBtnStatus, setJoinBtnStatus] = useState(false)
   const [ShowJoinNumPopup, setShowJoinNumPopup] = useState(false)
   const [JoinNum, setJoinNum] = useState(null)
+  const [houseInfo, setHouseInfo] = useState(null)
   const [ShowGetUserPhoneLayer, setShowGetUserPhoneLayer] = useState(false)
   const [CurrnetHuoDongId] = useState(router.params.id) // 当前活动id
   const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
   const [JoinInfo, setJoinInfo] = useState(null) // 参加活动详情
   const [Status, setStatus] = useState(null) // 参加活动状态 0-立即参与 1-未开始 2-去报名 3-已报名 4-去签到 5-已签到 6-已结束
   const [StatusText, setStatusText] = useState(null) // 参加活动状态 0-立即参与 1-未开始 2-去报名 3-已报名 4-去签到 5-已签到 6-已结束
+  
+  // 只有业主以及家属可以参与活动
+  const [houseList, setHouseList] = useState([])
+  const [canJoin, setCanJoin] = useState(false)
 
   Taro.useShareAppMessage(() => {
     return getShareObject({
@@ -60,6 +66,23 @@ export default function HuoDongDetail () {
     }
   }, [Status])
 
+  useEffect(() => {
+    if (user?.houseList && user.houseList.length > 0) {
+      const lst = user.houseList.filter(x => x.roleId === 1 || x.roleId === 3).map(x => ({
+        ...x,
+        houseInfoId: [x.orgId, x.phaseId, x.buildingId, x.unitId, x.roomNoId].join(','),
+        houseName: [x.phaseName, x.buildingName, x.unitName, x.roomNoName].join('')
+      }))
+      setHouseList(lst);
+      setHouseInfo(lst[0]);
+      setCanJoin(lst.length > 0);
+    } else {
+      setHouseList([])
+      setHouseInfo()
+      setCanJoin(false)
+    }
+  }, [user?.houseList])
+
   const GetActivityDetail = () => { // 获取活动详情
     request({ ...apis.getActivityDetail, args: { id: CurrnetHuoDongId } }).then((res) => {
       setActivityDetail(res)
@@ -115,6 +138,11 @@ export default function HuoDongDetail () {
       Taro.showToast({ title: '请填入参加活动人数', icon: 'none' })
       setDataLock(false)
     } else {
+      if (!houseInfo || !houseInfo.houseInfoId) {
+        Taro.showToast({ title: '请选择房产', icon: 'none' })
+        return
+      }
+
       const { personId, phone, nickname, orgId } = user
       const { dynamicId } = ActivityDetail
       let Data = {
@@ -126,7 +154,8 @@ export default function HuoDongDetail () {
         attendNum: JoinNum - 0 || 1,
         sharePerson: null,
         sharePersonName: null,
-        sharePersonType: null
+        sharePersonType: null,
+        houseInfo: houseInfo.houseInfoId,
       }
       request({ ...apis.JoinActivity, data: { ...Data } }).then(() => {
         Taro.showToast({ title: '报名成功', icon: 'none' })
@@ -135,6 +164,7 @@ export default function HuoDongDetail () {
         setDataLock(false)
       }).catch((res) => {
         Taro.showToast({ title: res, icon: 'none' })
+        setShowJoinNumPopup(false)
         setDataLock(false)
       })
     }
@@ -210,7 +240,11 @@ export default function HuoDongDetail () {
               <RichText nodes={`${ActivityDetail.desc !== null ? ActivityDetail.desc.replace(/font-size\:\s(\d+)px/ig, 'font-size: $1rpx') : ''}`}></RichText>
             </view>
 
-            <text className={Status - 0 === 2 || Status - 0 === 4 ? 'active BottomBtn' : 'BottomBtn'} onClick={ToJoin}>{StatusText}</text>
+            {
+              canJoin && (
+                <text className={Status - 0 === 2 || Status - 0 === 4 ? 'active BottomBtn' : 'BottomBtn'} onClick={ToJoin}>{StatusText}</text>
+              )
+            }
 
           </view>
         }
@@ -219,7 +253,17 @@ export default function HuoDongDetail () {
             <text>温馨提示</text>
             <view className='flex-h Form'>
               <view>
-                <text>参数人数：</text>
+                <text>选择房产：</text>
+              </view>
+              <view className='flex-item'>
+                <Picker rangeKey='houseName' rangeValue='houseInfoId' range={houseList} onChange={(_, v) => setHouseInfo(v)}>
+                  <view>{houseInfo ? houseInfo.houseName : '请选择房产' }</view>
+                </Picker>
+              </view>
+            </view>
+            <view className='flex-h Form'>
+              <view>
+                <text>参加人数：</text>
               </view>
               <view className='flex-item'>
                 <Input placeholder='请输入活动参加人数' onInput={JoinNumChange} value={JoinNum}></Input>