feats

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"',
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
   },
   mini: {},

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState, useImperativeHandle } from 'react';
+import React, { useEffect, useRef, useState, useImperativeHandle, useMemo } from 'react';
 import SpinBox from "@/components/Spin/SpinBox";
 
 import { ScrollView } from '@tarojs/components';
@@ -24,6 +24,8 @@ export default React.forwardRef((props, ref) => {
   const pageRef = useRef({ current: 1 })
   const [hasMore, setHasMore] = useState(false)
 
+  const uqCls = useMemo(() => `f-${Math.random().toString(36).substring(2)}`, [])
+
   // 滚动
   const handleScrollToLower = (e) => {
     if (!loading && hasMore) {
@@ -78,7 +80,7 @@ export default React.forwardRef((props, ref) => {
 
   useEffect(() => {
     Taro.nextTick(() => {
-      Taro.createSelectorQuery().select('.list-view').node(function (res) {
+      Taro.createSelectorQuery().select(`.${uqCls}`).node(function (res) {
         contextRef.current = res.node
       }).exec()
     })
@@ -98,7 +100,7 @@ export default React.forwardRef((props, ref) => {
         enhanced
         onScrollToLower={handleScrollToLower}
         {...leftProps}
-        className={`${className} list-view`}
+        className={`${className} ${uqCls} list-view`}
       >
         {!render
           ? props.children

src/components/MasonryLayout/index.jsx

@@ -23,57 +23,72 @@ export default (props) => {
   const { list, rfTimes: refresh } = listData
 
   // 用来绘制页面的数据
-  const renderListRef = useRef([])
+  // const renderListRef = useRef([])
 
   const lastList = usePrevious(list)
-  const lastRf = usePrevious(refresh)
+  // const lastRf = usePrevious(refresh)
 
 
   // 记录左右2栏的数据及高度
-  const leftHeight = useRef(0)
-  const rightHeight = useRef(0)
-  const [leftList, appendLeft, setLeftList] = useColumn()
-  const [rightList, appendRight, setRightList] = useColumn()
+  // const leftHeight = useRef(0)
+  // const rightHeight = useRef(0)
+  // const [leftList, appendLeft, setLeftList] = useColumn()
+  // const [rightList, appendRight, setRightList] = useColumn()
+  const [leftList, setLeftList] = useState([])
+  const [rightList, setRightList] = useState([])
   
   // 渲染逻辑
-  const forceRender = useRenderFunc(renderListRef, leftHeight, rightHeight, appendLeft, appendRight)
+  // const forceRender = useRenderFunc(renderListRef, leftHeight, rightHeight, appendLeft, appendRight)
 
   // 每个元素渲染完成, 会拿到当前栏的高度
   const handleRenderFinish = (direct) => (height) => {
-    if (direct === 'left') {
-      leftHeight.current = height
-    } else {
-      rightHeight.current = height
-    }
-
-    //
-    forceRender.current()
+    // if (direct === 'left') {
+    //   leftHeight.current = height
+    // } else {
+    //   rightHeight.current = height
+    // }
+
+    // //
+    // forceRender.current()
   }
   
-  console.debug('------leftHeight------->', leftHeight.current)
-  console.debug('------rightHeight------->', rightHeight.current)
-  console.debug('------renderListRef------->', renderListRef.current)
-  console.debug('------list------->', list)
+  // console.debug('------leftHeight------->', leftHeight.current)
+  // console.debug('------rightHeight------->', rightHeight.current)
+  // console.debug('------renderListRef------->', renderListRef.current)
+  // console.debug('------list------->', list)
 
   useEffect(() => {
     if (lastList && lastList === list) return;
 
-    // 新数据源 = 首次进入 或者 切换数据源
-    const isNew = (!lastList?.length && list.length) || (lastRf !== refresh)
-
-    if (!isNew) {
-      // 非新数据源, list 变更那就说明是执行了上拉加载      
-      // 于是, 只继续绘制变更的那部分
-      renderListRef.current = list.slice(lastList.length)
-    } else {
-      leftHeight.current = 0
-      rightHeight.current = 0
-      setLeftList([])
-      setRightList([])
-      renderListRef.current = list ? list.slice() : []
-    }
-
-    forceRender.current()
+    // // 新数据源 = 首次进入 或者 切换数据源
+    // const isNew = (!lastList?.length && list.length) || (lastRf !== refresh)
+
+    // if (!isNew) {
+    //   // 非新数据源, list 变更那就说明是执行了上拉加载      
+    //   // 于是, 只继续绘制变更的那部分
+    //   renderListRef.current = list.slice(lastList.length)
+    // } else {
+    //   leftHeight.current = 0
+    //   rightHeight.current = 0
+    //   setLeftList([])
+    //   setRightList([])
+    //   renderListRef.current = list ? list.slice() : []
+    // }
+
+    // forceRender.current()
+
+    const lst1 = []
+    const lst2 = []
+    list.map((item, index) => {
+      if (index % 2 === 0) {
+        lst1.push(item)
+      } else {
+        lst2.push(item)
+      }
+    })
+
+    setLeftList(lst1)
+    setRightList(lst2)
   }, [lastList, list])
 
   return (

src/pages/index/tabs/Recommend.jsx

@@ -26,7 +26,6 @@ export default (props) => {
   // 获取资源表信息
   // const [alllist, setAllList] = useState([])
   const [listData, setListData] = useState({ list: [], rfTimes: 0 })
-  const { isSaved } = listData
 
 
   //分类标签
@@ -41,16 +40,22 @@ export default (props) => {
       ...queryParams,
       typeId: tab
     })
-
-    //如果context有的话代表他滚动了   那么切换tab页就置顶
-    if (listRef.current?.context) {
-      listRef.current.context.scrollTo({ top: 0 })
-    }
   }
 
   const handleDataChange = (value, e) => {
     if (e.paramsChanged) {
       rfTimes.current += 1
+      
+      //如果context有的话代表他滚动了   那么切换tab页就置顶
+      if (listRef.current?.context) {
+        Taro.nextTick(() => {
+          const t = setTimeout(() => {
+            console.log('------------>', listRef.current.context.scrollTo)
+            listRef.current.context.scrollTo({ top: 0 })
+            clearTimeout(t)
+          }, 500)
+        })
+      }
     }
 
     setListData({ list: value, rfTimes: rfTimes.current })

src/utils/preFetchData.js

@@ -25,7 +25,17 @@ export default () => {
           },
           fail(err) {
             console.error(err)
-            reject(err)
+            // reject(err)
+            Taro.showToast({
+              title: '获取定位失败',
+              icon: 'none',
+            })
+
+            // 默认新街口
+            const location = '116.367742,39.940667';
+            resolve({
+              location,
+            })
           }
         })
       }