From 602642b0b2f823a635741aeafc1faafb24d3175b Mon Sep 17 00:00:00 2001 From: wurong <953969641@qq.com> Date: Thu, 4 May 2023 16:09:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/l10n/intl_en.arb | 1 + lib/l10n/intl_en_US.arb | 1 + lib/l10n/intl_zh_CN.arb | 2 +- lib/l10n/intl_zh_Hans_CN.arb | 1 + lib/l10n/intl_zh_Hant_CN.arb | 1 + lib/l10n/intl_zh_TW.arb | 1 + lib/mine/recharge_page.dart | 8 -------- lib/retrofit/min_api.dart | 2 +- lib/retrofit/retrofit_api.dart | 2 +- 9 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 5a7dc9a8..6e585276 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -723,6 +723,7 @@ "xuanzeshangpinlingqufangshi":"请选择商品的领取方式", "mendianyue":"门店余额", "lvbizhifu":"绿币支付", + "xuanzetuijianmendian":"选择推荐门店", diff --git a/lib/l10n/intl_en_US.arb b/lib/l10n/intl_en_US.arb index b7d1860b..b6ec2a8d 100644 --- a/lib/l10n/intl_en_US.arb +++ b/lib/l10n/intl_en_US.arb @@ -724,6 +724,7 @@ "xuanzeshangpinlingqufangshi":"Please select the picking method of goods", "mendianyue":"store balance", "lvbizhifu":"green payment", + "xuanzetuijianmendian":"select recommended store", diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index 5f95dbc4..6cd67e39 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -724,7 +724,7 @@ "xuanzeshangpinlingqufangshi":"请选择商品的领取方式", "mendianyue":"门店余额", "lvbizhifu":"绿币支付", - + "xuanzetuijianmendian":"选择推荐门店", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 7b4fe637..ceb0566b 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -724,6 +724,7 @@ "xuanzeshangpinlingqufangshi":"请选择商品的领取方式", "mendianyue":"门店余额", "lvbizhifu":"绿币支付", + "xuanzetuijianmendian":"选择推荐门店", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index ae04fcf5..db538c46 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -715,6 +715,7 @@ "xuanzeshangpinlingqufangshi":"請選擇商品的領取方式", "mendianyue":"門店餘額", "lvbizhifu":"綠幣支付", + "xuanzetuijianmendian":"選擇推薦門店", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 641c5f9a..6436f013 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -717,6 +717,7 @@ "xuanzeshangpinlingqufangshi":"請選擇商品的領取方式", "mendianyue":"門店餘額", "lvbizhifu":"綠幣支付", + "xuanzetuijianmendian":"選擇推薦門店", diff --git a/lib/mine/recharge_page.dart b/lib/mine/recharge_page.dart index 4c51e5ca..ba3eeb17 100644 --- a/lib/mine/recharge_page.dart +++ b/lib/mine/recharge_page.dart @@ -1,17 +1,13 @@ -import 'dart:convert'; import 'dart:io'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; -import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:fluwx/fluwx.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/rechargeActLists.dart'; -import 'package:huixiang/retrofit/data/recharge_list.dart'; import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/data/vip_benefit_list.dart'; import 'package:huixiang/retrofit/data/vip_rule_details.dart'; @@ -20,14 +16,11 @@ import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/utils/flutter_utils.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/min.dart'; -import 'package:huixiang/view_widget/item_input_widget.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/recharge_details_dialog.dart'; -import 'package:huixiang/view_widget/round_button.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:tobias/tobias.dart' as tobias; -import 'package:tobias/tobias.dart'; class RechargePage extends StatefulWidget { @override @@ -43,7 +36,6 @@ class _RechargePage extends State { List vipBenefitList = []; Color color = Colors.black; double discount = 100; - // List rechargeA; int selectIndex = 0; UserInfo userInfo; String mBalance = "0"; diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index a1ad9f27..dc0384e3 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart'; part 'min_api.g.dart'; -const localBaseUrl = "http://192.168.10.129:8765/app/";///本地 +const localBaseUrl = "http://192.168.10.78:8765/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index e27f691c..f03753ed 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -66,7 +66,7 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -const localBaseUrl = "http://192.168.10.129:8766/app/";///本地 +const localBaseUrl = "http://192.168.10.78:8766/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上