Merge branch 'wu_2023_map' into wr_2023_business

# Conflicts:
#	lib/mine/mine_view/mine_item.dart

lib/generated/intl/messages_en.dart

@@ -193,6 +193,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("店内用餐"),
+    "dianpuchongzhi" : MessageLookupByLibrary.simpleMessage("店铺充值"),
     "dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"),
     "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
@@ -309,6 +310,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"),
     "huiyuanka" : MessageLookupByLibrary.simpleMessage("会员卡"),
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"),
+    "huiyuanma" : MessageLookupByLibrary.simpleMessage("会员码"),
     "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("会员权益"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"),
     "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"),
@@ -468,6 +470,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《一心回乡服务协议》"),
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隐私服务》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本机号码登录"),
+    "qianbao" : MessageLookupByLibrary.simpleMessage("钱包"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("签到"),
     "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("签到得积分"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("签到领积分"),
@@ -740,6 +743,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"),
     "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡"),
     "yinsizhengce2" : MessageLookupByLibrary.simpleMessage("     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。"),
+    "yinzhang" : MessageLookupByLibrary.simpleMessage("印章"),
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
     "yiqianshou" : MessageLookupByLibrary.simpleMessage("已签收"),
     "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),

lib/generated/intl/messages_en_US.dart

@@ -193,6 +193,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("Telephone"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("Click login to enjoy more wonderful information"),
     "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("store dining"),
+    "dianpuchongzhi" : MessageLookupByLibrary.simpleMessage("Recharge"),
     "dianputuijian" : MessageLookupByLibrary.simpleMessage("Store recommendation"),
     "dianpuyue" : MessageLookupByLibrary.simpleMessage("Shop balance"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("Click me to get it"),
@@ -309,6 +310,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("Member Points"),
     "huiyuanka" : MessageLookupByLibrary.simpleMessage("Membership Card"),
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("Membership card details"),
+    "huiyuanma" : MessageLookupByLibrary.simpleMessage("vipCode"),
     "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("Membership Rights"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("Member Balance"),
     "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("Member Center"),
@@ -468,6 +470,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《Service Agreement for Returning Home with One Heart》"),
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《privacy Services》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("Log in with your own number"),
+    "qianbao" : MessageLookupByLibrary.simpleMessage("Wallet"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("Sign in"),
     "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("Sign in and get points"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("Sign in to receive points"),
@@ -740,6 +743,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《Privacy Agreement》"),
     "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("      Thank you for using the Home bound APP. We attach great importance to your personal information and privacy protection. In order to better ensure your personal rights and interests, before you use our products, please carefully read"),
     "yinsizhengce2" : MessageLookupByLibrary.simpleMessage("     With your consent, we will collect some possible data (geographic location, camera, storage and other information) according to your use needs。"),
+    "yinzhang" : MessageLookupByLibrary.simpleMessage("Seal"),
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("Signed in"),
     "yiqianshou" : MessageLookupByLibrary.simpleMessage("Signed in"),
     "yiquxiao" : MessageLookupByLibrary.simpleMessage(" Canceled "),

lib/generated/intl/messages_zh_CN.dart

@@ -193,6 +193,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("店内用餐"),
+    "dianpuchongzhi" : MessageLookupByLibrary.simpleMessage("店铺充值"),
     "dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"),
     "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
@@ -309,6 +310,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"),
     "huiyuanka" : MessageLookupByLibrary.simpleMessage("会员卡"),
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"),
+    "huiyuanma" : MessageLookupByLibrary.simpleMessage("会员码"),
     "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("会员权益"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"),
     "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"),
@@ -468,6 +470,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《一心回乡服务协议》"),
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隐私服务》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本机号码登录"),
+    "qianbao" : MessageLookupByLibrary.simpleMessage("钱包"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("签到"),
     "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("签到得积分"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("签到领积分"),
@@ -740,6 +743,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"),
     "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡"),
     "yinsizhengce2" : MessageLookupByLibrary.simpleMessage("     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。"),
+    "yinzhang" : MessageLookupByLibrary.simpleMessage("印章"),
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
     "yiqianshou" : MessageLookupByLibrary.simpleMessage("已签收"),
     "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -193,6 +193,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录，享受更多精彩信息"),
     "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("店内用餐"),
+    "dianpuchongzhi" : MessageLookupByLibrary.simpleMessage("店铺充值"),
     "dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"),
     "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
@@ -309,6 +310,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"),
     "huiyuanka" : MessageLookupByLibrary.simpleMessage("会员卡"),
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"),
+    "huiyuanma" : MessageLookupByLibrary.simpleMessage("会员码"),
     "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("会员权益"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"),
     "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"),
@@ -468,6 +470,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《一心回乡服务协议》"),
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隐私服务》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本机号码登录"),
+    "qianbao" : MessageLookupByLibrary.simpleMessage("钱包"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("签到"),
     "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("签到得积分"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("签到领积分"),
@@ -740,6 +743,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隐私协议》"),
     "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感谢您使用一心回乡APP。我们非常重视您的个人信息和隐私保护。为了更好地保证您的个人权益，在您使用我们的产品前，请务必仔细阅读一心回乡"),
     "yinsizhengce2" : MessageLookupByLibrary.simpleMessage("     在您同意后，我们才会根据您的使用需求，收集部分可能涉及的数据(地理位置、相机、存储等信息)。"),
+    "yinzhang" : MessageLookupByLibrary.simpleMessage("印章"),
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已签到"),
     "yiqianshou" : MessageLookupByLibrary.simpleMessage("已签收"),
     "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -189,6 +189,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("電話"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩信息"),
     "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("店内用餐"),
+    "dianpuchongzhi" : MessageLookupByLibrary.simpleMessage("店鋪充值"),
     "dianputuijian" : MessageLookupByLibrary.simpleMessage("店鋪推薦"),
     "dianpuyue" : MessageLookupByLibrary.simpleMessage("店鋪餘額"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"),
@@ -305,6 +306,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"),
     "huiyuanka" : MessageLookupByLibrary.simpleMessage("會員卡"),
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("會員卡詳情"),
+    "huiyuanma" : MessageLookupByLibrary.simpleMessage("會員碼"),
     "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("會員權益"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("會員餘額"),
     "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("會員中心"),
@@ -463,6 +465,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《一心回鄉服務協議》"),
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隱私服務》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本機號碼登錄"),
+    "qianbao" : MessageLookupByLibrary.simpleMessage("錢包"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("簽到"),
     "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("簽到得積分"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("簽到領積分"),
@@ -734,6 +737,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隱私協議》"),
     "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感謝您使用一心回鄉APP。我們非常的重視您的個人信息和隱私保護。為了更好地保證您的個人權益，在您使用我們的產品前，請務必仔細閱讀一心回鄉"),
     "yinsizhengce2" : MessageLookupByLibrary.simpleMessage("     在您同意後，我們才會根據您的使用需求，收集部分可能涉及(地理位置、相機、存儲等信息)的數據。"),
+    "yinzhang" : MessageLookupByLibrary.simpleMessage("印章"),
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已簽到"),
     "yiqianshou" : MessageLookupByLibrary.simpleMessage("已簽收"),
     "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),

lib/generated/intl/messages_zh_TW.dart

@@ -191,6 +191,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "dianhua" : MessageLookupByLibrary.simpleMessage("電話"),
     "dianjidenglu" : MessageLookupByLibrary.simpleMessage("點擊登錄，享受更多精彩信息"),
     "dianneiyongcan" : MessageLookupByLibrary.simpleMessage("店内用餐"),
+    "dianpuchongzhi" : MessageLookupByLibrary.simpleMessage("店鋪充值"),
     "dianputuijian" : MessageLookupByLibrary.simpleMessage("店鋪推薦"),
     "dianpuyue" : MessageLookupByLibrary.simpleMessage("店鋪餘額"),
     "dianwolingqu" : MessageLookupByLibrary.simpleMessage("點我領取"),
@@ -307,6 +308,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"),
     "huiyuanka" : MessageLookupByLibrary.simpleMessage("會員卡"),
     "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("會員卡詳情"),
+    "huiyuanma" : MessageLookupByLibrary.simpleMessage("會員碼"),
     "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("會員權益"),
     "huiyuanyue" : MessageLookupByLibrary.simpleMessage("會員餘額"),
     "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("會員中心"),
@@ -465,6 +467,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《一心回鄉服務協議》"),
     "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《隱私服務》"),
     "privacy_policy4" : MessageLookupByLibrary.simpleMessage("并使用本機號碼登錄"),
+    "qianbao" : MessageLookupByLibrary.simpleMessage("錢包"),
     "qiandao" : MessageLookupByLibrary.simpleMessage("簽到"),
     "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("簽到得積分"),
     "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("簽到領積分"),
@@ -737,6 +740,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《隱私協議》"),
     "yinsizhengce1" : MessageLookupByLibrary.simpleMessage("     感謝您使用一心回鄉APP。我們非常的重視您的個人信息和隱私保護。為了更好地保證您的個人權益，在您使用我們的產品前，請務必仔細閱讀一心回鄉"),
     "yinsizhengce2" : MessageLookupByLibrary.simpleMessage("     在您同意後，我們才會根據您的使用需求，收集部分可能涉及(地理位置、相機、存儲等信息)的數據。"),
+    "yinzhang" : MessageLookupByLibrary.simpleMessage("印章"),
     "yiqiandao" : MessageLookupByLibrary.simpleMessage("已簽到"),
     "yiqianshou" : MessageLookupByLibrary.simpleMessage("已簽收"),
     "yiquxiao" : MessageLookupByLibrary.simpleMessage(" 已取消 "),

lib/generated/l10n.dart

@@ -7145,6 +7145,46 @@ class S {
     );
   }
 
+  /// `钱包`
+  String get qianbao {
+    return Intl.message(
+      '钱包',
+      name: 'qianbao',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `会员码`
+  String get huiyuanma {
+    return Intl.message(
+      '会员码',
+      name: 'huiyuanma',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `印章`
+  String get yinzhang {
+    return Intl.message(
+      '印章',
+      name: 'yinzhang',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `店铺充值`
+  String get dianpuchongzhi {
+    return Intl.message(
+      '店铺充值',
+      name: 'dianpuchongzhi',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `并使用本机号码登录`
   String get privacy_policy4 {
     return Intl.message(

lib/l10n/intl_en.arb

@@ -743,6 +743,10 @@
   "xiugai":"修改",
   "bangdingshouji":"绑定手机",
   "genggaibangdingshoujihao":"更改绑定手机号",
+  "qianbao":"钱包",
+  "huiyuanma":"会员码",
+  "yinzhang":"印章",
+  "dianpuchongzhi":"店铺充值",
 
 
 

lib/l10n/intl_en_US.arb

@@ -744,6 +744,10 @@
   "xiugai":"modify",
   "bangdingshouji":"bind phone",
   "genggaibangdingshoujihao":"modify bind phone",
+  "qianbao":"Wallet",
+  "huiyuanma":"vipCode",
+  "yinzhang":"Seal",
+  "dianpuchongzhi":"Recharge",
 
 
 

lib/l10n/intl_zh_CN.arb

@@ -744,6 +744,10 @@
   "xiugai":"修改",
   "bangdingshouji":"绑定手机",
   "genggaibangdingshoujihao":"更改绑定手机号",
+  "qianbao":"钱包",
+  "huiyuanma":"会员码",
+  "yinzhang":"印章",
+  "dianpuchongzhi":"店铺充值",
 
 
 

lib/l10n/intl_zh_Hans_CN.arb

@@ -744,6 +744,10 @@
   "xiugai":"修改",
   "bangdingshouji":"绑定手机",
   "genggaibangdingshoujihao":"更改绑定手机号",
+  "qianbao":"钱包",
+  "huiyuanma":"会员码",
+  "yinzhang":"印章",
+  "dianpuchongzhi":"店铺充值",
 
 
 

lib/l10n/intl_zh_Hant_CN.arb

@@ -735,6 +735,10 @@
   "xiugai":"修改",
   "bangdingshouji":"綁定手機",
   "genggaibangdingshoujihao":"更改綁定手機號",
+  "qianbao":"錢包",
+  "huiyuanma":"會員碼",
+  "yinzhang":"印章",
+  "dianpuchongzhi":"店鋪充值",
 
 
 

lib/l10n/intl_zh_TW.arb

@@ -737,6 +737,10 @@
   "xiugai":"修改",
   "bangdingshouji":"綁定手機",
   "genggaibangdingshoujihao":"更改綁定手機號",
+  "qianbao":"錢包",
+  "huiyuanma":"會員碼",
+  "yinzhang":"印章",
+  "dianpuchongzhi":"店鋪充值",
 
 
 

lib/login/captcha/block_puzzle_captcha.dart

@@ -294,7 +294,7 @@ class _BlockPuzzleCaptchaPageState extends State<BlockPuzzleCaptchaPage>
         child: Container(
           key: _containerKey,
           width: dialogWidth,
-          height: 340.h,
+          height: 320.h,
           color: Colors.white,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
@@ -450,7 +450,7 @@ class _BlockPuzzleCaptchaPageState extends State<BlockPuzzleCaptchaPage>
                   alignment: Alignment.center,
                   child: Text(
                     '向右拖动滑块填充拼图',
-                    style: TextStyle(fontSize: 16.sp),
+                    style: TextStyle(fontSize: 14.sp),
                   ),
                 ),
                 Container(

lib/mine/mine_view/mine_item.dart

@@ -1,8 +1,5 @@
-import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_easyloading/flutter_easyloading.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:huixiang/generated/l10n.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/login_tips_dialog.dart';
@@ -221,22 +218,20 @@ class _MineItem extends State<MineItem> {
               ),
 
               ///店铺余额
-              Expanded(
+              Expanded(child:  InkWell(
-                child: InkWell(
+                onTap: () {
-                  onTap: () {
+                  SharedPreferences.getInstance().then((value) {
-                    SharedPreferences.getInstance().then((value) {
+                    if (value.getString("token") == null ||
-                      if (value.getString("token") == null ||
+                        value.getString("token") == "") {
-                          value.getString("token") == "") {
+                      LoginTipsDialog().show(context);
-                        LoginTipsDialog().show(context);
+                      return;
-                        return;
+                    }
-                      }
+                    Navigator.of(context).pushNamed('/router/mine_shop_page');
-                      Navigator.of(context).pushNamed('/router/mine_shop_page');
+                  });
-                    });
+                },
-                  },
+                child: mineItem(
-                  child: mineItem(
+                  S.of(context).dianpuchongzhi,
-                    "店铺充值",
+                  "assets/image/shop_yue.webp",
-                    "assets/image/shop_yue.webp",
-                  ),
                 ),
               ),
 

lib/mine/mine_view/mine_navbar.dart

@@ -85,7 +85,7 @@ class _MineNavbar extends State<MineNavbar> {
                     });
                   },
                   child: mineTopItem(
-                    "钱包",
+                    S.of(context).qianbao,
                     "assets/image/wallet.webp",
                   ),
                 ),
@@ -105,7 +105,7 @@ class _MineNavbar extends State<MineNavbar> {
                     });
                   },
                   child: mineTopItem(
-                    "会员码",
+                    S.of(context).huiyuanma,
                     "assets/image/vip_code.webp",
                   ),
                 ),
@@ -186,7 +186,7 @@ class _MineNavbar extends State<MineNavbar> {
                     },
                   child: mineBottomItem(
                     widget?.userInfo?.points?? "0",
-                    "积分",
+                    S.of(context).jifen,
                   ),
                 ),
               ),
@@ -246,7 +246,7 @@ class _MineNavbar extends State<MineNavbar> {
                   },
                   child: mineBottomItem(
                     widget?.userInfo?.happyBean?? "0",
-                    "印章",
+                    S.of(context).yinzhang,
                   ),
                 ),
               ),

lib/retrofit/retrofit_api.dart

@@ -92,6 +92,7 @@ abstract class ApiService {
     if (pay) {
       headers["Environment"] = "app";
     }
+    print("软件当前运行的模式 kReleaseMode:"+(kReleaseMode ? "发布模式":"调试模式"));
     if (kReleaseMode) baseUrl = serviceBaseUrl;
     if (isIp) baseUrl = ipBaseUrl;
     dio.options = BaseOptions(