静态页面

src/components/ProjectItemCard/index.jsx

@@ -42,7 +42,7 @@ export default (props) => {
       <view className='Views flex-h' onClick={() => goto(Data)}>
         <view className='flex-item'>
           <text className='iconfont icon-fenxiang'></text>
-          <text>{`${Data.shareList?.total || 0} 次分享`}</text>
+          <text>{`${Data.shareList?.total || 199} 次分享`}</text>
         </view>
         {
           (Data.uvList?.length || 0) > 0 && (
@@ -57,7 +57,7 @@ export default (props) => {
             </view>
           )
         }
-        <text>{`...${Data.uvList?.length || 0}人围观`}</text>
+        <text>{`...${Data.uvList?.length || 199}人围观`}</text>
       </view>
       {props.children}
     </view>

src/components/ShareModal/index.jsx

@@ -4,7 +4,7 @@ import { Button } from '@tarojs/components'
 import './style.scss'
 
 export default (props) => {
-  const { visible = false } = props
+  const { visible = false, Cancel = () => {} } = props
 
   const shareTimeline = () => {
     Taro.showToast({
@@ -29,7 +29,7 @@ export default (props) => {
               <text>好友或群</text>
             </Button>
           </view>
-          <text>取消</text>
+          <text onClick={Cancel}>取消</text>
         </view>
       </view>
     </view>

src/pages/index/activityDetail/index.jsx

@@ -12,6 +12,7 @@ import {
   Button
 } from '@tarojs/components';
 import Disclaimer from '@/components/Disclaimer';
+import ShareToCircle from '@/components/ShareToCircle'
 import { useSelector } from 'react-redux';
 import {
   signupActivity,
@@ -63,6 +64,8 @@ export default withLayout((props) => {
   const [selectorChecked, setSelectorChecked] = useState('1');
   const [selector, setSelector] = useState('');
 
+  const [ShowShareLayer, setShowShareLayer] = useState(false)
+
   const buildingId = detail?.buildingId;
 
   const [btnText, btnDisabled] = useStatus(detail)
@@ -201,8 +204,8 @@ export default withLayout((props) => {
             <view className='flex-item'>
               <text>{detail.address}</text>
             </view>
-            <text className='Price'>{detail.groupBuyPrice || '价格待定'}</text>
           </view>
+          <text className='Price'>{detail.groupBuyPrice || '价格待定'}</text>
           <text className='Time'>时间：{formatDate(detail.startDate, 'yyyy/M/d')} - {formatDate(detail.endDate, 'yyyy/M/d')}</text>
         </view>
         <view className='Option'>
@@ -211,8 +214,8 @@ export default withLayout((props) => {
             <text>分享</text>
             <Button open-type='share' className='ShareBtn'>分享</Button>
           </view>
-          <view>
-            <text className='iconfont icon-pengyouquan1'></text>
+          <view onClick={() => { setShowShareLayer(true) }}>
+            <text className='iconfont icon-pengyouquan1' style='font-size: 32rpx'></text>
             <text>朋友圈</text>
           </view>
         </view>
@@ -239,6 +242,7 @@ export default withLayout((props) => {
     <>
       {detail && (
         <view className='Page activityDetail flex-v'>
+          <ShareToCircle visible={ShowShareLayer} close={() => { setShowShareLayer(false) }}></ShareToCircle>
           <view className='flex-item'>
             <view>
               <ScrollView scroll-y>

src/pages/index/activityDetail/index.scss

@@ -68,13 +68,14 @@
                       line-height: 1.1;
                     }
                   }
-                  >.Price {
-                    font-size: 26px;
-                    font-weight: bold;
-                    color: #FF0000;
-                    margin-left: 30px;
-                    line-height: 1.1;
-                  }
+                }
+                >.Price {
+                  font-size: 26px;
+                  font-weight: bold;
+                  color: #FF0000;
+                  line-height: 1.1;
+                  display: block;
+                  margin-top: 10px;
                 }
                 >.Time {
                   display: block;

src/pages/index/addedValueService/formData.js

@@ -55,7 +55,7 @@ const questions = [
     question: '你较为看重家装的哪些方面？',
     key: 'important',
     type: 'checkboxs',
-    result: '',
+    result: [],
     resultId: null,
     options: [
       { name: '家装价格', id: 1, selected: false },
@@ -70,7 +70,7 @@ const questions = [
     question: '你理想的家装风格是哪些？',
     key: 'style',
     type: 'checkboxs',
-    result: '',
+    result: [],
     resultId: null,
     options: [
       { name: '北欧风格', id: 1, selected: false },
@@ -90,7 +90,7 @@ const questions = [
     question: '你最关键的家装诉求是什么？',
     key: 'mostImportant',
     type: 'checkboxs',
-    result: '',
+    result: [],
     resultId: null,
     options: [
       { name: '设计凸显个性', id: 1, selected: false },
@@ -106,7 +106,7 @@ const questions = [
     question: '你理想中的家应该包含哪些特殊功能区域？',
     key: 'special',
     type: 'checkboxs',
-    result: '',
+    result: [],
     resultId: null,
     options: [
       { name: '衣帽间', id: 1, selected: false },

src/pages/index/findHouseFromMap/index.jsx

@@ -178,7 +178,7 @@ export default withLayout((props) => {
             <view className='Views flex-h'>
               <view className='flex-item'>
                 <text className='iconfont icon-fenxiang'></text>
-                <text>{`${current.shareNum || 0}次分享`}</text>
+                <text>{`${current.shareNum || 199}次分享`}</text>
               </view>
               <view className='Icons'>
                 {
@@ -189,7 +189,7 @@ export default withLayout((props) => {
                   ))
                 }
               </view>
-              <text>{(current.uvList?.records || []).length > 0 ? '...' : ''}{`${current.pvNum}人围观`}</text>
+              <text>{(current.uvList?.records || []).length > 0 ? '...' : ''}{`${current.pvNum || 199}人围观`}</text>
             </view>
           </view>
         </view>

src/pages/index/specialPriceHouse/index.jsx

@@ -122,7 +122,7 @@ export default withLayout((props) => {
                       <view className='Views flex-h' onClick={() => goto(item)}>
                         <view className='flex-item'>
                           <text className='iconfont icon-fenxiang'></text>
-                          <text>{`${shareNum} 次分享`}</text>
+                          <text>{`${shareNum || 199} 次分享`}</text>
                         </view>
                         {
                           uvNum > 0 && (
@@ -137,7 +137,7 @@ export default withLayout((props) => {
                             </view>
                           )
                         }
-                        <text>{`...${uvNum}人围观`}</text>
+                        <text>{`...${uvNum || 199}人围观`}</text>
                       </view>
                       <view className='SpecialList'>
                         <ScrollView scrollX>

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

@@ -28,7 +28,7 @@ export default function UserDetailFollowRecord (props) {
 
   const GetPageList = () => {
     setHasNextPage(false)
-    fetch({ url: API_FOLLOW_LIST, method: 'get', payload: { pageNumber, pageSize: 10, customerId: CustomerId } }).then((res) => {
+    fetch({ url: API_FOLLOW_LIST, method: 'get', payload: { pageNumber, pageSize: 10, customerId: CustomerId, recordType: '跟进' } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)

src/pages/mine/customerDetail/index.jsx

@@ -33,9 +33,7 @@ export default withLayout((props) => {
 
   const UpdateCustomerInfo = () => {
     fetch({ url: `${API_GET_CUSTOMER_INFO}/${CustomerId}` }).then((res) => {
-      if (res) {
-        setCustomerInfo(res)
-      }
+      setCustomerInfo(res || {})
     })
   }
 

src/pages/mine/index.jsx

@@ -30,7 +30,7 @@ export default withLayout(() => {
     setShowLogin(false)
     if (user?.userInfo?.person?.personId) {
       const person = user.userInfo.person
-      setUserRole(person.personType === ROLE_CODE.CUSTOMER ? 1 : person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : 4)
+      setUserRole(person.personType === ROLE_CODE.CUSTOMER || person.personType === ROLE_CODE.DRIFT ? 1 : person.personType === ROLE_CODE.CHANNEL_AGENT ? 2 : person.personType === ROLE_CODE.CONSULTANT ? 3 : 4)
     }
   }, [user])
 

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

@@ -5,14 +5,15 @@ import { ScrollView, Image } 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_QUERY_USERINFO_BYID } from '@/constants/api'
+import { API_AGENT_CURRENT, 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'
 import './index.scss'
 
 export default withLayout((props) => {
 
-  const { router } = props
+  const { router, trackData } = props
   const { id } = router.params
   
   const [IsPull, setPull] = useState(false)
@@ -24,10 +25,15 @@ export default withLayout((props) => {
   const user = useSelector(state => state.user)
   const [PersonId, setPersonId] = useState(null)
 
+  const [isSave, handleFavor] = useLike(BuildingInfo?.isSave, {
+    id,
+    ...trackData,
+  });
+
   useEffect(() => {
     if (PersonId !== user.userInfo.person.personId) {
       if(id) {
-        fetch({ url: `${API_QUERY_USERINFO_BYID}/${id}`, method: 'get' }).then((res) => {
+        fetch({ url: `${API_CARDS_LIST}/${id}`, method: 'get' }).then((res) => {
           setUserInfo(res)
         })
       } else {
@@ -93,8 +99,8 @@ export default withLayout((props) => {
                   <view className='flex-item'>
                     <text>{UserInfo.nickname} {UserInfo.phone}</text>
                   </view>
-                  <text className='iconfont icon-dianzan'></text>
-                  <text onClick={Liked}>{UserInfo.likeNum || 0}赞</text>
+                  <text onClick={handleFavor} className='iconfont icon-dianzan' style={isSave ? { color: 'red' } : undefined}></text>
+                  <text onClick={handleFavor}>{UserInfo.likeNum || 0}{isSave ? `已点赞` : '赞'}</text>
                 </view>
                 <view className='Tag'>
                   <view>
@@ -149,13 +155,19 @@ export default withLayout((props) => {
                 <text>{UserInfo.address || '暂无地址'}</text>
               </view>
             </view>
+            <view className='flex-h'>
+              <text>简介：</text>
+              <view className='flex-item'>
+                <text className='active'>{UserInfo.description || '暂无简介'}</text>
+              </view>
+            </view>
             <view className='Btn'>
               <text>分享主页</text>
             </view>
           </view>
 
           {
-            BuildingInfo.buildingId &&
+            !!BuildingInfo.buildingId &&
             <view className='ProjectList'>
               <view className='flex-h'>
                 <view className='flex-item'>
@@ -165,7 +177,7 @@ export default withLayout((props) => {
                 <text className='iconfont icon-jiantouright'></text>
               </view>
               <view className='List'>
-                <ProjectListItem data={BuildingInfo}></ProjectListItem>
+                <ProjectListItem Data={BuildingInfo}></ProjectListItem>
               </view>
             </view>
           }

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

@@ -177,7 +177,7 @@
             font-weight: bold;
           }
           > .flex-h {
-            align-items: center;
+            align-items: flex-start;
             margin-top: 30px;
             > text {
               font-size: 30px;
@@ -199,6 +199,11 @@
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
+                &.active {
+                  white-space: normal;
+                  text-overflow: initial;
+                  word-break: break-all;
+                }
               }
             }
           }