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

src/components/BossCard/index.jsx

@@ -41,7 +41,7 @@ export default (props) => {
   return (
     <view class='container'>
       <view class='wrapper'>
-        <view class='left-complete-one' onClick={() => { goFood() }} >
+        <view class='left-complete-one'  >
           <image className='left-image-1' src={ProCard_hot}></image>
           <view className='left-viewText'>
             返现￥{item.cashback / 100}
@@ -56,7 +56,7 @@ export default (props) => {
             <image className='image-2' src={food}></image>
           </view>
           <view className='title-content'>
-            <view className='Pro-title'>
+            <view className='Pro-title' onClick={() => { goFood() }} >
               <view className='title-text'>{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</view>
             </view>
             <text className='title-money' >￥{item.actualPrice / 100}元<text className='title-money-2'>门市价{item.standardPrice / 100}元</text></text>

src/components/ShopCommission/index.jsx

@@ -0,0 +1,23 @@
+import Taro from '@tarojs/taro'
+import { useEffect } from 'react'
+import { getAccount } from '@/services/shopBoss'
+import formatTimes from '@/utils/formatTime'
+
+import './style.less'
+
+
+export default (props) => {
+
+  const { item } = props
+
+
+  return (
+    <view className='spreadCard'>
+      <view className='spreadDate'>日期：<text>{formatTimes(item.createDate, "yyyy/MM/dd")}</text></view>
+      <view className='card'>
+        <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTimes(item.createDate, "yyyy/MM/dd hh:ss")}</text></view>
+        <view className='spreadMoney'>收入金额：<text>{item.amount / 100}</text>元</view>
+      </view>
+    </view>
+  )
+}

src/components/ShopCommission/style.less

@@ -0,0 +1,21 @@
+.spreadCard{
+  margin-bottom: 1px;
+  .spreadDate{
+    font-size: 20px;
+    color: #202020;
+    line-height: 60px;
+  }
+  .card{
+    height: 166px;
+    background: #FFF;
+    box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
+    border-radius: 12px;
+    padding: 40px 0 43px 22px;
+    font-size: 24px;
+    color: #202020;
+    box-sizing: border-box;
+    .spreadMoney{
+      line-height: 60px;
+    }
+  }
+}

src/components/ShopUnused/index.jsx

@@ -0,0 +1,39 @@
+import Taro from '@tarojs/taro'
+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 './style.less'
+
+
+export default (props) => {
+  const { } = props
+
+
+
+  useEffect(() => {
+
+  }, [])
+
+  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>
+      <view className='order'>
+        <image className='orderImg' src={ms} 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>
+        <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>
+    </view>
+  )
+}

src/components/ShopUnused/style.less

@@ -0,0 +1,93 @@
+.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;
+    }
+  }
+  
+}

src/components/ShopUsed/index.jsx

@@ -0,0 +1,39 @@
+import Taro from '@tarojs/taro'
+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 './style.less'
+
+
+export default (props) => {
+  const { } = props
+
+
+
+  useEffect(() => {
+
+  }, [])
+
+  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>
+      <view className='order'>
+        <image className='orderImg' src={ms} 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>
+        <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/ShopUsed/style.less

@@ -0,0 +1,100 @@
+.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;
+  line-height: 34px;
+  text-align: center;
+  padding:40px 0 100px 0;
+}

src/components/foodCards/foodCards.jsx

@@ -7,7 +7,7 @@ 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 { getShopDetail, getShopcity } from '@/services/home'
 import { useState, useEffect } from 'react'
 
 
@@ -15,59 +15,65 @@ import { useState, useEffect } from 'react'
 //套餐卡片
 export default (props) => {
   const { item } = props
-  const [isSaved, toggleSave] = useSave(item.isSaved,'shop_package', item.packageId)
-  const [city,setCity]=useState({})
-  const [detail,setDetail]=useState({})
+  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(() => {
-  getShopDetail(item.shopId).then((res)=>{
-    setDetail(res)
-    getShopcity(res.cityId).then((res2)=>{
-      setCity(res2)
+    getShopDetail(item.shopId).then((res) => {
+      setDetail(res)
+      getShopcity(res.cityId).then((res2) => {
+        setCity(res2)
+      })
     })
-  })
-}, [])
-const star=parseFloat(((detail.sweetScore+detail.environmentScore+detail.serviceScore)/3).toFixed(1)); 
+  }, [])
+  const star = parseFloat(((detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1));
 
   return (
-      <view className='foodCard'>
-        <view className='fCleft'>
-          <view className='backMoney'>
-            返现￥{item.cashback/100}
-          </view>
-          <view className='appraise'>
-            <Star star={star} />
-            <text className='storezf'>{star}</text>
+    <view className='foodCard'>
+      <view className='fCleft'>
+        <view className='backMoney'>
+          返现￥{item.cashback / 100}
+        </view>
+        <view className='appraise'>
+          <Star star={star} />
+          <text className='storezf'>{star}</text>
+        </view>
+        <view>
+          <view className='contentImg'>
+            <image src={item.poster} className='img1'></image>
+            <image src={msTip} className='mstip'></image>
           </view>
-          <view>
-            <view className='contentImg'>
-              <image src={item.poster} className='img1'></image>
-              <image src={msTip} className='mstip'></image>
+          <view className='neirong'>
+            <view className='textword'>{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</view>
+            <view className='jiage' onClick={() => { goFood() }} >
+              <text className='rmb' >￥&nbsp;&nbsp;</text>
+              <text className='p1'><text className='price' >{item.actualPrice / 100}</text>元&nbsp;&nbsp;</text>
+              <text className='p2'>门市价<text className='oldprice' >{item.standardPrice / 100}</text>元</text>
             </view>
-            <view className='neirong'>
-              <view className='textword'>{(item.description).toString().length>25?(item.description).substring(0, 25)+'...':(item.description)}</view>
-              <view className='jiage'>
-                <text className='rmb' >￥&nbsp;&nbsp;</text>
-                <text className='p1'><text className='price' >{item.actualPrice/100}</text>元&nbsp;&nbsp;</text>
-                <text className='p2'>门市价<text className='oldprice' >{item.standardPrice/100}</text>元</text>
-              </view>
-              <view className='address'>
-                <image className='dw' src={wz} />
-                <text className='wz'>{city.areaPName}/{city.areaName}</text>
-                <view style={{display:'inline-block'}} onClick={toggleSave}>
-                <image className='star' src={isSaved>0?hongxin:baixin}></image>
-                <text className='collection'>{isSaved>0?'已收藏':'加入收藏'}</text>
-              </view>
+            <view className='address'>
+              <image className='dw' src={wz} />
+              <text className='wz'>{city.areaPName}/{city.areaName}</text>
+              <view style={{ display: 'inline-block' }} onClick={toggleSave}>
+                <image className='star' src={isSaved > 0 ? hongxin : baixin}></image>
+                <text className='collection'>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
               </view>
             </view>
           </view>
         </view>
-        <view className='fCright' onClick={()=>{Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}` });}}>
-          <image src={pay} />
-          <view>支付</view>
-        </view>
-        <view className='columnLine'></view>
       </view>
-    
+      <view className='fCright' onClick={() => { Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}` }); }}>
+        <image src={pay} />
+        <view>支付</view>
+      </view>
+      <view className='columnLine'></view>
+    </view>
+
   )
 }

src/hotel/components/HouseManage/houseManage.jsx

@@ -1,24 +1,49 @@
-import Taro 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 ShareRoom from '../shareRoom/ShareRoom.jsx'
+import ShareCard from '../shareCard/shareCard'
 import './houseManage.less'
-import {useState, useEffect,useRef } from 'react'
-import {useDidShow } from '@tarojs/taro'
-import {getRoomList} from '@/services/landlord'
 
-
-export default (props) => {
+export default React.forwardRef((props, ref) => {
   const {hotel}=props
   const [detail, setDetail] = useState([])
+
+  const shareDataRef = useRef()
+
   // 判断是否首次加载
   const mounted = useRef(false)
 
   const handelClick=()=>{
     Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}` });
   }
+  const handelDelete=(roomId)=>{
+    deleteRoom(roomId).then(()=>{
+      Taro.showToast({
+        title: '删除房源成功',
+        icon: 'none',
+      })
+      getRoomList({hotelId:hotel.hotelId}).then((res)=>{
+        setDetail(res.records||[])
+      })
+    })
+  }
+
+  const [showCutover, setShowCutover] = useState(false)
+  const [showCard, setShowCard] = useState(false)
+  const [room, setRoom] = useState({})
+  const ShowMoldeOn = (room) => {
+    setRoom(room)
+    setShowCutover(true)
+  }
+  const onClose = () => {
+    setShowCutover(false)
+  }
   useEffect(()=>{
     //首次加载页面时
     if (!mounted.current && hotel.hotelId) {
@@ -38,6 +63,25 @@ export default (props) => {
     }
   })
 
+  useImperativeHandle(ref, () => ({
+    getShareMessage: () => {
+      const { shareImage, roomOrderId } = shareDataRef.current
+      setShowCard(false)
+      return {
+        title: room.roomName,
+        path: `/pages/index/index?tab=1&roomId=${room.roomId}&roomOrderId=${roomOrderId}`,
+        imageUrl: shareImage,
+      }
+    }
+  }))
+
+  const handleFinish = (val) => {
+    shareDataRef.current = val
+    setShowCutover(false)
+    // 打开分享弹窗
+    setShowCard(true)
+  }
+
   return (
     <view>
       <view style={{ padding: '0 30rpx', height: '100%' }}>
@@ -46,6 +90,8 @@ export default (props) => {
             <image className='searchicon' src={iconsearch} />
             <view className="searchword">请输入关键字搜索</view>
           </view>
+          <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>
@@ -54,9 +100,9 @@ export default (props) => {
               <view className='houseCard'>
               <view className='houseName'>{item.roomName}</view>
               <view className='operation'>
-                <view><image src={see} /><text>查看入住人</text></view>
-                <view><image src={share} /><text>分享链接</text></view>
-                <view><image src={del} /><text>删除房源</text></view>
+                <view><image src={see} />查看入住人</view>
+                <view onClick={()=>ShowMoldeOn(item)}><image src={share}/>分享链接</view>
+                <view onClick={()=>{handelDelete(item.roomId)}}><image src={del} />删除房源</view>
               </view>
             </view>
               )
@@ -72,4 +118,4 @@ export default (props) => {
     
       </view>
   )
-}
+})

src/hotel/components/HouseManage/houseManage.less

@@ -40,6 +40,8 @@
   }
   .operation{
     column-count: 3;
+    font-size: 28px;
+    color: #202020;
     image{
       width: 28px;
       height: 28px;
@@ -47,10 +49,6 @@
       position: relative;
       top: 5px;
     }
-    text{      
-      font-size: 28px;
-      color: #202020;
-    }
   }
 }
 .addHouse{

src/hotel/components/Income/income.jsx

@@ -6,6 +6,8 @@ import sImg from '@/assets/icons/landlord/我的收入2.png'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 import Picker from '@/components/Picker'
+import formatTime from "@/utils/formatTime";
+
 
 export default (props) => {
   const { hotelList, hotel, account, onHotelChange, accountlog } = props
@@ -57,17 +59,17 @@ export default (props) => {
                 </view></view>
             </view>
           </view>
-
-          <view className='title' >{accountlog.length != '' ? '推广收入记录' : '暂无推广收入'}</view>
-          {
-            accountlog?.map((item) =>
-              <view className='spreadCard'>
-                <view className='card'>
-                  <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{item.createDate}</text></view>
-                  <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
-                  <image className='spreadImg' src={sImg} />
+          
+          <view className='title' >{accountlog.length!=''?'推广收入记录':'暂无推广收入'}</view>
+            {
+              accountlog?.map((item) => 
+                <view className='spreadCard'>
+                  <view className='card'>
+                    <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate,'yyyy/MM/dd hh:mm:ss')}</text></view>
+                    <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount/100).toFixed(2))}</text>元</view>
+                    <image className='spreadImg' src={sImg} />
+                  </view>
                 </view>
-              </view>
             )
           }
           {accountlog.length != '' ? <view className='botton'>已经到底了~</view> : ''}

src/hotel/components/shareCard/shareCard.jsx

@@ -0,0 +1,21 @@
+import React from 'react'
+import Popup from '@/components/Popup'
+import Taro from '@tarojs/taro'
+import { Input, Button, View, Picker, Label } from '@tarojs/components'
+import {shareRoom} from '@/services/landlord'
+import { useState } from 'react'
+import './shareCard.less'
+
+
+export default (props) => {
+  const { showCutover, onClose} = props
+
+  return (
+    <Popup show={showCutover} onClose={onClose}>
+      <View className='card'>
+      <Label style={{color:'black',fontSize:'45rpx'}}>确认分享给游客</Label>      
+      <View><Button  className='cancel' onClick={onClose}>取消</Button><Button openType='share' className='btn'>确认</Button></View>
+    </View>
+    </Popup>
+  )
+}

src/hotel/components/shareCard/shareCard.less

@@ -0,0 +1,24 @@
+.card{
+  font-size: 34px;
+  padding-top: 40px;
+}
+.cancel{
+  width: 150px;
+  height: 70px;
+  display: inline-block;
+  line-height: 70px;
+  border-radius: 12px;
+  font-size: 36px;
+  margin-top: 15px;
+  margin-right: 20px;
+}
+.btn {
+  width: 150px;
+  height: 70px;
+  background: #1A3B83;
+  display: inline-block;
+  line-height: 70px;
+  border-radius: 12px;
+  font-size: 36px;
+  color: #fff;
+}

src/hotel/components/shareRoom/ShareRoom.jsx

@@ -0,0 +1,53 @@
+import React from 'react'
+import Popup from '@/components/Popup'
+import Taro from '@tarojs/taro'
+import { Input, Button, View, Picker, Label } from '@tarojs/components'
+import { shareRoom } from '@/services/landlord'
+import './ShareRoom.less'
+import { useState } from 'react'
+
+
+export default (props) => {
+  const { showCutover, onClose, room, onFinish } = props
+  const [startDate, setStartDate] = useState('')
+  const [endDate, setEndDate] = useState('')
+  const [roomNum, setRoomNum] = useState('')
+  const handelStartDate = (e) => {
+    setStartDate(e.detail.value)
+  }
+  const handelEndDate = (e) => {
+    setEndDate(e.detail.value)
+  }
+  const handelShare = () => {
+    if (roomNum != '' && startDate != '' && endDate != '') {
+      shareRoom({ hotelId: room.hotelId, personNum: roomNum, roomId: room.roomId, startDate: startDate, endDate: endDate }).then((res) => {
+        onFinish(res)
+        setStartDate('')
+        setEndDate('')
+        setRoomNum()
+      })
+    }
+  }
+  return (
+    <Popup show={showCutover} onClose={onClose}>
+      <View className='from-room'>
+        <Label style={{ color: 'black' }}>请输入入住人信息</Label>
+        <View className='flex'>
+          <Label>入住人数：</Label><Input focus dataField='nm' onInput={(e) => setRoomNum(e.detail.value)} value={roomNum} type='number' placeholder='请输入入住人数' /></View>
+        <View className='flex'>
+          <Label>入住开始时间：</Label>
+          <Picker mode='date' className='picker' onChange={handelStartDate}>
+            {startDate == '' ? '请选择入住开始时间' : startDate}
+          </Picker>
+        </View>
+        <View className='flex'>
+          <Label>入住结束时间：</Label>
+          <Picker className='picker' mode='date' onChange={handelEndDate}>
+            {endDate == '' ? '请选择入住结束时间' : endDate}
+          </Picker>
+        </View>
+        <View><Button className='cancel' onClick={onClose}>取消</Button><Button className='btn' onClick={handelShare}>分享</Button></View>
+      </View>
+    </Popup>
+  )
+}

src/hotel/components/shareRoom/ShareRoom.less

@@ -0,0 +1,38 @@
+  .from-room{
+    font-size: 34px;
+    padding-top: 30px;
+    .flex{
+      display: flex;
+      margin: 10px 0;
+      Input{
+        width: 345px;
+        border-radius: 15px;
+        border: solid 1px rgb(121, 116, 116);
+        margin-left: 70px;
+      }
+      .picker{
+        width: 345px;
+        border-radius: 15px;
+        border: solid 1px rgb(121, 116, 116);
+      }
+    }
+  }
+  .cancel{
+      width: 150px;
+      height: 70px;
+      display: inline-block;
+      line-height: 70px;
+      border-radius: 12px;
+      font-size: 36px;
+      margin-right: 20px;
+  }
+  .btn {
+      width: 150px;
+      height: 70px;
+      background: #1A3B83;
+      display: inline-block;
+      line-height: 70px;
+      border-radius: 12px;
+      font-size: 36px;
+      color: #fff;
+  }

src/hotel/pages/landlord/addRoom/addRoom.jsx

@@ -32,21 +32,28 @@ export default withLayout((props) => {
     })
   }
   const sumbit = () => {
-    //判断每一项是否为空Object.values(roomModel).filter返回一个数组如果有空属性就是数组长度就不为0
-    Object.values(roomModel).filter(item => item == '').length != 0 ?
-      Taro.showToast({
-        title: '每一项都是必填项哦',
-        icon: 'none',
-      }) :
-      saveRoom(roomModel).then(() => {
-       
-          Taro.showToast({
+    if(
+    roomModel.roomName!=''&&
+    roomModel.address!=''&&
+    roomModel.location!=''&&
+    roomModel.weight!=''
+    )
+     { 
+      saveRoom(roomModel).then(() => {       
+          Taro.showModal({
             title: '保存成功',
-            icon: 'success',
+            showCancel:false
           }).then(() => {
             Taro.navigateBack()
           })
+      })       
+     } else{
+       Taro.showToast({
+        title: '有必填项未填哦',
+        icon: 'none',
       })
+     }
+      
   }
   return (
     <view className='page-index'>
@@ -55,13 +62,13 @@ export default withLayout((props) => {
         <mp-form models={roomModel} >
           <mp-cells title='请填写新增的房源信息' footer='  ' >
             <mp-cell prop='roomName' title='房屋名称：' extClass='font'>
-              <input focus dataField='roomName' onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName}  placeholder='请输入房屋名称' />
+              <input focus dataField='roomName' onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName}  placeholder='请输入房屋名称（必填）' />
             </mp-cell>
             <mp-cell prop='address' title='位置信息：' extClass='font'>
-              <input dataField='address' onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address}  placeholder='请输入房屋位置' />
+              <input dataField='address' onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address}  placeholder='请输入房屋位置（必填）' />
             </mp-cell>
             <mp-cell prop='location' title='定位经纬度：' extClass='font'>
-              <label onClick={onRoomMap}>{roomModel.location == '' ? '房间定位' : roomModel.location}</label>
+              <label onClick={onRoomMap}>{roomModel.location == '' ? '房间定位（必填）' : roomModel.location}</label>
             </mp-cell>
             <mp-cell prop='parkingAddress' title='停车场位置：' extClass='font'>
               <input dataField='parkingAddress' onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress}  placeholder='请输入停车场位置' />
@@ -76,7 +83,7 @@ export default withLayout((props) => {
               <input dataField='wifiPassword' onInput={(e) => setRoomModel({ ...roomModel, wifiPassword: e.detail.value })} value={roomModel.wifiPassword}  placeholder='请输入wifi密码' />
             </mp-cell>
             <mp-cell prop='weight' title='权重：' extClass='font'>
-              <input type='number' dataField='weight'  onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重' />
+              <input type='number' dataField='weight'  onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重（必填）' />
             </mp-cell>
             <mp-cell>
               <button className='button-OK' onClick={sumbit}>确定</button>

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

@@ -5,5 +5,6 @@ export default {
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
     "mp-dialog": "weui-miniprogram/dialog/dialog"
-  }
+  },
+  enableShareAppMessage: true
 }

src/hotel/pages/landlord/landlord.jsx

@@ -1,5 +1,5 @@
-import React, { useState, useEffect } from 'react'
-import { useRouter } from '@tarojs/taro'
+import React, { useState, useEffect, useRef } from 'react'
+import Taro,{ useRouter,useShareAppMessage } from '@tarojs/taro'
 import HouseManage from '../../components/HouseManage/houseManage'
 import Income from '../../components/Income/income'
 import TabBar from '@/components/CustTabBar'
@@ -23,6 +23,8 @@ export default withLayout((props) => {
   const [account, setAccount] = useState()
   const [accountlog, setAccountLog] = useState([])
 
+  const houseRef = useRef()
+
   useEffect(() => {
     getHotelManage().then((res) => {
       const { hotelList: list, account: acc, hotel: current } = res
@@ -59,12 +61,21 @@ export default withLayout((props) => {
     }
   }, [tab])
 
+  useShareAppMessage(() => {
+    return houseRef.current.getShareMessage()
+  })
+
+  useEffect(() => {
+    // 禁止右上角分享
+    Taro.hideShareMenu()
+  }, [])
+
   return (
     <view className='page-index'>
       <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
       <view className='index-container'>
         {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel} account={account} onHotelChange={handleHotelChange} accountlog={accountlog} />}
-        {currentTab === 1 && <HouseManage hotel={hotel} />}
+        {currentTab === 1 && <HouseManage hotel={hotel} ref={houseRef} />}
       </view>
       <view className='index-tabbar'>
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>

src/layouts/index.jsx

@@ -2,14 +2,26 @@
 import { useMemo } from 'react'
 import Taro from '@tarojs/taro'
 import { useModel } from '@/store'
+import { getQueryString } from '@/utils'
 import useRouter from '@/utils/hooks/useRouter'
+import useTrackPage from '@/utils/hooks/useTrackPage'
 import Loading from './Loading'
 import { getPageBy, getIndexPageOf } from '../routes'
 
 export default (Child) => (props) => {
+  const location = Taro.getStorageSync('location')
+
   const { person } = useModel('person')
   const router = useRouter()
 
+  // 埋点页面访问
+  const trackPageData = {
+    page: router.path,
+    params: getQueryString(router.params),
+    location,
+  }
+  useTrackPage(trackPageData)
+
   // 确保人员信息到位
   const loading = !person?.personRole;
 
@@ -48,5 +60,5 @@ export default (Child) => (props) => {
     })
   }
 
-  return loading ? <Loading /> : <Child {...props} person={person} router={router} />
+  return loading ? <Loading /> : <Child {...props} person={person} router={router} location={location} />
 }

src/pages/details/components/Extend/extend.jsx

@@ -1,18 +1,21 @@
 import { Video } from '@tarojs/components';
+import './extend.less'
 
 export default (props) => {
   const { item } = props
   return (
-    <>{
+    <>
+    {
       item.contentType == 'image' ?
-        <image src={item.content} mode='widthFix' style={{ width: '100%' }} /> :
+        <image src={item.content} mode='widthFix' style={{ width: '100%'}} /> :
         item.contentType == 'text' ?
           <view className='storezn'>{item.content}</view> :
           <Video
             controls
             autoplay={false}
             loop={false}
-            muted={false} style={{ width: "100%", height: '200px' }} src={item.content}></Video>
+            muted={false} style={{ width: "100%", height: '200px' }} src={item.content}>              
+          </Video>
     }
     </>
   )

src/pages/details/components/Extend/extend.less

@@ -0,0 +1,6 @@
+.storezn{
+  font-size: 28px;    
+  color: #202020;
+  line-height: 54px;
+  margin-bottom: 40px;
+}

src/pages/details/foodDetails/foodDetails.jsx

@@ -2,7 +2,10 @@ import CustomNav from '@/components/CustomNav'
 import withLayout from '@/layouts'
 import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
 import { useState, useEffect, useRef } from 'react'
+
 import { Swiper, SwiperItem } from '@tarojs/components';
+import BossCard from '@/components/BossCard'
+
 import Star from '@/components/Star/Star.jsx'
 import Cards from '@/components/foodCards/foodCards.jsx'
 import ax from '@/assets/icons/housemantj/onlove.png'

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -1,4 +1,6 @@
 import CustomNav from '@/components/CustomNav'
+import BossCard from '@/components/BossCard'
+
 import ax from '../../../assets/icons/housemantj/onlove.png'
 import hongxin from '../../../assets/icons/housemantj/已收藏.png'
 import baixin from '../../../assets/icons/housemantj/收藏.png'
@@ -9,6 +11,7 @@ import showMore from '../../../assets/icons/housemantj/查看更多.png'
 import share from '../../../assets/icons/housemantj/景点分享.png'
 import good from '../../../assets/icons/housemantj/景点爆赞.png'
 import collection from '../../../assets/icons/housemantj/景点收藏.png'
+
 import withLayout from '@/layouts'
 import { useState, useEffect, useRef } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'

src/pages/details/mjDetails/sceneryDetails.less

@@ -110,6 +110,23 @@
     margin-right: 10px;
   }
 }
+.showMore{
+  width: 100%;
+  background: linear-gradient(0deg, rgba(248, 248, 248, 0.58) 42%, rgba(248, 248, 248, 0) 100%);
+  font-size: 28px;
+  font-weight: bold;
+  color: #202020;
+  text-align: center;
+  position: absolute;
+  bottom: -40px;
+  padding-top: 77px;
+  padding-bottom: 20px;
+  .moreTip{
+    width: 38px;
+    height: 19px;
+    margin-top: 14px;
+  }
+}
 .foodCard{
   background: #FFF;
   box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
@@ -245,33 +262,7 @@
     bottom:15%;
   }
 }
-.showMore{
-  width: 100%;
-  background: linear-gradient(0deg, rgba(248, 248, 248, 0.58) 42%, rgba(248, 248, 248, 0) 100%);
-  font-size: 28px;
-  font-weight: bold;
-  color: #202020;
-  text-align: center;
-  position: absolute;
-  bottom: -40px;
-  padding-top: 77px;
-  padding-bottom: 20px;
-  .moreTip{
-    width: 38px;
-    height: 19px;
-    margin-top: 14px;
-  }
-}
-.storezn{
-  font-size: 28px;
-    
-    color: #202020;
-  line-height: 54px;
-  margin-bottom: 40px;
-}
-.storezn+image{
-  width: 100%;
-}  
+
 .bottom{
   font-size: 28px;    
   color: #C0C8D3;

src/pages/index/index.config.js

@@ -4,6 +4,7 @@ export default {
   styleIsolation: 'shared',
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
+    "mp-tabs": "../../../components/tabs/index",
     "mp-checkbox-group": "weui-miniprogram/checkbox-group/checkbox-group",
     "mp-checkbox": "weui-miniprogram/checkbox/checkbox",
     "mp-cells": "weui-miniprogram/cells/cells",

src/pages/index/index.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } 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'
@@ -8,6 +8,10 @@ import Guide from './tabs/Guide'
 import Mine from './tabs/Mine'
 import Recommend from './tabs/Recommend'
 import './index.less'
+import { getLocation } from '@/utils/location'
+import { getIndexType,  getResourceList } from '@/services/home'
+
+
 
 export default withLayout((props) => {
   const { router, person } = props
@@ -16,12 +20,27 @@ export default withLayout((props) => {
 
   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)
@@ -33,7 +52,7 @@ export default withLayout((props) => {
         <CustomNav logo={logo} title='十公里' />
       </view>
       <view className='index-container'>
-        {currentTab === 0 && <Recommend />}
+        {currentTab === 0 && <Recommend loc={locRef} qp={queryParams}/>}
         {currentTab === 1 && <Guide person={person} router={router} />}
         {/* {currentTab === 2 && <Strategy />} */}
         {currentTab === 2 && <Mine person={person} />}

src/pages/index/tabs/Guide.jsx

@@ -1,21 +1,13 @@
 import { useState, useEffect, useRef } from "react";
 import Taro from '@tarojs/taro'
 import MoreGuide from "@/components/MoreGuide";
-import Cards from '@/components/foodCards/foodCards.jsx'
 import BossCard from '@/components/BossCard'
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 import Taxi from '@/assets/icons/GuideCheck/taxi.png'
 import WiFi from '@/assets/icons/GuideCheck/WiFi.png'
 import GoHere from '@/assets/icons/GuideCheck/GoHere.png'
-import position from '@/assets/icons/GuideCheck/position_logo.png'
 import Cup from '@/assets/icons/GuideCheck/Cup.png'
 import BlackSpot from '@/assets/icons/GuideCheck/BlackSpot.png'
-import starOn from '@/assets/icons/GuideCheck/starOn.png'
-import starOff from '@/assets/icons/GuideCheck/starOff.png'
-import { getRecommendList, getExtendContent, getShopPackage } from '@/services/home'
+import { getRecommendList, getExtendContent } from '@/services/home'
 import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
 import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
 import showMore from '../../../assets/icons/housemantj/查看更多.png'
@@ -23,8 +15,6 @@ import showMore from '../../../assets/icons/housemantj/查看更多.png'
 import './GuideCss/style.less'
 
 
-const scoreList = new Array(5).fill(0)
-const score = '3.9'
 
 
 
@@ -243,7 +233,6 @@ export default (props) => {
           </view>
         </view>
         {spackage?.map((item, index) => <BossCard key={(index)} item={item} />)}
-
         {/* 卡片------------- */}
         {/* <view className='Guide-Content-box-two'>
           <view className='title-image-two'>

src/pages/index/tabs/Recommend.jsx

@@ -11,15 +11,20 @@ import './less/Recommend.less'
 
 
 export default (props) => {
-  const { router, person } = props
+  const { router, person, loc,qp } = props
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
   const { tabJump } = params || {}
   const [typeList, setTypeList] = useState([])
   
-  const locRef = useRef()
-
-  const [queryParams, setQueryParams] = useState({ location: '', pageNum: 1, pageSize: 10, typeId: '' })
+  const locRef = useRef(loc)
+  // if(locRef.current==null){
+  //     Taro.showLoading()
+  //   }
+  //   if (locRef.current!=null) {
+  //     Taro.hideLoading()
+  //   }
+  const [queryParams, setQueryParams] = useState(qp)
 
   // 获取资源表信息
   const [alllist, setAllList] = useState([])
@@ -40,14 +45,7 @@ export default (props) => {
   }
 
   useEffect(() => {
-    getLocation().then((res) => {
-      locRef.current = `${res.longitude},${res.latitude}`
-      setQueryParams({
-        ...queryParams,
-        location: locRef.current
-      })
-    })
-
+    
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
@@ -78,9 +76,6 @@ export default (props) => {
   }
 
 
-  const RefreshCard=()=>{
-    console.log(1111)
-  }
 
   
   return (

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

@@ -141,7 +141,7 @@
     }
   }
   .tabs-Unselected {
-    width: 20vw;      
+    width: 25vw;      
     font-weight: bold;
     color: #C0C8D3; 
     text-align: center;
@@ -154,7 +154,7 @@
   .tabs-Selected {
     font-size: 32px;
     color: #4C4C4C;
-    width: 20vw;      
+    width: 25vw;      
     font-weight: bold;
     text-align: center;
     border-bottom: 6px solid #4C4C4C;

src/services/landlord.js

@@ -53,9 +53,8 @@ import request from '@/utils/request'
 
 
 /**
- * 房源详情
- * @param {*} id 
+ * 分享房源
+ * @param {*} data 
  * @returns 
  */
-export const getRoomDetail = (id) => request(`/taRoom/${id}`)
-
+ export const shareRoom = (data) => request('/roomOrder', { method: 'post', data })

src/services/shopBoss.js

@@ -0,0 +1,27 @@
+
+import request from '@/utils/request'
+
+
+/**
+ * 商铺老板详情
+ * @param {*} 
+ * @returns 
+ */
+export const getShopList = (params) => request(`/shop/manage/index`, { params })
+
+
+/**
+ * 商铺账户全年订单收入/推广
+ * @param {*} 
+ * @returns 
+ */
+export const getShopMoney = (id, amountType) => request(`/shop/${id}/account?amountType=${amountType}`, { id })
+
+
+/**
+ * 商铺推广收入
+ * @param {*} 
+ * @returns 
+ */
+export const getAccount = (id,) => request(`/shop/account/${id}/log`, { id })
+

src/services/track.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+
+/**
+ * 埋点页面访问
+ * @param {*} data 
+ * @returns 
+ */
+export const trackPage = (data) => request('/track/page', { data, method: 'post', skipError: true })
+
+/**
+ * 更新埋点访问
+ * @param {*} id 
+ * @returns 
+ */
+export const updateTrackPage = (id) => request(`/track/page/${id}`, { method: 'put', skipError: true })

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -1,7 +1,10 @@
 import { React, useState, useEffect, } from 'react'
 import Taro, { useRouter } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
+import Picker from '@/components/Picker'
 import Popup from '@/components/Popup'
+import ShopUsed from '@/components/ShopUsed' //已核销
+import ShopUnused from '@/components/ShopUnused' //未核销
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
 import iconsearch from '@/assets/icons/housemantj/search.png'
@@ -18,10 +21,26 @@ import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 
 export default (props) => {
-
+  const { shopList, shop, account, onHotelChange, accountlog, shopMoney } = props
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
   const { tabJump } = params || {}
+
+  const [isyear, setYear] = useState(false)
+  const [isMomth, setMonth] = useState(false)
+  //小眼睛开关
+  const handleYear = () => {
+    isyear ? setYear(false) : setYear(true)
+  }
+  const handleMonth = () => {
+    isMomth ? setMonth(false) : setMonth(true)
+  }
+
+
+  const handleHotelChange = (shopId, current) => {
+    onHotelChange(current)
+  }
+
   useEffect(() => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
@@ -41,6 +60,7 @@ export default (props) => {
     },
   ]
 
+
   const [showCutover, setShowCutover] = useState(false)
   const ShowMoldeOn = () => {
     setShowCutover(true)
@@ -51,14 +71,12 @@ export default (props) => {
   return (
     <view>
       <view>
-        <CustomNav title='十公里' />
       </view>
       <ToggleRole showCutover={showCutover} onClose={onClose} role='shop' />
-
       <view style={{ padding: '30rpx', height: '100%' }}>
-        <scroll-view scroll-y="true" 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'>店名：<text>Yun咖 云里 咖啡店</text></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>
@@ -66,17 +84,18 @@ export default (props) => {
             <view className='money'>
               <view className='sleft'>
                 <view className='lword'>全年订单收入（税前）</view>
+
                 <view className='yearMoney'>
-                  <text>2800000</text>元
-                  <image className='micon' src={eyes}></image>
+                  <text>{isyear ? shopMoney?.totalCharges : '******'}</text>元
+                  <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
                 </view>
               </view>
               <view className='line' />
               <view className='sright'>
                 <view className='rword'>当月订单收入（税前）</view>
                 <view className='monthMoney'>
-                  <text>******</text>元
-                  <image className='micon2' src={ceyes}></image>
+                  <text>{isMomth ? shopMoney?.currentCharges : '******'}</text>元
+                  <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
                 </view></view>
             </view>
           </view>
@@ -99,64 +118,14 @@ export default (props) => {
           </view>
 
           <view>
+            {/* 未核销 */}
             {activeTab === 0 &&
-              <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>
-                <view className='order'>
-                  <image className='orderImg' src={ms} 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>
-                  <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>
-              </view>
+              <ShopUnused />
             }
+            {/* 已核销 */}
             {activeTab === 1 &&
               <>
-                <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>
-                  <view className='order'>
-                    <image className='orderImg' src={ms} 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>
-                    <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>
-                </view>
-                <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>
-                  <view className='order'>
-                    <image className='orderImg' src={ms} 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>
-                    <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>
-                </view>
+                <ShopUsed />
               </>
             }
           </view>

src/shop/components/ShopKeeper/shopKeeper.less

@@ -136,10 +136,10 @@
         color: #FF3434;
       }
       .micon2{
-        width: 34px;
-        height: 16px;
+        width: 38px;
+        height: 22px;
         margin-left: 23px;
-        margin-bottom: 7px;
+        margin-bottom: -2px;
       }
     }
   }
@@ -265,6 +265,19 @@
       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;

src/shop/components/Sparead/spreadMoney.jsx

@@ -1,19 +1,54 @@
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import Popup from '@/components/Popup'
+import Picker from '@/components/Picker'
+import ShopCommission from '@/components/ShopCommission'
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 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 './spreadMoney.less'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 export default (props) => {
-
+  const { shopList, shop, account, onHotelChange, accountlog, shopMoney } = 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
+
+
+
+  useEffect(() => {
+    getAccount(accountId).then((e) => {
+      const accContent = e.records
+      setShopAccount(accContent)
+
+    })
+  }, [accountId])
+
+  //小眼睛开关
+  const handleYear = () => {
+    isyear ? setYear(false) : setYear(true)
+  }
+  const handleMonth = () => {
+    isMomth ? setMonth(false) : setMonth(true)
+  }
+
+  //商铺更改
+  const handleHotelChange = (shopId, current) => {
+    onHotelChange(current)
+  }
+
+
+
   const ShowMoldeOn = () => {
     setShowCutover(true)
   }
@@ -24,13 +59,12 @@ export default (props) => {
   return (
     <view>
       <view>
-        <CustomNav title='十公里' />
       </view>
       <ToggleRole showCutover={showCutover} onClose={onClose} role='shop' />
       <view style={{ padding: '30rpx', height: '100%' }}>
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
-            <view className='storeName'>店名：<text>Yun咖 云里 咖啡店</text></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>
@@ -39,36 +73,28 @@ export default (props) => {
               <view className='sleft'>
                 <view className='lword'>全年推广收入（税前）</view>
                 <view className='yearMoney'>
-                  <text>2800000</text>元
-                  <image className='micon' src={eyes}></image>
+                  <text>{isyear ? shopMoney?.totalCharges : '******'}</text>元
+                  <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
                 </view>
               </view>
               <view className='line' />
               <view className='sright'>
                 <view className='rword'>当月推广收入（税前）</view>
                 <view className='monthMoney'>
-                  <text>******</text>元
-                  <image className='micon2' src={ceyes}></image>
+                  <text>{isMomth ? shopMoney?.currentCharges : '******'}</text>元
+                  <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
                 </view></view>
             </view>
           </view>
           <view className='title'>推广收入记录</view>
-          <view>
-            <view className='spreadCard'>
-              <view className='spreadDate'>日期：<text>2021-06-24</text></view>
-              <view className='card'>
-                <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>2021-06-24  20:45</text></view>
-                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view>
-              </view>
-            </view>
-            <view className='spreadCard'>
-              <view className='spreadDate'>日期：<text>2021-06-24</text></view>
-              <view className='card'>
-                <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>2021-06-24  20:45</text></view>
-                <view className='spreadMoney'>收入金额：<text>5.00</text>元</view>
-              </view>
-            </view>
-          </view>
+          {
+            shopAccount.map((item, index) => {
+              return (
+                <ShopCommission item={item} />
+
+              )
+            })
+          }
           <view className='botton'>已经到底了~</view>
         </scroll-view>
       </view>

src/shop/components/Sparead/spreadMoney.less

@@ -138,10 +138,10 @@
         color: #FF3434;
       }
       .micon2{
-        width: 34px;
-        height: 16px;
+        width: 38px;
+        height: 22px;
         margin-left: 23px;
-        margin-bottom: 7px;
+        margin-bottom: -2px;
       }
     }
   }
@@ -152,27 +152,7 @@
   line-height: 60px;
   margin: 62px 0 10px 1px;
 }
-.spreadCard{
-  margin-bottom: 1px;
-  .spreadDate{
-    font-size: 20px;
-    color: #202020;
-    line-height: 60px;
-  }
-  .card{
-    height: 166px;
-    background: #FFF;
-    box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
-    border-radius: 12px;
-    padding: 40px 0 43px 22px;
-    font-size: 24px;
-    color: #202020;
-    box-sizing: border-box;
-    .spreadMoney{
-      line-height: 60px;
-    }
-  }
-}
+
 .botton{
   font-size: 28px;   
   color: #C0C8D3;

src/shop/pages/spread/spreadIndex.jsx

@@ -1,5 +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 ShopKeeper from '../../components/ShopKeeper/shopKeeper'
 import Sparead from '../../components/Sparead/spreadMoney'
 import TabBar from '@/components/CustTabBar'
@@ -7,22 +9,72 @@ 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 './spreadIndex.less'
 import withLayout from '@/layouts'
 
+import './spreadIndex.less'
+
+
 export default withLayout((props) => {
   const { router, person } = props
 
   const { params } = useRouter()
   const { tab } = params || {}
-
   const [currentTab, setCurrentTab] = useState(0)
+  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 [shopMoney, setShopMoney] = useState([])
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
   }
 
+  const handelType = () => {
+    setAmountType('commission')
+  }
+
+  useEffect(() => {
+    getShopList().then((res) => {
+      const { shopList: list, account: acc, shop: current } = res
+      setShopList(list)
+      setShop(current)
+      setAccount(acc)
+      console.log("🚀 ~ file: shopKeeper.jsx ~ line 48 ~ getShopList ~ res", res)
+
+
+
+    })
+
+  }, [])
+
+  useEffect(() => {
+    if (shopId) {
+      getShopMoney(shopId, amountType).then((e) => {
+        setShopMoney(e)
+
+      })
+    }
+
+  }, [amountType, shopId])
+
+
+  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 || [])
+    //   })
+    // })
+  }
+
   useEffect(() => {
     if (tab) {
       setCurrentTab(tab - 0)
@@ -31,16 +83,18 @@ export default withLayout((props) => {
 
   return (
     <view className='page-index'>
+      <CustomNav title={shop?.shopName} />
+
       <view className='index-container'>
-        {currentTab === 0 && <ShopKeeper />}
-        {currentTab === 1 && <Sparead />}
+        {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} />}
       </view>
       <view className='index-tabbar'>
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>
           <view className={`${currentTab === 0 ? 'orderstab' : ''}`}>
             <image className='incomes' src={currentTab === 0 ? onShopImg : shopImg} /><text>订单收入</text>
           </view>
-          <view className={`${currentTab === 1 ? 'spreadtab' : ''}`}>
+          <view className={`${currentTab === 1 ? 'spreadtab' : ''}`} onClick={() => { handelType() }} >
             <image className='house' src={currentTab === 1 ? onSpareadImg : spareadImg} /><text>推广收入</text>
           </view>
         </TabBar>

src/utils/hooks/useTrackPage.js

@@ -0,0 +1,25 @@
+
+import { useRef } from 'react'
+import { useDidShow, useDidHide, nextTick } from '@tarojs/taro'
+import { trackPage, updateTrackPage } from '@/services/track'
+
+export default (payload) => {
+  const payloadRef = useRef()
+  const resRef = useRef()
+  payloadRef.current = payload
+
+  useDidShow(() => {
+    trackPage(payloadRef.current).then((res) => {
+      resRef.current = res;
+    }).catch((err) => {
+      console.error(err);
+    })
+  })
+
+  useDidHide(() => {
+    if (resRef.current) {
+      updateTrackPage(resRef.current.trackId)
+      resRef.current = undefined
+    }
+  })
+}

src/utils/index.js

@@ -1,4 +1,9 @@
 
+/**
+ * queryString 转 object
+ * @param {*} queryStr 
+ * @returns 
+ */
 export function parseQueryString(queryStr) {
   if (!queryStr) {
     return;
@@ -20,3 +25,20 @@ export function parseQueryString(queryStr) {
   }, {});
   return params;
 }
+
+/**
+ * object 转 queryStr
+ * @param {*} params 
+ * @returns 
+ */
+export function getQueryString(params) {
+  if (!params) return ;
+
+  const keys = Object.keys(params)
+  const arr = keys.map((key) => {
+    const val = params[key]
+    return `${key}=${encodeURIComponent(val)}`
+  })
+
+  return arr.join('&')
+}

src/utils/preFetchData.js

@@ -5,7 +5,23 @@ export default () => {
   const personId = Taro.getStorageSync('personId')
   const openid = Taro.getStorageSync('openid')
 
-  return Promise.resolve({ personId, openid })
+  return new Promise((resolve, reject) => {
+    Taro.getLocation({
+      success(res) {
+        const location = `${res.longitude},${res.latitude}`
+        Taro.setStorageSync('location', location)
+        resolve({
+          location,
+          personId,
+          openid
+        })
+      },
+      fail(err) {
+        console.error(err)
+        reject(err)
+      }
+    })
+  })
 
   // return new Promise((resolve, reject) => {
   //   Taro.getBackgroundFetchData({

src/utils/request.js

@@ -1,23 +1,12 @@
 
 import Taro from '@tarojs/taro'
+import { getQueryString } from '.'
 
 const logger = Taro.getRealtimeLogManager()
 
-const object2QueryString = (params) => {
-  if (!params) return ;
-
-  const keys = Object.keys(params)
-  const arr = keys.map((key) => {
-    const val = params[key]
-    return `${key}=${encodeURIComponent(val)}`
-  })
-
-  return arr.join('&')
-}
-
 export default (url, options) => {
   const { params, skipError, header, ...leftOptions } = options || {}
-  const queryStr = object2QueryString(params)
+  const queryStr = getQueryString(params)
 
   const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
   const nwUrl = `${HOST}/api/wx${urlWithParams}`