张延森 преди 3 години
родител
ревизия
d0cab13ec0

+ 1
- 1
config/prod.js Целия файл

10
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
10
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
11
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
11
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
12
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
12
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
13
-    Version: '"V0.0.39-20210811"'
13
+    Version: '"V0.0.40-20210811"'
14
   },
14
   },
15
   mini: {},
15
   mini: {},
16
   h5: {
16
   h5: {

+ 1
- 1
project.config.json Целия файл

2
 	"miniprogramRoot": "dist/",
2
 	"miniprogramRoot": "dist/",
3
 	"projectname": "miniapp",
3
 	"projectname": "miniapp",
4
 	"description": "",
4
 	"description": "",
5
-	"appid": "wxe44244d1a5ea3364",
5
+	"appid": "wxc96058d57e77f373",
6
 	"setting": {
6
 	"setting": {
7
 		"urlCheck": false,
7
 		"urlCheck": false,
8
 		"es6": false,
8
 		"es6": false,

+ 32
- 28
src/pages/index/buildingDetail/components/BasicInfo/index.jsx Целия файл

5
 import { ROLE_CODE } from '@/constants/user'
5
 import { ROLE_CODE } from '@/constants/user'
6
 import classNames from 'classnames'
6
 import classNames from 'classnames'
7
 import useFavor from '@/utils/hooks/useFavor'
7
 import useFavor from '@/utils/hooks/useFavor'
8
+import { formatDate } from '@/utils/chatDate'
8
 import '@/assets/css/iconfont.css'
9
 import '@/assets/css/iconfont.css'
9
 import './index.scss'
10
 import './index.scss'
10
 
11
 
53
         <view className='ProjectList'>
54
         <view className='ProjectList'>
54
           <ScrollView scroll-x show-scrollbar={false}>
55
           <ScrollView scroll-x show-scrollbar={false}>
55
             {
56
             {
56
-              (Info.buildingProjectType || []).map((item, index) => (
57
-                <view className='ListItem' key={`List-${index}`}>
58
-                  <Image mode='heightFix' src={require('@/assets/buildingDetail-icon4.jpg')} />
59
-                  <view>
57
+              (Info.buildingProjectType || []).map((item, index) => {
58
+                const priceUnit = item.priceType === 'average' ? '元/㎡' : '万元/套'
59
+                let price = item.startPrice === item.endPrice ? item.startPrice : `${item.startPrice}-${item.endPrice}`
60
+                if (!item.startPrice && !item.endPrice) {
61
+                  price = '暂无'
62
+                } else {
63
+                  price = `约${price}${priceUnit}`
64
+                }
65
+                
66
+                return (
67
+                  <view className='ListItem' key={`List-${index}`}>
68
+                    <Image mode='heightFix' src={require('@/assets/buildingDetail-icon4.jpg')} />
60
                     <view>
69
                     <view>
61
-                      <text>项目类型:</text>
62
-                      <text className='active black'>{item.buildingTypeName}</text>
70
+                      <view>
71
+                        <text>项目类型:</text>
72
+                        <text className='active black'>{item.buildingTypeName}</text>
73
+                      </view>
74
+                      <view>
75
+                        <text>房屋产权:</text>
76
+                        <text className='active'>{item.rightsYear}年</text>
77
+                        <text>装修标准:</text>
78
+                        <text className='active'>{item.decoration || '暂无'}</text>
79
+                      </view>
80
+                      <view>
81
+                        <text>项目参考价格:</text>
82
+                        <text className='active'>{price}</text>
83
+                      </view>
84
+                      <text className='SaleStatus active'>{item.marketStatus}</text>
63
                     </view>
85
                     </view>
64
-                    <view>
65
-                      <text>房屋产权:</text>
66
-                      <text className='active'>{item.rightsYear}年</text>
67
-                      <text>装修标准:</text>
68
-                      <text className='active'>{item.decoration || '暂无'}</text>
69
-                    </view>
70
-                    <view>
71
-                      <text>项目参考价格:</text>
72
-                      {
73
-                        (item.startPrice || item.endPrice) &&
74
-                        <text className='active'>约{item.startPrice}-{item.endPrice}元/㎡</text>
75
-                      }
76
-                      {
77
-                        !(item.startPrice || item.endPrice) &&
78
-                        <text className='active'>暂无数据</text>
79
-                      }
80
-                    </view>
81
-                    <text className='SaleStatus active'>{item.marketStatus}</text>
82
                   </view>
86
                   </view>
83
-                </view>
84
-              ))
87
+                )
88
+              })
85
             }
89
             }
86
           </ScrollView>
90
           </ScrollView>
87
         </view>
91
         </view>
107
           </view>
111
           </view>
108
           <text>:</text>
112
           <text>:</text>
109
           <view className='flex-item3'>
113
           <view className='flex-item3'>
110
-            <text className='active'>{Info.openingDate || '待定'}</text>
114
+            <text className='active'>{formatDate(Info.openingDate, 'yyyy-MM-dd' ) || '待定'}</text>
111
           </view>
115
           </view>
112
         </view>
116
         </view>
113
         <view className='flex-h'>
117
         <view className='flex-h'>
119
             <text className='active'>{Info.volumeRate || '暂无'}</text>
123
             <text className='active'>{Info.volumeRate || '暂无'}</text>
120
           </view>
124
           </view>
121
           <view style='width: 60px;'>
125
           <view style='width: 60px;'>
122
-            <text>车位比率</text>
126
+            <text>车位数量</text>
123
           </view>
127
           </view>
124
           <text>:</text>
128
           <text>:</text>
125
           <view className='flex-item'>
129
           <view className='flex-item'>

+ 2
- 2
src/pages/index/buildingDetail/components/HouseTypeIntro/index.jsx Целия файл

32
                 <view className='Title'>
32
                 <view className='Title'>
33
                   <text>{item.apartmentName}</text>
33
                   <text>{item.apartmentName}</text>
34
                 </view>
34
                 </view>
35
-                <text>建面{item.buildingArea || `-`}m²</text>
36
-                <text>套内{item.insideArea || `-`}m²</text>
35
+                <text>建面{item.buildingArea || `-`}m²</text>
36
+                {/* <text>套内{item.insideArea || `-`}m²</text> */}
37
               </view>
37
               </view>
38
             ))
38
             ))
39
           }
39
           }

+ 1
- 1
src/pages/index/buildingDetail/components/ProjectDynamic/index.jsx Целия файл

27
       </view>
27
       </view>
28
 
28
 
29
       <view className='Info' onClick={handleClick}>
29
       <view className='Info' onClick={handleClick}>
30
-        <text className='Time'>{formatDate(info.trendTime, 'yyyy-M-d')}</text>
30
+        <text className='Time'>{formatDate(info.trendTime, 'yyyy-MM-dd')}</text>
31
         <text className='Title'>{info.trendTitle}</text>
31
         <text className='Title'>{info.trendTitle}</text>
32
         <text className='Desc'>{info.trendContent}</text>
32
         <text className='Desc'>{info.trendContent}</text>
33
       </view>
33
       </view>

+ 2
- 1
src/pages/index/buildingDynamic/index.jsx Целия файл

3
 import { fetch } from '@/utils/request'
3
 import { fetch } from '@/utils/request'
4
 import { API_ITEMS_DETAIL } from '@/constants/api'
4
 import { API_ITEMS_DETAIL } from '@/constants/api'
5
 import { ScrollView } from '@tarojs/components'
5
 import { ScrollView } from '@tarojs/components'
6
+import { formatDate } from '@/utils/chatDate'
6
 import '@/assets/css/iconfont.css'
7
 import '@/assets/css/iconfont.css'
7
 import './index.scss'
8
 import './index.scss'
8
 
9
 
33
             {
34
             {
34
               PageList.map((item, index) => (
35
               PageList.map((item, index) => (
35
                 <view key={`ListItem-${index}`}>
36
                 <view key={`ListItem-${index}`}>
36
-                  <text className='Time'>{item.trendTime}</text>
37
+                  <text className='Time'>{formatDate(item.trendTime, 'yyyy-M-dd')}</text>
37
                   <view className='ItemContent'>
38
                   <view className='ItemContent'>
38
                     <text className='Title'>{item.trendTitle}</text>
39
                     <text className='Title'>{item.trendTitle}</text>
39
                     <text className='desc'>{item.trendContent}</text>
40
                     <text className='desc'>{item.trendContent}</text>

+ 2
- 1
src/pages/index/buildingInfo/index.jsx Целия файл

39
       { name: '规划户数', value: Info.familyNum || '待定', key: '' },
39
       { name: '规划户数', value: Info.familyNum || '待定', key: '' },
40
       { name: '楼栋总数', value: Info.buildingNum || '待定', key: '' },
40
       { name: '楼栋总数', value: Info.buildingNum || '待定', key: '' },
41
       { name: '绿化率', value: Info.greeningRate || '待定', key: '' },
41
       { name: '绿化率', value: Info.greeningRate || '待定', key: '' },
42
-      { name: '项目说明', value: Info.dynamic || '暂无', key: '' },
42
+      // { name: '项目说明', value: Info.dynamic || '暂无', key: '' },
43
+      { name: '销售许可', value: Info.preSalePermit || '待定', key: '' },
43
       { name: '备案名', value: Info.recordName || '暂无', key: '' },
44
       { name: '备案名', value: Info.recordName || '暂无', key: '' },
44
     ]
45
     ]
45
   ]
46
   ]