Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/BossCard/index.jsx

@@ -18,15 +18,17 @@ import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 import './style.less'
 
 export default (props) => {
-  const { item } = props
+  const { item, cardNavigateTo } = props
   const { shopId } = props.item
   const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.packageId)
   const [city, setCity] = useState({})
   const [detail, setDetail] = useState({})
 
+
+
+
   const goFood = () => {
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
-
   }
 
   useEffect(() => {

src/components/ShopUnused/index.jsx

@@ -1,5 +1,6 @@
 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'
@@ -7,7 +8,7 @@ import './style.less'
 
 
 export default (props) => {
-  const { } = props
+  const { item } = props
 
 
 
@@ -18,21 +19,18 @@ export default (props) => {
   return (
     <view className='orderCard'>
       <view style={{ overflow: 'hidden' }}>
-        <view className='orderId'>订单编号：<text>ABC123456789</text></view>
-        <view className='orderTime'>下单日期：<text>2021-06-22 12:35</text></view>
+        <view className='orderId'>订单编号：{item.orderId}</view>
+        <view className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss')}</view>
       </view>
       <view className='order'>
-        <image className='orderImg' src={ms} mode='aspectFit' />
+        <image className='orderImg' src={item.poster} mode='aspectFit' />
         <view className='orderRight'>
-          <view className='foodName'>【SEOUL.创意韩国料理】火爆全南京，
-            新街口又开新店啦...</view>
-          <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>88</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
+          <view className='foodName'>{item.description}</view>
+          <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>{item.actualPrice / 100}</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
           <view>已下单：等待客户上门就餐</view>
         </view>
         <view className='line' />
-
-        <view className='phone'>客户手机：<text>136****9434</text></view>
-        <view className='tripTime'>客户行程日期：预计在<text>2021-06-21中下午10:30-16:30</text></view>
+        <view className='phone'>客户手机：<text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</text></view>
       </view>
     </view>
   )

src/components/ShopUnused/style.less

@@ -29,7 +29,6 @@
     }
     .orderRight{
       .foodName{
-        height: 63px;
         font-size: 24px;
         color: #333333;
         line-height: 40px;

src/components/ShopUsed/index.jsx

@@ -32,7 +32,6 @@ export default (props) => {
         <view className='line' />
 
         <view className='phone'>客户手机：<text>136****9434</text><button className='button-OK'  >确认核销</button> </view>
-        <view className='tripTime'>客户行程日期：预计在<text>2021-06-21中下午10:30-16:30</text></view>
       </view>
     </view>
   )

src/components/foodCards/foodCards.jsx

@@ -1,3 +1,6 @@
+import useSave from "@/utils/hooks/useSave"
+import { getShopDetail, getShopcity } from '@/services/home'
+import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import Star from '@/components/Star/Star.jsx'
 import pay from '@/assets/icons/housemantj/pay.png'
@@ -6,9 +9,6 @@ import wz from '@/assets/icons/housemantj/location.png'
 import hongxin from '@/assets/icons/housemantj/已收藏.png'
 import baixin from '@/assets/icons/housemantj/收藏.png'
 import './style.less'
-import useSave from "@/utils/hooks/useSave"
-import { getShopDetail, getShopcity } from '@/services/home'
-import { useState, useEffect } from 'react'
 
 
 
@@ -20,11 +20,23 @@ export default (props) => {
   const [city, setCity] = useState({})
   const [detail, setDetail] = useState({})
 
+
+
+
   const goFood = () => {
-    Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
+    const page = Taro.getCurrentPages()
+    const currentPage = page[page.length - 1];//第一位是首页，最后一位是当前页面
+    const pagesUrl = `/${currentPage.route}`;
+    if (pagesUrl === '/pages/details/foodDetails/foodDetails') {
 
+    } else {
+      Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
+
+    }
   }
 
+
+
   useEffect(() => {
     getShopDetail(item.shopId).then((res) => {
       setDetail(res)

src/pages/index/index.jsx

@@ -1,4 +1,6 @@
-import React, { useState, useEffect,useRef } from 'react'
+
+
+import React, { useState, useEffect, useRef } from 'react'
 import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import logo from '@/assets/icons/comm/logo_small.png'
@@ -9,12 +11,12 @@ import Mine from './tabs/Mine'
 import Recommend from './tabs/Recommend'
 import './index.less'
 import { getLocation } from '@/utils/location'
-import { getIndexType,  getResourceList } from '@/services/home'
+import { getIndexType, getResourceList } from '@/services/home'
 
 
 
 export default withLayout((props) => {
-  const { router, person,location } = props
+  const { router, person, location } = props
   const { params, path } = router
   const { tab } = params || {}
   const [currentTab, setCurrentTab] = useState(0)
@@ -35,7 +37,7 @@ export default withLayout((props) => {
       <view className='index-container'>
         {currentTab === 0 && <Recommend location={location} />}
         {currentTab === 1 && <Guide person={person} router={router} />}
-        {/* {currentTab === 2 && <Strategy />} */}
+        {/* {currentTab === 2 && <Strategy />} */}
         {currentTab === 2 && <Mine person={person} />}
       </view>
       <view className='index-tabbar'>

src/pages/index/tabs/Guide.jsx

@@ -18,14 +18,17 @@ import './GuideCss/style.less'
 
 
 
+
 export default (props) => {
-  const { router, person } = props
-  console.log("🚀 ~ file: Guide.jsx ~ line 34 ~ props", props)
-  const { roomId, location, roomOrderId } = router.params
+  const { router, person, iflocation } = props
+  const { roomId, roomOrderId } = router.params
   const [extend, setExtend] = useState([])
   const [ifroomId, setIfroomId] = useState('havenot')
   const [spackage, setPackage] = useState([])
 
+  const cardNavigateTo = undefined
+
+
   // 住宿经纬度
   const Roomlog = useRef('')
   const Roomlat = useRef('')
@@ -33,26 +36,32 @@ export default (props) => {
   const Parklog = useRef('')
   const Parklat = useRef('')
   const [taRoomContent, setTaRoomContent] = useState([])
-
+  const RoomLocation = taRoomContent?.location
+  //没有停车 wifi的就不显示按钮
+  const [wifiButtonStyle, setWifiButtonStyle] = useState('')
+  const [parkingButtonStyle, setParkingButtonStyle] = useState('')
+  const [guideStyle, setGuideStyle] = useState('')
 
   //当前指南总数
   const [newextNum, setNewextNum] = useState(0)
   //全部指南个数
   const [AllextNum, setAllextNum] = useState(0)
   //指南当前页数
-  const [epage, setepage] = useState(2)
+  const [epage, setEpage] = useState(2)
   const extendMore = () => {
-    setepage(epage + 1)
+    setEpage(epage + 1)
     getExtendContent('room', roomId, { pageNum: epage }).then((res) => {
       setExtend([...extend, ...res.records])
       setNewextNum(newextNum + res.records.length)
     })
   }
 
+
+
+
   useEffect(() => {
     if (roomOrderId) {
       goToRoomForm(roomOrderId).then((res) => {
-        console.log("🚀 ~ file: Guide.jsx ~ line 48 ~ goToRoomForm ~ res", res)
         if (res.status !== 1) {
           Taro.navigateTo({
             url: `/pages/RoomOrder/index?roomOrderId=${roomOrderId}&status=${res.status}&roomId=${roomId}`,
@@ -65,10 +74,6 @@ export default (props) => {
 
 
   useEffect(() => {
-    // 老板推荐的套餐
-    getRecommendList({ location: location }).then((res) => {
-      setPackage(res || [])
-    })
 
     if (roomId) {
       // 点击’去这里‘跳转导航
@@ -78,7 +83,6 @@ export default (props) => {
         Parklog.current = (res.parkingLocation).toString().split(',')[0]
         Parklat.current = (res.parkingLocation).toString().split(',')[1]
         setTaRoomContent(res || [])
-        console.log(res);
       })
       //更多指引
       getExtendContent('room', roomId).then((res) => {
@@ -87,14 +91,41 @@ export default (props) => {
         setAllextNum(res.total)
         setNewextNum(res.records.length)
       })
+      getRecommendList({ location: RoomLocation }).then((res) => {
+        setPackage(res || [])
+      })
 
 
     } else {
-      console.log('房源没有ID');
+      getRecommendList({ location: iflocation }).then((res) => {
+        setPackage(res || [])
+      })
+
       return
     }
+    // extend?.records === []
 
-  }, [roomId])
+
+    if (taRoomContent?.wifiPassword === "") {
+      setWifiButtonStyle('none')
+    }
+    if (taRoomContent?.parkingAddress === "") {
+      setParkingButtonStyle('none')
+    }
+    // if (extend.length === 0) {
+    //   setGuideStyle('none')
+    // }
+    // if (extend) {
+    //   extend.map(item => {
+    //     if (item.pages) {
+    //       setGuideStyle('none')
+    //     } else {
+    //       setGuideStyle('')
+    //     }
+    //   })
+    // }
+
+  }, [roomId, RoomLocation])
 
 
   const goRoomMap = () => {
@@ -137,8 +168,6 @@ export default (props) => {
 
 
 
-
-
   return (
     <scroll-view scroll-y style='height:100%;'  >
 
@@ -176,9 +205,9 @@ export default (props) => {
                 <view className='MessageCard-content'>
                   <view className='MessageCard-name' >{taRoomContent?.address}</view>
                 </view>
-                <view className='MessageCard-button-RoomName'>
+                <view className='MessageCard-button-RoomName' onClick={() => { goRoomMap() }}>
                   <image className='MessageCard-image' src={GoHere} />
-                  <text className='MessageCard-text' onClick={() => { goRoomMap() }} >去这里</text>
+                  <text className='MessageCard-text'  >去这里</text>
                 </view>
               </view>
               <view className='MessageCard'>
@@ -190,9 +219,9 @@ export default (props) => {
                 <view className='MessageCard-content'>
                   <view className='MessageCard-name' >{taRoomContent?.parkingAddress}</view>
                 </view>
-                <view className='MessageCard-button-Park'>
+                <view className='MessageCard-button-Park' onClick={() => { goParkMap() }} style={{ display: parkingButtonStyle }} >
                   <image className='MessageCard-image' src={Taxi} />
-                  <text className='MessageCard-text' onClick={() => { goParkMap() }} >去这里</text>
+                  <text className='MessageCard-text'  >去这里</text>
                 </view>
               </view>
               <view className='MessageCard'>
@@ -201,18 +230,18 @@ export default (props) => {
                   WiFi信息
                   <text className='MessageCard-right'>----------</text>
                 </view>
-                <view className='MessageCard-content'>
+                <view className='MessageCard-content' style={{ display: wifiButtonStyle }} >
                   <view className='MessageCard-name' >名称：{taRoomContent?.wifiName}</view>
                   <view className='MessageCard-info'  ><text className='MessageCard-name'>密码：</text>{taRoomContent?.wifiPassword}</view>
                 </view>
-                <view className='MessageCard-button'>
+                <view className='MessageCard-button' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
                   <image className='MessageCard-image' src={WiFi} />
-                  <text className='MessageCard-text' onClick={() => { wifiCopy() }}>复制</text>
+                  <text className='MessageCard-text'>复制</text>
                 </view>
               </view>
 
-              <view className='Guide-Content-box' >
-                <view className='title-image'>
+              <view className='Guide-Content-box'  >
+                <view className='title-image' style={{ display: guideStyle }} >
                   <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
                   <text className='title-title-boss' >更多指引</text>
                 </view>
@@ -232,7 +261,7 @@ export default (props) => {
             <text className='title-title-boss' >老板推荐好吃的</text>
           </view>
         </view>
-        {spackage?.map((item, index) => <BossCard key={(index)} item={item} />)}
+        {spackage?.map((item, index) => <BossCard cardNavigateTo={cardNavigateTo} key={(index)} item={item} />)}
         {/* 卡片------------- */}
         {/* <view className='Guide-Content-box-two'>
           <view className='title-image-two'>

src/services/shopBoss.js

@@ -25,3 +25,23 @@ export const getShopMoney = (id, amountType) => request(`/shop/${id}/account?amo
  */
 export const getAccount = (id,) => request(`/shop/account/${id}/log`, { id })
 
+
+/**
+ * 商铺核销列表
+ * @param {*} 
+ * @returns 
+ */
+export const getVerifiedOrder = (data) => request(`/verifyTarget`, { data })
+
+
+
+
+
+/**
+ * 商铺核销确认
+ * @param {*} 
+ * @returns 
+ */
+export const setGetVerifiedOrder = (id) => request(`/verifyTarget​/${id}`, { method: 'put', id })
+
+

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -21,7 +21,7 @@ import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 
 export default (props) => {
-  const { shopList, shop, account, onHotelChange, accountlog, shopMoney } = props
+  const { shopList, shop, onHotelChange, shopMoney, verifiedOrder } = props
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
   const { tabJump } = params || {}
@@ -41,6 +41,26 @@ export default (props) => {
     onHotelChange(current)
   }
 
+
+  //搜索
+  const search = (value) => {
+    console.log(value);
+
+    return new Promise((resolve, reject) => {
+      console.log(resolve, reject);
+      resolve([{ text: '搜索结果', value: 1 }, { text: '搜索结果2', value: 2 }])
+
+    })
+  }
+  const handeInput = (e) => {
+    const value = e.detail.value
+    console.log("🚀 ~ file: shopKeeper.jsx ~ line 57 ~ handeInput ~ value", value)
+
+
+  }
+
+
+
   useEffect(() => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
@@ -74,9 +94,9 @@ export default (props) => {
       </view>
       <ToggleRole showCutover={showCutover} onClose={onClose} 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)' }}>
+        <scroll-view scroll-y scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll' style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
-            <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
+            <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
             <view onClick={ShowMoldeOn} className='User-info-cutover'>
               <image className='User-info-cutover-image' src={cutoverUser} />
             </view>
@@ -86,7 +106,7 @@ export default (props) => {
                 <view className='lword'>全年订单收入（税前）</view>
 
                 <view className='yearMoney'>
-                  <text>{isyear ? shopMoney?.totalCharges : '******'}</text>元
+                  <text>{isyear ? shopMoney?.totalCharges / 100 : '******'}</text>元
                   <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
                 </view>
               </view>
@@ -94,15 +114,18 @@ export default (props) => {
               <view className='sright'>
                 <view className='rword'>当月订单收入（税前）</view>
                 <view className='monthMoney'>
-                  <text>{isMomth ? shopMoney?.currentCharges : '******'}</text>元
+                  <text>{isMomth ? shopMoney?.currentCharges / 100 : '******'}</text>元
                   <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
                 </view></view>
             </view>
           </view>
           <view className='search'>
-            <input className='searchInput' />
-            <image className='searchicon' src={iconsearch} />
-            <view className="searchword">搜索订单(输入客户手机号码)</view>
+            <mp-searchbar
+              placeholder='搜索订单(输入客户手机号码)'
+              search={search}
+              onInput={(e) => handeInput(e)}
+            >
+            </mp-searchbar>
           </view>
           <view className='index-tabs'>
             <mp-tabs
@@ -116,11 +139,22 @@ export default (props) => {
             >
             </mp-tabs>
           </view>
+          {
+            verifiedOrder.map
 
+          }
           <view>
             {/* 未核销 */}
             {activeTab === 0 &&
-              <ShopUnused />
+              <>
+                {
+                  verifiedOrder.map((item, index) => {
+
+                    return <ShopUnused key={(index)} item={item} />
+                  })
+                }
+              </>
+
             }
             {/* 已核销 */}
             {activeTab === 1 &&

src/shop/components/ShopKeeper/shopKeeper.less

@@ -146,30 +146,47 @@
 }
 
 .search{
-  padding: 40px 0  30px 0;
-  position: relative;
-  .searchInput{    
-    height: 68px;
+  margin: 35px 0;
+  .weui-search-bar{
+    padding: 0px;
+    border-radius: 45px;
     background: #F8F8F8;
-    border-radius: 34px;
-    box-sizing: border-box;
-  }
-  .searchicon{
-    width: 25px;
-    height: 25px;
-    position: absolute;
-    left: 136px;
-    top: 61px;
-  }
-  .searchword{
-    height: 25px;
-    font-size: 24px;
-    color: #C0C8D3;
-    position: absolute;
-    left: calc(50% - 141rpx);
-    bottom: 60px;
+
+    .weui-search-bar__label{
+      background: #F8F8F8;
+    }
+    .weui-search-bar__form{
+      border-radius: 45px;
+      background: #F8F8F8;
+      
+
+    }
+
+    .weui-search-bar__label{
+      border-radius: 45px;
+      background: #F8F8F8;
+
+
+    }
+    .weui-search-bar__input{
+      text-align: center;
+      background: #F8F8F8;
+
+    }
+  
+    .weui-search-bar__cancel-btn{
+      position: relative;
+      left: -10px;
+      font-size: 31px;
+      padding-left: 5px;
+      background: #F8F8F8;
+
+
+    }
   }
 }
+
+
 .index-tabs {
   width: 100%;
   height: 91px;
@@ -194,99 +211,7 @@
     border-bottom: 5px solid black;
   }
 }
-.orderCard{
-  margin-bottom: 20px;
-  .orderId{
-    font-size: 20px;
-    color: #666666;
-    line-height: 44px;
-    float: left;
-    margin: 60px 0 32px 0;
 
-  }
-  .orderTime{    
-    font-size: 20px;
-    color: #666666;
-    line-height: 44px;
-    float: right;
-    margin: 60px 0 32px 0;
-  }
-  .order{
-    background: #FFFFFF;
-    box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
-    border-radius: 12px;
-    padding: 20px;
-    .orderImg{
-      width: 194px;
-      height: 194px;
-      border-radius: 22px;
-      float: left;
-      margin:0 26px 30px 0;
-    }
-    .orderRight{
-      .foodName{
-        height: 63px;
-        font-size: 24px;
-        color: #333333;
-        line-height: 40px;
-      }
-      .price{
-        font-size: 20px;
-        font-weight: bold;
-        color: #202020;
-        line-height: 44px;
-        margin: 37px 0 40px 0;
-        height: 19px;
-        .pnum{
-          color: #333333;
-          font-weight: 400;
-          margin-left: 47px;         
-        }
-      }
-      .price+view{
-        font-size: 20px;
-        font-weight: bold;
-        color: #FF3434;
-        line-height: 44px;
-        margin-bottom: 35px;
-        height: 19px;
-      }
-    }
-    .line{
-      width: 100%;
-      height: 2px;
-      background: #000;
-      opacity: 0.1;
-    }
-    .phone{
-      font-size: 24px;
-      color: #666666;
-      line-height: 44px;
-      height: 23px;
-      margin: 30px 0;
-    }
-    .button-OK{
-      width: 160px;
-    height: 40px;
-    background: #1A3B83;
-    /* margin: 0 auto; */
-    line-height: 40px;
-    border-radius: 12px;
-    font-size: 23px;
-    color: #ffffff;
-    position: relative;
-    right: -8em;
-    top: -2em;
-    }
-    .tripTime{
-      font-size: 24px;
-      color: #666666;
-      line-height: 44px;
-      margin-bottom: 30px;
-    }
-  }
-  
-}
 .botton{
   font-size: 28px;   
   color: #C0C8D3;

src/shop/components/Sparead/spreadMoney.jsx

@@ -16,7 +16,7 @@ import './spreadMoney.less'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 export default (props) => {
-  const { shopList, shop, account, onHotelChange, accountlog, shopMoney } = props
+  const { shopList, shop, onHotelChange, shopMoney } = props
   const [showCutover, setShowCutover] = useState(false)
   const [isyear, setYear] = useState(false)
   const [isMomth, setMonth] = useState(false)
@@ -73,7 +73,7 @@ export default (props) => {
               <view className='sleft'>
                 <view className='lword'>全年推广收入（税前）</view>
                 <view className='yearMoney'>
-                  <text>{isyear ? shopMoney?.totalCharges : '******'}</text>元
+                  <text>{isyear ? shopMoney?.totalCharges / 100 : '******'}</text>元
                   <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
                 </view>
               </view>
@@ -81,7 +81,7 @@ export default (props) => {
               <view className='sright'>
                 <view className='rword'>当月推广收入（税前）</view>
                 <view className='monthMoney'>
-                  <text>{isMomth ? shopMoney?.currentCharges : '******'}</text>元
+                  <text>{isMomth ? shopMoney?.currentCharges / 100 : '******'}</text>元
                   <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
                 </view></view>
             </view>
@@ -90,7 +90,7 @@ export default (props) => {
           {
             shopAccount.map((item, index) => {
               return (
-                <ShopCommission item={item} />
+                <ShopCommission key={(index)} item={item} />
 
               )
             })

src/shop/pages/spread/spreadIndex.config.js

@@ -4,6 +4,7 @@ export default {
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
     "mp-tabs": "../../../components/tabs/index",
-    "mp-dialog": "weui-miniprogram/dialog/dialog"
+    "mp-dialog": "weui-miniprogram/dialog/dialog",
+    "mp-searchbar": "weui-miniprogram/searchbar/searchbar",
   }
 }

src/shop/pages/spread/spreadIndex.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import CustomNav from '@/components/CustomNav'
 import { useRouter } from '@tarojs/taro'
-import { getShopList, getShopMoney, getAccount } from '@/services/shopBoss'
+import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
 import ShopKeeper from '../../components/ShopKeeper/shopKeeper'
 import Sparead from '../../components/Sparead/spreadMoney'
 import TabBar from '@/components/CustTabBar'
@@ -21,14 +21,13 @@ 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
-  console.log("🚀 ~ file: spreadIndex.jsx ~ line 26 ~ withLayout ~ shopId", shopId)
-  const [account, setAccount] = useState()
-  const [accountlog, setAccountLog] = useState([])
 
   const [amountType, setAmountType] = useState('order')
   const [shopMoney, setShopMoney] = useState([])
+  const [verifiedOrder, setVerifiedOrder] = useState([])
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
@@ -40,17 +39,30 @@ export default withLayout((props) => {
 
   useEffect(() => {
     getShopList().then((res) => {
-      const { shopList: list, account: acc, shop: current } = res
+      const { shopList: list, shop: current } = res
       setShopList(list)
       setShop(current)
-      setAccount(acc)
-      console.log("🚀 ~ file: shopKeeper.jsx ~ line 48 ~ getShopList ~ res", res)
+    })
+
+  }, [])
+
 
+  //未核销订单列表
+  useEffect(() => {
+    getVerifiedOrder({
+      isVerified: 0,
+      pageNum: 1,
+      pageSize: 99,
+      shopId: shopId,
 
+    }).then((res) => {
+      const order = res.records
+      setVerifiedOrder(order)
+      console.log("🚀 ~ file: spreadIndex.jsx ~ line 49 ~ getVerifiedOrder ~ res", res)
 
     })
 
-  }, [])
+  }, [shopId])
 
   useEffect(() => {
     if (shopId) {
@@ -86,8 +98,11 @@ export default withLayout((props) => {
       <CustomNav title={shop?.shopName} />
 
       <view className='index-container'>
-        {currentTab === 0 && <ShopKeeper shopList={shopList} shop={shop} account={account} onHotelChange={handleHotelChange} accountlog={accountlog} shopMoney={shopMoney} />}
-        {currentTab === 1 && <Sparead shopList={shopList} shop={shop} account={account} onHotelChange={handleHotelChange} accountlog={accountlog} shopMoney={shopMoney} />}
+        {currentTab === 0 && <ShopKeeper verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
+
+
+        }
+        {currentTab === 1 && <Sparead shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
       </view>
       <view className='index-tabbar'>
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>