新增扫码，跳转仓库详情。

assets/json/storehouse.json

@@ -0,0 +1,82 @@
+{
+  "code": 0,
+  "data": [
+    {
+      "kqmc": "英吉沙县金麦粮食收储有限公司中心粮站",
+      "tycfbm": "3291653123710827520U01001",
+      "cfmc": "001",
+      "ajmc": "1廒",
+      "hwmc": "P1",
+      "tyhwbm": null,
+      "bgr": "热依罕古丽艾散",
+      "jfsyrq": "2010-06-01",
+      "cnzlxg": "4.5",
+      "cmsl": null,
+      "clgx": null,
+      "lspzmc": null,
+      "lsxzmc": null,
+      "lsdjmc": null,
+      "lqgsdw": null,
+      "rcsj": null,
+      "shnd": null,
+      "cd": null,
+      "cfzt": "完好",
+      "cflx": "高大平房仓(仓房跨度21米及以上，堆粮高度6米及以上)",
+      "ajsjcr": "2500",
+      "jjsl": null,
+      "sjsynx": "70",
+      "zjbgdh": null,
+      "jysj": null,
+      "jyr": null,
+      "jylb": null,
+      "spaqzb": null,
+      "rkrq": null,
+      "jyxm": null,
+      "jyxmz": null,
+      "ckg": "51.74*14.28*7.1",
+      "zjsjList": null,
+      "isUnanimous": null,
+      "reason": null,
+      "itemList": [
+        {
+          "kqmc": "英吉沙县金麦粮食收储有限公司中心粮站",
+          "tycfbm": "3291653123710827520U01001",
+          "cfmc": "001",
+          "tyhwbm": null,
+          "bgr": "热依罕古丽艾散",
+          "jfsyrq": "2010-06-01",
+          "cnzlxg": "4.5",
+          "cmsl": null,
+          "clgx": null,
+          "lspzmc": "小麦",
+          "lsxzmc": "市级地方储备粮",
+          "lsdjmc": "二等",
+          "lqgsdw": "英吉沙县金麦粮油购销有限责任公司",
+          "rcsj": "2021-07-1518:20:50.000000",
+          "shnd": "2021",
+          "cd": "英吉沙县",
+          "cfzt": "1",
+          "cflx": "10101",
+          "ajsjcr": "2500",
+          "jjsl": "2500000",
+          "sjsynx": "70",
+          "zjbgdh": null,
+          "jysj": null,
+          "jyr": null,
+          "jylb": null,
+          "spaqzb": null,
+          "rkrq": null,
+          "jyxm": null,
+          "jyxmz": null,
+          "ckg": "51.74*14.28*7.1",
+          "zjsjList": null,
+          "isUnanimous": null,
+          "reason": null,
+          "ajmc": "1廒",
+          "hwmc": "P1"
+        }
+      ]
+    }
+  ],
+  "msg": ""
+}

lib/config/borders.dart

@@ -0,0 +1,25 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+
+class Borders {
+
+  /// 输入框 底部 边框样式 灰色
+  static const UnderlineInputBorder underBorder = UnderlineInputBorder(
+      borderSide: BorderSide(color: Color(0xFFD6D6D6), width: 0.44));
+
+
+  static const OutlineInputBorder borderA = OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(120)));
+  static const OutlineInputBorder borderB = OutlineInputBorder(
+    borderSide: BorderSide(color: Color(0xFFE6E6E6), width: 1),
+    borderRadius: BorderRadius.all(Radius.circular(120)),
+  );
+
+}
+
+class TextStyles {
+  static const TextStyle titA = TextStyle(fontSize: 15,fontWeight: FontWeight.bold);
+  static const TextStyle titB = TextStyle(color: Colors.grey,fontSize: 15);
+  static const TextStyle titC = TextStyle(fontSize: 15);
+}
+

lib/model/rsp/storehouse_rsp.dart

@@ -0,0 +1,176 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import '../num_converter.dart';
+import '../string_converter.dart';
+
+part 'storehouse_rsp.g.dart';
+
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
+class storehouseRspItemList {
+  String? kqmc;
+  String? tycfbm;
+  String? cfmc;
+  String? tyhwbm;
+  String? bgr;
+  String? jfsyrq;
+  String? cnzlxg;
+  String? cmsl;
+  String? clgx;
+  String? lspzmc;
+  String? lsxzmc;
+  String? lsdjmc;
+  String? lqgsdw;
+  String? rcsj;
+  String? shnd;
+  String? cd;
+  String? cfzt;
+  String? cflx;
+  String? ajsjcr;
+  String? jjsl;
+  String? sjsynx;
+  String? zjbgdh;
+  String? jysj;
+  String? jyr;
+  String? jylb;
+  String? spaqzb;
+  String? rkrq;
+  String? jyxm;
+  String? jyxmz;
+  String? ckg;
+  String? zjsjList;
+  String? isUnanimous;
+  String? reason;
+  String? ajmc;
+  String? hwmc;
+
+  storehouseRspItemList({
+    this.kqmc,
+    this.tycfbm,
+    this.cfmc,
+    this.tyhwbm,
+    this.bgr,
+    this.jfsyrq,
+    this.cnzlxg,
+    this.cmsl,
+    this.clgx,
+    this.lspzmc,
+    this.lsxzmc,
+    this.lsdjmc,
+    this.lqgsdw,
+    this.rcsj,
+    this.shnd,
+    this.cd,
+    this.cfzt,
+    this.cflx,
+    this.ajsjcr,
+    this.jjsl,
+    this.sjsynx,
+    this.zjbgdh,
+    this.jysj,
+    this.jyr,
+    this.jylb,
+    this.spaqzb,
+    this.rkrq,
+    this.jyxm,
+    this.jyxmz,
+    this.ckg,
+    this.zjsjList,
+    this.isUnanimous,
+    this.reason,
+    this.ajmc,
+    this.hwmc,
+  });
+
+  factory storehouseRspItemList.fromJson(Map<String, dynamic> json) => _$storehouseRspItemListFromJson(json);
+  Map<String, dynamic> toJson()=> _$storehouseRspItemListToJson(this);
+
+  // 2021-07-1518:20:50.000000
+  String? timeStr(){
+    if (rcsj == null) return null;
+    var time = rcsj!.substring(0, 10);
+    return time;
+  }
+
+}
+
+@JsonSerializable(converters: [NumConverter(), StringConverter()])
+class storehouseRsp {
+  String? kqmc;
+  String? tycfbm;
+  String? cfmc;
+  String? ajmc;
+  String? hwmc;
+  String? tyhwbm;
+  String? bgr;
+  String? jfsyrq;
+  String? cnzlxg;
+  String? cmsl;
+  String? clgx;
+  String? lspzmc;
+  String? lsxzmc;
+  String? lsdjmc;
+  String? lqgsdw;
+  String? rcsj;
+  String? shnd;
+  String? cd;
+  String? cfzt;
+  String? cflx;
+  String? ajsjcr;
+  String? jjsl;
+  String? sjsynx;
+  String? zjbgdh;
+  String? jysj;
+  String? jyr;
+  String? jylb;
+  String? spaqzb;
+  String? rkrq;
+  String? jyxm;
+  String? jyxmz;
+  String? ckg;
+  String? zjsjList;
+  String? isUnanimous;
+  String? reason;
+  List<storehouseRspItemList?>? itemList;
+
+  storehouseRsp({
+    this.kqmc,
+    this.tycfbm,
+    this.cfmc,
+    this.ajmc,
+    this.hwmc,
+    this.tyhwbm,
+    this.bgr,
+    this.jfsyrq,
+    this.cnzlxg,
+    this.cmsl,
+    this.clgx,
+    this.lspzmc,
+    this.lsxzmc,
+    this.lsdjmc,
+    this.lqgsdw,
+    this.rcsj,
+    this.shnd,
+    this.cd,
+    this.cfzt,
+    this.cflx,
+    this.ajsjcr,
+    this.jjsl,
+    this.sjsynx,
+    this.zjbgdh,
+    this.jysj,
+    this.jyr,
+    this.jylb,
+    this.spaqzb,
+    this.rkrq,
+    this.jyxm,
+    this.jyxmz,
+    this.ckg,
+    this.zjsjList,
+    this.isUnanimous,
+    this.reason,
+    this.itemList,
+  });
+  factory storehouseRsp.fromJson(Map<String, dynamic> json) => _$storehouseRspFromJson(json);
+  Map<String, dynamic> toJson() => _$storehouseRspToJson(this);
+}
+

lib/model/rsp/storehouse_rsp.g.dart

@@ -0,0 +1,171 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'storehouse_rsp.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+storehouseRspItemList _$storehouseRspItemListFromJson(
+        Map<String, dynamic> json) =>
+    storehouseRspItemList(
+      kqmc: const StringConverter().fromJson(json['kqmc']),
+      tycfbm: const StringConverter().fromJson(json['tycfbm']),
+      cfmc: const StringConverter().fromJson(json['cfmc']),
+      tyhwbm: const StringConverter().fromJson(json['tyhwbm']),
+      bgr: const StringConverter().fromJson(json['bgr']),
+      jfsyrq: const StringConverter().fromJson(json['jfsyrq']),
+      cnzlxg: const StringConverter().fromJson(json['cnzlxg']),
+      cmsl: const StringConverter().fromJson(json['cmsl']),
+      clgx: const StringConverter().fromJson(json['clgx']),
+      lspzmc: const StringConverter().fromJson(json['lspzmc']),
+      lsxzmc: const StringConverter().fromJson(json['lsxzmc']),
+      lsdjmc: const StringConverter().fromJson(json['lsdjmc']),
+      lqgsdw: const StringConverter().fromJson(json['lqgsdw']),
+      rcsj: const StringConverter().fromJson(json['rcsj']),
+      shnd: const StringConverter().fromJson(json['shnd']),
+      cd: const StringConverter().fromJson(json['cd']),
+      cfzt: const StringConverter().fromJson(json['cfzt']),
+      cflx: const StringConverter().fromJson(json['cflx']),
+      ajsjcr: const StringConverter().fromJson(json['ajsjcr']),
+      jjsl: const StringConverter().fromJson(json['jjsl']),
+      sjsynx: const StringConverter().fromJson(json['sjsynx']),
+      zjbgdh: const StringConverter().fromJson(json['zjbgdh']),
+      jysj: const StringConverter().fromJson(json['jysj']),
+      jyr: const StringConverter().fromJson(json['jyr']),
+      jylb: const StringConverter().fromJson(json['jylb']),
+      spaqzb: const StringConverter().fromJson(json['spaqzb']),
+      rkrq: const StringConverter().fromJson(json['rkrq']),
+      jyxm: const StringConverter().fromJson(json['jyxm']),
+      jyxmz: const StringConverter().fromJson(json['jyxmz']),
+      ckg: const StringConverter().fromJson(json['ckg']),
+      zjsjList: const StringConverter().fromJson(json['zjsjList']),
+      isUnanimous: const StringConverter().fromJson(json['isUnanimous']),
+      reason: const StringConverter().fromJson(json['reason']),
+      ajmc: const StringConverter().fromJson(json['ajmc']),
+      hwmc: const StringConverter().fromJson(json['hwmc']),
+    );
+
+Map<String, dynamic> _$storehouseRspItemListToJson(
+        storehouseRspItemList instance) =>
+    <String, dynamic>{
+      'kqmc': const StringConverter().toJson(instance.kqmc),
+      'tycfbm': const StringConverter().toJson(instance.tycfbm),
+      'cfmc': const StringConverter().toJson(instance.cfmc),
+      'tyhwbm': const StringConverter().toJson(instance.tyhwbm),
+      'bgr': const StringConverter().toJson(instance.bgr),
+      'jfsyrq': const StringConverter().toJson(instance.jfsyrq),
+      'cnzlxg': const StringConverter().toJson(instance.cnzlxg),
+      'cmsl': const StringConverter().toJson(instance.cmsl),
+      'clgx': const StringConverter().toJson(instance.clgx),
+      'lspzmc': const StringConverter().toJson(instance.lspzmc),
+      'lsxzmc': const StringConverter().toJson(instance.lsxzmc),
+      'lsdjmc': const StringConverter().toJson(instance.lsdjmc),
+      'lqgsdw': const StringConverter().toJson(instance.lqgsdw),
+      'rcsj': const StringConverter().toJson(instance.rcsj),
+      'shnd': const StringConverter().toJson(instance.shnd),
+      'cd': const StringConverter().toJson(instance.cd),
+      'cfzt': const StringConverter().toJson(instance.cfzt),
+      'cflx': const StringConverter().toJson(instance.cflx),
+      'ajsjcr': const StringConverter().toJson(instance.ajsjcr),
+      'jjsl': const StringConverter().toJson(instance.jjsl),
+      'sjsynx': const StringConverter().toJson(instance.sjsynx),
+      'zjbgdh': const StringConverter().toJson(instance.zjbgdh),
+      'jysj': const StringConverter().toJson(instance.jysj),
+      'jyr': const StringConverter().toJson(instance.jyr),
+      'jylb': const StringConverter().toJson(instance.jylb),
+      'spaqzb': const StringConverter().toJson(instance.spaqzb),
+      'rkrq': const StringConverter().toJson(instance.rkrq),
+      'jyxm': const StringConverter().toJson(instance.jyxm),
+      'jyxmz': const StringConverter().toJson(instance.jyxmz),
+      'ckg': const StringConverter().toJson(instance.ckg),
+      'zjsjList': const StringConverter().toJson(instance.zjsjList),
+      'isUnanimous': const StringConverter().toJson(instance.isUnanimous),
+      'reason': const StringConverter().toJson(instance.reason),
+      'ajmc': const StringConverter().toJson(instance.ajmc),
+      'hwmc': const StringConverter().toJson(instance.hwmc),
+    };
+
+storehouseRsp _$storehouseRspFromJson(Map<String, dynamic> json) =>
+    storehouseRsp(
+      kqmc: const StringConverter().fromJson(json['kqmc']),
+      tycfbm: const StringConverter().fromJson(json['tycfbm']),
+      cfmc: const StringConverter().fromJson(json['cfmc']),
+      ajmc: const StringConverter().fromJson(json['ajmc']),
+      hwmc: const StringConverter().fromJson(json['hwmc']),
+      tyhwbm: const StringConverter().fromJson(json['tyhwbm']),
+      bgr: const StringConverter().fromJson(json['bgr']),
+      jfsyrq: const StringConverter().fromJson(json['jfsyrq']),
+      cnzlxg: const StringConverter().fromJson(json['cnzlxg']),
+      cmsl: const StringConverter().fromJson(json['cmsl']),
+      clgx: const StringConverter().fromJson(json['clgx']),
+      lspzmc: const StringConverter().fromJson(json['lspzmc']),
+      lsxzmc: const StringConverter().fromJson(json['lsxzmc']),
+      lsdjmc: const StringConverter().fromJson(json['lsdjmc']),
+      lqgsdw: const StringConverter().fromJson(json['lqgsdw']),
+      rcsj: const StringConverter().fromJson(json['rcsj']),
+      shnd: const StringConverter().fromJson(json['shnd']),
+      cd: const StringConverter().fromJson(json['cd']),
+      cfzt: const StringConverter().fromJson(json['cfzt']),
+      cflx: const StringConverter().fromJson(json['cflx']),
+      ajsjcr: const StringConverter().fromJson(json['ajsjcr']),
+      jjsl: const StringConverter().fromJson(json['jjsl']),
+      sjsynx: const StringConverter().fromJson(json['sjsynx']),
+      zjbgdh: const StringConverter().fromJson(json['zjbgdh']),
+      jysj: const StringConverter().fromJson(json['jysj']),
+      jyr: const StringConverter().fromJson(json['jyr']),
+      jylb: const StringConverter().fromJson(json['jylb']),
+      spaqzb: const StringConverter().fromJson(json['spaqzb']),
+      rkrq: const StringConverter().fromJson(json['rkrq']),
+      jyxm: const StringConverter().fromJson(json['jyxm']),
+      jyxmz: const StringConverter().fromJson(json['jyxmz']),
+      ckg: const StringConverter().fromJson(json['ckg']),
+      zjsjList: const StringConverter().fromJson(json['zjsjList']),
+      isUnanimous: const StringConverter().fromJson(json['isUnanimous']),
+      reason: const StringConverter().fromJson(json['reason']),
+      itemList: (json['itemList'] as List<dynamic>?)
+          ?.map((e) => e == null
+              ? null
+              : storehouseRspItemList.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+
+Map<String, dynamic> _$storehouseRspToJson(storehouseRsp instance) =>
+    <String, dynamic>{
+      'kqmc': const StringConverter().toJson(instance.kqmc),
+      'tycfbm': const StringConverter().toJson(instance.tycfbm),
+      'cfmc': const StringConverter().toJson(instance.cfmc),
+      'ajmc': const StringConverter().toJson(instance.ajmc),
+      'hwmc': const StringConverter().toJson(instance.hwmc),
+      'tyhwbm': const StringConverter().toJson(instance.tyhwbm),
+      'bgr': const StringConverter().toJson(instance.bgr),
+      'jfsyrq': const StringConverter().toJson(instance.jfsyrq),
+      'cnzlxg': const StringConverter().toJson(instance.cnzlxg),
+      'cmsl': const StringConverter().toJson(instance.cmsl),
+      'clgx': const StringConverter().toJson(instance.clgx),
+      'lspzmc': const StringConverter().toJson(instance.lspzmc),
+      'lsxzmc': const StringConverter().toJson(instance.lsxzmc),
+      'lsdjmc': const StringConverter().toJson(instance.lsdjmc),
+      'lqgsdw': const StringConverter().toJson(instance.lqgsdw),
+      'rcsj': const StringConverter().toJson(instance.rcsj),
+      'shnd': const StringConverter().toJson(instance.shnd),
+      'cd': const StringConverter().toJson(instance.cd),
+      'cfzt': const StringConverter().toJson(instance.cfzt),
+      'cflx': const StringConverter().toJson(instance.cflx),
+      'ajsjcr': const StringConverter().toJson(instance.ajsjcr),
+      'jjsl': const StringConverter().toJson(instance.jjsl),
+      'sjsynx': const StringConverter().toJson(instance.sjsynx),
+      'zjbgdh': const StringConverter().toJson(instance.zjbgdh),
+      'jysj': const StringConverter().toJson(instance.jysj),
+      'jyr': const StringConverter().toJson(instance.jyr),
+      'jylb': const StringConverter().toJson(instance.jylb),
+      'spaqzb': const StringConverter().toJson(instance.spaqzb),
+      'rkrq': const StringConverter().toJson(instance.rkrq),
+      'jyxm': const StringConverter().toJson(instance.jyxm),
+      'jyxmz': const StringConverter().toJson(instance.jyxmz),
+      'ckg': const StringConverter().toJson(instance.ckg),
+      'zjsjList': const StringConverter().toJson(instance.zjsjList),
+      'isUnanimous': const StringConverter().toJson(instance.isUnanimous),
+      'reason': const StringConverter().toJson(instance.reason),
+      'itemList': instance.itemList,
+    };

lib/network/my_api.dart

@@ -6,14 +6,14 @@ import 'api.dart';
 class MyApi {
   MyApi._();
 
-  /// 生产url
-  static String productUrl = 'http://121.36.17.6:39099';
+  /// 华为 生产url
+  //static String productUrl = 'http://121.36.17.6:39099';
 
-  /// 紫光正式
-  //static String productUrl = 'http://101.36.160.117:39099';
+  /// 紫光 生产正式 url
+  static String productUrl = 'http://101.36.160.117:39099';
 
   /// 测试url
-  static String testUrl = 'http://121.36.17.6:19090';
+  static String testUrl = 'http://101.36.160.117:31070';
 
   static late String globalUrl;
 

lib/page/home/store_house_page.dart

@@ -0,0 +1,171 @@
+import 'dart:convert';
+
+import 'package:dotted_border/dotted_border.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/base/base_vm.dart';
+import 'package:lszlgl/config/borders.dart';
+import 'package:lszlgl/main.dart';
+import 'package:lszlgl/model/api_rsp.dart';
+import 'package:lszlgl/model/rsp/storehouse_rsp.dart';
+import 'package:lszlgl/widget/page_widget.dart';
+import 'package:lszlgl/widget/storehouse_item.dart';
+
+
+class StoreHousePage extends StatefulWidget {
+  final String houseNum;
+
+  const StoreHousePage({super.key, required this.houseNum});
+
+  @override
+  State<StoreHousePage> createState() => _StoreHousePageState();
+}
+
+class _StoreHousePageState extends BaseLifecycleState<StoreHousePage> {
+  final pageState = DataStatusModel<storehouseRsp?>().notifier<DataStatusModel<storehouseRsp?>>();
+  storehouseRsp? data;
+  final ValueNotifier<String> _title = ValueNotifier<String>('仓房信息');
+
+  @override
+  void onFirstShow(Duration timeStamp) {
+    loadData();
+  }
+
+  @override
+  void onDestroy() {
+    pageState.dispose();
+  }
+
+  void loadData() async{
+    pageState.update(pageState.value.loading());
+    try{
+      String jsonStr = await Future.delayed(const Duration(seconds: 3),()async{
+        return rootBundle.loadString('assets/json/storehouse.json');
+      });
+      Map<String,dynamic> val = json.decode(jsonStr);
+      ApiRsp<List<storehouseRsp?>> res= ApiRsp<List<storehouseRsp>>.fromJson(
+        val,
+            (json) => json is List<dynamic>
+            ? json
+            .map<storehouseRsp>((i) => storehouseRsp.fromJson(i as Map<String, dynamic>))
+            .toList()
+            : List.empty(),
+      );
+      if(res.data == null ){
+        pageState.update(pageState.value.empty());
+      }else{
+        data = res.data!.first;
+        _title.value = data?.kqmc ?? '仓房信息' ;
+        pageState.update(pageState.value.success(data: res.data!.first));
+      }
+    }catch(e){
+      logger.e(e);
+      pageState.update(pageState.value.error());
+    }
+  }
+
+
+  @override
+  Widget build(BuildContext context) {
+    return myScaffold(
+        child: KeyboardDismissOnTap(
+          dismissOnCapturedTaps: true,
+            child: Column(
+              children: [
+                ValueListenableBuilder(
+                  valueListenable: _title,
+                  builder: (_,String title,__){
+                    return myAppBar(title: title);
+                  },
+                ),
+                Expanded(
+                    child:Container(
+                      color: Colors.white,
+                      child: SingleChildScrollView(
+                        child: pageState.builder((v){
+                          if(v.status == DataStatus.error){
+                            return PageLoadingWidget.error(onTap: loadData);
+                          }
+
+                          if(v.status == DataStatus.empty){
+                            return const PageLoadingWidget.empty();
+                          }
+
+                          if(v.status == DataStatus.loading){
+                            return const PageLoadingWidget.loading();
+                          }
+
+                          return Column(
+                            //crossAxisAlignment: CrossAxisAlignment.stretch,
+                            children: [
+                              Padding(padding: const EdgeInsets.fromLTRB(22, 20, 22, 4),
+                              child: Column(
+                                crossAxisAlignment: CrossAxisAlignment.stretch,
+                                children: [
+                                  Text(data?.cfmc ?? '',style: TextStyles.titA,),
+                                  const SizedBox(height: 12),
+                                  Text('仓房编号：${data?.tycfbm}',style: TextStyles.titA),
+                                  const SizedBox(height: 12),
+                                  const Divider(thickness: 0.6,),
+                                  const SizedBox(height: 6),
+                                  StorehouseItem(special: true,left: data?.cflx,right: data?.cfzt),
+                                  StorehouseItem(left: '保管员',right: data?.bgr),
+                                  StorehouseItem(left: '交付使用日期', right: data?.jfsyrq),
+                                  const SizedBox(height: 10),
+                                  const Divider(thickness: 0.6,),
+                                ],
+                              ),
+                              ),
+                              const StoreHouseTit(tit: '仓房信息'),
+                              Padding(padding: const EdgeInsets.fromLTRB(22, 8, 22, 4),
+                              child:Column(
+                                crossAxisAlignment: CrossAxisAlignment.stretch,
+                                children: [
+                                  StorehouseItem(left: '设计仓容',right: '${data?.ajsjcr}吨',),
+                                  StorehouseItem(left: '设计使用年限',right: '${data?.sjsynx}年',),
+                                  StorehouseItem(left: '装粮线高',right: '${data?.cnzlxg}米',),
+                                  StorehouseItem(left: '长*宽*高',right: data?.ckg,),
+                                  const SizedBox(height: 10),
+                                  const Divider(thickness: 0.6,),
+                                ],
+                              )
+                              ),
+                              const StoreHouseTit(tit: '粮食库存'),
+                              Container(
+                                padding: const EdgeInsets.symmetric(horizontal:22,vertical: 12),
+                                child: DottedBorder(
+                                  strokeWidth: 0.8,
+                                  color: Colors.grey,
+                                  dashPattern:const[3,4],
+                                  padding: const EdgeInsets.all(8),
+                                  child: Column(
+                                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                                    children: [
+                                      StorehouseItem(left: '粮食品种',right: data?.itemList?.first?.lspzmc),
+                                      StorehouseItem(left: '粮食等级',right: data?.itemList?.first?.lsdjmc),
+                                      StorehouseItem(left: '库存',right: '${data?.itemList?.first?.jjsl}吨'),
+                                      StorehouseItem(left: '储存性质',right: data?.itemList?.first?.lsxzmc),
+                                      StorehouseItem(left: '粮权归属单位',right: data?.itemList?.first?.lqgsdw),
+                                      StorehouseItem(left: '入仓时间',right: data?.itemList?.first?.timeStr()),
+                                      StorehouseItem(left: '产地',right: data?.itemList?.first?.cd),
+                                      StorehouseItem(left: '收货年度',right: '${data?.itemList?.first?.shnd}年'),
+                                    ],
+                                  ),
+                                ),
+                              )
+                            ],
+                          );
+                        }
+                        ),
+                      ),
+                    )
+
+                ),
+              ],
+            )
+        ),
+    );
+  }
+}

lib/page/login/forget_password_page.dart

@@ -0,0 +1,180 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
+import 'package:lszlgl/base/base_state.dart';
+import 'package:lszlgl/config/borders.dart';
+import 'package:lszlgl/main.dart';
+import 'package:lszlgl/network/my_api.dart';
+import 'package:lszlgl/utils/string_utils.dart';
+import 'package:lszlgl/widget/button.dart';
+import 'package:lszlgl/widget/countdown_button_widget.dart';
+
+class ForgetPasswordPage extends StatefulWidget {
+  const ForgetPasswordPage({super.key});
+
+  @override
+  State<ForgetPasswordPage> createState() => _ForgetPasswordPageState();
+}
+
+class _ForgetPasswordPageState extends BaseState<ForgetPasswordPage> {
+  late GlobalKey<FormState> textFormKey;
+  late TextEditingController phoneCtrl;
+  late TextEditingController msgCtrl;
+  late TextEditingController pwdCtrl;
+
+  @override
+  void initState() {
+    super.initState();
+    textFormKey = GlobalKey<FormState>();
+    phoneCtrl = TextEditingController();
+    msgCtrl = TextEditingController();
+    pwdCtrl = TextEditingController();
+  }
+
+  /// 重置密码
+  void resetPwd() async{
+    MyNavigator.showLoading(msg: '密码设置中...');
+    try{
+      var res = await MyApi.get().resetPassword({
+        'username': phoneCtrl.text,
+        'password': pwdCtrl.text,
+        'code':msgCtrl.text,
+      });
+      if(res.data ?? false){
+        MyNavigator.showToast('密码设置成功');
+        MyNavigator.pop();
+      }
+    }catch(e){
+      logger.e(e);
+    }
+    MyNavigator.dismissLoading();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return myScaffold(
+        child: KeyboardDismissOnTap(
+            dismissOnCapturedTaps: true,
+            child: Column(
+              children: [
+                myAppBar(title: '忘记密码'),
+                Expanded(
+                    child: Container(
+                  color: Colors.white,
+                  child: SingleChildScrollView(
+                    padding: const EdgeInsets.fromLTRB(22, 40, 22, 20),
+                    child: Form(
+                      key: textFormKey,
+                      child: Column(
+                        children: [
+                          TextFormField(
+                            controller: phoneCtrl,
+                            keyboardType: TextInputType.number,
+                            decoration: const InputDecoration(
+                              hintText: '手机号',
+                              contentPadding: EdgeInsets.symmetric(horizontal: 20,vertical: 6),
+                              border: Borders.borderA,
+                              enabledBorder: Borders.borderB,
+                            ),
+                            validator: (val){
+                              return StringUtils.isPhoneNum(val) ? null : '请输入手机号';
+                            },
+                          ),
+                          const SizedBox(height: 16),
+
+                          TextFormField(
+                            controller: msgCtrl,
+                            keyboardType: TextInputType.number,
+                            decoration: InputDecoration(
+                              hintText: '验证码',
+                              contentPadding: const EdgeInsets.symmetric(horizontal: 20,vertical: 6),
+                              border: Borders.borderA,
+                              enabledBorder: Borders.borderB,
+                              suffixIconConstraints: const BoxConstraints(maxHeight: 26),
+                              suffixIcon: Padding(
+                                padding: const EdgeInsets.only(right: 20),
+                                child: CountdownButtonWidget(
+                                  phoneController: phoneCtrl,
+                                ),
+                              ),
+                            ),
+                            validator: (value){
+                              return value!.trim().isEmpty ? '请输入验证码' : null;
+                            },
+                          ),
+                          const SizedBox(height: 16),
+
+                          TextFormField(
+                            controller: pwdCtrl,
+                            obscureText: true,
+                            decoration: const InputDecoration(
+                              hintText: '新密码',
+                              contentPadding: EdgeInsets.symmetric(horizontal: 20,vertical: 6),
+                              border: Borders.borderA,
+                              enabledBorder: Borders.borderB,
+                            ),
+                            validator: (val){
+                              if(val!.length < 8){
+                                return '密码长度要大于8位';
+                              }
+                              var regex = RegExp(r'\d');
+                              if (!regex.hasMatch(val)) {
+                                return '密码要包含数字';
+                              }
+                              regex = RegExp(r'[a-zA-Z]');
+                              if (!regex.hasMatch(val)) {
+                                return '密码要包含大写字母或小写字母';
+                              }
+                              regex = RegExp(r'[!\"#$%&()*+,-./:;<=>?@\]\[^_`{|}~]');
+                              if (!regex.hasMatch(val)) {
+                                return '密码要包含特殊字符';
+                              }
+                              return null;
+                            },
+                          ),
+                          const SizedBox(height: 16),
+
+                          TextFormField(
+                            obscureText: true,
+                            decoration: const InputDecoration(
+                                hintText: '再次输入新密码',
+                                contentPadding: EdgeInsets.symmetric(horizontal: 20,vertical: 6),
+                                border: Borders.borderA,
+                                enabledBorder: Borders.borderB,
+                            ),
+                            validator: (val){
+                              if(val!.trim().isEmpty){
+                                return '请再次输入新密码';
+                              }
+                              if(val != pwdCtrl.text){
+                                return '两次输入密码不一致';
+                              }
+                              return null;
+                            },
+                          ),
+                          const SizedBox(height: 20),
+
+                          const Text(
+                            '*密码长度大于8位，包含数字、字母和特殊字符。',
+                            style: TextStyle(color: Colors.black54),
+                          ),
+                          const SizedBox(height: 36),
+
+                          MyButton(
+                            '确定',
+                            gradient: const LinearGradient(colors: [Color(0xFF3BD2E5), Color(0xFF247AF8)]),
+                            minHeight: 40,
+                            onTap: () {
+                              if (textFormKey.currentState!.validate()) {
+                                resetPwd();
+                              }
+                            },
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                )),
+              ],
+            )));
+  }
+}

lib/page/qrcode_scan/qrcode_scan_page.dart

@@ -39,6 +39,19 @@ class _QrCodeScanPageState extends BaseLifecycleState<QrCodeScanPage> with Singl
       showErrorDialog('内容为空，请扫描正确二维码');
       return;
     }
+
+    // 库房详情  http://121.36.17.6:18089/?ajbm=3291653123710827520U010011
+    if(code.contains('?ajbm=')){
+      List<String> list = code.split('ajbm=');
+      if(list.last.isEmpty){
+        showErrorDialog(code);
+        return;
+      }else{
+        MyRouter.startStoreHouse(list.last);
+        return;
+      }
+    }
+
     // 121.36.17.6:19090/admin-api/zj/code-sampling-task-details-sgjc/getSamplingTaskDetails?id=47106
     List<String> split = code.split('?');
     if (!code.contains('?') || split.length <= 1 || !split[0].contains('/')) {

lib/router/my_router.dart

@@ -1,4 +1,5 @@
 import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/page/home/store_house_page.dart';
 import 'package:lszlgl/page/login/forget_password_page.dart';
 import 'package:lszlgl/page/login/login_page.dart';
 import 'package:lszlgl/page/main_tab_page.dart';
@@ -41,6 +42,8 @@ const rConnectPrintPage = '/ConnectPrintPage';
 const rQrCodeScanPage = '/QrCodeScanPage';
 // 忘记密码
 const rForgetPasswordPage = '/ForgetPasswordPage';
+// 仓库信息
+const rStoreHousePage = '/StoreHousePage';
 
 final Map<String, MyNavigatorBuilder> rRouteMap = {
   // 根页面
@@ -57,6 +60,7 @@ final Map<String, MyNavigatorBuilder> rRouteMap = {
   rConnectPrintPage: (context, args) => ConnectPrintPage(args: args as ConnectPrintPageArgs),
   rQrCodeScanPage: (context, args) => const QrCodeScanPage(),
   rForgetPasswordPage:(context,args) => const ForgetPasswordPage(),
+  rStoreHousePage:(context,args) => StoreHousePage(houseNum: args as String),
 };
 
 class MyRouter {
@@ -115,6 +119,11 @@ class MyRouter {
     }
   }
 
+  /// 仓库详情
+  static void startStoreHouse(String num) {
+    MyNavigator.pushReplace(rStoreHousePage, args: num);
+  }
+
   /// 库存扦样任务
   static Future<dynamic> startStockSampleTask({StockSampleTaskPageArgs? args}) {
     return MyNavigator.push(rStockSampleTaskPage, args: args ?? StockSampleTaskPageArgs());

lib/service/jgpush_service.dart

@@ -0,0 +1,33 @@
+
+import 'package:jpush_flutter/jpush_flutter.dart';
+import 'package:lszlgl/config/app_config.dart';
+
+class JGPushService{
+  static final JPush jPush = JPush();
+
+
+  static Future<void> jgInit(AppEnvironment env) async{
+    jPush.setup(
+      // 极光推送 正式环境appkey需要再申请
+      appKey: env == AppEnvironment.product ? '???' : '2f42e3db4d0083b0bc5a3f6c',
+      channel: 'developer-default',
+      production: env == AppEnvironment.product ? true : false,
+      debug: env == AppEnvironment.develop ? true : false
+    );
+
+    jPush.addEventHandler(
+      // 接收通知回调方法。
+      onReceiveNotification: (Map<String, dynamic> message) async {
+        print("flutter onReceiveNotification: $message");
+      },
+      // 点击通知回调方法。
+      onOpenNotification: (Map<String, dynamic> message) async {
+        print("flutter onOpenNotification: $message");
+      },
+      // 接收自定义消息回调方法。
+      onReceiveMessage: (Map<String, dynamic> message) async {
+        print("flutter onReceiveMessage: $message");
+      },
+    );
+  }
+}

lib/widget/countdown_button_widget.dart

@@ -0,0 +1,112 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/config/colors.dart';
+import 'package:lszlgl/main.dart';
+import 'package:lszlgl/network/my_api.dart';
+import 'package:lszlgl/utils/string_utils.dart';
+
+
+/// 倒计时按钮
+class CountdownButtonWidget extends StatefulWidget {
+  /// 倒计时总秒数
+  final int timeCount;
+  /// 手机号
+  final TextEditingController phoneController;
+
+  const CountdownButtonWidget({
+    Key? key,
+    this.timeCount = 60,
+    required this.phoneController,
+  }) : super(key: key);
+
+  @override
+  State<CountdownButtonWidget> createState() => _CountdownButtonWidgetState();
+}
+
+class _CountdownButtonWidgetState extends State<CountdownButtonWidget> {
+  Timer? _timer;
+  //倒计时数值
+  var _countdownTime = 0;
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      child: Text(
+        _handleBtnText(),
+        style: const TextStyle(
+            color: MyColor.c_25A6EE, fontSize: 14),
+      ),
+      onTap: () async{
+        if (_countdownTime == 0) {
+          if (!StringUtils.isPhoneNum(widget.phoneController.text)) {
+            MyNavigator.showToast('请输入正确的手机号');
+            return;
+          }
+
+          bool isPost = await getPhoneMsg();
+          if(!isPost){
+            return;
+          }
+         // print('可以发送了');
+          _startCountdown();
+        }
+      },
+    );
+  }
+
+  /// 获取验证码
+  Future<bool> getPhoneMsg() async{
+    try{
+      var res = await MyApi.get().postPhoneMsg({
+        'mobile': widget.phoneController.text,
+        'scene': 23,
+      });
+      //print('$res.data');
+      if( res.data ?? false){
+        MyNavigator.showToast('验证码已发送');
+        return true;
+      }else{
+        return false;
+      }
+    }catch(e){
+      logger.e(e);
+      return false;
+    }
+  }
+
+  String _handleBtnText() {
+    if (_countdownTime > 0) {
+      return '剩余$_countdownTime秒';
+    } else {
+      return '获取验证码';
+    }
+  }
+
+  //倒计时方法
+  void _startCountdown() {
+    //倒计时时间
+    _countdownTime = widget.timeCount;
+    if (_timer != null) {
+      // 如果timer已存在要先取消置空
+      _timer!.cancel();
+      _timer = null;
+    }
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (_countdownTime < 1) {
+        _timer?.cancel();
+      } else {
+        setState(() {
+          _countdownTime -= 1;
+        });
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _timer?.cancel();
+    _timer = null;
+    super.dispose();
+  }
+}

lib/widget/storehouse_item.dart

@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+import 'package:lszlgl/config/borders.dart';
+
+class StorehouseItem extends StatelessWidget {
+  final String? left;
+  final String? right;
+  final bool special;
+  const StorehouseItem({
+    super.key,
+    this.left,
+    this.right,
+    this.special = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 4),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Expanded(
+            child: Text(
+              left ?? '',
+              style: special ? TextStyles.titA : TextStyles.titB,
+              maxLines: null,
+            ),
+          ),
+
+          const SizedBox(width: 20),
+
+          Expanded(
+            child: special
+                ? Padding(
+                    padding: const EdgeInsets.only(left: 40),
+                    child: Container(
+                        alignment: Alignment.center,
+                        decoration: BoxDecoration(
+                            color: const Color(0xFFE0F2F1),
+                            border: Border.all(color: const Color(0xFF4DB6AC), width: 1.0),
+                            borderRadius: BorderRadius.circular(12) // 设置边框样式
+                            ),
+                        child: Text(right ?? '',
+                            style: const TextStyle(fontSize: 14, color: Color(0xFF4DB6AC)))),
+                  )
+                : Text(
+                    right ?? '',
+                    style: TextStyles.titC,
+                    maxLines: null,
+                    textAlign: TextAlign.right,
+                  ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+// 绿色圆点加标题
+class StoreHouseTit extends StatelessWidget {
+  final String tit;
+  const StoreHouseTit({super.key, required this.tit});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(left: 6),
+      child: Row(
+        children: [
+          Container(
+            width: 10,
+            height: 10,
+            decoration:const BoxDecoration(
+              color:  Color(0xFF4DB6AC),
+              shape: BoxShape.circle,
+            ),
+          ),
+          const SizedBox(width: 4),
+          Text(tit,style: TextStyles.titA)
+        ],
+      ),
+    );
+  }
+}
+
+
+// const Color(0xFFE0F2F1)   const Color(0xFF4DB6AC)
+//  Text(right ?? '',style:const TextStyle(fontSize: 15,color: Color(0xFF4DB6AC

pubspec.yaml

@@ -97,6 +97,8 @@ dependencies:
   app_settings: ^5.1.1
   # 极光推送
   jpush_flutter: 3.0.3
+  # 虚线边框
+  dotted_border: ^2.1.0
 
 dev_dependencies:
   flutter_test: