1002884655 3 лет назад
Родитель
Сommit
71c0772da8
41 измененных файлов: 528 добавлений и 199 удалений
  1. 4
    0
      src/app.scss
  2. 8
    3
      src/components/ProjectListItem/index.jsx
  3. 7
    2
      src/components/ProjectListItem/index.scss
  4. 2
    2
      src/pages/index/buildingDetail/components/BasicInfo/index.scss
  5. 21
    0
      src/pages/index/buildingDetail/components/HouseTypeIntro/index.jsx
  6. 22
    0
      src/pages/index/buildingDetail/components/HouseTypeIntro/index.scss
  7. 21
    0
      src/pages/index/buildingDetail/components/LivingActivity/index.jsx
  8. 22
    0
      src/pages/index/buildingDetail/components/LivingActivity/index.scss
  9. 21
    0
      src/pages/index/buildingDetail/components/MarketingActivity/index.jsx
  10. 22
    0
      src/pages/index/buildingDetail/components/MarketingActivity/index.scss
  11. 21
    0
      src/pages/index/buildingDetail/components/News/index.jsx
  12. 22
    0
      src/pages/index/buildingDetail/components/News/index.scss
  13. 19
    0
      src/pages/index/buildingDetail/components/Periphery/index.jsx
  14. 22
    0
      src/pages/index/buildingDetail/components/Periphery/index.scss
  15. 19
    0
      src/pages/index/buildingDetail/components/Pictures/index.jsx
  16. 22
    0
      src/pages/index/buildingDetail/components/Pictures/index.scss
  17. 21
    0
      src/pages/index/buildingDetail/components/ProjectDynamic/index.jsx
  18. 22
    0
      src/pages/index/buildingDetail/components/ProjectDynamic/index.scss
  19. 21
    0
      src/pages/index/buildingDetail/components/PropertyConsultant/index.jsx
  20. 22
    0
      src/pages/index/buildingDetail/components/PropertyConsultant/index.scss
  21. 21
    0
      src/pages/index/buildingDetail/components/SpecialPriceHouse/index.jsx
  22. 22
    0
      src/pages/index/buildingDetail/components/SpecialPriceHouse/index.scss
  23. 54
    0
      src/pages/index/buildingDetail/index.jsx
  24. 2
    0
      src/pages/index/buildingDetail/index.scss
  25. 3
    2
      src/pages/index/components/ColumnTitle/index.scss
  26. 1
    1
      src/pages/index/components/HotRecommend/index.scss
  27. 1
    1
      src/pages/index/components/IndexColumnTitle/index.scss
  28. 1
    1
      src/pages/index/components/Location/index.scss
  29. 5
    164
      src/pages/index/helpToFindHouse/components/BuyHouse/index.jsx
  30. 10
    1
      src/pages/index/helpToFindHouse/components/BuyHouse/index.scss
  31. 6
    3
      src/pages/index/helpToFindHouse/components/HousePurchasing/index.jsx
  32. 10
    1
      src/pages/index/helpToFindHouse/components/HousePurchasing/index.scss
  33. 5
    2
      src/pages/index/helpToFindHouse/components/RentingHouse/index.jsx
  34. 10
    1
      src/pages/index/helpToFindHouse/components/RentingHouse/index.scss
  35. 1
    1
      src/pages/index/index.scss
  36. 2
    2
      src/pages/mine/components/MyCourseListItem/index.scss
  37. 2
    2
      src/pages/mine/components/MyShareListItem/index.scss
  38. 1
    1
      src/pages/mine/myCollect/index.scss
  39. 2
    1
      src/pages/video/components/VideoListItem/index.scss
  40. 2
    2
      src/pages/video/index.scss
  41. 6
    6
      src/routes.js

+ 4
- 0
src/app.scss Просмотреть файл

@@ -4,6 +4,10 @@ page,
4 4
   height: 100%;
5 5
   position: relative;
6 6
   overflow: hidden;
7
+  color: #333;
8
+  text {
9
+    color: #333;
10
+  }
7 11
 }
8 12
 
9 13
 .centerLabel {

+ 8
- 3
src/components/ProjectListItem/index.jsx Просмотреть файл

@@ -6,6 +6,7 @@ import { Image } from '@tarojs/components'
6 6
 
7 7
 export default function ProjectListItem (props) {
8 8
   const { Data = {} } = props
9
+  const { uvList = [] } = Data
9 10
   return (
10 11
     <view className='components ProjectListItem flex-h' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.buildingId}` })}}>
11 12
       <view className='Img'>
@@ -33,9 +34,13 @@ export default function ProjectListItem (props) {
33 34
           <text className='iconfont icon-fenxiang'></text>
34 35
           <text>{Data.shareNum}次分享</text>
35 36
           <view className='Users'>
36
-            <view></view>
37
-            <view></view>
38
-            <view></view>
37
+            {
38
+              uvList.records.slice(0, 3).map((item, index) => (
39
+                <view key={`uv-${index}`}>
40
+                  <Image mode='aspectFill' className='centerLabel' src={item.photoOravatar} />
41
+                </view>
42
+              ))
43
+            }
39 44
           </view>
40 45
           <text>...{Data.pvNum}人围观</text>
41 46
         </view>

+ 7
- 2
src/components/ProjectListItem/index.scss Просмотреть файл

@@ -28,7 +28,7 @@
28 28
           display: block;
29 29
           font-size: 28px;
30 30
           font-weight: bold;
31
-          color: #000;
31
+          color: #333;
32 32
           line-height: 40px;
33 33
           white-space: nowrap;
34 34
           overflow: hidden;
@@ -38,7 +38,7 @@
38 38
       > text {
39 39
         font-size: 24px;
40 40
         line-height: 40px;
41
-        color: #000;
41
+        color: #333;
42 42
         &:last-child {
43 43
           color: red;
44 44
         }
@@ -97,6 +97,7 @@
97 97
           border-radius: 100%;
98 98
           margin-left: -10px;
99 99
           position: relative;
100
+          overflow: hidden;
100 101
           &:nth-child(1) {
101 102
             z-index: 1;
102 103
             margin-left: 0;
@@ -107,6 +108,10 @@
107 108
           &:nth-child(3) {
108 109
             z-index: 3;
109 110
           }
111
+          >image {
112
+            width: 100%;
113
+            height: 100%;
114
+          }
110 115
         }
111 116
       }
112 117
     }

+ 2
- 2
src/pages/index/buildingDetail/components/BasicInfo/index.scss Просмотреть файл

@@ -13,7 +13,7 @@
13 13
         display: block;
14 14
         font-size: 40px;
15 15
         line-height: 56px;
16
-        color: #000;
16
+        color: #333;
17 17
       }
18 18
     }
19 19
     >.Collect {
@@ -179,7 +179,7 @@
179 179
           text-align: justify;
180 180
           text-align-last: justify;
181 181
           &.active {
182
-            color: #000;
182
+            color: #333;
183 183
             text-align: left;
184 184
             text-align-last: left;
185 185
           }

+ 21
- 0
src/pages/index/buildingDetail/components/HouseTypeIntro/index.jsx Просмотреть файл

@@ -0,0 +1,21 @@
1
+import React, { useState, useEffect } from 'react'
2
+import './index.scss'
3
+import '../../../../../assets/css/iconfont.css'
4
+import { ScrollView, Image } from '@tarojs/components'
5
+
6
+export default function HouseTypeIntro (props) {
7
+  const { Data = {} } = props
8
+  return (
9
+    <view className='components HouseTypeIntro'>
10
+
11
+      <view className='Title flex-h'>
12
+        <view className='flex-item'>
13
+          <text>户型介绍(5)</text>
14
+        </view>
15
+        <text>更多</text>
16
+        <text className='iconfont icon-jiantouright'></text>
17
+      </view>
18
+
19
+    </view>
20
+  )
21
+}

+ 22
- 0
src/pages/index/buildingDetail/components/HouseTypeIntro/index.scss Просмотреть файл

@@ -0,0 +1,22 @@
1
+.components.HouseTypeIntro {
2
+  position: relative;
3
+  overflow: hidden;
4
+  padding: 40px 30px;
5
+  >.Title {
6
+    align-items: center;
7
+    >.flex-item {
8
+      >text {
9
+        display: block;
10
+        font-size: 34px;
11
+        color: #333;
12
+        line-height: 1;
13
+        letter-spacing: 4px;
14
+        font-weight: bold;
15
+      }
16
+    }
17
+    >text {
18
+      font-size: 26px;
19
+      color: #A1A1A1;
20
+    }
21
+  }
22
+}

+ 21
- 0
src/pages/index/buildingDetail/components/LivingActivity/index.jsx Просмотреть файл

@@ -0,0 +1,21 @@
1
+import React, { useState, useEffect } from 'react'
2
+import './index.scss'
3
+import '../../../../../assets/css/iconfont.css'
4
+import { ScrollView, Image } from '@tarojs/components'
5
+
6
+export default function LivingActivity (props) {
7
+  const { Data = {} } = props
8
+  return (
9
+    <view className='components LivingActivity'>
10
+
11
+      <view className='Title flex-h'>
12
+        <view className='flex-item'>
13
+          <text>直播活动</text>
14
+        </view>
15
+        <text>更多</text>
16
+        <text className='iconfont icon-jiantouright'></text>
17
+      </view>
18
+
19
+    </view>
20
+  )
21
+}

+ 22
- 0
src/pages/index/buildingDetail/components/LivingActivity/index.scss Просмотреть файл

@@ -0,0 +1,22 @@
1
+.components.LivingActivity {
2
+  position: relative;
3
+  overflow: hidden;
4
+  padding: 40px 30px;
5
+  >.Title {
6
+    align-items: center;
7
+    >.flex-item {
8
+      >text {
9
+        display: block;
10
+        font-size: 34px;
11
+        color: #333;
12
+        line-height: 1;
13
+        letter-spacing: 4px;
14
+        font-weight: bold;
15
+      }
16
+    }
17
+    >text {
18
+      font-size: 26px;
19
+      color: #A1A1A1;
20
+    }
21
+  }
22
+}

+ 21
- 0
src/pages/index/buildingDetail/components/MarketingActivity/index.jsx Просмотреть файл

@@ -0,0 +1,21 @@
1
+import React, { useState, useEffect } from 'react'
2
+import './index.scss'
3
+import '../../../../../assets/css/iconfont.css'
4
+import { ScrollView, Image } from '@tarojs/components'
5
+
6
+export default function MarketingActivity (props) {
7
+  const { Data = {} } = props
8
+  return (
9
+    <view className='components MarketingActivity'>
10
+
11
+      <view className='Title flex-h'>
12
+        <view className='flex-item'>
13
+          <text>营销活动</text>
14
+        </view>
15
+        <text>更多</text>
16
+        <text className='iconfont icon-jiantouright'></text>
17
+      </view>
18
+
19
+    </view>
20
+  )
21
+}

+ 22
- 0
src/pages/index/buildingDetail/components/MarketingActivity/index.scss Просмотреть файл

@@ -0,0 +1,22 @@
1
+.components.MarketingActivity {
2
+  position: relative;
3
+  overflow: hidden;
4
+  padding: 40px 30px;
5
+  >.Title {
6
+    align-items: center;
7
+    >.flex-item {
8
+      >text {
9
+        display: block;
10
+        font-size: 34px;
11
+        color: #333;
12
+        line-height: 1;
13
+        letter-spacing: 4px;
14
+        font-weight: bold;
15
+      }
16
+    }
17
+    >text {
18
+      font-size: 26px;
19
+      color: #A1A1A1;
20
+    }
21
+  }
22
+}

+ 21
- 0
src/pages/index/buildingDetail/components/News/index.jsx Просмотреть файл

@@ -0,0 +1,21 @@
1
+import React, { useState, useEffect } from 'react'
2
+import './index.scss'
3
+import '../../../../../assets/css/iconfont.css'
4
+import { ScrollView, Image } from '@tarojs/components'
5
+
6
+export default function MarketingActivity (props) {
7
+  const { Data = {} } = props
8
+  return (
9
+    <view className='components MarketingActivity'>
10
+
11
+      <view className='Title flex-h'>
12
+        <view className='flex-item'>
13
+          <text>新鲜资讯</text>
14
+        </view>
15
+        <text>更多</text>
16
+        <text className='iconfont icon-jiantouright'></text>
17
+      </view>
18
+
19
+    </view>
20
+  )
21
+}

+ 22
- 0
src/pages/index/buildingDetail/components/News/index.scss Просмотреть файл

@@ -0,0 +1,22 @@
1
+.components.MarketingActivity {
2
+  position: relative;
3
+  overflow: hidden;
4
+  padding: 40px 30px;
5
+  >.Title {
6
+    align-items: center;
7
+    >.flex-item {
8
+      >text {
9
+        display: block;
10
+        font-size: 34px;
11
+        color: #333;
12
+        line-height: 1;
13
+        letter-spacing: 4px;
14
+        font-weight: bold;
15
+      }
16
+    }
17
+    >text {
18
+      font-size: 26px;
19
+      color: #A1A1A1;
20
+    }
21
+  }
22
+}

+ 19
- 0
src/pages/index/buildingDetail/components/Periphery/index.jsx Просмотреть файл

@@ -0,0 +1,19 @@
1
+import React, { useState, useEffect } from 'react'
2
+import './index.scss'
3
+import '../../../../../assets/css/iconfont.css'
4
+import { ScrollView, Image } from '@tarojs/components'
5
+
6
+export default function Periphery (props) {
7
+  const { Data = {} } = props
8
+  return (
9
+    <view className='components Periphery'>
10
+
11
+      <view className='Title flex-h'>
12
+        <view className='flex-item'>
13
+          <text>位置及周边配套</text>
14
+        </view>
15
+      </view>
16
+
17
+    </view>
18
+  )
19
+}

+ 22
- 0
src/pages/index/buildingDetail/components/Periphery/index.scss Просмотреть файл

@@ -0,0 +1,22 @@
1
+.components.Periphery {
2
+  position: relative;
3
+  overflow: hidden;
4
+  padding: 40px 30px;
5
+  >.Title {
6
+    align-items: center;
7
+    >.flex-item {
8
+      >text {
9
+        display: block;
10
+        font-size: 34px;
11
+        color: #333;
12
+        line-height: 1;
13
+        letter-spacing: 4px;
14
+        font-weight: bold;
15
+      }
16
+    }
17
+    >text {
18
+      font-size: 26px;
19
+      color: #A1A1A1;
20
+    }
21
+  }
22
+}

+ 19
- 0
src/pages/index/buildingDetail/components/Pictures/index.jsx Просмотреть файл

@@ -0,0 +1,19 @@
1
+import React, { useState, useEffect } from 'react'
2
+import './index.scss'
3
+import '../../../../../assets/css/iconfont.css'
4
+import { ScrollView, Image } from '@tarojs/components'
5
+
6
+export default function Pictures (props) {
7
+  const { Data = {} } = props
8
+  return (
9
+    <view className='components Pictures'>
10
+
11
+      <view className='Title flex-h'>
12
+        <view className='flex-item'>
13
+          <text>相册</text>
14
+        </view>
15
+      </view>
16
+
17
+    </view>
18
+  )
19
+}

+ 22
- 0
src/pages/index/buildingDetail/components/Pictures/index.scss Просмотреть файл

@@ -0,0 +1,22 @@
1
+.components.Pictures {
2
+  position: relative;
3
+  overflow: hidden;
4
+  padding: 40px 30px;
5
+  >.Title {
6
+    align-items: center;
7
+    >.flex-item {
8
+      >text {
9
+        display: block;
10
+        font-size: 34px;
11
+        color: #333;
12
+        line-height: 1;
13
+        letter-spacing: 4px;
14
+        font-weight: bold;
15
+      }
16
+    }
17
+    >text {
18
+      font-size: 26px;
19
+      color: #A1A1A1;
20
+    }
21
+  }
22
+}

+ 21
- 0
src/pages/index/buildingDetail/components/ProjectDynamic/index.jsx Просмотреть файл

@@ -0,0 +1,21 @@
1
+import React, { useState, useEffect } from 'react'
2
+import './index.scss'
3
+import '../../../../../assets/css/iconfont.css'
4
+import { ScrollView, Image } from '@tarojs/components'
5
+
6
+export default function ProjectDynamic (props) {
7
+  const { Data = {} } = props
8
+  return (
9
+    <view className='components ProjectDynamic'>
10
+
11
+      <view className='Title flex-h'>
12
+        <view className='flex-item'>
13
+          <text>项目动态</text>
14
+        </view>
15
+        <text>更多</text>
16
+        <text className='iconfont icon-jiantouright'></text>
17
+      </view>
18
+
19
+    </view>
20
+  )
21
+}

+ 22
- 0
src/pages/index/buildingDetail/components/ProjectDynamic/index.scss Просмотреть файл

@@ -0,0 +1,22 @@
1
+.components.ProjectDynamic {
2
+  position: relative;
3
+  overflow: hidden;
4
+  padding: 40px 30px;
5
+  >.Title {
6
+    align-items: center;
7
+    >.flex-item {
8
+      >text {
9
+        display: block;
10
+        font-size: 34px;
11
+        color: #333;
12
+        line-height: 1;
13
+        letter-spacing: 4px;
14
+        font-weight: bold;
15
+      }
16
+    }
17
+    >text {
18
+      font-size: 26px;
19
+      color: #A1A1A1;
20
+    }
21
+  }
22
+}

+ 21
- 0
src/pages/index/buildingDetail/components/PropertyConsultant/index.jsx Просмотреть файл

@@ -0,0 +1,21 @@
1
+import React, { useState, useEffect } from 'react'
2
+import './index.scss'
3
+import '../../../../../assets/css/iconfont.css'
4
+import { ScrollView, Image } from '@tarojs/components'
5
+
6
+export default function PropertyConsultant (props) {
7
+  const { Data = {} } = props
8
+  return (
9
+    <view className='components PropertyConsultant'>
10
+
11
+      <view className='Title flex-h'>
12
+        <view className='flex-item'>
13
+          <text>置业顾问</text>
14
+        </view>
15
+        <text>更多</text>
16
+        <text className='iconfont icon-jiantouright'></text>
17
+      </view>
18
+
19
+    </view>
20
+  )
21
+}

+ 22
- 0
src/pages/index/buildingDetail/components/PropertyConsultant/index.scss Просмотреть файл

@@ -0,0 +1,22 @@
1
+.components.PropertyConsultant {
2
+  position: relative;
3
+  overflow: hidden;
4
+  padding: 40px 30px;
5
+  >.Title {
6
+    align-items: center;
7
+    >.flex-item {
8
+      >text {
9
+        display: block;
10
+        font-size: 34px;
11
+        color: #333;
12
+        line-height: 1;
13
+        letter-spacing: 4px;
14
+        font-weight: bold;
15
+      }
16
+    }
17
+    >text {
18
+      font-size: 26px;
19
+      color: #A1A1A1;
20
+    }
21
+  }
22
+}

+ 21
- 0
src/pages/index/buildingDetail/components/SpecialPriceHouse/index.jsx Просмотреть файл

@@ -0,0 +1,21 @@
1
+import React, { useState, useEffect } from 'react'
2
+import './index.scss'
3
+import '../../../../../assets/css/iconfont.css'
4
+import { ScrollView, Image } from '@tarojs/components'
5
+
6
+export default function SpecialPriceHouse (props) {
7
+  const { Data = {} } = props
8
+  return (
9
+    <view className='components SpecialPriceHouse'>
10
+
11
+      <view className='Title flex-h'>
12
+        <view className='flex-item'>
13
+          <text>特价房源(5)</text>
14
+        </view>
15
+        <text>更多</text>
16
+        <text className='iconfont icon-jiantouright'></text>
17
+      </view>
18
+
19
+    </view>
20
+  )
21
+}

+ 22
- 0
src/pages/index/buildingDetail/components/SpecialPriceHouse/index.scss Просмотреть файл

@@ -0,0 +1,22 @@
1
+.components.SpecialPriceHouse {
2
+  position: relative;
3
+  overflow: hidden;
4
+  padding: 40px 30px;
5
+  >.Title {
6
+    align-items: center;
7
+    >.flex-item {
8
+      >text {
9
+        display: block;
10
+        font-size: 34px;
11
+        color: #333;
12
+        line-height: 1;
13
+        letter-spacing: 4px;
14
+        font-weight: bold;
15
+      }
16
+    }
17
+    >text {
18
+      font-size: 26px;
19
+      color: #A1A1A1;
20
+    }
21
+  }
22
+}

+ 54
- 0
src/pages/index/buildingDetail/index.jsx Просмотреть файл

@@ -5,6 +5,15 @@ import { ScrollView, Image } from '@tarojs/components'
5 5
 import '../../../assets/css/iconfont.css'
6 6
 import DetailBottom from './components/DetailBottom/index'
7 7
 import BasicInfo from './components/BasicInfo/index'
8
+import SpecialPriceHouse from './components/SpecialPriceHouse/index'
9
+import ProjectDynamic from './components/ProjectDynamic/index'
10
+import PropertyConsultant from './components/PropertyConsultant/index'
11
+import Periphery from './components/Periphery/index'
12
+import HouseTypeIntro from './components/HouseTypeIntro/index'
13
+import MarketingActivity from './components/MarketingActivity/index'
14
+import LivingActivity from './components/LivingActivity/index'
15
+import News from './components/News/index'
16
+import Pictures from './components/Pictures/index'
8 17
 
9 18
 export default withLayout((props) => {
10 19
 
@@ -51,6 +60,51 @@ export default withLayout((props) => {
51 60
                   <BasicInfo></BasicInfo>
52 61
                 </view>
53 62
 
63
+                {/* 特价房源 */}
64
+                <view className='SpecialPriceHouse'>
65
+                  <SpecialPriceHouse></SpecialPriceHouse>
66
+                </view>
67
+
68
+                {/* 项目动态 */}
69
+                <view className='ProjectDynamic'>
70
+                  <ProjectDynamic></ProjectDynamic>
71
+                </view>
72
+
73
+                {/* 置业顾问 */}
74
+                <view className='PropertyConsultant'>
75
+                  <PropertyConsultant></PropertyConsultant>
76
+                </view>
77
+
78
+                {/* 位置及周边 */}
79
+                <view className='Periphery'>
80
+                  <Periphery></Periphery>
81
+                </view>
82
+
83
+                {/* 户型介绍 */}
84
+                <view className='HouseTypeIntro'>
85
+                  <HouseTypeIntro></HouseTypeIntro>
86
+                </view>
87
+
88
+                {/* 营销活动 */}
89
+                <view className='MarketingActivity'>
90
+                  <MarketingActivity></MarketingActivity>
91
+                </view>
92
+
93
+                {/* 直播活动 */}
94
+                <view className='LivingActivity'>
95
+                  <LivingActivity></LivingActivity>
96
+                </view>
97
+
98
+                {/* 新鲜资讯 */}
99
+                <view className='News'>
100
+                  <News></News>
101
+                </view>
102
+
103
+                {/* 相册 */}
104
+                <view className='Pictures'>
105
+                  <Pictures></Pictures>
106
+                </view>
107
+
54 108
               </view>
55 109
 
56 110
               {/* bottom */}

+ 2
- 0
src/pages/index/buildingDetail/index.scss Просмотреть файл

@@ -44,6 +44,8 @@
44 44
             overflow: hidden;
45 45
             z-index: 2;
46 46
             margin-top: 71.5vw;
47
+            background: #f8f8f8;
48
+            border-radius: 40px 40px 0 0;
47 49
             >view {
48 50
               position: relative;
49 51
               overflow: hidden;

+ 3
- 2
src/pages/index/components/ColumnTitle/index.scss Просмотреть файл

@@ -1,12 +1,13 @@
1 1
 .components.ColumnTitle {
2 2
   align-items: center;
3 3
   padding: 0 30px;
4
-  margin-top: 40px;
4
+  margin-top: 60px;
5 5
   > text {
6 6
     font-size: 38px;
7 7
     font-weight: bold;
8
-    color: #000;
8
+    color: #333;
9 9
     line-height: 40px;
10
+    letter-spacing: 4px;
10 11
     &.iconfont {
11 12
       font-size: 44px;
12 13
       font-weight: normal;

+ 1
- 1
src/pages/index/components/HotRecommend/index.scss Просмотреть файл

@@ -19,7 +19,7 @@
19 19
         font-weight: bold;
20 20
         &.active {
21 21
           color: #193c83;
22
-          background: rgba(0, 0, 0, 0.08);
22
+          background: rgba(25, 60, 131, 0.08);
23 23
         }
24 24
       }
25 25
     }

+ 1
- 1
src/pages/index/components/IndexColumnTitle/index.scss Просмотреть файл

@@ -5,7 +5,7 @@
5 5
   > text {
6 6
     font-size: 32px;
7 7
     font-weight: bold;
8
-    color: #000;
8
+    color: #333;
9 9
     line-height: 40px;
10 10
   }
11 11
   > .More {

+ 1
- 1
src/pages/index/components/Location/index.scss Просмотреть файл

@@ -7,7 +7,7 @@
7 7
   align-items: center;
8 8
   >text {
9 9
     font-size: 20px;
10
-    line-height: 44px;
10
+    line-height: 80px;
11 11
     margin-left: 10px;
12 12
     &:first-child {
13 13
       margin-left: 20px;

+ 5
- 164
src/pages/index/helpToFindHouse/components/BuyHouse/index.jsx Просмотреть файл

@@ -103,8 +103,11 @@ export default function BuyHouse (props) {
103 103
                 }
104 104
                 {
105 105
                   item.type === 'range' &&
106
-                  <view className='RangeList'>
107
-                    <Slider activeColor="#193C83" block-color="#193C83" onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
106
+                  <view className='RangeList flex-h'>
107
+                    <view className='flex-item'>
108
+                      <Slider activeColor="#193C83" block-color="#fff" onChange={(e) => { Rangehange(e, index) }} min={item.options[0]} max={item.options[1]} show-value />
109
+                    </view>
110
+                    <text>万</text>
108 111
                   </view>
109 112
                 }
110 113
                 {
@@ -132,168 +135,6 @@ export default function BuyHouse (props) {
132 135
           </view>
133 136
         ))
134 137
       }
135
-      {/* {
136
-        StepId === 1 &&
137
-        <view className='Step'>
138
-          <view>
139
-            <text>意向区域</text>
140
-            <view className='Area'>
141
-              <view className='flex-h'>
142
-                <text className='iconfont icon-dingwei'></text>
143
-                <text>不限</text>
144
-                <view className='flex-item'></view>
145
-                <text className='iconfont icon-jiantoudown'></text>
146
-              </view>
147
-            </view>
148
-          </view>
149
-
150
-          <view>
151
-            <text>意向楼盘</text>
152
-            <view className='Purpose'>
153
-              <view>
154
-                <Input placeholder="请输入意向楼盘" />
155
-              </view>
156
-            </view>
157
-          </view>
158
-
159
-          <view>
160
-            <text>您想购买的是首套房还是二套房?</text>
161
-            <view className='CheckList'>
162
-              {
163
-                SingleList.map((item, index) => (
164
-                  <view key={`SingleItem-${index}`} className={CurrnetSingleId === item.id ? 'active' : ''} onClick={CutSingleId(item.id)}>
165
-                    {item.name}
166
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
167
-                  </view>
168
-                ))
169
-              }
170
-            </view>
171
-          </view>
172
-
173
-          <view>
174
-            <text>总价预算范围</text>
175
-            <view className='PriceRange'>
176
-              <view className='flex-h'>
177
-                <view className='flex-item'>
178
-                  <Input placeholder="最小面积㎡" />
179
-                </view>
180
-                <text>-</text>
181
-                <view className='flex-item'>
182
-                  <Input placeholder="最大面积㎡" />
183
-                </view>
184
-              </view>
185
-            </view>
186
-          </view>
187
-        </view>
188
-      }
189
-
190
-      {
191
-        StepId === 2 &&
192
-        <view className='Step'>
193
-          <view>
194
-            <text>您想购买的是二手房还是新房?</text>
195
-            <view className='CheckList'>
196
-              {
197
-                NewOldList.map((item, index) => (
198
-                  <view key={`NewOldItem-${index}`} className={CurrnetNewOldId === item.id ? 'active' : ''} onClick={CutNewOldId(item.id)}>
199
-                    {item.name}
200
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
201
-                  </view>
202
-                ))
203
-              }
204
-            </view>
205
-          </view>
206
-          <view>
207
-            <text>居室要求</text>
208
-            <view className='CheckList'>
209
-              {
210
-                HouseTypeList.map((item, index) => (
211
-                  <view key={`HouseTypeItem-${index}`} className={CurrnetHouseTypeId === item.id ? 'active' : ''} onClick={CutHouseTypeId(item.id)}>
212
-                    {item.name}
213
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
214
-                  </view>
215
-                ))
216
-              }
217
-            </view>
218
-          </view>
219
-          <view>
220
-            <text>面积要求</text>
221
-            <view className='CheckList'>
222
-              {
223
-                AreaList.map((item, index) => (
224
-                  <view key={`AreaItem-${index}`} className={CurrnetAreaId === item.id ? 'active' : ''} onClick={CutAreaId(item.id)}>
225
-                    {item.name}
226
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
227
-                  </view>
228
-                ))
229
-              }
230
-            </view>
231
-          </view>
232
-        </view>
233
-      }
234
-
235
-      {
236
-        StepId === 3 &&
237
-        <view className='Step'>
238
-          <view>
239
-            <text>价格要求</text>
240
-            <view className='RangeList'>
241
-              <Slider activeColor="#193C83" block-color="#193C83" change={PriceRangehange} min="50" max="200" show-value />
242
-            </view>
243
-          </view>
244
-          <view>
245
-            <text>偏好设置</text>
246
-            <view className='CheckList'>
247
-              {
248
-                PreferenceList.map((item, index) => (
249
-                  <view key={`PreferenceItem-${index}`} className={CurrnetPreferenceId === item.id ? 'active' : ''} onClick={CutPreferenceId(item.id)}>
250
-                    {item.name}
251
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
252
-                  </view>
253
-                ))
254
-              }
255
-            </view>
256
-          </view>
257
-          <view>
258
-            <text>购房目的</text>
259
-            <view className='CheckList'>
260
-              {
261
-                GoalList.map((item, index) => (
262
-                  <view key={`GoalItem-${index}`} className={CurrnetGoalId === item.id ? 'active' : ''} onClick={CutGoalId(item.id)}>
263
-                    {item.name}
264
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
265
-                  </view>
266
-                ))
267
-              }
268
-            </view>
269
-          </view>
270
-        </view>
271
-      }
272
-
273
-      {
274
-        StepId === 4 &&
275
-        <view className='Step'>
276
-          <view>
277
-            <text>计划在多久购房?</text>
278
-            <view className='CheckList'>
279
-              {
280
-                LongTimeList.map((item, index) => (
281
-                  <view key={`LongTimeItem-${index}`} className={CurrnetLongTimeId === item.id ? 'active' : ''} onClick={CutLongTimeId(item.id)}>
282
-                    {item.name}
283
-                    <Image mode='heightFix' src={require('../../../../../assets/findHouse-icon1.png')}></Image>
284
-                  </view>
285
-                ))
286
-              }
287
-            </view>
288
-          </view>
289
-          <view>
290
-            <text>您还有哪些需要备注的信息?</text>
291
-            <view className='Textarea'>
292
-              <Textarea placeholder="请说出您的其他需求,让我们更好的为您服务!" />
293
-            </view>
294
-          </view>
295
-        </view>
296
-      } */}
297 138
 
298 139
       <view className='Btn'>
299 140
         <text className='active' onClick={NextStep}>下一步</text>

+ 10
- 1
src/pages/index/helpToFindHouse/components/BuyHouse/index.scss Просмотреть файл

@@ -16,6 +16,7 @@
16 16
         font-weight: bold;
17 17
         color: #333;
18 18
         line-height: 40px;
19
+        letter-spacing: 4px;
19 20
       }
20 21
       > view {
21 22
         position: relative;
@@ -63,7 +64,7 @@
63 64
           display: inline-block;
64 65
           vertical-align: middle;
65 66
           font-size: 30px;
66
-          font-weight: bold;
67
+          font-weight: 600;
67 68
           color: #333;
68 69
           line-height: 40px;
69 70
           padding: 20px 0;
@@ -95,6 +96,14 @@
95 96
           }
96 97
         }
97 98
       }
99
+      >.RangeList {
100
+        align-items: center;
101
+        >text {
102
+          color: #999;
103
+          font-size: 28px;
104
+          transform: translateX(-30px);
105
+        }
106
+      }
98 107
       > .PriceRange {
99 108
         > view {
100 109
           align-items: center;

+ 6
- 3
src/pages/index/helpToFindHouse/components/HousePurchasing/index.jsx Просмотреть файл

@@ -144,7 +144,7 @@ export default function HousePurchasing (props) {
144 144
   return (
145 145
     <view className='components HousePurchasing'>
146 146
       {
147
-        ShowPopup && 
147
+        ShowPopup &&
148 148
         <SubmitBuyHouseResult></SubmitBuyHouseResult>
149 149
       }
150 150
       {
@@ -252,8 +252,11 @@ export default function HousePurchasing (props) {
252 252
         <view className='Step'>
253 253
           <view>
254 254
             <text>价格要求</text>
255
-            <view className='RangeList'>
256
-              <Slider activeColor="#193C83" block-color="#193C83" change={PriceRangehange} min="50" max="200" show-value />
255
+            <view className='RangeList flex-h'>
256
+              <view className='flex-item'>
257
+                <Slider activeColor="#193C83" block-color="#fff" change={PriceRangehange} min="50" max="200" show-value />
258
+              </view>
259
+              <text>万</text>
257 260
             </view>
258 261
           </view>
259 262
           <view>

+ 10
- 1
src/pages/index/helpToFindHouse/components/HousePurchasing/index.scss Просмотреть файл

@@ -16,6 +16,7 @@
16 16
         font-weight: bold;
17 17
         color: #333;
18 18
         line-height: 40px;
19
+        letter-spacing: 4px;
19 20
       }
20 21
       > view {
21 22
         position: relative;
@@ -63,7 +64,7 @@
63 64
           display: inline-block;
64 65
           vertical-align: middle;
65 66
           font-size: 30px;
66
-          font-weight: bold;
67
+          font-weight: 600;
67 68
           color: #333;
68 69
           line-height: 40px;
69 70
           padding: 20px 0;
@@ -95,6 +96,14 @@
95 96
           }
96 97
         }
97 98
       }
99
+      >.RangeList {
100
+        align-items: center;
101
+        >text {
102
+          color: #999;
103
+          font-size: 28px;
104
+          transform: translateX(-30px);
105
+        }
106
+      }
98 107
       > .PriceRange {
99 108
         > view {
100 109
           align-items: center;

+ 5
- 2
src/pages/index/helpToFindHouse/components/RentingHouse/index.jsx Просмотреть файл

@@ -144,7 +144,7 @@ export default function RentingHouse (props) {
144 144
   return (
145 145
     <view className='components RentingHouse'>
146 146
       {
147
-        ShowPopup && 
147
+        ShowPopup &&
148 148
         <SubmitBuyHouseResult></SubmitBuyHouseResult>
149 149
       }
150 150
       {
@@ -253,7 +253,10 @@ export default function RentingHouse (props) {
253 253
           <view>
254 254
             <text>价格要求</text>
255 255
             <view className='RangeList'>
256
-              <Slider activeColor="#193C83" block-color="#193C83" change={PriceRangehange} min="50" max="200" show-value />
256
+              <view className='flex-item'>
257
+                <Slider activeColor="#193C83" block-color="#fff" change={PriceRangehange} min="50" max="200" show-value />
258
+              </view>
259
+              <text>万</text>
257 260
             </view>
258 261
           </view>
259 262
           <view>

+ 10
- 1
src/pages/index/helpToFindHouse/components/RentingHouse/index.scss Просмотреть файл

@@ -16,6 +16,7 @@
16 16
         font-weight: bold;
17 17
         color: #333;
18 18
         line-height: 40px;
19
+        letter-spacing: 4px;
19 20
       }
20 21
       > view {
21 22
         position: relative;
@@ -63,7 +64,7 @@
63 64
           display: inline-block;
64 65
           vertical-align: middle;
65 66
           font-size: 30px;
66
-          font-weight: bold;
67
+          font-weight: 600;
67 68
           color: #333;
68 69
           line-height: 40px;
69 70
           padding: 20px 0;
@@ -95,6 +96,14 @@
95 96
           }
96 97
         }
97 98
       }
99
+      >.RangeList {
100
+        align-items: center;
101
+        >text {
102
+          color: #999;
103
+          font-size: 28px;
104
+          transform: translateX(-30px);
105
+        }
106
+      }
98 107
       > .PriceRange {
99 108
         > view {
100 109
           align-items: center;

+ 1
- 1
src/pages/index/index.scss Просмотреть файл

@@ -8,7 +8,7 @@
8 8
       overflow: hidden;
9 9
       min-height: 100vh;
10 10
       >.Location {
11
-        padding: 0 50px;
11
+        padding: 0 30px;
12 12
         position: relative;
13 13
         overflow: visible;
14 14
         margin-top: 24px;

+ 2
- 2
src/pages/mine/components/MyCourseListItem/index.scss Просмотреть файл

@@ -28,7 +28,7 @@
28 28
           display: block;
29 29
           font-size: 28px;
30 30
           font-weight: bold;
31
-          color: #000;
31
+          color: #333;
32 32
           line-height: 40px;
33 33
           white-space: nowrap;
34 34
           overflow: hidden;
@@ -38,7 +38,7 @@
38 38
       > text {
39 39
         font-size: 24px;
40 40
         line-height: 40px;
41
-        color: #000;
41
+        color: #333;
42 42
         &:last-child {
43 43
           color: red;
44 44
         }

+ 2
- 2
src/pages/mine/components/MyShareListItem/index.scss Просмотреть файл

@@ -28,7 +28,7 @@
28 28
           display: block;
29 29
           font-size: 28px;
30 30
           font-weight: bold;
31
-          color: #000;
31
+          color: #333;
32 32
           line-height: 30px;
33 33
           white-space: nowrap;
34 34
           overflow: hidden;
@@ -38,7 +38,7 @@
38 38
       > text {
39 39
         font-size: 24px;
40 40
         line-height: 40px;
41
-        color: #000;
41
+        color: #333;
42 42
         &:last-child {
43 43
           color: red;
44 44
         }

+ 1
- 1
src/pages/mine/myCollect/index.scss Просмотреть файл

@@ -18,7 +18,7 @@
18 18
             &::after {
19 19
               content: '';
20 20
               width: 100%;
21
-              height: 4px;
21
+              height: 6px;
22 22
               position: absolute;
23 23
               left: 0;
24 24
               bottom: 0;

+ 2
- 1
src/pages/video/components/VideoListItem/index.scss Просмотреть файл

@@ -31,13 +31,14 @@
31 31
       font-size: 32px;
32 32
       line-height: 40px;
33 33
       color: #333;
34
-      font-weight: bold;
34
+      font-weight: 600;
35 35
       height: 80px;
36 36
       overflow: hidden;
37 37
       text-overflow: ellipsis;
38 38
       display: -webkit-box;
39 39
       -webkit-box-orient: vertical;
40 40
       -webkit-line-clamp: 2;
41
+      letter-spacing: 2px;
41 42
     }
42 43
   }
43 44
   >.Location {

+ 2
- 2
src/pages/video/index.scss Просмотреть файл

@@ -20,7 +20,7 @@
20 20
         vertical-align: middle;
21 21
         font-size: 20px;
22 22
         color: #999;
23
-        line-height: 44px;
23
+        line-height: 80px;
24 24
         &.iconfont {
25 25
           margin-right: 10px;
26 26
         }
@@ -73,7 +73,7 @@
73 73
             &::after {
74 74
               content: '';
75 75
               width: 100%;
76
-              height: 4px;
76
+              height: 6px;
77 77
               display: block;
78 78
               position: absolute;
79 79
               left: 0;

+ 6
- 6
src/routes.js Просмотреть файл

@@ -4,6 +4,12 @@ const routes = [
4 4
   /**********************************
5 5
    *  Tab 页面
6 6
    *********************************/
7
+  {
8
+    name: '楼盘详情',
9
+    page: 'pages/index/buildingDetail/index',
10
+    pkg: 'main',
11
+    type: 'building',
12
+  },
7 13
   {
8 14
     name: '首页',
9 15
     page: 'pages/index/index',
@@ -60,12 +66,6 @@ const routes = [
60 66
     pkg: 'main',
61 67
     type: 'building',
62 68
   },
63
-  {
64
-    name: '楼盘详情',
65
-    page: 'pages/index/buildingDetail/index',
66
-    pkg: 'main',
67
-    type: 'building',
68
-  },
69 69
   {
70 70
     name: '品牌列表',
71 71
     page: 'pages/index/brandList/index',