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

src/components/CompoentsOrder/complete/index.jsx

@@ -84,7 +84,7 @@ export default (props) => {
   }
 
   return (
-    <SpinBox loading={loading} style={{ height: 'calc(100% - 46px)' }}>
+    <SpinBox loading={loading}>
       <scroll-view
         scrollY
         style={{ height: '100%' }}

src/components/SlideView/index.jsx

@@ -57,7 +57,7 @@ export default (props) => {
             const { height } = res[0]
             if (height && height !== contentHeightRef.current) {
               setActStyle({
-                height: `calc(${height}px - 30px)`,
+                height: `calc(${height}px - 20px)`,
               })
               contentHeightRef.current = height
             }

src/pages/MineUserAll/AllOrder/index.jsx

@@ -53,7 +53,7 @@ export default withLayout((props) => {
       <view className='index-navbar'>
         <CustomNav title='我的订单' />
       </view>
-      <View className='index-container'>
+      <View className='index-container' style={{display:'flex',flexDirection:'column',boxSizing:'border-box'}}>
         <view className='index-tabs'>
           <mp-tabs
             tabClass='tabs-Unselected'