扦样界面每个item比例调整。登录短信验证弹窗。个人中心更新内容。

lib/network/api.dart

@@ -112,6 +112,14 @@ abstract class Api {
   @POST('/admin-api/system/auth/reset_password_send_sms_code')
   Future<ApiRsp<bool?>> postPhoneMsg(@Body() Map<String, dynamic> map);
 
+  /// 登录时手机验证码获取
+  @POST('/admin-api/system/auth/send-sms-code')
+  Future<ApiRsp<bool?>> loginWithPhoneMsg(@Body() Map<String, dynamic> map);
+
+  /// 手机验证码验证登录
+  @POST('/admin-api/system/auth/sms-login')
+  Future<ApiRsp<LoginRsp>> smsLogin(@Body() Map<String, dynamic> map);
+
   ///忘记密码
   @POST('/admin-api/system/auth/reset_password')
   Future<ApiRsp<bool?>> resetPassword(@Body() Map<String, dynamic> map);

lib/network/api.g.dart

@@ -681,6 +681,68 @@ class _Api implements Api {
   }
 
   @override
+  Future<ApiRsp<bool?>> loginWithPhoneMsg(Map<String, dynamic> map) async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(map);
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<ApiRsp<bool>>(Options(
+      method: 'POST',
+      headers: _headers,
+      extra: _extra,
+    )
+            .compose(
+              _dio.options,
+              '/admin-api/system/auth/send-sms-code',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    final value = ApiRsp<bool?>.fromJson(
+      _result.data!,
+      (json) => json as bool?,
+    );
+    return value;
+  }
+
+  @override
+  Future<ApiRsp<LoginRsp>> smsLogin(Map<String, dynamic> map) async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final _data = <String, dynamic>{};
+    _data.addAll(map);
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<ApiRsp<LoginRsp>>(Options(
+      method: 'POST',
+      headers: _headers,
+      extra: _extra,
+    )
+            .compose(
+              _dio.options,
+              '/admin-api/system/auth/sms-login',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    final value = ApiRsp<LoginRsp>.fromJson(
+      _result.data!,
+      (json) => LoginRsp.fromJson(json as Map<String, dynamic>),
+    );
+    return value;
+  }
+
+  @override
   Future<ApiRsp<bool?>> resetPassword(Map<String, dynamic> map) async {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};

lib/network/my_api.dart

@@ -14,7 +14,9 @@ class MyApi {
 
   /// 测试url
   // static String testUrl = 'http://101.36.160.117:31070';
-  static String testUrl = 'http://121.36.17.6:9398';
+   static String testUrl = 'http://121.36.17.6:9398';
+
+
 
 
   static late String globalUrl;

lib/page/home/home_page.dart

@@ -16,7 +16,7 @@ class HomePage extends StatefulWidget {
 class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMixin {
   List<String> bannerList = [
     'http://121.36.17.6:19000/quality/app/zsys.png',
-    'https://gd-hbimg.huaban.com/82e60fd3c61530d52ec1d01f80cfda11526c42e4495cb-6JwN1d_fw658webp',
+    'https://gd-hbimg.huaban.com/c7a22fb15d70a0a976e20fb810c048ec11c76fc31ac08-hajElf_fw658webp',
   ];
 
   late List<ServiceModel> serviceList;

lib/page/login/login_page.dart

@@ -11,7 +11,9 @@ import 'package:lszlgl/network/my_api.dart';
 import 'package:lszlgl/service/dict_service.dart';
 import 'package:lszlgl/service/upgrade_service.dart';
 import 'package:lszlgl/service/user_service.dart';
+import 'package:lszlgl/utils/string_utils.dart';
 import 'package:lszlgl/widget/button.dart';
+import 'package:lszlgl/widget/phone_verify_widget.dart';
 
 import '../../config/reresh_config.dart';
 import '../../network/base_dio.dart';
@@ -33,6 +35,25 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
   late ValueNotifier<bool> _showPwd;
   late ValueNotifier<Map<String, dynamic>> _account;
 
+  // 手机号验证码弹窗  软检用
+  Future<bool> verifyPhone(String phone) async {
+    bool canLogin = false;
+    if (StringUtils.isPhoneNum(phone)) {
+      MyNavigator.dismissLoading();
+      canLogin = await showDialog(
+          context: context,
+          barrierDismissible: false,
+          builder: (c) {
+            return PhoneVerifyWidget(phone: phone);
+          });
+    } else {
+      canLogin = true;
+    }
+
+    return canLogin;
+  }
+
+  // 验收时 新增验证码登录
   void onLogin() async {
     var account = accountCtrl.text;
     var pwd = pwdCtrl.text;
@@ -49,6 +70,10 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
         MyNavigator.dismissLoading();
         return;
       }
+
+      // bool canLogin = await verifyPhone(account);
+      // if (!canLogin) return;
+
       await UserService.get().saveLogin(login.data);
 
       // 存储 账号、密码
@@ -176,7 +201,7 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
                   ),
                   const SizedBox(height: 12),
                   Container(
-                    padding: const EdgeInsets.symmetric(horizontal: 10,vertical: 2),
+                    padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 2),
                     decoration: const BoxDecoration(
                         color: Colors.white,
                         borderRadius: BorderRadius.only(
@@ -259,7 +284,11 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
                 child: GestureDetector(
                   child: Padding(
                     padding: const EdgeInsets.only(top: 4, right: 16),
-                    child: Image.asset(imgEyelash, width: 14,height: 14,),
+                    child: Image.asset(
+                      imgEyelash,
+                      width: 14,
+                      height: 14,
+                    ),
                   ),
                   onTap: () {
                     _showPwd.value = !_showPwd.value;
@@ -286,8 +315,8 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
 
   Widget buildEdit(
       {required TextEditingController ctrl,
-      required String hint, 
-        required String titleName,
+      required String hint,
+      required String titleName,
       required String topIcon,
       TextInputAction action = TextInputAction.done,
       bool obscure = false,
@@ -300,32 +329,26 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
         Padding(
           padding: const EdgeInsets.only(left: 8.0),
           child: Row(
-            children: [
-              Image.asset(topIcon, height: 18),
-              const SizedBox(width: 8),
-              Text(titleName)
-            ],
+            children: [Image.asset(topIcon, height: 18), const SizedBox(width: 8), Text(titleName)],
           ),
         ),
         const SizedBox(height: 6),
         TextField(
           controller: ctrl,
           decoration: InputDecoration(
-            border: const OutlineInputBorder(
+              border: const OutlineInputBorder(
+                  borderSide: BorderSide.none, borderRadius: BorderRadius.all(Radius.circular(10))),
+              enabledBorder: const OutlineInputBorder(
                 borderSide: BorderSide.none,
-                borderRadius: BorderRadius.all(Radius.circular(10))),
-            enabledBorder: const OutlineInputBorder(
-              borderSide: BorderSide.none,
-              borderRadius: BorderRadius.all(Radius.circular(10)),
-            ),
-            filled: true,
-            fillColor: const Color(0xffF6F6F8),
-            hintText: hint,
-            hintStyle: const TextStyle(color: Color(0xFFBBBBBB)),
-            isDense: true,
-            suffixIcon: rightIcon,
-            suffixIconConstraints: const BoxConstraints()
-          ),
+                borderRadius: BorderRadius.all(Radius.circular(10)),
+              ),
+              filled: true,
+              fillColor: const Color(0xffF6F6F8),
+              hintText: hint,
+              hintStyle: const TextStyle(color: Color(0xFFBBBBBB)),
+              isDense: true,
+              suffixIcon: rightIcon,
+              suffixIconConstraints: const BoxConstraints()),
           style: const TextStyle(fontSize: 14),
           textInputAction: action,
           obscureText: obscure,

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
-import 'dart:typed_data';
 import 'package:amap_flutter_location/amap_location_option.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:card_swiper/card_swiper.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:lszlgl/main.dart';
 import 'package:lszlgl/page/print/print_page.dart';
@@ -551,6 +551,13 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     return true;
   }
 
+  String? getJWString(String? v){
+    if(v!=null && v.contains('，')){
+      v = v.replaceAll('，', '\n');
+    }
+    return v;
+  }
+
   @override
   bool get wantKeepAlive => true;
 
@@ -624,7 +631,12 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
           ),
           child: Column(
             children: [
-              CardItemWidget('样品单号', rightText: data?.qyrwdh),
+              CardItemWidget('样品单号', rightText: data?.qyrwdh,rightRatio: 3,
+                  onTap:() async{
+                    await Clipboard.setData(ClipboardData(text: data?.qyrwdh ?? '' ));
+                    MyNavigator.showToast('样品单号已复制');
+                  }
+              ),
               CardItemWidget('扦样人员', rightText: data?.name, bottomLine: true),
               otherpeople.builder((v) => CardItemWidget(
                 '陪同人员',
@@ -665,6 +677,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
                 '乡镇',
                 data?.xiangXzqhName?.toString(),
                 onChanged: (value) => data?.xiangXzqhName = value.isEmpty ? null : value,
+                rightRatio: 3
               ),
               CardWidgets.buildEdit(
                 isDetail,
@@ -672,11 +685,12 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
                 '村',
                 data?.cunXzqhName?.toString(),
                 onChanged: (value) => data?.cunXzqhName = value.isEmpty ? null : value,
+                rightRatio: 3
               ),
               qyddjwd.builder(
                     (v) => CardItemWidget(
                   '扦样地点经纬度',
-                  rightText: v,
+                  rightText: getJWString(v),
                   bottomLine: true,
                   trailing: isDetail || v != null ? null : const MyButton('获取经纬度', alignment: null),
                   onTap: isDetail || data?.deliveryStatus == 2 ? null : getLocation,

lib/page/sample_task/reap_sample_detail/reap_sample_disaster_detail_page.dart

@@ -136,6 +136,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
         CardWidgets.buildMenu(
           isDetail,
           '种植土地周围是否有工厂排污',
+          leftRatio: 6,
           boolList,
           zztdzwsfygcpw,
           (_, sel) {
@@ -161,6 +162,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
         CardWidgets.buildMenu(
           isDetail,
           '种植土地周围使用水源、土壤是否有污染',
+          leftRatio: 6,
           boolList,
           zztdzwsysytrsfywr,
           (_, sel) {
@@ -186,6 +188,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
         CardWidgets.buildMenu(
           isDetail,
           '生产过程中是否发生比较严重的病虫害',
+          leftRatio: 6,
           boolList,
           scgczsffsbjyzdbch,
           (_, sel) {
@@ -206,12 +209,14 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '病虫害类型',
           bchlxList,
           bchlx,
+          rightRatio: 2,
           (_, sel) {
             data?.bchlx = sel.value;
           },
         ),
         CardWidgets.buildMenu(
           isDetail,
+          leftRatio: 6,
           '收获期间是否发生连阴雨天气',
           sfList,
           shqjsffslyytq,
@@ -219,6 +224,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
         ),
         CardWidgets.buildMenu(
           isDetail,
+          leftRatio: 6,
           '收获粮食水分是否偏高',
           sfList,
           shlssfsfpg,
@@ -226,6 +232,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
         ),
         CardWidgets.buildMenu(
           isDetail,
+          leftRatio: 6,
           '近年来本地是否发生真菌毒素污染',
           sfList,
           jnlbdsffszmwr,
@@ -251,6 +258,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
         ),
         CardWidgets.buildMenu(
           isDetail,
+          leftRatio: 6,
           '近年来本地是否发生重金属污染',
           sfList,
           jnlbdsfzjswr,

lib/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart

@@ -195,6 +195,7 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
                     CardWidgets.buildEdit(
                       isDetail,
                       '施药方法',
+                      rightRatio: 2,
                       item.syff,
                       backgroundColor: null,
                       onChanged: (value) => item.syff = value,

lib/page/sample_task/reap_sample_detail/reap_sample_org_detail_page.dart

@@ -84,6 +84,7 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
           '食品安全指标检验机构',
           rightText: aqjg,
           bottomLine: true,
+          leftRatio: aqjg==null ? 2:1,
         ),
         // CardItemWidget(
         //   '机构地址',

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -259,6 +259,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
         CardWidgets.buildMenu(
           isDetail,
           '粮食品类',
+          rightRatio: 2,
           lspzList,
           lspz,
           (_, sel) => data?.lspz = sel.value?.toString(),
@@ -266,6 +267,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
         CardWidgets.buildEdit(
           isDetail,
           '种植品种',
+          rightRatio: 2,
           data?.jtpzmc,
           onChanged: (value) => data?.jtpzmc = value,
         ),
@@ -348,6 +350,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
               formatters: [XNumberTextInputFormatter()],
               onChanged: (value) => item.qysl = value.isEmpty ? null : num.parse(value),
               backgroundColor: null,
+              leftRatio: 2
             ),
             CardWidgets.buildEdit(
               isDetail,
@@ -357,6 +360,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
               formatters: [XNumberTextInputFormatter()],
               onChanged: (value) => item.qydbsl = value.isEmpty ? null : num.parse(value),
               backgroundColor: null,
+              leftRatio: 2
             ),
             CardWidgets.buildEdit(
               isDetail,

lib/page/user_center/setting_page.dart

@@ -24,8 +24,8 @@ class _SettingPageState extends BaseState<SettingPage> {
     MyNavigator.pop();
   }
 
-  void onVersionTap() async {
-    UpgradeService.checkUpgrade(true);
+  void onVersionTap(bool show, {bool pop=false}) async {
+    UpgradeService.checkUpgrade(show, pop: pop);
   }
 
   @override
@@ -83,7 +83,18 @@ class _SettingPageState extends BaseState<SettingPage> {
             bottomLine: true,
           ),
           CardItemWidget('版本信息',
-              rightText: 'V${AppConfig.packageInfo.version}', onTap: onVersionTap),
+              rightText: 'V${AppConfig.packageInfo.version}',
+              onTap: (){
+                onVersionTap(true,pop: false);
+              },
+              bottomLine: true,
+          ),
+          CardItemWidget('更新内容',
+            rightChild: const Icon(Icons.keyboard_arrow_right,size: 24, color: Color(0xFF01B2C8)),
+            onTap: (){
+              onVersionTap(true,pop: true);
+            },
+          ),
         ],
       ),
     );

lib/service/upgrade_service.dart

@@ -1,8 +1,10 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
 import 'package:install_plugin/install_plugin.dart';
 import 'package:lszlgl/config/app_config.dart';
+import 'package:lszlgl/widget/button.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 
@@ -54,10 +56,17 @@ class UpgradeService {
     return pathSplit[pathSplit.length - 1];
   }
 
+  static String? getContentsString(String? v) {
+    if (v != null && v.contains('*')) {
+      v = v.replaceAll('*', '\n');
+    }
+    return v;
+  }
+
   static bool checking = false;
 
   /// 检查版本更新
-  static Future<void> checkUpgrade(bool showLoading) async {
+  static Future<void> checkUpgrade(bool showLoading, {bool pop = false}) async {
     if (!Platform.isAndroid) return;
     if (checking) return;
     checking = true;
@@ -75,10 +84,48 @@ class UpgradeService {
         int localCode = int.parse(AppConfig.packageInfo.buildNumber);
         logger.d('versionUpgrade:localCode:$localCode onlineCode:$onlineCode');
         if (localCode >= onlineCode) {
-          if (showLoading) MyNavigator.showToast('已是最新版本');
+          if (showLoading && !pop) {
+            MyNavigator.showToast('已是最新版本');
+          }
+          if (showLoading && pop) {
+            MyNavigator.showDialog(
+              tag: 'pop',
+              builder: (ctx) {
+                return Container(
+                  margin: const EdgeInsets.symmetric(horizontal: 24),
+                  padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
+                  decoration: const BoxDecoration(
+                    color: Colors.white,
+                    borderRadius: BorderRadius.all(Radius.circular(8)),
+                  ),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: [
+                      const Text(
+                        '当前版本更新内容：',
+                        style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
+                      ),
+                      const SizedBox(height: 12),
+                      Text(UpgradeService.getContentsString(contents) ?? ''),
+                      const SizedBox(height: 22),
+                      MyButton(
+                        '知道了',
+                        radius: 8,
+
+                        onTap: () {
+                          MyNavigator.dismiss(tag: 'pop');
+                        },
+                      )
+                    ],
+                  ),
+                );
+              },
+            );
+          }
         } else {
           // 版本更新
-          UpgradeDialog.showDialog(path,contents);
+          UpgradeDialog.showDialog(path, UpgradeService.getContentsString(contents) ?? '');
         }
       }
     } catch (e) {

lib/widget/card_item.dart

@@ -33,6 +33,10 @@ class CardItemWidget extends StatelessWidget {
 
   final Color? backgroundColor;
 
+  // 左右两边 填充比例
+  final int leftRatio;
+  final int rightRatio;
+
   const CardItemWidget(
     this.title, {
     Key? key,
@@ -46,6 +50,8 @@ class CardItemWidget extends StatelessWidget {
     this.showTopLine = false,
     this.bottomLine = false,
     this.backgroundColor = Colors.white,
+    this.leftRatio = 1,
+    this.rightRatio = 1,
   }) : super(key: key);
 
   @override
@@ -56,7 +62,9 @@ class CardItemWidget extends StatelessWidget {
       child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
-          showTopLine ? const Divider(color: Color(0xFFF3F3F3), height: 0, thickness: 1) : const SizedBox.shrink(),
+          showTopLine
+              ? const Divider(color: Color(0xFFF3F3F3), height: 0, thickness: 1)
+              : const SizedBox.shrink(),
           Container(
             constraints: const BoxConstraints(minHeight: 48),
             padding: const EdgeInsets.all(12),
@@ -64,14 +72,16 @@ class CardItemWidget extends StatelessWidget {
             child: Row(
               children: [
                 buildLeading(),
-                SizedBox(width: (MediaQuery.of(context).size.width/2)-20,child: buildTitle()),
+                buildTitle(),
                 const SizedBox(width: 4),
                 buildRight(),
                 buildTrailing(),
               ],
             ),
           ),
-          bottomLine ? const Divider(color: Color(0xFFF3F3F3), height: 0, thickness: 1) : const SizedBox.shrink(),
+          bottomLine
+              ? const Divider(color: Color(0xFFF3F3F3), height: 0, thickness: 1)
+              : const SizedBox.shrink(),
         ],
       ),
     );
@@ -94,12 +104,15 @@ class CardItemWidget extends StatelessWidget {
   }
 
   Widget buildTitle() {
-    return Text(
-      title,
-      style: const TextStyle(
-        color: Color(0xFF515151),
-        fontSize: 14,
-        fontWeight: FontWeight.w300,
+    return Expanded(
+      flex: leftRatio,
+      child: Text(
+        title,
+        style: const TextStyle(
+          color: Color(0xFF515151),
+          fontSize: 14,
+          fontWeight: FontWeight.w300,
+        ),
       ),
     );
   }
@@ -120,6 +133,7 @@ class CardItemWidget extends StatelessWidget {
       );
     }
     return Expanded(
+      flex: rightRatio,
       child: Container(
         alignment: rightAlign,
         child: child,
@@ -145,6 +159,8 @@ class CardItemMenuWidget extends StatelessWidget {
 
   final Color? backgroundColor;
   final Color? menuColor;
+  final int leftRatio;
+  final int rightRatio;
 
   final ValueNotifier<List<CardMenuData>> listNotifier;
   final ValueNotifier<CardMenuData?> selNotifier;
@@ -166,6 +182,9 @@ class CardItemMenuWidget extends StatelessWidget {
     this.backgroundColor = Colors.white,
     this.menuColor = Colors.white,
     this.onSelectTap,
+        this.leftRatio = 1,
+        this.rightRatio = 1,
+
   }) : super(key: key);
 
   void clickMenu() {
@@ -190,6 +209,8 @@ class CardItemMenuWidget extends StatelessWidget {
       bottomLine: bottomLine,
       backgroundColor: backgroundColor,
       rightChild: buildMenu(),
+      leftRatio: leftRatio,
+      rightRatio: rightRatio,
     );
   }
 
@@ -239,7 +260,11 @@ class CardItemMenuWidget extends StatelessWidget {
           selData == null
               ? const Padding(
                   padding: EdgeInsets.only(left: 4),
-                  child: Icon(Icons.keyboard_arrow_down, size: 24, color: Color(0xFF01B2C8),),
+                  child: Icon(
+                    Icons.keyboard_arrow_down,
+                    size: 24,
+                    color: Color(0xFF01B2C8),
+                  ),
                 )
               : const SizedBox.shrink(),
         ],
@@ -259,7 +284,8 @@ class CardItemMenuWidget extends StatelessWidget {
         alignment: Alignment.center,
         child: Text(
           item.name ?? '',
-          style: TextStyle(color: item.value == selData?.value ? const Color(0xFF01B2C8) : MyColor.c_666666),
+          style: TextStyle(
+              color: item.value == selData?.value ? const Color(0xFF01B2C8) : MyColor.c_666666),
         ),
       ),
     );
@@ -297,6 +323,8 @@ class CardWidgets {
     TextEditingController? ctrl,
     int? maxLength,
     String? errorText,
+        int leftRatio = 1,
+        int rightRatio = 1,
   }) {
     if (isDetail) {
       return CardItemWidget(
@@ -304,6 +332,8 @@ class CardWidgets {
         rightText: value,
         bottomLine: bottomLine,
         backgroundColor: backgroundColor,
+        leftRatio: leftRatio,
+        rightRatio: rightRatio,
       );
     }
     return CardItemWidget(
@@ -330,6 +360,8 @@ class CardWidgets {
       ),
       backgroundColor: backgroundColor,
       bottomLine: bottomLine,
+      leftRatio: leftRatio,
+      rightRatio: rightRatio,
     );
   }
 
@@ -349,7 +381,11 @@ class CardWidgets {
         title,
         rightText: v,
         trailing: v == null
-            ? const Icon(Icons.keyboard_arrow_down, size: 24, color: Color(0xFF01B2C8),)
+            ? const Icon(
+                Icons.keyboard_arrow_down,
+                size: 24,
+                color: Color(0xFF01B2C8),
+              )
             : const SizedBox.shrink(),
         bottomLine: true,
         onTap: () async {
@@ -388,7 +424,11 @@ class CardWidgets {
       trailing: isDetail || value != null
           ? null
           : trailing ??
-           const Icon(Icons.keyboard_arrow_down, size: 24, color: Color(0xFF01B2C8),),
+              const Icon(
+                Icons.keyboard_arrow_down,
+                size: 24,
+                color: Color(0xFF01B2C8),
+              ),
       onTap: isDetail
           ? null
           : () async {
@@ -413,6 +453,8 @@ class CardWidgets {
     String? hint,
     bool showTopLine = false,
     bool bottomLine = true,
+        int leftRatio = 1,
+        int rightRatio = 1,
   }) {
     if (isDetail) {
       return selNotifier.builder(
@@ -422,6 +464,8 @@ class CardWidgets {
           bottomLine: bottomLine,
           hint: hint,
           showTopLine: showTopLine,
+          leftRatio: leftRatio,
+          rightRatio: rightRatio,
         ),
       );
     }
@@ -433,6 +477,8 @@ class CardWidgets {
       bottomLine: bottomLine,
       hint: hint,
       showTopLine: showTopLine,
+      leftRatio: leftRatio,
+      rightRatio: rightRatio,
     );
   }
 }

lib/widget/phone_verify_widget.dart

@@ -0,0 +1,136 @@
+import 'package:flutter/material.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/main.dart';
+import 'package:lszlgl/network/my_api.dart';
+import 'package:lszlgl/widget/button.dart';
+import 'package:pin_code_fields/pin_code_fields.dart';
+
+class PhoneVerifyWidget extends StatefulWidget {
+  final String phone;
+  const PhoneVerifyWidget({super.key, required this.phone});
+
+  @override
+  State<PhoneVerifyWidget> createState() => _PhoneVerifyWidgetState();
+}
+
+class _PhoneVerifyWidgetState extends State<PhoneVerifyWidget> {
+  String currentText = "";
+  String starPhone = '';
+
+  /// 获取验证码
+  Future<bool> getPhoneMsg() async {
+    try {
+      var res = await MyApi.get().loginWithPhoneMsg({
+        'mobile': widget.phone,
+        'scene': 21,
+      });
+      //print('$res.data');
+      if (res.data ?? false) {
+        MyNavigator.showToast('验证码已发送');
+        return true;
+      } else {
+        MyNavigator.showToast('验证码发送失败');
+        return false;
+      }
+    } catch (e) {
+      logger.e(e);
+      return false;
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    getPhoneMsg();
+    starPhone = widget.phone.replaceFirst(RegExp(r'\d{4}'), '****', 3);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return PopScope(
+      canPop: false,
+      onPopInvoked: (bool didPop) {
+        if (didPop) {
+          return;
+        } else {
+          Navigator.of(context).pop(false);
+        }
+      },
+      child: Dialog(
+        insetPadding: const EdgeInsets.symmetric(horizontal: 22),
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+        child: Container(
+          padding: const EdgeInsets.fromLTRB(18, 24, 18, 18),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Text('短信验证码',style: TextStyle(fontWeight: FontWeight.bold,fontSize: 16),),
+              const SizedBox(height: 8),
+              Text('已向$starPhone发送短信验证码', style: const TextStyle(color: Colors.grey),),
+              const SizedBox(height: 22),
+              PinCodeTextField(
+                length: 6,
+                appContext: context,
+                autoFocus: true,
+                keyboardType: TextInputType.number,
+                cursorColor: Colors.grey,
+                animationType: AnimationType.scale,
+                pinTheme: PinTheme(
+                    activeColor: const Color(0xFF25A6EE),
+                    selectedColor: const Color(0xFF25A6EE),
+                    inactiveColor: const Color(0xFF25A6EE)),
+                onChanged: (value) {
+                  setState(() {
+                    currentText = value;
+                  });
+                },
+              ),
+              const SizedBox(height: 16),
+              MyButton(
+                '登 录',
+                radius: 8,
+                fontWeight: FontWeight.bold,
+                gradient: const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
+                onTap: () async {
+                  if (currentText.length < 6) {
+                    MyNavigator.showToast('验证码错误');
+                    return;
+                  }
+
+                  MyNavigator.showLoading();
+                  try {
+                    var res = await MyApi.get().smsLogin({
+                      'mobile': widget.phone,
+                      'code': currentText,
+                    });
+                    if (res.data != null) {
+                      if (context.mounted) {
+                        Navigator.of(context).pop(true);
+                      }
+                    }
+                  } catch (e) {
+                    logger.e(e);
+                  }
+                  MyNavigator.dismissLoading();
+                },
+              ),
+              Row(
+                children: [
+                  const Spacer(),
+                  TextButton(
+                      onPressed: () {
+                        getPhoneMsg();
+                      },
+                      child: const Text(
+                        '重发验证码',
+                        style: TextStyle(fontSize: 12, color: Color(0xFF25A6EE)),
+                      ))
+                ],
+              )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/widget/upgrade_dialog.dart

@@ -82,26 +82,26 @@ class UpgradeDialog extends StatelessWidget {
         mainAxisSize: MainAxisSize.min,
         children: [
           Container(
-            alignment: Alignment.topLeft,
+            alignment: Alignment.topCenter,
             child: Text(
               '发现新版本 $versionName',
-              style: const TextStyle(color: Color(0xFF333333), fontSize: 16, fontWeight: FontWeight.w500),
+              style: const TextStyle(color: Color(0xFF333333), fontSize: 16, fontWeight: FontWeight.bold),
             ),
           ),
-
+          const SizedBox(height: 12),
           const SizedBox(
             width: double.infinity,
             child: Text(
-             '更新内容:',
-             style:  TextStyle(fontSize: 14,color: Color(0xFF333333)),
+             '更新内容：',
+             style:  TextStyle(fontSize: 14,color: Color(0xFF333333),fontWeight: FontWeight.bold),
             ),
           ),
-
+          const SizedBox(height: 4),
           SizedBox(
             width: double.infinity,
             child: Text(
               contents,
-              style: const TextStyle(fontSize: 14,color: Color(0xFF333333),fontWeight: FontWeight.bold),
+              style: const TextStyle(fontSize: 14,color: Color(0xFF333333)),
             ),
           ),
 

pubspec.yaml

@@ -99,6 +99,7 @@ dependencies:
   jpush_flutter: 3.0.3
   # 虚线边框
   dotted_border: ^2.1.0
+  pin_code_fields: ^8.0.1
 
 dev_dependencies:
   flutter_test: