'意见反馈'

lib/pages/TabBar/widgets/main/widgets/OtherColumn.dart

@@ -117,33 +117,38 @@ class OtherColumn extends StatelessWidget {
                       ),
                     ),
                   ),
-                  Container(
-                    margin: EdgeInsets.fromLTRB(0, 10.w, 0, 20.w),
-                    width: 310.w,
-                    height: 45.w,
-                    decoration: const BoxDecoration(
-                        border: Border(
-                            bottom:
-                                BorderSide(width: 0.5, color: Color(0x20000000)
-                                    // 0x17000000
-                                    ))),
-                    child: ListTile(
-                      contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
-                      leading: Image(
-                        image: AssetImage('images/feedbacks.png'),
-                        width: 18.w,
-                        height: 21.w,
-                      ),
-                      title: Transform(
-                        transform: Matrix4.translationValues(-20, 0.0, 0.0),
-                        child: Text("意见反馈",
-                            style: TextStyle(
-                                fontSize: 17.sp, color: Color(0xff333333))),
-                      ),
-                      trailing: Image(
-                        image: AssetImage('images/userRight.png'),
-                        width: 10.w,
-                        height: 18.w,
+                  GestureDetector(
+                    onTap: () {
+                      Get.toNamed('/feedback');
+                    },
+                    child: Container(
+                      margin: EdgeInsets.fromLTRB(0, 10.w, 0, 20.w),
+                      width: 310.w,
+                      height: 45.w,
+                      decoration: const BoxDecoration(
+                          border: Border(
+                              bottom: BorderSide(
+                                  width: 0.5, color: Color(0x20000000)
+                                  // 0x17000000
+                                  ))),
+                      child: ListTile(
+                        contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
+                        leading: Image(
+                          image: AssetImage('images/feedbacks.png'),
+                          width: 18.w,
+                          height: 21.w,
+                        ),
+                        title: Transform(
+                          transform: Matrix4.translationValues(-20, 0.0, 0.0),
+                          child: Text("意见反馈",
+                              style: TextStyle(
+                                  fontSize: 17.sp, color: Color(0xff333333))),
+                        ),
+                        trailing: Image(
+                          image: AssetImage('images/userRight.png'),
+                          width: 10.w,
+                          height: 18.w,
+                        ),
                       ),
                     ),
                   ),

lib/pages/feedback/index.dart

@@ -0,0 +1,117 @@
+import 'package:farmer_client/models/entities/Address.dart';
+import 'package:farmer_client/widgets/DefaultButton.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:get/get.dart';
+
+class Feedback extends StatefulWidget {
+  const Feedback({Key? key}) : super(key: key);
+
+  @override
+  _Feedback createState() => _Feedback();
+}
+
+class _Feedback extends State<Feedback> {
+  String text = '';
+  bool isEdit=false;
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      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: Container(
+        height: 700.h,
+        padding: EdgeInsets.all(15.w),
+        child: Stack(
+          children: [
+            Container(
+              margin: EdgeInsets.fromLTRB(0, 0, 0, 50.h),
+              padding: EdgeInsets.symmetric(vertical: 5.w, horizontal: 18.5.w),
+              decoration: BoxDecoration(
+                  color: const Color(0xFFfefefe),
+                  borderRadius: BorderRadius.all(Radius.circular(10.w)),
+                  border: Border.all(
+                      color: const Color(0xcc000000),
+                      width: 1.h,
+                      style: BorderStyle.solid)),
+              child: TextFormField(
+                minLines: 6,
+                maxLines: 6,
+                style: TextStyle(fontSize: 17.sp, height: 1.5),
+                decoration: const InputDecoration(
+                  isCollapsed: true,
+                  border: InputBorder.none,
+                  counterText: '', //去掉计数
+                  floatingLabelBehavior: FloatingLabelBehavior.never,
+                ),
+                onTap: () {
+                  setState(() {
+                    isEdit=true;
+                  });
+                },
+                onChanged: (e) {
+                  setState(() {
+                    text = e;
+                  });
+                },
+              ),
+            ),
+            if(!isEdit) Positioned(
+              left: 20.w,
+              top: 5.w,
+              child: Row(
+                children: [
+                  Image.asset(
+                    'images/icons/feedbackIcon.png',
+                    width: 15.w,
+                  ),
+                  Text(
+                    '请留下您宝贵的意见和建议！',
+                    style: TextStyle(
+                        fontSize: 17.sp,
+                        letterSpacing: 2,
+                        color: Color(0xFFBEBDBD)),
+                  ),
+                ],
+              ),
+            ),
+            Positioned(
+              bottom: 25.h,
+              child: DefaultButton(
+                color: const Color(0xffffffff),
+                backColor: const Color(0xFFFF703B),
+                width: 345.w,
+                height: 49.h,
+                text: '提交',
+                onPressed: () {
+                  if (text == '') {
+                    Fluttertoast.showToast(msg: '请输入内容哦');
+                  } else {
+                    Fluttertoast.showToast(msg: '提交成功！');
+                    Get.back();
+                  }
+                },
+                margin: const EdgeInsets.all(0),
+                fontSize: 20.sp,
+                radius: 24.5.w,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/login/login.dart

@@ -289,7 +289,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                             recognizer:
                             TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
                               ..onTap = () {
-                                print('阅读已同意！！！');
+                                Get.toNamed('/agreement');
                               },
                           ),
                           const TextSpan(

lib/routes/middleWares.dart

@@ -8,7 +8,8 @@ void routingCallback (routing) {
   bool isLogin = box.hasData('token');
   bool isSplashScreen = routing?.current == '/splash';
   bool isLoginPage = routing?.current == '/login';
-  if (!isLogin && !isSplashScreen && !isLoginPage) {
+  bool isAgreementPage = routing?.current == '/agreement';
+  if (!isLogin && !isSplashScreen && !isLoginPage&&!isAgreementPage) {
     // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
     // https://github.com/jonataslaw/getx/issues/262
     SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));

lib/routes/pages.dart

@@ -4,6 +4,7 @@ import 'package:farmer_client/pages/aboutUs/index.dart';
 import 'package:farmer_client/pages/addAddress/index.dart';
 import 'package:farmer_client/pages/addressList/index.dart';
 import 'package:farmer_client/pages/agreement/index.dart';
+import 'package:farmer_client/pages/feedback/index.dart';
 import 'package:farmer_client/pages/userInfo/index.dart';
 import 'package:get/get.dart';
 import '../pages/index.dart';
@@ -20,4 +21,5 @@ List<GetPage> pages = [
   GetPage(name: '/machineryMap', page: () =>  MachineryMapPage()),
   GetPage(name: '/aboutUs', page: () =>  AboutUs()),
   GetPage(name: '/agreement', page: () =>  Agreement()),
+  GetPage(name: '/feedback', page: () =>  Feedback()),
 ];

pubspec.lock

@@ -5,154 +5,154 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "39.0.0"
   amap_flutter_base:
     dependency: transitive
     description:
       name: amap_flutter_base
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
   amap_flutter_map:
     dependency: "direct main"
     description:
       name: amap_flutter_map
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.0"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.15.0"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.2.3"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.6"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.2"
   flutter:
@@ -164,7 +164,7 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   flutter_localizations:
@@ -176,14 +176,14 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
   flutter_screenutil:
     dependency: "direct main"
     description:
       name: flutter_screenutil
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.4.0+1"
   flutter_test:
@@ -200,217 +200,217 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "8.0.9"
   get:
     dependency: "direct main"
     description:
       name: get
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.6.1"
   get_storage:
     dependency: "direct main"
     description:
       name: get_storage
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.3"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.2"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
   intl:
     dependency: transitive
     description:
       name: intl
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.17.0"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.6.3"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.4.0"
   json_serializable:
     dependency: "direct main"
     description:
       name: json_serializable
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.6"
   lints:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   location:
     dependency: "direct main"
     description:
       name: location
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.3.0"
   location_platform_interface:
     dependency: transitive
     description:
       name: location_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.0"
   location_web:
     dependency: transitive
     description:
       name: location_web
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.11"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.7.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.2"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.9"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.12"
   path_provider_ios:
     dependency: transitive
     description:
       name: path_provider_ios
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.5"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.3"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.2"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.2.4"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   sky_engine:
@@ -422,105 +422,105 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.2"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.2"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.5.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.0+1"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.0"
 sdks: