静态页面

package-lock.json

@@ -5650,6 +5650,11 @@
         "whatwg-url": "^7.0.0"
       }
     },
+    "dayjs": {
+      "version": "1.10.6",
+      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.6.tgz",
+      "integrity": "sha1-KIsqqC8thBimydTfWJjAc3rQKmM="
+    },
     "debug": {
       "version": "4.3.1",
       "resolved": "https://registry.npm.taobao.org/debug/download/debug-4.3.1.tgz?cache=0&sync_timestamp=1607566571506&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.3.1.tgz",

package.json

@@ -41,6 +41,7 @@
     "@tarojs/react": "3.2.8",
     "@tarojs/runtime": "3.2.8",
     "@tarojs/taro": "3.2.8",
+    "dayjs": "^1.8.14",
     "classnames": "^2.3.1",
     "react": "^17.0.0",
     "react-dom": "^17.0.0",

src/constants/api.js

@@ -228,6 +228,7 @@ export const API_GROUP_CREATE = resolvePath('taShareRecord')
 export const API_GROUP_JOIN = resolvePath('taShareChildRecord')
 
 //person
+export const API_CUSTOMER_DETAILINFO = resolvePath('customer')
 export const API_MY_CUSTOMER = resolvePath('inventory/customer/statistics')
 export const API_CUSTOMER_LIST = resolvePath('inventory/customer/statistics')
 export const API_CUSTOMER_DETAIL = resolvePath('inventory/customer')

src/pages/mine/components/FollowCustomer/index.jsx

@@ -1,6 +1,6 @@
 import { useState, useEffect } from 'react'
 // import Taro from '@tarojs/taro'
-import { ScrollView, Image } from '@tarojs/components'
+import { ScrollView, Image, Input } from '@tarojs/components'
 import { fetch } from '@/utils/request'
 import { API_CUSTOMER_LIST } from '@/constants/api'
 import './index.scss'
@@ -12,7 +12,6 @@ export default function FollowCustomer () {
   const [pageNumber, setPageNumber] = useState(1)
   const [HasNextPage, setHasNextPage] = useState(true)
   const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
 
   const [StatusMenu] = useState([
     { name: '全部状态', id: 0 },
@@ -42,9 +41,11 @@ export default function FollowCustomer () {
   }, [FormData])
 
   const GetPageList = () => {
+    setHasNextPage(false)
     fetch({ url: `${API_CUSTOMER_LIST}/follow`, method: 'get', payload: { pageNumber, pageSize: 10, ...FormData, day: FormData.day === 1 ? '' : FormData.day } }).then((res) => {
-      setPageList(res.records || [])
-      setHasNextPage(res.current >= res.pages)
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
     })
   }
 
@@ -64,24 +65,36 @@ export default function FollowCustomer () {
     }
   }
 
+  const SearchConfirm = (e) => {
+    setFormData({...FormData, name: e.detail.value})
+  }
+
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
   return (
     <view className='components FollowCustomer'>
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
 
           <view className='Search'>
             <view>
               <text className='iconfont icon-sousuo'></text>
-              <text>请输入用户名/手机号/到访时间搜索</text>
+              {/* <text>请输入用户名/手机号/到访时间搜索</text> */}
+              <Input confirm-type='search' placeholder='请输入用户名/手机号/到访时间搜索' onConfirm={SearchConfirm}></Input>
             </view>
           </view>
 
@@ -93,7 +106,7 @@ export default function FollowCustomer () {
                   <text>{item.name}</text>
                   {
                     FormData.status === item.id &&
-                    <Image mode='widthFix' src={require('../../../../assets/findHouse-icon1.png')}></Image>
+                    <Image mode='widthFix' src={require('@/assets/findHouse-icon1.png')}></Image>
                   }
                 </view>
               ))

src/pages/mine/components/FollowCustomer/index.scss

@@ -35,6 +35,17 @@
               font-size: 28px;
             }
           }
+          >input {
+            display: inline-block;
+            vertical-align: middle;
+            font-size: 20px;
+            color: #999;
+            line-height: 44px;
+            height: 44px;
+            margin-left: 10px;
+            text-align: left;
+            width: 320px;
+          }
         }
       }
       > text {

src/pages/mine/components/MyCollectForActivity/index.jsx

@@ -34,7 +34,7 @@ export default function MyCollectForActivity () {
       fetch({ url: API_ACTIVITY_SAVE, method: 'get', payload: { mine: true, pageNumber, pageSize } }).then((res) => {
         if (res !== null) {
           setPageList(res.records || [])
-          setHasNextPage(res.current >= res.pages)
+          setHasNextPage(res.current < res.pages)
         } else {
           setPageList([])
           setHasNextPage(false)

src/pages/mine/components/MyCollectForBuilding/index.jsx

@@ -33,7 +33,7 @@ export default function MyCollectForBuilding () {
     if(pageNumber && HasNextPage) {
       fetch({ url: API_ITEMS_LIST, method: 'get', payload: { mine: true, pageNumber, pageSize } }).then((res) => {
         setPageList(res.records || [])
-        setHasNextPage(res.current >= res.pages)
+        setHasNextPage(res.current < res.pages)
       })
     }
   }, [pageNumber])

src/pages/mine/components/MyCollectForNews/index.jsx

@@ -33,7 +33,7 @@ export default function MyCollectForNews () {
     if(pageNumber && HasNextPage) {
       fetch({ url: API_NEWS_LIST, method: 'get', payload: { mine: true, pageNumber, pageSize } }).then((res) => {
         setPageList(res.records || [])
-        setHasNextPage(res.current >= res.pages)
+        setHasNextPage(res.current < res.pages)
       })
     }
   }, [pageNumber])

src/pages/mine/components/StatCustomerListItem/index.jsx

@@ -4,24 +4,26 @@ import { Image } from '@tarojs/components'
 import './index.scss'
 
 export default function StatCustomerListItem (props) {
+
   const { data = {}, showStatus = false } = props
+
   return (
     <view className='components StatCustomerListItem flex-h'>
-      <view className='Icon' onClick={() => { Taro.navigateTo({url: `/pages/mine/customerDetail/index?id=${data.customerId}`}) }}>
+      <view className='Icon' onClick={() => { Taro.navigateTo({ url: `/pages/mine/customerDetail/index?id=${data.customerId}` }) }}>
         <Image mode='scaleToFill' src={data.avatarurl}></Image>
       </view>
-      <view className='flex-item' onClick={() => { Taro.navigateTo({url: `/pages/mine/customerDetail/index?id=${data.customerId}`}) }}>
+      <view className='flex-item' onClick={() => { Taro.navigateTo({ url: `/pages/mine/customerDetail/index?id=${data.customerId}` }) }}>
         <view>
           <text>{data.name}</text>
-          <text className='iconfont icon-yonghu'></text>
+          <text className={data.sex === 1 ? 'iconfont icon-nanxing' : 'iconfont icon-nvxing'}></text>
         </view>
         <text>{data.phone}</text>
       </view>
       <text className='iconfont icon-liaotian'></text>
-      <text className='iconfont icon-dianhua active'></text>
+      <text className='iconfont icon-dianhua active' onClick={() => { Taro.makePhoneCall({ phoneNumber: data.phone }) }}></text>
       {
         showStatus &&
-        <text className='Status' onClick={() => { Taro.navigateTo({url: `/pages/mine/customerDetail/index?id=${data.customerId}`}) }}>报备</text>
+        <text className='Status'>{data.status === 0 ? '' : data.status === 1 ? '报备' : data.status === 2 ? '到访' : data.status === 3 ? '认筹' : '签约'}</text>
       }
     </view>
   )

src/pages/mine/components/TransactedCustomer/index.jsx

@@ -1,31 +1,52 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import { ScrollView } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import { API_CUSTOMER_LIST } from '@/constants/api'
 import './index.scss'
-import Taro from '@tarojs/taro'
-import { ScrollView, Image } from '@tarojs/components'
 import StatCustomerListItem from '../StatCustomerListItem/index'
 
-export default function TransactedCustomer (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+export default function TransactedCustomer () {
+  const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  const [pageNumber, setPageNumber] = useState(1)
+  const [HasNextPage, setHasNextPage] = useState(true)
+
+  useEffect(() => {
+    GetPageList()
+  }, [pageNumber])
+
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: `${API_CUSTOMER_LIST}/clinch`, method: 'get', payload: { pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
   return (
     <view className='components TransactedCustomer'>
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
 
           <view className='List'>

src/pages/mine/components/UserDetailActivityInfo/index.jsx

@@ -1,51 +1,70 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import { ScrollView } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import { API_ACTIVITY_LIST_CUSTOMER } from '@/constants/api'
 import './index.scss'
-import Taro from '@tarojs/taro'
-import { ScrollView, Image } from '@tarojs/components'
 
 export default function UserDetailActivityInfo (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState([
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' },
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' },
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' },
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' },
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' },
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' }
-  ])
+  const { CustomerId = null, AddFollow = () => {} } = props
+  const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  const [pageNumber, setPageNumber] = useState(1)
+  const [HasNextPage, setHasNextPage] = useState(true)
+
+  useEffect(() => {
+    GetPageList()
+  }, [pageNumber])
+
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_ACTIVITY_LIST_CUSTOMER, method: 'get', payload: { pageNumber, pageSize: 10, customerId: CustomerId } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if (pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
   return (
     <view className='components UserDetailActivityInfo'>
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
 
           <view className='Content'>
+            {
+              !PageList.length &&
+              <text>暂无数据</text>
+            }
             {
               PageList.map((item, index) => (
                 <view className='flex-h' key={`Item-${index}`}>
                   <view className='flex-item'>
-                    <text>{item.time}</text>
+                    <text>{item.startDate}</text>
                   </view>
                   <view className='Line'>
                     <view></view>
                   </view>
                   <view className='flex-item'>
-                    <text className='active'>{item.content}</text>
+                    <text className='active'>{item.title}</text>
                   </view>
                 </view>
               ))
@@ -53,7 +72,7 @@ export default function UserDetailActivityInfo (props) {
           </view>
 
           <view className='Btn'>
-            <text className='active'>添加跟进</text>
+            <text className='active' onClick={AddFollow}>添加跟进</text>
           </view>
 
         </view>

src/pages/mine/components/UserDetailActivityInfo/index.scss

@@ -20,6 +20,12 @@
         border-radius: 16px;
         box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
         padding: 50px 30px;
+        >text {
+          display: block;
+          text-align: center;
+          font-size: 28px;
+          color: #666;
+        }
         >.flex-h {
           position: relative;
           overflow: hidden;

src/pages/mine/components/UserDetailBasicInfo/index.jsx

@@ -1,11 +1,10 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import { ScrollView } from '@tarojs/components'
 import './index.scss'
-import Taro from '@tarojs/taro'
-import { ScrollView, Image } from '@tarojs/components'
 import EditUserDetailBasicInfo from '../EditUserDetailBasicInfo/index'
 
 export default function UserDetailBasicInfo (props) {
-  const { Data = {} } = props
+  const { CustomerInfo = {}, AddFollow = () => {} } = props
   const [ShowEditPopup, setShowEditPopup] = useState(false)
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
@@ -25,7 +24,7 @@ export default function UserDetailBasicInfo (props) {
 
   return (
     <view className='components UserDetailBasicInfo'>
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
         <view className='PageContent'>
 
           <view className='Content'>
@@ -33,7 +32,7 @@ export default function UserDetailBasicInfo (props) {
               <text>姓名</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>范丞丞</text>
+                <text>{CustomerInfo.name || '-'}</text>
               </view>
               <text className='iconfont icon-xiugai active' onClick={() => {setShowEditPopup(true)}}></text>
               <text className='active' onClick={() => {setShowEditPopup(true)}}>修改</text>
@@ -42,49 +41,49 @@ export default function UserDetailBasicInfo (props) {
               <text>昵称</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>Tomorrow</text>
+                <text>{CustomerInfo.nickname || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>手机号码</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>13613949434</text>
+                <text>{CustomerInfo.phone || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>性别</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>男</text>
+                <text>{CustomerInfo.sex === 1 ? '男' : '女'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>家庭住址</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>江苏省南京市雨花台区铁心桥街道韩府坊小区</text>
+                <text>{CustomerInfo.address || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>工作地址</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>江苏省南京市雨花台区</text>
+                <text>{CustomerInfo.company || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>年龄段</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>18-25</text>
+                <text>{CustomerInfo.age || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
               <text>职业</text>
               <text>：</text>
               <view className='flex-item'>
-                <text>演员</text>
+                <text>{CustomerInfo.work || '-'}</text>
               </view>
             </view>
             <view className='flex-h'>
@@ -160,8 +159,8 @@ export default function UserDetailBasicInfo (props) {
           </view>
 
           <view className='Btn'>
-            <text className='active'>添加跟进</text>
-            <text>变更状态</text>
+            <text className='active' onClick={AddFollow}>添加跟进</text>
+            {/* <text>变更状态</text> */}
           </view>
 
         </view>

src/pages/mine/components/UserDetailFollowRecord/index.jsx

@@ -1,37 +1,63 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import { ScrollView } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import { API_FOLLOW_LIST } from '@/constants/api'
+import dayjs from 'dayjs'
 import './index.scss'
-import Taro from '@tarojs/taro'
-import { ScrollView, Image } from '@tarojs/components'
 
 export default function UserDetailFollowRecord (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState([
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' },
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' },
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' },
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' },
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' },
-    { content: '参加了5D沉浸式 剧场', time: '2019年7月12日 12:30:00' }
-  ])
+  const { CustomerId = null, AddFollow = () => {}, AddFollowCounts = 0 } = props
+  const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  const [pageNumber, setPageNumber] = useState(1)
+  const [HasNextPage, setHasNextPage] = useState(true)
+
+  useEffect(() => {
+    GetPageList()
+  }, [pageNumber])
+
+  useEffect(() => {
+    if(AddFollowCounts) {
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
+    }
+  }, [AddFollowCounts])
+
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_FOLLOW_LIST, method: 'get', payload: { pageNumber, pageSize: 10, customerId: CustomerId } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if (pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
   return (
     <view className='components UserDetailFollowRecord'>
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
 
           <view className='Content'>
@@ -39,13 +65,14 @@ export default function UserDetailFollowRecord (props) {
               PageList.map((item, index) => (
                 <view className='flex-h' key={`Item-${index}`}>
                   <view className='flex-item'>
-                    <text>{item.time}</text>
+                    <text>{dayjs(item.createDate).format('YYYY年MM月DD日 HH:mm:ss')}</text>
                   </view>
                   <view className='Line'>
                     <view></view>
                   </view>
                   <view className='flex-item'>
-                    <text className='active'>{item.content}</text>
+                    <text className='active' style={{textAlign: 'left'}}>{item.recordType}</text>
+                    <text style={{textAlign: 'left'}}>{item.recordContent}</text>
                   </view>
                 </view>
               ))
@@ -53,7 +80,7 @@ export default function UserDetailFollowRecord (props) {
           </view>
 
           <view className='Btn'>
-            <text className='active'>添加跟进</text>
+            <text className='active' onClick={AddFollow}>添加跟进</text>
           </view>
 
         </view>

src/pages/mine/components/UserDetailViewRecord/index.jsx

@@ -1,77 +1,79 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+// import Taro from '@tarojs/taro'
+import { ScrollView } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import { API_VISIT_RECORD } from '@/constants/api'
 import './index.scss'
-import Taro from '@tarojs/taro'
-import { ScrollView, Image } from '@tarojs/components'
 
 export default function UserDetailViewRecord (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState(['', '', '', '', '', '', '', '', '', '', '', '', ''])
+  const { CustomerId = null, AddFollow = () => {} } = props
+  const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
+  const [pageNumber, setPageNumber] = useState(1)
+  const [HasNextPage, setHasNextPage] = useState(true)
+
+  useEffect(() => {
+    GetPageList()
+  }, [pageNumber])
+
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_VISIT_RECORD, method: 'get', payload: { pageNumber, pageSize: 10, customerId: CustomerId } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if (pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
   return (
     <view className='components UserDetailViewRecord'>
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
 
           <view className='Content'>
-            <view className='flex-h'>
-              <text>查看项目详情</text>
-              <text>：</text>
-              <view className='flex-item'>
-                <text>银城悦见山</text>
-              </view>
-              <text>2021/05/21 13:00</text>
-            </view>
-            <view className='flex-h'>
-              <text>查看户型图</text>
-              <text>：</text>
-              <view className='flex-item'>
-                <text>银城悦见山</text>
-              </view>
-              <text>2021/05/21 13:00</text>
-            </view>
-            <view className='flex-h'>
-              <text>报名活动</text>
-              <text>：</text>
-              <view className='flex-item'>
-                <text>银城悦见山</text>
-              </view>
-              <text>2021/05/21 13:00</text>
-            </view>
-            <view className='flex-h'>
-              <text>在线沟通</text>
-              <text>：</text>
-              <view className='flex-item'>
-                <text>银城悦见山</text>
-              </view>
-              <text>2021/05/21 13:00</text>
-            </view>
-            <view className='flex-h'>
-              <text>在线咨询</text>
-              <text>：</text>
-              <view className='flex-item'>
-                <text>银城悦见山</text>
-              </view>
-              <text>2021/05/21 13:00</text>
-            </view>
+            {
+              !PageList.length &&
+              <text>暂无数据</text>
+            }
+            {
+              PageList.map((item, index) => (
+                <view className='flex-h' key={`ListItem-${index}`}>
+                  <text>{item.activity}</text>
+                  {
+                    (item.activityName || item.buildingName) &&
+                    <text>：</text>
+                  }
+                  <view className='flex-item'>
+                    <text>{item.activityName || item.buildingName}</text>
+                  </view>
+                  <text>{item.visitTime}</text>
+                </view>
+              ))
+            }
           </view>
 
           <view className='Btn'>
-            <text className='active'>添加跟进</text>
+            <text className='active' onClick={AddFollow}>添加跟进</text>
           </view>
 
         </view>

src/pages/mine/components/UserDetailViewRecord/index.scss

@@ -20,6 +20,12 @@
         border-radius: 16px;
         box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.03);
         padding: 30px;
+        >text {
+          display: block;
+          text-align: center;
+          font-size: 28px;
+          color: #666;
+        }
         >.flex-h {
           align-items: flex-start;
           margin-top: 30px;

src/pages/mine/customerDetail/index.jsx

@@ -1,16 +1,21 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import Taro from "@tarojs/taro";
 import withLayout from '@/layout'
-import './index.scss'
 import '@/assets/css/iconfont.css'
-import { Image } from '@tarojs/components'
+import { Image, Textarea } from '@tarojs/components'
+import { fetch } from '@/utils/request'
+import { API_CUSTOMER_DETAILINFO, API_FOLLOW_LIST } from '@/constants/api'
+import { getImgURL } from '@/utils/image'
+import './index.scss'
 import UserDetailBasicInfo from '../components/UserDetailBasicInfo/index'
 import UserDetailViewRecord from '../components/UserDetailViewRecord/index'
 import UserDetailActivityInfo from '../components/UserDetailActivityInfo/index'
 import UserDetailFollowRecord from '../components/UserDetailFollowRecord/index'
 
 export default withLayout((props) => {
-
-  // const [PageProps] = useState(props)
+  const [CustomerId] = useState(props.router.params.id)
+  const [CustomerInfo, setCustomerInfo] = useState({})
+  const [ShowAddFollow, setShowAddFollow] = useState(false)
   const [MenuList] = useState([
     { name: '基本信息', id: 1 },
     { name: '访问记录', id: 2 },
@@ -18,6 +23,16 @@ export default withLayout((props) => {
     { name: '跟进记录', id: 4 }
   ])
   const [CurrentMenuId, setCurrentMenuId] = useState(1)
+  const [FollowContent, setFollowContent] = useState('')
+  const [FollowAddCounts, setFollowAddCounts] = useState(0)
+
+  useEffect(() => {
+    if (CustomerId) {
+      fetch({ url: `${API_CUSTOMER_DETAILINFO}/${CustomerId}` }).then((res) => {
+        setCustomerInfo(res)
+      })
+    }
+  }, [CustomerId])
 
   const CutMenu = (item) => {
     return () => {
@@ -25,6 +40,38 @@ export default withLayout((props) => {
     }
   }
 
+  const AddFollow = () => {
+    setShowAddFollow(true)
+  }
+
+  const FollowInput = (e) => {
+    setFollowContent(e.detail.value.substring(0, 10))
+  }
+
+  const SaveFollow = () => {
+    fetch({ url: API_FOLLOW_LIST, method: 'post', payload: { recordType: '添加跟进', recordContent: FollowContent, customerSex: CustomerInfo.sex, customerId: CustomerId } }).then((res) => {
+      Taro.showToast({
+        title: '添加跟进成功',
+        icon: 'none'
+      })
+      setShowAddFollow(false)
+      setFollowContent('')
+      if (CurrentMenuId === 4) {
+        setFollowAddCounts(FollowAddCounts + 1)
+      }
+    }).catch(() => {
+      Taro.showToast({
+        title: '添加跟进失败',
+        icon: 'none'
+      })
+    })
+  }
+
+  const CancelAddFollow = () => {
+    setShowAddFollow(false)
+    setFollowContent('')
+  }
+
   return (
     <view className='Page customerDetail flex-v'>
 
@@ -34,20 +81,20 @@ export default withLayout((props) => {
             <view className='centerLabel'>
               <view className='flex-h'>
                 <view className='Icon'>
-                  <Image mode='aspectFill' src={null}></Image>
+                  <Image mode='aspectFill' src={getImgURL(CustomerInfo.avatarurl)}></Image>
                 </view>
                 <view className='flex-item'>
                   <view>
-                    <text>徐慧慧</text>
-                    <text className='iconfont icon-nvxing'></text>
+                    <text>{CustomerInfo.name}</text>
+                    <text className={CustomerInfo.sex === 1 ? 'iconfont icon-nanxing' : 'iconfont icon-nvxing'}></text>
                   </view>
-                  <text>136 1394 9434</text>
+                  <text>{CustomerInfo.phone}</text>
                 </view>
                 <text className='iconfont icon-liaotian'></text>
-                <text className='iconfont icon-dianhua'></text>
+                <text className='iconfont icon-dianhua' onClick={() => { Taro.makePhoneCall({ phoneNumber: CustomerInfo.phone }) }}></text>
               </view>
             </view>
-            <text className='Status'>已到访</text>
+            <text className='Status'>{CustomerInfo.status === 1 || CustomerInfo.status === 0 ? '已报备' : CustomerInfo.status === 2 ? '已到访' : CustomerInfo.status === 3 ? '已认筹' : '已签约'}</text>
             <text className='Tips'>NEW</text>
             <text className='Tips'>NEW</text>
           </view>
@@ -70,29 +117,53 @@ export default withLayout((props) => {
           {/* 基本信息 */}
           {
             CurrentMenuId === 1 &&
-            <UserDetailBasicInfo></UserDetailBasicInfo>
+            <UserDetailBasicInfo CustomerId={CustomerId} CustomerInfo={CustomerInfo} AddFollow={AddFollow}></UserDetailBasicInfo>
           }
 
           {/* 访问记录 */}
           {
             CurrentMenuId === 2 &&
-            <UserDetailViewRecord></UserDetailViewRecord>
+            <UserDetailViewRecord CustomerId={CustomerId} AddFollow={AddFollow}></UserDetailViewRecord>
           }
 
           {/* 活动信息 */}
           {
             CurrentMenuId === 3 &&
-            <UserDetailActivityInfo></UserDetailActivityInfo>
+            <UserDetailActivityInfo CustomerId={CustomerId} AddFollow={AddFollow}></UserDetailActivityInfo>
           }
 
           {/* 跟进记录 */}
           {
             CurrentMenuId === 4 &&
-            <UserDetailFollowRecord></UserDetailFollowRecord>
+            <UserDetailFollowRecord CustomerId={CustomerId} AddFollow={AddFollow} AddFollowCounts={FollowAddCounts}></UserDetailFollowRecord>
           }
         </view>
       </view>
 
+      {
+        ShowAddFollow &&
+        <view className='AddFollow'>
+          <view className='centerLabel'>
+            <view>
+              <view>
+                <text>跟进内容</text>
+                <view className='FollowContent'>
+                  <Textarea placeholder='不超过150字' maxLength={150} value={FollowContent} onInput={FollowInput} />
+                </view>
+                <view className='Save flex-h'>
+                  <view className='flex-item'>
+                    <text onClick={CancelAddFollow}>取消</text>
+                  </view>
+                  <view className='flex-item'>
+                    <text onClick={SaveFollow}>保存</text>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      }
+
     </view>
   )
 })

src/pages/mine/customerDetail/index.scss

@@ -171,4 +171,72 @@
       bottom: 0;
     }
   }
+  >.AddFollow {
+    position: fixed;
+    width: 100%;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 100;
+    background: rgba(0, 0, 0, 0.6);
+    >view {
+      width: 100%;
+      overflow: hidden;
+      >view {
+        padding: 0 30px;
+        position: relative;
+        overflow: hidden;
+        >view {
+          padding: 30px;
+          position: relative;
+          overflow: hidden;
+          border-radius: 12px;
+          background: #fff;
+          >text {
+            display: block;
+            font-size: 30px;
+            font-weight: bold;
+            white-space: nowrap;
+          }
+          >.FollowContent {
+            position: relative;
+            overflow: hidden;
+            margin-top: 20px;
+            border: 2px solid rgba(0, 0, 0, 0.1);
+            padding: 20px;
+            box-sizing: border-box;
+            >textarea {
+              font-size: 28px;
+              line-height: 40px;
+            }
+          }
+          >.Save {
+            position: relative;
+            overflow: hidden;
+            margin-top: 30px;
+            align-items: center;
+            >view {
+              margin-left: 60px;
+              &:first-child {
+                margin-left: 0;
+                >text {
+                  background: #ccc;
+                  color: #333;
+                }
+              }
+              >text {
+                display: block;
+                text-align: center;
+                font-size: 32px;
+                line-height: 80px;
+                background: #1A3B83;
+                color: #fff;
+                border-radius: 8px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 }

src/pages/mine/customerInfo/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '客户基本信息'
+}

src/pages/mine/customerInfo/index.jsx

@@ -0,0 +1,171 @@
+import React, { useState, useEffect } from 'react'
+import { useSelector } from 'react-redux'
+import withLayout from '@/layout'
+import { ScrollView, Input } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
+import './index.scss'
+
+export default withLayout(() => {
+
+  const user = useSelector(state => state.user)
+  const [UserInfo, setUserInfo] =useState({
+    name: '',
+    nickname: '',
+    phone: '',
+    sex: '',
+    address: '',
+    company: '',
+    agentCode: '',
+  })
+
+  useEffect(() => {
+    setUserInfo(user?.userInfo?.person)
+  }, [user])
+
+  return (
+    <view className='Page customerInfo'>
+
+      <ScrollView scroll-y>
+        <view className='PageContent'>
+
+          <text>姓名</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入姓名'></Input>
+            </view>
+          </view>
+
+          <text>昵称</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入昵称'></Input>
+            </view>
+          </view>
+
+          <text>手机号码</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入手机号码'></Input>
+            </view>
+          </view>
+
+          <text>性别</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <text>请选择</text>
+            </view>
+            <text className='iconfont icon-jiantoudown'></text>
+          </view>
+
+          <text>家庭住址</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入家庭住址'></Input>
+            </view>
+          </view>
+
+          <text>工作地址</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入工作地址'></Input>
+            </view>
+          </view>
+
+          <text>年龄段</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <text>请选择</text>
+            </view>
+            <text className='iconfont icon-jiantoudown'></text>
+          </view>
+
+          <text>职业</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入职业'></Input>
+            </view>
+          </view>
+
+          <text>家庭年收入范围</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <text>请选择</text>
+            </view>
+            <text className='iconfont icon-jiantoudown'></text>
+          </view>
+
+          <text>家庭成员数</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入家庭成员数'></Input>
+            </view>
+          </view>
+
+          <text>已有房产数</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入已有房产数'></Input>
+            </view>
+          </view>
+
+          <text>已有车辆数</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请输入已有车辆数'></Input>
+            </view>
+          </view>
+
+          <text>预计购房时间</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <text>请选择</text>
+            </view>
+            <text className='iconfont icon-jiantoudown'></text>
+          </view>
+
+          <text>客户咨询重点</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等；'></Input>
+            </view>
+          </view>
+
+          <text>购房动机</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <text>请选择</text>
+            </view>
+            <text className='iconfont icon-jiantoudown'></text>
+          </view>
+
+          <text>客户抗性分析</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等；'></Input>
+            </view>
+          </view>
+
+          <text>客户对项目认可点</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等；'></Input>
+            </view>
+          </view>
+
+          <text>备注</text>
+          <view className='FormLine flex-h'>
+            <view className='flex-item'>
+              <Input placeholder='补充说明（选填）'></Input>
+            </view>
+          </view>
+
+          <view className='Btn'>
+            <text>提交</text>
+          </view>
+
+        </view>
+      </ScrollView>
+
+    </view>
+  )
+})

src/pages/mine/customerInfo/index.scss

@@ -0,0 +1,64 @@
+.Page.customerInfo {
+  background: #fff;
+  height: 100vh;
+  width: 100%;
+  > scroll-view {
+    width: 100%;
+    height: 100%;
+    .PageContent {
+      position: relative;
+      overflow: hidden;
+      min-height: 100vh;
+      > text {
+        font-size: 34px;
+        font-weight: bold;
+        color: #333;
+        display: block;
+        text-indent: 40px;
+        margin-top: 30px;
+      }
+      > .flex-h {
+        padding: 20px 40px;
+        border-bottom: 2px solid rgba(0, 0, 0, 0.12);
+        margin-top: 10px;
+        align-items: center;
+        >view {
+          > input {
+            display: block;
+            width: 100%;
+            background: none;
+            font-size: 26px;
+            line-height: 40px;
+            height: 40px;
+          }
+          >text {
+            display: block;
+            width: 100%;
+            background: none;
+            font-size: 26px;
+            line-height: 40px;
+            height: 40px;
+          }
+        }
+        >text {
+          font-size: 30px;
+        }
+      }
+      .Btn {
+        padding: 40px;
+        position: relative;
+        overflow: hidden;
+        >text {
+          display: block;
+          text-align: center;
+          font-size: 32px;
+          line-height: 92px;
+          background: #193C83;
+          color: #fff;
+          font-weight: bold;
+          border-radius: 92px;
+        }
+      }
+    }
+  }
+}

src/pages/mine/myActivity/index.jsx

@@ -13,10 +13,8 @@ export default withLayout(() => {
   const user = useSelector(state => state.user)
   const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
   const [PersonId, setPersonId] = useState(null)
-  const [pageNumber, setPageNumber] = useState(null)
-  const [pageSize] = useState(10)
+  const [pageNumber, setPageNumber] = useState(1)
   const [HasNextPage, setHasNextPage] = useState(true)
 
   useEffect(() => {
@@ -27,36 +25,43 @@ export default withLayout(() => {
 
   useEffect(() => {
     if(PersonId) {
-      setPageNumber(1)
+      GetPageList()
     }
-  }, [PersonId])
-
-  useEffect(() => {
-    if(pageNumber && HasNextPage) {
-      fetch({ url: API_ACTIVITY_LIST_CUSTOMER, method: 'get', payload: { customerId: PersonId, pageNumber, pageSize } }).then((res) => {
-        setPageList(res.records || [])
-        setHasNextPage(res.current >= res.pages)
-      })
-    }
-  }, [pageNumber])
+  }, [pageNumber, PersonId])
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_ACTIVITY_LIST_CUSTOMER, method: 'get', payload: { customerId: PersonId, pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
+
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
   return (
     <view className='Page myActivity'>
 
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#f8f8f8'>
         <view className='PageContent'>
           <view className='List'>
             {

src/pages/mine/myHomepage/index.jsx

@@ -163,9 +163,9 @@ export default withLayout(() => {
             <text>已经到底了~</text>
           </view>
 
-          <view className='Share'>
+          {/* <view className='Share'>
             <text onClick={() => { setShowPopup(true) }}>生成海报分享好友</text>
-          </view>
+          </view> */}
 
         </view>
       </ScrollView>

src/pages/mine/myShare/index.jsx

@@ -13,10 +13,8 @@ export default withLayout(() => {
   const user = useSelector(state => state.user)
   const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
   const [PersonId, setPersonId] = useState(null)
-  const [pageNumber, setPageNumber] = useState(null)
-  const [pageSize] = useState(10)
+  const [pageNumber, setPageNumber] = useState(1)
   const [HasNextPage, setHasNextPage] = useState(true)
 
   useEffect(() => {
@@ -25,38 +23,45 @@ export default withLayout(() => {
     }
   }, [user])
 
-  useEffect(() => {
-    if(pageNumber && HasNextPage) {
-      fetch({ url: API_SHARE_LIST, method: 'get', payload: { personId: PersonId, pageNumber, pageSize } }).then((res) => {
-        setPageList(res.records || [])
-        setHasNextPage(res.current >= res.pages)
-      })
-    }
-  }, [pageNumber])
-
   useEffect(() => {
     if(PersonId) {
-      setPageNumber(1)
+      GetPageList()
     }
-  }, [PersonId])
+  }, [pageNumber, PersonId])
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
 
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_SHARE_LIST, method: 'get', payload: { personId: PersonId, pageNumber, pageSize: 10 } }).then((res) => {
+      setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
+      setHasNextPage(res.current < res.pages)
+      setPull(false)
+    })
+  }
+
+  const PageLoadMore = () => { // 页面上拉加载更多
+    if(HasNextPage) {
+      setPageNumber(pageNumber + 1)
+    }
+  }
+
   useEffect(() => { // 下拉刷新触发
     if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+      if(pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
     }
   }, [IsPull])
 
   return (
     <view className='Page MyShare'>
 
-      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
         <view className='PageContent'>
           <view className='List'>
             {

src/pages/mine/userInfo/index.config.js

@@ -1,3 +1,3 @@
 export default {
-  navigationBarTitleText: '基本信息'
+  navigationBarTitleText: '个人信息'
 }

src/pages/mine/userInfo/index.jsx

@@ -1,154 +1,79 @@
-import React, { useState, useEffect } from 'react'
+import { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
+import { useSelector } from 'react-redux'
 import withLayout from '@/layout'
-import './index.scss'
-import { ScrollView, Input } from '@tarojs/components'
+import { ScrollView, Input, Image } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
+import { fetch } from '@/utils/request'
+import login from '@/utils/login'
+import { API_EDIT_AGENT } from '@/constants/api'
 import '@/assets/css/iconfont.css'
+import './index.scss'
 
-export default withLayout((props) => {
-
-  // const [PageProps] = useState(props)
+export default withLayout(() => {
+
+  const user = useSelector(state => state.user)
+  const [UserInfo, setUserInfo] = useState({})
+  const [FormData, setFormData] = useState({
+    name: '',
+    phone: ''
+  })
+
+  useEffect(() => {
+    setUserInfo(user?.userInfo?.person)
+    setFormData({name: user?.userInfo?.person.name, phone: user?.userInfo?.person.phone})
+  }, [user])
+
+  const Save = () => {
+    fetch({ url: `${API_EDIT_AGENT}?name=${FormData.name}&phone=${FormData.phone}`, method: 'put' }).then(() => {
+      Taro.showToast({
+        title: '修改成功',
+        icon: 'none'
+      })
+      login({path: '', scene: ''})
+    })
+  }
+
+  const FormChange = (key, e) => {
+    let Data = {...FormData}
+    Data[key] = e.detail.value
+    setFormData(Data)
+  }
 
   return (
     <view className='Page UserInfo'>
 
-      <ScrollView scroll-y={true} refresher-enabled={false} refresher-background='#fff'>
+      <ScrollView scroll-y>
         <view className='PageContent'>
 
-          <text>姓名</text>
+          <text>头像</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入姓名'></Input>
+              <view className='Icon'>
+                <Image mode='aspectFill' src={getImgURL(UserInfo.avatarurl)}></Image>
+              </view>
             </view>
+            {/* <text className='iconfont icon-jiantouright'></text> */}
           </view>
 
-          <text>昵称</text>
+          <text>用户名</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入昵称'></Input>
+              <Input placeholder='请输入用户名' value={FormData.name} onInput={FormChange.bind(this, 'name')}></Input>
             </view>
           </view>
 
           <text>手机号码</text>
           <view className='FormLine flex-h'>
             <view className='flex-item'>
-              <Input placeholder='请输入手机号码'></Input>
-            </view>
-          </view>
-
-          <text>性别</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>请选择</text>
-            </view>
-            <text className='iconfont icon-jiantoudown'></text>
-          </view>
-
-          <text>家庭住址</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入家庭住址'></Input>
-            </view>
-          </view>
-
-          <text>工作地址</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入工作地址'></Input>
-            </view>
-          </view>
-
-          <text>年龄段</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>请选择</text>
-            </view>
-            <text className='iconfont icon-jiantoudown'></text>
-          </view>
-
-          <text>职业</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入职业'></Input>
-            </view>
-          </view>
-
-          <text>家庭年收入范围</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>请选择</text>
-            </view>
-            <text className='iconfont icon-jiantoudown'></text>
-          </view>
-
-          <text>家庭成员数</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入家庭成员数'></Input>
-            </view>
-          </view>
-
-          <text>已有房产数</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入已有房产数'></Input>
-            </view>
-          </view>
-
-          <text>已有车辆数</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请输入已有车辆数'></Input>
-            </view>
-          </view>
-
-          <text>预计购房时间</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>请选择</text>
-            </view>
-            <text className='iconfont icon-jiantoudown'></text>
-          </view>
-
-          <text>客户咨询重点</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等；'></Input>
-            </view>
-          </view>
-
-          <text>购房动机</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <text>请选择</text>
-            </view>
-            <text className='iconfont icon-jiantoudown'></text>
-          </view>
-
-          <text>客户抗性分析</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等；'></Input>
-            </view>
-          </view>
-
-          <text>客户对项目认可点</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='请填写  如：地段、交通、社区配套、户型、价格等；'></Input>
-            </view>
-          </view>
-
-          <text>备注</text>
-          <view className='FormLine flex-h'>
-            <view className='flex-item'>
-              <Input placeholder='补充说明（选填）'></Input>
+              <Input placeholder='请输入手机号码' value={FormData.phone} onInput={FormChange.bind(this, 'phone')}></Input>
             </view>
           </view>
 
-          <view className='Btn'>
-            <text>提交</text>
-          </view>
+        </view>
 
+        <view className='Btn'>
+          <text onClick={Save}>保存</text>
         </view>
       </ScrollView>
 

src/pages/mine/userInfo/index.scss

@@ -8,7 +8,9 @@
     .PageContent {
       position: relative;
       overflow: hidden;
-      min-height: 100vh;
+      min-height: calc(100vh - 100px);
+      z-index: 1;
+      padding-bottom: 100px;
       > text {
         font-size: 34px;
         font-weight: bold;
@@ -23,6 +25,18 @@
         margin-top: 10px;
         align-items: center;
         >view {
+          >.Icon {
+            width: 92px;
+            height: 92px;
+            position: relative;
+            overflow: hidden;
+            border-radius: 100%;
+            background: #eee;
+            >image {
+              width: 100%;
+              height: 100%;
+            }
+          }
           > input {
             display: block;
             width: 100%;
@@ -44,20 +58,22 @@
           font-size: 30px;
         }
       }
-      .Btn {
-        padding: 40px;
-        position: relative;
-        overflow: hidden;
-        >text {
-          display: block;
-          text-align: center;
-          font-size: 32px;
-          line-height: 92px;
-          background: #193C83;
-          color: #fff;
-          font-weight: bold;
-          border-radius: 92px;
-        }
+    }
+    .Btn {
+      padding: 0 40px;
+      position: relative;
+      overflow: hidden;
+      z-index: 2;
+      margin-top: -100px;
+      >text {
+        display: block;
+        text-align: center;
+        font-size: 32px;
+        line-height: 92px;
+        background: #193C83;
+        color: #fff;
+        font-weight: bold;
+        border-radius: 92px;
       }
     }
   }