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

src/components/ShopUsed/style.less

@@ -19,7 +19,7 @@
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
     border-radius: 12px;
     padding: 20px;
-    margin: 0 5px;
+    margin: 0 3px;
     .orderTop{
       display: flex;
       .orderImg{

src/hotel/components/Income/income.jsx

@@ -1,4 +1,6 @@
 import { useState, useMemo } from 'react'
+import Taro from '@tarojs/taro'
+import { View, Image } from '@tarojs/components';
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
 import sImg from '@/assets/icons/landlord/money2.png'
@@ -28,32 +30,30 @@ export default (props) => {
     isMomth ? setMonth(false) : setMonth(true)
   }
   return (
-    <view>
-      <view style={{ padding: '30rpx', height: '100%' }}>
-        <view className='storexx'>
-          <view className='storeName'>店名：{hotel.hotelName}</view>
-          <view className='money'>
-            <view className='sleft'>
-              <view className='lword'>全年收入（税前）</view>
-              <view className='yearMoney'>
-                <text>{isyear ? formatPrice(account?.amounts) : '******'}</text>元
-                <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
-              </view>
+    <view style={{ padding: '30rpx', height: '100%',display:'flex',flexDirection:'column' }}>
+      <view className='storexx' style={{flex:'none'}}>
+        <view className='storeName'>店名：{hotel.hotelName}</view>
+        <view className='money'>
+          <view className='sleft'>
+            <view className='lword'>全年收入（税前）</view>
+            <view className='yearMoney'>
+              <text>{isyear ? formatPrice(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 ? formatPrice(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 ? formatPrice(account?.currentCharges) : '******'}</text>元
+              <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
+            </view></view>
         </view>
-
-        <view className='title' >推广收入记录</view>
-
+      </view>
+      <view className='title' style={{flex:'none'}}>推广收入记录</view>
+      <View style={{flex:'auto',overflow:'hidden',position:'relative'}}>
         <List
-          style={{ height: 'calc(100vh - 375px)' }}
+          style={{ height: '100%' }}
           request={fetchAPI}
           params={queryParams}
           noData={<NoData />}
@@ -70,7 +70,7 @@ export default (props) => {
           )}
         >
         </List>
-      </view>
+      </View>
     </view>
   )
 }

src/shop/components/Sparead/spreadMoney.jsx

@@ -19,9 +19,7 @@ export default (props) => {
   const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
 
-  const queryParams = useMemo(() => ({
-
-  }), [])
+  const queryParams = useMemo(() => ({}), [])
 
 
   const reqestAPI = getList(shopMoney?.acc?.accountId)

src/shop/pages/spread/spreadIndex.jsx

@@ -1,11 +1,8 @@
 import React, { useState, useEffect, useRef } from 'react'
 import CustomNav from '@/components/CustomNav'
 import { useRouter } from '@tarojs/taro'
-import baozan from '@/assets/icons/housemantj/bgood.png'
-
-import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
+import { getShopList, getShopMoney, getVerifiedOrder } from '@/services/shopBoss'
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
-import SpinBox from "@/components/Spin/SpinBox";
 import withLayout from '@/layouts'
 import {
   TPL_MESSAGE_SHOP_PAY_SUCCESS,
@@ -23,12 +20,13 @@ import { View } from '@tarojs/components'
 export default withLayout((props) => {
   const { router, person } = props
   const { params } = useRouter()
-  const { tab,cardShop } = params || {}
+  const { tab,shopOrderId } = params || {}
   const [currentTab, setCurrentTab] = useState(0)
   //顶部的商铺列表
   const [shopList, setShopList] = useState([])
   //当前商铺
   const [shop, setShop] = useState()
+  // const shopOrderId='1a8deba868489b0be19cba941e6f577e'
   const shopId = shop?.shopId
 
   
@@ -53,7 +51,12 @@ export default withLayout((props) => {
     getShopList().then((res) => {
       const { shopList: list, shop: current } = res
       setShopList(list)
-      setShop(current)
+      if (shopOrderId) {
+        setShop(list.filter(x=>x.shopId==shopOrderId)[0])
+      }
+      else{
+        setShop(current)
+      }
     })
   }, [])