Przeglądaj źródła

Merge branch 'master' of http://git.ycjcjy.com/nanyang/farmer_client

张延森 3 lat temu
rodzic
commit
1efc596fe6

BIN
images/aboutUs.png Wyświetl plik


BIN
images/feedbacks.png Wyświetl plik


BIN
images/userRight.png Wyświetl plik


BIN
images/versionUpdate.png Wyświetl plik


+ 3
- 1
lib/pages/main/index.dart Wyświetl plik

@@ -1,3 +1,4 @@
1
+import 'package:farmer_client/pages/main/widgets/OtherColumn.dart';
1 2
 import 'package:farmer_client/pages/main/widgets/UserAddress.dart';
2 3
 import 'package:farmer_client/pages/main/widgets/UserInfo.dart';
3 4
 import 'package:flutter/material.dart';
@@ -28,7 +29,8 @@ class _MainPageState extends State<MainPage> {
28 29
         child:   Column(
29 30
           children: [
30 31
             UserInfo(),
31
-            UserAddress()
32
+            UserAddress(),
33
+            OtherColumn()
32 34
           ],
33 35
         ),
34 36
       )

+ 97
- 0
lib/pages/main/widgets/OtherColumn.dart Wyświetl plik

@@ -0,0 +1,97 @@
1
+import 'package:flutter/material.dart';
2
+import 'package:flutter_screenutil/flutter_screenutil.dart';
3
+
4
+class OtherColumn extends StatelessWidget {
5
+  const OtherColumn({Key? key}) : super(key: key);
6
+
7
+  @override
8
+  Widget build(BuildContext context) {
9
+    return Container(
10
+        alignment: Alignment.center,
11
+        height: 123.w,
12
+        width: 345.w,
13
+        margin: EdgeInsets.fromLTRB(0, 15.w, 0, 15.w),
14
+        decoration: BoxDecoration(
15
+          borderRadius: BorderRadius.circular(30),
16
+          color: Colors.white,
17
+          boxShadow: [
18
+            BoxShadow(
19
+              blurRadius: 10, //阴影范围
20
+              spreadRadius: 0.1, //阴影浓度
21
+              color: Colors.grey.withOpacity(0.2), //阴影颜色
22
+            ),
23
+          ],
24
+        ),
25
+        child: Column(
26
+          children: [
27
+            Container(
28
+                margin: EdgeInsets.fromLTRB(0, 30.w, 0, 20.w),
29
+                alignment: Alignment.topLeft,
30
+                decoration: const BoxDecoration(
31
+                    border: Border(
32
+                        left: BorderSide(width: 5, color: Color(0xff000000)
33
+                          // 0x17000000
34
+                        ))),
35
+                child: Padding(
36
+                  padding: EdgeInsets.fromLTRB(12.w, 0, 0, 0),
37
+                  child: Text(
38
+                    '地址信息',
39
+                    style: TextStyle(
40
+                      color: Color(0xff333333),
41
+                      fontWeight: FontWeight.bold,
42
+                      fontSize: 17.sp,
43
+                    ),
44
+                  ),
45
+                )),
46
+            Row(
47
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
48
+              children: [
49
+                Container(
50
+                  child: Row(
51
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
52
+                    children: [
53
+                      Padding(
54
+                        padding: EdgeInsets.fromLTRB(17.w, 0, 10.w, 0),
55
+                        child: Image(
56
+                          image: AssetImage('images/aboutUs.png'),
57
+                          width: 17.w,
58
+                          height: 21.w,
59
+                        ),
60
+                      ),
61
+                      Container(
62
+                        width: 260,
63
+                        child: GestureDetector(
64
+                          child: Text(
65
+                            '请填写详细地址请填写详细地址请填写详细地址',
66
+                            softWrap: true,
67
+                            maxLines: 1,
68
+                            textAlign: TextAlign.left,
69
+                            overflow: TextOverflow.ellipsis,
70
+                            style: TextStyle(
71
+                              fontWeight: FontWeight.bold,
72
+                              fontSize: 17,
73
+                            ),
74
+                          ),
75
+                          onTap: () {
76
+                            print('修改地址');
77
+                          },
78
+                        ),
79
+                      )
80
+                    ],
81
+                  ),
82
+                ),
83
+                Container(
84
+                  alignment: Alignment.center,
85
+                  padding: EdgeInsets.fromLTRB(0, 0, 30.w, 0),
86
+                  child: Image(
87
+                    image: AssetImage('images/userRight.png'),
88
+                    width: 10.w,
89
+                    height: 18.w,
90
+                  ),
91
+                ),
92
+              ],
93
+            ),
94
+          ],
95
+        ));
96
+  }
97
+}

+ 1
- 1
lib/pages/main/widgets/UserInfo.dart Wyświetl plik

@@ -26,7 +26,7 @@ class UserInfo extends StatelessWidget {
26 26
             child: Container(
27 27
                 alignment: Alignment.center,
28 28
                 height: 24.w,
29
-                width: 90.w,
29
+                width: 93.w,
30 30
                 decoration: const BoxDecoration(
31 31
                   borderRadius: BorderRadius.only(
32 32
                       bottomLeft: Radius.circular(20),

+ 4
- 0
pubspec.yaml Wyświetl plik

@@ -82,6 +82,10 @@ flutter:
82 82
     - images/ordersLeft.png
83 83
     - images/mineBack.png
84 84
     - images/userMoren.png
85
+    - images/aboutUs.png
86
+    - images/feedbacks.png
87
+    - images/userRight.png
88
+    - images/versionUpdate.png
85 89
 
86 90
   # An image asset can refer to one or more resolution-specific "variants", see
87 91
   # https://flutter.dev/assets-and-images/#resolution-aware.