李志伟 vor 3 Jahren
Ursprung
Commit
744b4144b3

BIN
src/assets/icons/housemantj/暂无数据.png Datei anzeigen


+ 11
- 0
src/components/NoData/index.jsx Datei anzeigen

@@ -0,0 +1,11 @@
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 Datei anzeigen

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

+ 2
- 2
src/hotel/components/Income/income.jsx Datei anzeigen

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

+ 2
- 1
src/hotel/pages/landlord/landlord.jsx Datei anzeigen

@@ -9,6 +9,7 @@ import houseImg from '@/assets/icons/landlord/房源管理.png'
9 9
 import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
10 10
 import withLayout from '@/layouts'
11 11
 import { getHotelManage,  getNowHotelManage } from '@/services/landlord'
12
+import NoData from '@/components/NoData'
12 13
 import CustomNav from '@/components/CustomNav'
13 14
 import './landlord.less'
14 15
 
@@ -68,7 +69,7 @@ export default withLayout((props) => {
68 69
       <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
69 70
       <view className='index-container'>
70 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 73
       </view>
73 74
       <view className='index-tabbar'>
74 75
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>

+ 14
- 24
src/pages/index/tabs/Recommend.jsx Datei anzeigen

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

+ 12
- 7
src/pages/searchResult/searchResult.jsx Datei anzeigen

@@ -1,13 +1,14 @@
1
-import { React, useState, useEffect, } from 'react'
1
+import { React, useState } from 'react'
2 2
 // .就是当前路径
3 3
 import iconsearch from '../../assets/icons/housemantj/search.png'
4 4
 import CustomNav from '@/components/CustomNav'
5 5
 import Taro from '@tarojs/taro'
6 6
 import Card from '../index/components/Card'
7 7
 import { getResourceList } from '@/services/home'
8
+import NoData from '@/components/NoData'
8 9
 import List from '@/components/List';
9
-import './searchResult.less'
10 10
 import withLayout from '@/layouts'
11
+import './searchResult.less'
11 12
 
12 13
 
13 14
 
@@ -84,11 +85,15 @@ export default withLayout((props) => {
84 85
           params={queryParams}
85 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 97
         </List>
93 98
       </view>
94 99
     </view>

+ 3
- 2
src/shop/components/ShopKeeper/shopKeeper.jsx Datei anzeigen

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

+ 4
- 12
src/shop/components/Sparead/spreadMoney.jsx Datei anzeigen

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