flx

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/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

@@ -7,6 +7,7 @@ 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'
@@ -25,12 +26,20 @@ import './shopKeeper.less'
 
 
 export default (props) => {
-  const { shopList, shop, onHotelChange, shopMoney, verifiedOrder, onVarified, onVarifiedTwo, setVer } = 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)
   //小眼睛开关
@@ -73,12 +82,8 @@ export default (props) => {
     },
   ]
 
-  const [vale, setVale] = useState('')
-
-  const phoneVale = () => {
-
-  }
 
+  //给父组件传val
   const handleVarified = () => {
     onVarified()
   }
@@ -168,30 +173,51 @@ export default (props) => {
             {/* 未核销 */}
             {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)
@@ -86,6 +87,7 @@ export default withLayout((props) => {
   useEffect(() => {
     if (shopId) {
       getShopMoney(shopId, amountType).then((e) => {
+
         setShopMoney(e)
 
       })
@@ -116,7 +118,7 @@ export default withLayout((props) => {
     <view className='page-index'>
       <CustomNav title={shop?.shopName} />
       <view className='index-container'>
-        {currentTab === 0 && <ShopKeeper setVer={setVer} 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>