flx

config/prod.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://sgl-v2.njyunzhi.com"',
+    HOST: '"http://192.168.89.147:8080"',
   },
   mini: {},
   h5: {

package.json

@@ -36,7 +36,6 @@
   "author": "",
   "dependencies": {
     "@babel/runtime": "^7.7.7",
-    "@miniprogram-component-plus/tabs": "^1.0.0",
     "@tarojs/components": "3.3.2",
     "@tarojs/react": "3.3.2",
     "@tarojs/runtime": "3.3.2",

src/components/CompoentsOrder/complete/index.jsx

@@ -1,166 +1,358 @@
-import { useState } from "react";
+import react, { useState, useEffect } from "react";
+import Taro from "@tarojs/taro";
+import { getOrderSub, getQrcode } from "@/services/payOrder";
+import formatTime from "@/utils/formatTime";
+import image from "@/assets/icons/ProCard/8kb.jpg";
+import food from "@/assets/icons/ProCard/food.png";
+import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
 
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
+import Evaluation from "@/assets/icons/UserCenter/Evaluation.png";
+import Null from "@/assets/icons/UserCenter/null_logo.png";
+import QRcode from "@/assets/icons/UserCenter/QRcode.png";
 
-import Evaluation from '@/assets/icons/UserCenter/Evaluation.png'
-import Null from '@/assets/icons/UserCenter/null_logo.png'
-import QRcode from '@/assets/icons/UserCenter/QRcode.png'
-
-import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
-import starOn from '@/assets/icons/GuideCheck/starOn.png'
-import starOff from '@/assets/icons/GuideCheck/starOff.png'
+import Pay from "@/assets/icons/GuideCheck/Pay_logo.png";
+import starOn from "@/assets/icons/GuideCheck/starOn.png";
+import starOff from "@/assets/icons/GuideCheck/starOff.png";
 import AlreadyUsed from "../AlreadyUsed";
-import './style.less'
-
+import "./style.less";
 
-const scoreList = new Array(5).fill(0)
-const score = '3.9'
+const scoreList = new Array(5).fill(0);
+const score = "3.9";
 
+const dict = {
+  0: { status: 0 },
+  1: { status: 1 },
+  2: { isVerified: 1 },
+  3: { status: 9 },
+};
 export default (props) => {
+  const { type } = props;
+  const [list, setList] = useState([]);
+  const [IsPull, setPull] = useState(false);
+  const [pageNum, setNumber] = useState(1);
+  const [HasNextPage, setHasNextPage] = useState(true);
+
+  useEffect(() => {
+    getList();
+  }, [pageNum]);
+
+  const pageRefresh = () => {
+    // 页面下拉刷新回调
+    setPull(true);
+  };
+
+  const getList = () => {
+    setHasNextPage(false);
+
+    // let params = {};
+
+    // if (type === 1) {
+    // }
+    getOrderSub({
+      pageNum,
+      pageSize: 10,
+      ...(type !== undefined ? dict[type] : null),
+    }).then((res) => {
+      setList(
+        pageNum === 1 ? res.records || [] : list.concat(res.records || [])
+      );
+      setHasNextPage(res.current < res.pages);
+      setPull(false);
+    });
+  };
+
+  const pageLoadMore = () => {
+    // 页面上拉加载更多
+    if (HasNextPage) {
+      setNumber(pageNum + 1);
+    }
+  };
+
+  useEffect(() => {
+    // 下拉刷新触发
+    if (IsPull) {
+      if (pageNum === 1) {
+        getList();
+      } else {
+        setNumber(1);
+      }
+    }
+  }, [IsPull]);
+
+  //核销
+  const onWriteOff = (item) => {
+    Taro.scanCode({
+      onlyFromCamera: true,
+      success: (res) => {
+        if (res.path) {
+          getQrcode(res.result).then((result) => {
+            Taro.navigateTo({
+              url: `/${result.page}?${result.scene}`,
+            });
+          });
+        } else {
+          Taro.showToast({
+            title: "非当前小程序生成二维码",
+            icon: "none",
+            duration: 2000,
+          });
+        }
+      },
+      fail: (err) => {
+        console.log(err, "err");
+      },
+    });
+  };
+
   return (
-    <scroll-view scroll-y style='height: 90vh;'  >
-      <view className='complete-boxs' >
-        {/* 已使用 */}
-        <view className='OrderNumber' >订单编号：ABC123456789</view>
-        <view class='wrapper'>
-          <view class='left-complete-one'>
-            <image className='left-image-1' src={ProCard_hot}></image>
-            <view className='left-viewText'>
-              返现￥16.00
-            </view>
-            {/* 评分 */}
-            <view className='card-box-star'>
-              {
-                scoreList.map((_, index) => {
-
-                  const src = (index + '0.1') < score ? starOn : starOff
-                  return (
-                    <image className='card-star-image' key={index} src={src} />
-                  )
-                })
-              }
-              <text className='card-star-text' >{score}</text>
-            </view>
-            <view className='title-image'>
-              <image className='image-1' mode='scaleToFill' src={image}></image>
-              <image className='image-2' src={food}></image>
-            </view>
-            <view className='title-content'>
-              <view className='Pro-title'>
-                <view className='title-text'>【米啊糯】新街口店 <text className='title-money-2' >数量：1张</text></view>
+    <scroll-view
+      scroll-y
+      style="height: 90vh;"
+      refresher-enabled
+      refresher-triggered={IsPull}
+      onrefresherrefresh={pageRefresh}
+      refresher-background="#fff"
+      onscrolltolower={pageLoadMore}
+    >
+      <view className="complete-boxs">
+        {list.map((item, index) => {
+          /* 待支付 */
+          if (item.status === 0) {
+            return (
+              <view key={`${type}-${item.orderId}`}>
+                <view className="OrderNumber">订单编号：{item.orderId}</view>
+
+                <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>
+                      <image className="image-2" src={food}></image>
+                    </view>
+                    <view className="title-content">
+                      <view className="Pro-title">
+                        <view className="title-text">
+                          {item.packageDescription}
+                          <text className="title-money-2">
+                            数量：{item.amount}张
+                          </text>
+                        </view>
+                      </view>
+                      <text className="title-money">
+                        ￥{item.unitPrice / 100}元
+                      </text>
+                      <view className="title-time">
+                        有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
+                        {formatTime(item.endTime, "yyyy/MM/dd")}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="right-complete-two">
+                    <view
+                      className="right-content"
+                      onClick={() => {
+                        Taro.navigateTo({
+                          url: `/pages/PayOrder/index?orderId=${item.orderId}`,
+                        });
+                      }}
+                    >
+                      <image className="right-image" src={Pay} />
+                      <view className="right-title">支付</view>
+                    </view>
+                  </view>
+                </view>
               </view>
-              <text className='title-money' >￥6990元</text>
-              <view className='title-time' >核销时间：2021/06/21  12:00</view>
-            </view>
-          </view>
-          <view class='right-complete-two'>
-            <view className='right-content'>
-              <image className='right-image' src={Evaluation} />
-              <view className='right-title'>评价</view>
-            </view>
-          </view>
-        </view>
-        {/* 待核销 */}
-        <view className='OrderNumber'>订单编号：ABC123456789</view>
-        <view class='wrapper'>
-          <view class='left-complete-one'>
-            <image className='left-image-1' src={ProCard_hot}></image>
-            <view className='left-viewText'>
-              返现￥16.00
-            </view>
-            <view className='title-image'>
-              <image className='image-1' mode='scaleToFill' src={image}></image>
-              <image className='image-2' src={food}></image>
-            </view>
-            <view className='title-content'>
-              <view className='Pro-title'>
-                <view className='title-text'>【SEOUL·创意韩国料理】 <text className='title-money-2' >数量：1张</text></view>
+            );
+          }
+          /* 待核销 */
+          if (item.status === 1 && item.isVerified == 0) {
+            return (
+              <view key={`${type}-${item.orderId}`}>
+                <view className="OrderNumber">订单编号：{item.orderId}</view>
+                <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>
+                      <image className="image-2" src={food}></image>
+                    </view>
+                    <view className="title-content">
+                      <view className="Pro-title">
+                        <view className="title-text">
+                          {item.packageDescription}
+                          <text className="title-money-2">
+                            数量：{item.amount}张
+                          </text>
+                        </view>
+                      </view>
+                      <text className="title-money">
+                        ￥{item.unitPrice / 100}元
+                      </text>
+                      <view className="title-time">
+                        有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
+                        {formatTime(item.endTime, "yyyy/MM/dd")}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="right-complete-two">
+                    <view
+                      className="right-content"
+                      onClick={() => onWriteOff(item)}
+                    >
+                      <image className="right-image" src={QRcode} />
+                      <view className="right-title">扫码核销</view>
+                    </view>
+                  </view>
+                </view>
               </view>
-              <text className='title-money' >￥6990元</text>
-              <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
-            </view>
-          </view>
-          <view class='right-complete-two'>
-            <view className='right-content'>
-              <image className='right-image' src={QRcode} />
-              <view className='right-title'>扫码核销</view>
-            </view>
-          </view>
-        </view>
-        {/* 待支付 */}
-        <view className='OrderNumber'>订单编号：ABC123456789</view>
-
-        <view class='wrapper'>
-          <view class='left-complete-one'>
-            <image className='left-image-1' src={ProCard_hot}></image>
-            <view className='left-viewText'>
-              返现￥16.00
-            </view>
-            <view className='title-image'>
-              <image className='image-1' mode='scaleToFill' src={image}></image>
-              <image className='image-2' src={food}></image>
-            </view>
-            <view className='title-content'>
-              <view className='Pro-title'>
-                <view className='title-text'>【SEOUL·创意韩国料理】 <text className='title-money-2' >数量：1张</text></view>
+            );
+          }
+          /* 已过期 */
+          if (item.status === 9) {
+            return (
+              <view key={`${type}-${item.orderId}`}>
+                <view className="OrderNumber">订单编号：{item.orderId}</view>
+                <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="card-box-star">
+                      {scoreList.map((_, index) => {
+                        const src = index + 1 <= item.score ? starOn : starOff;
+                        return (
+                          <image
+                            className="card-star-image"
+                            key={index}
+                            src={src}
+                          />
+                        );
+                      })}
+                      <text className="card-star-text">{item.score}</text>
+                    </view>
+                    <view className="title-image">
+                      <image
+                        className="image-1"
+                        mode="scaleToFill"
+                        src={item.poster || image}
+                      ></image>
+                      <image className="image-2" src={food}></image>
+                    </view>
+                    <view className="title-content">
+                      <view className="Pro-title">
+                        <view className="title-text">
+                          {item.packageDescription}
+                          <text className="title-money-2">
+                            数量：{item.amount}张
+                          </text>
+                        </view>
+                      </view>
+                      <text className="title-money">
+                        ￥{item.unitPrice / 100}元
+                      </text>
+                      <view className="title-time">
+                        有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
+                        {formatTime(item.endTime, "yyyy/MM/dd")}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="right-complete-two">
+                    <view className="right-content">
+                      <image className="right-image-2" src={Null} />
+                    </view>
+                  </view>
+                </view>
               </view>
-              <text className='title-money' >￥6990元</text>
-              <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
-            </view>
-          </view>
-          <view class='right-complete-two'>
-            <view className='right-content'>
-              <image className='right-image' src={Pay} />
-              <view className='right-title'>支付</view>
-            </view>
-          </view>
-        </view>
-        {/* 已过期 */}
-        <view className='OrderNumber'>订单编号：ABC123456789</view>
-        <view class='wrapper'>
-          <view class='left-complete-one'>
-            <image className='left-image-1' src={ProCard_hot}></image>
-            <view className='left-viewText'>
-              返现￥16.00
-            </view>
-            {/* 评分 */}
-            <view className='card-box-star'>
-              {
-                scoreList.map((_, index) => {
-
-                  const src = (index + '0.1') < score ? starOn : starOff
-                  return (
-                    <image className='card-star-image' key={index} src={src} />
-                  )
-                })
-              }
-              <text className='card-star-text' >{score}</text>
-            </view>
-            <view className='title-image'>
-              <image className='image-1' mode='scaleToFill' src={image}></image>
-              <image className='image-2' src={food}></image>
-            </view>
-            <view className='title-content'>
-              <view className='Pro-title'>
-                <view className='title-text'>【SEOUL·创意韩国料理】 <text className='title-money-2' >数量：1张</text></view>
+            );
+          }
+          /* 已使用 */
+          if (item.isVerified == 1) {
+            return (
+              <view key={`${type}-${item.orderId}`}>
+                <view className="OrderNumber">订单编号：{item.orderId}</view>
+                <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="card-box-star">
+                      {scoreList.map((_, index) => {
+                        console.log(index);
+                        const src = index + 1 <= item.score ? starOn : starOff;
+                        return (
+                          <image
+                            className="card-star-image"
+                            key={index}
+                            src={src}
+                          />
+                        );
+                      })}
+                      <text className="card-star-text">{item.score}</text>
+                    </view>
+                    <view className="title-image">
+                      <image
+                        className="image-1"
+                        mode="scaleToFill"
+                        src={item.poster || image}
+                      ></image>
+                      <image className="image-2" src={food}></image>
+                    </view>
+                    <view className="title-content">
+                      <view className="Pro-title">
+                        <view className="title-text">
+                          {item.packageDescription}
+                          <text className="title-money-2">
+                            数量：{item.amount}张
+                          </text>
+                        </view>
+                      </view>
+                      <text className="title-money">
+                        ￥{item.unitPrice / 100}元
+                      </text>
+                      <view className="title-time">
+                        核销时间：{" "}
+                        {formatTime(item.verifiedDate, "yyyy/MM/dd hh:mm")}
+                      </view>
+                    </view>
+                  </view>
+                  <view class="right-complete-two">
+                    <view className="right-content">
+                      <image className="right-image" src={Evaluation} />
+                      <view className="right-title">评价</view>
+                    </view>
+                  </view>
+                </view>
               </view>
-              <text className='title-money' >￥6990元</text>
-              <view className='title-time' >有效期：2021/06/21-2021/12/31</view>
-            </view>
-          </view>
-          <view class='right-complete-two'>
-            <view className='right-content'>
-              <image className='right-image-2' src={Null} />
-            </view>
-          </view>
-        </view>
-        <view className='foot'>
-          已经到底了~
-        </view>
+            );
+          }
+        })}
+
+        <view className="foot">已经到底了~</view>
       </view>
-    </scroll-view >
+    </scroll-view>
+  );
+};
+
+//  {/* 待核销 */}
+
+//  {/* 待支付 */}
 
-  )
-}
+//  {/* 已过期 */}

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,22 +1,27 @@
-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 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)
@@ -26,89 +31,47 @@ export default (props) => {
   }
   return (
     <view>
-      <view>
-        <CustomNav title='十公里' />
-      </view>
       <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 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>
-            </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/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/foodCards/foodCards.jsx

@@ -1,7 +1,4 @@
-import useSave from "@/utils/hooks/useSave"
-import Taro from "@tarojs/taro"
-import { getShopDetail, getShopcity } from '@/services/home'
-import { useState, useEffect } from 'react'
+import Taro from '@tarojs/taro'
 import Star from '@/components/Star/Star.jsx'
 import pay from '@/assets/icons/housemantj/pay.png'
 import msTip from '@/assets/icons/housemantj/foodtip.png'
@@ -9,71 +6,68 @@ 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({})
-
-  const goToPay = () => {
-    Taro.navigateTo({
-      url: `/pages/PayOrder/index?packageId=${item.packageId}&shopId=${item.shopId}`,
-    })
-  }
+  const [isSaved, toggleSave] = useSave(item.isSaved,'shop_package', item.packageId)
+  const [city,setCity]=useState({})
+  const [detail,setDetail]=useState({})
 
   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>
-        <view>
-          <view className='contentImg'>
-            <image src={item.poster} className='img1'></image>
-            <image src={msTip} className='mstip'></image>
+      <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 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='contentImg'>
+              <image src={item.poster} className='img1'></image>
+              <image src={msTip} className='mstip'></image>
             </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 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>
             </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={() => { goToPay() }}>
-        <image src={pay} />
-        <view>支付</view>
-      </view>
-      <view className='columnLine'></view>
-    </view>
-
+    
   )
 }

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/pages/MineUserAll/AllOrder/index.jsx

@@ -96,10 +96,10 @@ export default withLayout((props) => {
         </mp-tabs>
       </view>
       {activeTab === 0 && <Complete />}
-      {activeTab === 1 && <TobePaid />}
-      {activeTab === 2 && <TobeWritten />}
-      {activeTab === 3 && <AlreadyUsed />}
-      {activeTab === 4 && <AlreadyExpired />}
+      {activeTab === 1 && <Complete type={0} />}
+      {activeTab === 2 && <Complete type={1} />}
+      {activeTab === 3 && <Complete type={2} />}
+      {activeTab === 4 && <Complete type={3} />}
     </view>
   )
 })

src/pages/PayOrder/index.jsx

@@ -1,147 +1,291 @@
-import withLayout from '@/layouts'
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import AuthPage from '@/components/AuthPage'
-import Taro from '@tarojs/taro'
-import { useState, useEffect, useRef } 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 CustomNav from '@/components/CustomNav'
-import PayOrderCard from '@/components/PayOrderCard'
-import { PaysOrder, getMineOrder } from '@/services/payOrder' //创建订单
-import { getShopPackage, } from '@/services/home'
-import './style.less'
+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 { id, shopId, packageId } = props.router.params
-  const [shopPackage, setShopPackage] = useState([])
-  const [buttonDisabled, setButtonDisabled] = useState(true)
-  const [totalCost, setTotalCost] = useState(0)
-  const [cashBack, setCashBack] = useState(0)
-  const [realPrice, setRealPrice] = useState(0)
-
-  console.log('----------shopId-------', props, shopId, id);
-
-  const handelButton = () => {
-    setButtonDisabled(false)
-  }
-
-  const goRules = () => {
-    Taro.navigateTo({ url: `/pages/MineUserAll/Rules/index` })
-
-  }
-
-
-  const handeList = () => {
-    shopPackage.map((item) => {
-      //总价
-      let CostSum = (item.actualPrice / 100) * (item.BuyNumber || 1)
-      setTotalCost(totalCost + CostSum)
-      //返现价
-      let backSum = (item.cashback / 100) * (item.BuyNumber || 1)
-      setCashBack(cashBack + backSum)
-      //实际价
-      let PriceSum = (item.standardPrice / 100) * (item.BuyNumber || 1)
-      setRealPrice(realPrice + PriceSum)
-
-    })
+  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,
+        });
+      },
+    });
   }
 
-
-
-
-  useEffect(() => {
-
-
-    getShopPackage(shopId, { packageId: packageId }).then((res) => {
-      const itemShop = res.records
-      setShopPackage(itemShop)
-    })
-
-
-  }, [])
-
-
-
-
-
-  const shopContent = (item) => {
-    const lst = shopPackage.map((pack) => {
-      if (pack.packageId === item.packageId) {
-        return item
-      } else {
-        return pack
+  const onShowPay = (e) => {
+    if (agreement) {
+      if(payInfo){
+        requestPayment(payInfo)
+        return
       }
-    })
-
-    setShopPackage(lst)
-  }
-
-  const submit = (data) => {
-    PaysOrder(data, {
-      amount: 2,
-      itemId: id,
-      price: totalCost
-
-    }).then((res) => {
-      console.log("🚀 ~ file: index.jsx ~ line 33 ~ submit ~ res", res)
-
-      Taro.requestPayment({
-        timeStamp: '',
-        nonceStr: '',
-        package: '',
-        signType: 'MD5',
-        paySign: '',
-        success: val => {
-          console.log(val);
-        },
-        fail: err => {
-
-        }
+      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,
+      });
+    }
+  };
 
-      })
+  useEffect(() => {
+    if (packageId) {
+      getShopPackageDetail(packageId).then((res) => {
+        setList([res]);
+      });
+    }
+    if (orderId) {
+      getOrderSub({ pageNum: 1, pageSize: 999, orderId }).then((res) => {
+        setList(res.records);
+      });
+    }
+  }, [packageId, orderId]);
 
-    }).catch(err => {
-      console.log("🚀 ~ -------------支付错误------------", err)
+  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);
     });
-  }
-
-
-
-  return !person.phone ? <AuthPage /> : (
-
-    <view class='container'>
-      <CustomNav title='订单' />
-      {
-        shopPackage?.map((item, index) => <PayOrderCard onShopContent={shopContent} onShopNumber={handeList} key={(index)} item={item} />)
-      }
-
-      <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>
+    setTotalPrice(total);
+  }, [list]);
+
+  return (
+    <view class="container">
+      <CustomNav title="订单" />
+      <Popup show={showDialog} maskClosable={false}>
+        <OrderMolded item={detail}/>
+        <view className="item-center-Number">
+          <view
+            className="buy-num-minus"
+            disabled={DisabledBool}
+            onClick={NumberCut}
+          >
+            -
           </view>
-          <view className='Card-user'>
-            <Radio onClick={handelButton} style='padding-left:20px; position: relative; top:24px;' value='我已阅读知晓并同意' >我已阅读知晓并同意 <text style='color:#274190;text-decoration:underline;font-weight:400' onClick={goRules} >《平台用户服务协议》</text></Radio>
+          <Input
+            className="buy-num-input"
+            type="number"
+            min="1"
+            onInput={onInput}
+            value={BuyNumber}
+          />
+          <view className="buy-num-add" onClick={NumberAdd}>
+            +
           </view>
         </view>
-        <view className='button-box-button-box'>
-          <view className='button-text-image' >
-            <text className='button-text-money-hot'>返现￥{cashBack}</text>
-            <image className='button-image' src={ProCard_hot}></image>
-            <view className='button-text-money'>门店市面价：{realPrice / 100}元</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
+                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>
-          <Button onClick={submit} disabled={buttonDisabled} className='button-box-one'>￥{totalCost}元 <text className='button-text-one'>支付订单</text> </Button>
         </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>
       </view>
     </view>
-
-
-  )
-
-})
-
+  );
+});

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 { 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'
@@ -20,7 +20,6 @@ import Taro from '@tarojs/taro'
 import Extend from '../components/Extend/extend'
 import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
-import { useRef } from 'react';
 
 export default withLayout((props) => {
   const { router, person } = props

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/payOrder.js

@@ -1,13 +1,33 @@
 //支付订单模块
 import request from '@/utils/request'
 //套餐订单列表用哪个接口
+//订单详情，订单修改数量
 
-export const getMineOrder = () => request('/orderSub/summary/mine',)
+  /**
+ * 生成订单
+ * @param {*} data 
+ * @returns 
+ */
+   export const saveOrder = (data) => request('/order', { method: 'post', data })
 
+   /**
+ * 获取子订单列表
+ * @param {*} data
+ * @returns 
+ */
+ export const getOrderSub = (data) => request('/orderSub', { data })
 
+   /**
+ * 订单项目发起支付
+ * @param {*} id 
+ * @returns 
+ */
+    export const payOrder = (id) => request(`/order/${id}/pay`, { method: 'post' })
 
-export const PaysOrder = (data) => request('/order', { data, method: 'post' })
-
-
-
-//订单详情，订单修改数量
+   /**
+ * 获取子订单列表
+ * @param {*} id
+ * @returns 
+ */
+    export const getQrcode = (id) => request(`/qrcode/${id}`)
+    

src/utils/formatTime.js

@@ -0,0 +1,16 @@
+export default function formatTimes(date, fmt) {
+  var date = new Date(date);
+  var o = {
+    "M+": date.getMonth() + 1, //月份
+    "d+": date.getDate(), //日
+    "h+": date.getHours(), //小时
+    "m+": date.getMinutes(), //分
+    "s+": date.getSeconds(), //秒
+    "q+": Math.floor((date.getMonth() + 3) / 3), //季度
+    "S": date.getMilliseconds() //毫秒
+  };
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+  for (var k in o)
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+  return fmt;
+};