From 98886b7d9f9786824d6bf196ad82dfb41708290b Mon Sep 17 00:00:00 2001
From: anfe <448468458@qq.com>
Date: Fri, 5 Jul 2024 09:37:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:xhj=20=E5=8E=BB=E9=99=A4=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                                     | Bin 10244 -> 12292 bytes
 .../lockMain/xhj/lockMain_xhj_page.dart       |  20 ++++++++++--------
 lib/mine/mineSet/mineSet/mineSet_page.dart    |   1 -
 pre_build.sh                                  |   2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 8466420f5eec47c7e53018d7dd4a1f675cd85dc7..f2fb2aab0ced3b77ff75f1b81bdfe9dc7671128e 100755
GIT binary patch
delta 1248
zcmc&zO-mb56g^|c&e%kaQHv0*Swt#YgGCoA1*we-QL9+!Hl2JJLnoOK8zFAuLfi;~
zyj5NFFGv`=>!QEHwg13{D_45n!+gw8T^0J^zWct;z2~0y-tqSF*BAh8rJ8*QOmb+_
zqz{MKodB`mdF)Lzz==kiqH!Ds(rdPpN!w2P+?o)xaeYy4>uTFZp}ox&p4P_bf8MJG
zB$E=z6?0;|c+jvu8m?jLrWSOUUJV)b5Xz_^hZNGNGM0@j64=LHGv#B<)6SS2OI($h
zefk_S#Mp4?zxi-?&*SO@)?lFs+Y9W<`+z;z!74r=iB0+h5m_&Sd(irtWfR>?a^D%d
z!r~su5m)f!Dk{Zr>4WM7<|N#kLMrP?@e*H1W(S|KhAn*h8!e5>H8BnA$k1N9p|IOk
zkC2(Xyc%UJk>M`q8Fdk5u2+%gUdfwYR)|DLg~P;@RGb>g7HBD6LYd?X^d-)pP#2d=
zzEFk=m8Dn?!9Ho#i)tknza!I8FEd$Wi<x^B8PP_42jn|wN4Oq5Gw0_P-p1x<7lkvp
zEPf4L<oc+AO&SNJP$7v!_D}FvucH-?p<nQPk=VSvHg9UBTI)NAjp5t8RL6gcPoVv2
zeDy!`w211au}ucqt#*FqhIJDV{qdO|`Cb3eAl`?fI%lTXi~k7luZin{qyMPH`ae|S
E0Rgs7zW@LL

delta 182
zcmZokXbF&DU|?W$DortDU{C-uIe-{M3-C-V6q~3gIoUvmMHI+qkOE>xpg2QLx?yl~
zes00$i4s-p6CdbqX6InxV3gX-qp+E2a<#I?=JU$zjFTTIHgFi58|o;S7#mHVCtyGM
zxazFQC)GY|78KxT-*{ywlOQw5RG?+tK*AMd;l_*KnJ4q>=rS@)HsMj`V1hVCV{(el
N%*n!Peo);<838>lE2IDb

diff --git a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart
index 87232bd4..32aa6cf9 100755
--- a/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart
+++ b/lib/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart
@@ -45,12 +45,13 @@ class _StarLockMainXHJPageState extends State<StarLockMainXHJPage>
                   showAppBar: false,
                   showDrawer: false,
                 ),
-                SafeArea(
-                  bottom: false,
-                  child: LockMallPage(
-                    allowReturn: false,
-                  ),
-                ),
+                // xhj 不需要显示商城
+                // SafeArea(
+                //   bottom: false,
+                //   child: LockMallPage(
+                //     allowReturn: false,
+                //   ),
+                // ),
                 SafeArea(
                   bottom: false,
                   child: MessageListXHJPage(
@@ -84,9 +85,10 @@ class _StarLockMainXHJPageState extends State<StarLockMainXHJPage>
         child: Row(
           children: <Widget>[
             navigationBarItem(logic, Icons.key, '设备'.tr, 0),
-            navigationBarItem(logic, Icons.shopping_cart, '商城'.tr, 1),
-            navigationBarItem(logic, Icons.message, '消息'.tr, 2),
-            navigationBarItem(logic, Icons.account_circle, '我的'.tr, 3),
+            // xhj 不需要显示商城
+            // navigationBarItem(logic, Icons.shopping_cart, '商城'.tr, 1),
+            navigationBarItem(logic, Icons.message, '消息'.tr, 1),
+            navigationBarItem(logic, Icons.account_circle, '我的'.tr, 2),
           ],
         ),
       ),
diff --git a/lib/mine/mineSet/mineSet/mineSet_page.dart b/lib/mine/mineSet/mineSet/mineSet_page.dart
index 90a37a5a..de0e7a2d 100755
--- a/lib/mine/mineSet/mineSet/mineSet_page.dart
+++ b/lib/mine/mineSet/mineSet/mineSet_page.dart
@@ -313,7 +313,6 @@ class _MineSetPageState extends State<MineSetPage>
               Navigator.pushNamed(
                   context, Routers.aPPUnlockNeedMobileNetworkingLockPage);
             }),
-        // if (!F.isLite)
         CommonItem(
           leftTitel: TranslationLoader.lanKeys!.valueAddedServices!.tr,
           isHaveLine: true,
diff --git a/pre_build.sh b/pre_build.sh
index 64804453..4fb0373f 100644
--- a/pre_build.sh
+++ b/pre_build.sh
@@ -84,4 +84,4 @@ echo -e "\n* 没有发现废弃 API，开始编译"
 # 编译命令
 flutter clean && flutter pub get
 flutter build apk --flavor $environment -t $main_file
-#flutter build ios --flavor $environment -t $main_file
+flutter build ios --flavor $environment -t $main_file