From 64af37cb72b4fbfd62b7f1275e269b8a6fa68041 Mon Sep 17 00:00:00 2001
From: PH2 <1293456824@qq.com>
Date: Mon, 29 Mar 2021 16:06:15 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=99=BA=E8=83=BD=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E6=90=9C=E7=B4=A2=E8=B7=B3=E8=BD=AC=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../intellect_search_goods_dialog.dart        | 24 ++++++++++++-------
 .../intellect_search_no_goods_dialog.dart     | 20 ++++++++++------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_goods_dialog.dart b/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_goods_dialog.dart
index 5609773..a716664 100644
--- a/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_goods_dialog.dart
+++ b/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_goods_dialog.dart
@@ -250,11 +250,8 @@ class _IntellectSearchGoodsDialogState
                   ),
                   Expanded(
                     child: Text(
-                      (num.tryParse(widget?.model?.price ?? "0") -
-                                  num.tryParse(
-                                      widget?.model?.couponPrice ?? "0"))
-                              .toStringAsFixed(2) ??
-                          "",
+                      formatNum((num.tryParse(widget?.model?.price ?? "0") - num.tryParse(widget?.model?.couponPrice ?? "0")), 2),
+                      // ().toStringAsFixed(2) ?? "",
                       maxLines: 1,
                       style: TextStyle(
                         fontSize: 16,
@@ -272,6 +269,18 @@ class _IntellectSearchGoodsDialogState
     );
   }
 
+  // 取两位小数，不进行四舍五入
+  String formatNum(var num, int position) {
+    String rlt = '0';
+    if ((num.toString().length - num.toString().lastIndexOf(".") - 1) < position) {
+      //小数点后有几位小数
+      rlt = num.toStringAsFixed(position).substring(0, num.toString().lastIndexOf(".") + position + 1).toString();
+    } else {
+      rlt = num.toString().substring(0, num.toString().lastIndexOf(".") + position + 1).toString();
+    }
+    return rlt;
+  }
+
   _buildBottomItem() {
     return Column(
       children: <Widget>[
@@ -294,10 +303,7 @@ class _IntellectSearchGoodsDialogState
                   child: Text(
                     (_styleModel?.moduleList?.saveBtn?.content ?? "") +
                         " ¥" +
-                        ((num.tryParse(widget?.model?.couponPrice ?? "0") ??
-                                    0) +
-                                num.tryParse(widget?.model?.commission ?? '0'))
-                            .toString(),
+                        formatNum((num.tryParse(widget?.model?.couponPrice ?? "0") ?? 0) + num.tryParse(widget?.model?.commission ?? '0'), 2),
                     style: TextStyle(
                         color: HexColor.fromHex(
                             _styleModel?.moduleList?.saveBtn?.fontColor),
diff --git a/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_no_goods_dialog.dart b/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_no_goods_dialog.dart
index c5b1501..7ff7e21 100644
--- a/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_no_goods_dialog.dart
+++ b/lib/dialog/global_dialog/intellect_search_goods_dialog/intellect_search_no_goods_dialog.dart
@@ -61,6 +61,18 @@ class _IntellectSearchNoGoodsDialogState extends State<IntellectSearchNoGoodsDia
     });
   }
 
+  /// 点击立即搜索，跳转搜索结果页
+  void openSearchResultPage() {
+    // RouterUtil.route(SkipModel.fromJson(_styleModel.moduleList.btn.skipInfo.toJson()), {"keywords": searchText, "type": _styleModel.moduleList.btn.skipInfo.pvd}, context).then((_) {
+    //   Navigator.pop(context);
+    // });
+    // 这里直接跳搜索结果页，不能跳搜索页。app端直接写死。需要修改记得修改这个地方
+    _styleModel.moduleList.btn.skipInfo.skipIdentifier = 'pub.flutter.search_result';
+    RouterUtil.route(SkipModel.fromJson(_styleModel.moduleList.btn.skipInfo.toJson()), {"keywords": searchText, "type": _styleModel.moduleList.btn.skipInfo.pvd}, context).then((_) {
+      Navigator.pop(context);
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -162,13 +174,7 @@ class _IntellectSearchNoGoodsDialogState extends State<IntellectSearchNoGoodsDia
                     ),
                   )),
                 ),
-                onTap: () {
-                  RouterUtil.route(
-                          SkipModel.fromJson(_styleModel.moduleList.btn.skipInfo.toJson()), {"keywords": searchText, "type": _styleModel.moduleList.btn.skipInfo.pvd}, context)
-                      .then((_) {
-                    Navigator.pop(context);
-                  });
-                },
+                onTap: () => openSearchResultPage(),
               ),
             )
           ],