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

src/components/Spin/style.less

@@ -139,6 +139,7 @@
 
 .loading-wrapper {
   height: 100%;
+
   position: relative;
   overflow: hidden;
 

src/pages/PayOrder/index.jsx

@@ -93,12 +93,20 @@ export default withLayout((props) => {
       //   requestPayment(payInfo);
       //   return;
       // }
-
       Taro.showLoading({
         title: '支付中',
       })
 
       if (packageId) {
+        if (!totalPrice?.actualPrice) {
+          Taro.showToast({
+            title: '请选择有效账单',
+            icon: 'none'
+          })
+          return
+        }
+
+
         saveOrder(
           list.map((x) => {
             return {

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -82,7 +82,6 @@ export default (props) => {
     onVarified()
   }
 
-
   const [showCutover, setShowCutover] = useState(false)
   const ShowMoldeOn = () => {
     setShowCutover(true)
@@ -135,39 +134,38 @@ export default (props) => {
           >
           </mp-tabs>
         </view>
-        <view>
+        <view  >
           {/* 未核销 */}
           {activeTab === 0 &&
-            <>
-              <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
-                <List
-                  style={{ height: '50%' }}
-                  request={getVerifiedOrder}
-                  params={queryParams}
-                  onDataChange={setAllList}
-                  noData={<NoData />}
-                  render={({ item, index }) =>
-                    <ShopUnused key={(index)} item={item} />}
-                >
-                </List>
-              </scroll-view>
-            </>
+            <view style={{ height: '45vh' }}>
+              <List
+                style={{ height: '100%' }}
+                request={getVerifiedOrder}
+                params={queryParams}
+                onDataChange={setAllList}
+                noData={<NoData />}
+                render={({ item, index }) =>
+                  <ShopUnused key={(index)} item={item} />}
+              >
+              </List>
+            </view>
+
           }
           {/* 已核销 */}
           {activeTab === 1 &&
-            <>
-              <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
-                <List
-                  style={{ height: '50%' }}
-                  noData={<NoData />}
-                  request={getVerifiedOrder}
-                  params={queryParams}
-                  onDataChange={setAllList}
-                  render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
-                >
-                </List>
-              </scroll-view>
-            </>
+            <view style={{ height: '45vh' }}>
+
+              <List
+                style={{ height: '100%' }}
+                noData={<NoData />}
+                request={getVerifiedOrder}
+                params={queryParams}
+                onDataChange={setAllList}
+                render={({ item, index }) => <ShopUsed verifiedOrder={verifiedOrder} key={(index)} item={item} />}
+              >
+              </List>
+            </view>
+
           }
         </view>
       </view>

src/shop/components/Sparead/spreadMoney.jsx

@@ -85,18 +85,18 @@ export default (props) => {
 
 
         <view className='title'>推广收入记录</view>
-
-        <List
-          style={{ height: '50%' }}
-          request={reqestAPI}
-          params={queryParams}
-          noData={<NoData />}
-          render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
-        >
-        </List>
-
+        <view style={{ height: '50vh' }}>
+
+          <List
+            style={{ height: '100%' }}
+            request={reqestAPI}
+            params={queryParams}
+            noData={<NoData />}
+            render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
+          >
+          </List>
+        </view>
       </view>
-
     </view >
   )
 }

src/shop/pages/spread/spreadIndex.jsx

@@ -17,6 +17,7 @@ import Sparead from '../../components/Sparead/spreadMoney'
 
 
 import './spreadIndex.less'
+import { View } from '@tarojs/components'
 
 
 export default withLayout((props) => {
@@ -105,7 +106,7 @@ export default withLayout((props) => {
   }, [tab])
 
   return (
-    <SpinBox loading={loading} className='page-index'>
+    <View className='page-index'>
       <view className='index-navbar'>
         <CustomNav logo='none' title={shop?.shopName} />
       </view>
@@ -117,7 +118,7 @@ export default withLayout((props) => {
       <view className='index-tabbar'>
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
       </view>
-    </SpinBox>
+    </View>
 
   )