Merge branch 'wu_2023_map' into wr_2023_business

lib/generated/intl/messages_en.dart

@@ -816,6 +816,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhunongjifen" : MessageLookupByLibrary.simpleMessage("助农积分"),
     "zhunongzhuanqu" : MessageLookupByLibrary.simpleMessage("助农专区"),
     "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。"),
+    "zhuxiaozhanghao" : MessageLookupByLibrary.simpleMessage("注销账号"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
     "ziti" : MessageLookupByLibrary.simpleMessage("自提"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),

lib/generated/intl/messages_en_US.dart

@@ -816,6 +816,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhunongjifen" : MessageLookupByLibrary.simpleMessage("Farming aid points"),
     "zhunongzhuanqu" : MessageLookupByLibrary.simpleMessage("Special Area for Agricultural Aid"),
     "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("Reminder again: After the account is logged off, it cannot be recovered, and relevant data and information will be permanently deleted。"),
+    "zhuxiaozhanghao" : MessageLookupByLibrary.simpleMessage("Account cancellation"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("self fetching"),
     "ziti" : MessageLookupByLibrary.simpleMessage("Self mention"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("Self lifting address"),

lib/generated/intl/messages_zh_CN.dart

@@ -816,6 +816,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhunongjifen" : MessageLookupByLibrary.simpleMessage("助农积分"),
     "zhunongzhuanqu" : MessageLookupByLibrary.simpleMessage("助农专区"),
     "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。"),
+    "zhuxiaozhanghao" : MessageLookupByLibrary.simpleMessage("注销账号"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
     "ziti" : MessageLookupByLibrary.simpleMessage("自提"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -816,6 +816,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhunongjifen" : MessageLookupByLibrary.simpleMessage("助农积分"),
     "zhunongzhuanqu" : MessageLookupByLibrary.simpleMessage("助农专区"),
     "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复，相关数据和信息会永久删除。"),
+    "zhuxiaozhanghao" : MessageLookupByLibrary.simpleMessage("注销账号"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
     "ziti" : MessageLookupByLibrary.simpleMessage("自提"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -810,6 +810,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhunongjifen" : MessageLookupByLibrary.simpleMessage("助農積分"),
     "zhunongzhuanqu" : MessageLookupByLibrary.simpleMessage("助農專區"),
     "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒：註銷帳號後不可恢復，相關資料和資訊會永久删除。"),
+    "zhuxiaozhanghao" : MessageLookupByLibrary.simpleMessage("註銷帳號"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
     "ziti" : MessageLookupByLibrary.simpleMessage("自提"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),

lib/generated/intl/messages_zh_TW.dart

@@ -813,6 +813,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhunongjifen" : MessageLookupByLibrary.simpleMessage("助農積分"),
     "zhunongzhuanqu" : MessageLookupByLibrary.simpleMessage("助農專區"),
     "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒：註銷帳號後不可恢復，相關資料和資訊會永久删除。"),
+    "zhuxiaozhanghao" : MessageLookupByLibrary.simpleMessage("註銷帳號"),
     "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
     "ziti" : MessageLookupByLibrary.simpleMessage("自提"),
     "zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),

lib/generated/l10n.dart

@@ -7185,6 +7185,16 @@ class S {
     );
   }
 
+  /// `注销账号`
+  String get zhuxiaozhanghao {
+    return Intl.message(
+      '注销账号',
+      name: 'zhuxiaozhanghao',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `并使用本机号码登录`
   String get privacy_policy4 {
     return Intl.message(

lib/l10n/intl_en.arb

@@ -747,6 +747,7 @@
   "huiyuanma":"会员码",
   "yinzhang":"印章",
   "dianpuchongzhi":"店铺充值",
+  "zhuxiaozhanghao":"注销账号",
 
 
 

lib/l10n/intl_en_US.arb

@@ -748,6 +748,7 @@
   "huiyuanma":"vipCode",
   "yinzhang":"Seal",
   "dianpuchongzhi":"Recharge",
+  "zhuxiaozhanghao":"Account cancellation",
 
 
 

lib/l10n/intl_zh_CN.arb

@@ -748,6 +748,7 @@
   "huiyuanma":"会员码",
   "yinzhang":"印章",
   "dianpuchongzhi":"店铺充值",
+  "zhuxiaozhanghao":"注销账号",
 
 
 

lib/l10n/intl_zh_Hans_CN.arb

@@ -748,6 +748,7 @@
   "huiyuanma":"会员码",
   "yinzhang":"印章",
   "dianpuchongzhi":"店铺充值",
+  "zhuxiaozhanghao":"注销账号",
 
 
 

lib/l10n/intl_zh_Hant_CN.arb

@@ -739,6 +739,7 @@
   "huiyuanma":"會員碼",
   "yinzhang":"印章",
   "dianpuchongzhi":"店鋪充值",
+  "zhuxiaozhanghao":"註銷帳號",
 
 
 

lib/l10n/intl_zh_TW.arb

@@ -741,6 +741,7 @@
   "huiyuanma":"會員碼",
   "yinzhang":"印章",
   "dianpuchongzhi":"店鋪充值",
+  "zhuxiaozhanghao":"註銷帳號",
 
 
 

lib/login/captcha/block_puzzle_captcha.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';
 import 'dart:math';
 
 import 'package:dio/dio.dart';
@@ -294,7 +295,7 @@ class _BlockPuzzleCaptchaPageState extends State<BlockPuzzleCaptchaPage>
         child: Container(
           key: _containerKey,
           width: dialogWidth,
-          height: 320.h,
+          height: (Platform.isAndroid)?320.h:310.h,
           color: Colors.white,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,

lib/setting/setting_page.dart

@@ -175,7 +175,7 @@ class _SettingPage extends State<SettingPage> {
               height: 16.h,
             ),
             GestureDetector(
-              child: settingSingleItem("注销账号"),
+              child: settingSingleItem(S.of(context).zhuxiaozhanghao),
               onTap: () {
                 Navigator.of(context).pushNamed('/router/logout_page');
               },