静态页面

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    // HOST: '"https://xlk.njyz.tech"',
-    HOST: '"https://www.newhousehold.cn"',
+    HOST: '"https://xlk.njyz.tech"',
+    // HOST: '"https://www.newhousehold.cn"',
     // HOST: '"http://127.0.0.1:8567"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-cn-shanghai.aliyuncs.com/"',

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxc96058d57e77f373",
+	"appid": "wxe44244d1a5ea3364",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,
@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/components/ProjectListItem/index.jsx

@@ -8,8 +8,19 @@ import './index.scss'
 export default function ProjectListItem (props) {
   const { Data = {}, ShowImgIcon = true } = props
   const { uvList = [] } = Data
+
+  const LinkTo = () => {
+    if(Data.eventType === 'news') { // 资讯
+      Taro.navigateTo({ url: `/pages/index/newsDetail/index?id=${Data.targetId}` })
+    } else if(Data.eventType === 'activity') { // 活动
+      Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${Data.targetId}` })
+    } else { // 楼盘
+      Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.buildingId || Data.targetId}` })
+    }
+  }
+
   return (
-    <view className='components ProjectListItem flex-h' onClick={() => { Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.buildingId || Data.targetId}` }) }}>
+    <view className='components ProjectListItem flex-h' onClick={LinkTo}>
       <view className='Img'>
         <view>
           <Image mode='aspectFill' className='centerLabel' src={getImgURL((Data?.buildingListImg || []).length ? Data.buildingListImg[0].url : Data.activityImg || null)} />

src/pages/index/components/ActivityListItem/index.jsx

@@ -28,7 +28,7 @@ export default function ActivityListItem (props) {
   return (
     <view className='components ActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${data.dynamicId}` }) }}>
       <view className='Img'>
-        <Image mode='aspectFill' src={getImgURL(data.listImgUrl)} className='centerLabel'></Image>
+        <Image mode='aspectFill' src={getImgURL(data.listImgUrl || data.imgUrl)} className='centerLabel'></Image>
       </view>
       <view className='Info'>
         <view className='Name flex-h'>

src/pages/mine/myCustomerDetail/index.jsx

@@ -163,27 +163,30 @@ export default withLayout((props) => {
           }
 
           {/* 操作人员 */}
-          {/* <view className='OptUser'>
-            <view className='Title flex-h'>
-              <text>操作人员</text>
-              <view className='flex-item'></view>
-              <view className='More'>
-                <text>更多</text>
-                <text className='iconfont icon-jiantouright'></text>
-              </view>
-            </view>
-            <view className='Content'>
-              <view className='UserInfo flex-h'>
-                <view className='Icon'>
-                  <Image mode='aspectFill' src={null}></Image>
+          {
+            followList.length > 0 &&
+            <view className='OptUser'>
+              <view className='Title flex-h'>
+                <text>操作人员</text>
+                <view className='flex-item'></view>
+                <view className='More' onClick={() => { Taro.navigateTo({url: `/pages/mine/myCustomerForOperator/index?id=${id}`}) }}>
+                  <text>更多</text>
+                  <text className='iconfont icon-jiantouright'></text>
                 </view>
-                <view className='flex-item'>
-                  <text>最后跟进人</text>
-                  <text>跟进时间</text>
+              </view>
+              <view className='Content'>
+                <view className='UserInfo flex-h'>
+                  <view className='Icon'>
+                    <Image mode='aspectFill' src={null}></Image>
+                  </view>
+                  <view className='flex-item'>
+                    <text>{followList[0].followerName}</text>
+                    <text>{formatDate(followList[0].createDate, 'yyyy-MM-dd hh:mm')}</text>
+                  </view>
                 </view>
               </view>
             </view>
-          </view> */}
+          }
 
           {/* 跟进记录 */}
           <view className='Record'>
@@ -194,17 +197,17 @@ export default withLayout((props) => {
                 <text>新增</text>
               </view>
               <view className='flex-item'></view>
-              {/* <view className='More'>
+              <view className='More' onClick={() => { Taro.navigateTo({url: `/pages/mine/myCustomerForRecord/index?id=${id}`}) }}>
                 <text>更多</text>
                 <text className='iconfont icon-jiantouright'></text>
-              </view> */}
+              </view>
             </view>
             <view className='Content'>
               {
                 followList.map((item, index) => (
                   <view key={`Item-${index}`}>
                     <view className='flex-h'>
-                      <text>{item.name}</text>
+                      <text>{item.followerName}</text>
                       <view className='flex-item'></view>
                       <text>{formatDate(item.createDate, 'yyyy-MM-dd hh:mm')}</text>
                     </view>

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

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '操作人员'
+}

src/pages/mine/myCustomerForOperator/index.jsx

@@ -0,0 +1,90 @@
+import { useState, useEffect } from 'react'
+import withLayout from '@/layout'
+import { ScrollView, Image } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_ACTIVITY_LIST } from '@/constants/api'
+import { getImgURL } from '@/utils/image'
+import './index.scss'
+
+export default withLayout(() => {
+
+  const user = useSelector(state => state.user)
+  const [PageList, setPageList] = useState([])
+  const [IsPull, setPull] = useState(false)
+  const [PersonId, setPersonId] = useState(null)
+  const [pageNumber, setPageNumber] = useState(1)
+  const [HasNextPage, setHasNextPage] = useState(true)
+
+  useEffect(() => {
+    if (user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    GetPageList()
+  }, [pageNumber])
+
+  const PageRefresh = () => { // 页面下拉刷新回调
+    setPull(true)
+  }
+
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_ACTIVITY_LIST, method: 'get', payload: { mine: true, 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) {
+      if (pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
+    }
+  }, [IsPull])
+
+  return (
+    <view className='Page myActivity'>
+
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
+        <view className='PageContent'>
+          <view className='List'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem flex-h' key={`ListItem-${index}`}>
+                  <view className='Icon'>
+                    <Image mode='aspectFill' className='centerLabel' src={getImgURL(null)} />
+                  </view>
+                  <view className='flex-item'>
+                    <text>报备人</text>
+                    <text>2021-08-08 15:15:15</text>
+                  </view>
+                </view>
+              ))
+            }
+          </view>
+
+          {/* bottom */}
+          <view className='PageBottom'>
+            <text>已经到底了~</text>
+          </view>
+
+        </view>
+      </ScrollView>
+
+    </view>
+  )
+})

src/pages/mine/myCustomerForOperator/index.scss

@@ -0,0 +1,70 @@
+.Page.myActivity {
+  background: #fff;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  > scroll-view {
+    width: 100%;
+    height: 100vh;
+    .PageContent {
+      position: relative;
+      overflow: hidden;
+      min-height: 100vh;
+      >.List {
+        padding: 0 30px;
+        position: relative;
+        overflow: hidden;
+        >.ListItem {
+          position: relative;
+          overflow: hidden;
+          border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+          padding: 24px 0;
+          align-items: center;
+          >.Icon {
+            width: 92px;
+            height: 92px;
+            position: relative;
+            overflow: hidden;
+            background: #eee;
+            border-radius: 100%;
+            margin-right: 30px;
+            >image {
+              width: 100%;
+              height: 100%;
+            }
+          }
+          >.flex-item {
+            >text {
+              display: block;
+              font-size: 28px;
+              color: #666;
+              line-height: 1;
+              margin-top: 12px;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              &:first-child {
+                font-size: 32px;
+                color: #333;
+                margin-top: 0;
+              }
+            }
+          }
+        }
+      }
+      > .PageBottom {
+        text-align: center;
+        font-size: 0;
+        white-space: nowrap;
+        > text {
+          display: inline-block;
+          font-size: 28px;
+          color: #666;
+          line-height: 40px;
+          margin: 20px auto;
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '跟进记录'
+}

src/pages/mine/myCustomerForRecord/index.jsx

@@ -0,0 +1,90 @@
+import { useState, useEffect } from 'react'
+import withLayout from '@/layout'
+import { ScrollView, Image } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
+import { useSelector } from 'react-redux'
+import { fetch } from '@/utils/request'
+import { API_ACTIVITY_LIST } from '@/constants/api'
+import { getImgURL } from '@/utils/image'
+import './index.scss'
+
+export default withLayout(() => {
+
+  const user = useSelector(state => state.user)
+  const [PageList, setPageList] = useState([])
+  const [IsPull, setPull] = useState(false)
+  const [PersonId, setPersonId] = useState(null)
+  const [pageNumber, setPageNumber] = useState(1)
+  const [HasNextPage, setHasNextPage] = useState(true)
+
+  useEffect(() => {
+    if (user?.userInfo?.person?.personId) {
+      setPersonId(user.userInfo.person.personId)
+    }
+  }, [user])
+
+  useEffect(() => {
+    GetPageList()
+  }, [pageNumber])
+
+  const PageRefresh = () => { // 页面下拉刷新回调
+    setPull(true)
+  }
+
+  const GetPageList = () => {
+    setHasNextPage(false)
+    fetch({ url: API_ACTIVITY_LIST, method: 'get', payload: { mine: true, 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) {
+      if (pageNumber === 1) {
+        GetPageList()
+      } else {
+        setPageNumber(1)
+      }
+    }
+  }, [IsPull])
+
+  return (
+    <view className='Page myActivity'>
+
+      <ScrollView scroll-y refresher-enabled refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} onscrolltolower={PageLoadMore} refresher-background='#fff'>
+        <view className='PageContent'>
+          <view className='List'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem' key={`ListItem-${index}`}>
+                  <view className='flex-h'>
+                    <view className='flex-item'>
+                      <text>跟进人</text>
+                    </view>
+                    <text>2021-05-21 12:00</text>
+                  </view>
+                  <text>跟进内容</text>
+                </view>
+              ))
+            }
+          </view>
+
+          {/* bottom */}
+          <view className='PageBottom'>
+            <text>已经到底了~</text>
+          </view>
+
+        </view>
+      </ScrollView>
+
+    </view>
+  )
+})

src/pages/mine/myCustomerForRecord/index.scss

@@ -0,0 +1,62 @@
+.Page.myActivity {
+  background: #fff;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  > scroll-view {
+    width: 100%;
+    height: 100vh;
+    .PageContent {
+      position: relative;
+      overflow: hidden;
+      min-height: 100vh;
+      >.List {
+        padding: 0 30px;
+        position: relative;
+        overflow: hidden;
+        >.ListItem {
+          position: relative;
+          overflow: hidden;
+          border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+          padding: 40px 0;
+          >.flex-h {
+            align-items: center;
+            >.flex-item {
+              >text {
+                display: block;
+                font-size: 32px;
+                color: #333;
+                line-height: 1;
+              }
+            }
+            >text {
+              font-size: 24px;
+              color: #999;
+              line-height: 1;
+            }
+          }
+          >text {
+            font-size: 28px;
+            color: 666;
+            line-height: 36px;
+            display: block;
+            margin-top: 38px;
+          }
+        }
+      }
+      > .PageBottom {
+        text-align: center;
+        font-size: 0;
+        white-space: nowrap;
+        > text {
+          display: inline-block;
+          font-size: 28px;
+          color: #666;
+          line-height: 40px;
+          margin: 20px auto;
+        }
+      }
+    }
+  }
+}

src/routes.js

@@ -318,6 +318,20 @@ const routes = [
     type: 'mine',
     // auth: ['phone'],
   },
+  {
+    name: '操作人员',
+    page: 'pages/mine/myCustomerForOperator/index',
+    pkg: 'main',
+    type: 'mine',
+    // auth: ['phone'],
+  },
+  {
+    name: '跟进记录',
+    page: 'pages/mine/myCustomerForRecord/index',
+    pkg: 'main',
+    type: 'mine',
+    // auth: ['phone'],
+  },
   {
     name: '我的收藏',
     page: 'pages/mine/myCollect/index',