静态页面

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,

src/constants/api.js

@@ -74,6 +74,7 @@ export const API_UPLOAD_IMAGE = resolvePath('image')
 export const API_CHAT_READED = resolvePath('chat/message')
 export const API_CHAT_UNREADED = resolvePath('chat/unReaded')
 
+export const API_CONSULTANT = resolvePath('consultant')
 
 // card
 export const API_CARDS_LIST = resolvePath('cards')

src/pages/index/activityDetail/index.jsx

@@ -100,7 +100,8 @@ export default withLayout((props) => {
     {
       title: shareContent.shareContentTitle || detail?.title,
       path: `${router.path}?${paramsRef.current}`,
-      image: shareContent.shareContentImg || getImgURL(detail?.imgUrl),
+      // image: shareContent.shareContentImg || getImgURL(detail?.imgUrl),
+      image: '',
     },
     fullTrackData
   );

src/pages/mine/addCustomer/components/BuildingPicker.jsx

@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react'
+import { useSelector } from 'react-redux'
 import Picker from '@/components/Picker'
 import { fetch } from '@/utils/request'
 import { API_GET_AGENT_BUILDINGS, API_ITEMS_LIST } from '@/constants/api'
@@ -7,11 +8,12 @@ import { ROLE_CODE } from '@/constants/user'
 export default (props) => {
 
   const { type = '', change = () => {} } = props
+  const city = useSelector(state => state.city)
   const [dicts, setDicts] = useState([])
 
   useEffect(() => {
     if (type === ROLE_CODE.CUSTOMER) {
-      fetch({ url: API_ITEMS_LIST, payload: { pageNumber: 1, pageSize: 1000 } }).then((res) => {
+      fetch({ url: API_ITEMS_LIST, payload: { pageNumber: 1, pageSize: 1000, cityId: city.curCity.id } }).then((res) => {
         setDicts(res.records || [])
       })
     } else {

src/pages/mine/feedBack/index.jsx

@@ -30,6 +30,10 @@ export default withLayout(() => {
   }
 
   const Submit = () => {
+    if(FormData.message === '') {
+      Taro.showToast({ title: '请填写问题描述', icon: 'none'})
+      return false
+    }
     fetch({ url: API_FEEDBACK_SUBMIT, method: 'post', payload: FormData }).then(() => {
       Taro.showToast({
         title: '反馈成功', icon: 'none', complete: () => {

src/pages/mine/index.jsx

@@ -20,12 +20,14 @@ const copyRight = `技术支持: 云致科技 @ ${(new Date()).getFullYear()}`
 export default withLayout(() => {
 
   const user = useSelector(state => state.user)
+  const city = useSelector(state => state.city)
   const [UserRole, setUserRole] = useState(null) // 1-普通用户 2-经纪人 3-置业顾问 4-驻场管理
   const [MenuList, setMenuList] = useState([])
   const { dispatch } = store
 
   useEffect(() => {
     if (user?.userInfo?.person?.personId) {
+      console.log(city)
       const person = user.userInfo.person
       setUserRole(person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : person.personType === ROLE_CODE.MARKETING ? 4 : 1)
     }

src/pages/mine/myRecommendCode/index.jsx

@@ -16,7 +16,7 @@ export default withLayout((props) => {
   useEffect(() => {
     const payload = {
       scene: `id=${person?.personId}&from=${page.type}_share&recommender=${person?.personId}`,
-      page: `pages/consultant/myHomepage/index`
+      page: `subpackages/pages/consultant/myHomepage/index`
     }
     fetch({ url: API_QRCODE, payload, method: 'post' }).then((res) => {
       setQrCodeUrl(res)

src/routes.js

@@ -384,7 +384,7 @@ const routes = [
     name: '个人主页',
     page: 'pages/consultant/myHomepage/index',
     pkg: 'subpackages',
-    type: 'mine',
+    type: 'card',
     // auth: ['phone'],
   },
   {

src/subpackages/pages/consultant/myHomepage/index.jsx

@@ -5,7 +5,7 @@ import { ScrollView, Image, Button } from '@tarojs/components'
 import ProjectListItem from '@/components/ProjectListItem/index'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_AGENT_CURRENT, API_ITEMS_DETAIL, API_CARDS_LIST } from '@/constants/api'
+import { API_CARDS_UV, API_ITEMS_DETAIL, API_CARDS_LIST } from '@/constants/api'
 import { getImgURL } from '@/utils/image'
 import useLike from "@/utils/hooks/useLike";
 import '@/assets/css/iconfont.css'
@@ -21,14 +21,28 @@ export default withLayout((props) => {
   const [PullTimer, setPullTimer] = useState(null)
   const [UserInfo, setUserInfo] = useState({})
   const [BuildingInfo, setBuildingInfo] = useState({})
+  const [LikeNum, setLikeNum] = useState(0)
 
   const user = useSelector(state => state.user)
   const [PersonId, setPersonId] = useState(null)
 
-  const [isSave, handleFavor] = useLike(BuildingInfo?.isSave, {
-    id,
+  const [isSave, handleFavor] = useLike(UserInfo?.liked, {
+    id: id || user.userInfo.person.personId,
     ...trackData,
-  });
+    eventType: 'consultant'
+  }, () => {
+    if(!isSave) {
+      AddHotNum()
+    }
+    const likeNum = isSave ? UserInfo.likeNum - 1 : UserInfo.likeNum + 1
+    setLikeNum(likeNum)
+  })
+
+  useEffect(() => {
+    if(UserInfo.id) {
+      setLikeNum(UserInfo.likeNum)
+    }
+  }, [UserInfo])
 
   useEffect(() => {
     if (PersonId !== user.userInfo.person.personId) {
@@ -52,14 +66,14 @@ export default withLayout((props) => {
   }, [PersonId])
 
   useEffect(() => {
-    if (UserInfo.buildingId) {
+    if (UserInfo.buildingId && !BuildingInfo.buildingId) {
       GetBuildingInfo()
     }
   }, [UserInfo])
 
-  const GetUserInfo = () => {
-    fetch({ url: API_AGENT_CURRENT, method: 'get' }).then((res) => {
-      setUserInfo(res)
+  const AddHotNum = () => {
+    fetch({ url: API_CARDS_UV + `/${id || PersonId}`, method: 'post' }).then(() => {
+      setUserInfo({...UserInfo, hotNum: (UserInfo.hotNum || 0) - 0 + 1})
     })
   }
 
@@ -99,7 +113,7 @@ export default withLayout((props) => {
                     <text>{UserInfo.name} {UserInfo.phone}</text>
                   </view>
                   <text onClick={handleFavor} className='iconfont icon-dianzan' style={isSave ? { color: 'red' } : undefined}></text>
-                  <text onClick={handleFavor}>{UserInfo.likeNum || 0}{isSave ? `已点赞` : '赞'}</text>
+                  <text onClick={handleFavor}>{LikeNum}{isSave ? `已点赞` : '赞'}</text>
                 </view>
                 <view className='Tag'>
                   <view>
@@ -134,7 +148,7 @@ export default withLayout((props) => {
                 }
               </view>
               <text className='iconfont icon-renqi'></text>
-              <text>人气值{UserInfo.hotNum || 999}</text>
+              <text>人气值{(UserInfo.hotNum || 0) + 999}</text>
             </view>
           </view>
 

src/utils/hooks/useLike.js

@@ -5,9 +5,9 @@ import { resolvePath } from '@/constants/api'
 import track from '@/utils/tracking/track'
 
 const addLike = (type, id) => fetch({ url: resolvePath(`${type}/like/${id}`),  method: 'POST' })
-const cancelLike = (type, id) => fetch({ url: resolvePath(`${type}/like/${id}`),  method: 'POST' })
+const cancelLike = (type, id) => fetch({ url: resolvePath(`${type}/like/${id}`),  method: 'DELETE' })
 
-export default function(liked, options = {}) {
+export default function(liked, options = {}, callback = () => {}) {
   const { id, eventType } = options
   const [isLiked, setIsLiked] = useState(liked)
 
@@ -21,6 +21,7 @@ export default function(liked, options = {}) {
           title: '已取消点赞',
           icon: 'none',
         })
+        callback()
       })
     } else {
       addLike(eventType, id).then(() => {
@@ -29,6 +30,7 @@ export default function(liked, options = {}) {
           title: '点赞成功',
           icon: 'none',
         })
+        callback()
       })
     }
     track({