fix

src/pages/account/index.jsx

@@ -8,23 +8,27 @@ import Layout from '../../layout/index'
 import request from '../../util/request'
 import getQueryValue from '../../util/getQueryValue'
 import NoData from '@/compents/NoData'
-
+import InifiniteList from '@/compents/InifiniteList'
 
 const account = (props) => {
 
   const { id } = getQueryValue()
   const [list, setList] = useState([])
-
+  const [page, setPage] = useState({ total: 0, pageNum: 0 })
 
   useDidShow(() => {
     console.log('useDidShow')
     getShopKepperList({ pageNum: 1, pageSize:10 })
   })
 
-  function getShopKepperList() {
-    request({ url: '/taShopKeeper',params:{shopId:id}, method: 'get', }).then((res)=>{
+  function getShopKepperList(params) {
+    request({ url: '/taShopKeeper',params:{shopId:id,...params}, method: 'get', }).then((res)=>{
       const { records, ...page} = res.data.data
-      setList(records)
+      setList(list.concat(records || []))
+      setPage({
+        ...page,
+        pageNum: page.current
+      })
     })
   }
 
@@ -38,7 +42,7 @@ const account = (props) => {
         if (res.confirm) {
           console.log('用户点击确定')
           request({ url: `/taShopKeeper/${keeperId}`, method: 'delete', }).then((res)=>{
-            getShopKepperList({ pageNum: 1, pageSize:10 })
+            setList(list.filter((x)=>x.keeperId!=keeperId))
           })
 
         } else if (res.cancel) {
@@ -49,28 +53,40 @@ const account = (props) => {
   }
 
 
+  const loadMore = () => {
+    getShopKepperList({ pageNum: page.pageNum + 1 })
+  }
 
+    const renderItem = (index, key) => (
+      <View className='account-view' key={key}>
+      {/* <Text className='account-view-title'>房源编号：<Text style={{fontSize:"1rem"}}>{item.keeperId}</Text></Text> */}
+      <ContainerLayout className='account-view-card'>
+        <View className='top' >
+          <View>姓名：{list[index].name}</View>
+          <View>电话：{list[index].phone}</View>
+          {/* <View>微信号：{x.user.name}</View>
+          <View>房源数：{x.user.name}</View> */}
+        </View>
+        <View className='bottom'>
+          <Text onClick={() => { Taro.navigateTo({ url: `/pages/account/edit/index?keeperId=${list[index].keeperId}` }) }}>编辑</Text>
+          <Text onClick={()=>onDelete(list[index].keeperId)}>删除</Text>
+        </View>
+      </ContainerLayout>
+    </View>
+  )
 
   return <View className='account'>
     <Layout>
       <NoData nodata={!list.length} tips="暂无老板" style={{minHeight: '200px'}}>
-        {list.map((item, index) => {
-          return <View className='account-view' key={index}>
-            {/* <Text className='account-view-title'>房源编号：<Text style={{fontSize:"1rem"}}>{item.keeperId}</Text></Text> */}
-            <ContainerLayout className='account-view-card'>
-              <View className='top' >
-                <View>姓名：{item.name}</View>
-                <View>电话：{item.phone}</View>
-                {/* <View>微信号：{x.user.name}</View>
-                <View>房源数：{x.user.name}</View> */}
-              </View>
-              <View className='bottom'>
-                <Text onClick={() => { Taro.navigateTo({ url: `/pages/account/edit/index?keeperId=${item.keeperId}` }) }}>编辑</Text>
-                <Text onClick={()=>onDelete(item.keeperId)}>删除</Text>
-              </View>
-            </ContainerLayout>
-          </View>
-        })}
+
+
+      <InifiniteList
+        length={list.length}
+        total={page.total}
+        height={600}
+        itemRenderer={renderItem}
+        loadMore={loadMore}
+      />
       </NoData>
     </Layout>
     {/* onClick={(e)=>(e) */}

src/pages/imglist/index.jsx

@@ -33,9 +33,9 @@ const index = (props) => {
     const [data, setData] = useState({})
     const [tagList, setTagList] = useState([])
 
-    let [arrList, setArrList] = useState([[]])
+    let [arrList, setArrList] = useState({})
     useDidShow(() => {
-        console.log(query)
+        // console.log(query)
         getImageList()
         getMateTagGroupList()
     })
@@ -51,7 +51,7 @@ const index = (props) => {
     const getImageList = () => {
         request({ url: '/taMetaImageTag', params: { tagIds: query } }).then((res) => {
             const { records, ...page } = res.data.data
-            console.log(groupby(records, item => item.imageId))
+            console.log(groupby(records, item => item.imageId),'------')
             // _.groupBy([6.1, 4.2, 6.3], Math.floor);
             setList(groupby(records, item => item.imageId))
 
@@ -170,32 +170,37 @@ const index = (props) => {
     }
 
     const onLabelChange = (e, index) => {
-        console.log(e, index, 'onLabelChange')
+        let newArrArrList={
+            ...arrList,
+            [index]: e
+        }
+        setArrList(newArrArrList)
+        let newArr = Object.values(newArrArrList).reduce((pre, cur) => {
 
-        arrList[index] = e
-        // const [arrList, setArrList] = useState([[],[],[]])
-        setLabelList(arrList.flat())
+            return pre.concat(cur)
 
-        console.log(arrList.flat(), 'labelList')
+        }, [])
+        setLabelList([...newArr])
     }
 
     return <View className='imglist'>
 
         
-        <NoData nodata={!list.length}>
-
-
+        <NoData nodata={Object.keys(list).length === 0}>
+        {console.log(labelState,'-------------------')
+}
         {!labelState&&<View style={{ padding: '0 30px' }}>
+           
             {
 
                 Object.keys(list).map((item) => {
-                    console.log(list[item], item, 'list[item]11')
 
                     return <View className='imglist-card'>
                         <View className='imglist-card-tags' style={{ display: 'flex' }}>
                             {/* imageimageimageimage34 */}
                             {list[item].map((x) => {
-                                return <View className='tag' s>{x.tagName}</View>
+                                console.log(x.tagName)
+                                return <View className='tag' >{x.tagName}</View>
                             })}
                         </View>
                         <Image src={list[item][0].image} style={{ width: '100%' }} onClick={() => { setData(list[item]); setIsOpened(true) }}></Image>
@@ -218,7 +223,7 @@ const index = (props) => {
                 }
             </View>
             {/* <Tab value={['取消','']}  onClick={() => { Taro.navigateTo({ url: `/pages/label/edit/index` }) }} ></Tab> */}
-            <Tab pageState='3' value={['取消', '选择']} onClick={[(e) => setPageState('1'), (e) => ontagsClick()]}></Tab>
+            <Tab pageState='3' value={['取消', '选择']} onClick={[(e) => setLabelState(false), (e) => ontagsClick()]}></Tab>
         </View>
         }
 

src/pages/label/index.jsx

@@ -21,7 +21,7 @@ const house = (props) => {
 
 
   const getMateTagGroupList = () => {
-    request({ url: '/taMateTagGroup' }).then((res) => {
+    request({ url: '/taMateTagGroup', params:{pageSize:9999}}).then((res) => {
       const { records, ...page} = res.data.data
       setList(records)
     })

src/pages/mateTag/index.jsx

@@ -26,7 +26,7 @@ const house = (props) => {
   // })
   const getMateTagList = () => {
     console.log(id,'getMateTagList')
-    request({ url: '/taMateTag',params:{groupId:id},method: 'get', }).then((res) => {
+    request({ url: '/taMateTag',params:{groupId:id,pageSize:9999},method: 'get', }).then((res) => {
       const { records, ...page} = res.data.data
       setList(records)
     })
@@ -44,7 +44,7 @@ const house = (props) => {
           console.log('用户点击确定')
 
           request({ url: `/taMateTag/${row.tagId}`, method: 'delete', }).then((res)=>{
-            getMateTagList({ pageNum: 1, pageSize:10 })
+            getMateTagList({ pageNum: 1, pageSize:999 })
           })
           // Taro.showModal({
           //   title: `改标签组有${row.user.number}个标签仍在使用。请先清空标签，再删除标签组`,

src/pages/material/index.jsx

@@ -61,15 +61,9 @@ const index = (props) => {
             return pre.concat(cur)
 
         }, [])
-        setLabelList(newArr)
-        console.log(newArr, 'newArr')
-        // console.log(e, index, 'onLabelChange')
+        setLabelList([...newArr])
+        console.log(newArr, 'newArr11111111')
 
-        // arrList[index] = e
-        // // const [arrList, setArrList] = useState([[],[],[]])
-        // setLabelList(arrList.flat())
-
-        // console.log(arrList.flat(), 'labelList')
     }
 
 
@@ -115,29 +109,11 @@ const index = (props) => {
                 })
             }
             </NoData>
-
-            {/* <View className='inputstyle-view'>
-                <Text className='title'>入住人数</Text>
-                <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
-                </Container>
-            </View>
-            <View className='inputstyle-view'>
-                <Text className='title'>入住日期</Text>
-                <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
-                </Container>
-            </View>
-
-            <View className='inputstyle-view'>
-                <Text className='title'>离店日期</Text>
-                <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
-                </Container>
-            </View> */}
         </Layout>
         {/* className='addhousetab' */}
-        <Tab pageState='3' value={['取消', '开始查询']} onClick={[(e) => setPageState('2'), (e) => onClick(e)]}></Tab>
+        <Tab pageState='3' value={['取消', '开始查询']} onClick={[(e) => Taro.navigateBack({
+                delta: 1
+            }), (e) => onClick(e)]}></Tab>
     </View>
 }
 

src/pages/shop/index.jsx

@@ -28,12 +28,12 @@ const account = (props) => {
   })
 
   function getShopList(params) {
-    setLoading(true)
+    // setLoading(true)
     request({ url: "/taShop",params,  method: 'get' })
       .then((res) => {
         const { records, ...page} = res.data.data
 
-        setLoading(false)
+        // setLoading(false)
         setPage({
           ...page,
           pageNum: page.current
@@ -55,6 +55,7 @@ const account = (props) => {
          
           request({ url: `/taShop/${shopId}`,  method: 'delete' })
           .then((res) => {
+            setList(list.filter((x)=>x.shopId!=shopId))
           })
 
 
@@ -66,6 +67,7 @@ const account = (props) => {
   }
 
   const loadMore = () => {
+    console.log('----------------')
     getShopList({ pageNum: page.pageNum + 1 })
   }
 
@@ -118,7 +120,7 @@ const account = (props) => {
       <InifiniteList
         length={list.length}
         total={page.total}
-        height={500}
+        height={600}
         itemRenderer={renderItem}
         loadMore={loadMore}
       />