Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"http://127.0.0.1:8081"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"http://127.0.0.1:8081"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',

config/prod.js

@@ -3,10 +3,10 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"', //正式
-    WSS_HOST: '"wss://xlk.njyz.tech"',
-    OSS_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
-    OSS_FAST_PATH: '"https://zhiyun-image.oss-accelerate.aliyuncs.com/"',
+    HOST: '"https://xlj.newlandsh.com"', //正式
+    WSS_HOST: '"wss://xlj.newlandsh.com"',
+    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: '"V3.5.29-20201112"'
   },

src/constants/api.js

@@ -255,3 +255,7 @@ export const API_SHARE_INFOLIST = resolvePath('sharePersonInfoList')
 export const API_BIND_CUSTOMER = resolvePath('judgeBindCustomer')
 // 消息模板
 export const API_TEMPLATE_TYPE = resolvePath('template/of/')
+
+// 品牌商
+export const API_BRAND_LIST = resolvePath('brand')
+export const API_BRAND_INFO = resolvePath('brand')

src/pages/index/brandDetail/index.jsx

@@ -1,14 +1,49 @@
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import withLayout from '@/layout'
 import Taro from '@tarojs/taro'
 import { ScrollView, Image } from '@tarojs/components'
 import ProjectListItem from '@/components/ProjectListItem/index'
+import { queryBrandInfo } from '@/services/common';
+import { getItemList } from '@/services/item';
+import { getImgURL } from '@/utils/image'
 import '@/assets/css/iconfont.css'
-import './index.scss'
 import ColumnTitle from '../components/ColumnTitle/index'
+import './index.scss'
+
+export default withLayout((props) => {
+  const { router } = props
+  const { id } = router.params
 
-export default withLayout(() => {
   const [ProjectList, setProjectList] = useState([{}, {}])
+  const [brandInfo, setBrandInfo] = useState({})
+
+  const getList = (params) => {
+    Taro.showLoading()
+    getItemList({
+      brandId: id,
+      ...(params || {}),
+    }).then((res) => {
+      const { records } = res
+      setProjectList(records || {})
+      Taro.hideLoading()
+    }).catch((err) => {
+      console.error(err)
+      Taro.hideLoading()
+    })
+  }
+
+  useEffect(() => {
+    if (id) {
+      queryBrandInfo(id).then((res) => {
+        setBrandInfo(res || {})
+      }).catch((err) => {
+        console.error(err)
+      })
+
+      getList({ pageNumber: 1 })
+    }
+  }, [id])
+
   return (
     <view className='brandDetail'>
       <ScrollView scroll-y>
@@ -16,16 +51,15 @@ export default withLayout(() => {
 
           {/* 主图 */}
           <view className='Top'>
-            <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
+            <Image mode='scaleToFill' src={getImgURL(brandInfo.brandImg)} className='centerLabel'></Image>
           </view>
 
           {/* 简介 */}
           <view className='Desc'>
             <view>
-              <Image mode='heightFix' src={null} className='Logo'></Image>
+              <Image mode='heightFix' src={getImgURL(brandInfo.brandLogo)} className='Logo'></Image>
               <view>
-                <text>“东原”</text>
-                <text>是一家以地产开发、商业运营、物业服务为核心的大型综合企业。始终坚持稳健创进的发展战略，深耕精选,布局全国一线及强二线城市,位列2020中国房地产开发企业TOP44。</text>
+                <text>{brandInfo.brandRemark}</text>
               </view>
             </view>
           </view>

src/pages/index/brandDetail/index.scss

@@ -47,11 +47,11 @@
             >text {
               font-size: 22px;
               line-height: 48px;
-              &:first-child {
-                font-size: 48px;
-                font-weight: bold;
-                line-height: 1;
-              }
+              // &:first-child {
+              //   font-size: 48px;
+              //   font-weight: bold;
+              //   line-height: 1;
+              // }
             }
           }
         }

src/pages/index/brandList/index.jsx

@@ -2,14 +2,12 @@ import { useState, useEffect } from 'react';
 import Taro from '@tarojs/taro';
 import withLayout from '@/layout';
 import { ScrollView, View, Block, Image } from '@tarojs/components';
+import { queryBrandList } from '@/services/common';
+import { getImgURL } from '@/utils/image';
 import '@/assets/css/iconfont.css';
-import { queryCityList } from '@/services/common';
-import { dispatchCitySelected } from '@/actions/city';
-import { useDispatch } from 'react-redux';
 import './index.scss';
 
 export default withLayout(() => {
-  const dispatch = useDispatch();
   const [list, setList] = useState({});
 
   useEffect(() => {
@@ -17,26 +15,24 @@ export default withLayout(() => {
   }, [])
 
   function initData () {
-    queryCityList().then((cityList) => {
-      console.log(`ttt`, cityList)
-      const t = cityList.reduce((prev, cur) => {
-        if (prev[cur.initial]) {
-          prev[cur.initial].push(cur)
+    queryBrandList({ pageSize: 500 }).then((res) => {
+      const { records } = res
+      const lst = (records || []).reduce((prev, cur) => {
+        if (prev[cur.indexLetter]) {
+          prev[cur.indexLetter].push(cur)
         } else {
-          prev[cur.initial] = [cur]
+          prev[cur.indexLetter] = [cur]
         }
         return prev
       }, {})
 
-      setList(t)
+      setList(lst)
     })
   }
 
   function handleSelected (item) {
-    dispatchCitySelected(item)(dispatch).then(() => {
-      Taro.navigateBack({
-        delta: 1,
-      })
+    Taro.navigateTo({
+      url: `/pages/index/brandDetail/index?id=${item.brandId}`,
     })
   }
 
@@ -56,9 +52,9 @@ export default withLayout(() => {
               <Block key={key}>
                 <View className='city-initial'>{key}</View>
                 {list[key].map((item) => (
-                  <View key={item.id} className='city-item' onClick={() => handleSelected(item)}>
-                    <Image mode='heightFix' src={null}></Image>
-                    <text>{item.shortname}</text>
+                  <View key={item.brandId} className='city-item' onClick={() => handleSelected(item)}>
+                    <Image mode='heightFix' src={getImgURL(item.brandLogo)}></Image>
+                    <text>{item.brandName}</text>
                   </View>
                 ))}
               </Block>

src/pages/index/brandList/index.scss

@@ -14,14 +14,17 @@
   .city-item {
     padding: 30px 50px;
     background: white;
+
     >image {
       width: auto;
       height: 44px;
       margin-right: 10px;
+      vertical-align: middle;
     }
     >text {
       font-size: 34px;
       font-weight: bold;
+      vertical-align: middle;
     }
   }
 }

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

@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { useSelector } from 'react-redux'
 import { Image } from '@tarojs/components'
-import AuthRole from '@/components/auth/AuthRole'
+import AuthRole from '@/components/Auth/AuthRole'
 // import Poster from '@/components/Poster'
 import { queryActivityList } from '@/services/activity'
 import { ROLE_CODE } from '@/constants/user'

src/pages/index/buildingDetail/index.jsx

@@ -64,6 +64,9 @@ export default withLayout((props) => {
 
   }, [id, router.path])
 
+  // 户型图
+  const houseTypeImages = (DetailInfo?.buildingApartment || []).filter(x => x.apartmentType === 'apart')
+
   return (
     <view className='Page buildingDetail flex-v'>
       <view className='flex-item'>
@@ -110,7 +113,7 @@ export default withLayout((props) => {
 
                 {/* 户型介绍 */}
                 <view className='HouseTypeIntro' style={{minHeight: 0}}>
-                  <HouseTypeIntro Info={DetailInfo?.buildingApartment}></HouseTypeIntro>
+                  <HouseTypeIntro Info={houseTypeImages}></HouseTypeIntro>
                 </view>
 
                 {/* 营销活动 */}

src/pages/index/buildingInfo/index.jsx

@@ -22,6 +22,7 @@ export default withLayout((props) => {
       { name: '均价', value: Info.price || '待定', key: '' },
       { name: '销售状态', value: Info.marketStatus || '待定', key: '' },
       { name: '开盘日期', value: formateDate(Info.openingDate) || '待定', key: '' },
+      { name: '交房时间', value: formateDate(Info.receivedDate) || '待定', key: '' },
       { name: '楼盘地址', value: Info.address || '暂无', key: '' },
     ],
     [

src/pages/index/components/Menu/index.jsx

@@ -7,7 +7,7 @@ export default function Menu (props) {
   const List = [
     { name: '全部楼盘', id: 1, icon: require('../../../../assets/index-icon9.png'), router: '/pages/index/buildingList/index' },
     { name: '品牌地产', id: 2, icon: require('../../../../assets/index-icon8.png'), router: '/pages/index/brandList/index' },
-    { name: '近期开盘', id: 3, icon: require('../../../../assets/index-icon6.png'), router: `/pages/index/buildingList/index?type=2` },
+    { name: '近期开盘', id: 3, icon: require('../../../../assets/index-icon6.png'), router: `/pages/index/buildingList/index?isRecentOpening=1` },
     { name: '帮我找房', id: 4, icon: require('../../../../assets/index-icon1.png'), router: '/pages/index/helpToFindHouse/index' },
     { name: '增值服务', id: 5, icon: require('../../../../assets/index-icon16.png'), router: '/pages/index/addedValueService/index' },
     { name: '地图找房', id: 6, icon: require('../../../../assets/index-icon2.png'), router: '/pages/index/findHouseFromMap/index' },

src/services/common.js

@@ -7,6 +7,8 @@ import {
   API_BURIED_POINT,
   API_CITY_LIST,
   API_TEMPLATE_TYPE,
+  API_BRAND_LIST,
+  API_BRAND_INFO,
   API_INDEX_ICONS
 } from "@/constants/api";
 
@@ -88,3 +90,16 @@ export const queryCityList = () => fetch({ url: API_CITY_LIST });
  */
 export const queryMessageTPL = type =>
   fetch({ url: `${API_TEMPLATE_TYPE}/${type}` });
+
+
+/**
+ * 获取品牌房企列表
+ * @param {*}
+ */
+export const queryBrandList = (params) => fetch({ url: API_BRAND_LIST, params });
+
+/**
+ * 获取品牌房企列表
+ * @param {*}
+ */
+ export const queryBrandInfo = (id) => fetch({ url: `${API_BRAND_INFO}/${id}`});