静态页面

src/components/RenZhengScreen/index.jsx

@@ -34,9 +34,13 @@ export default function RenZhengScreen (props) {
           <text className='Tips'>{user.verifyStatus === 'not_certified' ? '请进行业主信息认证' : user.verifyStatus === 'certification_in_progress' ? '业主认证中,请等待物业审核' : user.verifyStatus === 'certified' ? '业主认证通过' : '业主验证未通过，请重新验证'}</text>
         }
         <view>
-          {
+          {/* {
             user !== null && user.verifyStatus !== 'certification_in_progress' && user.verifyStatus !== 'certified' &&
             <text onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuRenZheng/index?from=popup` }) }} className='active'>去认证</text>
+          } */}
+          {
+            user !== null &&
+            <text onClick={() => { Taro.navigateTo({ url: `/pages/WoDe/YeZhuRenZheng/index?from=popup` }) }} className='active'>去认证</text>
           }
           {/* <text onClick={RefreshUserInfo} className={DataLock ? '' : 'active'}>{DataLock ? '正在刷新...' : '刷新人员信息'}</text> */}
         </view>

src/pages/HuoDong/HuoDongDetail/index.jsx

@@ -143,7 +143,7 @@ export default function HuoDongDetail () {
   const ToJoin = () => { // 去报名
     if (DataLock || ActivityDetail === null || (Status - 0 !== 2 && Status - 0 !== 4)) return
     if (Status - 0 === 4) { // 去签到
-      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongSign/index?id=${ActivityDetail.dynamicId}` })
+      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongSign/index?id=${ActivityDetail.dynamicId}&from=detail` })
     } else { // 去报名
       const { phone } = user
       if (!phone) { // 未授权手机号，唤起授权手机号弹窗

src/pages/HuoDong/HuoDongSign/index.jsx

@@ -14,15 +14,16 @@ export default function HuoDongDetail () {
   const [HasSign, setHasSign] = useState(false)
   const [ShowSign, setShowSign] = useState(false)
   const [CurrnetId, setCurrentId] = useState(useRouter().params.id) // 当前活动id
+  const [CurrnetFrom] = useState(useRouter().params.from || null) // 当前活动跳转来源
   const [CurrnetSceneId] = useState(useRouter().params.scene) // 当前活动id
   const [ActivityDetail, setActivityDetail] = useState(null) // 活动详情
   const [JoinInfo, setJoinInfo] = useState(null) // 参加活动详情
 
   useEffect(() => {
-    if (user && user.verifyStatus === 'certified') {
+    if (user && user.verifyStatus === 'certified' && CurrnetFrom !== 'detail') {
       setShowSign(true)
     }
-  }, [user])
+  }, [user, CurrnetFrom])
 
   useEffect(() => {
     if (CurrnetId !== null && CurrnetId !== undefined) {
@@ -95,6 +96,14 @@ export default function HuoDongDetail () {
             }
           </view>
         </view>
+        {
+          CurrnetFrom === 'detail' &&
+          <view className='AlertPopup'>
+            <view className='centerLabel'>
+              <text>请扫码签到</text>
+            </view>
+          </view>
+        }
       </view>
     </Page>
   )

src/pages/HuoDong/HuoDongSign/index.less

@@ -9,6 +9,33 @@
     z-index: 1;
   }
 
+  >.AlertPopup {
+    width: 100%;
+    position: fixed;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.6);
+    overflow: hidden;
+    z-index: 100;
+
+    >view {
+      width: 50%;
+      padding: 20px 0;
+      background: #fff;
+      border-radius: 10px;
+      overflow: hidden;
+
+      >text {
+        display: block;
+        font-size: 26px;
+        line-height: 40px;
+        text-align: center;
+        white-space: nowrap;
+      }
+    }
+  }
+
   >.SignBtn {
     width: 188px;
     height: 188px;
@@ -61,6 +88,7 @@
 
       >view {
         background: rgba(243, 88, 68, 1);
+
         >text {
           color: #fff;
         }

src/pages/WoDe/GeRenXinXi/index.jsx

@@ -1,13 +1,89 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
 import Page from '@/layouts'
 import { useModel } from '@/store'
+import { Input, Picker } from '@tarojs/components'
+import request, { apis } from '@/utils/request'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
 
 export default function GeRenXinXi (props) {
 
-  const { user } = useModel('user')
+  const { user, setUser } = useModel('user')
+  const [Name, setName] = useState(null)
+  const [Phone, setPhone] = useState(null)
+  const [Birthday, setBirthday] = useState(null)
+  const [ShowNameEdit, setShowNameEdit] = useState(false)
+  const [ShowPhoneEdit, setShowPhoneEdit] = useState(false)
+  const [ShowBirthdayEdit, setShowBirthdayEdit] = useState(false)
+  const [Sex, setSex] = useState(null)
+  const [SexList] = useState([{ id: 1, name: '男' }, { id: 2, name: '女' }])
+
+  useEffect(() => {
+    if (user !== null) {
+      setName(user.name || user.nickname)
+      setPhone(user.tel || user.phone)
+      setBirthday(user.birthday)
+      SexList.map((item, index) => {
+        if (user.sex - 0 === item.id - 0 ||user.gender - 0 === item.id - 0) {
+          setSex(index)
+        }
+      })
+    }
+  }, [user])
+
+  const NameChange = (e) => {
+    setName(e.detail.value)
+  }
+
+  const PhoneChange = (e) => {
+    setPhone(e.detail.value)
+  }
+
+  const BirthdayChange = (e) => {
+    setBirthday(e.detail.value)
+  }
+
+  const SexChange = (e) => {
+    request({ ...apis.EditUserInfo, data: { sex: SexList[e.detail.value - 0].id - 0 } }).then(() => {
+      Taro.showToast({ title: '修改成功', icon: 'none' })
+      setSex(e.detail.value - 0)
+      setUser({ ...user, sex: SexList[e.detail.value - 0].id - 0 })
+    }).catch((res) => {
+      Taro.showToast({ title: res, icon: 'none' })
+    })
+  }
+
+  const EditName = () => {
+    request({ ...apis.EditUserInfo, data: { name: Name } }).then(() => {
+      setShowNameEdit(false)
+      Taro.showToast({ title: '修改成功', icon: 'none' })
+      setUser({ ...user, name: Name })
+    }).catch((res) => {
+      Taro.showToast({ title: res, icon: 'none' })
+    })
+  }
+
+  const EditPhone = () => {
+    request({ ...apis.EditUserInfo, data: { phone: Phone } }).then(() => {
+      setShowPhoneEdit(false)
+      Taro.showToast({ title: '修改成功', icon: 'none' })
+      setUser({ ...user, tel: Phone })
+    }).catch((res) => {
+      Taro.showToast({ title: res, icon: 'none' })
+    })
+  }
+
+  const EditBirthday = () => {
+    request({ ...apis.EditUserInfo, data: { birthday: Birthday } }).then(() => {
+      setShowBirthdayEdit(false)
+      Taro.showToast({ title: '修改成功', icon: 'none' })
+      setUser({ ...user, birthday: Birthday })
+    }).catch((res) => {
+      Taro.showToast({ title: res, icon: 'none' })
+    })
+  }
 
   return (
     <Page>
@@ -19,19 +95,93 @@ export default function GeRenXinXi (props) {
               <image mode='aspectFill' src={user !== null ? user.avatarurl : null}></image>
             </view>
           </view>
-          <view className='flex-h'>
+          <view className='flex-h' onClick={() => { setShowNameEdit(true) }}>
             <text className='flex-item'>姓名</text>
-            <text>{user !== null ? user.nickname : null}</text>
+            <text>{Name}</text>
           </view>
           <view className='flex-h'>
             <text className='flex-item'>性别</text>
-            <text>{user !== null ? user.gender - 0 === 1 ? '男' : user.sex - 0 === 2 ? '女' : null : null}</text>
+            {/* <text>{user !== null ? user.gender - 0 === 1 ? '男' : user.gender - 0 === 2 ? '女' : null : null}</text> */}
+            <Picker value={Sex} range-key='name' range={SexList} onChange={SexChange}>
+              <view className='PickerText'>{Sex === null ? '请选择性别' : SexList[Sex].id - 0 === 1 ? '男' : '女'}</view>
+            </Picker>
           </view>
-          <view className='flex-h'>
+          <view className='flex-h' onClick={() => { setShowPhoneEdit(true) }}>
             <text className='flex-item'>联系电话</text>
-            <text>{user !== null ? user.phone : null}</text>
+            <text>{Phone}</text>
+          </view>
+          <view className='flex-h' onClick={() => { setShowBirthdayEdit(true) }}>
+            <text className='flex-item'>生日</text>
+            <text>{Birthday}</text>
           </view>
         </view>
+
+        {
+          ShowNameEdit &&
+          <view className='Popup'>
+            <view className='centerLabel'>
+              <view className='Title'>
+                <text>修改姓名</text>
+              </view>
+              <view className='Content'>
+                <Input value={Name} onInput={NameChange}></Input>
+              </view>
+              <view className='Bottom flex-h'>
+                <view className='flex-item'>
+                  <text onClick={() => { setShowNameEdit(false); setName(user.nickname) }}>取消</text>
+                </view>
+                <view className='flex-item'>
+                  <text onClick={EditName}>确定</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        }
+
+        {
+          ShowPhoneEdit &&
+          <view className='Popup'>
+            <view className='centerLabel'>
+              <view className='Title'>
+                <text>修改手机号</text>
+              </view>
+              <view className='Content'>
+                <Input type='tel' value={Phone} onInput={PhoneChange}></Input>
+              </view>
+              <view className='Bottom flex-h'>
+                <view className='flex-item'>
+                  <text onClick={() => { setShowPhoneEdit(false); setPhone(user.phone) }}>取消</text>
+                </view>
+                <view className='flex-item'>
+                  <text onClick={EditPhone}>确定</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        }
+
+        {
+          ShowBirthdayEdit &&
+          <view className='Popup'>
+            <view className='centerLabel'>
+              <view className='Title'>
+                <text>修改生日</text>
+              </view>
+              <view className='Content'>
+                <Input placeholder='例如：2012-02-02' value={Birthday} onInput={BirthdayChange}></Input>
+              </view>
+              <view className='Bottom flex-h'>
+                <view className='flex-item'>
+                  <text onClick={() => { setShowBirthdayEdit(false); setBirthday(user.birthday) }}>取消</text>
+                </view>
+                <view className='flex-item'>
+                  <text onClick={EditBirthday}>确定</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        }
+
         {/* <view className='Form'>
           <view className='flex-h'>
             <text className='flex-item'>身份</text>

src/pages/WoDe/GeRenXinXi/index.less

@@ -5,6 +5,71 @@
   background: #f8f8f8;
   overflow: hidden;
 
+  >.Popup {
+    width: 100%;
+    position: fixed;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 100;
+    background: rgba(0, 0, 0, 0.6);
+
+    >view {
+      width: 600px;
+      background: #fff;
+      border-radius: 12px;
+
+      >.Title {
+        >text {
+          display: block;
+          font-size: 28px;
+          line-height: 40px;
+          margin-top: 20px;
+          text-align: center;
+        }
+      }
+
+      >.Content {
+        padding: 0 40px;
+        position: relative;
+        overflow: hidden;
+        margin-top: 40px;
+
+        >input {
+          display: block;
+          width: 100%;
+          text-align: center;
+          font-size: 26px;
+          line-height: 80px;
+          height: 80px;
+          border: 2px solid #ccc;
+          border-radius: 6px;
+          box-sizing: border-box;
+        }
+      }
+
+      >.Bottom {
+        border-top: 2px solid #eee;
+        margin-top: 40px;
+
+        >view {
+          border-left: 2px solid #eee;
+
+          &:first-child {
+            border-left: none;
+          }
+
+          >text {
+            display: block;
+            text-align: center;
+            font-size: 26px;
+            line-height: 80px;
+          }
+        }
+      }
+    }
+  }
+
   >.Form {
     padding: 0 30px;
     position: relative;
@@ -15,10 +80,19 @@
     >.flex-h {
       align-items: center;
       border-top: 2px solid rgba(0, 0, 0, 0.08);
+
       &:first-child {
         border: none;
       }
 
+      .PickerText {
+        font-size: 28px;
+        color: #999;
+        line-height: 40px;
+        min-width: 100px;
+        text-align: right;
+      }
+
       >text {
         font-size: 28px;
         color: #999;

src/pages/WoDe/YeZhuBaoXiu/index.jsx

@@ -48,7 +48,7 @@ export default function WoDeGongDan () {
   return (
     <Page>
       <view className='WoDeGongDan'>
-        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGuanJiaGongDanList`} ListName={`pagelist`} Refresh={Refresh} Push={Push}>
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGuanJiaGongDanList`} ListName={`pagelist`} RequestParams={{ communityId: user.communityId }} Refresh={Refresh} Push={Push}>
           <view className='Content Activity'>
             {
               PageList.map((item, index) => (

src/pages/WoDe/index.jsx

@@ -79,8 +79,8 @@ export default function WoDe () {
                 <image mode='aspectFill' src={user.avatarurl} class='centerLabel'></image>
               </view>
               <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
-                <text>{user.nickname || '暂未授权用户信息'}</text>
-                <text>{user.phone ? `${user.phone} ${user.roleId - 0 === 1 ? '户主' : user.roleId - 0 === 2 ? '租客' : user.roleId - 0 === 3 ? '家属' : ''}` : '游客'}</text>
+                <text>{user.name || user.nickname || '暂未授权用户信息'}</text>
+                <text>{(user.tel || user.phone) ? `${user.tel || user.phone} ${user.roleId - 0 === 1 ? '户主' : user.roleId - 0 === 2 ? '租客' : user.roleId - 0 === 3 ? '家属' : ''}` : '游客'}</text>
               </view>
               {
                 user.havaSigned !== undefined &&

src/utils/api.js

@@ -1,6 +1,10 @@
 const prefix = `${HOST}/api/wx`
 
 const $api = {
+  EditUserInfo: { // 修改用户信息
+    method: 'put',
+    url: `${prefix}/editPerson`
+  },
   GetCommentList: { // 获取留言板列表
     method: 'get',
     url: `${prefix}/message-board`
@@ -25,7 +29,7 @@ const $api = {
     method: 'post',
     url: `${prefix}/accessTicket/:orgId`
   },
-  getGuanJiaGongDanList:{ // 获取管家工单列表
+  getGuanJiaGongDanList: { // 获取管家工单列表
     method: 'get',
     url: `${prefix}/life/ticket/list`
   },