静态页面

config/dev.js

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

project.config.json

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

src/components/ProjectItemCard/style.scss

@@ -43,8 +43,12 @@
       }
     }
     > text {
-      font-size: 32px;
+      font-size: 30px;
       font-weight: bold;
+      max-width: 50%;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
       &:last-child {
         color: #ff0000;
       }

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

@@ -36,13 +36,24 @@ export default function LivingActivity (props) {
 
       <view className='List flex-h'>
         {
-          List.map((item, index) => (
-            <view className='flex-item' key={`ListItem-${index}`} onClick={() => gotoDetail(item)}>
-              <view style={{display: item.listImg ? 'block' : 'none'}}>
-                <Image mode='aspectFill' src={getImgURL(item.listImg)} className='centerLabel'></Image>
-              </view>
+          List.length > 0 &&
+          <view className='flex-item' onClick={() => gotoDetail(List[0])}>
+            <view style={{display: List[0].listImg ? 'block' : 'none'}}>
+              <Image mode='aspectFill' src={getImgURL(List[0].listImg)} className='centerLabel'></Image>
             </view>
-          ))
+          </view>
+        }
+        {
+          List.length > 1 &&
+          <view className='flex-item' onClick={() => gotoDetail(List[1])}>
+            <view style={{display: List[1].listImg ? 'block' : 'none'}}>
+              <Image mode='aspectFill' src={getImgURL(List[1].listImg)} className='centerLabel'></Image>
+            </view>
+          </view>
+        }
+        {
+          List.length === 1 &&
+          <view className='flex-item'></view>
         }
       </view>
 

src/pages/index/components/ActivityListItem/index.scss

@@ -41,7 +41,8 @@
         text-align: center;
         border-radius: 60px;
         background: #B9B2B2;
-        width: 144px;
+        min-width: 124px;
+        padding: 0 10px;
         &.yellow {
           background: #FA9730;
         }

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

@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'
 import { useSelector } from 'react-redux'
 import Taro from '@tarojs/taro'
 import { queryActivityList } from '@/services/activity'
-import { Swiper, SwiperItem } from '@tarojs/components'
+import { Swiper, SwiperItem, Block } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
@@ -12,21 +12,23 @@ export default function HotRecommend (props) {
   const city = useSelector(state => state.city)
   const [MenuList] = useState([{ name: '热门活动', id: 'dymic' }, { name: '热门团房', id: 'house' }])
   const [CurrentId, setCurrentId] = useState('dymic')
-  const [list, setList] = useState([])
+  const [list, setList] = useState([[], []])
   const [CurrentContentInfo, setCurrentContentInfo] = useState({})
 
   useEffect(() => {
     if (city.curCity.name) {
       GetRecommendActivity()
     }
-  }, [city, CurrentId])
+  }, [city])
 
   const GetRecommendActivity = () => {
-
-    queryActivityList({ home: 1, cityId: city.curCity.id, type: CurrentId }).then((res) => {
+    queryActivityList({ home: 1, cityId: city.curCity.id, type: 'dymic' }).then((res) => {
       const resArr = res.records || []
-      setList(resArr)
-      change(!!resArr.length)
+      queryActivityList({ home: 1, cityId: city.curCity.id, type: 'house' }).then((subRes) => {
+        const subResArr = subRes.records || []
+        setList([resArr || [], subResArr || []])
+        change(resArr.length || subResArr.length)
+      })
     })
   }
 
@@ -62,24 +64,42 @@ export default function HotRecommend (props) {
           }
         </view>
         <view className='Content'>
-          {/* <view className='flex-h'>
-            <text className='flex-item'>{CurrentContentInfo.title || '暂无活动'}</text>
-            <text onClick={ToMore}>{CurrentId === 'dymic' ? '更多活动' : '更多团房'}</text>
-          </view>
-          <text>{CurrentContentInfo.halfTitle}</text> */}
           <Swiper autoplay interval={5000} vertical>
             {
-              list.map((item, index) => (
-                <SwiperItem key={`Banner-${index}`}>
-                  <view className='swiper-item'>
-                    <view className='flex-h'>
-                      <text className='flex-item' onClick={toDetail}>{item.title || '暂无活动'}</text>
-                      <text onClick={() => {ToMore()}}>{CurrentId === 'dymic' ? '更多活动' : '更多团房'}</text>
-                    </view>
-                    <text onClick={toDetail}>{item.halfTitle}</text>
-                  </view>
-                </SwiperItem>
-              ))
+              CurrentId === 'dymic' &&
+              <Block>
+                {
+                  list[0].map((item, index) => (
+                    <SwiperItem key={`Banner-${index}`}>
+                      <view className='swiper-item'>
+                        <view className='flex-h'>
+                          <text className='flex-item' onClick={toDetail}>{item.title || '暂无活动'}</text>
+                          <text onClick={() => { ToMore() }}>更多活动</text>
+                        </view>
+                        <text onClick={toDetail}>{item.halfTitle}</text>
+                      </view>
+                    </SwiperItem>
+                  ))
+                }
+              </Block>
+            }
+            {
+              CurrentId === 'house' &&
+              <Block>
+                {
+                  list[1].map((item, index) => (
+                    <SwiperItem key={`Banner-${index}`}>
+                      <view className='swiper-item'>
+                        <view className='flex-h'>
+                          <text className='flex-item' onClick={toDetail}>{item.title || '暂无活动'}</text>
+                          <text onClick={() => { ToMore() }}>更多团房</text>
+                        </view>
+                        <text onClick={toDetail}>{item.halfTitle}</text>
+                      </view>
+                    </SwiperItem>
+                  ))
+                }
+              </Block>
             }
           </Swiper>
         </view>

src/pages/index/findHouseFromMap/index.jsx

@@ -164,7 +164,6 @@ export default withLayout((props) => {
               <view className='flex-item'>
                 <text>{current.buildingName}</text>
               </view>
-              <text></text>
               <text>{current.price}</text>
             </view>
             <text className='Address'>{current.address}</text>

src/pages/index/findHouseFromMap/index.scss

@@ -141,11 +141,13 @@
             }
           }
           > text {
-            font-size: 32px;
+            font-size: 30px;
             font-weight: bold;
-            &:last-child {
-              color: #ff0000;
-            }
+            color: #ff0000;
+            max-width: 50%;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
           }
         }
         > .Address {