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

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -114,7 +114,7 @@ export default (props) => {
                 <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>
@@ -122,7 +122,7 @@ 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>

src/shop/components/Sparead/spreadMoney.jsx

@@ -16,7 +16,7 @@ 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 [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
 
   const queryParams = useMemo(() => ({
@@ -70,7 +70,7 @@ export default (props) => {
                 <view className='lword'>全年推广收入（税前）</view>
                 <view className='yearMoney'>
                   <text>{isyear ? (shopMoney?.totalCharges / 100).toFixed(2) : '******'}</text>元
-                  <image className='micon' src={isyear ? eyes : ceyes} onClick={handleYear} />
+                  <image className='micon' src={isyear ? eyes :ceyes } onClick={handleYear} />
                 </view>
               </view>
               <view className='line' />

src/shop/pages/spread/spreadIndex.jsx

@@ -5,6 +5,7 @@ import baozan from '@/assets/icons/housemantj/bgood.png'
 
 import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
 import { withSubscribeMessage } from '@/utils/subscribeMessage'
+import SpinBox from "@/components/Spin/SpinBox";
 import withLayout from '@/layouts'
 import {
   TPL_MESSAGE_SHOP_PAY_SUCCESS,
@@ -27,6 +28,7 @@ export default withLayout((props) => {
   const [shopList, setShopList] = useState([])
   const [shop, setShop] = useState()
   const shopId = shop?.shopId
+  const [loading, setLoading] = useState(false)
 
   const [amountType, setAmountType] = useState('order')
   const [isVerified, setisVerified] = useState(0)
@@ -42,7 +44,6 @@ export default withLayout((props) => {
     if (listRef.current?.context) {
       listRef.current.context.scrollTo({ top: 0 })
     }
-
     withSubscribeMessage([TPL_MESSAGE_SHOP_PAY_SUCCESS, TPL_MESSAGE_SHOP_VERIFY_RESULT])
   }
   //商铺列表
@@ -71,10 +72,12 @@ export default withLayout((props) => {
   }
 
   useEffect(() => {
+    setLoading(true)
     if (shopId) {
       getShopMoney(shopId, amountType).then((e) => {
         setShopMoney(e)
-      })
+        setLoading(false)
+      }).catch(setLoading(false))
     }
 
   }, [amountType, shopId, currentTab])
@@ -102,7 +105,7 @@ export default withLayout((props) => {
   }, [tab])
 
   return (
-    <view className='page-index'>
+    <SpinBox loading={loading} className='page-index'>
       <view className='index-navbar'>
         <CustomNav logo='none' title={shop?.shopName} />
       </view>
@@ -114,7 +117,7 @@ export default withLayout((props) => {
       <view className='index-tabbar'>
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
       </view>
-    </view>
+    </SpinBox>
 
   )