flx

src/components/ShopCommission/index.jsx

@@ -1,6 +1,8 @@
 import Taro from '@tarojs/taro'
 import { useEffect } from 'react'
+
 import { getAccount } from '@/services/shopBoss'
+
 import formatTimes from '@/utils/formatTime'
 
 import './style.less'
@@ -11,6 +13,7 @@ export default (props) => {
   const { item } = props
 
 
+
   return (
     <view className='spreadCard'>
       <view className='spreadDate'>日期：<text>{formatTimes(item.createDate, "yyyy/MM/dd")}</text></view>

src/components/ShopUsed/style.less

@@ -61,6 +61,7 @@
       height: 2px;
       background: #000;
       opacity: 0.1;
+      margin-top: 100px;
     }
     .phone{
       font-size: 24px;

src/services/shopBoss.js

@@ -42,6 +42,6 @@ export const getVerifiedOrder = (data) => request(`/verifyTarget`, { data })
  * @param {*} 
  * @returns 
  */
-export const setGetVerifiedOrder = (id) => request(`/verifyTarget​/${id}`, { method: 'put', id })
 
 
+export const setGetVerifiedOrder = (id) => request(`/verifyTarget/${id}/confirm`, { method: 'put', id })

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -6,6 +6,7 @@ import Popup from '@/components/Popup'
 import ShopUsed from '@/components/ShopUsed' //已核销
 import ShopUnused from '@/components/ShopUnused' //未核销
 import SearchBar from '@/components/SearchBar'
+
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
 import iconsearch from '@/assets/icons/housemantj/search.png'
@@ -22,7 +23,8 @@ import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 
 export default (props) => {
-  const { shopList, shop, onHotelChange, shopMoney, verifiedOrder } = props
+  const { shopList, shop, onHotelChange, shopMoney, verifiedOrder, onVarified, onVarifiedTwo } = props
+  const shopId = shop?.shopId
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
   const { tabJump } = params || {}
@@ -38,22 +40,11 @@ export default (props) => {
   }
 
 
-  const handleHotelChange = (shopId, current) => {
+  const handleHotelChange = (e, current) => {
     onHotelChange(current)
   }
 
 
-
-
-
-
-  const handleChange = (e) => {
-    console.log("🚀 ~ file: shopKeeper.jsx ~ line 67 ~ handleChange ~ e", e)
-
-
-  }
-
-
   useEffect(() => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
@@ -63,6 +54,13 @@ export default (props) => {
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
+    if (index === 1) {
+      onVarified()
+
+    } else {
+      onVarifiedTwo()
+
+    }
   }
   const tabs = [
     {
@@ -73,6 +71,12 @@ export default (props) => {
     },
   ]
 
+
+  const handleVarified = () => {
+    onVarified()
+  }
+
+
   const onSeacrh = (e) => {
     console.log('eeeeeeeeeeeeeeeeee', e.detail.value);
   }
@@ -146,12 +150,19 @@ export default (props) => {
                   })
                 }
               </>
-
             }
             {/* 已核销 */}
             {activeTab === 1 &&
               <>
-                <ShopUsed />
+                {
+                  verifiedOrder.map((item, index) => {
+
+                    return <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />
+                  })
+                }
+
+
+
               </>
             }
           </view>

src/shop/pages/spread/spreadIndex.jsx

@@ -21,11 +21,11 @@ export default withLayout((props) => {
   const { tab } = params || {}
   const [currentTab, setCurrentTab] = useState(0)
   const [shopList, setShopList] = useState([])
-  console.log("🚀 ~ file: spreadIndex.jsx ~ line 24 ~ withLayout ~ shopList", shopList)
   const [shop, setShop] = useState()
   const shopId = shop?.shopId
 
   const [amountType, setAmountType] = useState('order')
+  const [isVerified, setisVerified] = useState(0)
   const [shopMoney, setShopMoney] = useState([])
   const [verifiedOrder, setVerifiedOrder] = useState([])
   const handleTabChange = (e) => {
@@ -50,7 +50,7 @@ export default withLayout((props) => {
   //未核销订单列表
   useEffect(() => {
     getVerifiedOrder({
-      isVerified: 0,
+      isVerified: isVerified,
       pageNum: 1,
       pageSize: 99,
       shopId: shopId,
@@ -58,11 +58,21 @@ export default withLayout((props) => {
     }).then((res) => {
       const order = res.records
       setVerifiedOrder(order)
-      console.log("🚀 ~ file: spreadIndex.jsx ~ line 49 ~ getVerifiedOrder ~ res", res)
 
     })
 
-  }, [shopId])
+
+  }, [shopId, isVerified])
+
+
+  const onVarified = () => {
+    setisVerified(1)
+  }
+
+
+  const onVarifiedTwo = () => {
+    setisVerified(0)
+  }
 
   useEffect(() => {
     if (shopId) {
@@ -96,13 +106,10 @@ export default withLayout((props) => {
   return (
     <view className='page-index'>
       <CustomNav title={shop?.shopName} />
-
       <view className='index-container'>
-        {currentTab === 0 && <ShopKeeper verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
-
-
+        {currentTab === 0 && <ShopKeeper onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
         }
-        {currentTab === 1 && <Sparead shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
+        {currentTab === 1 && <Sparead shopList={shopList} shop={shop} verifiedOrder={verifiedOrder} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
       </view>
       <view className='index-tabbar'>
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>