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

src/components/BossCard/index.jsx

@@ -47,14 +47,14 @@ export default (props) => {
         <view class='left-complete-one'  >
           <image className='left-image-1' src={ProCard_hot}></image>
           <view className='left-viewText'>
-            返现￥{item.cashback / 100}
+            返现￥{(item.cashback / 100)?.toFixed(2)}
           </view>
           {/* 评分 */}
           <view className='card-box-star'>
             <Star star={star} />
             <text className='card-star-text' >{star}</text>
           </view>
-          <view className='title-image'  onClick={() => { goFood() }}>
+          <view className='title-image' onClick={() => { goFood() }}>
             <image className='image-1' mode='scaleToFill' src={item.poster}></image>
             <image className='image-2' src={food}></image>
           </view>
@@ -62,7 +62,7 @@ export default (props) => {
             <view className='Pro-title' onClick={() => { goFood() }} >
               <view className='title-text'>{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</view>
             </view>
-            <text className='title-money' >￥{item.actualPrice / 100}元<text className='title-money-2'>门市价{item.standardPrice / 100}元</text></text>
+            <text className='title-money' >￥{(item.actualPrice / 100)?.toFixed(2)}元<text className='title-money-2'>门市价{(item.standardPrice / 100)?.toFixed(2)}元</text></text>
             <view className='title-position-on'>
               <image className='title-position' src={position} />
               <text className='title-position-image'>{city.areaPName}/{city.areaName}</text>

src/components/CollectList/AttractionsCollect/index.jsx

@@ -1,47 +0,0 @@
-import Taro from "@tarojs/taro";
-import { useState } from "react";
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
-import SeeDetails from '@/assets/icons/GuideCheck/SeeDetails.png'
-
-import Attractions from '@/assets/icons/GuideCheck/Attractions.png'
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-import position from '@/assets/icons/GuideCheck/position_logo.png'
-
-import starOn from '@/assets/icons/housemantj/onlove.png'
-import starOff from '@/assets/icons/housemantj/景点爆赞.png'
-import './style.less'
-
-
-export default (props) => {
-
-  return (
-    <view class='wrapper'>
-      <view class='left-complete-one' style='padding-top: 20px;'>
-        <view className='title-image'>
-          <image className='image-1' mode='scaleToFill' src={image}></image>
-          <image className='image-2' src={Attractions}></image>
-        </view>
-        <view className='title-content'>
-          <view className='Pro-title'>
-            <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
-          </view>
-          <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-          <view className='title-position-on'>
-            <image className='title-position' src={position} />
-            <text className='title-position-image'>南京市/秦淮区</text>
-            <image className='title-on' src={starOn} />
-          </view>
-        </view>
-      </view>
-      <view class='right-complete-two'>
-        <view className='right-content'>
-          <image className='right-image' src={SeeDetails} />
-          <view className='right-title'>查看详情</view>
-        </view>
-      </view>
-    </view>
-  )
-}
-

src/components/CollectList/AttractionsCollect/style.less

@@ -1,228 +0,0 @@
-@whiteColor: #fff;
-
-.wrapper-tourist {
-  margin-top: 40px;
-  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));
-  .card-box-star {
-    position: absolute;
-    width: auto;
-    height: 44.3px;
-    position: absolute;
-    left: 200px;
-    top: 28px;
-    font-size: 20px;
-    color: @whiteColor;
-    .card-star-image {
-      padding-left: 6px;
-      width: 21px;
-      height: 21px;
-    }
-    .card-star-text {
-      padding-left: 10px;
-      font-size: 20px;
-      color: #333;
-      font-weight: 700;
-    }
-  }
-
-  .left-complete-one {
-    padding-top: 85px;
-    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: 20px;
-      color: @whiteColor;
-    }
-    //图片
-    .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;
-      }
-      .title-position-on {
-        display: flex;
-        font-size: 20px;
-        .title-position {
-          width: 18px;
-          height: 24px;
-          padding-right: 10px;
-          padding-top: 5px;
-        }
-        .title-position-image {
-          align-items: center;
-          font-size: 20px;
-          color: #333;
-        }
-        .title-on {
-          // margin-bottom: 10px;
-          padding-top: 5px;
-          padding-left: 40px;
-          width: 21px;
-          height: 21px;
-          padding-right: 10px;
-        }
-        .title-on-text {
-          align-items: center;
-
-          font-size: 20px;
-          color: #333;
-        }
-      }
-    }
-  }
-  // .left-complete-one:nth-child(2) {
-  //   background: rgb(182, 0, 0);
-  //   padding-top: 10px;
-  // }
-}
-
-.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: 120px;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    // border: 1px solid red;
-
-    .right-number {
-      // width: 32px;
-      // font-size: 20px;
-      // border-radius: 4px;
-      // border: 2px solid #999;
-      // margin: auto;
-      // text-align: center;
-    }
-    .right-image {
-      // float: convert();
-      width: 35px;
-      height: 34px;
-      margin: 0 auto;
-      align-items: center;
-      margin: auto;
-      padding-left: 8px;
-      // text-align: center;
-    }
-
-    .right-title {
-      font-weight: 700;
-      font-size: 24px;
-      padding-top: 15px;
-      text-align: center;
-    }
-  }
-}
-//线条
-.right-complete-two::after {
-  content: "";
-  position: absolute;
-  top: 15px;
-  margin: 26px auto;
-  height: 70%;
-  border-left: 1px dashed #595959;
-}

src/components/CollectList/FoodCollect/index.jsx → src/components/CollectList/MyCollect/index.jsx

@@ -5,7 +5,7 @@ import useLike from "@/utils/hooks/useLike"
 import { getShopDetail, getShopcity } from '@/services/home'
 import { useState, useEffect } from 'react'
 import { View } from '@tarojs/components'
-
+import formatPrice from "@/utils/formatPrice";
 import Star from '@/components/Star/Star.jsx'
 import position from '@/assets/icons/GuideCheck/position_logo.png'
 import SeeDetails from '@/assets/icons/GuideCheck/SeeDetails.png'
@@ -19,45 +19,14 @@ import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 
 
 
-
 import './style.less'
 
 export default (props) => {
   const { item, cardNavigateTo } = props
-  const shopId = props.item
-  const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.targetId)
-  const [isLike, toggleLike] = useLike(item.isLike, 'shop', item.targetId)
+  // const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.targetId)
+  const [isLike, toggleLike] = useLike(item.isLike, 'tourist', item.targetId)
 
-  const [city, setCity] = useState({})
-  const [detail, setDetail] = useState({})
-  const [hotStyle, setHotStyle] = useState('none')
   const targetType = item.targetType
-  // item.targetType !== 'shop_package'
-
-
-  const goFood = () => {
-    // Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
-  }
-
-  // useEffect(() => {
-  //   if (shopId) {
-  //     getShopDetail(item.shopId).then((res) => {
-  //       setDetail(res)
-  //       getShopcity(res.cityId).then((x) => {
-  //         setCity(x)
-  //       })
-  //     })
-  //   }
-
-  // }, [shopId, targetType])
-
-  // useEffect(() => {
-  //   if (item.targetType !== 'shop_package') {
-  //     console.log(item.targetType);
-  //   }
-
-  // }, [item.targetType])
-
 
 
   const star = parseFloat(((item.sweetScore + item.environmentScore + item.serviceScore) / 3).toFixed(1));
@@ -69,22 +38,22 @@ export default (props) => {
             <view class='left-complete-one'   >
               <image className='left-image-1' src={ProCard_hot} style={{ display: item.targetType === 'shop_package' ? '' : 'none' }} ></image>
               <view className='left-viewText'  >
-                返现￥{item.cashback / 100}
+                返现￥{formatPrice(item.cashback)}
               </view>
               {/* 评分 */}
               <view className='card-box-star' style={{ display: item.targetType === 'shop_package' ? '' : 'none' }} >
                 <Star star={star} />
                 <text className='card-star-text' >{star}</text>
               </view>
-              <view className='title-image' onClick={() => { goFood() }}>
+              <view className='title-image' >
                 <image className='image-1' mode='scaleToFill' src={item.poster}></image>
                 <image className='image-2' src={item.targetType === 'tourist' ? Attractions : food}></image>
               </view>
               <view className='title-content'>
-                <view className='Pro-title' onClick={() => { goFood() }} >
+                <view className='Pro-title'  >
                   <view className='title-text'>{(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}</view>
                 </view>
-                <text className='title-money' >￥{item.actualPrice / 100}元<text className='title-money-2'>门市价{item.standardPrice / 100}元</text></text>
+                <text className='title-money' >￥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standardPrice)}元</text></text>
                 <view className='title-position-on'>
                   <image className='title-position' src={position} />
                   <text className='title-position-image'>{item.areaPName}/{item.areaName}</text>
@@ -92,7 +61,7 @@ export default (props) => {
               </view>
             </view>
             <view class='right-complete-two'>
-              <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}` }); }}>
+              <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }); }}>
                 {/* <view className='right-number'>×1</view> */}
                 <image className='right-image' src={SeeDetails} />
                 <view className='right-title'>查看详情</view>
@@ -106,30 +75,27 @@ export default (props) => {
           targetType !== "shop_package" && (
             <view class='wrapper-tourist'>
               <view class='left-complete-one'   >
-                <view className='title-image' onClick={() => { goFood() }}>
+                <view className='title-image'>
                   <image className='image-1' mode='scaleToFill' src={item.poster}></image>
                   <image className='image-2' src={item.targetType === 'tourist' ? Attractions : food}></image>
                 </view>
                 <view className='title-content'>
-                  <view className='Pro-title' onClick={() => { goFood() }} >
+                  <view className='Pro-title'  >
                     <view className='title-text'>{(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}</view>
                   </view>
-                  <text className='title-money' >￥{item.actualPrice / 100}元<text className='title-money-2'>门市价{item.standardPrice / 100}元</text></text>
-                  <view onClick={toggleSave}>
-                    <image className='title-on' src={isLike > 0 ? baozan : weibaozan} />
-                    <text onClick={toggleLike} className='title-on-text'>{isLike > 0 ? '已爆赞' : '爆赞'}</text>
+                  <text className='title-money' >￥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standardPrice)}元</text></text>
+                  <view onClick={toggleLike}>
+                    <image className='title-on' src={isLike === 1 ? baozan : weibaozan} />
+                    <text className='title-on-text'>{isLike === 1 ? '已爆赞' : '爆赞'}</text>
                   </view>
                   <view className='title-position-on'>
-
                     <image className='title-position' src={position} />
-
                     <text className='title-position-image'>{item.areaPName}/{item.areaName}</text>
-
                   </view>
                 </view>
               </view>
               <view class='right-complete-two'>
-                <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}` }); }}>
+                <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` }); }}>
                   {/* <view className='right-number'>×1</view> */}
                   <image className='right-image' src={SeeDetails} />
                   <view className='right-title'>查看详情</view>

src/components/CompoentsOrder/complete/index.jsx

@@ -5,6 +5,7 @@ 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 refund from "@/assets/icons/GuideCheck/refund.png";
 
 import Evaluation from "@/assets/icons/UserCenter/Evaluation.png";
 import Null from "@/assets/icons/UserCenter/null_logo.png";
@@ -15,15 +16,16 @@ import starOn from "@/assets/icons/GuideCheck/starOn.png";
 import starOff from "@/assets/icons/GuideCheck/starOff.png";
 import AlreadyUsed from "../AlreadyUsed";
 import "./style.less";
+import { useDidShow } from "@tarojs/taro";
 
 const scoreList = new Array(5).fill(0);
 const score = "3.9";
 
 const dict = {
-  0: { status: 0 },
-  1: { status: 1 },
+  0: { status: 0,isVerified: 0  },
+  1: { status: 1,isVerified: 0 },
   2: { isVerified: 1 },
-  3: { status: 9 },
+  3: { status: 9,isVerified: 0 },
 };
 export default (props) => {
   const { type } = props;
@@ -32,8 +34,15 @@ export default (props) => {
   const [pageNum, setNumber] = useState(1);
   const [HasNextPage, setHasNextPage] = useState(true);
 
+  useDidShow(()=>{
+    setNumber(1)
+  })
+
   useEffect(() => {
-    getList();
+    if(pageNum){
+      getList();
+    }
+    
   }, [pageNum]);
 
   const pageRefresh = () => {
@@ -46,6 +55,7 @@ export default (props) => {
     getOrderSub({
       pageNum,
       pageSize: 10,
+      isVerified: '',
       ...(type !== undefined ? dict[type] : null),
     }).then((res) => {
       setList(
@@ -76,6 +86,7 @@ export default (props) => {
 
   //核销
   const onWriteOff = (item) => {
+    // 本地测试用
     // Taro.navigateTo({
     //   url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}&subOrderId=${item.subOrderId}`,
     // });
@@ -123,7 +134,7 @@ export default (props) => {
                   <view class="left-complete-one">
                     <image className="left-image-1" src={ProCard_hot}></image>
                     <view className="left-viewText">
-                      返现￥{item.cashback / 100}
+                      返现￥{(item.cashback / 100).toFixed(2)}
                     </view>
                     <view className="title-image">
                       <image
@@ -143,7 +154,7 @@ export default (props) => {
                         </view>
                       </view>
                       <text className="title-money">
-                        ￥{item.unitPrice / 100}元
+                        ￥{(item.unitPrice / 100).toFixed(2)}元
                       </text>
                       <view className="title-time">
                         有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
@@ -177,7 +188,7 @@ export default (props) => {
                   <view class="left-complete-one">
                     <image className="left-image-1" src={ProCard_hot}></image>
                     <view className="left-viewText">
-                      返现￥{item.cashback / 100}
+                      返现￥{(item.cashback / 100).toFixed(2)}
                     </view>
                     <view className="title-image">
                       <image
@@ -197,7 +208,7 @@ export default (props) => {
                         </view>
                       </view>
                       <text className="title-money">
-                        ￥{item.unitPrice / 100}元
+                        ￥{(item.unitPrice / 100).toFixed(2)}元
                       </text>
                       <view className="title-time">
                         有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
@@ -217,6 +228,52 @@ export default (props) => {
                 </view>
               </view>
             );
+          }
+           /* 已退费 */
+           if (item.status === 2 && 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).toFixed(2)}
+                    </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).toFixed(2)}元
+                      </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={refund} />
+                    </view>
+                  </view>
+                </view>
+              </view>
+            );
           }
           /* 已过期 */
           if (item.status === 9) {
@@ -227,7 +284,7 @@ export default (props) => {
                   <view class="left-complete-one">
                     <image className="left-image-1" src={ProCard_hot}></image>
                     <view className="left-viewText">
-                      返现￥{item.cashback / 100}
+                      返现￥{(item.cashback / 100).toFixed(2)}
                     </view>
                     {/* 评分 */}
                     <view className="card-box-star">
@@ -261,7 +318,7 @@ export default (props) => {
                         </view>
                       </view>
                       <text className="title-money">
-                        ￥{item.unitPrice / 100}元
+                        ￥{(item.unitPrice / 100).toFixed(2)}元
                       </text>
                       <view className="title-time">
                         有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
@@ -287,7 +344,7 @@ export default (props) => {
                   <view class="left-complete-one">
                     <image className="left-image-1" src={ProCard_hot}></image>
                     <view className="left-viewText">
-                      返现￥{item.cashback / 100}
+                      返现￥{(item.cashback / 100).toFixed(2)}
                     </view>
                     {/* 评分 */}
                     <view className="card-box-star">
@@ -322,7 +379,7 @@ export default (props) => {
                         </view>
                       </view>
                       <text className="title-money">
-                        ￥{item.unitPrice / 100}元
+                        ￥{(item.unitPrice / 100).toFixed(2)}元
                       </text>
                       <view className="title-time">
                         核销时间：{" "}

src/components/List/index.jsx

@@ -9,6 +9,7 @@ export default (props) => {
     params,
     pageSize = 10,
     onError,
+    shopId,
     onDataChange,
     ...leftProps
   } = props
@@ -17,11 +18,11 @@ export default (props) => {
   const [payload, setPayload] = useState({})
   const [list, setList] = useState([])
   const pageRef = useRef({ current: 1, pages: 0 })
+  const hasMore = pageRef.current.current < pageRef.current.pages
 
   // 滚动
   const handleScrollToLower = (e) => {
     const loading = loadingRef.current
-    const hasMore = pageRef.current.current < pageRef.current.pages
 
     if (!loading && hasMore) {
       setPayload({
@@ -31,22 +32,13 @@ export default (props) => {
     }
   }
 
-  // 联动状态, 设置查询参数
-  useEffect(() => {
-    setPayload({
-      ...params,
-      pageNum: 1,
-      pageSize,
-    })
-  }, [pageSize, params])
+  const fetchList = (queryParams) => {
+    if (!request) return;
 
-  // 请求数据
-  useEffect(() => {
     Taro.showLoading()
     loadingRef.current = true
-    request(payload).then((res) => {
+    request(queryParams).then((res) => {
       const { records, ...pageInfo } = res || {}
-
       const lst = pageInfo.current === 1 ? records || [] : list.concat(records || [])
       setList(lst)
       if (onDataChange) {
@@ -64,7 +56,24 @@ export default (props) => {
         onError(err)
       }
     })
-  }, [payload])
+  }
+
+  const fetchRef = useRef()
+  fetchRef.current = fetchList
+
+  // 联动状态, 设置查询参数
+  useEffect(() => {
+    setPayload({
+      ...params || {},
+      pageNum: 1,
+      pageSize,
+    })
+  }, [pageSize, params])
+
+  // 请求数据
+  useEffect(() => {
+    fetchRef.current(payload)
+  }, [payload, shopId])
 
   return (
     <ScrollView
@@ -72,10 +81,11 @@ export default (props) => {
       onScrollToLower={handleScrollToLower}
       {...leftProps}
     >
-      { !render
-          ? props.children
-          : list.map((item, index) => render({ item, index }))
+      {!render
+        ? props.children
+        : list.map((item, index) => render({ item, index }))
       }
+      <view className='botton' style={{ display: hasMore ? 'none' : '' }}>已经到底了~</view>
     </ScrollView>
   )
 }

src/components/OrderMolded/index.jsx

@@ -15,7 +15,7 @@ export default (props) => {
       <view class='left-complete-one'>
         <image className='left-image-1' src={ProCard_hot}></image>
         <view className='left-viewText'>
-          返现￥{item.cashback / 100}
+          返现￥{(item.cashback / 100).toFixed(2)}
         </view>
         <view className='title-image'>
           <image className='image-1' mode='scaleToFill' src={item.poster}></image>
@@ -25,7 +25,7 @@ export default (props) => {
           <view className='Pro-title'>
             <view className='title-text'>{item.description}</view>
           </view>
-          <text className='title-money' >￥{item.actualPrice / 100}元</text>
+          <text className='title-money' >￥{(item.actualPrice / 100).toFixed(2)}元</text>
           <view className='title-time' >有效期：{formatTimes(item.startTime, "yyyy/MM/dd")}-{formatTimes(item.endTime, "yyyy/MM/dd")}</view>
         </view>
       </view>

src/components/PayOrderCard/index.jsx

@@ -91,7 +91,7 @@ export default (props) => {
           <view class='left-complete-one'>
             <image className='left-image-1' src={ProCard_hot}></image>
             <view className='left-viewText'>
-              返现￥{item.cashback / 100}
+              返现￥{(item.cashback / 100).toFixed(2)}
             </view>
             <view className='title-image'>
               <image className='image-1' mode='scaleToFill' src={item.poster}></image>
@@ -101,7 +101,7 @@ export default (props) => {
               <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>
+              <text className='title-money' >￥{(item.actualPrice / 100).toFixed(2)}<text className='title-money-2'>{(item.standardPrice / 100).toFixed(2)}</text></text>
               <view className='title-time' >有效期：{formatTimes(item.startTime, "yyyy/MM/dd")}-{formatTimes(item.endTime, "yyyy/MM/dd")}</view>
             </view>
           </view>

src/components/Popup/index.jsx

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

src/components/ShopCommission/index.jsx

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

src/components/ShopUnused/index.jsx

@@ -1,9 +1,8 @@
 import Taro from '@tarojs/taro'
 import { useState, useEffect } from 'react'
 import formatTimes from '@/utils/formatTime'
-import iconsearch from '@/assets/icons/housemantj/search.png'
-import ms from '@/assets/icons/housemantj/ms3.jpg'
-import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
+
+
 import './style.less'
 
 
@@ -26,7 +25,7 @@ export default (props) => {
         <image className='orderImg' src={item.poster} mode='aspectFit' />
         <view className='orderRight'>
           <view className='foodName'>{item.description}</view>
-          <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>{item.actualPrice / 100}</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
+          <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>{(item.actualPrice / 100).toFixed(2)}</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
           <view>已下单：等待客户上门就餐</view>
         </view>
         <view className='line' />

src/components/ShopUsed/index.jsx

@@ -29,15 +29,13 @@ export default (props) => {
   }
 
 
-  useEffect(() => {
 
-  }, [])
 
   return (
     <View className='orderCard'>
       <View style={{ overflow: 'hidden' }}>
         <View className='orderId'>订单编号：{item.orderId}</View>
-        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss')}</View>
+        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss') || ''}</View>
       </View>
       <View className='order'>
         <Image className='orderImg' src={item.poster} mode='aspectFit' />
@@ -47,7 +45,10 @@ export default (props) => {
         </View>
         <View className='line' />
         <View className='phone'>客户手机：<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
-          <button className='Button-OK' onClick={confirmOrder} style={{ display: buttonStyle }}  >确认核销</button> </View>
+          {
+            !item.isConfirmVerified && <button className='Button-OK' onClick={confirmOrder} style={{ display: buttonStyle }}  >确认核销</button>
+          }
+        </View>
       </View>
     </View>
   )

src/components/Star/Star.jsx

@@ -2,15 +2,20 @@
 import hongxin from '@/assets/icons/housemantj/已收藏.png'
 import baixin from '@/assets/icons/housemantj/收藏.png'
 import './Star.less'
+
+const Star = (props) => <image className='star' src={props.star >= props.index ? hongxin : baixin}></image>
+
+const starList = (new Array(5)).fill()
+
 export default (props) => {
   const {star}=props
+
+
   return (
     <>
-      <image className='star' src={star >= 1 ? hongxin : baixin}></image>
-      <image className='star' src={star >= 2 ? hongxin : baixin}></image>
-      <image className='star' src={star >= 3 ? hongxin : baixin}></image>
-      <image className='star' src={star >= 4 ? hongxin : baixin}></image>
-      <image className='star' src={star >= 5 ? hongxin : baixin}></image>
+    {
+      starList.map((_, index) => <Star key={index} star={star} index={index + 1} />)
+    }
     </>
   )
 }

src/components/foodCards/foodCards.jsx

@@ -51,7 +51,7 @@ export default (props) => {
     <view className='foodCard'>
       <view className='fCleft'>
         <view className='backMoney'>
-          返现￥{item.cashback / 100}
+          返现￥{(item.cashback / 100).toFixed(2)}
         </view>
         <view className='appraise'>
           <Star star={star} />
@@ -66,8 +66,8 @@ export default (props) => {
             <view className='textword'  onClick={() => { goFood() }} >{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</view>
             <view className='jiage' onClick={() => { goFood() }} >
               <text className='rmb' >￥&nbsp;&nbsp;</text>
-              <text className='p1'><text className='price' >{item.actualPrice / 100}</text>元&nbsp;&nbsp;</text>
-              <text className='p2'>门市价<text className='oldprice' >{item.standardPrice / 100}</text>元</text>
+              <text className='p1'><text className='price' >{(item.actualPrice / 100).toFixed(2)}</text>元&nbsp;&nbsp;</text>
+              <text className='p2'>门市价<text className='oldprice' >{(item.standardPrice / 100).toFixed(2)}</text>元</text>
             </view>
             <view className='address'>
               <image className='dw' src={wz} />

src/components/toggleRole/ToggleRole.jsx

@@ -13,7 +13,7 @@ import { useModel } from '@/store'
 
 
 export default (props) => {
-  const { showCutover, onClose, role } = props
+  const { showCutover, onClose, maskClosable, role } = props
   const { getRole } = useModel('person')
   const goToPerson = () => {
     getRole('normal')
@@ -25,11 +25,8 @@ export default (props) => {
   const goToShop = () => {
     getRole('shop')
   }
-  const onClose2 = () => {
-    // console.log('2222222222222222222')
-  }
   return (
-    <Popup show={showCutover} onClose={onClose2}>
+    <Popup show={showCutover} maskClosable={maskClosable} onClose={onClose}>
       <view className='User-box-sths' >
         <view className='User-box-selectUser'>请选择身份：</view>
         <view className='User-box-tourist' onClick={goToPerson}>

src/hotel/components/HouseManage/houseManage.jsx

@@ -37,11 +37,13 @@ export default React.forwardRef((props, ref) => {
             getRoomList({ hotelId: hotel.hotelId }).then((res) => {
               setDetail(res.records || [])
             })
-          })       
-        } 
+          })
+        }
       }
     })
-   
+  }
+  const handelDetail = (val) => {
+    Taro.navigateTo({ url: `/hotel/pages/landlord/addRoom/addRoom?hotelId=${hotel.hotelId}&hotelName=${hotel.hotelName}&roomId=${val.roomId}` });
   }
 
   const [showCutover, setShowCutover] = useState(false)
@@ -54,6 +56,9 @@ export default React.forwardRef((props, ref) => {
   const onClose = () => {
     setShowCutover(false)
   }
+  const onClose2 = () => {
+    setShowCard(false)
+  }
   useEffect(() => {
     //首次加载页面时
     if (!mounted.current && hotel.hotelId) {
@@ -95,29 +100,29 @@ export default React.forwardRef((props, ref) => {
     Taro.navigateTo({ url: `/hotel/pages/landlord/roomOrder/roomOrder?roomId=${val.roomId}&roomName=${val.roomName}` });
   }
 
-  const onSearch=(e)=>{
-    if(e.detail.value==''){
+  const onSearch = (e) => {
+    if (e.detail.value == '') {
       getRoomList({ hotelId: hotel.hotelId }).then((res) => {
         setDetail(res.records || [])
       })
     }
-    else{
-      getRoomList({ hotelId: hotel.hotelId,roomName:e.detail.value }).then((res) => {
-      setDetail(res.records || [])
-    })
-    }    
+    else {
+      getRoomList({ hotelId: hotel.hotelId, roomName: e.detail.value }).then((res) => {
+        setDetail(res.records || [])
+      })
+    }
   }
   return (
     <view>
       <view style={{ padding: '0 30rpx', height: '100%' }}>
-        <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch}/>
+        <SearchBar placeholder='请输入房源名搜索' onBlur={onSearch} />
         <ShareRoom showCutover={showCutover} onClose={onClose} room={room} onFinish={handleFinish} />
-        <ShareCard showCutover={showCard} onClose={onClose} />
+        <ShareCard showCutover={showCard} onClose={onClose2} />
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 244px)' }}>
           {
-            detail?.map((item) =>
+            (detail || []).map((item) =>
               <view className='houseCard'>
-                <view className='houseName'>{item.roomName}</view>
+                <view className='houseName' onClick={() => { handelDetail(item) }} >{item.roomName || ''}</view>
                 <view className='operation'>
                   <view onClick={() => handelOrder(item)}><image src={see} />查看入住人</view>
                   <view onClick={() => ShowMoldeOn(item)}><image src={share} />分享链接</view>

src/hotel/components/Income/income.jsx

@@ -1,5 +1,4 @@
 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'
@@ -7,11 +6,22 @@ import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 import Picker from '@/components/Picker'
 import formatTime from "@/utils/formatTime";
+import {getAccountLogList} from '@/services/landlord'
+
+import List from '@/components/List';
+import './income.less'
+
 
 
 export default (props) => {
   const { hotelList, hotel, account, onHotelChange, accountlog } = props
 
+  // const [accountLog,setAccountLog]=useState(accountlog)
+
+
+  // const [queryParams, setQueryParams] = useState({pageNum: 1, pageSize: 10})
+  // setQueryParams(hotel.hotelId)
+
   const handleHotelChange = (hotelId, current) => {
     onHotelChange(current)
   }
@@ -29,50 +39,72 @@ export default (props) => {
     setShowCutover(true)
   }
   const onClose = () => {
-    console.log('11111111')
     setShowCutover(false)
   }
   return (
     <view>
-      <ToggleRole role='hotel' showCutover={showCutover} onClose={onClose} />
+      <ToggleRole role='hotel' showCutover={showCutover} maskClosable={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'>店名：<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='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 className='storexx'>
+          <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='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 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 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 className='title' >{accountlog.length!=''?'推广收入记录':'暂无推广收入'}</view>
-            {
-              accountlog?.map((item) => 
-                <view className='spreadCard'>
-                  <view className='card'>
-                    <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate,'yyyy/MM/dd hh:mm:ss')}</text></view>
-                    <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount/100).toFixed(2))}</text>元</view>
-                    <image className='spreadImg' src={sImg} />
-                  </view>
+        </view>
+
+        <view className='title' >{accountlog.length != '' ? '推广收入记录' : '暂无推广收入'}</view>
+        
+        {/* <List
+                  style={{ height: '50vh' }}
+                  request={getAccountLogList}
+                  params={queryParams}
+                  onDataChange={setAccountLog}
+                >
+                  {
+                    (accountLog || []).map((item) =>
+                    <view className='spreadCard'>
+                      <view className='card'>
+                        <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
+                        <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
+                        <image className='spreadImg' src={sImg} />
+                      </view>
+                    </view>
+                    )
+                  }
+          </List> */}
+        
+        
+        
+        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: '50vh' }}>
+
+          {
+            (accountlog || []).map((item) =>
+              <view className='spreadCard'>
+                <view className='card'>
+                  <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
+                  <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
+                  <image className='spreadImg' src={sImg} />
                 </view>
+              </view>
             )
           }
-          {accountlog.length != '' ? <view className='botton'>已经到底了~</view> : ''}
+        <view className='botton' >已经到底了~</view>
         </scroll-view>
       </view>
     </view>

src/hotel/components/shareRoom/ShareRoom.jsx

@@ -30,8 +30,35 @@ export default (props) => {
   }
   return (
     <Popup show={showCutover} onClose={onClose}>
-      <View className='from-room'>
-      <mp-form  >
+      <View className='from-room srl'>
+        <View style={{marginBottom:'25px'}}>
+          <View className='rzline' /><Label className='srl mg'>请输入入住人信息</Label><View className='rzline' />
+        </View>
+        <View className='srleft'>
+          <Label>入住人数：</Label>
+          <Input onInput={(e) => setRoomNum(e.detail.value)} value={roomNum} type='number' placeholder='请输入入住人数' />
+        </View>
+        <View className='srleft'>
+          <Label >入住开始时间：</Label>
+          <Picker className='picker' mode='date' onChange={handelStartDate}>
+            {startDate == '' ? '请选择入住开始时间' : startDate}
+          </Picker>
+        </View>
+        <View className='srleft'>
+          <Label>入住结束时间：</Label>
+          <Picker className='picker' mode='date' onChange={handelEndDate}>
+            {endDate == '' ? '请选择入住结束时间' : endDate}
+          </Picker>
+        </View>
+        <View>
+          <Button className='cancel' onClick={onClose}>取消</Button>
+          <Button className='btn' onClick={handelShare}>分享</Button>
+        </View>
+
+
+
+
+        {/* <mp-form  >
         <Label style={{color:'black'}}>请输入入住人信息</Label>
         <mp-cells    footer='  ' >
           <mp-cell title='入住人数：' extClass='font'>
@@ -49,10 +76,9 @@ export default (props) => {
           </mp-cell>
           <mp-cell>
             <Button className='cancel' onClick={onClose}>取消</Button><Button className='btn' onClick={handelShare}>分享</Button>
-            {/* <button className='button-OK' onClick={sumbit}>确定</button> */}
           </mp-cell>
         </mp-cells>
-      </mp-form>
+      </mp-form> */}
       </View>
 
 

src/hotel/components/shareRoom/ShareRoom.less

@@ -1,28 +1,59 @@
 .from-room{
-  padding-top: 30px;
-  .font{
-    font-size: 28px;
-    color: #202020;
+  padding-top: 60px;
+}
+.srl{
+  font-size: 30px;
+  font-weight: bold;
+  color: #202020;  
+  .mg{
+    font-size: 38px;
+    margin: 0 20px 50px 20px;
+  }
+  .rzline{
+    border-top: 2px #999 dashed;
+    height: 2px;
+    width: 80px;
+    display: inline-block;
+    margin-bottom: 8px;
   }
+  .srleft{
+    text-align: left;
+    Input{
+      height: 92px;
+      font-size: 28px;
+      color: #999;
+      background: #FEFEFE;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.08);
+      margin-bottom: 40px;
+    }
+    .picker{
+      font-size: 28px;
+      color: #999;
+      line-height: 92px;
+      height: 92px;
+      background: #FEFEFE;
+      margin-bottom: 40px;
+      box-shadow: 0px 1px 0px 0px rgba(0, 0, 0, 0.08);
+    }
+  }  
   .cancel{
-    width: 150px;
-    height: 70px;
+    color: #274290;
     display: inline-block;
-    line-height: 70px;
+    margin: 20px 20px 0 0;
+    width: 236px;
+    height: 78px;
+    border: 2px solid #274190;
     border-radius: 12px;
-    font-size: 36px;
-    margin-right: 20px;
   }
   .btn {
-    width: 150px;
-    height: 70px;
-    background: #1A3B83;
-    display: inline-block;
-    line-height: 70px;
+    width: 236px;
+    height: 78px;
+    background: #274291;
     border-radius: 12px;
-    font-size: 36px;
+    display: inline-block;
     color: #fff;
   }
 }
+
   
   

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

@@ -3,11 +3,11 @@ import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import { useEffect, useState } from "react"
 import './addRoom.less'
-import { saveRoom, getHotelDetail } from '@/services/landlord'
+import { saveRoom, getRoomDetail, updateRoom } from '@/services/landlord'
 
 
 export default withLayout((props) => {
-  const { hotelId, hotelName } = props.router.params
+  const { hotelId, hotelName, roomId } = props.router.params
   const [roomModel, setRoomModel] = useState({
     hotelId,
     roomName: '',
@@ -32,58 +32,68 @@ export default withLayout((props) => {
     })
   }
   const sumbit = () => {
-    if(
-    roomModel.roomName!=''&&
-    roomModel.address!=''&&
-    roomModel.location!=''&&
-    roomModel.weight!=''
-    )
-     { 
-      saveRoom(roomModel).then(() => {       
-          Taro.showModal({
-            title: '保存成功',
-            showCancel:false
-          }).then(() => {
-            Taro.navigateBack()
-          })
-      })       
-     } else{
-       Taro.showToast({
+    if (
+      roomModel.roomName != '' &&
+      roomModel.address != '' &&
+      roomModel.location != '' &&
+      roomModel.weight != ''
+    ) {
+      const seveices = roomId ? updateRoom : saveRoom
+      seveices(roomModel, roomId).then(() => {
+        Taro.showModal({
+          title: roomId ? '修改成功' : '保存成功',
+          showCancel: false
+        }).then(() => {
+          Taro.navigateBack()
+        })
+      })
+    } else {
+      Taro.showToast({
         title: '有必填项未填哦',
         icon: 'none',
       })
-     }
-      
+    }
   }
+
+  useEffect(() => {
+    if (roomId) {
+      getRoomDetail(roomId).then((res) => {
+        setRoomModel(res)
+      })
+    }
+  }, [])
+
+
+
   return (
     <view className='page-index'>
       <CustomNav title={hotelName} />
       <view className='from-room'  >
         <mp-form models={roomModel} >
           <mp-cells title='请填写新增的房源信息' footer='  ' >
-            <mp-cell prop='roomName' title='房屋名称：' extClass='font'>
-              <input focus dataField='roomName' onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName}  placeholder='请输入房屋名称（必填）' />
+            <mp-cell title='房屋名称：' extClass='font'>
+              <input onInput={(e) => setRoomModel({ ...roomModel, roomName: e.detail.value })} value={roomModel.roomName} placeholder='请输入房屋名称（必填）' />
             </mp-cell>
-            <mp-cell prop='address' title='位置信息：' extClass='font'>
-              <input dataField='address' onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address}  placeholder='请输入房屋位置（必填）' />
+            <mp-cell title='位置信息：' extClass='font'>
+              <input onInput={(e) => setRoomModel({ ...roomModel, address: e.detail.value })} value={roomModel.address} placeholder='请输入房屋位置（必填）' />
             </mp-cell>
-            <mp-cell prop='location' title='定位经纬度：' extClass='font'>
+            <mp-cell title='定位经纬度：' extClass='font'>
               <label onClick={onRoomMap}>{roomModel.location == '' ? '房间定位（必填）' : roomModel.location}</label>
             </mp-cell>
-            <mp-cell prop='parkingAddress' title='停车场位置：' extClass='font'>
-              <input dataField='parkingAddress' onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress}  placeholder='请输入停车场位置' />
+            <mp-cell title='停车场位置：' extClass='font'>
+              <input onInput={(e) => setRoomModel({ ...roomModel, parkingAddress: e.detail.value })} value={roomModel.parkingAddress} placeholder='请输入停车场位置' />
             </mp-cell>
-            <mp-cell prop='parkingLocation' title='定位经纬度：' extClass='font'>
+            <mp-cell title='定位经纬度：' extClass='font'>
               <label onClick={onParkMap}>{roomModel.parkingLocation == '' ? '停车场定位' : roomModel.parkingLocation}</label>
             </mp-cell>
-            <mp-cell prop='wifiName' title='Wi-Fi名称：' extClass='font'>
-              <input dataField='wifiName' onInput={(e) => setRoomModel({ ...roomModel, wifiName: e.detail.value })} value={roomModel.wifiName}  placeholder='请输入wifi名称' />
+            <mp-cell title='Wi-Fi名称：' extClass='font'>
+              <input onInput={(e) => setRoomModel({ ...roomModel, wifiName: e.detail.value })} value={roomModel.wifiName} placeholder='请输入wifi名称' />
             </mp-cell>
-            <mp-cell prop='wifiPassword' title='Wi-Fi密码：' extClass='font'>
-              <input dataField='wifiPassword' onInput={(e) => setRoomModel({ ...roomModel, wifiPassword: e.detail.value })} value={roomModel.wifiPassword}  placeholder='请输入wifi密码' />
+            <mp-cell title='Wi-Fi密码：' extClass='font'>
+              <input onInput={(e) => setRoomModel({ ...roomModel, wifiPassword: e.detail.value })} value={roomModel.wifiPassword} placeholder='请输入wifi密码' />
             </mp-cell>
-            <mp-cell prop='weight' title='权重：' extClass='font'>
-              <input type='number' dataField='weight'  onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重（必填）' />
+            <mp-cell title='权重：' extClass='font'>
+              <input type='number' value={roomModel.weight} onInput={(e) => setRoomModel({ ...roomModel, weight: e.detail.value })} placeholder='请输入权重（必填）' />
             </mp-cell>
             <mp-cell>
               <button className='button-OK' onClick={sumbit}>确定</button>

src/hotel/pages/landlord/landlord.jsx

@@ -10,7 +10,6 @@ import onhouseImg from '@/assets/icons/landlord/房源管理按下.png'
 import withLayout from '@/layouts'
 import { getHotelManage, getAccountLogList, getNowHotelManage } from '@/services/landlord'
 import CustomNav from '@/components/CustomNav'
-
 import './landlord.less'
 
 export default withLayout((props) => {
@@ -20,7 +19,7 @@ export default withLayout((props) => {
 
   const [hotelList, setHotelList] = useState([])
   const [hotel, setHotel] = useState()
-  const [account, setAccount] = useState()
+  const [account, setAccount] = useState({})
   const [accountlog, setAccountLog] = useState([])
 
   const houseRef = useRef()

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

@@ -49,10 +49,10 @@ export default withLayout((props) => {
 
         {
           detail.length==0?<View className='houseCard'>暂无入住人数据</View>
-           :detail?.map((item) =>
+           :detail.map((item) =>
             <View className='houseCard'>
               {
-                item.personList?.map((item2) =>
+                (item.personList||[]).map((item2) =>
                   <View className='operation'>
                     <View style={{display:'inline-block'}} onClick={()=>CopyName(item2.customerName)}>
                       <Label>{item2.customerName}</Label>

src/pages/MineUserAll/Collect/index.jsx

@@ -2,32 +2,14 @@
 import CustomNav from '@/components/CustomNav'
 import { useState, useEffect } from "react";
 import withLayout from '@/layouts'
-
-import Taro from '@tarojs/taro'
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
-import SeeDetails from '@/assets/icons/GuideCheck/SeeDetails.png'
 import { getCollectList } from '@/services/home'
-
-import Attractions from '@/assets/icons/GuideCheck/Attractions.png'
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-import position from '@/assets/icons/GuideCheck/position_logo.png'
-import starOn from '@/assets/icons/GuideCheck/starOn.png'
-import starOff from '@/assets/icons/GuideCheck/starOff.png'
-import AttractionsCollect from '@/components/CollectList/AttractionsCollect'
-import FoodCollect from '@/components/CollectList/FoodCollect'
-
-
+import MyCollect from '@/components/CollectList/MyCollect'
 import './style.less'
 
-
 export default withLayout((props) => {
   const { router, person, location } = props
-  console.log("🚀 ~ file: index.jsx ~ line 27 ~ withLayout ~ props", props)
   const [collectContent, setCollectContent] = useState([])
-
-
+  console.log("🚀 ~ file: index.jsx ~ line 12 ~ withLayout ~ collectContent", collectContent)
 
   useEffect(() => {
     getCollectList({
@@ -40,29 +22,14 @@ export default withLayout((props) => {
     })
   }, [location])
 
-
-
-
   return (
     <view className='box-content'>
       <CustomNav title='我的收藏' />
-
       <view>
         {
-          collectContent.map((item, index) => {
-            return <FoodCollect key={(index)} item={item} />
-          })
-
+          collectContent.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
         }
-
-
       </view>
-      {/* {
-        collectContent.map((item, index) => {
-          return <AttractionsCollect key={(index)} item={item} />
-        })
-
-      } */}
       <view className='foot'>
         已经到底了~
       </view>

src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx

@@ -1,6 +1,7 @@
 import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
 import Taro from "@tarojs/taro";
 import { Button, Icon, Text, Textarea } from "@tarojs/components";
+import formatPrice from "@/utils/formatPrice";
 
 import { useState, useEffect } from "react";
 import withLayout from "@/layouts";
@@ -86,7 +87,7 @@ export default withLayout((props) => {
   const onRefund = () => {
     // console.log(explain, checkeds, "----onRefund----");
     refund(id, {
-      refundDecription: checkeds?.map(x=>options.filter(y=>y.key==x)[0]?.title).join(';'),
+      refundDecription: checkeds?.map(x => options.filter(y => y.key == x)[0]?.title).join(';'),
       refundReason: explain,
     }).then((res) => {
       Taro.showToast({
@@ -94,7 +95,7 @@ export default withLayout((props) => {
         icon: "none",
         duration: 2000,
       });
-      Taro.navigateBack({delta: 1})
+      Taro.navigateBack({ delta: 1 })
     });
   };
 
@@ -127,13 +128,13 @@ export default withLayout((props) => {
       </view>
       {/* 商品信息结束 */}
       <view>
-        {list?.map((item) => {
+        {(list || []).map((item) => {
           return (
             <view class="wrapper" key={item.orderId}>
               <view class="left-complete-one">
                 <image className="left-image-1" src={ProCard_hot}></image>
                 <view className="left-viewText">
-                  返现￥{item.cashback / 100}
+                  返现￥{formatPrice(item.cashback)}
                 </view>
                 <view className="title-image">
                   <image
@@ -153,9 +154,9 @@ export default withLayout((props) => {
                     </view>
                   </view>
                   <text className="title-money">
-                    ￥{item.unitPrice / 100}元
+                    ￥{formatPrice(item.unitPrice)}元
                     <text className="title-money-2">
-                      门市价{item.standardPrice / 100}元
+                      门市价{formatPrice(item.standardPrice)}元
                     </text>
                   </text>
                   <view className="title-time">
@@ -188,11 +189,10 @@ export default withLayout((props) => {
         {options.map((x) => {
           return (
             <text
-              className={`Refund-star-view${x.key} ${
-                checkeds.indexOf(x.key) > -1
+              className={`Refund-star-view${x.key} ${checkeds.indexOf(x.key) > -1
                   ? "bg2"
                   : `Refund-star-view${x.key}`
-              }`}
+                }`}
               key={x.key}
               onClick={() => viewOK(x)}
             >
@@ -221,15 +221,15 @@ export default withLayout((props) => {
       </view>
       <view className="money-title">
         实付金额:{" "}
-        <text className="money-name">{totalPrice.charges / 100}元</text>
+        <text className="money-name">{formatPrice(totalPrice.charges)}元</text>
       </view>
       <view className="money-title">
         已获返现:{" "}
-        <text className="money-name">{totalPrice.cashback / 100}元</text>
+        <text className="money-name">{formatPrice(totalPrice.cashback)}元</text>
       </view>
       <view className="money-title">
         退款金额:{" "}
-        <text className="money-name">{totalPrice.refundPrice / 100}元</text>
+        <text className="money-name">{formatPrice(totalPrice.refundPrice)}元</text>
       </view>
       <view className="ul-li-text">
         <view className="ul-li-view"></view>

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -86,7 +86,7 @@ export default withLayout((props) => {
         onscrolltolower={pageLoadMore}
       >
         <view>
-          {list?.map((item) => {
+          {(list||[]).map((item) => {
             return (
               <view class="wrapper" key={item.orderId}>
                 <view class="left-complete-one">
@@ -98,7 +98,7 @@ export default withLayout((props) => {
                   {/* 评分 */}
                   <view className="card-box-star">
                     {scoreList.map((_, index) => {
-                      const src = index + 1 < item.score ? starOn : starOff;
+                      const src = index + 1 <= item.score ? starOn : starOff;
                       return (
                         <image
                           className="card-star-image"

src/pages/PayOrder/index.jsx

@@ -12,6 +12,7 @@ import Taro, { useDidShow } from "@tarojs/taro";
 import { getPackageDetail } from "@/services/home";
 import { saveOrder, getOrderSub, payOrder } from "@/services/payOrder";
 import formatTime from "@/utils/formatTime";
+import formatPrice from "@/utils/formatPrice";
 
 export default withLayout((props) => {
   const { router, person } = props;
@@ -116,7 +117,7 @@ export default withLayout((props) => {
         ).then((res) => {
           setPayInfo(res);
           requestPayment(res);
-        }).catch(()=>{
+        }).catch(() => {
           Taro.hideLoading()
           Taro.showToast({
             title: "支付失败",
@@ -129,7 +130,7 @@ export default withLayout((props) => {
         payOrder(orderId).then((res) => {
           setPayInfo(res);
           requestPayment(res);
-        }).catch(()=>{
+        }).catch(() => {
           Taro.hideLoading()
           Taro.showToast({
             title: "支付失败",
@@ -216,13 +217,13 @@ export default withLayout((props) => {
         </view>
       </Popup>
       <view class="coupon-list">
-        {list?.map((item) => {
+        {(list || []).map((item) => {
           return (
-            <view class="wrapper">
+            <view class="wrapper" key={item.orderId}>
               <view class="left-complete-one">
                 <image className="left-image-1" src={ProCard_hot}></image>
                 <view className="left-viewText">
-                  返现￥{(item.cashback || 0) / 100}
+                  返现￥{formatPrice(item.cashback)}
                 </view>
                 <view className="title-image">
                   <image
@@ -237,9 +238,9 @@ export default withLayout((props) => {
                     <view className="title-text">{item.description}</view>
                   </view>
                   <text className="title-money">
-                    ￥{(item.actualPrice || item.unitPrice || 0) / 100}元
+                    ￥{formatPrice(item.actualPrice || item.unitPrice)}元
                     <text className="title-money-2">
-                      门市价{(item.standardPrice || 0) / 100}元
+                      门市价{formatPrice(item.standardPrice)}元
                     </text>
                   </text>
                   <view className="title-time">
@@ -290,17 +291,17 @@ export default withLayout((props) => {
         <view className="button-box-button-box">
           <view className="button-text-image">
             <text className="button-text-money-hot">
-              返现￥{(totalPrice?.cashback || 0) / 100}
+              返现￥{formatPrice(totalPrice?.cashback || 0)}
             </text>
             <image className="button-image" src={ProCard_hot}>
               123123
             </image>
             <view className="button-text-money">
-              门店市面价：{(totalPrice?.standardPrice || 0) / 100}元
+              门店市面价：{formatPrice(totalPrice?.standardPrice || 0)}元
             </view>
           </view>
           <Button className="button-box-one" onClick={() => onShowPay()}>
-            ￥{(totalPrice?.actualPrice || 0) / 100}元
+            ￥{formatPrice(totalPrice?.actualPrice || 0)}元
             <text className="button-text-one">支付订单</text>
           </Button>
         </view>

src/pages/TobeShop/index.jsx

@@ -1,8 +1,11 @@
+import Taro from "@tarojs/taro";
+import { useState, useEffect } from "react";
 import withLayout from "@/layouts";
-
 import CustomNav from "@/components/CustomNav";
+import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
 import Popup from "@/components/Popup";
-import { useState, useEffect } from "react";
+import formatPrice from "@/utils/formatPrice";
+
 import LocationBig from "@/assets/icons/UserCenter/LocationBig.png";
 import Perfection from "@/assets/icons/UserCenter/Perfection.png";
 import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
@@ -14,21 +17,31 @@ import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
 import { Button, Icon, Text, Textarea } from "@tarojs/components";
 import { getVerifyTargetList, putVerifyTarget } from "@/services/payOrder";
 import formatTime from '@/utils/formatTime'
+
 import "./style.less";
-import Taro from "@tarojs/taro";
 
 export default withLayout((props) => {
   const { router, person } = props;
+  console.log("🚀 ~ file: index.jsx ~ line 22 ~ withLayout ~ props", props)
   const { id, subOrderId } = props.router.params;
   const [showDialog, setShowDialog] = useState(false);
   //核销
   const [Consumption, setConsumption] = useState(false);
 
   const [checked, setChecked] = useState();
+  const [shopContent, setShopContent] = useState([])
 
+  const [list, setList] = useState([]);
+
+
+  const getShop = () => {
+    getShopDetail(id).then(e => {
+      setShopContent(e)
+
+    })
+  }
 
 
-  const [list, setList] = useState([]);
 
   const getList = (params) => {
     getVerifyTargetList({
@@ -51,6 +64,7 @@ export default withLayout((props) => {
 
   useEffect(() => {
     getList();
+    getShop();
   }, []);
 
   const ShowMoldeOn = () => {
@@ -123,7 +137,7 @@ export default withLayout((props) => {
         <view className="position-header">
           <image className="position-LocationBig" src={LocationBig} />
           <text cla="position-LocationBig-text">
-            当前所在店铺：SEOUL·创意韩国料理
+            当前所在店铺：{shopContent?.shopName || []}
           </text>
         </view>
         <view className="shop-image">
@@ -135,7 +149,7 @@ export default withLayout((props) => {
           <text className="shop-title-title">请选择你要核销的套餐</text>
         </view>
         <view>
-          {list?.map((item) => {
+          {(list || []).map((item) => {
 
             return (
               <view class="wrapper" key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
@@ -144,7 +158,7 @@ export default withLayout((props) => {
                     <image className="Check_OK-image" src={item.verifyNo == checked ? Check_OK : Check_NO} />
                   </view>
                   <image className="left-image-1" src={ProCard_hot}></image>
-                  <view className="left-viewText">返现￥16.00</view>
+                  <view className="left-viewText">返现￥{item.cashback}</view>
                   <view className="title-image">
                     <image
                       className="image-1"
@@ -161,7 +175,7 @@ export default withLayout((props) => {
                       </view>
                     </view>
                     <text className="title-money">
-                      ￥{item.actualPrice / 100}元<text className="title-money-2">门市价{item.standPrice / 100}元</text>
+                      ￥{formatPrice(item.actualPrice)}元<text className="title-money-2">门市价{formatPrice(item.standPrice)}元</text>
                     </text>
                     <view className="title-time">
                       有效期：{formatTime(item?.createDate, "yyyy/MM/dd")}-

src/pages/TobeShop/style.less

@@ -89,7 +89,6 @@
       position: absolute;
       width: auto;
       height: 44.3px;
-      position: absolute;
       left: 200px;
       top: 28px;
       font-size: 20px;
@@ -109,6 +108,7 @@
 
     .left-complete-one {
       // padding-left: 64px;
+      width: 560px;
       padding-top: 87px;
       padding-bottom: 43px;
       position: relative;
@@ -141,7 +141,7 @@
         width: 145px;
         height: 44px;
         position: absolute;
-        margin-left: 75px;
+        margin-left: 88px;
         top: 22px;
       }
       .left-viewText {
@@ -162,6 +162,7 @@
         border-radius: 24px;
         overflow: hidden;
         position: relative;
+        flex: none;
         .image-1 {
           width: 100%;
           height: 145px;
@@ -260,7 +261,7 @@
     background-repeat: no-repeat;
     width: 129px;
     border-radius: 0 15px 15px 0;
-    position: relative;
+    // position: relative;
     //右面部分
     .right-content {
       // width: 100px;

src/pages/details/foodDetails/foodDetails.jsx

@@ -1,82 +1,105 @@
-import CustomNav from '@/components/CustomNav'
-import withLayout from '@/layouts'
-import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
-import { useState, useEffect, useRef } from 'react'
-import { Button, Swiper, SwiperItem } from '@tarojs/components';
-import Star from '@/components/Star/Star.jsx'
-import Cards from '@/components/foodCards/foodCards.jsx'
-import ax from '@/assets/icons/housemantj/onlove.png'
-import yysj from '@/assets/icons/housemantj/营业时间.png'
-import dw from '@/assets/icons/housemantj/地址.png'
-import zhuandao from '@/assets/icons/housemantj/backTop.png'
-import titlezs from '@/assets/icons/housemantj/标题装饰.png'
-import showMore from '@/assets/icons/housemantj/查看更多.png'
-import share from '@/assets/icons/housemantj/景点分享.png'
-import good from '@/assets/icons/housemantj/景点爆赞.png'
-import baozan from '@/assets/icons/housemantj/爆赞.png'
-import weibaozan from '@/assets/icons/housemantj/未赞.png'
-import Taro,{ useShareAppMessage } from '@tarojs/taro'
-import useSave from "@/utils/hooks/useSave"
-import useLike from "@/utils/hooks/useLike"
-import Extend from '../components/Extend/extend'
-import './foodDetails.less'
+import CustomNav from "@/components/CustomNav";
+import withLayout from "@/layouts";
+import {
+  getShopDetail,
+  getShopPackage,
+  getExtendContent,
+} from "@/services/home";
+import { getVerifyTargetList } from "@/services/payOrder";
+import { useState, useEffect, useRef } from "react";
+import { Button, Swiper, SwiperItem } from "@tarojs/components";
+import Star from "@/components/Star/Star.jsx";
+import Cards from "@/components/foodCards/foodCards.jsx";
+import ax from "@/assets/icons/housemantj/onlove.png";
+import yysj from "@/assets/icons/housemantj/营业时间.png";
+import dw from "@/assets/icons/housemantj/地址.png";
+import zhuandao from "@/assets/icons/housemantj/backTop.png";
+import titlezs from "@/assets/icons/housemantj/标题装饰.png";
+import showMore from "@/assets/icons/housemantj/查看更多.png";
+import share from "@/assets/icons/housemantj/景点分享.png";
+import good from "@/assets/icons/housemantj/景点爆赞.png";
+import baozan from "@/assets/icons/housemantj/爆赞.png";
+import weibaozan from "@/assets/icons/housemantj/未赞.png";
+import Taro, { useShareAppMessage } from "@tarojs/taro";
+import useSave from "@/utils/hooks/useSave";
+import useLike from "@/utils/hooks/useLike";
+import Extend from "../components/Extend/extend";
+import "./foodDetails.less";
 
 export default withLayout((props) => {
-  const { router, person } = props
-  const { id, subOrderId } = props.router.params
+  const { router, person } = props;
+  const { id, subOrderId, scene } = props.router.params;
   // console.log(id,subOrderId,'--333-----')
   useEffect(() => {
-    console.log(id, subOrderId, '-------')
+    console.log(id, subOrderId, "-------");
     if (id && subOrderId) {
       Taro.navigateTo({
         url: `/pages/TobeShop/index?id=${id}&subOrderId=${subOrderId}`,
       });
     }
-  }, [id, subOrderId])
+  }, [id, subOrderId]);
+
+  useEffect(() => {
+
+    if (id && scene) {
+      getVerifyTargetList({
+        shopId: id,
+        isMine: true,
+        isVerified: 0,
+      }).then((res) => {
+        if(res?.records?.length>0){
+          Taro.navigateTo({
+            url: `/pages/TobeShop/index?id=${id}`,
+          });
+        }
+       
+      });
+    }
+  }, [id, scene]);
+  
   //商铺基础信息
-  const [detail, setDetail] = useState({})
-  console.log("🚀 ~ file: foodDetails.jsx ~ line 38 ~ withLayout ~ setDetail", setDetail)
+  const [detail, setDetail] = useState({});
   //商铺套餐
-  const [spackage, setPackage] = useState([])
+  const [spackage, setPackage] = useState([]);
   //banner图集数组
-  const [imglist, setimglist] = useState([])
-  const [index, setIndex] = useState(0)
+  const [imglist, setimglist] = useState([]);
+  const [index, setIndex] = useState(0);
   const handchange = (e) => {
-    setIndex(e.detail.current)
-  }
+    setIndex(e.detail.current);
+  };
 
-  const [isSaved, toggleSave] = useSave(detail.isSaved, 'shop', id)
-  const [isLike, toggleLike] = useLike(detail.isLike, 'shop', id)
+  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 [page, setpage] = useState(2);
   const pgMore = () => {
-    setpage(page + 1)
+    setpage(page + 1);
     getShopPackage(id, { pageNum: page }).then((res) => {
-      setPackage([...spackage, ...res.records])
-      setNewpgNum(newpgNum + res.records.length)
-    })
-  }
+      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 [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)
-    })
-  }
+    setepage(epage + 1);
+    getExtendContent("shop", id, { pageNum: epage }).then((res) => {
+      setExtend([...extend, ...res.records]);
+      setNewextNum(newextNum + res.records.length);
+    });
+  };
   const openMap = () => {
     Taro.openLocation({
       longitude: log.current - 0,
@@ -84,134 +107,191 @@ export default withLayout((props) => {
       name: detail.shopName,
       address: detail.address,
       scale: 12,
-    })
-  }
-  const log = useRef('')
-  const lat = useRef('')
+    });
+  };
+  const log = useRef("");
+  const lat = useRef("");
 
   useEffect(() => {
     getShopDetail(id).then((res) => {
-      setDetail(res)
-      log.current = (res.locaton).toString().split(',')[0]
-      lat.current = (res.locaton).toString().split(',')[1]
-      setimglist(res.imageList || [])
-    })
+      setDetail(res);
+      log.current = res.locaton.toString().split(",")[0];
+      lat.current = res.locaton.toString().split(",")[1];
+      setimglist(res.imageList || []);
+    });
     getShopPackage(id).then((res) => {
-      setPackage(res.records || [])
-      setNewpgNum(res.records.length)
-      setAllpgNum(res.total)
-    })
-    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));
-  
+      setPackage(res.records || []);
+      setNewpgNum(res.records.length);
+      setAllpgNum(res.total);
+    });
+    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)
+  );
+
   // 分享
-  useShareAppMessage(()=>{
-      return {
-        title: detail.shopName,
-        path: `/pages/details/foodDetails/foodDetails?id=${id}`,
-        imageUrl: detail.poster,
-      }
-    
-  })
+  useShareAppMessage(() => {
+    return {
+      title: detail.shopName,
+      path: `/pages/details/foodDetails/foodDetails?id=${id}`,
+      imageUrl: detail.poster,
+    };
+  });
 
   return (
-    <view className='page-index'>
-      <view className='index-navbar'>
-        <CustomNav title='十公里' />
+    <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'
+              className=".swiper"
               circular
               current={index}
               onChange={handchange}
             >
-              {
-                imglist.map((item) =>
-                  <SwiperItem>
-                    <image src={item.url} className='storeImage' >
-                      <view className='tpPage'>
-                        <text>{index + 1}/{imglist.length}</text>
-                      </view>
-                    </image>
-                  </SwiperItem>
-                )
-              }
+              {imglist.map((item) => (
+                <SwiperItem>
+                  <image src={item.url} className="storeImage">
+                    <view className="tpPage">
+                      <text>
+                        {index + 1}/{imglist.length}
+                      </text>
+                    </view>
+                  </image>
+                </SwiperItem>
+              ))}
             </Swiper>
-            <view className='storeJs'>
-              <view style={{ overflow: 'hidden' }}>
-                <view className='storeName'>{detail.shopName}</view>
-                <view className='sprice'>
-                  <text className='t1'>￥</text>
+            <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={baozan} style={{ width: '15px', height: '15px', marginRight: '11rpx', marginBottom: '-2px' }} />
-                    爆赞{detail.likeNum}</view>
+                  <view className="bzRight">
+                    <image
+                      src={baozan}
+                      style={{
+                        width: "15px",
+                        height: "15px",
+                        marginRight: "11rpx",
+                        marginBottom: "-2px",
+                      }}
+                    />
+                    爆赞{detail.likeNum}
+                  </view>
                 </view>
               </view>
-              <view className='appraise'>
-                <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>
-                  <text className='t1'>服务：{detail.serviceScore}</text>
+              <view className="appraise">
+                <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>
+                  <text className="t1">服务：{detail.serviceScore}</text>
                 </view>
               </view>
-              <view className='yysj'>
-                <image src={yysj} className='yysjImg' />营业时间：{detail.businessHours}
+              <view className="yysj">
+                <image src={yysj} className="yysjImg" />
+                营业时间：{detail.businessHours}
               </view>
-              <view className='dpPosition' onClick={openMap}>
-                <image src={dw} className='dwTip' />
+              <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 className='title'>
-              <image src={titlezs} /><text>返现套餐</text>
+          <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}>
+            {(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' />
+              <image src={showMore} className="moreTip" />
             </view>
           </view>
-          <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
-            <view className='title'>
+          <view
+            style={{
+              position: "relative",
+              display: extend == "" ? "none" : "",
+            }}
+          >
+            <view className="title">
               <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' />
+              <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'>
-        <Button openType='share' className='sharebtn'>分享</Button>
-        <view className='tab'>
-          <image className='share' src={share} />分享
+      <view className="bottomTab">
+        <Button openType="share" className="sharebtn">
+          分享
+        </Button>
+        <view className="tab">
+          <image className="share" src={share} />
+          分享
         </view>
-        <view className='tab' onClick={toggleLike}>
-          <image className='good' src={isLike > 0 ? baozan : weibaozan} />{isLike > 0 ? '已爆赞' : '爆赞'}
+        <view className="tab" onClick={toggleLike}>
+          <image className="good" src={isLike > 0 ? baozan : weibaozan} />
+          {isLike > 0 ? "已爆赞" : "爆赞"}
         </view>
-        <view className='tab' onClick={toggleSave}>
-          <image className='collection' src={isSaved > 0 ? ax : good} />{isSaved > 0 ? '已收藏' : '加入收藏'}
+        <view className="tab" onClick={toggleSave}>
+          <image className="collection" src={isSaved > 0 ? ax : good} />
+          {isSaved > 0 ? "已收藏" : "加入收藏"}
         </view>
       </view>
     </view>
-  )
-})
+  );
+});

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -16,19 +16,20 @@ import useSave from "@/utils/hooks/useSave"
 import useLike from "@/utils/hooks/useLike"
 import Cards from '@/components/foodCards/foodCards.jsx'
 import Taro,{ useShareAppMessage } from '@tarojs/taro'
-import { getResourceList } from '@/services/home'
+import { getTouristDistance } from '@/services/home'
 import Extend from '../components/Extend/extend'
 import './sceneryDetails.less'
 
 
 
 export default withLayout((props) => {
-  const { router, person } = props
-  const { id, distance, location } = props.router.params
+  const { router, person ,location } = props
+  const { id} = props.router.params
   const [detail, setDetail] = useState({})
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
   const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
-
+  const [distance,setDistance]=useState()
+  const [tslocation,setTsLocation]=useState('')
   //banner图集数组
   const [imglist, setimglist] = useState([])
   const [index, setIndex] = useState(0)
@@ -66,8 +67,6 @@ export default withLayout((props) => {
   }
   const log = useRef('')
   const lat = useRef('')
-
-
   useEffect(() => {
     getTouristDetail(id).then((res) => {
       log.current = (res.locaton).toString().split(',')[0]
@@ -81,11 +80,14 @@ export default withLayout((props) => {
       setAllextNum(res.total)
       setNewextNum(res.records.length)
     })
-    getRecommendList({ location: location }).then((res) => {
+    getTouristDistance('tourist',id,{location:location}).then((res)=>{
+      setDistance((res.distance / 1000).toFixed(2))
+      setTsLocation(res.lng + ',' + res.lat)
+    })    
+    getRecommendList({ location: tslocation }).then((res) => {
       setRecommend(res || [])
     })
-  }, [])
-  
+  }, []) 
   // 分享
   useShareAppMessage(()=>{
     return {
@@ -148,7 +150,7 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={titlejd} />景点介绍
             </view>
-            {extend?.map((item) => <Extend item={item} />)}
+            {(extend||[]).map((item) => <Extend item={item} />)}
             <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
               <view>点击查看更多</view>
               <image src={showMore} className='moreTip' />
@@ -158,7 +160,7 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={titlems} />老板推荐好吃的
             </view>
-            {recommend?.map((item) => <Cards item={item} />)}
+            {(recommend||[]).map((item) => <Cards item={item} />)}
           </view>
           <view className='bottom'>已经到底了~</view>
         </scroll-view>

src/pages/index/components/Card.js

@@ -16,7 +16,7 @@ export default (props) => {
   const Detail = () => {
     if (item.targetType == 'tourist') {
       let loc = item.lng + ',' + item.lat
-      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}&distance=${(item.distance / 1000).toFixed(2)}&location=${loc}` });
+      Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` });
     }
     else {
       Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })

src/pages/index/tabs/Guide.jsx

@@ -245,7 +245,7 @@ export default (props) => {
                   <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
                   <text className='title-title-boss' >更多指引</text>
                 </view>
-                {extend?.map((item, index) => <MoreGuide key={(index)} item={item} />)}
+                {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
 
                 <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
                   <view>点击查看更多</view>
@@ -261,7 +261,7 @@ export default (props) => {
             <text className='title-title-boss' >老板推荐好吃的</text>
           </view>
         </view>
-        {spackage?.map((item, index) => <BossCard cardNavigateTo={cardNavigateTo} key={(index)} item={item} />)}
+        {(spackage || []).map((item, index) => <BossCard cardNavigateTo={cardNavigateTo} key={(index)} item={item} />)}
         {/* 卡片------------- */}
         {/* <view className='Guide-Content-box-two'>
           <view className='title-image-two'>

src/pages/index/tabs/Mine.jsx

@@ -31,7 +31,6 @@ export default (props) => {
   const hasAvatar = !!person.avatar
   const [orderNum, setOrderNum] = useState([])
 
-  console.log('--------DefaultImage-----', DefaultImage)
 
   const ShowMoldeOn = () => {
     setShowCutover(true)
@@ -46,7 +45,6 @@ export default (props) => {
   }, [])
 
 
-
   // 通过getUserProfile获取微信用户信息
   const handleGetUserProfile = () => {
     if (hasAvatar) return;
@@ -115,7 +113,7 @@ export default (props) => {
 
       <view className='User-box'>
         {/* 身份切换 */}
-        <ToggleRole showCutover={showCutover} onClose={onClose} role='normal' />
+        <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='normal' />
         <view className='User-info'>
           <view className='User-photos-box'>
             <image src={person.avatar || DefaultImage} className='User-photos' />
@@ -135,12 +133,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'>{orderNum?.unPayNum}笔订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.unPayNum || '0'}笔订单</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'>{orderNum?.unVerifiedNum}个订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.unVerifiedNum || '0'}个订单</view>
             </view>
             <view className='buy-list-Paybox ' onClick={handleAllOrder} >
               <image className='buy-list-PayLogo' src={AllOrder} />
@@ -150,7 +148,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'>{orderNum?.refundNum}笔订单</view>
+              <view className='buy-list-OrderNumber'>{orderNum?.refundNum || '0'}笔订单</view>
             </view>
           </view>
           <view className='Badge-box'>

src/pages/index/tabs/Recommend.jsx

@@ -34,13 +34,14 @@ export default (props) => {
       setQueryParams({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
   }
-
   useEffect(() => {
     //查询分类标签表
     getIndexType({ pageSize: 20 }).then((res) => {
       setTypeList(res.records || [])
-    })    
+    })
   }, [])
+
+
   const onSearch = () => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });
@@ -75,7 +76,7 @@ export default (props) => {
       </view>
 
       <List
-        style={{ height: 'calc(100% - 160px)' }}
+        style={{ height: 'calc(100% - 145px)' }}
         request={getResourceList}
         params={queryParams}
         onDataChange={setAllList}

src/pages/search/search.jsx

@@ -35,7 +35,7 @@ export default withLayout((props) => {
                 <view className='hotSearch'>热门搜索</view>
                 <view className='hotSearchtip'>
                     {
-                        hotList?.map((item) => <view onClick={()=>hotSearch(item.word)}>{item.word}</view>)
+                        (hotList||[]).map((item) => <view onClick={()=>hotSearch(item.word)}>{item.word}</view>)
                     }
                 </view>
             </view>

src/pages/searchResult/searchResult.jsx

@@ -4,19 +4,20 @@ import iconsearch from '../../assets/icons/housemantj/search.png'
 import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
 import Card from '../index/components/Card'
-import {getResourceList } from '@/services/home'
+import { getResourceList } from '@/services/home'
+import List from '@/components/List';
 import './searchResult.less'
 import withLayout from '@/layouts'
 
 
 
 export default withLayout((props) => {
-  const { router, person,location } = props
-  const { q} = props.router.params
+  const { router, person, location } = props
+  const { q } = props.router.params
 
   // 横向tab
   const [activeTab, setActiveTab] = useState(0)
-  const [queryParams, setQueryParams] = useState({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
+  const [queryParams, setQueryParams] = useState({ q: q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
 
   // 获取资源表信息
   const [alllist, setAllList] = useState([])
@@ -35,13 +36,13 @@ export default withLayout((props) => {
     const { index } = e.detail
     setActiveTab(index)
     if (index == 0) {
-      setQueryParams({q:q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
+      setQueryParams({ q: q, location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
-    else if(index==1){
-      setQueryParams({q:q,targetType:'shop', location: location, pageNum: 1, pageSize: 10, typeId: '' })      
+    else if (index == 1) {
+      setQueryParams({ q: q, targetType: 'shop', location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
-    else{
-      setQueryParams({q:q,targetType:'tourist', location: location, pageNum: 1, pageSize: 10, typeId: '' })
+    else {
+      setQueryParams({ q: q, targetType: 'tourist', location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
   }
 
@@ -52,11 +53,6 @@ export default withLayout((props) => {
     Taro.navigateTo({ url: '/pages/search/search' });
   }
 
-  useEffect(() => {
-    getResourceList(queryParams).then((res) => {
-      setAllList(res.records || [])
-    })
-  }, [queryParams])
 
 
 
@@ -82,15 +78,18 @@ export default withLayout((props) => {
           >
           </mp-tabs>
         </view>
-
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{height:'100vh'}} >
-          <view className="waterfall">
+        <List
+          style={{ height: 'calc(100% - 90px)' }}
+          request={getResourceList}
+          params={queryParams}
+          onDataChange={setAllList}
+        >
+          <view className='waterfall'>
             {
-              alllist?.map((item) => <Card key={item.resourceNo} item={item} />)
+              alllist.map((item) => <Card key={item.resourceNo} item={item} />)
             }
           </view>
-          <view className='botton'>已经到底了~</view>
-        </scroll-view>
+        </List>
       </view>
     </view>
   )

src/services/home.js

@@ -103,6 +103,13 @@ export const getExtendContent = (type, id, params) => request(`/${type}/${id}/co
  */
 export const getTouristDetail = (id) => request(`/tourist/${id}`)
 
+/**
+ * 获取景点距离定位 用于通过景点分享功能进入景点详情页的客户
+ * @param {*} id 
+ * @returns 
+ */
+ export const getTouristDistance = (targetType,targetId,params) => request(`/resource/${targetType}/${targetId}`,{params})
+
 /**
  * 获取推荐套餐列表
  * @returns 

src/services/landlord.js

@@ -6,14 +6,22 @@ import request from '@/utils/request'
  * @param {*} id 
  * @returns 
  */
- export const getHotelDetail = (id) => request(`/taHotel/${id}`)
- 
+export const getHotelDetail = (id) => request(`/taHotel/${id}`)
+
 /**
  * 查询指定名宿的账户
  * @param {*} params 
  * @returns 
  */
- export const getNowHotelManage = (id,params) => request(`/hotel/manage/${id}`, { params })
+export const getNowHotelManage = (id, params) => request(`/hotel/manage/${id}`, { params })
+
+
+/**
+* 查询指定商铺的账户
+* @param {*} params 
+* @returns 
+*/
+export const getNowShopManage = (id, params) => request(`/shop/manage/${id}`, { params })
 
 
 /**
@@ -21,35 +29,49 @@ import request from '@/utils/request'
  * @param {*} params 
  * @returns 
  */
- export const getHotelManage = (params) => request('/hotel/manage/index', { params })
+export const getHotelManage = (params) => request('/hotel/manage/index', { params })
 
 /**
  * 查询指定名宿的账户流水
  * @param {*} params 
  * @returns 
  */
- export const getAccountLogList = (id) => request(`/hotel/account/${id}/log`)
+export const getAccountLogList = (id) => request(`/hotel/account/${id}/log`)
 
 /**
  * 房源列表
  * @param {*} id 
  * @returns 
  */
- export const getRoomList = (params) => request('/taRoom',{params})
+export const getRoomList = (params) => request('/taRoom', { params })
 
 /**
  * 保存房源
  * @param {*} data 
  * @returns 
  */
- export const saveRoom = (data) => request('/taRoom', { method: 'post', data })
+export const saveRoom = (data) => request('/taRoom', { method: 'post', data })
 
- /**
- * 删除房源
+/**
+* 删除房源
+* @param {*} data 
+* @returns 
+*/
+export const deleteRoom = (id) => request(`/taRoom/${id}`, { method: 'delete' })
+
+/**
+* 房源详情
+* @param {*} id 
+* @returns 
+*/
+export const getRoomDetail = (id) => request(`/taRoom/${id}`)
+
+/**
+ * 更新房源
  * @param {*} data 
  * @returns 
  */
-  export const deleteRoom = (id) => request(`/taRoom/${id}`, { method: 'delete'})
+export const updateRoom = (data, id) => request(`/taRoom/${id}`, { method: 'put', data })
 
 
 /**
@@ -57,10 +79,10 @@ import request from '@/utils/request'
  * @param {*} data 
  * @returns 
  */
- export const shareRoom = (data) => request('/roomOrder', { method: 'post', data })
- /**
- * 查看历史入住人列表
- * @param {*} id 
- * @returns 
- */
-  export const getRoomOrderList = (params) => request('/roomOrder',{params})
+export const shareRoom = (data) => request('/roomOrder', { method: 'post', data })
+/**
+* 查看历史入住人列表
+* @param {*} id 
+* @returns 
+*/
+export const getRoomOrderList = (params) => request('/roomOrder', { params })

src/services/shopBoss.js

@@ -23,7 +23,7 @@ export const getShopMoney = (id, amountType) => request(`/shop/${id}/account?amo
  * @param {*} 
  * @returns 
  */
-export const getAccount = (id,) => request(`/shop/account/${id}/log`, { id })
+export const getAccount = (id, params) => request(`/shop/account/${id}/log`, { params })
 
 
 /**

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -1,4 +1,4 @@
-import { React, useState, useEffect, } from 'react'
+import { React, useState, useEffect, useRef } from 'react'
 import Taro, { useRouter } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import Picker from '@/components/Picker'
@@ -6,29 +6,40 @@ import Popup from '@/components/Popup'
 import ShopUsed from '@/components/ShopUsed' //已核销
 import ShopUnused from '@/components/ShopUnused' //未核销
 import SearchBar from '@/components/SearchBar'
+import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
+import List from '@/components/List';
 
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import ms from '@/assets/icons/housemantj/ms3.jpg'
+import ToggleRole from '@/components/toggleRole/ToggleRole'
+
 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 './shopKeeper.less'
-import ToggleRole from '@/components/toggleRole/ToggleRole'
+import { useMemo } from 'react'
 
 
 export default (props) => {
-  const { shopList, shop, onHotelChange, shopMoney, verifiedOrder, onVarified, onVarifiedTwo } = props
-  const shopId = shop?.shopId
-  const [activeTab, setActiveTab] = useState(0)
+  const { shopList, shop, onHotelChange, shopMoney, verifiedOrder, isVerified, onVarified, onVarifiedTwo, setVer } = props
   const { params } = useRouter()
   const { tabJump } = params || {}
 
+  const [activeTab, setActiveTab] = useState(0)
+  const [phone, setPhone] = useState()
+  // const [isVerified, setisVerified] = useState(0)
+  // const [queryParams, setQueryParams] = useState({ isVerified: isVerified, pageNum: 1, pageSize: 10, shopId: shop?.shopId, phone: phone })
+
+  const queryParams = useMemo(() => ({
+    shopId: shop?.shopId,
+    isVerified: `${tabJump}` === '1' ? 1 : 0,
+    phone: phone || '',
+  }), [phone, shop?.shopId, tabJump])
+
+
+  // 获取资源表信息
+  const [alllist, setAllList] = useState([])
+
   const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
   //小眼睛开关
@@ -45,6 +56,10 @@ export default (props) => {
   }
 
 
+  const handelSearch = (e) => {
+    const val = e.detail.value
+    setPhone(val)
+  }
   useEffect(() => {
     if (tabJump) {
       setActiveTab(tabJump - 0)
@@ -54,13 +69,6 @@ export default (props) => {
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
-    if (index === 1) {
-      onVarified()
-
-    } else {
-      onVarifiedTwo()
-
-    }
   }
   const tabs = [
     {
@@ -71,16 +79,12 @@ export default (props) => {
     },
   ]
 
-
+  //给父组件传val
   const handleVarified = () => {
     onVarified()
   }
 
 
-  const onSearch = (e) => {
-    console.log('eeeeeeeeeeeeeeeeee', e.detail.value);
-  }
-
   const [showCutover, setShowCutover] = useState(false)
   const ShowMoldeOn = () => {
     setShowCutover(true)
@@ -92,7 +96,7 @@ export default (props) => {
     <view>
       <view>
       </view>
-      <ToggleRole showCutover={showCutover} onClose={onClose} role='shop' />
+      <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
       <view style={{ padding: '30rpx', height: '100%' }}>
         <scroll-view scroll-y scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll' style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
@@ -121,7 +125,7 @@ export default (props) => {
           </view>
           <view className='search'>
 
-            <SearchBar placeholder='搜索订单(输入客户手机号码)' onBlur={onSearch} />
+            <SearchBar placeholder='搜索订单(输入客户手机号码)' onBlur={handelSearch} />
           </view>
           <view className='index-tabs'>
             <mp-tabs
@@ -135,38 +139,38 @@ export default (props) => {
             >
             </mp-tabs>
           </view>
-          {
-            verifiedOrder.map
-
-          }
           <view>
             {/* 未核销 */}
             {activeTab === 0 &&
               <>
-                {
-                  verifiedOrder.map((item, index) => {
-
-                    return <ShopUnused key={(index)} item={item} />
-                  })
-                }
+                <List
+                  style={{ height: '50%' }}
+                  request={getVerifiedOrder}
+                  params={queryParams}
+                  onDataChange={setAllList}
+                  render={({ item, index }) => <ShopUnused key={(index)} item={item} />}
+                >
+                </List>
               </>
+
             }
             {/* 已核销 */}
             {activeTab === 1 &&
               <>
-                {
-                  verifiedOrder.map((item, index) => {
-
-                    return <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />
-                  })
-                }
-
+                <List
+                  style={{ height: '50%' }}
 
+                  request={getVerifiedOrder}
+                  params={queryParams}
+                  onDataChange={setAllList}
+                  render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
+                >
+                </List>
 
               </>
             }
           </view>
-          <view className='botton'>已经到底了~</view>
+          {/* <view className='botton'>已经到底了~</view> */}
         </scroll-view>
       </view>
     </view>

src/shop/components/Sparead/spreadMoney.jsx

@@ -1,8 +1,10 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useMemo } from 'react'
 import Taro from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import Popup from '@/components/Popup'
+import List from '@/components/List';
 import Picker from '@/components/Picker'
+import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
 import ShopCommission from '@/components/ShopCommission'
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
@@ -10,34 +12,30 @@ import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
 import touristOFF from '@/assets/icons/UserCenter/touristOFF.png'
 import hotelBossOFF from '@/assets/icons/UserCenter/hotelBossOFF.png'
 import shopBossON from '@/assets/icons/UserCenter/shopBossON.png'
-import { getAccount } from '@/services/shopBoss'
 import ToggleRole from '@/components/toggleRole/ToggleRole'
 
 
 import './spreadMoney.less'
 
+const getList = (id) => (params) => getAccount(id, params)
+
 export default (props) => {
   const { shopList, shop, onHotelChange, shopMoney } = props
   const [showCutover, setShowCutover] = useState(false)
   const [isyear, setYear] = useState(false)
   const [isMomth, setMonth] = useState(false)
-  const [shopAccount, setShopAccount] = useState([])
   const acc = shopMoney?.acc
   const { accountId } = acc
 
+  const queryParams = useMemo(() => ({
 
+  }), [])
 
 
+  const reqestAPI = getList(shopMoney?.acc?.accountId)
 
 
-  useEffect(() => {
-    getAccount(accountId).then((e) => {
-      const accContent = e.records
-      setShopAccount(accContent)
-
-    })
 
-  }, [accountId])
 
   //小眼睛开关
   const handleYear = () => {
@@ -65,7 +63,7 @@ export default (props) => {
     <view>
       <view>
       </view>
-      <ToggleRole showCutover={showCutover} onClose={onClose} role='shop' />
+      <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
       <view style={{ padding: '30rpx', height: '100%' }}>
         <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
@@ -78,7 +76,7 @@ export default (props) => {
               <view className='sleft'>
                 <view className='lword'>全年推广收入（税前）</view>
                 <view className='yearMoney'>
-                  <text>{isyear ? shopMoney?.totalCharges / 100 : '******'}</text>元
+                  <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
                   <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
                 </view>
               </view>
@@ -86,21 +84,20 @@ export default (props) => {
               <view className='sright'>
                 <view className='rword'>当月推广收入（税前）</view>
                 <view className='monthMoney'>
-                  <text>{isMomth ? shopMoney?.currentCharges / 100 : '******'}</text>元
+                  <text>{isMomth ? (shopMoney?.currentCharges / 100).toFixed(2) : '******'}</text>元
                   <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
                 </view></view>
             </view>
           </view>
           <view className='title'>推广收入记录</view>
-          {
-            shopAccount.map((item, index) => {
-              return (
-                <ShopCommission key={(index)} item={item} />
-
-              )
-            })
-          }
-          <view className='botton'>已经到底了~</view>
+          <List
+            style={{ height: 'calc(100% - 145px)' }}
+            request={reqestAPI}
+            params={queryParams}
+
+            render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
+          >
+          </List>
         </scroll-view>
       </view>
 

src/shop/pages/spread/spreadIndex.jsx

@@ -2,14 +2,16 @@ import React, { useState, useEffect } from 'react'
 import CustomNav from '@/components/CustomNav'
 import { useRouter } from '@tarojs/taro'
 import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
-import ShopKeeper from '../../components/ShopKeeper/shopKeeper'
-import Sparead from '../../components/Sparead/spreadMoney'
+
 import TabBar from '@/components/CustTabBar'
 import shopImg from '@/assets/icons/shopKeeper/订单收入.png'
 import onShopImg from '@/assets/icons/shopKeeper/订单收入按下.png'
 import spareadImg from '@/assets/icons/shopKeeper/推广收入.png'
 import onSpareadImg from '@/assets/icons/shopKeeper/推广收入按下.png'
 import withLayout from '@/layouts'
+import ShopKeeper from '../../components/ShopKeeper/shopKeeper'
+import Sparead from '../../components/Sparead/spreadMoney'
+
 
 import './spreadIndex.less'
 
@@ -28,6 +30,7 @@ export default withLayout((props) => {
   const [isVerified, setisVerified] = useState(0)
   const [shopMoney, setShopMoney] = useState([])
   const [verifiedOrder, setVerifiedOrder] = useState([])
+
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
@@ -36,7 +39,7 @@ export default withLayout((props) => {
   const handelType = () => {
     setAmountType('commission')
   }
-
+  //商铺列表
   useEffect(() => {
     getShopList().then((res) => {
       const { shopList: list, shop: current } = res
@@ -47,22 +50,30 @@ export default withLayout((props) => {
   }, [])
 
 
+  // 搜索核销手机号
+  const setVer = (e) => {
+    setVerifiedOrder(e.records)
+
+
+
+  }
+
   //未核销订单列表
-  useEffect(() => {
-    getVerifiedOrder({
-      isVerified: isVerified,
-      pageNum: 1,
-      pageSize: 99,
-      shopId: shopId,
+  // useEffect(() => {
+  //   getVerifiedOrder({
+  //     isVerified: isVerified,
+  //     pageNum: 1,
+  //     pageSize: 99,
+  //     shopId: shopId,
 
-    }).then((res) => {
-      const order = res.records
-      setVerifiedOrder(order)
+  //   }).then((res) => {
+  //     const order = res.records
+  //     setVerifiedOrder(order)
 
-    })
+  //   })
 
 
-  }, [shopId, isVerified])
+  // }, [shopId, isVerified])
 
 
   const onVarified = () => {
@@ -82,19 +93,25 @@ export default withLayout((props) => {
       })
     }
 
-  }, [amountType, shopId])
-
+  }, [amountType, shopId, currentTab])
 
+  //店铺选择
   const handleHotelChange = (current) => {
     console.log('已选择店铺', current);
-    // getNowHotelManage(current.shopId).then((res) => {
-    //   const { account: acc } = res
-    //   setAccount(acc)
-    //   setHotel(current)
-    //   getAccountLogList(acc.accountId).then((res2) => {
-    //     setAccountLog(res2.records || [])
-    //   })
-    // })
+    getShopMoney(current.shopId, amountType).then((e) => {
+      setShop(current)
+      getVerifiedOrder({
+        isVerified: isVerified,
+        pageNum: 1,
+        pageSize: 99,
+        shopId: current.shopId,
+
+      }).then((res) => {
+        const order = res.records
+        setVerifiedOrder(order)
+
+      })
+    })
   }
 
   useEffect(() => {
@@ -107,7 +124,7 @@ export default withLayout((props) => {
     <view className='page-index'>
       <CustomNav title={shop?.shopName} />
       <view className='index-container'>
-        {currentTab === 0 && <ShopKeeper onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
+        {currentTab === 0 && <ShopKeeper isVerified={isVerified} setVer={setVer} onVarifiedTwo={onVarifiedTwo} onVarified={onVarified} verifiedOrder={verifiedOrder} shopList={shopList} shop={shop} shopId={shopId} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
         }
         {currentTab === 1 && <Sparead shopList={shopList} shop={shop} verifiedOrder={verifiedOrder} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
       </view>

src/utils/formatPrice.js

@@ -0,0 +1 @@
+export default (t) => ((t || 0) / 100).toFixed(2);