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

.vscode/launch.json

@@ -2,14 +2,17 @@
     // 使用 IntelliSense 了解相关属性。 
     // 悬停以查看现有属性的描述。
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "pwa-chrome",
+    
+        "version": "0.2.0",
+        "configurations": [
+          {
+            "type": "pwa-msedge",
             "request": "launch",
-            "name": "Launch Chrome against localhost",
+            "name": "Launch Microsoft Edge and open the Edge DevTools",
             "url": "http://localhost:8080",
             "webRoot": "${workspaceFolder}"
-        }
-    ]
+          }
+        ]
+      
+    
 }

package.json

@@ -41,6 +41,7 @@
     "@tarojs/runtime": "3.3.2",
     "@tarojs/taro": "3.3.2",
     "@zjxpcyc/react-tiny-store": "^1.0.0",
+    "moment": "^2.29.1",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"
   },

src/components/CompoentsOrder/AlreadyExpired/index.jsx

@@ -39,7 +39,7 @@ export default (props) => {
             <view className='card-box-star'>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + '0.1') < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} />
@@ -78,7 +78,7 @@ export default (props) => {
             <view className='card-box-star'>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + '0.1') < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} />

src/components/CompoentsOrder/AlreadyUsed/index.jsx

@@ -48,7 +48,7 @@ export default (props) => {
               <text className='card-box-star-text' onClick={Nuberr} >口味：</text>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + `${CollectNub}`) < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
@@ -60,7 +60,7 @@ export default (props) => {
               <text className='card-box-star-text' onClick={Nuberr} >环境：</text>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + `${CollectNub}`) < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
@@ -72,7 +72,7 @@ export default (props) => {
               <text className='card-box-star-text' onClick={Nuberr} >服务：</text>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + `${CollectNub}`) < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
@@ -100,7 +100,7 @@ export default (props) => {
             <view className='card-box-star'>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + '0.1') < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} />
@@ -141,7 +141,7 @@ export default (props) => {
             <view className='card-box-star'>
               {
                 scoreList.map((_, index) => {
-                  console.log(index)
+
                   const src = (index + '0.1') < score ? starOn : starOff
                   return (
                     <image className='card-star-image' key={index} src={src} />

src/components/Landlord/HouseManage/houseManage.jsx

@@ -1,40 +1,45 @@
 import Taro from '@tarojs/taro'
-import CustomNav from '@/components/CustomNav'
-import pImg from '../../../assets/icons/landlord/定位 位置.png'
-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 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 './houseManage.less'
+import { useState, useEffect,useRef } from 'react'
+import {getRoomList} from '@/services/landlord'
 
 
 export default (props) => {
+  const {hotel}=props
+  const [detail, setDetail] = useState([])
+  useEffect(()=>{
+    getRoomList({hotelId:hotel.hotelId}).then((res)=>{
+      setDetail(res.records||[])
+    })
+  },[hotel])
   return (
     <view>
-      <view>
-        <CustomNav logo={null} title='十公里周边指南' />
-      </view>
       <view style={{ padding: '0 30rpx', height: '100%' }}>
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 204px)' }}>
-          <view className='position'>
-            <image className='pImg' src={pImg} />
-            当前店铺：<text>南京紫荆国际公寓酒店</text>
-          </view>
           <view className='search'>
             <input className='searchInput' disabled />
             <image className='searchicon' src={iconsearch} />
             <view className="searchword">请输入关键字搜索</view>
           </view>
           <view>
-            <view className='houseCard'>
-              <view className='houseName'>南京紫荆国际公寓酒店</view>
+            {
+              detail?.map((item)=>
+              <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>
             </view>
+              )
+            }
+            
            
           </view>
         </scroll-view>        

src/components/Landlord/HouseManage/houseManage.less

@@ -1,16 +1,4 @@
-.position{
-  height: 27px;
-  font-size: 28px;
-  color: #202020;
-  padding-left: 25px;
-  .pImg{
-    width: 35px;
-    height: 42px;
-    position: relative;
-    top: 10px;
-    right: 21px;
-  }
-}
+
 .search{
   padding: 40px 0  30px 0;
   position: relative;

src/components/Landlord/Income/income.jsx

@@ -1,136 +1,77 @@
-import { useState} from 'react'
-import Taro from '@tarojs/taro'
-import Popup from '@/components/Popup'
-import CustomNav from '@/components/CustomNav'
+import { useState } from 'react'
 import './income.less'
 import eyes from '../../../assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '../../../assets/icons/shopKeeper/小眼睛-闭上.png'
 import sImg from '../../../assets/icons/landlord/我的收入2.png'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
-import touristON from '@/assets/icons/UserCenter/touristON.png'
-import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
-import hotelBossON from '@/assets/icons/UserCenter/hotelBossON.png'
-import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
-import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
-import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
-
+import ToggleRoul from '@/components/toggleRoul/ToggleRoul'
+import Picker from '@/components/Picker'
 
 export default (props) => {
+  const { hotelList, hotel, account, onHotelChange, accountlog } = props
+
+  const handleHotelChange = (hotelId, current) => {
+    onHotelChange(current)
+  }
+
+  const [isyear, setYear] = useState(true)
+  const [isMomth, setMonth] = useState(false)
+  const handleYear = () => {
+    isyear ? setYear(false) : setYear(true)
+  }
+  const handleMonth = () => {
+    isMomth ? setMonth(false) : setMonth(true)
+  }
   const [showCutover, setShowCutover] = useState(false)
   const ShowMoldeOn = () => {
     setShowCutover(true)
   }
-  const ok = () => {
+  const onClose = () => {
     setShowCutover(false)
   }
-  const gotoShop = () => {
-    Taro.redirectTo({ url: '/shop/pages/spread/spreadIndex' })
-  }
-  const gotoPerson = () => {
-    Taro.redirectTo({ url: '/pages/index/index' })
-  }
   return (
     <view>
-      <view>
-        <CustomNav title='十公里' />
-      </view>
-      <Popup show={showCutover} maskClosable={false}>
-          <view className='User-box-sths' >
-            <view className='User-box-selectUser'>请选择身份：</view>
-            <view className='User-box-tourist' onClick={gotoPerson}>
-              <image className='Ubs-tourist-image' src={touristOFF} />
-              <text className='Ubs-tourist-text'>游客</text>
-            </view>
-            <view className='User-box-hotelBoss' onClick={ok}>
-              <image className='Ubs-hotelBoss-image' src={hotelBossON} />
-              <text className='Ubs-hotelBoss-text'>民宿老板</text>
-
-            </view>
-            <view className='User-box-shopBoss' onClick={gotoShop}>
-              <image className='Ubs-shopBoss-image' src={shopBossOFF} />
-              <text className='Ubs-shopBoss-text'>店铺老板</text>
-            </view>
-          </view>
-        </Popup>     
+      <ToggleRoul showCutover={showCutover} onClose={onClose} />
       <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 onClick={ShowMoldeOn}  className='User-info-cutover'>
-                <image className='User-info-cutover-image' src={cutoverUser} />
-              </view>
-              <view className='money'>
-                <view className='sleft'>
-                  <view className='lword'>全年收入（税前）</view>
-                  <view className='yearMoney'>
-                    <text>2800000</text>元
-                    <image className='micon' src={eyes}></image>
-                  </view>
-                </view>
-                <view className='line' />
-                <view className='sright'>
-                  <view className='rword'>当月收入（税前）</view>
-                  <view className='monthMoney'>
-                    <text>******</text>元
-                    <image className='micon2' src={ceyes}></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> 
-                <image className='spreadImg' src={sImg} />
-              </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> 
-                <image className='spreadImg' src={sImg} />
-              </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> 
-                <image className='spreadImg' src={sImg} />
-              </view>
+            <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择民宿" value={hotel?.hotelId} kv={['hotelName', 'hotelId']} dicts={hotelList} onChange={handleHotelChange} /></view>
+            <view onClick={ShowMoldeOn} className='User-info-cutover'>
+              <image className='User-info-cutover-image' src={cutoverUser} />
             </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> 
-                <image className='spreadImg' src={sImg} />
-              </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> 
-                <image className='spreadImg' src={sImg} />
-              </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> 
-                <image className='spreadImg' src={sImg} />
+            <view className='money'>
+              <view className='sleft'>
+                <view className='lword'>全年收入（税前）</view>
+                <view className='yearMoney'>
+                  <text>{isyear ? account?.amounts : '******'}</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>{isMomth ? account?.currentCharges : '******'}</text>元
+                  <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
+                </view></view>
             </view>
           </view>
-          <view className='botton'>已经到底了~</view>
-        </scroll-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>
+                </view>
+              )
+            }
+            {accountlog.length!=''?<view className='botton'>已经到底了~</view>:''}          
+        </scroll-view>
       </view>
+    </view>
   )
 }

src/components/Landlord/Income/income.less

@@ -56,7 +56,7 @@
 }
 .storexx{
   text-align: center;
-  height: 302px;
+  display: flow-root;
   background: #FFFFFF;
   box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
   border-radius: 24px;
@@ -80,26 +80,26 @@
   }
   .sleft{
     float: left;
+    text-align: left;
     .lword{
-      height: 25px;
       font-size: 26px;
       color: #666666;
-      margin-bottom: 40px;      
-      margin-left: 1px;
+      margin-bottom: 40px;
     }
     .yearMoney{
-      height: 30px;
       font-size: 28px;
       font-weight: bold;
       color: #202020;
+      line-height: 0;
+      display: inline-block;
       text{
         font-size: 40px;
         color: #FF3434
       }
       .micon{
         width: 38px;
-        height: 22px;
-        margin-left: 19px;
+        height: 26px;
+        margin-left: 20px;
       }
     }
   }
@@ -114,28 +114,26 @@
   }
   .sright{
     float: right;
-    text-align: left;
+    text-align: right;
     .rword{
       font-size: 26px;
       color: #666666;
-      margin: 0 25px 47px 0;
-      text-align: center;
+      margin-bottom: 40px;
     }
     .monthMoney{
-      height: 24px;
       font-size: 28px;
       font-weight: bold;
       color: #202020;
-      line-height: 24px;
+      line-height: 0;
+      display: inline-block;
       text{
         font-size: 40px;
         color: #FF3434;
       }
       .micon2{
-        width: 34px;
-        height: 16px;
-        margin-left: 23px;
-        margin-bottom: 7px;
+        height: 26px;
+        width: 38px;
+        margin-left: 20px;
       }
     }
   }
@@ -147,12 +145,7 @@
   margin: 62px 0 10px 1px;
 }
 .spreadCard{
-  margin-bottom: 1px;
-  .spreadDate{
-    font-size: 20px;
-    color: #202020;
-    line-height: 60px;
-  }
+  margin-bottom: 60px;  
   .card{
     height: 166px;
     background: #FFF;

src/components/OrderMolded/index.jsx

@@ -1,32 +1,35 @@
 import { useState } from 'react'
 import image from '@/assets/icons/ProCard/8kb.jpg'
 import { Button, Radio } from '@tarojs/components'
-
+import PayOrderCard from '@/components/PayOrderCard'
+import moment from 'moment'
 import food from '@/assets/icons/ProCard/food.png'
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 import './style.less'
 
 export default (props) => {
+  const { item } = props
 
   return (
     <view class='wrapper-box'>
       <view class='left-complete-one'>
         <image className='left-image-1' src={ProCard_hot}></image>
         <view className='left-viewText'>
-          返现￥16.00
+          返现￥{item.cashback / 100}
         </view>
         <view className='title-image'>
-          <image className='image-1' mode='scaleToFill' src={image}></image>
+          <image className='image-1' mode='scaleToFill' src={item.poster}></image>
           <image className='image-2' src={food}></image>
         </view>
         <view className='title-content'>
           <view className='Pro-title'>
-            <view className='title-text'>【橘里橘气咖啡店】新鲜出炉啦!</view>
+            <view className='title-text'>{item.description}</view>
           </view>
-          <text className='title-money' >￥6990元</text>
-          <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
+          <text className='title-money' >￥{item.actualPrice / 100}元</text>
+          <view className='title-time' >有效期：<text>{moment(item.startTimeal).format('YYYY/MM/DD')}</text> - <text>{moment(item.endTime).format('YYYY/MM/DD')}</text></view>
         </view>
       </view>
     </view>
+    // </view >
   )
 }

src/components/PayOrderCard/index.jsx

@@ -0,0 +1,121 @@
+import withLayout from '@/layouts'
+import useSave from "@/utils/hooks/useSave"
+import image from '@/assets/icons/ProCard/8kb.jpg'
+import AuthPage from '@/components/AuthPage'
+import moment from 'moment'
+import { useState, useEffect } from 'react'
+import { Button, Radio, Input } from '@tarojs/components'
+import food from '@/assets/icons/ProCard/food.png'
+import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
+import OrderMolded from '@/components/OrderMolded'
+import Popup from '@/components/Popup'
+
+
+
+import './style.less'
+
+export default (props) => {
+  const { item, onShopContent, onShopNumber } = props
+  const [showDialog, setShowDialog] = useState(false)
+  const [BuyNumber, setBuyNumber] = useState(1)
+  const [DisabledBool, setDisabledBool] = useState(false)
+
+
+
+  const ShowMoldeOn = () => {
+    setShowDialog(true)
+  }
+  const ButtonCancel = () => {
+    setShowDialog(false)
+    setBuyNumber(1)
+  }
+  const ButtonOK = (e) => {
+    setShowDialog(false)
+    const itemList = [{ ...item }]
+    const itemListNumber = itemList.map(x => {
+      return { ...x, BuyNumber: BuyNumber }
+    })
+    const handeItemList = itemListNumber.map(shoPnumber => {
+      onShopContent(shoPnumber)
+    })
+    onShopNumber()
+    // console.log("🚀 ~ file: index.jsx ~ line 38 ~ ButtonOK ~ handeItemList", handeItemList)
+
+
+  }
+  const NumberAdd = () => {
+    setBuyNumber(BuyNumber + 1)
+
+  }
+
+  const NumberCut = () => {
+    setBuyNumber(BuyNumber - 1)
+
+  }
+
+  const onInput = (e) => {
+    let values = e.detail.value
+    setBuyNumber(values - 0)
+
+
+  }
+
+
+  useEffect(() => {
+    if (BuyNumber < 2) {
+      setDisabledBool(true)
+
+    } else {
+      setDisabledBool(false)
+
+    }
+
+  }, [BuyNumber])
+
+  return (
+
+    <view class='container'>
+      <Popup show={showDialog} maskClosable={false}>
+        <OrderMolded item={item} />
+        <view className='item-center-Number' >
+          <view className='buy-num-minus' disabled={DisabledBool} onClick={NumberCut} > - </view>
+          <Input className='buy-num-input' type='number' min={1} onInput={onInput} value={BuyNumber} />
+          <view className='buy-num-add' onClick={NumberAdd} >+</view>
+        </view>
+        <view className='buy-button-box' >
+          <button className='button-Cancel' onClick={ButtonCancel} >取消</button>
+          <button className='button-OK' onClick={ButtonOK} >确定</button>
+        </view>
+      </Popup>
+      <view class='coupon-list'>
+        <view class='wrapper'>
+          <view class='left-complete-one'>
+            <image className='left-image-1' src={ProCard_hot}></image>
+            <view className='left-viewText'>
+              返现￥{item.cashback / 100}
+            </view>
+            <view className='title-image'>
+              <image className='image-1' mode='scaleToFill' src={item.poster}></image>
+              <image className='image-2' src={food}></image>
+            </view>
+            <view className='title-content'>
+              <view className='Pro-title'>
+                <view className='title-text'>{item.description}</view>
+              </view>
+              <text className='title-money' >￥{item.actualPrice / 100}<text className='title-money-2'>{item.standardPrice / 100}</text></text>
+              <view className='title-time' >有效期：<text>{moment(item.startTimeal).format('YYYY/MM/DD')}</text> - <text>{moment(item.endTime).format('YYYY/MM/DD')}</text></view>
+            </view>
+          </view>
+          <view class='right-complete-two' onClick={ShowMoldeOn} >
+            <view className='right-content'>
+              <view className='right-number'>×{BuyNumber}</view>
+              <view className='right-title'>数量</view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+
+  )
+}

src/components/PayOrderCard/style.less

@@ -0,0 +1,299 @@
+@whiteColor: #fff;
+@Image-ProCard_hot: "../../assets/icons/ProCard/ProCard_hot.png";
+.container {
+  width: 100%;
+  .item-center-Number {
+    width: 100%;
+    margin-top: 30px;
+    .buy-num-minus {
+      display: inline-block;
+      width: 60px;
+      height: 60px;
+      background: #ffffff;
+      border: 1px solid #999999;
+      border-radius: 8px 0px 0px 8px;
+    }
+    .buy-num-input {
+      display: inline-block;
+      width: 90px;
+      height: 60px;
+      font-size: 28px;
+      font-weight: 400;
+      color: #202020;
+      background: #ffffff;
+      border: 1px solid #999999;
+      position: relative;
+      top: 26px;
+    }
+    .buy-num-add {
+      display: inline-block;
+
+      width: 60px;
+      height: 60px;
+      background: #ffffff;
+      border: 1px solid #999999;
+      border-radius: 0px 8px 8px 0px;
+    }
+  }
+  .buy-button-box {
+    width: 100%;
+    margin: 40px 0 0 0;
+
+    .button-Cancel {
+      display: inline-block;
+      width: 236px;
+      height: 78px;
+      border: 2px solid #274291;
+      font-size: 30px;
+      font-weight: bold;
+      color: #274291;
+      border-radius: 12px;
+      margin-right: 80px;
+    }
+    .button-OK {
+      display: inline-block;
+
+      width: 236px;
+      height: 78px;
+      background: #274291;
+      border-radius: 12px;
+      font-size: 30px;
+      font-weight: bold;
+      color: #ffffff;
+    }
+  }
+  .wrapper {
+    display: flex;
+    position: relative;
+    // margin-top: 600px;
+    margin: 30px auto;
+    width: 700px;
+
+    // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+    // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
+    filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
+
+    .left-complete-one {
+      padding-top: 87px;
+      padding-bottom: 43px;
+      position: relative;
+      display: flex;
+      background: @whiteColor;
+      background: radial-gradient(
+            circle at top right,
+            transparent 15px,
+            @whiteColor 0
+          )
+          top right,
+        radial-gradient(circle at bottom right, transparent 15px, @whiteColor 0)
+          bottom right;
+      background-size: 100% 60%;
+      background-repeat: no-repeat;
+
+      width: 573px;
+      border-radius: 15px 0px 0px 15px;
+      // border-radius: 12px;
+
+      align-items: center;
+      .left-image-1 {
+        width: 145px;
+        height: 44px;
+        position: absolute;
+        top: 22px;
+      }
+      .left-viewText {
+        // background-image: url(@Image-ProCard_hot);
+        // width: 287px;
+        width: auto;
+        height: 44.3px;
+        position: absolute;
+        left: 1px;
+        top: 28px;
+        font-size: 24px;
+        color: @whiteColor;
+        font-weight: 600;
+      }
+      //图片
+      .title-image {
+        width: 145px;
+        margin-left: 20px;
+        border-radius: 24px;
+        overflow: hidden;
+        position: relative;
+        .image-1 {
+          width: 100%;
+          height: 145px;
+        }
+        .image-2 {
+          width: 89px;
+          height: 34px;
+          position: absolute;
+          left: 0;
+          top: 0;
+        }
+      }
+      // 商品标题
+      .title-content {
+        // padding: 84px 0 56px 20px;
+        padding-left: 18px;
+
+        .Pro-title {
+          .title-text {
+            width: 375px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box; //必须要
+            -webkit-line-clamp: 1;
+            -webkit-box-orient: vertical;
+            word-break: break-all; /* 多出文本省略号代替 */
+            text-align: left;
+            font-size: 24px;
+            padding-bottom: 10px;
+          }
+        }
+        .title-money {
+          padding-top: 34px;
+          font-size: 24px;
+          // color: red;
+          font-weight: 800;
+        }
+        .title-money-2 {
+          font-size: 18px;
+          color: #666;
+          padding-left: 10px;
+          text-decoration: line-through;
+        }
+
+        .title-time {
+          font-size: 24px;
+          padding-top: 20px;
+          color: #c0c8d3;
+        }
+      }
+    }
+  }
+
+  .right-complete-two {
+    background: @whiteColor;
+    background: radial-gradient(
+          circle at top left,
+          transparent 15px,
+          @whiteColor 0
+        )
+        top left,
+      radial-gradient(circle at bottom left, transparent 15px, @whiteColor 0)
+        bottom left;
+    background-size: 100% 60%;
+    background-repeat: no-repeat;
+    width: 129px;
+    border-radius: 0 15px 15px 0;
+    position: relative;
+    //右面部分
+    .right-content {
+      // width: 100px;
+      // height: 80px;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      // border: 1px solid red;
+
+      .right-number {
+        width: 40px;
+        font-size: 20px;
+        border-radius: 4px;
+        border: 2px solid #999;
+        margin: auto;
+        text-align: center;
+      }
+
+      .right-title {
+        font-weight: 700;
+        font-size: 24px;
+        padding-top: 20px;
+        text-align: center;
+      }
+    }
+  }
+  //线条
+  .right-complete-two::after {
+    content: "";
+    position: absolute;
+    top: 15px;
+    margin: 26px auto;
+    height: 70%;
+    border-left: 1px dashed #595959;
+  }
+
+  .view-button {
+
+    position: fixed;
+    bottom: 0px;
+
+    .Card-number-box {
+      .Card-number {
+        width: 100%;
+        height: 96px;
+        background-color: @whiteColor;
+      }
+      .Card-user {
+        width: 100%;
+        height: 96px;
+        background-color: @whiteColor;
+      }
+    }
+    .button-box-button-box {
+      position: relative;
+      .button-text-image {
+        width: 144;
+        height: 45px;
+        position: absolute;
+        top: -35px;
+        left: 267px;
+        right: 305px;
+        z-index: 1;
+        .button-text-money-hot {
+          position: absolute;
+          width: 144px;
+          height: 43px;
+          line-height: 43px;
+          font-size: 24px;
+          font-weight: bold;
+          color: @whiteColor;
+        }
+        .button-image {
+          width: 143px;
+          height: 43px;
+        }
+        .button-text-money {
+          position: absolute;
+          margin-top: -8;
+          width: 157px;
+          font-size: 18px;
+          font-weight: 400;
+          text-decoration: line-through;
+          color: @whiteColor;
+        }
+      }
+      .button-box-one {
+        font-size: 30px;
+        line-height: 92px;
+        margin-top: 3em;
+        background-color: #274190;
+        border-radius: 12px;
+        width: 690px;
+        height: 92px;
+        color: @whiteColor;
+        // position: absolute;
+        bottom: 40px;
+        right: 0;
+        left: 0;
+        .button-text-one {
+          right: 133px;
+          font-size: 30px;
+          padding-left: 220px;
+        }
+      }
+    }
+  }
+}

src/components/Picker/index.jsx

@@ -0,0 +1,58 @@
+import { useEffect, useState } from 'react'
+import { Picker, View } from '@tarojs/components'
+import './style.less'
+
+export default (props) => {
+  const { kv, value, onChange, dicts, placeholder, mode, ...leftProps } = props
+  const [rangeKey, rangeVal] = kv || ['label', 'value']
+
+  const [inx, setInx] = useState()
+  const [text, setText] = useState()
+
+  const handleChange = (e) => {
+    if (mode && mode !== 'selector') {
+      onChange(e.detail.value)
+      return
+    }
+
+    const index = e.detail.value - 0
+    const item = dicts[index]
+    if (onChange) {
+      onChange(item[rangeVal], item)
+    }
+  }
+
+  useEffect(() => {
+    if (dicts && dicts.length > 0) {
+      if (value !== undefined && value !== null) {
+        for(let i = 0; i < dicts.length; i += 1) {
+          if (dicts[i][rangeVal] === value) {
+            setInx(i)
+            setText(dicts[i][rangeKey])
+            break;
+          }
+        }
+      }
+    }
+  }, [dicts, rangeKey, rangeVal, value])
+
+  useEffect(() => {
+    if (mode && mode !== 'selector') {
+      setText(value)
+    }
+  }, [mode, value])
+
+  return (
+    <Picker
+      className='g-picker'
+      rangeKey={rangeKey}
+      onChange={handleChange}
+      value={inx}
+      range={dicts}
+      mode={mode||'selector'}
+      {...leftProps}
+    >
+      <View>{text || placeholder || '请选择'}</View>
+    </Picker>
+  )
+}

src/components/Popup/index.jsx

@@ -2,10 +2,10 @@
 import './style.less'
 
 export default (props) => {
-  const { show, mask = true, maskClosable, onClose } = props
+  const { show, mask = true,  onClose } = props
 
   return (
-    <mp-dialog extClass='x-popup' buttons={[]} show={show} mask={mask} maskClosable={maskClosable} onClose={onClose}>
+    <mp-dialog extClass='x-popup'  buttons={[]} show={show} mask={mask} maskClosable={true} onClose={onClose}>
       {props.children}
     </mp-dialog>
   )

src/components/spreads/ShopKeeper/shopKeeper.jsx

@@ -14,6 +14,7 @@ import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
 import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
 import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
 import './shopKeeper.less'
+import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
 
 
 export default (props) => {
@@ -44,41 +45,16 @@ export default (props) => {
   const ShowMoldeOn = () => {
     setShowCutover(true)
   }
-  const ok = () => {
+  const onClose = () => {
     setShowCutover(false)
   }
-  const goToHotel = () => {
-    Taro.redirectTo({ url: '/hotel/pages/landlord/landlord' })
-  }
-  const gotoPerson = () => {
-    Taro.redirectTo({ url: '/pages/index/index' })
-  }
   return (
     <view>
       <view>
         <CustomNav title='十公里' />
       </view>
-      <Popup show={showCutover} maskClosable={false}>
-          <view className='User-box-sths' >
-            <view className='User-box-selectUser'>请选择身份：</view>
-            <view className='User-box-tourist' onClick={gotoPerson}>
-              <image className='Ubs-tourist-image' src={touristOFF} />
-              <text className='Ubs-tourist-text'>游客</text>
-            </view>
-            <view className='User-box-hotelBoss' onClick={goToHotel}>
-              <image className='Ubs-hotelBoss-image' src={hotelBossOFF} />
-              <text className='Ubs-hotelBoss-text'>民宿老板</text>
-
-            </view>
-            <view className='User-box-shopBoss' onClick={ok}>
-              <image className='Ubs-shopBoss-image' src={shopBossON} />
-              <text className='Ubs-shopBoss-text'>店铺老板</text>
-
-            </view>
-          </view>
-
-        </Popup>
-        
+      <ToggleRoul showCutover={showCutover} onClose={onClose} />
+  
       <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'>

src/components/spreads/Sparead/spreadMoney.jsx

@@ -1,4 +1,4 @@
-import { useState} from 'react'
+import { useState } from 'react'
 import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import Popup from '@/components/Popup'
@@ -9,94 +9,70 @@ 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 './spreadMoney.less'
+import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
 
 export default (props) => {
+
   const [showCutover, setShowCutover] = useState(false)
   const ShowMoldeOn = () => {
     setShowCutover(true)
   }
-  const ok = () => {
+  const onClose = () => {
     setShowCutover(false)
-  }
-  const goToHotel = () => {
-    Taro.redirectTo({ url: '/hotel/pages/landlord/landlord' })
-  }
-  const gotoPerson = () => {
-    Taro.redirectTo({ url: '/pages/index/index' })
-  }
+    }
 
   return (
     <view>
       <view>
         <CustomNav title='十公里' />
       </view>
-      <Popup show={showCutover} maskClosable={false}>
-          <view className='User-box-sths' >
-            <view className='User-box-selectUser'>请选择身份：</view>
-            <view className='User-box-tourist' onClick={gotoPerson}>
-              <image className='Ubs-tourist-image' src={touristOFF} />
-              <text className='Ubs-tourist-text'>游客</text>
-            </view>
-            <view className='User-box-hotelBoss' onClick={goToHotel}>
-              <image className='Ubs-hotelBoss-image' src={hotelBossOFF} />
-              <text className='Ubs-hotelBoss-text'>民宿老板</text>
-
-            </view>
-            <view className='User-box-shopBoss' onClick={ok}>
-              <image className='Ubs-shopBoss-image' src={shopBossON} />
-              <text className='Ubs-shopBoss-text'>店铺老板</text>
-
-            </view>
-          </view>
-
-        </Popup>
-     
+      <ToggleRoul showCutover={showCutover} onClose={onClose} />
       <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 onClick={ShowMoldeOn}  className='User-info-cutover'>
-                <image className='User-info-cutover-image' src={cutoverUser} />
-              </view>
-              <view className='tip'>（计算收入以核销为准）</view>
-              <view className='money'>
-                <view className='sleft'>
-                  <view className='lword'>全年推广收入（税前）</view>
-                  <view className='yearMoney'>
-                    <text>2800000</text>元
-                    <image className='micon' src={eyes}></image>
-                  </view>
+            <view className='storeName'>店名：<text>Yun咖 云里 咖啡店</text></view>
+            <view onClick={ShowMoldeOn} className='User-info-cutover'>
+              <image className='User-info-cutover-image' src={cutoverUser} />
+            </view>
+            <view className='tip'>（计算收入以核销为准）</view>
+            <view className='money'>
+              <view className='sleft'>
+                <view className='lword'>全年推广收入（税前）</view>
+                <view className='yearMoney'>
+                  <text>2800000</text>元
+                  <image className='micon' src={eyes}></image>
                 </view>
-                <view className='line' />
-                <view className='sright'>
-                  <view className='rword'>当月推广收入（税前）</view>
-                  <view className='monthMoney'>
-                    <text>******</text>元
-                    <image className='micon2' src={ceyes}></image>
-                  </view></view>
               </view>
+              <view className='line' />
+              <view className='sright'>
+                <view className='rword'>当月推广收入（税前）</view>
+                <view className='monthMoney'>
+                  <text>******</text>元
+                  <image className='micon2' src={ceyes}></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 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 className='spreadMoney'>收入金额：<text>5.00</text>元</view>
               </view>
             </view>
           </view>
           <view className='botton'>已经到底了~</view>
-        </scroll-view>        
-      </view>
-      
+        </scroll-view>
       </view>
+
+    </view>
   )
 }

src/components/toggleRoul/ToggleRoul.jsx

@@ -0,0 +1,47 @@
+import { useState,useEffect } from 'react';
+
+import touristON from '@/assets/icons/UserCenter/touristON.png'
+import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
+import hotelBossON from '@/assets/icons/UserCenter/hotelBossON.png'
+import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
+import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
+import shopBossOFF from '@/assets/icons/UserCenter/shopBossOFF.png'
+
+import Popup from '@/components/Popup'
+import './ToggleRoul.less'
+import { useModel } from '@/store'
+
+
+export default ( props)=>{
+  const {showCutover, onClose }=props
+  const {getRoul}=useModel('person')
+  const goToPerson=()=>{
+    getRoul('normal')
+  }
+  const goToHotel=()=>{
+    getRoul('hotel')
+  }
+  const goToShop=()=>{
+    getRoul('shop')
+  }
+
+    return (      
+      <Popup show={showCutover} onClose={onClose}>
+          <view className='User-box-sths' >
+            <view className='User-box-selectUser'>请选择身份：</view>
+            <view className='User-box-tourist' onClick={goToPerson}>
+              <image className='Ubs-tourist-image' src={touristOFF} />
+              <text className='Ubs-tourist-text'>游客</text>
+            </view>
+            <view className='User-box-hotelBoss' onClick={goToHotel}>
+              <image className='Ubs-hotelBoss-image' src={hotelBossOFF} />
+              <text className='Ubs-hotelBoss-text'>民宿老板</text>
+            </view>
+            <view className='User-box-shopBoss' onClick={goToShop}>
+              <image className='Ubs-shopBoss-image' src={shopBossON} />
+              <text className='Ubs-shopBoss-text'>店铺老板</text>
+            </view>
+          </view>
+        </Popup>
+    )  
+}

src/components/toggleRoul/ToggleRoul.less

@@ -0,0 +1,56 @@
+.User-box-sths{
+  display: flex;
+  margin: 40px 0  60px 0;
+  justify-content: space-around;
+  flex-wrap: wrap;
+  .User-box-selectUser{
+    width: 100%;
+    font-size: 32px;
+    font-weight: bold;
+    color: #202020;
+    line-height: 32px;
+    margin: 60px 0 70px  0;
+    text-align: left;
+  }
+  .User-box-tourist{
+    display: inline-block;
+
+     .Ubs-tourist-image{
+      width: 86px;
+      height: 86px;
+
+    }
+    .Ubs-tourist-text{
+      display: block;
+      font-size: 30px;
+      font-weight: bold;
+      color: #999999;      
+    }
+  }
+  .User-box-hotelBoss{
+    display: inline-block;
+    .Ubs-hotelBoss-image{
+      width: 86px;
+      height: 86px;
+    }
+    .Ubs-hotelBoss-text{
+      display: block;
+      font-size: 30px;
+      font-weight: bold;
+      color: #999999;
+    }
+  }
+  .User-box-shopBoss{
+    .Ubs-shopBoss-image{
+      width: 86px;
+      height: 86px;
+    }
+    .Ubs-shopBoss-text{
+      display: block;
+      font-size: 30px;
+      font-weight: bold;
+      color:#202020;
+    }
+  }
+
+}

src/hotel/pages/landlord/landlord.jsx

@@ -7,15 +7,45 @@ import incomeImg from '@/assets/icons/landlord/我的收入.png'
 import onincomeImg from '@/assets/icons/landlord/我的收入按下.png'
 import houseImg from '@/assets/icons/landlord/房源管理.png'
 import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
-import './landlord.less'
 import withLayout from '@/layouts'
+import { getHotelManage, getAccountLogList, getNowHotelManage } from '@/services/landlord'
+import CustomNav from '@/components/CustomNav'
 
+import './landlord.less'
 
 export default withLayout((props) => {
   const { router, person } = props
   const { params } = useRouter()
   const { tab } = params || {}
 
+  const [hotelList, setHotelList] = useState([])
+  const [hotel, setHotel] = useState()
+  const [account, setAccount] = useState()
+  const [accountlog, setAccountLog] = useState([])
+
+  useEffect(() => {
+    getHotelManage().then((res) => {
+      const { hotelList: list, account: acc, hotel: current } = res
+      setHotelList(list)
+      setHotel(current)
+      setAccount(acc)
+      getAccountLogList(acc.accountId).then((res2) => {
+        setAccountLog(res2.records || [])
+      })
+    })
+  }, [])
+
+  const handleHotelChange = (current) => {    
+    getNowHotelManage(current.hotelId).then((res) => {
+      const {account: acc } = res
+      setAccount(acc)
+      setHotel(current)
+      getAccountLogList(acc.accountId).then((res2) => {
+        setAccountLog(res2.records || [])
+      })
+    })
+  }
+
   const [currentTab, setCurrentTab] = useState(0)
 
   const handleTabChange = (e) => {
@@ -31,9 +61,10 @@ export default withLayout((props) => {
 
   return (
     <view className='page-index'>
+      <CustomNav title={hotel?.hotelName} logo={hotel?.logo} />
       <view className='index-container'>
-        {currentTab === 0 && <Income />}
-        {currentTab === 1 && <HouseManage />}
+        {currentTab === 0 && <Income hotelList={hotelList} hotel={hotel} account={account} onHotelChange={handleHotelChange} accountlog={accountlog} />}
+        {currentTab === 1 && <HouseManage hotel={hotel} />}
       </view>
       <view className='index-tabbar'>
         <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>

src/layouts/index.jsx

@@ -18,12 +18,12 @@ export default (Child) => (props) => {
     const personRole = person?.personRole;
     if (!personRole) return;
 
-    const isNormalPerson = personRole === 'person'
+    const isNormalPerson = personRole === 'normal'
 
     const currentPage = getPageBy(router.path)
     let indexPage = getIndexPageOf(personRole)
     if (!isNormalPerson) {
-      indexPage = `${personRole}/${indexPage}`
+      indexPage = `${personRole}/${indexPage.page}`
     }
 
     const isMatched = isNormalPerson ?

src/pages/MineUserAll/Collect/index.jsx

@@ -49,7 +49,7 @@ export default withLayout((props) => {
           <view className='card-box-star'>
             {
               scoreList.map((_, index) => {
-                console.log(index)
+
                 const src = (index + '0.1') < score ? starOn : starOff
                 return (
                   <image className='card-star-image' key={index} src={src} />
@@ -92,7 +92,7 @@ export default withLayout((props) => {
           <view className='card-box-star'>
             {
               scoreList.map((_, index) => {
-                console.log(index)
+
                 const src = (index + '0.1') < score ? starOn : starOff
                 return (
                   <image className='card-star-image' key={index} src={src} />

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -40,7 +40,7 @@ export default withLayout((props) => {
           <view className='card-box-star'>
             {
               scoreList.map((_, index) => {
-                console.log(index)
+
                 const src = (index + '0.1') < score ? starOn : starOff
                 return (
                   <image className='card-star-image' key={index} src={src} />
@@ -80,7 +80,7 @@ export default withLayout((props) => {
           <view className='card-box-star'>
             {
               scoreList.map((_, index) => {
-                console.log(index)
+
                 const src = (index + '0.1') < score ? starOn : starOff
                 return (
                   <image className='card-star-image' key={index} src={src} />

src/pages/PayOrder/index.jsx

@@ -1,291 +1,73 @@
-import withLayout from "@/layouts";
-import image from "@/assets/icons/ProCard/8kb.jpg";
-import { useState, useEffect } from "react";
-import { Button, Checkbox, Input } from "@tarojs/components";
-
-import food from "@/assets/icons/ProCard/food.png";
-import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
-import CustomNav from "@/components/CustomNav";
-import OrderMolded from "@/components/OrderMolded";
-import Popup from "@/components/Popup";
-
-import "./style.less";
-import Taro, { useDidShow } from "@tarojs/taro";
-import { getShopPackageDetail } from "@/services/home";
-import { saveOrder, getOrderSub, payOrder } from "@/services/payOrder";
-import formatTime from "@/utils/formatTime";
-
-export default withLayout((props) => {
-  const { router, person } = props;
-  const { packageId, orderId } = props.router.params;
-
-  const [payInfo,setPayInfo] = useState()
-
-  const [showDialog, setShowDialog] = useState(false);
-  // 是否已阅读协议
-  const [agreement, setAgreement] = useState(false);
-  // 总价 totalPrice
-  const [totalPrice, setTotalPrice] = useState({});
-  const [list, setList] = useState([]);
-
-  const [BuyNumber, setBuyNumber] = useState(1);
-  const [detail, setDetail] = useState({});
-
-  const [DisabledBool, setDisabledBool] = useState(false);
-
-  const ShowMoldeOn = (e) => {
-    if (packageId) {
-      setBuyNumber(e.amount || 1);
-      setDetail(e);
-      setShowDialog(true);
-    }
-  };
-  const ButtonCancel = () => {
-    setShowDialog(false);
-  };
-  const ButtonOK = (e) => {
-    setList(
-      list.map((x) =>
-        x.packageId == detail.packageId ? { ...x, amount: BuyNumber } : x
-      )
-    );
-    setShowDialog(false);
-  };
-
-  const NumberAdd = () => {
-    setBuyNumber(BuyNumber + 1);
-    console.log(BuyNumber);
-  };
-
-  const NumberCut = () => {
-    if (DisabledBool) return;
-    setBuyNumber(BuyNumber - 1);
-    console.log(BuyNumber);
-  };
-
-  const onInput = (e) => {
-    let values = e.detail.value;
-    setBuyNumber(values - 0);
-  };
-
-  const requestPayment = (params) =>{
-    console.log(params,'requestPayment')
-    Taro.requestPayment({
-      ...params,
-      package: params.packageValue,
-      success: () => {
-        console.log("success");
-        setPayInfo()
-        Taro.showToast({
-          title: "支付成功",
-          icon: "none",
-          duration: 2000,
-        });
-      },
-      fail: (e) => {
-        console.log(e, "fail");
-        Taro.showToast({
-          title: "支付失败",
-          icon: "none",
-          duration: 2000,
-        });
-      },
-    });
-  }
-
-  const onShowPay = (e) => {
-    if (agreement) {
-      if(payInfo){
-        requestPayment(payInfo)
-        return
-      }
-      if (packageId) {
-        saveOrder(
-          list.map((x) => {
-            return {
-              amount: x.amount || 1,
-              itemId: x.packageId,
-              price: x.actualPrice,
-            };
-          })
-        ).then((res) => {
-          setPayInfo(res)
-          requestPayment(res)
-        });
-      }
-      if (orderId) {
-        payOrder(orderId).then((res) => {
-          setPayInfo(res)
-          requestPayment(res)
-        });
-      }
-    } else {
-      Taro.showToast({
-        title: "请勾选《平台用户服务协议》",
-        icon: "none",
-        duration: 2000,
-      });
-    }
-  };
+import Taro from '@tarojs/taro'
+import Star from '@/components/Star/Star.jsx'
+import pay from '@/assets/icons/housemantj/pay.png'
+import msTip from '@/assets/icons/housemantj/foodtip.png'
+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'
+
+
+
+//套餐卡片
+export default (props) => {
+  const { item } = props
+  const [isSaved, toggleSave] = useSave(item.isSaved,'shop_package', item.packageId)
+  const [city,setCity]=useState({})
+  const [detail,setDetail]=useState({})
 
   useEffect(() => {
-    if (packageId) {
-      getShopPackageDetail(packageId).then((res) => {
-        setList([res]);
-      });
-    }
-    if (orderId) {
-      getOrderSub({ pageNum: 1, pageSize: 999, orderId }).then((res) => {
-        setList(res.records);
-      });
-    }
-  }, [packageId, orderId]);
-
-  useEffect(() => {
-    if (BuyNumber < 2) {
-      setDisabledBool(true);
-    } else {
-      setDisabledBool(false);
-    }
-  }, [BuyNumber]);
-
-  useEffect(() => {
-    let total = {
-      cashback: 0,
-      actualPrice: 0,
-      standardPrice: 0,
-    };
-    list.map((x) => {
-      total.cashback += x.cashback * (x.amount || 1);
-      total.actualPrice += (x.actualPrice || x.unitPrice) * (x.amount || 1);
-      total.standardPrice += x.standardPrice * (x.amount || 1);
-    });
-    setTotalPrice(total);
-  }, [list]);
+  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)); 
 
   return (
-    <view class="container">
-      <CustomNav title="订单" />
-      <Popup show={showDialog} maskClosable={false}>
-        <OrderMolded />
-        <view className="item-center-Number">
-          <view
-            className="buy-num-minus"
-            disabled={DisabledBool}
-            onClick={NumberCut}
-          >
-            -
+      <view className='foodCard'>
+        <view className='fCleft'>
+          <view className='backMoney'>
+            返现￥{item.cashback/100}
           </view>
-          <Input
-            className="buy-num-input"
-            type="number"
-            min="1"
-            onInput={onInput}
-            value={BuyNumber}
-          />
-          <view className="buy-num-add" onClick={NumberAdd}>
-            +
+          <view className='appraise'>
+            <Star star={star} />
+            <text className='storezf'>{star}</text>
           </view>
-        </view>
-        <view className="buy-button-box">
-          <button className="button-Cancel" onClick={ButtonCancel}>
-            取消
-          </button>
-          <button className="button-OK" onClick={ButtonOK}>
-            确定
-          </button>
-        </view>
-      </Popup>
-      <view class="coupon-list">
-        {list?.map((item) => {
-          return (
-            <view class="wrapper">
-              <view class="left-complete-one">
-                <image className="left-image-1" src={ProCard_hot}></image>
-                <view className="left-viewText">
-                  返现￥{(item.cashback || 0) / 100}
-                </view>
-                <view className="title-image">
-                  <image
-                    className="image-1"
-                    mode="scaleToFill"
-                    src={item.poster}
-                  ></image>
-                  <image className="image-2" src={food}></image>
-                </view>
-                <view className="title-content">
-                  <view className="Pro-title">
-                    <view className="title-text">{item.description}</view>
-                  </view>
-                  <text className="title-money">
-                    ￥{(item.actualPrice || item.unitPrice || 0) / 100}元
-                    <text className="title-money-2">
-                      门市价{(item.standardPrice || 0) / 100}元
-                    </text>
-                  </text>
-                  <view className="title-time">
-                    有效期：{formatTime(item.startTime, "yyyy/MM/dd")}-
-                    {formatTime(item.endTime, "yyyy/MM/dd")}
-                  </view>
-                </view>
+          <view>
+            <view className='contentImg'>
+              <image src={item.poster} className='img1'></image>
+              <image src={msTip} className='mstip'></image>
+            </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
-                class="right-complete-two"
-                onClick={() => ShowMoldeOn(item)}
-              >
-                <view className="right-content">
-                  <view className="right-number">×{item.amount || 1}</view>
-                  <view className="right-title">数量</view>
-                </view>
               </view>
             </view>
-          );
-        })}
-      </view>
-      <view className="view-button">
-        <view className="Card-number-box">
-          <view className="Card-number">
-            <text style="left:29px;position: absolute; padding-top:20px">
-              手机号码:
-            </text>
-            <text style="right:29px;position: absolute;padding-top:20px">
-              {person.phone}
-            </text>
-          </view>
-          <view className="Card-user">
-            <Checkbox
-              style="padding-left:20px; position: relative; top:24px;"
-              value="agreement"
-              checked={agreement}
-              onClick={() => {
-                setAgreement(!agreement);
-              }}
-            >
-              我已阅读知晓并同意
-              <text style="color:#274190;text-decoration:underline;font-weight:400">
-                《平台用户服务协议》
-              </text>
-            </Checkbox>
           </view>
         </view>
-        <view className="button-box-button-box">
-          <view className="button-text-image">
-            <text className="button-text-money-hot">
-              返现￥{(totalPrice?.cashback || 0) / 100}
-            </text>
-            <image className="button-image" src={ProCard_hot}>
-              123123
-            </image>
-            <view className="button-text-money">
-              门店市面价：{(totalPrice?.standardPrice || 0) / 100}元
-            </view>
-          </view>
-          <Button className="button-box-one" onClick={() => onShowPay()}>
-            ￥{(totalPrice?.actualPrice || 0) / 100}元
-            <text className="button-text-one">支付订单</text>
-          </Button>
+        <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>
-  );
-});
+    
+  )
+}

src/pages/PayOrder/style.less

@@ -23,7 +23,7 @@
       background: #ffffff;
       border: 1px solid #999999;
       position: relative;
-      top: 30px;
+      top: 26px;
     }
     .buy-num-add {
       display: inline-block;
@@ -226,9 +226,9 @@
   }
 
   .view-button {
-    // width: 100%;
-    // height: 150px;
-    position: relative;
+
+    position: fixed;
+    bottom: 0px;
 
     .Card-number-box {
       .Card-number {

src/pages/details/foodDetails/foodDetails.jsx

@@ -1,7 +1,7 @@
 import CustomNav from '@/components/CustomNav'
 import withLayout from '@/layouts'
-import {getShopDetail,getShopPackage,getExtendContent} from '@/services/home'
-import { useState,useEffect } from 'react'
+import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
+import { useState, useEffect,useRef } from 'react'
 import { Swiper, SwiperItem } from '@tarojs/components';
 import Star from '@/components/Star/Star.jsx'
 import Cards from '@/components/foodCards/foodCards.jsx'
@@ -15,83 +15,101 @@ import share from '../../../assets/icons/housemantj/景点分享.png'
 import good from '../../../assets/icons/housemantj/景点爆赞.png'
 import collection from '../../../assets/icons/housemantj/景点收藏.png'
 import hongxin from '../../../assets/icons/housemantj/已收藏.png'
-
 import './foodDetails.less'
+import Taro from '@tarojs/taro'
 import Extend from '../components/extend'
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 
 export default withLayout((props) => {
   const { router, person } = props
-  const {id}=props.router.params
+  const { id } = props.router.params
   //商铺基础信息
-  const [detail,setDetail]=useState({})
+  const [detail, setDetail] = useState({})
   //商铺套餐
-  const [spackage,setPackage]=useState([])
+  const [spackage, setPackage] = useState([])
   //banner图集数组
-  const [imglist,setimglist]=useState([])
+  const [imglist, setimglist] = useState([])
   const [index, setIndex] = useState(0)
   const handchange = (e) => {
     setIndex(e.detail.current)
   }
-  
+
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'shop', id)
   const [isLike, toggleLike] = useLike(detail.isLike, 'shop', id)
 
   //当前套餐总数
-  const [newpgNum,setNewpgNum]=useState(0)
+  const [newpgNum, setNewpgNum] = useState(0)
   //全部套餐个数
-  const [AllpgNum,setAllpgNum]=useState(0)
+  const [AllpgNum, setAllpgNum] = useState(0)
   //套餐当前页数
-  const [page,setpage]=useState(2)
-  const pgMore=()=>{
-    setpage(page+1)
-    getShopPackage(id,{pageNum:page}).then((res)=>{
-      setPackage([...spackage,...res.records])
-      setNewpgNum(newpgNum+res.records.length)
+  const [page, setpage] = useState(2)
+  const pgMore = () => {
+    setpage(page + 1)
+    getShopPackage(id, { pageNum: page }).then((res) => {
+      setPackage([...spackage, ...res.records])
+      setNewpgNum(newpgNum + res.records.length)
     })
   }
   //本店指南
-  const [extend,setExtend]=useState([])
+  const [extend, setExtend] = useState([])
 
   //当前指南总数
-  const [newextNum,setNewextNum]=useState(0)
+  const [newextNum, setNewextNum] = useState(0)
   //全部指南个数
-  const [AllextNum,setAllextNum]=useState(0)
+  const [AllextNum, setAllextNum] = useState(0)
   //指南当前页数
-  const [epage,setepage]=useState(2)
-  const extendMore=()=>{
-    setepage(epage+1)
-    getExtendContent('shop',id,{pageNum:epage}).then((res)=>{
-      setExtend([...extend,...res.records])
-      setNewextNum(newextNum+res.records.length)
+  const [epage, setepage] = useState(2)
+  const extendMore = () => {
+    setepage(epage + 1)
+    getExtendContent('shop', id, { pageNum: epage }).then((res) => {
+      setExtend([...extend, ...res.records])
+      setNewextNum(newextNum + res.records.length)
+    })
+  }
+  const toShare = () => {
+    console.log(222222222222)
+    onShareAppMessage()
+  }
+  const openMap = () => {
+    Taro.openLocation({
+      longitude: log.current - 0,
+      latitude: lat.current - 0,
+      name: detail.shopName,
+      address: detail.address,
+      scale: 12,
     })
   }
-  useEffect(()=>{
-    getShopDetail(id).then((res)=>{
+  const log = useRef('')
+  const lat = useRef('')
+
+  useEffect(() => {
+    getShopDetail(id).then((res) => {
       setDetail(res)
-      setimglist(res.imageList||[])
+      log.current = (res.locaton).toString().split(',')[0]
+      lat.current = (res.locaton).toString().split(',')[1]
+      setimglist(res.imageList || [])
     })
-    getShopPackage(id).then((res)=>{
-      setPackage(res.records||[])
+    getShopPackage(id).then((res) => {
+      setPackage(res.records || [])
       setNewpgNum(res.records.length)
       setAllpgNum(res.total)
     })
-    getExtendContent('shop',id).then((res)=>{
-      setExtend(res.records||[])
+    getExtendContent('shop', id).then((res) => {
+      setExtend(res.records || [])
       setAllextNum(res.total)
       setNewextNum(res.records.length)
     })
-  },[])
-  const star=parseFloat(((detail.sweetScore+detail.environmentScore+detail.serviceScore)/3).toFixed(1)); 
-return (
+  }, [])
+  const star = parseFloat(((detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1));
+  return (
     <view className='page-index'>
       <view className='index-navbar'>
         <CustomNav title='十公里' />
       </view>
-      <view style={{overflow: 'auto', padding: '0 30rpx', background: '#F8F8F8' }}>
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll">
-          <view className='storeDetails'>           
+      <view style={{ overflow: 'auto', padding: '0 30rpx', background: '#F8F8F8' }}>
+        <scroll-view scroll-y='true' scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll'>
+          <view className='storeDetails'>
             <Swiper
               className='.swiper'
               circular
@@ -103,27 +121,27 @@ return (
                   <SwiperItem>
                     <image src={item.url} className='storeImage' >
                       <view className='tpPage'>
-                      <text>{index + 1}/{imglist.length}</text>
+                        <text>{index + 1}/{imglist.length}</text>
                       </view>
                     </image>
                   </SwiperItem>
                 )
               }
-            </Swiper>                        
+            </Swiper>
             <view className='storeJs'>
               <view style={{ overflow: 'hidden' }}>
-                  <view className='storeName'>{detail.shopName}</view>
-                  <view className='sprice'>
-                    <text className='t1'>￥</text>
-                    {detail.averagePrice/100}/人                
-                    <view className='bzRight'>
-                      <image src={ax} style={{ width: '15px', height: '15px', marginRight: '11rpx', marginBottom: '-2px' }} />
+                <view className='storeName'>{detail.shopName}</view>
+                <view className='sprice'>
+                  <text className='t1'>￥</text>
+                  {detail.averagePrice / 100}/人
+                  <view className='bzRight'>
+                    <image src={ax} style={{ width: '15px', height: '15px', marginRight: '11rpx', marginBottom: '-2px' }} />
                     爆赞{detail.likeNum}</view>
-                  </view>
+                </view>
               </view>
               <view className='appraise'>
-                <Star star={star}/>{star}
-                <view style={{float:'right',marginTop:'5px'}}>
+                <Star star={star} />{star}
+                <view style={{ float: 'right', marginTop: '5px' }}>
                   <text className='comment'>点评：</text>
                   <text className='t1'>口味：{detail.sweetScore}</text>
                   <text className='t1'>环境：{detail.environmentScore}</text>
@@ -133,40 +151,40 @@ return (
               <view className='yysj'>
                 <image src={yysj} className='yysjImg' />营业时间：{detail.businessHours}
               </view>
-              <view className='dpPosition'> 
+              <view className='dpPosition' onClick={openMap}>
                 <image src={dw} className='dwTip' />
                 <view>
-                  {detail.address}<image src={zhuandao} className='zhuandao'/>
+                  {detail.address}<image src={zhuandao} className='zhuandao' />
                 </view>
               </view>
             </view>
           </view>
-          <view style={{ position: 'relative',display:spackage==''?'none':''}}>
+          <view style={{ position: 'relative', display: spackage == '' ? 'none' : '' }}>
             <view className='title'>
-              <image src={titlezs}/><text>返现套餐</text>
-            </view>            
-            {spackage?.map((item)=><Cards star={star} item={item}/>)}            
-            <view className='showMore' style={{display:newpgNum==AllpgNum?'none':''}} onClick={pgMore}>
+              <image src={titlezs} /><text>返现套餐</text>
+            </view>
+            {spackage?.map((item) => <Cards star={star} item={item} />)}
+            <view className='showMore' style={{ display: newpgNum == AllpgNum ? 'none' : '' }} onClick={pgMore}>
               <view>查看更多</view>
               <image src={showMore} className='moreTip' />
             </view>
           </view>
-          <view style={{ position: 'relative',display:extend==''?'none':'' }}>
+          <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
             <view className='title'>
-              <image src={titlezs}/>
+              <image src={titlezs} />
               <text>本店指南</text>
             </view>
-            {extend?.map((item)=><Extend item={item} />)}
-            <view className='showMore' style={{display:newextNum==AllextNum?'none':''}} onClick={extendMore}>
+            {extend?.map((item) => <Extend item={item} />)}
+            <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
               <view>查看更多</view>
               <image src={showMore} className='moreTip' />
             </view>
           </view>
-           <view className='botton' style={{display:newextNum==AllextNum?'':'none'}}>已经到底了~</view>
+          <view className='botton' style={{ display: newextNum == AllextNum ? '' : 'none' }}>已经到底了~</view>
         </scroll-view>
       </view>
       <view className='bottomTab'>
-        <view className='tab'>
+        <view className='tab' onClick={toShare}>
           <image className='share' src={share} />分享
         </view>
         <view className='tab' onClick={toggleLike}>

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -9,15 +9,16 @@ 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 './sceneryDetails.less'
 import withLayout from '@/layouts'
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useRef } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
 import { Swiper, SwiperItem } from '@tarojs/components';
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import Extend from '../components/extend'
 import Cards from '@/components/foodCards/foodCards.jsx'
+import Taro from '@tarojs/taro'
+import './sceneryDetails.less'
 
 
 
@@ -54,8 +55,23 @@ export default withLayout((props) => {
   // 推荐套餐列表
   const [recommend, setRecommend] = useState([])
 
+  const openMap = () => {
+    Taro.openLocation({
+      longitude: log.current - 0,
+      latitude: lat.current - 0,
+      name: detail.touristName,
+      address: detail.address,
+      scale: 12,
+    })
+  }
+  const log = useRef('')
+  const lat = useRef('')
+
+
   useEffect(() => {
     getTouristDetail(id).then((res) => {
+      log.current = (res.locaton).toString().split(',')[0]
+      lat.current = (res.locaton).toString().split(',')[1]
       setDetail(res)
       setimglist(res.imageList || [])
 
@@ -69,7 +85,6 @@ export default withLayout((props) => {
       setRecommend(res || [])
     })
   }, [])
-  console.log(extend=='')
   return (
     <view className='page-index'>
       <view className='index-navbar'>
@@ -106,7 +121,7 @@ export default withLayout((props) => {
                 <text className='bzRight'>爆赞{detail.likeNum}</text>
               </view>
               <view className='wz'>{detail.address}</view>
-              <view className='dpPosition'>
+              <view className='dpPosition' onClick={openMap}>
                 <image src={dw} className='dwTip' />
                 <view className='distance'>{distance}公里</view>
               </view>
@@ -119,7 +134,7 @@ export default withLayout((props) => {
               <image className='scTip' src={isSaved > 0 ? hongxin : baixin} /><text>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
             </view>
           </view>
-          <view style={{ position: 'relative',display:extend==''?'none':''}}>
+          <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
             <view className='title'>
               <image src={titlejd} />景点介绍
             </view>
@@ -129,7 +144,7 @@ export default withLayout((props) => {
               <image src={showMore} className='moreTip' />
             </view>
           </view>
-          <view style={{ position: 'relative', display: recommend=='' ? 'none' : '' }}>
+          <view style={{ position: 'relative', display: recommend == '' ? 'none' : '' }}>
             <view className='title'>
               <image src={titlems} />老板推荐好吃的
             </view>

src/pages/index/tabs/Mine.jsx

@@ -1,5 +1,5 @@
 
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { Slot } from '@tarojs/components'
 import AuthPage from '@/components/AuthPage'
@@ -16,8 +16,12 @@ import Rules from '@/assets/icons/UserCenter/Rules.png'
 import DefaultImage from '@/assets/icons/UserCenter/DefaultImage.png'
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import SwitchSelect from '@/components/SwitchSelect'
+import { PaysOrder, getMineOrder } from '@/services/payOrder' //创建订单
+
 import { useModel } from '@/store'
 import './MineCss/style.less'
+import  ToggleRoul  from  '@/components/toggleRoul/ToggleRoul'
+
 
 
 
@@ -28,12 +32,23 @@ export default (props) => {
   const { getAvatar } = useModel('person')
   const [showCutover, setShowCutover] = useState(false)
   const hasAvatar = !!person.avatar
-  // const hidePhone = person.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2")
-  // console.log("🚀 ~ file: Mine.jsx ~ line 31 ~ hidePhone", hidePhone)
+  const [orderNum, setOrderNum] = useState([])
+  console.log("🚀 ~ file: Mine.jsx ~ line 34 ~ orderNum", orderNum)
+
 
   const ShowMoldeOn = () => {
     setShowCutover(true)
   }
+  const onClose = () => {
+    setShowCutover(false)
+  }
+
+  useEffect(() => {
+    getMineOrder().then(res => setOrderNum(res))
+
+  }, [])
+
+
 
   // 通过getUserProfile获取微信用户信息
   const handleGetUserProfile = () => {
@@ -103,7 +118,7 @@ export default (props) => {
 
       <view className='User-box'>
         {/* 身份切换 */}
-        <SwitchSelect show={showCutover} maskClosable />
+        <ToggleRoul showCutover={showCutover} onClose={onClose} />
         <view className='User-info'>
           <view className='User-photos-box'>
             <image src={person.avatar || { DefaultImage }} className='User-photos' />
@@ -123,12 +138,12 @@ export default (props) => {
             <view className='buy-list-Paybox' onClick={handleTobePaid} >
               <image className='buy-list-PayLogo' src={awaitPay} />
               <view className='buy-list-goPay'>待支付</view>
-              <view className='buy-list-OrderNumber'>2笔订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.unPayNum}笔订单</view>
             </view>
             <view className='buy-list-Paybox ' onClick={handleTobeWritten} >
               <image className='buy-list-PayLogo' src={ToShop} />
               <view className='buy-list-goPay'>待核销</view>
-              <view className='buy-list-OrderNumber'>1个订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.unVerifiedNum}个订单</view>
             </view>
             <view className='buy-list-Paybox ' onClick={handleAllOrder} >
               <image className='buy-list-PayLogo' src={AllOrder} />
@@ -138,7 +153,7 @@ export default (props) => {
             <view className='buy-list-Paybox ' onClick={handleRefund} >
               <image className='buy-list-PayLogo' src={Refund} />
               <view className='buy-list-goPay'>退款/售后</view>
-              <view className='buy-list-OrderNumber'>2笔订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.refundNum}笔订单</view>
             </view>
           </view>
           <view className='Badge-box'>

src/pages/index/tabs/Recommend.jsx

@@ -35,7 +35,7 @@ export default (props) => {
       typeId: tab
     })
     if (index == 0) {
-      setQueryParams({ location: location1, pageNum: 1, pageSize: 10, typeId: '' })
+      setQueryParams({ location:  locRef.current, pageNum: 1, pageSize: 10, typeId: '' })
     }
   }
 
@@ -60,7 +60,6 @@ export default (props) => {
       // 更新 typeId
       // 更新 分页
     }
-
     setActiveTab(tabJump - 0)
   }, [tabJump])
 
@@ -77,6 +76,13 @@ export default (props) => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });
   }
+
+
+  const RefreshCard=()=>{
+    console.log(1111)
+  }
+
+  
   return (
     <view style={{ height: '100%', overflow: 'auto' }}>
       <view className='search' onClick={onSearch}>
@@ -104,7 +110,9 @@ export default (props) => {
           </mp-tabs>
         </scroll-view>
       </view>
-      <scroll-view scroll-y='true' scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll'>
+      <scroll-view scroll-y='true' scroll-view='true'  	bindscrolltolower='lower' bindscrolltoupper='upper'	 bindscroll='scroll'
+      
+      >
         <view className='waterfall'>
           {
             alllist.map((item) => <Card key={item.resourceNo} item={item} />)

src/services/landlord.js

@@ -11,11 +11,33 @@ import request from '@/utils/request'
 
  
 /**
- * 查询房源列表 
+ * 查询指定名宿的账户
  * @param {*} params 
  * @returns 
  */
- export const getRoomList = (params) => request('/taRoom', { params })
+ export const getNowHotelManage = (id,params) => request(`/hotel/manage/${id}`, { params })
+
+
+/**
+ * 查询民宿老板的所有名宿列表
+ * @param {*} params 
+ * @returns 
+ */
+ export const getHotelManage = (params) => request('/hotel/manage/index', { params })
+
+/**
+ * 查询指定名宿的账户流水
+ * @param {*} params 
+ * @returns 
+ */
+ export const getAccountLogList = (id) => request(`/hotel/account/${id}/log`)
+
+/**
+ * 房源列表
+ * @param {*} id 
+ * @returns 
+ */
+ export const getRoomList = (params) => request('/taRoom',{params})
 
  /**
  * 删除房源

src/services/person.js

@@ -20,3 +20,10 @@ export const authPhone = (data) => request('/auth-phone', { data, method: 'put'
  * @returns 
  */
 export const authAvatar = (data) => request('/auth-user', { data, method: 'put' })
+
+ /**
+ * 切换角色
+ * @param {*} data 
+ * @returns 
+ */
+  export const toggleRoul = (targetType) => request(`/person-role/${targetType}`,{ method: 'post'})

src/store/models/person.js

@@ -1,6 +1,6 @@
 import { useState } from "react"
 import Taro from '@tarojs/taro'
-import { signIn, authPhone, authAvatar } from '@/services/person'
+import { signIn, authPhone, authAvatar,toggleRoul } from '@/services/person'
 
 export default () => {
   const [person, setPerson] = useState()
@@ -36,13 +36,19 @@ export default () => {
     })
   }
 
+  const getRoul = (data) => {
+    return toggleRoul(data).then((res) => {
+      setPerson(res);
+    })
+  }
+
   return {
     person,
     peronRoles,
     setPerson,
     login,
     getPhone,
-
     getAvatar,
+    getRoul
   }
 }