李志伟 3 years ago
parent
commit
3e3bc20f28

+ 8
- 0
src/components/Footer/index.jsx View File

@@ -0,0 +1,8 @@
1
+import {View} from '@tarojs/components'
2
+import './style.less'
3
+
4
+export default ()=>{
5
+  return (
6
+    <View className='listBottom'>暂无更多~</View>
7
+  )
8
+}

+ 9
- 0
src/components/Footer/style.less View File

@@ -0,0 +1,9 @@
1
+.listBottom{
2
+  line-height: 31px;
3
+  font-size: 32px;
4
+  font-weight: 500;
5
+  color: #666666;
6
+  margin-top: 64px;
7
+  padding-bottom: 30px;
8
+  text-align: center;
9
+}

src/pages/index/components/OrderCard/index.jsx → src/components/OrderCard/index.jsx View File


src/pages/index/components/OrderCard/style.less → src/components/OrderCard/style.less View File

@@ -1,5 +1,5 @@
1 1
 .card{
2
-  margin-top: 30px;
2
+  margin: 30px;
3 3
   box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
4 4
   border-radius: 40px;
5 5
   position: relative;

+ 3
- 3
src/pages/index/components/order/index.jsx View File

@@ -4,7 +4,8 @@ import { View, Input, Swiper, Image, SwiperItem, Text,ScrollView } from "@tarojs
4 4
 import positionImg from '@/assets/comm/position.png'
5 5
 import searchImg from '@/assets/comm/search.png'
6 6
 import orderImg from '@/assets/comm/orderList.png'
7
-import OrderCard from "../OrderCard";
7
+import Footer from "@/components/Footer";
8
+import OrderCard from "@/components/OrderCard";
8 9
 import './style.less'
9 10
 
10 11
 export default () => {
@@ -60,8 +61,7 @@ export default () => {
60 61
         
61 62
         <OrderCard />
62 63
         <OrderCard />
63
-        <View className='listBottom'>暂无更多~</View>
64
-        
64
+        <Footer />
65 65
       </View>
66 66
       </ScrollView>
67 67
     </View>

+ 2
- 10
src/pages/index/components/order/style.less View File

@@ -59,7 +59,6 @@
59 59
     }
60 60
   }
61 61
   .orderList{
62
-    margin: 30px;
63 62
     padding-top: 30px;
64 63
     .head{
65 64
       font-size: 40px;
@@ -69,6 +68,8 @@
69 68
       line-height: 41px;      
70 69
       display: flex;
71 70
       align-items: center;
71
+      padding-bottom: 10px;
72
+      margin-left: 30px;
72 73
       .headIcon{
73 74
         width: 34px;
74 75
         height: 38px;
@@ -90,15 +91,6 @@
90 91
         color: #666666;
91 92
       }
92 93
     }
93
-    .listBottom{
94
-      line-height: 31px;
95
-      font-size: 32px;
96
-      font-weight: 500;
97
-      color: #666666;
98
-      margin-top: 64px;
99
-      padding-bottom: 30px;
100
-      text-align: center;
101
-    }
102 94
   }
103 95
 }
104 96
 

+ 12
- 3
src/pages/moreOrder/index.jsx View File

@@ -1,7 +1,9 @@
1
-import { View, Input, Image,Text } from "@tarojs/components"
1
+import { View, Input, Image,Text,ScrollView } from "@tarojs/components"
2 2
 import CustomNav from "@/components/CustomNav";
3 3
 import searchImg from '@/assets/comm/search.png'
4 4
 import { useState } from "react";
5
+import OrderCard from "@/components/OrderCard";
6
+import Footer from "@/components/Footer";
5 7
 import './style.less'
6 8
 
7 9
 export default () => {
@@ -70,9 +72,16 @@ export default () => {
70 72
         </View>
71 73
       </View>
72 74
       <View className='index-container'>
73
-        {currentTab === 0 && <View>777</View>}
75
+      <ScrollView scrollY style={{height:'100%'}}>
76
+        {currentTab}
77
+      <OrderCard />
78
+      <OrderCard />
79
+      <OrderCard />
80
+      <Footer />
81
+      </ScrollView>
82
+        {/* {currentTab === 0 && <View>777</View>}
74 83
         {currentTab === 1 && <View>888</View>}
75
-        {currentTab === 2 && <View>999</View>}
84
+        {currentTab === 2 && <View>999</View>} */}
76 85
       </View>
77 86
     </View>
78 87
   )