信息修改

src/pages/index/activityDetail/CountDown.jsx

@@ -1,4 +1,4 @@
-import React from 'react'
+
 import useCountDown from '@/utils/hooks/useCountDown'
 
 export default (props) => {
@@ -8,13 +8,13 @@ export default (props) => {
   return (
     <view className='CountDown'>
       <text>距离报名结束还有</text>
-      <text className='Red'>{CountDown[1]||0}</text>
+      <text className='Red'>{CountDown[1] - 0 > 0 ? CountDown[1] : 0}</text>
       <text>天</text>
-      <text className='Number' style={{ marginLeft: '40rpx' }}>{CountDown[2]||0}</text>
+      <text className='Number' style={{ marginLeft: '40rpx' }}>{CountDown[2] - 0 > 0 ? CountDown[2] : 0}</text>
       <text className='active'>时</text>
-      <text className='Number'>{CountDown[3]||0}</text>
+      <text className='Number'>{CountDown[3] - 0 > 0 ? CountDown[3] : 0}</text>
       <text className='active'>分</text>
-      <text className='Number'>{CountDown[4]||0}</text>
+      <text className='Number'>{CountDown[4] - 0 > 0 ? CountDown[4] : 0}</text>
       <text className='active'>秒</text>
     </view>
   )

src/pages/index/buildingList/components/FilterForArea/index.jsx

@@ -6,14 +6,14 @@ export default function FilterForArea (props) {
   const { change = () => {}, defaultValue = '-' } = props
   const [AreaList] = useState([
     {name: '不限', id: '-'},
-    {name: '50㎡以下', id: '0-50'},
-    {name: '50-70㎡', id: '50-70'},
-    {name: '70-90㎡', id: '70-90'},
-    {name: '90-110㎡', id: '90-110'},
-    {name: '110-130㎡', id: '110-130'},
-    {name: '130-150㎡', id: '130-150'},
-    {name: '150-200㎡', id: '150-200'},
-    {name: '200㎡以上', id: '200-'},
+    {name: '60㎡以下', id: '0-60'},
+    {name: '60-85㎡', id: '60-85'},
+    {name: '85-100㎡', id: '85-100'},
+    {name: '100-125㎡', id: '100-125'},
+    {name: '125-145㎡', id: '125-145'},
+    {name: '145-180㎡', id: '145-180'},
+    {name: '180-220㎡', id: '180-220'},
+    {name: '220㎡以上', id: '220-'},
   ])
   const [CurrentId, setCurrentId] = useState(defaultValue)
 

src/pages/index/buildingList/components/FilterForPrice/index.jsx

@@ -1,4 +1,5 @@
 import { useState } from 'react'
+import { ScrollView } from '@tarojs/components'
 import './index.scss'
 
 export default function FilterForPrice (props) {
@@ -11,23 +12,38 @@ export default function FilterForPrice (props) {
   const [CurrentTypeId, setCurrentTypeId] = useState(priceType || 'average')
   const [AverageList] = useState([
     { name: '不限', id: '-' },
-    { name: '10000/㎡以下', id: '0-10000' },
-    { name: '10000-20000元/㎡', id: '10000-20000' },
-    { name: '20000-30000元/㎡', id: '20000-30000' },
-    { name: '30000-50000元/㎡', id: '30000-50000' },
-    { name: '50000-70000元/㎡', id: '50000-70000' },
-    { name: '70000-100000元/㎡', id: '70000-100000' },
+    { name: '5000/㎡以下', id: '0-5000' },
+    { name: '5000-10000元/㎡', id: '5000-10000' },
+    { name: '10000-15000元/㎡', id: '10000-15000' },
+    { name: '15000-20000元/㎡', id: '15000-20000' },
+    { name: '20000-25000元/㎡', id: '20000-25000' },
+    { name: '25000-30000元/㎡', id: '25000-30000' },
+    { name: '30000-35000元/㎡', id: '30000-35000' },
+    { name: '35000-40000元/㎡', id: '35000-40000' },
+    { name: '40000-50000元/㎡', id: '40000-50000' },
+    { name: '50000-60000元/㎡', id: '50000-60000' },
+    { name: '60000-80000元/㎡', id: '60000-80000' },
+    { name: '80000-100000元/㎡', id: '80000-100000' },
     { name: '100000元/㎡以上', id: '100000-' },
   ])
   const [TotalList] = useState([
     { name: '不限', id: '-' },
-    { name: '100万以下', id: '0-100' },
+    { name: '50万以下', id: '0-50' },
+    { name: '50-100万', id: '50-100' },
     { name: '100-150万', id: '100-150' },
     { name: '150-200万', id: '150-200' },
     { name: '200-250万', id: '200-250' },
-    { name: '250-500万', id: '250-500' },
-    { name: '500-1000万', id: '500-1000' },
-    { name: '1000万以上', id: '1000-' },
+    { name: '250-300万', id: '250-300' },
+    { name: '300-400万', id: '300-400' },
+    { name: '400-500万', id: '400-500' },
+    { name: '500-600万', id: '500-600' },
+    { name: '600-700万', id: '600-700' },
+    { name: '700-800万', id: '700-800' },
+    { name: '800-900万', id: '800-900' },
+    { name: '900-1000万', id: '900-1000' },
+    { name: '1000-1200万', id: '1000-1200' },
+    { name: '1200-1500万', id: '1200-1500' },
+    { name: '1500万以上', id: '1500-' },
   ])
   const [CurrentId, setCurrentId] = useState(price || '-')
 
@@ -54,45 +70,48 @@ export default function FilterForPrice (props) {
         }
       </view>
       <view className='flex-item'>
+        <ScrollView scroll-y>
 
-        {/* 单价 */}
-        {
-          CurrentTypeId === 'average' &&
-          <view>
-            {
-              AverageList.map((item, index) => (
-                <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutPrice(item.id)}>
-                  <text>{item.name}</text>
-                  <view className='flex-item'></view>
-                  {
-                    CurrentId === item.id &&
-                    <text className='iconfont icon-gou1'></text>
-                  }
-                </view>
-              ))
-            }
-          </view>
-        }
 
-        {/* 总价 */}
-        {
-          CurrentTypeId === 'total' &&
-          <view>
-            {
-              TotalList.map((item, index) => (
-                <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutPrice(item.id)}>
-                  <text>{item.name}</text>
-                  <view className='flex-item'></view>
-                  {
-                    CurrentId === item.id &&
-                    <text className='iconfont icon-gou1'></text>
-                  }
-                </view>
-              ))
-            }
-          </view>
-        }
+          {/* 单价 */}
+          {
+            CurrentTypeId === 'average' &&
+            <view className='ListContent'>
+              {
+                AverageList.map((item, index) => (
+                  <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutPrice(item.id)}>
+                    <text>{item.name}</text>
+                    <view className='flex-item'></view>
+                    {
+                      CurrentId === item.id &&
+                      <text className='iconfont icon-gou1'></text>
+                    }
+                  </view>
+                ))
+              }
+            </view>
+          }
+
+          {/* 总价 */}
+          {
+            CurrentTypeId === 'total' &&
+            <view className='ListContent'>
+              {
+                TotalList.map((item, index) => (
+                  <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutPrice(item.id)}>
+                    <text>{item.name}</text>
+                    <view className='flex-item'></view>
+                    {
+                      CurrentId === item.id &&
+                      <text className='iconfont icon-gou1'></text>
+                    }
+                  </view>
+                ))
+              }
+            </view>
+          }
 
+        </ScrollView>
       </view>
     </view>
   )

src/pages/index/buildingList/components/FilterForPrice/index.scss

@@ -21,24 +21,31 @@
   }
   >.flex-item {
     border-left: 2px solid rgba(0, 0, 0, 0.08);
-    >view {
-      >view {
+    >scroll-view {
+      width: 100%;
+      height: 600px;
+      position: relative;
+      .ListContent {
         position: relative;
         overflow: hidden;
-        border-bottom: 2px solid rgba(0, 0, 0, 0.08);
-        align-items: center;
-        &.active {
-          >text {
-            color: #193C83;
-            &:first-child {
-              font-weight: bold;
+        >view {
+          position: relative;
+          overflow: hidden;
+          border-bottom: 2px solid rgba(0, 0, 0, 0.08);
+          align-items: center;
+          &.active {
+            >text {
+              color: #193C83;
+              &:first-child {
+                font-weight: bold;
+              }
             }
           }
-        }
-        >text {
-          font-size: 28px;
-          line-height: 80px;
-          text-indent: 30px;
+          >text {
+            font-size: 28px;
+            line-height: 80px;
+            text-indent: 30px;
+          }
         }
       }
     }

src/pages/index/index.jsx

@@ -49,7 +49,7 @@ export default withLayout((props) => {
   }
 
   const GetProjectList = () => { // 获取项目列表
-    fetch({ url: API_INDEX_PROJECTS, method: 'get', payload: { cityId: city.id, pageNum: 1, pageSize: 10 } }).then((res) => {
+    fetch({ url: API_INDEX_PROJECTS, method: 'get', payload: { cityId: city.id, pageNum: 1, pageSize: 20 } }).then((res) => {
       setProjectList(res.records || [])
     })
   }

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

@@ -12,14 +12,14 @@ export default (props) => {
   const [dicts, setDicts] = useState([])
 
   useEffect(() => {
-    if (type === ROLE_CODE.CUSTOMER) {
-      fetch({ url: API_ITEMS_LIST, payload: { pageNumber: 1, pageSize: 1000, cityId: city.curCity.id } }).then((res) => {
-        setDicts(res.records || [])
-      })
-    } else {
+    if (type !== ROLE_CODE.CUSTOMER && type !== ROLE_CODE.DRIFT) {
       fetch({ url: API_GET_AGENT_BUILDINGS }).then((res) => {
         setDicts(res || [])
       })
+    } else {
+      fetch({ url: API_ITEMS_LIST, payload: { pageNumber: 1, pageSize: 1000, cityId: city.curCity.id } }).then((res) => {
+        setDicts(res.records || [])
+      })
     }
   }, [])
 

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

@@ -29,7 +29,7 @@ export default function MyCourseListItem (props) {
             <view></view>
             <view></view> */}
           </view>
-          <text>{Data.lookNum}人查看</text>
+          <text>{Data.lookNum || 0}人查看</text>
         </view>
       </view>
     </view>

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

@@ -23,6 +23,7 @@
         >.flex-h {
           position: relative;
           overflow: hidden;
+          align-items: flex-start;
           &:first-child {
             >.Line {
               >view {
@@ -57,6 +58,7 @@
               line-height: 40px;
               transform: translateY(-6px);
               -webkit-transform: translateY(-6px);
+              word-break: break-all;
               &.active {
                 font-weight: bold;
               }

src/pages/mine/customerDetail/index.jsx

@@ -48,7 +48,7 @@ export default withLayout((props) => {
   }
 
   const FollowInput = (e) => {
-    setFollowContent(e.detail.value.substring(0, 10))
+    setFollowContent(e.detail.value.substring(0, 150))
   }
 
   const SaveFollow = () => {

src/pages/mine/index.jsx

@@ -86,8 +86,8 @@ export default withLayout(() => {
                       </view>
                     </view>
                     <text className='Role'>{UserRole === 1 ? '客户' : UserRole === 2 ? '合伙人' : UserRole === 3 ? '置业顾问' : '驻场管理'}</text>
-                    <text className='New'>NEW</text>
-                    <text className='iconfont icon-diqiu'></text>
+                    {/* <text className='New'>NEW</text> */}
+                    <Image mode='heightFix' src={require('@/assets/mine-icon35.png')} className='New'></Image>
                   </view>
                 </view>
               </view>

src/pages/mine/index.scss

@@ -97,14 +97,13 @@
                 z-index: 3;
               }
               > .New {
-                font-size: 90px;
-                font-weight: bold;
-                color: rgba(255, 255, 255, 0.1);
-                display: inline-block;
+                display: block;
                 position: absolute;
+                height: 140px;
                 z-index: 1;
-                right: 30px;
-                top: 30px;
+                left: 30px;
+                bottom: 40px;
+                opacity: 0.2;
               }
               > .iconfont {
                 font-size: 200px;
@@ -112,8 +111,6 @@
                 display: inline-block;
                 position: absolute;
                 z-index: 1;
-                left: 30px;
-                top: 10px;
               }
             }
           }

src/subpackages/pages/channel/partnerChannel/index.jsx

@@ -81,7 +81,7 @@ export default withLayout((props) => {
               <view className='flex-item'>
                 <Image mode='heightFix' src={require('@/assets/mine-icon21.png')}></Image>
                 <view className='Icon'>
-                  <Image mode='aspectFill' src={tp2.avatarurl}></Image>
+                  <Image mode='aspectFill' src={tp2.avatarurl} style={{width: '100%', height: '100%'}}></Image>
                 </view>
                 <view className='Index'>
                   <text>{tp2.name||'暂无'}</text>
@@ -97,7 +97,7 @@ export default withLayout((props) => {
               <view className='flex-item active'>
                 <Image mode='heightFix' src={require('@/assets/mine-icon20.png')}></Image>
                 <view className='Icon'>
-                  <Image mode='aspectFill' src={tp1.avatarurl}></Image>
+                  <Image mode='aspectFill' src={tp1.avatarurl} style={{width: '100%', height: '100%'}}></Image>
                 </view>
                 <view className='Index'>
                   <text>{tp1.name||'暂无'}</text>
@@ -113,7 +113,7 @@ export default withLayout((props) => {
               <view className='flex-item'>
                 <Image mode='heightFix' src={require('@/assets/mine-icon22.png')}></Image>
                 <view className='Icon'>
-                  <Image mode='aspectFill' src={tp3.avatarurl}></Image>
+                  <Image mode='aspectFill' src={tp3.avatarurl} style={{width: '100%', height: '100%'}}></Image>
                 </view>
                 <view className='Index'>
                   <text>{tp3.name||'暂无'}</text>

src/subpackages/pages/channel/partnerChannel/index.scss

@@ -48,7 +48,13 @@
                 >.Icon {
                   width: 120px;
                   height: 120px;
+                  position: relative;
+                  overflow: hidden;
                   margin-top: 24px;
+                  >image {
+                    width: 100%;
+                    height: 100%;
+                  }
                 }
                 >.Index {
                   margin-top: 20px;
@@ -78,6 +84,10 @@
                 border-radius: 100%;
                 background: #eee;
                 margin: 34px auto 0;
+                >image {
+                  width: 100%;
+                  height: 100%;
+                }
               }
               >.Index {
                 width: 148px;

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

@@ -16,9 +16,7 @@ export default withLayout((props) => {
   const { router, trackData } = props
   const { id } = router.params
   
-  const [IsPull, setPull] = useState(false)
   const [ShowPopup, setShowPopup] = useState(false)
-  const [PullTimer, setPullTimer] = useState(null)
   const [UserInfo, setUserInfo] = useState({})
   const [BuildingInfo, setBuildingInfo] = useState({})
   const [LikeNum, setLikeNum] = useState(0)
@@ -83,22 +81,9 @@ export default withLayout((props) => {
     })
   }
 
-  const PageRefresh = () => { // 页面下拉刷新回调
-    setPull(true)
-  }
-
-  useEffect(() => { // 下拉刷新触发
-    if (IsPull) {
-      clearTimeout(PullTimer)
-      setPullTimer(setTimeout(() => {
-        setPull(false)
-      }, 2000))
-    }
-  }, [IsPull])
-
   return (
     <view className='Page myHomepage'>
-      <ScrollView scrollY refresherEnabled refresherTriggered={IsPull} refresherDefaultStyle='black' refresherBackground='#fff' onRefresherRefresh={PageRefresh}>
+      <ScrollView scrollY>
         <view className='PageContent'>
 
           <view className='Card UserInfo'>