李志伟 3 年之前
父節點
當前提交
744b4144b3

二進制
src/assets/icons/housemantj/暂无数据.png 查看文件


+ 11
- 0
src/components/NoData/index.jsx 查看文件

1
+import {Image, View } from '@tarojs/components'
2
+import Nodata from '@/assets/icons/housemantj/暂无数据.png'
3
+
4
+export default (props) => {
5
+  return (
6
+    <>
7
+      <View style={{textAlign:'center',paddingTop:'20px'}}>暂无数据</View>
8
+      <Image mode="widthFix" style={{ width: '80%', margin: '0 10%' }} src={Nodata} ></Image>
9
+    </>
10
+  )
11
+}

+ 0
- 1
src/components/Star/Star.jsx 查看文件

1
-
2
 import hongxin from '@/assets/icons/housemantj/已收藏.png'
1
 import hongxin from '@/assets/icons/housemantj/已收藏.png'
3
 import baixin from '@/assets/icons/housemantj/收藏.png'
2
 import baixin from '@/assets/icons/housemantj/收藏.png'
4
 import './Star.less'
3
 import './Star.less'

+ 2
- 2
src/hotel/components/Income/income.jsx 查看文件

7
 import Picker from '@/components/Picker'
7
 import Picker from '@/components/Picker'
8
 import formatTime from "@/utils/formatTime";
8
 import formatTime from "@/utils/formatTime";
9
 import { getAccountLogList } from '@/services/landlord'
9
 import { getAccountLogList } from '@/services/landlord'
10
-
10
+import NoData from '@/components/NoData'
11
 import List from '@/components/List';
11
 import List from '@/components/List';
12
 import './income.less'
12
 import './income.less'
13
 
13
 
74
           style={{ height: 'calc(100vh - 390px)' }}
74
           style={{ height: 'calc(100vh - 390px)' }}
75
           request={fetchAPI}
75
           request={fetchAPI}
76
           params={queryParams}
76
           params={queryParams}
77
-          noData={<view className='title' >暂无</view>}
77
+          noData={<NoData />}
78
           render={({item, index}) => (
78
           render={({item, index}) => (
79
             <view className='spreadCard' key={index}>
79
             <view className='spreadCard' key={index}>
80
               <view className='card'>
80
               <view className='card'>

+ 2
- 1
src/hotel/pages/landlord/landlord.jsx 查看文件

9
 import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
9
 import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
10
 import withLayout from '@/layouts'
10
 import withLayout from '@/layouts'
11
 import { getHotelManage,  getNowHotelManage } from '@/services/landlord'
11
 import { getHotelManage,  getNowHotelManage } from '@/services/landlord'
12
+import NoData from '@/components/NoData'
12
 import CustomNav from '@/components/CustomNav'
13
 import CustomNav from '@/components/CustomNav'
13
 import './landlord.less'
14
 import './landlord.less'
14
 
15
 
68
       <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
69
       <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
69
       <view className='index-container'>
70
       <view className='index-container'>
70
         {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel}  account={account} onHotelChange={handleHotelChange} />}
71
         {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel}  account={account} onHotelChange={handleHotelChange} />}
71
-        {hotel?.hotelId?currentTab === 1 && <HouseManage hotel={hotel} ref={houseRef} disabled={!hotel.hotelId}/>:''}
72
+        {hotel?.hotelId?currentTab === 1 && <HouseManage hotel={hotel} ref={houseRef} disabled={!hotel.hotelId}/>:<NoData />}
72
       </view>
73
       </view>
73
       <view className='index-tabbar'>
74
       <view className='index-tabbar'>
74
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>
75
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>

+ 14
- 24
src/pages/index/tabs/Recommend.jsx 查看文件

4
 import locationimg from '@/assets/icons/housemantj/location.png'
4
 import locationimg from '@/assets/icons/housemantj/location.png'
5
 import Tip from '@/components/tip'
5
 import Tip from '@/components/tip'
6
 import List from '@/components/List';
6
 import List from '@/components/List';
7
-import { getIndexType,  getResourceList } from '@/services/home'
7
+import { getIndexType, getResourceList } from '@/services/home'
8
+import NoData from '@/components/NoData'
8
 import Card from '../components/Card'
9
 import Card from '../components/Card'
9
 import './less/Recommend.less'
10
 import './less/Recommend.less'
10
 
11
 
13
   const { router, person, location } = props
14
   const { router, person, location } = props
14
   const [activeTab, setActiveTab] = useState(0)
15
   const [activeTab, setActiveTab] = useState(0)
15
   const [typeList, setTypeList] = useState([])
16
   const [typeList, setTypeList] = useState([])
16
-  
17
-  
17
+
18
+
18
   const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
19
   const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
19
 
20
 
20
   // 获取资源表信息
21
   // 获取资源表信息
40
       setTypeList(res.records || [])
41
       setTypeList(res.records || [])
41
     })
42
     })
42
   }, [])
43
   }, [])
43
-  
44
+
44
   const onSearch = () => {
45
   const onSearch = () => {
45
     // 用绝对路径
46
     // 用绝对路径
46
     Taro.navigateTo({ url: '/pages/search/search' });
47
     Taro.navigateTo({ url: '/pages/search/search' });
73
           </mp-tabs>
74
           </mp-tabs>
74
         </scroll-view>
75
         </scroll-view>
75
       </view>
76
       </view>
76
-
77
-
78
-
79
-      {/* <ScrollView
80
-      scrollY
81
-      onScrollToLower={handleScrollToLower}
82
-    >
83
-      
84
-      
85
-    </ScrollView> */}
86
-
87
-
88
-
89
-
90
-
91
       <List
77
       <List
92
         style={{ height: 'calc(100% - 145px)' }}
78
         style={{ height: 'calc(100% - 145px)' }}
93
         request={getResourceList}
79
         request={getResourceList}
94
         params={queryParams}
80
         params={queryParams}
95
         onDataChange={setAllList}
81
         onDataChange={setAllList}
96
       >
82
       >
97
-        <view className='waterfall'>
98
-          {
99
-            alllist.map((item) => <Card key={item.resourceNo} item={item} />)
100
-          }
101
-        </view>
83
+        {
84
+          alllist.length == 0 ?
85
+          <NoData />:
86
+            <view className='waterfall'>
87
+              {
88
+                alllist.map((item) => <Card key={item.resourceNo} item={item} />)
89
+              }
90
+            </view>
91
+        }
102
       </List>
92
       </List>
103
     </view>
93
     </view>
104
   )
94
   )

+ 12
- 7
src/pages/searchResult/searchResult.jsx 查看文件

1
-import { React, useState, useEffect, } from 'react'
1
+import { React, useState } from 'react'
2
 // .就是当前路径
2
 // .就是当前路径
3
 import iconsearch from '../../assets/icons/housemantj/search.png'
3
 import iconsearch from '../../assets/icons/housemantj/search.png'
4
 import CustomNav from '@/components/CustomNav'
4
 import CustomNav from '@/components/CustomNav'
5
 import Taro from '@tarojs/taro'
5
 import Taro from '@tarojs/taro'
6
 import Card from '../index/components/Card'
6
 import Card from '../index/components/Card'
7
 import { getResourceList } from '@/services/home'
7
 import { getResourceList } from '@/services/home'
8
+import NoData from '@/components/NoData'
8
 import List from '@/components/List';
9
 import List from '@/components/List';
9
-import './searchResult.less'
10
 import withLayout from '@/layouts'
10
 import withLayout from '@/layouts'
11
+import './searchResult.less'
11
 
12
 
12
 
13
 
13
 
14
 
84
           params={queryParams}
85
           params={queryParams}
85
           onDataChange={setAllList}
86
           onDataChange={setAllList}
86
         >
87
         >
87
-          <view className='waterfall'>
88
-            {
89
-              alllist.map((item) => <Card key={item.resourceNo} item={item} />)
90
-            }
91
-          </view>
88
+          {
89
+            alllist.length == 0 ?
90
+              <NoData /> :
91
+              <view className='waterfall'>
92
+                {
93
+                  alllist.map((item) => <Card key={item.resourceNo} item={item} />)
94
+                }
95
+              </view>
96
+          }
92
         </List>
97
         </List>
93
       </view>
98
       </view>
94
     </view>
99
     </view>

+ 3
- 2
src/shop/components/ShopKeeper/shopKeeper.jsx 查看文件

6
 import SearchBar from '@/components/SearchBar'
6
 import SearchBar from '@/components/SearchBar'
7
 import { getVerifiedOrder } from '@/services/shopBoss'
7
 import { getVerifiedOrder } from '@/services/shopBoss'
8
 import List from '@/components/List';
8
 import List from '@/components/List';
9
-
9
+import NoData from '@/components/NoData'
10
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
10
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
11
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
11
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
12
 import ToggleRole from '@/components/toggleRole/ToggleRole'
12
 import ToggleRole from '@/components/toggleRole/ToggleRole'
145
                   request={getVerifiedOrder}
145
                   request={getVerifiedOrder}
146
                   params={queryParams}
146
                   params={queryParams}
147
                   onDataChange={setAllList}
147
                   onDataChange={setAllList}
148
+                  noData={<NoData />}
148
                   render={({ item, index }) => <ShopUnused key={(index)} item={item} />}
149
                   render={({ item, index }) => <ShopUnused key={(index)} item={item} />}
149
                 >
150
                 >
150
                 </List>
151
                 </List>
156
               <>
157
               <>
157
                 <List
158
                 <List
158
                   style={{ height: '50%' }}
159
                   style={{ height: '50%' }}
159
-
160
+                  noData={<NoData />}
160
                   request={getVerifiedOrder}
161
                   request={getVerifiedOrder}
161
                   params={queryParams}
162
                   params={queryParams}
162
                   onDataChange={setAllList}
163
                   onDataChange={setAllList}

+ 4
- 12
src/shop/components/Sparead/spreadMoney.jsx 查看文件

1
-import { useState, useEffect, useMemo } from 'react'
1
+import { useState,  useMemo } from 'react'
2
 import Taro from '@tarojs/taro'
2
 import Taro from '@tarojs/taro'
3
-import CustomNav from '@/components/CustomNav'
4
-import Popup from '@/components/Popup'
5
 import List from '@/components/List';
3
 import List from '@/components/List';
6
 import Picker from '@/components/Picker'
4
 import Picker from '@/components/Picker'
7
-import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
5
+import {getAccount} from '@/services/shopBoss'
8
 import ShopCommission from '@/components/ShopCommission'
6
 import ShopCommission from '@/components/ShopCommission'
9
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
7
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
10
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
8
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
11
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
9
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
12
-import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
13
-import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
14
-import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
10
+import NoData from '@/components/NoData'
15
 import ToggleRole from '@/components/toggleRole/ToggleRole'
11
 import ToggleRole from '@/components/toggleRole/ToggleRole'
16
-
17
-
18
 import './spreadMoney.less'
12
 import './spreadMoney.less'
19
 
13
 
20
 const getList = (id) => (params) => getAccount(id, params)
14
 const getList = (id) => (params) => getAccount(id, params)
24
   const [showCutover, setShowCutover] = useState(false)
18
   const [showCutover, setShowCutover] = useState(false)
25
   const [isyear, setYear] = useState(false)
19
   const [isyear, setYear] = useState(false)
26
   const [isMomth, setMonth] = useState(false)
20
   const [isMomth, setMonth] = useState(false)
27
-  const acc = shopMoney?.acc
28
-  const { accountId } = acc
29
 
21
 
30
   const queryParams = useMemo(() => ({
22
   const queryParams = useMemo(() => ({
31
 
23
 
94
             style={{ height: 'calc(100% - 145px)' }}
86
             style={{ height: 'calc(100% - 145px)' }}
95
             request={reqestAPI}
87
             request={reqestAPI}
96
             params={queryParams}
88
             params={queryParams}
97
-
89
+            noData={<NoData />}
98
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
90
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
99
           >
91
           >
100
           </List>
92
           </List>