静态页面

config/dev.js

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

src/pages/index/components/HotRecommend/index.jsx

@@ -61,7 +61,7 @@ export default function HotRecommend (props) {
             ))
           }
         </view>
-        <view className='Content' onClick={toDetail}>
+        <view className='Content'>
           {/* <view className='flex-h'>
             <text className='flex-item'>{CurrentContentInfo.title || '暂无活动'}</text>
             <text onClick={ToMore}>{CurrentId === 'dymic' ? '更多活动' : '更多团房'}</text>
@@ -73,10 +73,10 @@ export default function HotRecommend (props) {
                 <SwiperItem key={`Banner-${index}`}>
                   <view className='swiper-item'>
                     <view className='flex-h'>
-                      <text className='flex-item'>{item.title || '暂无活动'}</text>
-                      <text onClick={ToMore}>{CurrentId === 'dymic' ? '更多活动' : '更多团房'}</text>
+                      <text className='flex-item' onClick={toDetail}>{item.title || '暂无活动'}</text>
+                      <text onClick={() => {ToMore()}}>{CurrentId === 'dymic' ? '更多活动' : '更多团房'}</text>
                     </view>
-                    <text>{item.halfTitle}</text>
+                    <text onClick={toDetail}>{item.halfTitle}</text>
                   </view>
                 </SwiperItem>
               ))

src/pages/index/specialPriceHouse/index.jsx

@@ -31,6 +31,7 @@ export default withLayout((props) => {
   const GetPageList = () => {
     setHasNextPage(false)
     fetch({ url: API_SPECIAL_ROOM_LIST, method: 'get', payload: { pageNumber, pageSize: 10, cityId: city?.id } }).then((res) => {
+      console.log(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)
@@ -73,10 +74,10 @@ export default withLayout((props) => {
           <view className='List'>
             {
               PageList.map((item, index) => {
-                const mainImg = getImgURL(item?.buildingListImg?.length ? item.buildingListImg[0].url : null)
+                const mainImg = getImgURL((item?.buildingListImg || []).length ? item.buildingListImg[0].url : null)
                 const price = item.price || '价格待定'
                 const shareNum = item.shareList?.total || 0
-                const uvNum = item.uvList?.length || 0
+                const uvNum = (item?.uvList || []).length || 0
 
                 // 最多6个
                 const tags = (item.buildingTag || []).map(x => x.tagName).slice(0, 6)
@@ -98,7 +99,7 @@ export default withLayout((props) => {
                       <view className='Img' onClick={() => goto(item)}>
                         <Image mode='scaleToFill' src={mainImg} className='centerLabel'></Image>
                         {
-                          item.panoramaList.length > 0 &&
+                          (item?.panoramaList || []).length > 0 &&
                           <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
                         }
                         {

src/pages/video/components/VideoListItem/index.jsx

@@ -19,7 +19,7 @@ export default function VideoListItem (props) {
     <view className='components VideoListItem' onClick={()=>toDetail()}>
       <view className='Img'>
         <view>
-          <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.images) || null} />
+          <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.images || Data.videImg) || null} />
           {
             Data.type === 'live' && new Date(Data.startTime).getTime() <= Date.now() &&
             <text className='active'>直播中</text>
@@ -35,7 +35,7 @@ export default function VideoListItem (props) {
         </view>
       </view>
       <view className='Title'>
-        <text>{Data.title}</text>
+        <text>{Data.title || Data.name}</text>
       </view>
       <view className='Location flex-h'>
         <text className='iconfont icon-dingwei'></text>

src/pages/video/index.jsx

@@ -18,6 +18,7 @@ export default withLayout((props) => {
     { name: '新房推荐', id: 'new' },
     { name: '视频', id: 'video' }
   ])
+  const [PageList, setPageList] = useState([])
   // 全部或者新房的列表
   const [activityList, setActivityList] = useState([])
   // 预告与直播的列表
@@ -36,18 +37,18 @@ export default withLayout((props) => {
     if (['all', 'new'].indexOf(CurrnetMenuId) > -1) {
       // 全部与新房用的一个接口
       fetch({ url: API_LIVE_LIST, payload: { ...params, cityId: city.id }, spin: true }).then((res) => {
-        setActivityList(res.records || [])
+        setPageList(res.records || [])
       })
     } else if (['notice', 'live'].indexOf(CurrnetMenuId) > -1) {
       // 预告与直播是虽然是同一个接口, 但是返回值字段不一样
       const process = 'notice' === CurrnetMenuId ? 1 : 2;
       fetch({ url: API_LIVE_LIST, payload: { ...params, cityId: city.id, process }, spin: true}).then((res) => {
-        setLiveList(res.records || [])
+        setPageList(res.records || [])
       })
     } else {
       // 视频另外一个接口
       fetch({ url: API_VIDEO_LIST, payload: { ...params, cityId: city.id }, spin: true }).then((res) => {
-        setVideoList(res.records || [])
+        setPageList(res.records || [])
       })
     }
   }
@@ -87,32 +88,7 @@ export default withLayout((props) => {
           <ScrollView scroll-y>
             <view className='PageContent'>
               {
-                /* 全部 与 新房 */
-                ['all', 'new'].indexOf(CurrnetMenuId) > -1 && activityList.map((item, index) => (
-                  <view className='ListItem' key={`List-${index}`}>
-                    <view>
-                      <view>
-                        <VideoListItem Data={item}></VideoListItem>
-                      </view>
-                    </view>
-                  </view>
-                ))
-              }
-              {
-                /* 预告 与 直播 */
-                ['notice', 'live'].indexOf(CurrnetMenuId) > -1 && activityList.map((item, index) => (
-                  <view className='ListItem' key={`List-${index}`}>
-                    <view>
-                      <view>
-                        <VideoListItem Data={item}></VideoListItem>
-                      </view>
-                    </view>
-                  </view>
-                ))
-              }
-              {
-                /* 视频 */
-                'video' === CurrnetMenuId && activityList.map((item, index) => (
+                PageList.map((item, index) => (
                   <view className='ListItem' key={`List-${index}`}>
                     <view>
                       <view>