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

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/chat/chatDetail/index.jsx

@@ -137,6 +137,12 @@ export default withLayout((props) => {
     })
   }, [PageList, scroll])
 
+  const CheckBigImg = (img) => {
+    return () => {
+      Taro.previewImage({ current: img, urls: [img] })
+    }
+  }
+
   return (
     <view className='chatDetail flex-v'>
       <view className='flex-item'>
@@ -171,7 +177,7 @@ export default withLayout((props) => {
                                 item.messageType === im.MESSAGETYPE.IMAGE &&
                                 <view className='Message Left Img'>
                                   <view>
-                                    <Image mode='scaleToFill' src={item.message}></Image>
+                                    <Image onClick={CheckBigImg(item.message)} mode='scaleToFill' src={item.message}></Image>
                                   </view>
                                 </view>
                               }
@@ -196,7 +202,7 @@ export default withLayout((props) => {
                                 item.messageType === im.MESSAGETYPE.IMAGE &&
                                 <view className='Message Right Img'>
                                   <view>
-                                    <Image mode='scaleToFill' src={item.message}></Image>
+                                    <Image onClick={CheckBigImg(item.message)} mode='scaleToFill' src={item.message}></Image>
                                   </view>
                                 </view>
                               }

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/index/helpToFindHouse/components/SubmitBuyHouseResult/index.jsx

@@ -1,14 +1,17 @@
 
 import { useState } from 'react'
 import Taro from '@tarojs/taro'
-import { Image, Block } from '@tarojs/components'
+import { Image, Block, ScrollView } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
+import ProjectItemCard from '@/components/ProjectItemCard/index'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default function SubmitBuyHouseResult (props) {
   const { List = [], setting, ShowResult = true } = props
 
+  // const [ShowSorry, setShowSorry] = useState(false)
+
   const handlePhone = () => {
     if (!setting?.phone) {
       Taro.showToast({
@@ -53,23 +56,49 @@ export default function SubmitBuyHouseResult (props) {
                     <text>匹配楼盘</text>
                   </view>
                 </view>
-                <view className='RecommendBuildingItem' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${List[0].buildingId}` })}}>
-                  <view>
-                    <view className='Img'>
-                      <Image mode='aspectFill' src={getImgURL(List[0].poster || List[0].preSalePermit)} className='centerLabel'></Image>
-                    </view>
-                    <view className='Title flex-h'>
-                      <view className='flex-item'>
-                        <text>{List[0].name}</text>
-                      </view>
-                      <view className='Price'><text>{List[0].price}</text></view>
+                <view className={List.length === 1 ? 'ScrollViewX active' : 'ScrollViewX'}>
+                  <ScrollView scrollX>
+                    <view className='ListContainer'>
+                      {
+                        List.map((item, index) => (
+                          <view className='RecommendBuildingItem' key={`item-${index}`} onClick={() => { Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${item.buildingId}` }) }}>
+                            <view>
+                              <view className='Img'>
+                                <Image mode='aspectFill' src={getImgURL(item.poster || item.preSalePermit)} className='centerLabel'></Image>
+                              </view>
+                              <view className='Title flex-h'>
+                                <view className='flex-item'>
+                                  <text>{item.name}</text>
+                                </view>
+                                <view className='Price'><text>{item.price}</text></view>
+                              </view>
+                              <text className='Address'>{item.address}</text>
+                            </view>
+                          </view>
+                        ))
+                      }
                     </view>
-                    <text className='Address'>{List[0].address}</text>
-                  </view>
+                  </ScrollView>
                 </view>
               </view>
             }
 
+            {
+              List.length === 0 &&
+              <view className='Recommend Sorry'>
+                <view className='Title'>
+                  <view>
+                    <text>温馨提示</text>
+                  </view>
+                </view>
+                <view className='Tips'>
+                  <text>非常抱歉！</text>
+                  <text>根据您的需求，目前尚无可推荐的楼盘</text>
+                  <text>您可以返回首页浏览更多内容！</text>
+                </view>
+              </view> 
+            }
+
           </view>
         </view>
       </view>

src/pages/index/helpToFindHouse/components/SubmitBuyHouseResult/index.scss

@@ -8,25 +8,25 @@
   margin: 0 !important;
   padding: 0 !important;
   z-index: 100 !important;
-  >view {
+  > view {
     width: 100%;
-    >view {
+    > view {
       padding: 0 30px;
       position: relative;
       overflow: hidden;
-      >view {
+      > view {
         position: relative;
         overflow: hidden;
         min-height: 80px;
         background: #fff;
         border-radius: 24px;
-        >.Status {
+        > .Status {
           text-align: center;
           margin-top: 40px;
-          >text {
+          > text {
             font-size: 34px;
             font-weight: bold;
-            color: #193C83;
+            color: #193c83;
             display: block;
             text-align: center;
             line-height: 34px;
@@ -38,11 +38,11 @@
             }
           }
         }
-        >.Tips {
+        > .Tips {
           position: relative;
           overflow: hidden;
           margin-top: 30px;
-          >text {
+          > text {
             display: block;
             text-align: center;
             font-size: 26px;
@@ -51,42 +51,61 @@
             white-space: nowrap;
           }
         }
-        >.Btn {
+        > .Btn {
           padding: 0 80px;
           position: relative;
           overflow: hidden;
           margin-top: 40px;
           align-items: center;
           margin-bottom: 60px;
-          >text, button {
+          > text,
+          button {
             padding: 0;
             font-size: 30px;
             line-height: 78px;
             border-radius: 78px;
             margin-left: 60px;
             text-align: center;
-            border: 2px solid #193C83;
+            border: 2px solid #193c83;
             box-sizing: border-box;
-            color: #193C83;
+            color: #193c83;
             font-weight: bold;
             &:first-child {
               margin-left: 0;
             }
             &.active {
-              background: #193C83;
+              background: #193c83;
               color: #fff;
             }
           }
         }
-        >.Recommend {
+        > .Recommend {
           padding: 0 30px;
           position: relative;
           overflow: hidden;
-          >.Title {
+          &.Sorry {
+            position: relative;
+            overflow: hidden;
+            padding: 60px 0 80px;
+            > .Tips {
+              position: relative;
+              overflow: hidden;
+              margin-top: 40px;
+              > text {
+                display: block;
+                text-align: center;
+                font-size: 26px;
+                color: #666;
+                line-height: 50px;
+                white-space: nowrap;
+              }
+            }
+          }
+          > .Title {
             position: relative;
             overflow: hidden;
             &::after {
-              content: '';
+              content: "";
               width: 100%;
               display: block;
               position: absolute;
@@ -96,7 +115,7 @@
               background: rgba(0, 0, 0, 0.12);
               z-index: 1;
             }
-            >view {
+            > view {
               display: block;
               position: relative;
               z-index: 2;
@@ -106,7 +125,7 @@
               text-align: center;
               font-size: 0;
               &::after {
-                content: '';
+                content: "";
                 width: 100%;
                 display: block;
                 position: absolute;
@@ -116,7 +135,7 @@
                 z-index: 2;
                 border-bottom: 2px dashed #333;
               }
-              >text {
+              > text {
                 display: inline-block;
                 position: relative;
                 z-index: 3;
@@ -129,74 +148,99 @@
               }
             }
           }
-          >.PlanTitle {
-            font-size: 30px;
-            font-weight: bold;
-            white-space: nowrap;
-            position: relative;
-            overflow: hidden;
-            margin-top: 40px;
-            text-align: center;
-            >text {
-              color: #FC3838;
-            }
-          }
-          >.RecommendBuildingItem {
+          > .ScrollViewX {
+            width: 100%;
+            height: 400px;
             position: relative;
             overflow: hidden;
-            padding: 0 60px;
             margin-top: 30px;
             margin-bottom: 50px;
-            >view {
-              position: relative;
-              overflow: hidden;
-              >.Img {
-                width: 100%;
-                padding-bottom: 60%;
-                position: relative;
-                overflow: hidden;
-                background: #eee;
-                >image {
-                  width: 100%;
-                  height: 100%;
-                }
-              }
-              >.Title {
-                align-items: flex-start;
-                margin-top: 24px;
-                >.flex-item {
-                  >text {
-                    display: block;
-                    font-size: 32px;
-                    font-weight: bold;
-                    color: #333;
-                    line-height: 40px;
-                    overflow: hidden;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
+            &.active {
+              height: 470px;
+            }
+            > scroll-view {
+              width: 100%;
+              height: 100%;
+              .ListContainer {
+                min-width: 100%;
+                white-space: nowrap;
+                font-size: 0;
+                > .RecommendBuildingItem {
+                  &:only-child {
+                    width: 100%;
+                    margin-right: 0;
                   }
-                }
-                >.Price {
-                  font-size: 22px;
-                  font-weight: bold;
-                  color: #333;
-                  margin-left: 10px;
-                  line-height: 40px;
-                  max-width: 50%;
+                  position: relative;
                   overflow: hidden;
-                  white-space: nowrap;
-                  text-overflow: ellipsis;
-                  >text {
-                    color: #FC2C2C;
+                  display: inline-block;
+                  vertical-align: middle;
+                  width: 500px;
+                  margin-right: 30px;
+                  > view {
+                    position: relative;
+                    overflow: hidden;
+                    > .Img {
+                      width: 100%;
+                      padding-bottom: 60%;
+                      position: relative;
+                      overflow: hidden;
+                      background: #eee;
+                      > image {
+                        width: 100%;
+                        height: 100%;
+                      }
+                    }
+                    > .Title {
+                      align-items: flex-start;
+                      margin-top: 24px;
+                      > .flex-item {
+                        > text {
+                          display: block;
+                          font-size: 32px;
+                          font-weight: bold;
+                          color: #333;
+                          line-height: 40px;
+                          overflow: hidden;
+                          white-space: nowrap;
+                          text-overflow: ellipsis;
+                        }
+                      }
+                      > .Price {
+                        font-size: 22px;
+                        font-weight: bold;
+                        color: #333;
+                        margin-left: 10px;
+                        line-height: 40px;
+                        max-width: 50%;
+                        overflow: hidden;
+                        white-space: nowrap;
+                        text-overflow: ellipsis;
+                        > text {
+                          color: #fc2c2c;
+                        }
+                      }
+                    }
+                    > .Address {
+                      font-size: 22px;
+                      color: #666;
+                      line-height: 30px;
+                      margin-top: 20px;
+                    }
                   }
                 }
               }
-              >.Address {
-                font-size: 22px;
-                color: #666;
-                line-height: 30px;
-                margin-top: 20px;
-              }
+            }
+          }
+          > .PlanTitle {
+            font-size: 30px;
+            font-weight: bold;
+            white-space: nowrap;
+            position: relative;
+            overflow: hidden;
+            margin-top: 40px;
+            text-align: center;
+            > text {
+              color: #fc3838;
             }
           }
         }

src/pages/index/newsList/index.jsx

@@ -8,8 +8,9 @@ import { API_NEWS_LIST } from '@/constants/api'
 import './index.scss'
 import NewsListItem from '../components/NewsListItem/index'
 
-export default withLayout(() => {
+export default withLayout((props) => {
   
+  const { city } = props
   const user = useSelector(state => state.user)
   const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
@@ -35,7 +36,7 @@ export default withLayout(() => {
 
   const GetPageList = () => {
     setHasNextPage(false)
-    fetch({ url: API_NEWS_LIST, method: 'get', payload: { pageNumber, pageSize: 10 } }).then((res) => {
+    fetch({ url: API_NEWS_LIST, method: 'get', payload: { pageNumber, pageSize: 10, cityId: city.id } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)

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/components/EditUserDetailBasicInfo/index.jsx

@@ -20,6 +20,14 @@ export default function EditUserDetailBasicInfo (props) {
   const [BuyTimeRange] = useState(['1月以内', '1至3月', '半年以内', '一年以内', '一年以上'])
   const [CanSubmit, setCanSubmit] = useState(false)
 
+  useEffect(() => {
+    setFormData({ ...Data })
+    setSex(Data?.sex - 0 === 1 ? '男' : '女')
+    setAge(Data?.age)
+    setHouseholdIncome(Data?.householdIncome)
+    setEstimatedPurchaseTime(Data?.estimatedPurchaseTime)
+  }, [Data])
+
   useEffect(() => {
     if (CanSubmit) {
       setCanSubmit(false)

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.config.js

@@ -1,3 +1,4 @@
 export default {
-  navigationBarTitleText: '个人主页'
+  navigationBarTitleText: '个人主页',
+  enableShareAppMessage: true
 }

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

@@ -1,11 +1,11 @@
 import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
-import { ScrollView, Image } from '@tarojs/components'
+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>
 
@@ -162,7 +176,7 @@ export default withLayout((props) => {
               </view>
             </view>
             <view className='Btn'>
-              <text>分享主页</text>
+              <Button className='Share' open-type='share'>分享主页</Button>
             </view>
           </view>
 

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

@@ -209,7 +209,7 @@
           }
           > .Btn {
             margin-top: 40px;
-            > text {
+            > button {
               display: block;
               text-align: center;
               font-size: 32px;
@@ -218,6 +218,10 @@
               color: #333;
               font-weight: bold;
               background: #f2f2f2;
+              border: none;
+              &::after {
+                border: none;
+              }
             }
           }
         }
@@ -349,6 +353,7 @@
             line-height: 92px;
             background: #193c83;
             border-radius: 92px;
+            border: none;
           }
         }
       }

src/subpackages/pages/marketing/changeVisit/index.jsx

@@ -5,7 +5,8 @@ import '@/assets/css/iconfont.css'
 import { getCardList } from '@/services/card'
 import { fetch } from '@/utils/request'
 import Taro from '@tarojs/taro'
-import { API_SURE_CHIP, API_BUILDING_HOUSE_TYPE, API_SURE_SIGN, API_SURE_BUY } from '@/constants/api'
+import { formatDate } from "@/utils/chatDate";
+import { API_SURE_CHIP, API_BUILDING_HOUSE_TYPE, API_SURE_SIGN, API_SURE_BUY, API_CUSTOMER_DETAILINFO } from '@/constants/api'
 import './index.scss'
 
 export default withLayout((props) => {
@@ -13,13 +14,13 @@ export default withLayout((props) => {
   const { router } = props
   const { name, buildingId, type, id, channelId } = router.params
 
-  const RenChouData = {
+  const [RenChouData, setRenChouData] = useState({
     name,
     realtyConsultant: '',
     remark: '',
-  }
+  })
 
-  const QianYueData = {
+  const [QianYueData, setQianYueData] = useState({
     name,
     realtyConsultant: '',
     remark: '',
@@ -29,7 +30,7 @@ export default withLayout((props) => {
     houseType: '',
     price: '',
     successDate: '',
-  }
+  })
 
   const [FormData, setFormData] = useState({ ...RenChouData })
 
@@ -48,12 +49,6 @@ export default withLayout((props) => {
 
   const [CurrentRoomTypeId, setCurrentRoomTypeId] = useState(null)
 
-  useEffect(() => {
-    if (channelId !== null && channelId !== 'null') {
-
-    }
-  }, [])
-
   useEffect(() => {
     if (buildingId) {
       const params = {
@@ -68,6 +63,32 @@ export default withLayout((props) => {
     }
   }, [buildingId])
 
+  useEffect(() => {
+    fetch({ url: `${API_CUSTOMER_DETAILINFO}/${id}`, method: 'get' }).then((res) => {
+      if(CurrentStatusId - 0 === 3) {
+        setFormData({ ...FormData, ...res?.customerPreparatory })
+      }
+      setRenChouData({ ...RenChouData, ...res?.customerPreparatory })
+      if((res.customerSignatory || []).length) {
+        let customerSignatory = res.customerSignatory[0]
+        customerSignatory.dividendsPer = customerSignatory.dividendsName.substring(customerSignatory.dividendsName.indexOf('|') + 1, customerSignatory.dividendsName.indexOf('%'))
+        customerSignatory.dividendsName = customerSignatory.dividendsName.substring(0, customerSignatory.dividendsName.indexOf('|'))
+        setQianYueData({...QianYueData, ...customerSignatory})
+        HouseTypeList.map((item) => {
+          if(item.apartmentId === res.customerSignatory[0].houseType) {
+            setCurrentRoomTypeId(item.apartmentId)
+          }
+        })
+        setSuccessDate(res.customerSignatory[0].successDate.substring(0, 10))
+      }
+      ConsultantList.map((item) => {
+        if(item.id === res.customerPreparatory.realtyConsultant) {
+          setCurrnetConsultant(item)
+        }
+      })
+    })
+  }, [ConsultantList, HouseTypeList])
+
   useEffect(() => {
     if (CurrentStatusId - 0 !== 3 && buildingId) {
       fetch({ url: `${API_BUILDING_HOUSE_TYPE}?buildingId=${buildingId}&pageSize=${500}`, method: 'get' }).then((res) => {
@@ -76,14 +97,18 @@ export default withLayout((props) => {
     }
   }, [CurrentStatusId, buildingId])
 
+  useEffect(() => {
+    console.log(FormData)
+  }, [FormData])
+
   const CutStatus = (item) => {
     return () => {
       setCurrentStatusId(item.id)
-      if (item.id === 3) {
+      if (item.id - 0 === 3) {
         setFormData({ ...RenChouData })
-      } else if (item.id === 4) {
+      } else if (item.id - 0 === 4) {
         setFormData({ ...QianYueData })
-      } else if (item.id === 5) {
+      } else if (item.id - 0 === 5) {
         setFormData({ ...QianYueData })
       }
     }
@@ -101,12 +126,9 @@ export default withLayout((props) => {
   const InputChange = (key, e) => {
     let resData = { ...FormData }
     resData[key] = e.detail.value
-    console.log('---------resData---------', resData)
     setFormData({ ...resData })
   }
 
-  console.log('---------FormData---------', FormData)
-
   const PickerChange = (key, e) => {
     let resData = { ...FormData }
     if (key === 'realtyConsultant') {
@@ -134,7 +156,6 @@ export default withLayout((props) => {
   }
 
   const ToSubmit = () => {
-    // if (!CheckForm()) return false
     if (CurrentStatusId === 3) {
       fetch({ url: API_SURE_CHIP, method: 'put', payload: { customerId: id, customerPreparatory: { ...FormData, channelId: channelId === 'null' || channelId === null ? '' : channelId } } }).then(() => {
         Taro.showToast({ title: '修改成功', icon: 'none', duration: 2000 })
@@ -176,7 +197,7 @@ export default withLayout((props) => {
   const SuccessDateChange = (e) => {
     let resData = { ...FormData }
     resData.successDate = new Date(e.detail.value)
-    setFormData(resData.successDate)
+    setFormData(resData)
     setSuccessDate(e.detail.value)
   }
 
@@ -233,10 +254,10 @@ export default withLayout((props) => {
               <text className='required'>业绩分成人|占比/%</text>
               <view className='FormLine flex-h'>
                 <view className='flex-item'>
-                  <Input placeholder='请输入业绩分成人' onInput={InputChange.bind(this, 'dividendsName')}></Input>
+                  <Input placeholder='请输入业绩分成人' value={FormData.dividendsName} onInput={InputChange.bind(this, 'dividendsName')}></Input>
                 </view>
                 <view className='flex-item'>
-                  <Input placeholder='请输入占比%' type='number' onInput={InputChange.bind(this, 'dividendsPer')}></Input>
+                  <Input placeholder='请输入占比%' value={FormData.dividendsPer} type='number' onInput={InputChange.bind(this, 'dividendsPer')}></Input>
                 </view>
               </view>
             </Block>
@@ -272,7 +293,7 @@ export default withLayout((props) => {
               <text className='required'>房号</text>
               <view className='FormLine flex-h'>
                 <view className='flex-item'>
-                  <Input placeholder='请输入房号' onInput={InputChange.bind(this, 'houseInfo')}></Input>
+                  <Input placeholder='请输入房号' value={FormData.houseInfo} onInput={InputChange.bind(this, 'houseInfo')}></Input>
                 </view>
               </view>
             </Block>
@@ -284,7 +305,7 @@ export default withLayout((props) => {
               <text className='required'>签约日期</text>
               <view className='FormLine flex-h'>
                 <view className='flex-item'>
-                  <Picker mode='date' value={null} onChange={SuccessDateChange}>{SuccessDate || '请选择开始日期'}</Picker>
+                  <Picker mode='date' value={FormData.successDate} onChange={SuccessDateChange}>{SuccessDate || '请选择开始日期'}</Picker>
                 </view>
                 <text className='iconfont icon-jiantoudown'></text>
               </view>
@@ -297,7 +318,7 @@ export default withLayout((props) => {
               <text className='required'>成交金额</text>
               <view className='FormLine flex-h'>
                 <view className='flex-item'>
-                  <Input placeholder='请输入金额' onInput={InputChange.bind(this, 'price')}></Input>
+                  <Input placeholder='请输入金额' value={FormData.price} onInput={InputChange.bind(this, 'price')}></Input>
                 </view>
               </view>
             </Block>

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({