feats

package.json

@@ -41,7 +41,6 @@
     "@tarojs/react": "3.0.13",
     "@tarojs/runtime": "3.0.13",
     "@tarojs/taro": "3.0.13",
-    "lodash": "4.17.15",
     "lodash.groupby": "^4.6.0",
     "miniprogram-recycle-view": "^0.1.5",
     "react": "^16.10.0",

src/compents/Picker/index.jsx

@@ -7,7 +7,6 @@ export default props => {
 
   const handleChange = e => {
     const inx = e.detail.value - 0
-    console.log('---------->>>>', inx, range)
     setPos(inx)
     if (props.onChange) {
       props.onChange(range[inx])
@@ -40,7 +39,10 @@ export default props => {
 
   return (
     <picker value={pos} range={range} range-key={rangeKey} onChange={handleChange}>
-      <view>{label ? `${preTitle} ${label}` : placeholder}</view>
+      <view style="display: flex">
+        <view style="flex: auto">{label ? `${preTitle} ${label}` : placeholder}</view>
+        <view style="flex: none">&gt;</view>
+      </view>
     </picker>
   )
 }

src/compents/RecycleList/index.jsx

@@ -9,6 +9,10 @@ export default props => {
   
   const hanldeScrollToLower = e => {
     if ((props.list || []).length >= (props.total - 0)) {
+      Taro.showToast({
+        title: '没有更多数据了~~',
+        icon: 'none'
+      })
       return
     }
 
@@ -37,6 +41,8 @@ export default props => {
     }
   }, [props.width, props.height])
 
+  // console.log('--------list---------->', props.list)
+
   return (
     <recycle-view
       id={id.current}

src/pages/adminUser/index.jsx

@@ -10,7 +10,6 @@ import upload from '../../assets/upload.png'
 import menuicon from '../../assets/menuicon.png'
 
 import './index.scss'
-import { xor } from 'lodash';
 
 const menuList = [{
   title: '民宿宿老板账号管理',

src/pages/house/list/index.jsx

@@ -3,10 +3,12 @@ import React, {
   useMemo,
   useState,
   forwardRef,
-  useImperativeHandle
+  useImperativeHandle,
+  useCallback
 } from "react";
 import Taro, { useDidShow } from "@tarojs/taro";
 import { useSelector } from 'react-redux'
+// import debounce from 'lodash.debounce'
 import "./index.scss";
 import { View, Text, Input, Image } from "@tarojs/components";
 import ContainerLayout from "../../../compents/container/index";
@@ -38,6 +40,8 @@ let house = (props, ref) => {
 
   const getHouseList = () => {
     if (!queryParams.shopId) return
+    
+    // console.log('---------->>>>', queryParams.shopId, queryParams.pageNum)
 
     request({
       url: "/taHouse",
@@ -45,9 +49,14 @@ let house = (props, ref) => {
     }).then(res => {
       const { records, ...page } = res.data.data;
 
+      // console.log('-----page------>', page)
+
       if (page.current !== 1) {
+        // console.log('-----page---1--->', page.current)
         setList(list.concat(records));
       } else {
+        // console.log('-----page---2--->')
+        // setList([]);  // 这句不能删, 部分机型上直接替换 list 不生效
         setList(records);
       }
       setTotal(page.total);
@@ -59,7 +68,7 @@ let house = (props, ref) => {
       ...queryParams,
       pageNum: queryParams.pageNum + 1
     });
-  };
+  }
 
   const onShare = x => {
     Taro.navigateTo({ url: `/pages/share/index?houseId=${x.houseId}&&title=${x.title}` });

src/pages/landlord/index.jsx

@@ -97,14 +97,14 @@ const index = (props) => {
         shopList.length > 1 &&
         (
           <mp-cells>
-            <mp-cell link>
+            <mp-cell>
               <Picker
                 value={defaultShop}
                 range={shopList}
                 rangeKey="text"
                 rangeValue="value"
-                preTitle="当前店铺"
-                placeholder="请选择店铺"
+                preTitle="当前店铺: "
+                placeholder="请选择店铺 ..."
                 onChange={handleSelectShop}
               />
             </mp-cell>

yarn.lock

@@ -8178,7 +8178,7 @@ lodash.clonedeep@^4.5.0:
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz?cache=0&sync_timestamp=1600349120640&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash.debounce%2Fdownload%2Flodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  resolved "https://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
 lodash.groupby@^4.6.0:
@@ -8196,11 +8196,6 @@ lodash.toarray@^4.4.0:
   resolved "https://registry.npm.taobao.org/lodash.toarray/download/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
   integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE=
 
-lodash@4.17.15:
-  version "4.17.15"
-  resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=
-
 lodash@4.17.20, "lodash@4.6.1 || ^4.16.1", lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@~4.17.10:
   version "4.17.20"
   resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"