Browse Source

信息修改

1002884655 3 years ago
parent
commit
b8a73687fd

BIN
src/assets/logo.png View File


BIN
src/assets/mine-icon35.png View File


+ 5
- 5
src/pages/index/activityDetail/CountDown.jsx View File

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

+ 8
- 8
src/pages/index/buildingList/components/FilterForArea/index.jsx View File

6
   const { change = () => {}, defaultValue = '-' } = props
6
   const { change = () => {}, defaultValue = '-' } = props
7
   const [AreaList] = useState([
7
   const [AreaList] = useState([
8
     {name: '不限', id: '-'},
8
     {name: '不限', id: '-'},
9
-    {name: '50㎡以下', id: '0-50'},
10
-    {name: '50-70㎡', id: '50-70'},
11
-    {name: '70-90㎡', id: '70-90'},
12
-    {name: '90-110㎡', id: '90-110'},
13
-    {name: '110-130㎡', id: '110-130'},
14
-    {name: '130-150㎡', id: '130-150'},
15
-    {name: '150-200㎡', id: '150-200'},
16
-    {name: '200㎡以上', id: '200-'},
9
+    {name: '60㎡以下', id: '0-60'},
10
+    {name: '60-85㎡', id: '60-85'},
11
+    {name: '85-100㎡', id: '85-100'},
12
+    {name: '100-125㎡', id: '100-125'},
13
+    {name: '125-145㎡', id: '125-145'},
14
+    {name: '145-180㎡', id: '145-180'},
15
+    {name: '180-220㎡', id: '180-220'},
16
+    {name: '220㎡以上', id: '220-'},
17
   ])
17
   ])
18
   const [CurrentId, setCurrentId] = useState(defaultValue)
18
   const [CurrentId, setCurrentId] = useState(defaultValue)
19
 
19
 

+ 65
- 46
src/pages/index/buildingList/components/FilterForPrice/index.jsx View File

1
 import { useState } from 'react'
1
 import { useState } from 'react'
2
+import { ScrollView } from '@tarojs/components'
2
 import './index.scss'
3
 import './index.scss'
3
 
4
 
4
 export default function FilterForPrice (props) {
5
 export default function FilterForPrice (props) {
11
   const [CurrentTypeId, setCurrentTypeId] = useState(priceType || 'average')
12
   const [CurrentTypeId, setCurrentTypeId] = useState(priceType || 'average')
12
   const [AverageList] = useState([
13
   const [AverageList] = useState([
13
     { name: '不限', id: '-' },
14
     { name: '不限', id: '-' },
14
-    { name: '10000/㎡以下', id: '0-10000' },
15
-    { name: '10000-20000元/㎡', id: '10000-20000' },
16
-    { name: '20000-30000元/㎡', id: '20000-30000' },
17
-    { name: '30000-50000元/㎡', id: '30000-50000' },
18
-    { name: '50000-70000元/㎡', id: '50000-70000' },
19
-    { name: '70000-100000元/㎡', id: '70000-100000' },
15
+    { name: '5000/㎡以下', id: '0-5000' },
16
+    { name: '5000-10000元/㎡', id: '5000-10000' },
17
+    { name: '10000-15000元/㎡', id: '10000-15000' },
18
+    { name: '15000-20000元/㎡', id: '15000-20000' },
19
+    { name: '20000-25000元/㎡', id: '20000-25000' },
20
+    { name: '25000-30000元/㎡', id: '25000-30000' },
21
+    { name: '30000-35000元/㎡', id: '30000-35000' },
22
+    { name: '35000-40000元/㎡', id: '35000-40000' },
23
+    { name: '40000-50000元/㎡', id: '40000-50000' },
24
+    { name: '50000-60000元/㎡', id: '50000-60000' },
25
+    { name: '60000-80000元/㎡', id: '60000-80000' },
26
+    { name: '80000-100000元/㎡', id: '80000-100000' },
20
     { name: '100000元/㎡以上', id: '100000-' },
27
     { name: '100000元/㎡以上', id: '100000-' },
21
   ])
28
   ])
22
   const [TotalList] = useState([
29
   const [TotalList] = useState([
23
     { name: '不限', id: '-' },
30
     { name: '不限', id: '-' },
24
-    { name: '100万以下', id: '0-100' },
31
+    { name: '50万以下', id: '0-50' },
32
+    { name: '50-100万', id: '50-100' },
25
     { name: '100-150万', id: '100-150' },
33
     { name: '100-150万', id: '100-150' },
26
     { name: '150-200万', id: '150-200' },
34
     { name: '150-200万', id: '150-200' },
27
     { name: '200-250万', id: '200-250' },
35
     { name: '200-250万', id: '200-250' },
28
-    { name: '250-500万', id: '250-500' },
29
-    { name: '500-1000万', id: '500-1000' },
30
-    { name: '1000万以上', id: '1000-' },
36
+    { name: '250-300万', id: '250-300' },
37
+    { name: '300-400万', id: '300-400' },
38
+    { name: '400-500万', id: '400-500' },
39
+    { name: '500-600万', id: '500-600' },
40
+    { name: '600-700万', id: '600-700' },
41
+    { name: '700-800万', id: '700-800' },
42
+    { name: '800-900万', id: '800-900' },
43
+    { name: '900-1000万', id: '900-1000' },
44
+    { name: '1000-1200万', id: '1000-1200' },
45
+    { name: '1200-1500万', id: '1200-1500' },
46
+    { name: '1500万以上', id: '1500-' },
31
   ])
47
   ])
32
   const [CurrentId, setCurrentId] = useState(price || '-')
48
   const [CurrentId, setCurrentId] = useState(price || '-')
33
 
49
 
54
         }
70
         }
55
       </view>
71
       </view>
56
       <view className='flex-item'>
72
       <view className='flex-item'>
73
+        <ScrollView scroll-y>
57
 
74
 
58
-        {/* 单价 */}
59
-        {
60
-          CurrentTypeId === 'average' &&
61
-          <view>
62
-            {
63
-              AverageList.map((item, index) => (
64
-                <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutPrice(item.id)}>
65
-                  <text>{item.name}</text>
66
-                  <view className='flex-item'></view>
67
-                  {
68
-                    CurrentId === item.id &&
69
-                    <text className='iconfont icon-gou1'></text>
70
-                  }
71
-                </view>
72
-              ))
73
-            }
74
-          </view>
75
-        }
76
 
75
 
77
-        {/* 总价 */}
78
-        {
79
-          CurrentTypeId === 'total' &&
80
-          <view>
81
-            {
82
-              TotalList.map((item, index) => (
83
-                <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutPrice(item.id)}>
84
-                  <text>{item.name}</text>
85
-                  <view className='flex-item'></view>
86
-                  {
87
-                    CurrentId === item.id &&
88
-                    <text className='iconfont icon-gou1'></text>
89
-                  }
90
-                </view>
91
-              ))
92
-            }
93
-          </view>
94
-        }
76
+          {/* 单价 */}
77
+          {
78
+            CurrentTypeId === 'average' &&
79
+            <view className='ListContent'>
80
+              {
81
+                AverageList.map((item, index) => (
82
+                  <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutPrice(item.id)}>
83
+                    <text>{item.name}</text>
84
+                    <view className='flex-item'></view>
85
+                    {
86
+                      CurrentId === item.id &&
87
+                      <text className='iconfont icon-gou1'></text>
88
+                    }
89
+                  </view>
90
+                ))
91
+              }
92
+            </view>
93
+          }
94
+
95
+          {/* 总价 */}
96
+          {
97
+            CurrentTypeId === 'total' &&
98
+            <view className='ListContent'>
99
+              {
100
+                TotalList.map((item, index) => (
101
+                  <view key={`ListItem${index}`} className={CurrentId === item.id ? 'flex-h active' : 'flex-h'} onClick={CutPrice(item.id)}>
102
+                    <text>{item.name}</text>
103
+                    <view className='flex-item'></view>
104
+                    {
105
+                      CurrentId === item.id &&
106
+                      <text className='iconfont icon-gou1'></text>
107
+                    }
108
+                  </view>
109
+                ))
110
+              }
111
+            </view>
112
+          }
95
 
113
 
114
+        </ScrollView>
96
       </view>
115
       </view>
97
     </view>
116
     </view>
98
   )
117
   )

+ 21
- 14
src/pages/index/buildingList/components/FilterForPrice/index.scss View File

21
   }
21
   }
22
   >.flex-item {
22
   >.flex-item {
23
     border-left: 2px solid rgba(0, 0, 0, 0.08);
23
     border-left: 2px solid rgba(0, 0, 0, 0.08);
24
-    >view {
25
-      >view {
24
+    >scroll-view {
25
+      width: 100%;
26
+      height: 600px;
27
+      position: relative;
28
+      .ListContent {
26
         position: relative;
29
         position: relative;
27
         overflow: hidden;
30
         overflow: hidden;
28
-        border-bottom: 2px solid rgba(0, 0, 0, 0.08);
29
-        align-items: center;
30
-        &.active {
31
-          >text {
32
-            color: #193C83;
33
-            &:first-child {
34
-              font-weight: bold;
31
+        >view {
32
+          position: relative;
33
+          overflow: hidden;
34
+          border-bottom: 2px solid rgba(0, 0, 0, 0.08);
35
+          align-items: center;
36
+          &.active {
37
+            >text {
38
+              color: #193C83;
39
+              &:first-child {
40
+                font-weight: bold;
41
+              }
35
             }
42
             }
36
           }
43
           }
37
-        }
38
-        >text {
39
-          font-size: 28px;
40
-          line-height: 80px;
41
-          text-indent: 30px;
44
+          >text {
45
+            font-size: 28px;
46
+            line-height: 80px;
47
+            text-indent: 30px;
48
+          }
42
         }
49
         }
43
       }
50
       }
44
     }
51
     }

+ 1
- 1
src/pages/index/index.jsx View File

49
   }
49
   }
50
 
50
 
51
   const GetProjectList = () => { // 获取项目列表
51
   const GetProjectList = () => { // 获取项目列表
52
-    fetch({ url: API_INDEX_PROJECTS, method: 'get', payload: { cityId: city.id, pageNum: 1, pageSize: 10 } }).then((res) => {
52
+    fetch({ url: API_INDEX_PROJECTS, method: 'get', payload: { cityId: city.id, pageNum: 1, pageSize: 20 } }).then((res) => {
53
       setProjectList(res.records || [])
53
       setProjectList(res.records || [])
54
     })
54
     })
55
   }
55
   }

+ 5
- 5
src/pages/mine/addCustomer/components/BuildingPicker.jsx View File

12
   const [dicts, setDicts] = useState([])
12
   const [dicts, setDicts] = useState([])
13
 
13
 
14
   useEffect(() => {
14
   useEffect(() => {
15
-    if (type === ROLE_CODE.CUSTOMER) {
16
-      fetch({ url: API_ITEMS_LIST, payload: { pageNumber: 1, pageSize: 1000, cityId: city.curCity.id } }).then((res) => {
17
-        setDicts(res.records || [])
18
-      })
19
-    } else {
15
+    if (type !== ROLE_CODE.CUSTOMER && type !== ROLE_CODE.DRIFT) {
20
       fetch({ url: API_GET_AGENT_BUILDINGS }).then((res) => {
16
       fetch({ url: API_GET_AGENT_BUILDINGS }).then((res) => {
21
         setDicts(res || [])
17
         setDicts(res || [])
22
       })
18
       })
19
+    } else {
20
+      fetch({ url: API_ITEMS_LIST, payload: { pageNumber: 1, pageSize: 1000, cityId: city.curCity.id } }).then((res) => {
21
+        setDicts(res.records || [])
22
+      })
23
     }
23
     }
24
   }, [])
24
   }, [])
25
 
25
 

+ 1
- 1
src/pages/mine/components/MyCourseListItem/index.jsx View File

29
             <view></view>
29
             <view></view>
30
             <view></view> */}
30
             <view></view> */}
31
           </view>
31
           </view>
32
-          <text>{Data.lookNum}人查看</text>
32
+          <text>{Data.lookNum || 0}人查看</text>
33
         </view>
33
         </view>
34
       </view>
34
       </view>
35
     </view>
35
     </view>

+ 2
- 0
src/pages/mine/components/UserDetailFollowRecord/index.scss View File

23
         >.flex-h {
23
         >.flex-h {
24
           position: relative;
24
           position: relative;
25
           overflow: hidden;
25
           overflow: hidden;
26
+          align-items: flex-start;
26
           &:first-child {
27
           &:first-child {
27
             >.Line {
28
             >.Line {
28
               >view {
29
               >view {
57
               line-height: 40px;
58
               line-height: 40px;
58
               transform: translateY(-6px);
59
               transform: translateY(-6px);
59
               -webkit-transform: translateY(-6px);
60
               -webkit-transform: translateY(-6px);
61
+              word-break: break-all;
60
               &.active {
62
               &.active {
61
                 font-weight: bold;
63
                 font-weight: bold;
62
               }
64
               }

+ 1
- 1
src/pages/mine/customerDetail/index.jsx View File

48
   }
48
   }
49
 
49
 
50
   const FollowInput = (e) => {
50
   const FollowInput = (e) => {
51
-    setFollowContent(e.detail.value.substring(0, 10))
51
+    setFollowContent(e.detail.value.substring(0, 150))
52
   }
52
   }
53
 
53
 
54
   const SaveFollow = () => {
54
   const SaveFollow = () => {

+ 2
- 2
src/pages/mine/index.jsx View File

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

+ 5
- 8
src/pages/mine/index.scss View File

97
                 z-index: 3;
97
                 z-index: 3;
98
               }
98
               }
99
               > .New {
99
               > .New {
100
-                font-size: 90px;
101
-                font-weight: bold;
102
-                color: rgba(255, 255, 255, 0.1);
103
-                display: inline-block;
100
+                display: block;
104
                 position: absolute;
101
                 position: absolute;
102
+                height: 140px;
105
                 z-index: 1;
103
                 z-index: 1;
106
-                right: 30px;
107
-                top: 30px;
104
+                left: 30px;
105
+                bottom: 40px;
106
+                opacity: 0.2;
108
               }
107
               }
109
               > .iconfont {
108
               > .iconfont {
110
                 font-size: 200px;
109
                 font-size: 200px;
112
                 display: inline-block;
111
                 display: inline-block;
113
                 position: absolute;
112
                 position: absolute;
114
                 z-index: 1;
113
                 z-index: 1;
115
-                left: 30px;
116
-                top: 10px;
117
               }
114
               }
118
             }
115
             }
119
           }
116
           }

+ 3
- 3
src/subpackages/pages/channel/partnerChannel/index.jsx View File

81
               <view className='flex-item'>
81
               <view className='flex-item'>
82
                 <Image mode='heightFix' src={require('@/assets/mine-icon21.png')}></Image>
82
                 <Image mode='heightFix' src={require('@/assets/mine-icon21.png')}></Image>
83
                 <view className='Icon'>
83
                 <view className='Icon'>
84
-                  <Image mode='aspectFill' src={tp2.avatarurl}></Image>
84
+                  <Image mode='aspectFill' src={tp2.avatarurl} style={{width: '100%', height: '100%'}}></Image>
85
                 </view>
85
                 </view>
86
                 <view className='Index'>
86
                 <view className='Index'>
87
                   <text>{tp2.name||'暂无'}</text>
87
                   <text>{tp2.name||'暂无'}</text>
97
               <view className='flex-item active'>
97
               <view className='flex-item active'>
98
                 <Image mode='heightFix' src={require('@/assets/mine-icon20.png')}></Image>
98
                 <Image mode='heightFix' src={require('@/assets/mine-icon20.png')}></Image>
99
                 <view className='Icon'>
99
                 <view className='Icon'>
100
-                  <Image mode='aspectFill' src={tp1.avatarurl}></Image>
100
+                  <Image mode='aspectFill' src={tp1.avatarurl} style={{width: '100%', height: '100%'}}></Image>
101
                 </view>
101
                 </view>
102
                 <view className='Index'>
102
                 <view className='Index'>
103
                   <text>{tp1.name||'暂无'}</text>
103
                   <text>{tp1.name||'暂无'}</text>
113
               <view className='flex-item'>
113
               <view className='flex-item'>
114
                 <Image mode='heightFix' src={require('@/assets/mine-icon22.png')}></Image>
114
                 <Image mode='heightFix' src={require('@/assets/mine-icon22.png')}></Image>
115
                 <view className='Icon'>
115
                 <view className='Icon'>
116
-                  <Image mode='aspectFill' src={tp3.avatarurl}></Image>
116
+                  <Image mode='aspectFill' src={tp3.avatarurl} style={{width: '100%', height: '100%'}}></Image>
117
                 </view>
117
                 </view>
118
                 <view className='Index'>
118
                 <view className='Index'>
119
                   <text>{tp3.name||'暂无'}</text>
119
                   <text>{tp3.name||'暂无'}</text>

+ 10
- 0
src/subpackages/pages/channel/partnerChannel/index.scss View File

48
                 >.Icon {
48
                 >.Icon {
49
                   width: 120px;
49
                   width: 120px;
50
                   height: 120px;
50
                   height: 120px;
51
+                  position: relative;
52
+                  overflow: hidden;
51
                   margin-top: 24px;
53
                   margin-top: 24px;
54
+                  >image {
55
+                    width: 100%;
56
+                    height: 100%;
57
+                  }
52
                 }
58
                 }
53
                 >.Index {
59
                 >.Index {
54
                   margin-top: 20px;
60
                   margin-top: 20px;
78
                 border-radius: 100%;
84
                 border-radius: 100%;
79
                 background: #eee;
85
                 background: #eee;
80
                 margin: 34px auto 0;
86
                 margin: 34px auto 0;
87
+                >image {
88
+                  width: 100%;
89
+                  height: 100%;
90
+                }
81
               }
91
               }
82
               >.Index {
92
               >.Index {
83
                 width: 148px;
93
                 width: 148px;

+ 1
- 16
src/subpackages/pages/consultant/myHomepage/index.jsx View File

16
   const { router, trackData } = props
16
   const { router, trackData } = props
17
   const { id } = router.params
17
   const { id } = router.params
18
   
18
   
19
-  const [IsPull, setPull] = useState(false)
20
   const [ShowPopup, setShowPopup] = useState(false)
19
   const [ShowPopup, setShowPopup] = useState(false)
21
-  const [PullTimer, setPullTimer] = useState(null)
22
   const [UserInfo, setUserInfo] = useState({})
20
   const [UserInfo, setUserInfo] = useState({})
23
   const [BuildingInfo, setBuildingInfo] = useState({})
21
   const [BuildingInfo, setBuildingInfo] = useState({})
24
   const [LikeNum, setLikeNum] = useState(0)
22
   const [LikeNum, setLikeNum] = useState(0)
83
     })
81
     })
84
   }
82
   }
85
 
83
 
86
-  const PageRefresh = () => { // 页面下拉刷新回调
87
-    setPull(true)
88
-  }
89
-
90
-  useEffect(() => { // 下拉刷新触发
91
-    if (IsPull) {
92
-      clearTimeout(PullTimer)
93
-      setPullTimer(setTimeout(() => {
94
-        setPull(false)
95
-      }, 2000))
96
-    }
97
-  }, [IsPull])
98
-
99
   return (
84
   return (
100
     <view className='Page myHomepage'>
85
     <view className='Page myHomepage'>
101
-      <ScrollView scrollY refresherEnabled refresherTriggered={IsPull} refresherDefaultStyle='black' refresherBackground='#fff' onRefresherRefresh={PageRefresh}>
86
+      <ScrollView scrollY>
102
         <view className='PageContent'>
87
         <view className='PageContent'>
103
 
88
 
104
           <view className='Card UserInfo'>
89
           <view className='Card UserInfo'>