feats

config/prod.js

@@ -10,7 +10,7 @@ module.exports = {
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
-    Version: '"V0.0.39-20210811"'
+    Version: '"V0.0.40-20210811"'
   },
   mini: {},
   h5: {

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxe44244d1a5ea3364",
+	"appid": "wxc96058d57e77f373",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/pages/index/buildingDetail/components/BasicInfo/index.jsx

@@ -5,6 +5,7 @@ import AuthRole from '@/components/Auth/AuthRole'
 import { ROLE_CODE } from '@/constants/user'
 import classNames from 'classnames'
 import useFavor from '@/utils/hooks/useFavor'
+import { formatDate } from '@/utils/chatDate'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
@@ -53,35 +54,38 @@ export default function BasicInfo (props) {
         <view className='ProjectList'>
           <ScrollView scroll-x show-scrollbar={false}>
             {
-              (Info.buildingProjectType || []).map((item, index) => (
-                <view className='ListItem' key={`List-${index}`}>
-                  <Image mode='heightFix' src={require('@/assets/buildingDetail-icon4.jpg')} />
-                  <view>
+              (Info.buildingProjectType || []).map((item, index) => {
+                const priceUnit = item.priceType === 'average' ? '元/㎡' : '万元/套'
+                let price = item.startPrice === item.endPrice ? item.startPrice : `${item.startPrice}-${item.endPrice}`
+                if (!item.startPrice && !item.endPrice) {
+                  price = '暂无'
+                } else {
+                  price = `约${price}${priceUnit}`
+                }
+                
+                return (
+                  <view className='ListItem' key={`List-${index}`}>
+                    <Image mode='heightFix' src={require('@/assets/buildingDetail-icon4.jpg')} />
                     <view>
-                      <text>项目类型：</text>
-                      <text className='active black'>{item.buildingTypeName}</text>
+                      <view>
+                        <text>项目类型：</text>
+                        <text className='active black'>{item.buildingTypeName}</text>
+                      </view>
+                      <view>
+                        <text>房屋产权：</text>
+                        <text className='active'>{item.rightsYear}年</text>
+                        <text>装修标准：</text>
+                        <text className='active'>{item.decoration || '暂无'}</text>
+                      </view>
+                      <view>
+                        <text>项目参考价格：</text>
+                        <text className='active'>{price}</text>
+                      </view>
+                      <text className='SaleStatus active'>{item.marketStatus}</text>
                     </view>
-                    <view>
-                      <text>房屋产权：</text>
-                      <text className='active'>{item.rightsYear}年</text>
-                      <text>装修标准：</text>
-                      <text className='active'>{item.decoration || '暂无'}</text>
-                    </view>
-                    <view>
-                      <text>项目参考价格：</text>
-                      {
-                        (item.startPrice || item.endPrice) &&
-                        <text className='active'>约{item.startPrice}-{item.endPrice}元/㎡</text>
-                      }
-                      {
-                        !(item.startPrice || item.endPrice) &&
-                        <text className='active'>暂无数据</text>
-                      }
-                    </view>
-                    <text className='SaleStatus active'>{item.marketStatus}</text>
                   </view>
-                </view>
-              ))
+                )
+              })
             }
           </ScrollView>
         </view>
@@ -107,7 +111,7 @@ export default function BasicInfo (props) {
           </view>
           <text>：</text>
           <view className='flex-item3'>
-            <text className='active'>{Info.openingDate || '待定'}</text>
+            <text className='active'>{formatDate(Info.openingDate, 'yyyy-MM-dd' ) || '待定'}</text>
           </view>
         </view>
         <view className='flex-h'>
@@ -119,7 +123,7 @@ export default function BasicInfo (props) {
             <text className='active'>{Info.volumeRate || '暂无'}</text>
           </view>
           <view style='width: 60px;'>
-            <text>车位比率</text>
+            <text>车位数量</text>
           </view>
           <text>：</text>
           <view className='flex-item'>

src/pages/index/buildingDetail/components/HouseTypeIntro/index.jsx

@@ -32,8 +32,8 @@ export default function HouseTypeIntro (props) {
                 <view className='Title'>
                   <text>{item.apartmentName}</text>
                 </view>
-                <text>建面{item.buildingArea || `-`}m²</text>
-                <text>套内{item.insideArea || `-`}m²</text>
+                <text>建面约{item.buildingArea || `-`}m²</text>
+                {/* <text>套内{item.insideArea || `-`}m²</text> */}
               </view>
             ))
           }

src/pages/index/buildingDetail/components/ProjectDynamic/index.jsx

@@ -27,7 +27,7 @@ export default function ProjectDynamic (props) {
       </view>
 
       <view className='Info' onClick={handleClick}>
-        <text className='Time'>{formatDate(info.trendTime, 'yyyy-M-d')}</text>
+        <text className='Time'>{formatDate(info.trendTime, 'yyyy-MM-dd')}</text>
         <text className='Title'>{info.trendTitle}</text>
         <text className='Desc'>{info.trendContent}</text>
       </view>

src/pages/index/buildingDynamic/index.jsx

@@ -3,6 +3,7 @@ import withLayout from '@/layout'
 import { fetch } from '@/utils/request'
 import { API_ITEMS_DETAIL } from '@/constants/api'
 import { ScrollView } from '@tarojs/components'
+import { formatDate } from '@/utils/chatDate'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
@@ -33,7 +34,7 @@ export default withLayout((props) => {
             {
               PageList.map((item, index) => (
                 <view key={`ListItem-${index}`}>
-                  <text className='Time'>{item.trendTime}</text>
+                  <text className='Time'>{formatDate(item.trendTime, 'yyyy-M-dd')}</text>
                   <view className='ItemContent'>
                     <text className='Title'>{item.trendTitle}</text>
                     <text className='desc'>{item.trendContent}</text>

src/pages/index/buildingInfo/index.jsx

@@ -39,7 +39,8 @@ export default withLayout((props) => {
       { name: '规划户数', value: Info.familyNum || '待定', key: '' },
       { name: '楼栋总数', value: Info.buildingNum || '待定', key: '' },
       { name: '绿化率', value: Info.greeningRate || '待定', key: '' },
-      { name: '项目说明', value: Info.dynamic || '暂无', key: '' },
+      // { name: '项目说明', value: Info.dynamic || '暂无', key: '' },
+      { name: '销售许可', value: Info.preSalePermit || '待定', key: '' },
       { name: '备案名', value: Info.recordName || '暂无', key: '' },
     ]
   ]