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

lib/pages/userInfo/index.dart

@@ -11,6 +11,7 @@ class UserInfo extends StatefulWidget {
 }
 
 class _UserInfo extends State<UserInfo> {
+  String name = '';
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -28,11 +29,14 @@ class _UserInfo extends State<UserInfo> {
         ),
       ),
       body: Container(
+        color: Color(0xFFffffff),
         padding: EdgeInsets.all(15.w),
         child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Container(
-              height: 92.h,
+              margin: EdgeInsets.fromLTRB(0, 0, 0, 40.h),
+              padding: EdgeInsets.symmetric(vertical: 15.h, horizontal: 0),
               decoration: BoxDecoration(
                 color: const Color(0xFFFFFFFF),
                 boxShadow: [
@@ -43,10 +47,78 @@ class _UserInfo extends State<UserInfo> {
                   ),
                 ],
               ),
-              child: Row(children: [
-                Text('666'),
-              ]),
+              child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Image.asset(
+                      'images/userMoren.png',
+                      width: 62.w,
+                      height: 62.w,
+                    ),
+                    Text(
+                      '更换头像',
+                      style: TextStyle(
+                          fontSize: 17.sp,
+                          color: Color(0xFF333333),
+                          letterSpacing: 2,
+                          fontWeight: FontWeight.w500),
+                    ),
+                  ]),
             ),
+            Text(
+              '姓名：',
+              style: TextStyle(
+                  color: const Color(0xFF333333),
+                  fontSize: 17.sp,
+                  letterSpacing: 2,
+                  fontWeight: FontWeight.bold),
+            ),
+            Container(
+                margin: EdgeInsets.fromLTRB(0, 20.h, 0, 40.h),
+                padding: EdgeInsets.symmetric(vertical: 19.h, horizontal: 0),
+                decoration: BoxDecoration(
+                  color: const Color(0xFFFFFFFF),
+                  boxShadow: [
+                    BoxShadow(
+                      color: const Color(0x1F000000),
+                      offset: Offset(0, 1.w),
+                      blurRadius: 0,
+                    ),
+                  ],
+                ),
+                child: Column(
+                  children: [
+                    Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Container(
+                            width: 200.w,
+                            child: TextFormField(
+                              initialValue: name,
+                              style: TextStyle(
+                                  color: Color(0xFF333333),
+                                  fontSize: 17.sp,
+                                  letterSpacing: 2,
+                                  fontWeight: FontWeight.bold),
+                              decoration: const InputDecoration(
+                                isCollapsed: true,
+                                hintText: '请输入您的姓名',
+                                border: InputBorder.none,
+                                counterText: '', //去掉计数
+                                floatingLabelBehavior:
+                                    FloatingLabelBehavior.never,
+                              ),
+                              onChanged: (e) {},
+                            ),
+                          ),
+                          Image.asset(
+                            'images/icons/cancel.png',
+                            width: 18.w,
+                            height: 18.w,
+                          )
+                        ]),
+                  ],
+                )),
           ],
         ),
       ),

pubspec.yaml

@@ -97,6 +97,7 @@ flutter:
     - images/icons/decorate.png
     - images/icons/edit.png
     - images/icons/delete.png
+    - images/icons/cancel.png
     - images/ordersListImga.png
 
   # An image asset can refer to one or more resolution-specific "variants", see