'.'

lib/pages/Login/index.dart

@@ -86,6 +86,7 @@ class _Login extends State<Login> {
             Fluttertoast.showToast(msg: '登录成功！');
             Get.offNamed('/home');
           }).catchError((err) {
+            print(err);
             Fluttertoast.showToast(msg: err);
           });
         } else {

lib/pages/index.dart

@@ -10,4 +10,5 @@ export 'machineryDetail/index.dart';
 export 'machineryMap/index.dart';
 export 'bankList/index.dart';
 export 'addBankCard/index.dart';
+export 'userInfo/index.dart';
 

lib/pages/machineryMap/index.dart

@@ -13,7 +13,6 @@ class MachineryMap extends BasicPage {
 
   @override
   void beforeShow() {
-    // TODO: implement beforeShow
     super.beforeShow();
     if (Get.arguments != null) {
       getMachineryDetail(Get.arguments['id'], {

lib/pages/main/index.dart

@@ -41,6 +41,9 @@ class Main extends BasicPage {
       Get.toNamed('/bankList');
     // }
   }
+  void goUserInfo(){
+    Get.toNamed('/userInfo');
+  }
 
   @override
   Widget builder(BuildContext context) {
@@ -225,6 +228,7 @@ class Main extends BasicPage {
                         EdgeInsets.symmetric(horizontal: 15.w, vertical: 0),
                     child: Column(
                       children: [
+
                         MyCell(
                           head: Image.asset(
                             'images/main/account.png',
@@ -234,7 +238,7 @@ class Main extends BasicPage {
                             '账号与安全',
                             style: TextStyle(
                               fontSize: 17.sp,
-                              color: Color(0xff333333),
+                              color: const Color(0xff333333),
                               fontWeight: FontWeight.bold,
                             ),
                           ),
@@ -242,7 +246,7 @@ class Main extends BasicPage {
                             'images/main/goto.png',
                             width: 10.w,
                           ),
-                          onClick: () {},
+                          onClick: () {goUserInfo();},
                         ),
                         MyCell(
                           head: Image.asset(

lib/pages/userInfo/index.dart

@@ -0,0 +1,260 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:get/get.dart';
+import 'package:worker_client/models/app.dart';
+import 'package:worker_client/models/entities/person.dart';
+import 'package:worker_client/services/user.dart';
+import 'package:worker_client/widgets/MyButton/index.dart';
+import 'package:worker_client/widgets/layout/BasicPage.dart';
+
+class UserInfo extends BasicPage {
+  UserInfo({Key? key}) : super(key: key);
+
+  AppController store = AppController.t;
+  late String name;
+  late String phone;
+  late TextEditingController _cName;
+  late TextEditingController _cPhone;
+
+  @override
+  void beforeShow() {
+    // TODO: implement beforeShow
+    super.beforeShow();
+    _cName = TextEditingController(text: store.user().nickName.toString());
+    _cPhone = TextEditingController(text: store.user().phone.toString());
+    name = store.user().nickName.toString();
+    phone = store.user().phone.toString();
+  }
+  RegExp exp = RegExp(r'^1[3456789]\d{9}$');
+
+  void handleOk() {
+    if (name == '' && phone == '') {
+      Fluttertoast.showToast(msg: '请输入您需要修改的信息');
+      return;
+    } else if (phone != '' && !exp.hasMatch(phone)) {
+      Fluttertoast.showToast(msg: '请输入正确的手机号');
+      return;
+    } else {
+      updateInfo(store.user().personId.toString(), {
+        ...store.user().toJson(),
+        'nickName': name,
+        'phone': phone
+      }).then((value) {
+        Fluttertoast.showToast(msg: '修改成功');
+        store.user(Person.fromJson(value));
+        Get.offNamed('/main');
+      });
+    }
+  }
+
+  @override
+  Widget builder(BuildContext context) {
+    naviTitle = '个人信息';
+    return Container(
+      padding: EdgeInsets.all(15.w),
+      decoration: const BoxDecoration(color: Colors.white),
+      child: Column(
+        children: [
+          Container(
+            width: 345.w,
+            height: 92.h,
+            alignment: Alignment.centerLeft,
+            decoration: BoxDecoration(color: Colors.white, boxShadow: [
+              BoxShadow(color: Color(0x1f000000), offset: Offset(0, 1.w))
+            ]),
+            child: store.user().avatar != null
+                ? Container(
+                    clipBehavior: Clip.hardEdge,
+                    decoration: BoxDecoration(
+                        borderRadius: BorderRadius.all(Radius.circular(31.w))),
+                    child: Image.network(
+                      store.user().avatar.toString(),
+                      width: 62.w,
+                      height: 62.w,
+                    ),
+                  )
+                : Image.asset(
+                    'images/main/defaultAvatar.png',
+                    width: 62.w,
+                    height: 62.w,
+                  ),
+          ),
+          Container(
+              width: 345.w,
+              alignment: Alignment.centerLeft,
+              margin: EdgeInsets.only(top: 40.h),
+              decoration: BoxDecoration(color: Colors.white, boxShadow: [
+                BoxShadow(color: Color(0x1f000000), offset: Offset(0, 1.w))
+              ]),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    '用户名：',
+                    style: TextStyle(
+                        color: const Color(0xFF333333),
+                        letterSpacing: 2,
+                        fontSize: 17.sp,
+                        fontWeight: FontWeight.bold),
+                  ),
+                  Container(
+                    height: 54.h,
+                    alignment: Alignment.centerLeft,
+                    child: store.user().userName != null
+                        ? Text(
+                            store.user().userName.toString(),
+                            style: TextStyle(
+                                color: const Color(0xFF333333),
+                                fontSize: 17.sp,
+                                fontWeight: FontWeight.bold),
+                          )
+                        : const Text(''),
+                  ),
+                ],
+              )),
+          Container(
+            width: 345.w,
+            alignment: Alignment.centerLeft,
+            margin: EdgeInsets.only(top: 40.h),
+            decoration: BoxDecoration(color: Colors.white, boxShadow: [
+              BoxShadow(color: const Color(0x1f000000), offset: Offset(0, 1.w))
+            ]),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  '姓名：',
+                  style: TextStyle(
+                      color: const Color(0xFF333333),
+                      fontSize: 17.sp,
+                      fontWeight: FontWeight.bold,
+                      letterSpacing: 2),
+                ),
+                Container(
+                  height: 54.h,
+                  alignment: Alignment.centerLeft,
+                  child: Row(
+                    children: [
+                      Expanded(
+                        flex: 1,
+                        child: TextField(
+                          controller: _cName,
+                          style: TextStyle(
+                              fontSize: 17.sp,
+                              fontWeight: FontWeight.bold,
+                              color: const Color(0xff333333)),
+                          decoration: const InputDecoration(
+                            isCollapsed: true,
+                            hintText: '请输入您的姓名',
+                            counterText: '', //去掉右下角的东西
+                            border: InputBorder.none,
+                            floatingLabelBehavior: FloatingLabelBehavior.never,
+                          ),
+                          onChanged: (val) {
+                            name = val;
+                          },
+                        ),
+                      ),
+                      GestureDetector(
+                        behavior: HitTestBehavior.opaque,
+                        onTap: () {
+                          name = '';
+                          _cName.clear();
+                        },
+                        child: Container(
+                          width: 50.w,
+                          alignment: Alignment.center,
+                          child: Image.asset(
+                            'images/main/cancel.png',
+                            width: 18.w,
+                          ),
+                        ),
+                      )
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+          Container(
+            width: 345.w,
+            alignment: Alignment.centerLeft,
+            margin: EdgeInsets.only(top: 40.h),
+            decoration: BoxDecoration(color: Colors.white, boxShadow: [
+              BoxShadow(color: Color(0x1f000000), offset: Offset(0, 1.w))
+            ]),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  '手机号：',
+                  style: TextStyle(
+                      color: const Color(0xFF333333),
+                      letterSpacing: 2,
+                      fontSize: 17.sp,
+                      fontWeight: FontWeight.bold),
+                ),
+                Container(
+                  height: 54.h,
+                  alignment: Alignment.centerLeft,
+                  child: Row(
+                    children: [
+                      Expanded(
+                        flex: 1,
+                        child: TextField(
+                          //赋初值
+                          controller: _cPhone,
+                          maxLength: 11,
+                          keyboardType: TextInputType.number,
+                          style: TextStyle(
+                              fontSize: 17.sp,
+                              fontWeight: FontWeight.bold,
+                              color: const Color(0xff333333)),
+                          decoration: const InputDecoration(
+                            isCollapsed: true,
+                            hintText: '请输入您的手机号',
+                            counterText: '', //去掉右下角的东西
+                            border: InputBorder.none,
+                            floatingLabelBehavior: FloatingLabelBehavior.never,
+                          ),
+                          onChanged: (val) {
+                            phone = val;
+                          },
+                        ),
+                      ),
+                      GestureDetector(
+                        behavior: HitTestBehavior.opaque,
+                        onTap: () {
+                          phone = '';
+                          _cPhone.clear();
+                        },
+                        child: Container(
+                          width: 50.w,
+                          alignment: Alignment.center,
+                          child: Image.asset(
+                            'images/main/cancel.png',
+                            width: 18.w,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+          const Spacer(),
+          MyButton(
+              text: '保存',
+              type: 0,
+              pwith: 30.w,
+              disable: false,
+              onClick: () {
+                handleOk();
+              })
+        ],
+      ),
+    );
+  }
+}

lib/routes/pages.dart

@@ -21,4 +21,5 @@ List<GetPage> pages=[
   GetPage(name: '/machineryMap', page: () => MachineryMap()),
   GetPage(name: '/bankList', page: () => BankListPages()),
   GetPage(name: '/addBankCard', page: () => AddBankPage()),
+  GetPage(name: '/userInfo', page: () => UserInfo()),
 ];

lib/services/user.dart

@@ -26,3 +26,15 @@ Future userLogin(String userName, String password) async {
 Future getCurrent() async {
   return request('/person/current');
 }
+/**
+ * 修改个人信息
+ * @param {*}
+ * @returns
+ */
+
+Future updateInfo(String id, Map data) async {
+  return request('/person/${id}', options: Options(method: 'PUT'), data: data)
+      .catchError((error) => {
+            Fluttertoast.showToast(msg: error.error['message']),
+          });
+}

lib/widgets/MyButton/index.dart

@@ -6,19 +6,20 @@ import '../GradientButton.dart';
 
 class MyButton extends StatelessWidget {
   final String text;
-  //type 1 绿色 2 黄色
+  //type 0 绿色 1 黄色
   final int type;
   //true 有结束动画 false 无变化
   final bool disable;
   //点击事件
   final GestureTapCallback onClick;
+  final double? pwith;
 
   MyButton(
       {Key? key,
       required this.text,
       required this.type,
       required this.disable,
-      required this.onClick})
+      required this.onClick, this.pwith})
       : super(key: key);
 
   List<GradientModel> Glist=[
@@ -29,7 +30,7 @@ class MyButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       margin: EdgeInsets.fromLTRB(0, 12.5.h, 0, 9.h),
-      width: 315.w,
+      width: 315.w+(pwith??0),
       height: 49.h,
       child: GradientButton(
           colors: [Glist[type].beginColor,Glist[type].endColor],