吃个甘蔗嚼一年 3 vuotta sitten
vanhempi
commit
d9f6f40f3b

+ 0
- 3
src/components/ShopCommission/index.jsx Näytä tiedosto

@@ -1,7 +1,4 @@
1
-import Taro from '@tarojs/taro'
2
-import { useEffect } from 'react'
3 1
 
4
-import { getAccount } from '@/services/shopBoss'
5 2
 
6 3
 import formatTimes from '@/utils/formatTime'
7 4
 

+ 3
- 2
src/shop/components/ShopKeeper/shopKeeper.jsx Näytä tiedosto

@@ -144,7 +144,7 @@ export default (props) => {
144 144
             {activeTab === 0 &&
145 145
               <>
146 146
                 <List
147
-                  style={{ height: 'calc(100% - 145px)' }}
147
+                  style={{ height: '50%' }}
148 148
                   request={getVerifiedOrder}
149 149
                   params={queryParams}
150 150
                   onDataChange={setAllList}
@@ -158,7 +158,8 @@ export default (props) => {
158 158
             {activeTab === 1 &&
159 159
               <>
160 160
                 <List
161
-                  style={{ height: 'calc(100% - 145px)' }}
161
+                  style={{ height: '50%' }}
162
+
162 163
                   request={getVerifiedOrder}
163 164
                   params={queryParams}
164 165
                   onDataChange={setAllList}

+ 9
- 3
src/shop/components/Sparead/spreadMoney.jsx Näytä tiedosto

@@ -1,4 +1,4 @@
1
-import { useState, useEffect } from 'react'
1
+import { useState, useEffect, useMemo } from 'react'
2 2
 import Taro from '@tarojs/taro'
3 3
 import CustomNav from '@/components/CustomNav'
4 4
 import Popup from '@/components/Popup'
@@ -26,9 +26,13 @@ export default (props) => {
26 26
   const [isMomth, setMonth] = useState(false)
27 27
   const acc = shopMoney?.acc
28 28
   const { accountId } = acc
29
-  const [accId, setaccId] = useState(accountId)
30 29
 
31
-  const reqestAPI = getList(accId)
30
+  const queryParams = useMemo(() => ({
31
+
32
+  }), [])
33
+
34
+
35
+  const reqestAPI = getList(shopMoney?.acc?.accountId)
32 36
 
33 37
 
34 38
 
@@ -89,6 +93,8 @@ export default (props) => {
89 93
           <List
90 94
             style={{ height: 'calc(100% - 145px)' }}
91 95
             request={reqestAPI}
96
+            params={queryParams}
97
+
92 98
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
93 99
           >
94 100
           </List>

+ 0
- 1
src/shop/pages/spread/spreadIndex.jsx Näytä tiedosto

@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react'
2 2
 import CustomNav from '@/components/CustomNav'
3 3
 import { useRouter } from '@tarojs/taro'
4 4
 import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
5
-import { getHotelManage, getAccountLogList, getNowShopManage } from '@/services/landlord'
6 5
 
7 6
 import TabBar from '@/components/CustTabBar'
8 7
 import shopImg from '@/assets/icons/shopKeeper/订单收入.png'