From 4a61bf35e0a6820314bd8db067cda83ba5e2f5ab Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 24 Mar 2025 18:20:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B6=85=E5=B8=82=E4=B8=8D=E5=BC=B9?=
 =?UTF-8?q?=E8=B5=B7=E9=94=AE=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widgets/order/mixin/order_mixin.dart      |  6 ++---
 lib/pages/canteen_product/controller.dart     |  2 +-
 lib/pages/setting/widgets/setting_face.dart   | 22 +++++++++++++++----
 .../setting/widgets/setting_product.dart      |  2 ++
 lib/pages/supermarket_order/controller.dart   |  2 +-
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib/common/widgets/order/mixin/order_mixin.dart b/lib/common/widgets/order/mixin/order_mixin.dart
index 092ce00..37c8ec8 100644
--- a/lib/common/widgets/order/mixin/order_mixin.dart
+++ b/lib/common/widgets/order/mixin/order_mixin.dart
@@ -92,6 +92,7 @@ mixin OrderMixin {
     );
     currentTabIndex = i;
     if (i <= classifyList.length - 1) {
+      currentPage.value = 1;
       await getProduct();
     }
     EasyLoading.dismiss();
@@ -442,8 +443,7 @@ mixin OrderMixin {
     });
   }
 
-  void sendSubScreen() {
-    if (shopCardList.isEmpty) return;
+  Future<void> sendSubScreen() async {
     final json = SubScreenProductEvent(
       shopList: shopCardList.map((e) => e.toJson()).toList(),
       sysType: _sysType,
@@ -451,7 +451,7 @@ mixin OrderMixin {
       totalPrice: totalPrice.value,
       amountMealPrice: amountMealPrice.value,
     ).toJson();
-    SubScreenPlugin.sendMsgToViceScreen(
+    await SubScreenPlugin.sendMsgToViceScreen(
       SubScreenAction.updateCard.name,
       params: json,
     );
diff --git a/lib/pages/canteen_product/controller.dart b/lib/pages/canteen_product/controller.dart
index 01b646e..3ebeff8 100644
--- a/lib/pages/canteen_product/controller.dart
+++ b/lib/pages/canteen_product/controller.dart
@@ -192,8 +192,8 @@ class CanteenProductController extends GetxController with OrderMixin {
       await _computedAmountMealPrice();
       await updateSqlOrder();
       await createApiOrder();
-      _clearShopCard();
       putOffSendSubScreen();
+      _clearShopCard();
       EasyLoading.dismiss();
     };
     // |支付方式|点击|取消|
diff --git a/lib/pages/setting/widgets/setting_face.dart b/lib/pages/setting/widgets/setting_face.dart
index 0ba1abc..9aed654 100644
--- a/lib/pages/setting/widgets/setting_face.dart
+++ b/lib/pages/setting/widgets/setting_face.dart
@@ -14,6 +14,10 @@ class FaceManageController extends GetxController {
 
   final appC = Get.find<AppControl>();
 
+  late SysSetting sysSetting;
+
+  Rx<SysType> sysType = SysType.CANTEEN.obs;
+
   RxList<FaceEntity> faceList = RxList();
 
   RxInt currentPage = RxInt(1);
@@ -29,6 +33,8 @@ class FaceManageController extends GetxController {
   @override
   void onInit() async {
     super.onInit();
+    sysSetting = await AppSettingTool.getSysSetting();
+    sysType.value = sysSetting.sysType;
     getFaceList();
     _listenMqCallback();
   }
@@ -182,10 +188,18 @@ Widget buildFaceSearch(BuildContext context) {
   final theme = FTheme.of(context);
   return <Widget>[
     const Spacer(),
-    FTextField(
-      controller: faceC.usernameC,
-      hint: '请输入姓名',
-      maxLines: 1,
+    Obx(
+      () => FTextField(
+        textInputAction: faceC.sysType.value == SysType.SUPERMARKET
+            ? TextInputAction.none
+            : TextInputAction.newline,
+        keyboardType: faceC.sysType.value == SysType.SUPERMARKET
+            ? TextInputType.none
+            : TextInputType.multiline,
+        controller: faceC.usernameC,
+        hint: '请输入姓名',
+        maxLines: 1,
+      ),
     ).width(300.w),
     FButton(
       label: Text(
diff --git a/lib/pages/setting/widgets/setting_product.dart b/lib/pages/setting/widgets/setting_product.dart
index e749105..ba6c834 100644
--- a/lib/pages/setting/widgets/setting_product.dart
+++ b/lib/pages/setting/widgets/setting_product.dart
@@ -194,6 +194,8 @@ Widget _buildSearch(BuildContext context) {
     ].toRow().expanded(),
     Obx(
       () => FTextField(
+        textInputAction: TextInputAction.none,
+        keyboardType: TextInputType.none,
         controller: productC.selfCodeC,
         hint: '请输入自编码/商品名',
         maxLines: 1,
diff --git a/lib/pages/supermarket_order/controller.dart b/lib/pages/supermarket_order/controller.dart
index 64e5639..7ef40e3 100644
--- a/lib/pages/supermarket_order/controller.dart
+++ b/lib/pages/supermarket_order/controller.dart
@@ -259,9 +259,9 @@ class SupermarketOrderController extends GetxController with OrderMixin {
       );
       await updateSqlOrder();
       await createApiOrder();
+      EasyLoading.dismiss();
       _clearShopCard();
       putOffSendSubScreen();
-      EasyLoading.dismiss();
     };
     // |支付方式|点击|取消|
     payTypeSelect.onCancel = () {};