fxl

src/components/CollectList/MyCollect/index.jsx

@@ -19,7 +19,6 @@ import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 
 
 
-
 import './style.less'
 
 export default (props) => {
@@ -30,8 +29,6 @@ export default (props) => {
   const targetType = item.targetType
 
 
-
-
   const star = parseFloat(((item.sweetScore + item.environmentScore + item.serviceScore) / 3).toFixed(1));
   return (
     <View>

src/components/List/index.jsx

@@ -9,6 +9,7 @@ export default (props) => {
     params,
     pageSize = 10,
     onError,
+    shopId,
     onDataChange,
     ...leftProps
   } = props
@@ -72,7 +73,7 @@ export default (props) => {
   // 请求数据
   useEffect(() => {
     fetchRef.current(payload)
-  }, [payload])
+  }, [payload, shopId])
 
   return (
     <ScrollView

src/components/ShopUnused/index.jsx

@@ -1,10 +1,7 @@
 import Taro from '@tarojs/taro'
 import { useState, useEffect } from 'react'
 import formatTimes from '@/utils/formatTime'
-import iconsearch from '@/assets/icons/housemantj/search.png'
-import ms from '@/assets/icons/housemantj/ms3.jpg'
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
-import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
+
 
 import './style.less'
 
@@ -14,11 +11,9 @@ export default (props) => {
 
 
 
-  // useEffect(() => {
-  //   getVerifiedOrder({ phone: '18082043755' }).then((res) => {
+  useEffect(() => {
 
-  //   })
-  // }, [])
+  }, [])
 
   return (
     <view className='orderCard'>

src/services/landlord.js

@@ -6,14 +6,22 @@ import request from '@/utils/request'
  * @param {*} id 
  * @returns 
  */
- export const getHotelDetail = (id) => request(`/taHotel/${id}`)
- 
+export const getHotelDetail = (id) => request(`/taHotel/${id}`)
+
 /**
  * 查询指定名宿的账户
  * @param {*} params 
  * @returns 
  */
- export const getNowHotelManage = (id,params) => request(`/hotel/manage/${id}`, { params })
+export const getNowHotelManage = (id, params) => request(`/hotel/manage/${id}`, { params })
+
+
+/**
+* 查询指定商铺的账户
+* @param {*} params 
+* @returns 
+*/
+export const getNowShopManage = (id, params) => request(`/shop/manage/${id}`, { params })
 
 
 /**
@@ -21,35 +29,35 @@ import request from '@/utils/request'
  * @param {*} params 
  * @returns 
  */
- export const getHotelManage = (params) => request('/hotel/manage/index', { params })
+export const getHotelManage = (params) => request('/hotel/manage/index', { params })
 
 /**
  * 查询指定名宿的账户流水
  * @param {*} params 
  * @returns 
  */
- export const getAccountLogList = (id) => request(`/hotel/account/${id}/log`)
+export const getAccountLogList = (id) => request(`/hotel/account/${id}/log`)
 
 /**
  * 房源列表
  * @param {*} id 
  * @returns 
  */
- export const getRoomList = (params) => request('/taRoom',{params})
+export const getRoomList = (params) => request('/taRoom', { params })
 
 /**
  * 保存房源
  * @param {*} data 
  * @returns 
  */
- export const saveRoom = (data) => request('/taRoom', { method: 'post', data })
+export const saveRoom = (data) => request('/taRoom', { method: 'post', data })
 
- /**
- * 删除房源
- * @param {*} data 
- * @returns 
- */
-  export const deleteRoom = (id) => request(`/taRoom/${id}`, { method: 'delete'})
+/**
+* 删除房源
+* @param {*} data 
+* @returns 
+*/
+export const deleteRoom = (id) => request(`/taRoom/${id}`, { method: 'delete' })
 
 
 /**
@@ -57,10 +65,10 @@ import request from '@/utils/request'
  * @param {*} data 
  * @returns 
  */
- export const shareRoom = (data) => request('/roomOrder', { method: 'post', data })
- /**
- * 查看历史入住人列表
- * @param {*} id 
- * @returns 
- */
-  export const getRoomOrderList = (params) => request('/roomOrder',{params})
+export const shareRoom = (data) => request('/roomOrder', { method: 'post', data })
+/**
+* 查看历史入住人列表
+* @param {*} id 
+* @returns 
+*/
+export const getRoomOrderList = (params) => request('/roomOrder', { params })

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -1,4 +1,4 @@
-import { React, useState, useEffect, } from 'react'
+import { React, useState, useEffect, useRef } from 'react'
 import Taro, { useRouter } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import Picker from '@/components/Picker'
@@ -16,25 +16,25 @@ import ms from '@/assets/icons/housemantj/ms3.jpg'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
-import touristON from '@/assets/icons/UserCenter/touristON.png'
-import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
-import hotelBossON from '@/assets/icons/UserCenter/hotelBossON.png'
-import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
-import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
-import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
 import './shopKeeper.less'
+import { useMemo } from 'react'
 
 
 export default (props) => {
-  const { shopList, shop, onHotelChange, shopMoney, isVerified, verifiedOrder, onVarified, onVarifiedTwo, setVer } = props
-  const shopId = shop?.shopId
-  const [activeTab, setActiveTab] = useState(0)
+  const { shopList, shop, onHotelChange, shopMoney, verifiedOrder, isVerified, onVarified, onVarifiedTwo, setVer } = props
   const { params } = useRouter()
   const { tabJump } = params || {}
 
-  const [queryParams, setQueryParams] = useState({ isVerified: isVerified, pageNum: 1, pageSize: 10, shopId: '' })
-
+  const [activeTab, setActiveTab] = useState(0)
+  const [phone, setPhone] = useState()
+  // const [isVerified, setisVerified] = useState(0)
+  // const [queryParams, setQueryParams] = useState({ isVerified: isVerified, pageNum: 1, pageSize: 10, shopId: shop?.shopId, phone: phone })
 
+  const queryParams = useMemo(() => ({
+    shopId: shop?.shopId,
+    isVerified: `${tabJump}` === '1' ? 1 : 0,
+    phone: phone || '',
+  }), [phone, shop?.shopId, tabJump])
 
 
   // 获取资源表信息
@@ -56,6 +56,10 @@ export default (props) => {
   }
 
 
+  const handelSearch = (e) => {
+    const val = e.detail.value
+    setPhone(val)
+  }
   useEffect(() => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
@@ -65,13 +69,6 @@ export default (props) => {
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
-    if (index === 1) {
-      onVarified()
-
-    } else {
-      onVarifiedTwo()
-
-    }
   }
   const tabs = [
     {
@@ -82,39 +79,12 @@ export default (props) => {
     },
   ]
 
-
   //给父组件传val
   const handleVarified = () => {
     onVarified()
   }
 
 
-  const onSearch = (e) => {
-    const val = e.detail.value
-    if (val !== '') {
-      getVerifiedOrder({
-        phone: val,
-        pageNum: 1,
-        pageSize: 10,
-
-      }).then((res) => {
-        setVer(res)
-
-      })
-    } else {
-      getVerifiedOrder({
-        shopId: shopId,
-        pageNum: 1,
-        pageSize: 10,
-
-      }).then((res) => {
-        setVer(res)
-
-      })
-    }
-
-  }
-
   const [showCutover, setShowCutover] = useState(false)
   const ShowMoldeOn = () => {
     setShowCutover(true)
@@ -126,7 +96,7 @@ export default (props) => {
     <view>
       <view>
       </view>
-      <ToggleRole showCutover={showCutover} onClose={onClose} role='shop' />
+      <ToggleRole showCutover={showCutover} onClose={onClose} maskClosable={showCutover} role='shop' />
       <view style={{ padding: '30rpx', height: '100%' }}>
         <scroll-view scroll-y scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll' style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
@@ -155,7 +125,7 @@ export default (props) => {
           </view>
           <view className='search'>
 
-            <SearchBar placeholder='搜索订单(输入客户手机号码)' onBlur={onSearch} />
+            <SearchBar placeholder='搜索订单(输入客户手机号码)' onBlur={handelSearch} />
           </view>
           <view className='index-tabs'>
             <mp-tabs
@@ -178,13 +148,8 @@ export default (props) => {
                   request={getVerifiedOrder}
                   params={queryParams}
                   onDataChange={setAllList}
+                  render={({ item, index }) => <ShopUnused key={(index)} item={item} />}
                 >
-                  {
-                    alllist.map((item, index) => {
-
-                      return <ShopUnused key={(index)} item={item} />
-                    })
-                  }
                 </List>
               </>
 
@@ -197,22 +162,9 @@ export default (props) => {
                   request={getVerifiedOrder}
                   params={queryParams}
                   onDataChange={setAllList}
+                  render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
                 >
-                  {
-                    alllist.map((item, index) => {
-
-                      return <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />
-                    })
-                  }
                 </List>
-                {/* {
-                  verifiedOrder.map((item, index) => {
-
-                    return <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />
-                  })
-                } */}
-
-
 
               </>
             }

src/shop/components/Sparead/spreadMoney.jsx

@@ -24,28 +24,15 @@ export default (props) => {
   const [showCutover, setShowCutover] = useState(false)
   const [isyear, setYear] = useState(false)
   const [isMomth, setMonth] = useState(false)
-  const [shopAccount, setShopAccount] = useState([])
   const acc = shopMoney?.acc
   const { accountId } = acc
+  const [accId, setaccId] = useState(accountId)
 
-  const reqestAPI = getList(accountId)
+  const reqestAPI = getList(accId)
 
 
-  // 获取资源表信息
-  const [alllist, setAllList] = useState([])
 
 
-
-
-  useEffect(() => {
-    getAccount(accountId).then((e) => {
-      const accContent = e.records
-      setShopAccount(accContent)
-
-    })
-
-  }, [accountId])
-
   //小眼睛开关
   const handleYear = () => {
     isyear ? setYear(false) : setYear(true)
@@ -85,7 +72,7 @@ export default (props) => {
               <view className='sleft'>
                 <view className='lword'>全年推广收入（税前）</view>
                 <view className='yearMoney'>
-                  <text>{isyear ? shopMoney?.totalCharges / 100 : '******'}</text>元
+                  <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
                   <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
                 </view>
               </view>
@@ -93,7 +80,7 @@ export default (props) => {
               <view className='sright'>
                 <view className='rword'>当月推广收入（税前）</view>
                 <view className='monthMoney'>
-                  <text>{isMomth ? shopMoney?.currentCharges / 100 : '******'}</text>元
+                  <text>{isMomth ? (shopMoney?.currentCharges / 100).toFixed(2) : '******'}</text>元
                   <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
                 </view></view>
             </view>
@@ -105,15 +92,6 @@ export default (props) => {
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
           >
           </List>
-          {/* {
-            shopAccount.map((item, index) => {
-              return (
-                <ShopCommission key={(index)} item={item} />
-
-              )
-            })
-          } */}
-          {/* <view className='botton'>已经到底了~</view> */}
         </scroll-view>
       </view>
 

src/shop/pages/spread/spreadIndex.jsx

@@ -2,14 +2,17 @@ import React, { useState, useEffect } from 'react'
 import CustomNav from '@/components/CustomNav'
 import { useRouter } from '@tarojs/taro'
 import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
-import ShopKeeper from '../../components/ShopKeeper/shopKeeper'
-import Sparead from '../../components/Sparead/spreadMoney'
+import { getHotelManage, getAccountLogList, getNowShopManage } from '@/services/landlord'
+
 import TabBar from '@/components/CustTabBar'
 import shopImg from '@/assets/icons/shopKeeper/订单收入.png'
 import onShopImg from '@/assets/icons/shopKeeper/订单收入按下.png'
 import spareadImg from '@/assets/icons/shopKeeper/推广收入.png'
 import onSpareadImg from '@/assets/icons/shopKeeper/推广收入按下.png'
 import withLayout from '@/layouts'
+import ShopKeeper from '../../components/ShopKeeper/shopKeeper'
+import Sparead from '../../components/Sparead/spreadMoney'
+
 
 import './spreadIndex.less'
 
@@ -28,6 +31,7 @@ export default withLayout((props) => {
   const [isVerified, setisVerified] = useState(0)
   const [shopMoney, setShopMoney] = useState([])
   const [verifiedOrder, setVerifiedOrder] = useState([])
+
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
@@ -36,10 +40,9 @@ export default withLayout((props) => {
   const handelType = () => {
     setAmountType('commission')
   }
-
+  //商铺列表
   useEffect(() => {
     getShopList().then((res) => {
-      console.log("🚀 ~ file: spreadIndex.jsx ~ line 42 ~ getShopList ~ res", res)
       const { shopList: list, shop: current } = res
       setShopList(list)
       setShop(current)
@@ -56,23 +59,22 @@ export default withLayout((props) => {
 
   }
 
-
   //未核销订单列表
-  useEffect(() => {
-    getVerifiedOrder({
-      isVerified: isVerified,
-      pageNum: 1,
-      pageSize: 99,
-      shopId: shopId,
+  // useEffect(() => {
+  //   getVerifiedOrder({
+  //     isVerified: isVerified,
+  //     pageNum: 1,
+  //     pageSize: 99,
+  //     shopId: shopId,
 
-    }).then((res) => {
-      const order = res.records
-      setVerifiedOrder(order)
+  //   }).then((res) => {
+  //     const order = res.records
+  //     setVerifiedOrder(order)
 
-    })
+  //   })
 
 
-  }, [shopId, isVerified])
+  // }, [shopId, isVerified])
 
 
   const onVarified = () => {
@@ -87,25 +89,30 @@ export default withLayout((props) => {
   useEffect(() => {
     if (shopId) {
       getShopMoney(shopId, amountType).then((e) => {
-
         setShopMoney(e)
 
       })
     }
 
-  }, [amountType, shopId])
-
+  }, [amountType, shopId, currentTab])
 
+  //店铺选择
   const handleHotelChange = (current) => {
     console.log('已选择店铺', current);
-    // getNowHotelManage(current.shopId).then((res) => {
-    //   const { account: acc } = res
-    //   setAccount(acc)
-    //   setHotel(current)
-    //   getAccountLogList(acc.accountId).then((res2) => {
-    //     setAccountLog(res2.records || [])
-    //   })
-    // })
+    getShopMoney(current.shopId, amountType).then((e) => {
+      setShop(current)
+      getVerifiedOrder({
+        isVerified: isVerified,
+        pageNum: 1,
+        pageSize: 99,
+        shopId: current.shopId,
+
+      }).then((res) => {
+        const order = res.records
+        setVerifiedOrder(order)
+
+      })
+    })
   }
 
   useEffect(() => {
@@ -118,7 +125,7 @@ export default withLayout((props) => {
     <view className='page-index'>
       <CustomNav title={shop?.shopName} />
       <view className='index-container'>
-        {currentTab === 0 && <ShopKeeper isVerified={isVerified} setVer={setVer} onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
+        {currentTab === 0 && <ShopKeeper isVerified={isVerified} setVer={setVer} onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} shopId={shopId} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
         }
         {currentTab === 1 && <Sparead shopList={shopList} shop={shop} verifiedOrder={verifiedOrder} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
       </view>