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/BossCard/style.less

@@ -281,7 +281,7 @@
         margin-top: 3em;
         background-color: #274190;
         border-radius: 12px;
-        width: 690px;
+        width: calc(100% - 60px);
         height: 92px;
         color: @whiteColor;
         // position: absolute;

src/components/CompoentsOrder/AlreadyUsed/style.less

@@ -314,7 +314,7 @@
 
     .button-box {
       margin: 60px 0;
-      width: 690px;
+      width: calc(100% - 60px);
       height: 88px;
       line-height: 88px;
       background: #274291;

src/components/CompoentsOrder/TobePaid/style.less

@@ -257,7 +257,7 @@
 
     .button-box {
       margin: 60px 0;
-      width: 690px;
+      width: calc(100% - 60px);
       height: 88px;
       line-height: 88px;
       background: #274291;

src/components/CompoentsOrder/TobeWritten/style.less

@@ -258,7 +258,7 @@
 
     .button-box {
       margin: 60px 0;
-      width: 690px;
+      width: calc(100% - 60px);
       height: 88px;
       line-height: 88px;
       background: #274291;

src/components/PayOrderCard/style.less

@@ -281,7 +281,7 @@
         margin-top: 3em;
         background-color: #274190;
         border-radius: 12px;
-        width: 690px;
+        width: calc(100% - 60px);
         height: 92px;
         color: @whiteColor;
         // position: absolute;

src/components/SearchBar/index.jsx

@@ -0,0 +1,21 @@
+import Taro, { View } from "@tarojs/components"
+
+import './style.less'
+
+export default (props) => {
+
+  const { placeholder, onBlur } = props
+
+
+
+
+  return (
+    <View className='searchBar'>
+      <mp-searchbar
+        placeholder={placeholder}
+        onBlur={onBlur}
+      >
+      </mp-searchbar>
+    </View>
+  )
+}

src/components/SearchBar/style.less

@@ -0,0 +1,41 @@
+
+.searchBar{
+  margin: 35px 0;
+  .weui-search-bar{
+    padding: 0px;
+    border-radius: 45px;
+    background: #F8F8F8;
+
+    .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;
+
+
+    }
+  }
+}

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/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

@@ -1,14 +1,32 @@
 import Taro from '@tarojs/taro'
+import { getShopList, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
+
 import { useState, useEffect } from 'react'
 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 formatTimes from '@/utils/formatTime'
 import './style.less'
 
 
 export default (props) => {
-  const { } = props
 
+  const { item, verifiedOrder } = props
+  const verifyNo = item?.verifyNo
+  const [buttonStyle, setButtonStyle] = useState('')
+
+
+  const confirmOrder = () => {
+    setGetVerifiedOrder(verifyNo).then((e) => {
+      Taro.showToast({
+        title: '核销成功',
+        icon: 'success',
+        duration: 2000,
+      })
+      setButtonStyle('none')
+
+    })
+  }
 
 
   useEffect(() => {
@@ -18,22 +36,20 @@ 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>已下单：等待客户上门就餐</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 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 className='phone'>客户手机：<text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</text>
+          <button className='button-OK' onClick={confirmOrder} style={{ display: buttonStyle }}  >确认核销</button> </view>
       </view>
     </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/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/hotel/components/HouseManage/houseManage.jsx

@@ -1,17 +1,19 @@
-import Taro, {useDidShow } from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import see from '@/assets/icons/landlord/查看入住人.png'
 import share from '@/assets/icons/landlord/分享链接.png'
 import del from '@/assets/icons/landlord/删除.png'
 import addImg from '@/assets/icons/landlord/添加.png'
 import iconsearch from '@/assets/icons/housemantj/search.png'
-import React,{useState, useEffect,useRef, useImperativeHandle } from 'react'
-import {getRoomList,deleteRoom} from '@/services/landlord'
+import React, { useState, useEffect, useRef, useImperativeHandle } from 'react'
+import { getRoomList, deleteRoom } from '@/services/landlord'
 import ShareRoom from '../shareRoom/ShareRoom.jsx'
 import ShareCard from '../shareCard/shareCard'
 import './houseManage.less'
+import SearchBar from '@/components/SearchBar'
+
 
 export default React.forwardRef((props, ref) => {
-  const {hotel}=props
+  const { hotel } = props
   const [detail, setDetail] = useState([])
 
   const shareDataRef = useRef()
@@ -19,17 +21,17 @@ export default React.forwardRef((props, ref) => {
   // 判断是否首次加载
   const mounted = useRef(false)
 
-  const handelClick=()=>{
+  const handelClick = () => {
     Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}` });
   }
-  const handelDelete=(roomId)=>{
-    deleteRoom(roomId).then(()=>{
+  const handelDelete = (roomId) => {
+    deleteRoom(roomId).then(() => {
       Taro.showToast({
         title: '删除房源成功',
         icon: 'none',
       })
-      getRoomList({hotelId:hotel.hotelId}).then((res)=>{
-        setDetail(res.records||[])
+      getRoomList({ hotelId: hotel.hotelId }).then((res) => {
+        setDetail(res.records || [])
       })
     })
   }
@@ -44,21 +46,21 @@ export default React.forwardRef((props, ref) => {
   const onClose = () => {
     setShowCutover(false)
   }
-  useEffect(()=>{
+  useEffect(() => {
     //首次加载页面时
     if (!mounted.current && hotel.hotelId) {
-      getRoomList({hotelId:hotel.hotelId}).then((res)=>{
-        setDetail(res.records||[])
+      getRoomList({ hotelId: hotel.hotelId }).then((res) => {
+        setDetail(res.records || [])
         mounted.current = true
       })
     }
-  },[hotel?.hotelId])
+  }, [hotel?.hotelId])
 
   //当前页面切换到前台时
   useDidShow(() => {
     if (mounted.current) {
-      getRoomList({hotelId:hotel.hotelId}).then((res)=>{
-        setDetail(res.records||[])
+      getRoomList({ hotelId: hotel.hotelId }).then((res) => {
+        setDetail(res.records || [])
       })
     }
   })
@@ -81,41 +83,48 @@ export default React.forwardRef((props, ref) => {
     // 打开分享弹窗
     setShowCard(true)
   }
+  const handelOrder = (val) => {
+    Taro.navigateTo({ url: `/hotel/pages/landlord/roomOrder/roomOrder?roomId=${val.roomId}&roomName=${val.roomName}` });
+  }
 
+  const onSearch=(e)=>{
+    if(e.detail.value==''){
+      getRoomList({ hotelId: hotel.hotelId }).then((res) => {
+        setDetail(res.records || [])
+      })
+    }
+    else{
+      getRoomList({ hotelId: hotel.hotelId,roomName:e.detail.value }).then((res) => {
+      setDetail(res.records || [])
+    })
+    }
+    
+  }
   return (
     <view>
       <view style={{ padding: '0 30rpx', height: '100%' }}>
-          <view className='search'>
-            <input className='searchInput' disabled />
-            <image className='searchicon' src={iconsearch} />
-            <view className="searchword">请输入关键字搜索</view>
-          </view>
-          <ShareRoom showCutover={showCutover} onClose={onClose}  room={room} onFinish={handleFinish} />
-          <ShareCard showCutover={showCard} onClose={onClose}/>
+        <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
+        <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
+        <ShareCard showCutover={showCard} onClose={onClose} />
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 255px)' }}>
-
-          <view>
-            {
-              detail?.map((item)=>
+          {
+            detail?.map((item) =>
               <view className='houseCard'>
-              <view className='houseName'>{item.roomName}</view>
-              <view className='operation'>
-                <view><image src={see} />查看入住人</view>
-                <view onClick={()=>ShowMoldeOn(item)}><image src={share}/>分享链接</view>
-                <view onClick={()=>{handelDelete(item.roomId)}}><image src={del} />删除房源</view>
+                <view className='houseName'>{item.roomName}</view>
+                <view className='operation'>
+                  <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
+                  <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>
+                  <view onClick={() => handelDelete(item.roomId)}><image src={del} />删除房源</view>
+                </view>
               </view>
-            </view>
-              )
-            }
-            
-           
-          </view>
-        </scroll-view>        
+            )
+          }
+        </scroll-view>
       </view>
       <view className='addHouse' onClick={handelClick}>
         <image className='addImg' src={addImg} />添加房源
       </view>
-    
-      </view>
+
+    </view>
   )
 })

src/hotel/components/HouseManage/houseManage.less

@@ -1,29 +1,5 @@
 
-.search{
-  padding: 40px 0 15px 0;
-  position: relative;
-  .searchInput{    
-    height: 68px;
-    background: #F8F8F8;
-    border-radius: 34px;
-    box-sizing: border-box;
-  }
-  .searchicon{
-    width: 25px;
-    height: 25px;
-    position: absolute;
-    left: calc(50% - 135px);
-    top: 64px;
-  }
-  .searchword{
-    height: 23px;
-    font-size: 24px;
-    color: #C0C8D3;
-    position: absolute;
-    left: calc(50% - 100px);
-    bottom: 45px;
-  }
-}
+
 .houseCard{
   background: #FFFFFF;
   box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);

src/hotel/pages/landlord/addRoom/addRoom.less

@@ -8,7 +8,7 @@
   display: inline;
 }
 button {
-  width: 690px;
+  width: calc(100% - 60px);
   height: 92px;
   background: #1A3B83;
   margin: 0 auto;

src/hotel/pages/landlord/landlord.config.js

@@ -4,7 +4,8 @@ export default {
   styleIsolation: 'shared',
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
-    "mp-dialog": "weui-miniprogram/dialog/dialog"
+    "mp-dialog": "weui-miniprogram/dialog/dialog",
+    "mp-searchbar": "weui-miniprogram/searchbar/searchbar"
   },
   enableShareAppMessage: true
 }

src/hotel/pages/landlord/roomOrder/roomOrder.config.js

@@ -0,0 +1,6 @@
+export default {
+  navigationBarTitleText: '',
+  navigationStyle: 'custom',
+  usingComponents: {
+  }
+}

src/hotel/pages/landlord/roomOrder/roomOrder.jsx

@@ -0,0 +1,78 @@
+import withLayout from '@/layouts'
+import React, { useState, useEffect, useRef } from 'react'
+import CustomNav from '@/components/CustomNav'
+import Taro from '@tarojs/taro'
+import copy from '@/assets/icons/landlord/复制.png'
+import { Input, Button, View, Picker, Label, Image } from '@tarojs/components'
+import { getRoomOrderList } from '@/services/landlord'
+import './roomOrder.less'
+
+
+
+
+export default withLayout((props) => {
+  const { roomId, roomName } = props.router.params
+  const [detail, setDetail] = useState([])
+  useEffect(() => {
+    getRoomOrderList({ roomId: roomId }).then((res) => {
+      setDetail(res.records || [])
+    })
+  }, [])
+  const CopyName = (val) => {
+    Taro.setClipboardData({
+      data: val,
+      success: e => {
+        Taro.showToast({
+          title: '入住人姓名已复制',
+          icon: 'success',
+          duration: 2000,
+        })
+      }
+    })
+  }
+  const CopyPhone = (val) => {
+    Taro.setClipboardData({
+      data: val,
+      success: e => {
+        Taro.showToast({
+          title: '入住人电话已复制',
+          icon: 'success',
+          duration: 2000,
+        })
+      }
+    })
+  }
+  return (
+    <View style={{ padding: '0 30px' }}>
+      <CustomNav title={roomName ? roomName : '房间名'} />
+      <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 65px)' }}>
+
+        {
+          detail.length==0?<View className='houseCard'>暂无入住人数据</View>
+           :detail?.map((item) =>
+            <View className='houseCard'>
+              {
+                item.personList?.map((item2) =>
+                  <View className='operation'>
+                    <View style={{display:'inline-block'}} onClick={()=>CopyName(item2.customerName)}>
+                      <Label>{item2.customerName}</Label>
+                      <Image src={copy} />
+                    </View>
+                    <View style={{display:'inline-block',marginLeft:'40rpx'}} onClick={()=>CopyPhone(item2.customerPhone)}>
+                      <Label>{item2.customerPhone}</Label>
+                      <Image src={copy} />
+                    </View>
+                  </View>
+
+                )
+              }              
+              <View className='operation'>入住时间：{item.startDate}  -  {item.endDate}</View>
+
+            </View>
+          )
+        }
+        
+      </scroll-view>
+    </View>
+  )
+})

src/hotel/pages/landlord/roomOrder/roomOrder.less

@@ -0,0 +1,19 @@
+.houseCard{
+  background: #1A3B83;
+  border-radius: 60px;
+  padding: 40px 30px 41px 30px;
+  text-align: center;
+  margin: 30px 0;
+  font-size: 28px;
+  color: #fff;  
+  Image{
+    width: 35px;
+    height: 35px;
+    margin-left:40px;
+    position: relative;
+    top: 5px;
+  }
+  .operation{
+    margin: 10px 0;
+  }
+}

src/pages/MineUserAll/RefundMoney/CheckRefund/style.less

@@ -402,7 +402,7 @@
 
     .button-box {
       margin: 60px 0;
-      width: 690px;
+      width: calc(100% - 60px);
       height: 88px;
       line-height: 88px;
       background: #274291;

src/pages/PayOrder/style.less

@@ -281,7 +281,7 @@
         margin-top: 3em;
         background-color: #274190;
         border-radius: 12px;
-        width: 690px;
+        width: calc(100% - 60px);
         height: 92px;
         color: @whiteColor;
         // position: absolute;

src/pages/RoomOrder/index.jsx

@@ -9,7 +9,6 @@ import './style.less'
 
 
 
-
 export default withLayout((props) => {
   const { router, person } = props
   const { roomId, roomOrderId, status } = router.params

src/pages/RoomOrder/style.less

@@ -1,5 +1,5 @@
 button {
-  width: 690px;
+  width: calc(100% - 60px);
   height: 92px;
   background: #1A3B83;
   margin: 0 auto;

src/pages/TobeShop/style.less

@@ -303,7 +303,7 @@
 
     .button-box {
       margin: 60px 0;
-      width: 690px;
+      width: calc(100% - 60px);
       height: 88px;
       line-height: 88px;
       background: #274291;

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,38 +11,19 @@ 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 } = props
+  const { router, person, location } = props
   const { params, path } = router
   const { tab } = params || {}
-
   const [currentTab, setCurrentTab] = useState(0)
-
-  const locRef = useRef()
-
-
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
   }
-
-  const [queryParams, setQueryParams] = useState({ location: '', pageNum: 1, pageSize: 10, typeId: '' })
-
-
-  useEffect(() => {
-    getLocation().then((res) => {
-      locRef.current = `${res.longitude},${res.latitude}`
-      setQueryParams({
-        ...queryParams,
-        location: locRef.current
-      })
-    })  
-  }, [])
-
   useEffect(() => {
     if (tab) {
       setCurrentTab(tab - 0)
@@ -52,16 +35,14 @@ export default withLayout((props) => {
         <CustomNav logo={logo} title='十公里' />
       </view>
       <view className='index-container'>
-        {currentTab === 0 && <Recommend loc={locRef} qp={queryParams}/>}
+        {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'>
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
       </view>
     </view>
-
   )
-
-})
+})

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/pages/index/tabs/GuideCss/style.less

@@ -5,7 +5,7 @@
   width: 94%;
   margin: auto;
   .MessageCard {
-    width: 690px;
+    width: calc(100% - 60px);
     height: 175px;
     background: @whiteColor;
     border-radius: 12px;
@@ -135,7 +135,7 @@
 
   .articleCard {
     margin-top: 60px;
-    width: 690px;
+    width: calc(100% - 60px);
     // height: 1066px;
     background: #ffffff;
     border-radius: 12px;

src/pages/index/tabs/MineCss/style.less

@@ -169,7 +169,7 @@
   .Badge-box {
     margin-top: 30px;
     .Badge-list {
-      width: 690px;
+      width: calc(100% - 60px);
       height: 102px;
       background: #ffffff;
       box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.08);

src/pages/index/tabs/Recommend.jsx

@@ -1,7 +1,7 @@
 import Taro, { useRouter } from '@tarojs/taro'
 import { React, useState, useEffect, useRef } from 'react'
 import iconsearch from '@/assets/icons/housemantj/search.png'
-import location from '@/assets/icons/housemantj/location.png'
+import locationimg from '@/assets/icons/housemantj/location.png'
 import Tip from '@/components/tip'
 import { getIndexType,  getResourceList } from '@/services/home'
 import Card from '../components/Card'
@@ -11,20 +11,14 @@ import './less/Recommend.less'
 
 
 export default (props) => {
-  const { router, person, loc,qp } = props
+  const { router, person, location } = props
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
   const { tabJump } = params || {}
   const [typeList, setTypeList] = useState([])
   
-  const locRef = useRef(loc)
-  // if(locRef.current==null){
-  //     Taro.showLoading()
-  //   }
-  //   if (locRef.current!=null) {
-  //     Taro.hideLoading()
-  //   }
-  const [queryParams, setQueryParams] = useState(qp)
+  
+  const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
 
   // 获取资源表信息
   const [alllist, setAllList] = useState([])
@@ -40,35 +34,22 @@ export default (props) => {
       typeId: tab
     })
     if (index == 0) {
-      setQueryParams({ location:  locRef.current, pageNum: 1, pageSize: 10, typeId: '' })
+      setQueryParams({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
   }
 
-  useEffect(() => {
-    
+  useEffect(() => {    
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
-    })
-    
+    })    
   }, [])
 
   useEffect(() => {
-    if (tabJump) {
-      // 更新 typeId
-      // 更新 分页
-    }
-    setActiveTab(tabJump - 0)
-  }, [tabJump])
-
-
-  useEffect(() => {
-    if (locRef.current) {
       getResourceList(queryParams).then((res) => {
         setAllList(res.records || [])
       })
-    }
-  }, [queryParams])
+    }, [queryParams])
 
   const onSearch = () => {
     // 用绝对路径
@@ -88,7 +69,7 @@ export default (props) => {
       <Tip />
       <view className='index-tabs'>
         <view className='position'>
-          <image className='location' src={location} />
+          <image className='location' src={locationimg} />
           <view className='city'>南京</view>
           <view className='line' />
         </view>

src/pages/index/tabs/less/Recommend.less

@@ -2,7 +2,6 @@
     padding: 10px 30px 0 30px;
     position: relative;
     .searchInput{    
-        width: 690px;
         height: 68px;
         background: #F8F8F8;
         border-radius: 34px;

src/routes.js

@@ -80,6 +80,10 @@ const hotelPages = [
     title: '新增房源',
     page: 'pages/landlord/addRoom/addRoom',
   },
+  {
+    title: '查看入住人',
+    page: 'pages/landlord/roomOrder/roomOrder',
+  },
 ];
 
 // 所有的页面

src/services/landlord.js

@@ -57,4 +57,10 @@ import request from '@/utils/request'
  * @param {*} data 
  * @returns 
  */
- export const shareRoom = (data) => request('/roomOrder', { method: 'post', data })
+ export const shareRoom = (data) => request('/roomOrder', { method: 'post', data })
+ /**
+ * 查看历史入住人列表
+ * @param {*} id 
+ * @returns 
+ */
+  export const getRoomOrderList = (params) => request('/roomOrder',{params})

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}/confirm`, { method: 'put', id })

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -5,6 +5,8 @@ import Picker from '@/components/Picker'
 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'
@@ -21,7 +23,8 @@ import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 
 export default (props) => {
-  const { shopList, shop, account, onHotelChange, accountlog, shopMoney } = 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 || {}
@@ -37,10 +40,11 @@ export default (props) => {
   }
 
 
-  const handleHotelChange = (shopId, current) => {
+  const handleHotelChange = (e, current) => {
     onHotelChange(current)
   }
 
+
   useEffect(() => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
@@ -50,6 +54,13 @@ export default (props) => {
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
+    if (index === 1) {
+      onVarified()
+
+    } else {
+      onVarifiedTwo()
+
+    }
   }
   const tabs = [
     {
@@ -61,6 +72,15 @@ export default (props) => {
   ]
 
 
+  const handleVarified = () => {
+    onVarified()
+  }
+
+
+  const onSeacrh = (e) => {
+    console.log('eeeeeeeeeeeeeeeeee', e.detail.value);
+  }
+
   const [showCutover, setShowCutover] = useState(false)
   const ShowMoldeOn = () => {
     setShowCutover(true)
@@ -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,14 @@ 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>
+
+            <SearchBar placeholder='搜索订单(输入客户手机号码)' onBlur={onSearch} />
           </view>
           <view className='index-tabs'>
             <mp-tabs
@@ -116,16 +135,34 @@ export default (props) => {
             >
             </mp-tabs>
           </view>
+          {
+            verifiedOrder.map
 
+          }
           <view>
             {/* 未核销 */}
             {activeTab === 0 &&
-              <ShopUnused />
+              <>
+                {
+                  verifiedOrder.map((item, index) => {
+
+                    return <ShopUnused key={(index)} item={item} />
+                  })
+                }
+              </>
             }
             {/* 已核销 */}
             {activeTab === 1 &&
               <>
-                <ShopUsed />
+                {
+                  verifiedOrder.map((item, index) => {
+
+                    return <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />
+                  })
+                }
+
+
+
               </>
             }
           </view>

src/shop/components/ShopKeeper/shopKeeper.less

@@ -145,31 +145,8 @@
   }
 }
 
-.search{
-  padding: 40px 0  30px 0;
-  position: relative;
-  .searchInput{    
-    height: 68px;
-    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;
-  }
-}
+
+
 .index-tabs {
   width: 100%;
   height: 91px;
@@ -194,99 +171,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

@@ -11,12 +11,13 @@ import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
 import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
 import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
 import { getAccount } from '@/services/shopBoss'
+import ToggleRole from '@/components/toggleRole/ToggleRole'
+
 
 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)
@@ -26,12 +27,16 @@ export default (props) => {
 
 
 
+
+
+
   useEffect(() => {
     getAccount(accountId).then((e) => {
       const accContent = e.records
       setShopAccount(accContent)
 
     })
+
   }, [accountId])
 
   //小眼睛开关
@@ -73,7 +78,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 +86,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 +95,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'
@@ -23,12 +23,11 @@ export default withLayout((props) => {
   const [shopList, setShopList] = useState([])
   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 [isVerified, setisVerified] = useState(0)
   const [shopMoney, setShopMoney] = useState([])
+  const [verifiedOrder, setVerifiedOrder] = useState([])
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
@@ -40,17 +39,40 @@ 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: isVerified,
+      pageNum: 1,
+      pageSize: 99,
+      shopId: shopId,
+
+    }).then((res) => {
+      const order = res.records
+      setVerifiedOrder(order)
 
     })
 
-  }, [])
+
+  }, [shopId, isVerified])
+
+
+  const onVarified = () => {
+    setisVerified(1)
+  }
+
+
+  const onVarifiedTwo = () => {
+    setisVerified(0)
+  }
 
   useEffect(() => {
     if (shopId) {
@@ -84,10 +106,10 @@ export default withLayout((props) => {
   return (
     <view className='page-index'>
       <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 onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} 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}>