feats

config/dev.js

@@ -4,7 +4,7 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"http://192.168.89.147:8080"',
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
+    HOST: '"https://sgl-v2.njyunzhi.com"',
   },
   mini: {},
   h5: {}

config/prod.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://sgl-v2-test.njyunzhi.com"',
+    HOST: '"https://sgl-v2.njyunzhi.com"',
   },
   mini: {},
   h5: {

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "miniapp",
   "description": "十公里",
-  "appid": "wx835627a9b9b3932a",
+  "appid": "wx06a7372d48d56843",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/components/List/index.jsx

@@ -81,6 +81,7 @@ export default React.forwardRef((props, ref) => {
   // 请求数据
   useEffect(() => {
     fetchRef.current(payload)
+    console.log('------------list----------------', payload, request)
   }, [payload, request])
 
   useEffect(() => {

src/components/MoreGuide/style.less

@@ -6,6 +6,6 @@
     font-size: 28px;
     font-weight: 400;
     color: #202020;
-    line-height: 54px;
+    line-height: 64px;
     padding-bottom: 10px;
   }

src/hotel/pages/components/Extend/style.less

@@ -45,7 +45,7 @@
   }
   .storezn{
     color: #202020;
-    line-height: 54px;
+    line-height: 64px;
     margin-bottom: 60px;
     text-align: justify;
   }

src/pages/details/components/Extend/extend.less

@@ -1,8 +1,11 @@
 .cardext{
+  padding: 0 30px;
+  box-sizing: border-box;
+
   .storezn{
     font-size: 28px;    
     color: #202020;
-    line-height: 54px;
+    line-height: 64px;
     margin-bottom: 40px;
     text-align: justify;
   }

src/pages/details/foodDetails/foodDetails.jsx

@@ -109,12 +109,12 @@ export default withLayout((props) => {
         setimglist(res.imageList || []);
         setLoading(false)
       }).catch(() => setLoading(false));
-      getShopPackage(id).then((res) => {
+      getShopPackage(id, { pageSize: 500 }).then((res) => {
         setPackage(res.records || []);
         setNewpgNum(res.records.length);
         setAllpgNum(res.total);
       });
-      getExtendContent("shop", id, { pageNum: 999 }).then((res) => {
+      getExtendContent("shop", id, { pageSize: 500 }).then((res) => {
         setExtend(res.records || []);
         setAllextNum(res.total);
         setNewextNum(res.records.length);

src/pages/details/foodDetails/foodDetails.less

@@ -164,7 +164,7 @@
 .storezn {
   font-size: 28px;
   color: #202020;
-  line-height: 54px;
+  line-height: 64px;
   margin-bottom: 44px;
 }
 .storezn + image {

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -79,7 +79,7 @@ export default withLayout((props) => {
           setRecommend(res2 || [])
         })
       })
-      getExtendContent('tourist', id, { pageNum: 99999 }).then((res) => {
+      getExtendContent('tourist', id, { pageSize: 500 }).then((res) => {
         setExtend(res.records || [])
         setAllextNum(res.total)
         setNewextNum(res.records.length)
@@ -158,7 +158,7 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={titlejd} />景点介绍
             </view>
-            {(extend || []).map((item) => <Extend item={item} />)}
+              {(extend || []).map((item) => <Extend item={item} />)}
 
           </view>
           <view style={{ position: 'relative', marginTop: '6em', display: recommend == '' ? 'none' : '' }}>

src/pages/index/tabs/Guide.jsx

@@ -67,9 +67,7 @@ export default (props) => {
 
   const geiZy = () => {
     setLoading(true)
-    getExtendContent('room', roomId, {
-
-    }).then((res) => {
+    getExtendContent('room', roomId, { pageSize: 500 }).then((res) => {
       // setExtend(res.records || [])
       setExtend(res.records)
       setIfroomId('reality')
@@ -162,9 +160,7 @@ export default (props) => {
   }
 
   return (
-    <scroll-view scrollY style='height:100%;'  >
-      <SpinBox loading={loading}>
-
+    <scroll-view scrollY style={{ height: '100%' }}  >
         <view className='Guide-Home-box'>
           {
             ifroomId === 'havenot' && (
@@ -177,7 +173,7 @@ export default (props) => {
           {/* 有民宿的情况下 */}
           {
             ifroomId === 'reality' && (
-              <view>
+              <SpinBox loading={loading}>
                 <view className='room-box-info-ROOM'>
                   <view className='room-bi-name-ROOM' >
                     <view className='room-bin-title-ROOM'>房屋名称</view>
@@ -245,9 +241,11 @@ export default (props) => {
                     <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
                     <text className='title-title-boss' >更多指引</text>
                   </view>
-                  {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
+                  <view style={{ padding: '0 30rpx', boxSizing: 'border-box' }}>
+                    {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
+                  </view>
                 </view>
-              </view>
+              </SpinBox>
             )
           }
           <view className='Guide-Content-box'>
@@ -261,7 +259,6 @@ export default (props) => {
           </view>
 
         </view>
-      </SpinBox>
     </scroll-view>
   )
 }

src/pages/index/tabs/Recommend.jsx

@@ -11,6 +11,7 @@ import { getIndexType, getResourceList } from '@/services/home'
 import Card from '../components/Card'
 import './less/Recommend.less'
 
+const listStyle = { height: 'calc(100% - 145px)' }
 
 export default (props) => {
   const { router, person, location } = props
@@ -19,7 +20,7 @@ export default (props) => {
   const [typeList, setTypeList] = useState([])
   const listRef = useRef()
 
-  const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
+  const [queryParams, setQueryParams] = useState({ location, pageNum: 1, pageSize: 10, typeId: '' })
 
   // 获取资源表信息
   const [alllist, setAllList] = useState([])
@@ -27,17 +28,16 @@ export default (props) => {
   const tabs = [{ title: '附近' }].concat(typeList.map(x => ({ ...x, title: x.typeName })))
   //切换上面的标签
   const handleTabChange = (e) => {
+    console.log('------------handleTabChange-------', queryParams)
     const { index } = e.detail
     setActiveTab(index)
-    const tab = tabs[index].typeId
+    const tab = tabs[index].typeId || ''
+
     setQueryParams({
       ...queryParams,
       typeId: tab
     })
 
-    if (index == 0) {
-      setQueryParams({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
-    }
     //如果context有的话代表他滚动了   那么切换tab页就置顶
     if (listRef.current?.context) {
       listRef.current.context.scrollTo({ top: 0 })
@@ -64,6 +64,8 @@ export default (props) => {
 
   }
 
+  console.log('-------------------', queryParams)
+
 
   useDidShow(() => {
     likeLook()
@@ -102,8 +104,7 @@ export default (props) => {
       {/* <View style={{ flex:'auto' }}> */}
         <List
           ref={listRef}
-          style={{ height: 'calc(100% - 145px)' }}
-          // style={{ flex: 'auto', height: '100%' }}
+          style={listStyle}
           request={getResourceList}
           params={queryParams}
           onDataChange={setAllList}