Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app

 Conflicts:

	assets/image/2x/icon_sign_success.png

	assets/image/3x/icon_sign_success.png

	lib/generated/l10n.dart

	lib/l10n/intl_en.arb

	lib/l10n/intl_zh_CN.arb

	lib/l10n/intl_zh_Hans_CN.arb

	lib/l10n/intl_zh_Hant_CN.arb

	lib/l10n/intl_zh_TW.arb

lib/l10n/intl_en.arb

@@ -526,6 +526,8 @@
   "waimaipeisong": "外卖配送",
   "kuaidiwuliu": "快递物流",
   "yuliudianhua": "预留电话",
+  "tuiguangma": "推广码",
+  "wodegongju": "我的工具",
 
 
 

lib/l10n/intl_zh_CN.arb

@@ -532,6 +532,5 @@
 
 
 
-
   "privacy_policy4": "并使用本机号码登录"
 }

lib/l10n/intl_zh_Hant_CN.arb

@@ -521,6 +521,8 @@
   "waimaipeisong": "外賣配送",
   "kuaidiwuliu": "快遞物流",
   "yuliudianhua": "預留電話",
+  "tuiguangma": "推廣碼",
+  "wodegongju": "我的工具",
 
 
 

lib/l10n/intl_zh_TW.arb

@@ -520,6 +520,8 @@
   "waimaipeisong": "外賣配送",
   "kuaidiwuliu": "快遞物流",
   "yuliudianhua": "預留電話",
+  "tuiguangma": "推廣碼",
+  "wodegongju": "我的工具",
 
 
 

lib/main.dart

@@ -230,7 +230,7 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
   '/router/vip_balance': (context, {arguments}) => VipBalancePage(arguments: arguments),
   '/router/exchange_order_details': (context, {arguments}) => ExchangeOrderDetailPage(),
   '/router/location_map': (context, {arguments}) => LocationMap(arguments: arguments),
-  // '/router/settlement': (context, {arguments}) => Settlement(arguments: arguments),
+  '/router/settlement': (context, {arguments}) => Settlement(arguments: arguments),
   '/router/integral_detailed_page': (context, {arguments}) => IntegralDetailedPage(),
   '/router/write_off_success_page': (context, {arguments}) => WriteOffSuccessPage(),
   '/router/exchange_history_page': (context, {arguments}) => ExchangeHistoryPage(),

pubspec.lock

@@ -168,7 +168,7 @@ packages:
       name: cli_util
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.3"
+    version: "0.3.4"
   clock:
     dependency: transitive
     description:
@@ -388,7 +388,7 @@ packages:
       name: flutter_smart_dialog
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.9"
+    version: "2.3.1"
   flutter_spinkit:
     dependency: "direct main"
     description: