feat

lib/pages/index.dart

@@ -16,3 +16,6 @@ export 'withdrawal/index.dart';
 export 'aboutUs/index.dart';
 export 'agreement/index.dart';
 export 'feedback/index.dart';
+export 'upgrade/index.dart';
+export 'workInShifts/index.dart';
+export 'resetPassword/index.dart';

lib/pages/main/index.dart

@@ -249,6 +249,26 @@ class Main extends BasicPage {
                         EdgeInsets.symmetric(horizontal: 15.w, vertical: 0),
                     child: Column(
                       children: [
+                        MyCell(
+                          head: Image.asset(
+                            'images/main/workinshifts.png',
+                            width: 19.w,
+                          ),
+                          body: Text(
+                            '我的排班',
+                            style: TextStyle(
+                                fontSize: 17.sp,
+                                fontWeight: FontWeight.bold,
+                                color: Color(0xff333333)),
+                          ),
+                          action: Image.asset(
+                            'images/main/goto.png',
+                            width: 10.w,
+                          ),
+                          onClick: () {
+                            Get.toNamed('/workInShifts');
+                          },
+                        ),
                         MyCell(
                           head: Image.asset(
                             'images/main/account.png',
@@ -330,6 +350,26 @@ class Main extends BasicPage {
                             goFeedback();
                           },
                         ),
+                        MyCell(
+                          head: Image.asset(
+                            'images/main/upgrade.png',
+                            width: 19.w,
+                          ),
+                          body: Text(
+                            '系统更新',
+                            style: TextStyle(
+                                fontSize: 17.sp,
+                                fontWeight: FontWeight.bold,
+                                color: Color(0xff333333)),
+                          ),
+                          action: Image.asset(
+                            'images/main/goto.png',
+                            width: 10.w,
+                          ),
+                          onClick: () {
+                            Get.toNamed('/upgrade');
+                          },
+                        ),
                         Container(
                           height: 45.5.h,
                           width: 345.w,

lib/pages/resetPassword/index.dart

@@ -0,0 +1,188 @@
+
+
+import 'package:flutter/material.dart';
+import 'package:flutter/src/widgets/framework.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:worker_client/utils/timer.dart';
+import 'package:worker_client/widgets/layout/BasicPage.dart';
+
+import 'package:worker_client/widgets/MyButton/index.dart';
+
+class ResetPassword extends BasicPage {
+  ResetPassword({Key? key}) : super(key: key) {
+    naviTitle = '修改密码';
+  }
+
+  @override
+  Widget builder(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.all(15.w),
+      decoration: const BoxDecoration(color: Colors.white),
+      child: Column(
+        children: [
+          Expanded(
+            flex: 1,
+            child: ListView(
+              children: [
+                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(
+                                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) {
+                                },
+                              ),
+                            ),
+                            GestureDetector(
+                              behavior: HitTestBehavior.opaque,
+                              onTap: () {},
+                              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(
+                                //赋初值
+                                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) {
+                                },
+                              ),
+                            ),
+                            GestureDetector(
+                              behavior: HitTestBehavior.opaque,
+                              onTap: () {
+                              },
+                              child: Container(
+                                width: 50.w,
+                                alignment: Alignment.center,
+                                child: Image.asset(
+                                  'images/main/cancel.png',
+                                  width: 18.w,
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+          Padding(
+            padding: EdgeInsets.only(bottom: 15.w),
+            child: MyButton(
+              text: '保存',
+              type: 0,
+              pwith: 30.w,
+              disable: false,
+              onClick: () {
+                EasyLoading.show(status: '请稍候...');
+                setTimeout(() {
+                  EasyLoading.showToast("网络超时, 请稍后再试");
+
+                  setTimeout(() {
+                    EasyLoading.dismiss();
+                  }, 1500);
+                }, 3000);
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+}

lib/pages/upgrade/index.dart

@@ -0,0 +1,45 @@
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+import 'package:worker_client/widgets/MyButton/index.dart';
+import 'package:worker_client/widgets/layout/BasicPage.dart';
+
+import 'package:worker_client/utils/timer.dart';
+
+class UpgradePage extends BasicPage {
+  UpgradePage({Key? key}) : super(key: key) {
+    naviTitle = '检查更新';
+  }
+
+  @override
+  Widget builder(BuildContext context) {
+
+    return Container(
+      margin: EdgeInsets.only(top: 24.h),
+      padding: EdgeInsets.symmetric(horizontal: 32.w),
+      child: Column(
+        children: [
+          MyButton (
+            text: '检查更新',
+            type: 0,
+            disable: false,
+            onClick: () {
+              EasyLoading.show(status: '正在检查更新...');
+
+              setTimeout(() {
+                EasyLoading.showToast('当前已是最新版本');
+
+                setTimeout(() {
+                  EasyLoading.dismiss();
+                }, 1500);
+              }, 3000);
+            },
+          )
+        ],
+      ),
+    );
+  }
+
+}

lib/pages/userInfo/index.dart

@@ -80,23 +80,38 @@ class UserInfo extends BasicPage {
                           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',
+                  child: Row(
+                    children: [
+                      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,
+                      ),
+                      const Expanded(child: SizedBox()),
+                      GestureDetector(
+                        onTap: () {
+                          Get.toNamed("/resetPassword");
+                        },
+                        child: Text("修改密码", style: TextStyle(
+                            color: const Color(0xFF333333),
+                            fontSize: 17.sp,
+                            fontWeight: FontWeight.bold,
+                            letterSpacing: 2),),
+                      )
+                    ],
+                  )
                 ),
                 Container(
                   width: 345.w,

lib/pages/workInShifts/index.dart

@@ -0,0 +1,25 @@
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+import 'package:worker_client/widgets/layout/BasicPage.dart';
+
+class WorkInShifts extends BasicPage {
+  WorkInShifts({Key? key}) : super(key: key) {
+    naviTitle = '我的排班';
+  }
+
+  @override
+  Widget builder(BuildContext context) {
+    //
+    return Container(
+      margin: EdgeInsets.only(top: 50.h),
+      child: Image.network(
+        'https://dz-machinery.oss-cn-nanjing.aliyuncs.com/images/%E6%8E%92%E7%8F%AD%E7%A4%BA%E4%BE%8B.png',
+        width: Get.width,
+        fit: BoxFit.cover,
+      ),
+    );
+  }
+
+}

lib/routes/pages.dart

@@ -33,4 +33,7 @@ List<GetPage> pages = [
   GetPage(name: '/aboutUs', page: () => AboutUs()),
   GetPage(name: '/agreement', page: () => Agreement()),
   GetPage(name: '/feedback', page: () => Feedback()),
+  GetPage(name: '/upgrade', page: () => UpgradePage()),
+  GetPage(name: '/workInShifts', page: () => WorkInShifts()),
+  GetPage(name: '/resetPassword', page: () => ResetPassword()),
 ];