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

src/components/CustomNav/index.jsx

@@ -65,7 +65,7 @@ export default (props) => {
   }
 
   const goHome = () => {
-    Taro.navigateTo({
+    Taro.reLaunch({
       url: '/pages/index/index'
     })
   }

src/shop/pages/spread/spreadIndex.jsx

@@ -33,8 +33,8 @@ export default withLayout((props) => {
   const listRef = useRef()
 
   const handleTabChange = (e) => {
-
     const { index } = e.detail
+    index?setAmountType('commission'):setAmountType('order')
     setCurrentTab(index)
     //如果context有的话代表他滚动了   那么切换tab页就置顶
     if (listRef.current?.context) {
@@ -43,15 +43,6 @@ export default withLayout((props) => {
 
     withSubscribeMessage([TPL_MESSAGE_SHOP_PAY_SUCCESS, TPL_MESSAGE_SHOP_VERIFY_RESULT])
   }
-
-  const handelTypeOrder = () => {
-    setAmountType('order')
-  }
-
-  const handelType = () => {
-    setAmountType('commission')
-  }
-
   //商铺列表
   useEffect(() => {
     getShopList().then((res) => {
@@ -59,16 +50,12 @@ export default withLayout((props) => {
       setShopList(list)
       setShop(current)
     })
-
   }, [])
 
 
   // 搜索核销手机号
   const setVer = (e) => {
     setVerifiedOrder(e.records)
-
-
-
   }
 
 
@@ -85,7 +72,6 @@ export default withLayout((props) => {
     if (shopId) {
       getShopMoney(shopId, amountType).then((e) => {
         setShopMoney(e)
-
       })
     }
 
@@ -100,11 +86,9 @@ export default withLayout((props) => {
         pageNum: 1,
         pageSize: 99,
         shopId: current.shopId,
-
       }).then((res) => {
         const order = res.records
         setVerifiedOrder(order)
-
       })
     })
   }
@@ -124,9 +108,6 @@ export default withLayout((props) => {
         {currentTab === 0 && <ShopKeeper isVerified={isVerified} shopId={shopId} amountType={amountType} 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>
-      <view className='index-tabbar'>
-
       </view>
       <view className='index-tabbar'>
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>