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

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/List/index.jsx

@@ -31,20 +31,12 @@ 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)
@@ -63,6 +55,23 @@ export default (props) => {
         onError(err)
       }
     })
+  }
+
+  const fetchRef = useRef()
+  fetchRef.current = fetchList
+
+  // 联动状态, 设置查询参数
+  useEffect(() => {
+    setPayload({
+      ...params || {},
+      pageNum: 1,
+      pageSize,
+    })
+  }, [pageSize, params])
+
+  // 请求数据
+  useEffect(() => {
+    fetchRef.current(payload)
   }, [payload])
 
   return (
@@ -71,11 +80,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>
+      <view className='botton' style={{ display: hasMore ? 'none' : '' }}>已经到底了~</view>
     </ScrollView>
   )
 }

src/components/Popup/index.jsx

@@ -3,11 +3,11 @@ import './style.less'
 
 export default (props) => {
   const { show, mask = true, onClose, maskClosable } = props
-  const onClose3=()=>{
+  const onClose3 = () => {
     console.log('3333333333333333333333')
   }
   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/ShopUnused/index.jsx

@@ -4,6 +4,8 @@ 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 { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
+
 import './style.less'
 
 
@@ -12,9 +14,11 @@ export default (props) => {
 
 
 
-  useEffect(() => {
+  // useEffect(() => {
+  //   getVerifiedOrder({ phone: '18082043755' }).then((res) => {
 
-  }, [])
+  //   })
+  // }, [])
 
   return (
     <view className='orderCard'>

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/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')
@@ -29,7 +29,7 @@ export default (props) => {
     // 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/pages/MineUserAll/Collect/index.jsx

@@ -15,7 +15,6 @@ 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'
 
 
@@ -57,12 +56,7 @@ export default withLayout((props) => {
 
 
       </view>
-      {/* {
-        collectContent.map((item, index) => {
-          return <AttractionsCollect key={(index)} item={item} />
-        })
 
-      } */}
       <view className='foot'>
         已经到底了~
       </view>

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -24,7 +24,7 @@ import './sceneryDetails.less'
 
 export default withLayout((props) => {
   const { router, person ,location } = props
-  const { id, distance, location2 } = props.router.params
+  const { id, distance, loc } = props.router.params
   const [detail, setDetail] = useState({})
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
   const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
@@ -66,7 +66,8 @@ export default withLayout((props) => {
   }
   const log = useRef('')
   const lat = useRef('')
-
+  const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10, typeId: '',targetId:id  })
+  const [nloction,setNLoction]=useState()
 
   useEffect(() => {
     getTouristDetail(id).then((res) => {
@@ -81,9 +82,13 @@ export default withLayout((props) => {
       setAllextNum(res.total)
       setNewextNum(res.records.length)
     })
-    getRecommendList({ location: location }).then((res) => {
+    getRecommendList({ location: loc }).then((res) => {
       setRecommend(res || [])
     })
+    getResourceList(queryParams).then((res)=>{
+      console.log(queryParams)
+      console.log(res)
+    })
   }, [])
   
   // 分享

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}&distance=${(item.distance / 1000).toFixed(2)}&loc=${loc}` });
     }
     else {
       Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })

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

@@ -76,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/searchResult/searchResult.jsx

@@ -79,7 +79,7 @@ export default withLayout((props) => {
           </mp-tabs>
         </view>
         <List
-          style={{ height: 'calc(100% - 160px)' }}
+          style={{ height: 'calc(100% - 90px)' }}
           request={getResourceList}
           params={queryParams}
           onDataChange={setAllList}

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

@@ -6,11 +6,15 @@ 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'
@@ -19,16 +23,23 @@ 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'
 
 
 export default (props) => {
-  const { shopList, shop, onHotelChange, shopMoney, verifiedOrder, onVarified, onVarifiedTwo } = props
+  const { shopList, shop, onHotelChange, shopMoney, isVerified, verifiedOrder, onVarified, onVarifiedTwo, setVer } = props
   const shopId = shop?.shopId
   const [activeTab, setActiveTab] = useState(0)
   const { params } = useRouter()
   const { tabJump } = params || {}
 
+  const [queryParams, setQueryParams] = useState({ isVerified: isVerified, pageNum: 1, pageSize: 10, shopId: '' })
+
+
+
+
+  // 获取资源表信息
+  const [alllist, setAllList] = useState([])
+
   const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
   //小眼睛开关
@@ -72,13 +83,36 @@ export default (props) => {
   ]
 
 
+  //给父组件传val
   const handleVarified = () => {
     onVarified()
   }
 
 
   const onSearch = (e) => {
-    console.log('eeeeeeeeeeeeeeeeee', e.detail.value);
+    const val = e.detail.value
+    if (val !== '') {
+      getVerifiedOrder({
+        phone: val,
+        pageNum: 1,
+        pageSize: 10,
+
+      }).then((res) => {
+        setVer(res)
+
+      })
+    } else {
+      getVerifiedOrder({
+        shopId: shopId,
+        pageNum: 1,
+        pageSize: 10,
+
+      }).then((res) => {
+        setVer(res)
+
+      })
+    }
+
   }
 
   const [showCutover, setShowCutover] = useState(false)
@@ -135,38 +169,55 @@ export default (props) => {
             >
             </mp-tabs>
           </view>
-          {
-            verifiedOrder.map
-
-          }
           <view>
             {/* 未核销 */}
             {activeTab === 0 &&
               <>
-                {
-                  verifiedOrder.map((item, index) => {
-
-                    return <ShopUnused key={(index)} item={item} />
-                  })
-                }
+                <List
+                  style={{ height: 'calc(100% - 145px)' }}
+                  request={getVerifiedOrder}
+                  params={queryParams}
+                  onDataChange={setAllList}
+                >
+                  {
+                    alllist.map((item, index) => {
+
+                      return <ShopUnused key={(index)} item={item} />
+                    })
+                  }
+                </List>
               </>
+
             }
             {/* 已核销 */}
             {activeTab === 1 &&
               <>
-                {
+                <List
+                  style={{ height: 'calc(100% - 145px)' }}
+                  request={getVerifiedOrder}
+                  params={queryParams}
+                  onDataChange={setAllList}
+                >
+                  {
+                    alllist.map((item, index) => {
+
+                      return <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />
+                    })
+                  }
+                </List>
+                {/* {
                   verifiedOrder.map((item, index) => {
 
                     return <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />
                   })
-                }
+                } */}
 
 
 
               </>
             }
           </view>
-          <view className='botton'>已经到底了~</view>
+          {/* <view className='botton'>已经到底了~</view> */}
         </scroll-view>
       </view>
     </view>

src/shop/components/Sparead/spreadMoney.jsx

@@ -2,7 +2,9 @@ import { useState, useEffect } 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,12 +12,13 @@ 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)
@@ -25,7 +28,11 @@ export default (props) => {
   const acc = shopMoney?.acc
   const { accountId } = acc
 
+  const reqestAPI = getList(accountId)
+
 
+  // 获取资源表信息
+  const [alllist, setAllList] = useState([])
 
 
 
@@ -92,15 +99,21 @@ export default (props) => {
             </view>
           </view>
           <view className='title'>推广收入记录</view>
-          {
+          <List
+            style={{ height: 'calc(100% - 145px)' }}
+            request={reqestAPI}
+            render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
+          >
+          </List>
+          {/* {
             shopAccount.map((item, index) => {
               return (
                 <ShopCommission key={(index)} item={item} />
 
               )
             })
-          }
-          <view className='botton'>已经到底了~</view>
+          } */}
+          {/* <view className='botton'>已经到底了~</view> */}
         </scroll-view>
       </view>
 

src/shop/pages/spread/spreadIndex.jsx

@@ -39,6 +39,7 @@ export default withLayout((props) => {
 
   useEffect(() => {
     getShopList().then((res) => {
+      console.log("🚀 ~ file: spreadIndex.jsx ~ line 42 ~ getShopList ~ res", res)
       const { shopList: list, shop: current } = res
       setShopList(list)
       setShop(current)
@@ -47,6 +48,15 @@ export default withLayout((props) => {
   }, [])
 
 
+  // 搜索核销手机号
+  const setVer = (e) => {
+    setVerifiedOrder(e.records)
+
+
+
+  }
+
+
   //未核销订单列表
   useEffect(() => {
     getVerifiedOrder({
@@ -77,6 +87,7 @@ export default withLayout((props) => {
   useEffect(() => {
     if (shopId) {
       getShopMoney(shopId, amountType).then((e) => {
+
         setShopMoney(e)
 
       })
@@ -107,7 +118,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} onHotelChange={handleHotelChange} shopMoney={shopMoney} />
         }
         {currentTab === 1 && <Sparead shopList={shopList} shop={shop} verifiedOrder={verifiedOrder} onHotelChange={handleHotelChange} shopMoney={shopMoney} />}
       </view>