Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"http://127.0.0.1:8081"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"http://127.0.0.1:8081"',
     WSS_HOST: '"ws://127.0.0.1:8081"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

src/constants/api.js

@@ -296,3 +296,9 @@ export const API_FEEDBACK_SETTING = resolvePath('searchHouse/setting')
 
 // 系统参数
 export const API_SYSTEM_PARAM = resolvePath('sysOrgParams')
+
+// 渠道-龙虎榜
+export const API_CHANNEL_RANK = resolvePath('ranklist')
+
+// 获取报备客户详情
+export const API_CHANNEL_CUSTOMER_DETAIL = resolvePath('channelCustomer')

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

@@ -4,6 +4,7 @@ import Taro from '@tarojs/taro'
 
 export default function MyActivityListItem (props) {
   const { Data = {} } = props
+
   return (
     <view className='components MyActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/index/activityDetail/index?id=${Data.id}` }) }}>
       <view className='Img'>

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

@@ -10,8 +10,14 @@ export default function MyCustomerListItem (props) {
   const { expirationDate, customerStatus } = data
   const expStr = expirationDate && customerStatus === '1' ? `${expirationDate.substring(0, 10)} 回收` : ''
 
+  const gotoDetail = () => {
+    const id = data.channelCustomerId || data.customerId
+    const url = `/pages/mine/myCustomerDetail/index?id=${id}`
+    Taro.navigateTo({ url })
+  }
+
   return (
-    <view className='components MyCustomerListItem flex-h' onClick={() => { Taro.navigateTo({ url: `/pages/mine/myCustomerDetail/index?id=${data.customerId}` }) }}>
+    <view className='components MyCustomerListItem flex-h' onClick={gotoDetail}>
       <view className='Img'>
         <Image mode='scaleToFill' src={data.avatarurl}></Image>
       </view>

src/pages/mine/customerDetail/index.jsx

@@ -5,7 +5,9 @@ import '@/assets/css/iconfont.css'
 import { Image, Textarea } from '@tarojs/components'
 import { fetch } from '@/utils/request'
 import { API_GET_CUSTOMER_INFO, API_FOLLOW_LIST } from '@/constants/api'
+import { getCustomerDetail, addFollowRecord } from '@/services/person'
 import { getImgURL } from '@/utils/image'
+import { BIZ_STATUS } from '@/constants/user'
 import './index.scss'
 import UserDetailBasicInfo from '../components/UserDetailBasicInfo/index'
 import UserDetailViewRecord from '../components/UserDetailViewRecord/index'
@@ -13,9 +15,10 @@ import UserDetailActivityInfo from '../components/UserDetailActivityInfo/index'
 import UserDetailFollowRecord from '../components/UserDetailFollowRecord/index'
 
 export default withLayout((props) => {
+  const { router, person } = props
+  const { id : CustomerId,  } = router.params
 
-  const { name, sex, phone, avatarurl, status } = props.router.params
-  const [CustomerId] = useState(props.router.params.id)
+  const [custBaseInfo, setCustBaseInfo] = useState({})
   const [CustomerInfo, setCustomerInfo] = useState({})
   const [ShowAddFollow, setShowAddFollow] = useState(false)
   const [MenuList] = useState([
@@ -28,12 +31,6 @@ export default withLayout((props) => {
   const [FollowContent, setFollowContent] = useState('')
   const [FollowAddCounts, setFollowAddCounts] = useState(0)
 
-  useEffect(() => {
-    if (CustomerId) {
-      UpdateCustomerInfo()
-    }
-  }, [CustomerId])
-
   const UpdateCustomerInfo = () => {
     fetch({ url: `${API_GET_CUSTOMER_INFO}${CustomerId}` }).then((res) => {
       if (res) {
@@ -57,7 +54,13 @@ export default withLayout((props) => {
   }
 
   const SaveFollow = () => {
-    fetch({ url: API_FOLLOW_LIST, method: 'post', payload: { recordType: '添加跟进', recordContent: FollowContent, customerSex: CustomerInfo.sex, customerId: CustomerId } }).then((res) => {
+    const payload = {
+      recordType: '添加跟进',
+      recordContent: FollowContent,
+      customerSex: CustomerInfo.sex,
+      customerId: CustomerId,
+    }
+    addFollowRecord(payload).then((res) => {
       Taro.showToast({
         title: '添加跟进成功',
         icon: 'none'
@@ -80,6 +83,15 @@ export default withLayout((props) => {
     setFollowContent('')
   }
 
+  useEffect(() => {
+    if (CustomerId) {
+      UpdateCustomerInfo()
+
+      getCustomerDetail(CustomerId).then((res) => setCustBaseInfo(res || {}))
+    }
+  }, [CustomerId])
+
+
   return (
     <view className='Page customerDetail flex-v'>
 
@@ -89,20 +101,20 @@ export default withLayout((props) => {
             <view className='centerLabel'>
               <view className='flex-h'>
                 <view className='Icon'>
-                  <Image mode='aspectFill' src={getImgURL(CustomerInfo.avatarurl || avatarurl)}></Image>
+                  <Image mode='aspectFill' src={getImgURL(custBaseInfo.avatarurl)}></Image>
                 </view>
                 <view className='flex-item'>
                   <view>
-                    <text>{CustomerInfo.name || name}</text>
-                    <text className={CustomerInfo.sex - 0 === 1 || sex - 0 === 1 ? 'iconfont icon-nanxing' : 'iconfont icon-nvxing'}></text>
+                    <text>{custBaseInfo.name}</text>
+                    <text className={custBaseInfo.sex - 0 === 1 ? 'iconfont icon-nanxing' : 'iconfont icon-nvxing'}></text>
                   </view>
-                  <text>{CustomerInfo.phone || phone}</text>
+                  <text>{custBaseInfo.phone}</text>
                 </view>
                 <text className='iconfont icon-liaotian'></text>
-                <text className='iconfont icon-dianhua' onClick={() => { Taro.makePhoneCall({ phoneNumber: CustomerInfo.phone || phone }) }}></text>
+                <text className='iconfont icon-dianhua' onClick={() => { Taro.makePhoneCall({ phoneNumber: custBaseInfo.phone }) }}></text>
               </view>
             </view>
-            <text className='Status'>{status - 0 === 1 || status - 0 === 0 ? '已报备' : status - 0 === 2 ? '已到访' : status - 0 === 3 ? '已认筹' : '已签约'}</text>
+            <text className='Status'>{BIZ_STATUS[custBaseInfo.status] || '报备'}</text>
             <text className='Tips'>NEW</text>
             <text className='Tips'>NEW</text>
           </view>

src/pages/mine/myCustomerDetail/index.jsx

@@ -1,32 +1,29 @@
 import React, { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
+import { getChannelCustomerDetail } from '@/services/person'
 import { ScrollView, Image } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
+import './index.scss'
+import { ROLE_CODE } from '@/constants/user'
 
 export default withLayout((props) => {
+  const { router, person } = props
+  const { id } = router.params
 
-  // const [PageProps] = useState(props)
-  const [IsPull, setPull] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
-
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
-  }
+  const [custBaseInfo, setCustBaseInfo] = useState({})
 
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
+  useEffect(() => {
+    if (id) {
+      if (person.personType === ROLE_CODE.CHANNEL_AGENT) {
+        getChannelCustomerDetail(id).then((res) => setCustBaseInfo(res || {}))
+      }
     }
-  }, [IsPull])
+  }, [id, person])
 
   return (
     <view className='Page myCustomerDetail'>
 
-      <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#f8f8f8'>
+      <ScrollView scrollY>
         <view className='PageContent'>
 
           {/* 基本信息 */}
@@ -40,8 +37,8 @@ export default withLayout((props) => {
                   <Image mode='aspectFill' src={null}></Image>
                 </view>
                 <view className='flex-item'>
-                  <text>范丞丞</text>
-                  <text>136 1394 9434</text>
+                  <text>{custBaseInfo.name}</text>
+                  <text>{custBaseInfo.phone}</text>
                 </view>
                 <text className='iconfont icon-jiantouright'></text>
               </view>

src/pages/mine/partnerChannel/index.jsx

@@ -1,17 +1,17 @@
 import React, { useState, useEffect } from 'react'
 import withLayout from '@/layout'
-import './index.scss'
 import { ScrollView, Image } from '@tarojs/components'
+import { getChannelRank } from '@/services/agent'
+import { fetch } from '@/utils/request'
+import { API_GET_AGENT_BUILDINGS } from '@/constants/api'
 import '@/assets/css/iconfont.css'
+import './index.scss'
 
 export default withLayout((props) => {
-
-  // const [PageProps] = useState(props)
-  const [RankingList, setRankingList] = useState([
-    { name: '范丞丞', id: '', icon: '', num: '5', department: '销售部' },
-    { name: '范丞丞', id: '', icon: '', num: '6', department: '销售部' },
-    { name: '范丞丞', id: '', icon: '', num: '3', department: '销售部' }
-  ])
+  
+  const [buildingId, setBuildingId] = useState()
+  const [buildingList, setBuildingList] = useState([])
+  const [rankList, setRankList] = useState([])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
@@ -28,6 +28,24 @@ export default withLayout((props) => {
     }
   }, [IsPull])
 
+  useEffect(() => {
+    fetch({ url: API_GET_AGENT_BUILDINGS }).then((res) => {
+      const buildings = res || []
+      setBuildingList(buildings)
+      if (buildings.length) {
+        setBuildingId(buildings[0].buildingId)
+      }
+    })
+  }, [])
+
+  useEffect(() => {
+    if (buildingId) {
+      getChannelRank({buildingId}).then((res) => {
+        setRankList(res || [])
+      })
+    }
+  }, [buildingId])
+
   return (
     <view className='Page partnerChannel'>
       <ScrollView scroll-y={true} refresher-enabled={true} refresher-triggered={IsPull} onrefresherrefresh={PageRefresh} refresher-background='#fff'>
@@ -37,34 +55,34 @@ export default withLayout((props) => {
           <view className='Ranking'>
             <view className='Top flex-h'>
               <text className='flex-item'>龙虎榜</text>
-              <Image mode='heightFix' src={require('../../../assets/mine-icon23.png')}></Image>
+              <Image mode='heightFix' src={require('@/assets/mine-icon23.png')}></Image>
             </view>
             <view className='List flex-h'>
               {
-                RankingList.map((item, index) => (
+                rankList.map((item, index) => (
                   <view className={index === 1 ? 'flex-item active' : 'flex-item'} key={`ListItem-${index}`}>
                     {
                       index === 0 &&
-                      <Image mode='heightFix' src={require('../../../assets/mine-icon21.png')}></Image>
+                      <Image mode='heightFix' src={require('@/assets/mine-icon21.png')}></Image>
                     }
                     {
                       index === 1 &&
-                      <Image mode='heightFix' src={require('../../../assets/mine-icon20.png')}></Image>
+                      <Image mode='heightFix' src={require('@/assets/mine-icon20.png')}></Image>
                     }
                     {
                       index === 2 &&
-                      <Image mode='heightFix' src={require('../../../assets/mine-icon22.png')}></Image>
+                      <Image mode='heightFix' src={require('@/assets/mine-icon22.png')}></Image>
                     }
                     <view className='Icon'>
-                      <Image mode='aspectFill' src={item.icon || null}></Image>
+                      <Image mode='aspectFill' src={item.avatarurl || null}></Image>
                     </view>
                     <view className='Index'>
                       <text>{item.name}</text>
                       <text>{index === 0 ? 2 : index === 1 ? 1 : 3}</text>
                     </view>
                     <view className='Num'>
-                      <text>{item.department}</text>
-                      <text>{item.num}</text>
+                      <text></text>
+                      <text>{item.number}</text>
                     </view>
                   </view>
                 ))

src/services/agent.js

@@ -5,8 +5,8 @@ import {
   API_REGISTER_AGENT,
   API_AGENT_CHANNEL,
   API_AGENT_CURRENT,
-  API_EDIT_AGENT
-
+  API_EDIT_AGENT,
+  API_CHANNEL_RANK,
 } from '@/constants/api'
 
 
@@ -41,3 +41,5 @@ export const agentCurrent = payload => fetch({ url: API_AGENT_CURRENT, payload }
  */
 export const editAgent = payload => fetch({ url: `${API_EDIT_AGENT}?name=${payload.name}&&avatar=${payload.avatar}&&phone=${payload.phone}`, method: 'PUT' })
 
+
+export const getChannelRank = (payload) => fetch({ url: API_CHANNEL_RANK, payload })

src/services/person.js

@@ -14,7 +14,8 @@ import {
   API_MORE_ACTIVITY,
   API_SHARE_LIST,
   API_SHARE_INFOLIST,
-  API_BIND_CUSTOMER
+  API_BIND_CUSTOMER,
+  API_CHANNEL_CUSTOMER_DETAIL,
 } from '@/constants/api'
 
 
@@ -107,5 +108,10 @@ export const judgeBindCustomer = (payload) => fetch({ url: API_BIND_CUSTOMER, pa
  */
 export const getSharePersonInfoList = (payload) => fetch({ url: API_SHARE_INFOLIST, payload })
 
+/**
+ * 获取报备客户详情
+ * @param {*} customerId  
+ */
+export const getChannelCustomerDetail = (id) => fetch({ url: `${API_CHANNEL_CUSTOMER_DETAIL}/${id}` })