main

lib/models/app.dart

@@ -5,6 +5,7 @@ import 'package:amap_flutter_location/amap_flutter_location.dart';
 import 'package:farmer_client/models/entities/person.dart';
 import 'package:farmer_client/widgets/Modal.dart';
 import 'package:get/get.dart';
+import '../services/user.dart';
 import '../utils/location.dart';
 
 class AppController extends GetxController {
@@ -47,12 +48,15 @@ class AppController extends GetxController {
       );
     });
 
-    // // 尝试获取一次人员信息
-    // getCurrent().then((person) {
-    //   user(person);
-    // }).catchError((e) {
-    //   print(e);
-    // });
+
+    // 尝试获取一次人员信息
+    getCurrent().then((person) {
+      print('9personpersonpersonperson+$person');
+      user(Person.fromJson(person));
+
+    }).catchError((e) {
+      print(e);
+    });
   }
 
   @override

lib/models/entities/person.dart

@@ -1,17 +1,18 @@
-
 class Person {
   String? personId;
   String? appId;
   String? openid;
   String? nickName;
   String? avatar;
-  int? sex;
+  num? sex;
   String? phone;
   String? userId;
-  int? status;
+  num? status;
   String? createDate;
+  String? identity;
+  String? isOrgManager;
 
-  Person ();
+  Person();
 
   Person.fromJson(Map<String, dynamic> json)
       : personId = json["personId"],
@@ -23,20 +24,23 @@ class Person {
         phone = json["phone"],
         userId = json["userId"],
         status = json["status"],
-        createDate = json["createDate"];
+        createDate = json["createDate"],
+        isOrgManager = json["isOrgManager"],
+        identity = json["identity"];
 
   Map<String, dynamic> toJson() => {
-    'personId' : personId,
-    'appId' : appId,
-    'openid' : openid,
-    'nickName' : nickName,
-    'avatar' : avatar,
-    'sex' : sex,
-    'phone' : phone,
-    'userId' : userId,
-    'status' : status,
-    'createDate' : createDate,
+        'personId': personId,
+        'appId': appId,
+        'openid': openid,
+        'nickName': nickName,
+        'avatar': avatar,
+        'sex': sex,
+        'phone': phone,
+        'userId': userId,
+        'status': status,
+        'createDate': createDate,
+        'isOrgManager': isOrgManager,
+         'identity': identity,
+
   };
 }
-
-

lib/pages/addAddress/index.dart

@@ -90,10 +90,7 @@ class AddAddress extends BasicPage {
                         msg: '修改地址成功！');
                     Get.back();
                   });
-                  
                 }
-
-
               }
             },
             margin: const EdgeInsets.all(0),

lib/pages/addressList/index.dart

@@ -45,7 +45,6 @@ class AddressList extends BasicPage {
     });
 
   }
-
   void onDelete(id) {
     print(id);
 

lib/pages/feedback/index.dart

@@ -5,6 +5,8 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
+import '../../services/main.dart';
+
 class Feedback extends BasicPage {
   final text=Rx<String>('');
   final isEdit=Rx<bool>(false);
@@ -45,7 +47,11 @@ class Feedback extends BasicPage {
               },
             ),
           ),
-          if(!isEdit.value) Positioned(
+          Obx(()=>
+          Visibility(
+          visible:!isEdit(),
+            child:
+          Positioned(
             left: 20.w,
             top: 5.w,
             child: Row(
@@ -64,6 +70,8 @@ class Feedback extends BasicPage {
               ],
             ),
           ),
+          ),
+          ),
           Positioned(
             bottom: 25.h,
             child: DefaultButton(
@@ -73,11 +81,14 @@ class Feedback extends BasicPage {
               height: 49.h,
               text: '提交',
               onPressed: () {
-                if (text.value == '') {
+                if (text() == '') {
                   Fluttertoast.showToast(msg: '请输入内容哦');
                 } else {
-                  Fluttertoast.showToast(msg: '提交成功！');
-                  Get.back();
+                  feedback(text()).then((value) {
+                    Fluttertoast.showToast(msg: '提交成功！');
+                    Get.back();
+                  });
+
                 }
               },
               margin: const EdgeInsets.all(0),

lib/pages/home2.dart

@@ -1,109 +0,0 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-
-class Home extends StatefulWidget {
-  const Home({Key? key}) : super(key: key);
-
-  @override
-  _Home createState() => _Home();
-}
-
-class _Home extends State<Home> {
-  List images = [
-    ['images/index/index.png', 'images/index/indexActive.png'],
-    ['images/index/job.png', 'images/index/jobActive.png'],
-    ['images/index/user.png', 'images/index/userActive.png'],
-  ];
-
-  final List _titles = ['首页', '订单列表', '个人中心'];
-  int _currentIndex = 0;
-  final tabTextStyleSelected =
-  TextStyle(color: const Color(0xFF06B03B),fontSize: 15.sp,fontWeight: FontWeight.bold); //选线卡选中字体颜色
-  final tabTextStyleNormal =
-  TextStyle(color: const Color(0xFF323232),fontSize: 15.sp,fontWeight: FontWeight.bold); //选项卡未选中字体颜色
-  int _tabIndex = 0; //选项卡下标
-
-  var _body = [Text('我是首页'), Text('我是订单列表'), Text('我是个人中心')];
-  TextStyle getTabTextStyle(int curIndex) {
-    //设置tabbar 选中和未选中的状态文本
-    if (curIndex == _tabIndex) {
-      return tabTextStyleSelected;
-    }
-    return tabTextStyleNormal;
-  }
-
-  Image getTabIcon(int curIndex) {
-    //设置tabbar选中和未选中的状态图标
-    if (curIndex == _tabIndex) {
-      return Image.asset(
-        images[curIndex][1],
-        width: 20.w,
-        height: 20.w,
-      );
-    }
-    return Image.asset(
-      images[curIndex][0],
-      width: 20.w,
-      height: 20.w,
-    );
-  }
-
-  Image getTabImage(path) {
-    return Image.asset(path, width: 26.w, height: 26.w);
-  }
-
-  // 切换底部选项卡，标题的变化设置
-  Text getTabTitle(int curIndex) {
-    return Text(_titles[curIndex], style: getTabTextStyle(curIndex));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        title: Text(
-          '首页',
-          style: TextStyle(
-              color: Colors.black,
-              fontSize: 17.sp,
-              letterSpacing: 2,
-              fontWeight: FontWeight.bold
-          ),
-        ),
-      ),
-      body: _body[_tabIndex],
-      bottomNavigationBar: Container(
-        height: 65.h,
-
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceAround,
-          children: [
-            Column(
-              children: [
-                getTabIcon(0),
-                getTabTitle(0)
-              ],
-            ),
-            Column(
-              children: [
-                getTabIcon(1),
-                getTabTitle(1)
-              ],
-            ),
-            Column(
-              children: [
-                getTabIcon(2),
-                getTabTitle(2)
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/pages/login/login.dart

@@ -100,7 +100,7 @@ class _RouteLogin extends State<MyRouteLogin> {
       if (_newValue) {
         userLogin(handlePhones, handleCodes).then((value) {
           userInfo(Person.fromJson(value['person']));
-          print('已同意协议');
+
 
           Get.off(Home());
         });

lib/pages/main/index.dart

@@ -13,27 +13,27 @@ class Main extends BasicPage {
     naviTitle = '我的';
   }
   final addressListInfo = Rx<List<Address>>([]);
+  final addressInfoContent = Rx<Address>(Address());
+
+
+
 
   @override
   void beforeShow() {
     // TODO: implement beforeShow
     super.beforeShow();
     getAddress().then((value) {
-       List<Address> list = [];
+      List<Address> list = [];
       value['records'].forEach((item) {
         list.add(Address.fromJson(item));
       });
-       addressListInfo(list);
+      addressListInfo(list);
+      addressInfoContent(addressListInfo()[0]);
     });
   }
 
-
   @override
   Widget builder(BuildContext context) {
-    return Obx(()=> MainPage(
-        item:addressListInfo()[0].address.toString()
-     )
-
-    );
+    return Obx(()=>MainPage( item: addressInfoContent(),));
   }
 }

lib/pages/main/widgets/main/index.dart

@@ -1,39 +1,25 @@
 import 'package:farmer_client/models/entities/Address.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
-
 import './widgets/OtherColumn.dart';
 import './widgets/UserAddress.dart';
 import './widgets/UserInfo.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-class MainPage extends StatefulWidget {
-  final String item;
-
+class MainPage extends StatelessWidget {
+  final Address item;
 
 
-   MainPage({Key? key, required this.item}) : super(key: key);
 
-  @override
-  State<MainPage> createState() => _MainPageState(item);
-
-}
+  MainPage({Key? key, required this.item}) : super(key: key);
 
-class _MainPageState extends State<MainPage> {
   GetStorage box = GetStorage();
-  late String item='请维护详细地址！';
-  _MainPageState(this.item);
 
-  @override
-  void initState() {
-    super.initState();
-    print('644444444444444+$item');
-
-  }
 
   @override
   Widget build(BuildContext context) {
+    print('644444444444444+$item');
 
     return Container(
       alignment: Alignment.center,

lib/pages/main/widgets/main/widgets/UserAddress.dart

@@ -5,7 +5,7 @@ import 'package:get/get.dart';
 import '../../../../../models/entities/Address.dart';
 
 class UserAddress extends StatelessWidget {
-  final String item;
+  final Address item;
 
   const UserAddress({Key? key, required this.item}) : super(key: key);
 
@@ -65,8 +65,7 @@ class UserAddress extends StatelessWidget {
                         ),
                         Container(
                           width: 260,
-                          child: Text(
-                            item != null? item: '请设置默认地址',
+                          child:  Text(item!=null?item.address.toString():'请设置详细地址！',
                             softWrap: true,
                             maxLines: 1,
                             textAlign: TextAlign.left,

lib/pages/main/widgets/main/widgets/UserInfo.dart

@@ -2,14 +2,19 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
+import '../../../../../models/app.dart';
+
 class UserInfo extends StatelessWidget {
-  const UserInfo({Key? key}) : super(key: key);
+  AppController userInfo = AppController.t;
+
+   UserInfo({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
+    print(userInfo.user().phone);
+
     return Container(
       margin: EdgeInsets.only(top: 20.0, bottom: 0.0),
-
       alignment: Alignment.center,
       height: 173.w,
       width: 345.w,
@@ -52,19 +57,23 @@ class UserInfo extends StatelessWidget {
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   Container(
+                    width: 63.w,
+                    height: 63.w,
                     decoration: BoxDecoration(
                       shape: BoxShape.circle,
+                      image: userInfo.user().avatar!=null?
+                      DecorationImage(
+                        image: NetworkImage(userInfo.user().avatar.toString()),
+                        fit: BoxFit.cover,
+                      ): DecorationImage(
+                        image: AssetImage('images/userMoren.png')
+                      ),
                       border: Border.all(
                         color: Colors.white,
                         width: 2,
                       ),
                     ),
                     margin: EdgeInsets.fromLTRB(30, 0, 15, 0),
-                    alignment: Alignment.center,
-                    child: Image.asset(
-                      "images/userMoren.png",
-                      width: 63.w,
-                    ),
                   ),
                 ],
               ),
@@ -75,8 +84,9 @@ class UserInfo extends StatelessWidget {
                   children: [
                     Container(
                       margin: EdgeInsets.fromLTRB(0, 0, 0, 10),
-                      child: Text(
-                        '符西西',
+                      child:
+                      Text(
+                        userInfo.user().nickName!=null?userInfo.user().nickName.toString():'请修改个人信息！',
                         style: TextStyle(
                           color: Colors.white,
                           fontSize: 17,
@@ -85,12 +95,14 @@ class UserInfo extends StatelessWidget {
                     ),
                     Container(
                       margin: EdgeInsets.fromLTRB(0, 10, 0, 0),
-                      child: Text(
-                        '17775000245',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 17,
-                        ),
+                      child:
+                          Text(
+                            userInfo.user().phone!=null?userInfo.user().phone.toString():'请修改手机号！',
+                            style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 17,
+                            ),
+
                       ),
                     ),
                     // const Text(

lib/pages/orderInfo/index.dart

@@ -116,13 +116,13 @@ class _BottomWidget extends StatelessWidget {
 
 
   void _orderDeletels (){
-    orderDelete(id).then((value) {
-      Fluttertoast.showToast(
-          msg: '订单取消成功！'
-      );
-    });
-
-
+    modal.showDialog(title: '测试', content: SizedBox(width: 400, height: 300,), onConfirm: () => true);
+    // orderDelete(id).then((value) {
+    //   Fluttertoast.showToast(
+    //       msg: '订单取消成功！'
+    //   );
+    //   Get.offNamed('/order');
+    // });
   }
 
 

lib/pages/userInfo/index.dart

@@ -5,29 +5,63 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
+import '../../models/app.dart';
+import '../../models/entities/person.dart';
+import '../../services/user.dart';
+
 class UserInfo extends BasicPage {
-  final name =Rx<String>('');
-  final phone =Rx<String>('');
+  late String name ;
+  late String phone;
   late TextEditingController _cName;
   late TextEditingController _cPhone;
+  AppController userInfo = AppController.t;
+
+
   @override
   void beforeShow() {
     super.beforeShow();
-    _cName = TextEditingController(text: name.value);
-    _cPhone = TextEditingController(text: phone.value);
+    _cName = TextEditingController(text: userInfo.user().nickName.toString());
+    _cPhone = TextEditingController(text:userInfo.user().phone.toString());
+    name=userInfo.user().nickName.toString();
+    phone=userInfo.user().phone.toString();
   }
 
   bool disableLogin = false;
   RegExp exp = RegExp(r'^1[3456789]\d{9}$');
 
+  Map<String, dynamic> data = {
+
+  };
+
+
   void handleOk() {
-    if (name.value == '' && phone.value == '') {
-      Fluttertoast.showToast(msg: '请输入您的信息');
-    } else if (phone.value!=''&&!exp.hasMatch(phone.value)) {
+    if (name == '' && phone == '') {
+      Fluttertoast.showToast(msg: '请输入正确的信息');
+      return;
+
+    } else if (phone==''&&!exp.hasMatch(phone)) {
       Fluttertoast.showToast(msg: '请输入正确的手机号');
+      return;
     } else {
-      Fluttertoast.showToast(msg: '保存成功');
-      Get.back();
+      data={
+        ...userInfo.user().toJson(),
+        'avatar':userInfo.user().avatar ?? '',
+        'nickName': name,
+        'phone': phone
+      };
+      updateInfo(userInfo.user().personId.toString(),data).then((value) {
+        // 尝试获取一次人员信息
+        getCurrent().then((person) {
+          userInfo.user(Person.fromJson(person));
+          Fluttertoast.showToast(msg: '保存成功');
+
+          Get.back();
+
+        }).catchError((e) {
+          print(e);
+        });
+
+      });
     }
   }
 
@@ -59,19 +93,21 @@ class UserInfo extends BasicPage {
             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),
+                  Container(
+                    width: 63.w,
+                    height: 63.w,
+                    decoration: BoxDecoration(
+                      shape: BoxShape.circle,
+                      image: userInfo.user().avatar!=null?
+                      DecorationImage(
+                        image: NetworkImage(userInfo.user().avatar.toString()),
+                        fit: BoxFit.cover,
+                      ): DecorationImage(
+                          image: AssetImage('images/userMoren.png')
+                      ),
+                    ),
                   ),
+
                 ]),
           ),
           Text(
@@ -119,13 +155,15 @@ class UserInfo extends BasicPage {
                               FloatingLabelBehavior.never,
                             ),
                             onChanged: (e) {
-                                name.value = e;
+
+                                name = e;
+                                print(name);
                             },
                           ),
                         ),
                         GestureDetector(
                           onTap: () {
-                              name.value = '';
+                              name = '';
                             _cName.clear();
                           },
                           child: Image.asset(
@@ -184,13 +222,13 @@ class UserInfo extends BasicPage {
                               FloatingLabelBehavior.never,
                             ),
                             onChanged: (e) {
-                                phone.value = e;
+                                phone = e;
                             },
                           ),
                         ),
                         GestureDetector(
                           onTap: () {
-                              phone.value = '';
+                              phone = '';
                             _cPhone.clear();
                           },
                           child: Image.asset(

lib/services/main.dart

@@ -0,0 +1,21 @@
+import 'package:dio/dio.dart';
+import 'package:farmer_client/utils/Request.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+
+/**
+ * 意见反馈
+ * @param {*} data
+ * @returns
+ */
+
+Future feedback(String content) async {
+  return request('/feedback',
+      options: Options(method: 'POST'), data: {'content': content})
+      .catchError((error) => {
+    Fluttertoast.showToast(msg: error.error['message']),
+  });
+}
+
+
+
+

lib/services/user.dart

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