safety

lib/generated/intl/messages_en.dart

@@ -494,7 +494,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
     "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
-    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("下载完成"),
+    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
     "xihuan_" : m31,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
@@ -569,7 +569,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"),
     "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"),
     "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"),
-    "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在下载中..."),
+    "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加载中..."),
     "zhidianmendian" : MessageLookupByLibrary.simpleMessage("致电门店"),
     "zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"),
     "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"),

lib/generated/intl/messages_zh_CN.dart

@@ -493,7 +493,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
     "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
-    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("下载完成"),
+    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
     "xihuan_" : m31,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
@@ -567,7 +567,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"),
     "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"),
     "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"),
-    "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在下载中..."),
+    "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加载中..."),
     "zhidianmendian" : MessageLookupByLibrary.simpleMessage("致电门店"),
     "zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"),
     "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"),

lib/generated/intl/messages_zh_Hans_CN.dart

@@ -493,7 +493,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
     "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
-    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("下载完成"),
+    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
     "xihuan_" : m31,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
@@ -567,7 +567,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"),
     "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"),
     "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"),
-    "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在下载中..."),
+    "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加载中..."),
     "zhidianmendian" : MessageLookupByLibrary.simpleMessage("致电门店"),
     "zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"),
     "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"),

lib/generated/intl/messages_zh_Hant_CN.dart

@@ -493,7 +493,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
     "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"),
-    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("下載完成"),
+    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加載完成"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"),
     "xihuan_" : m31,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"),
@@ -568,7 +568,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫騎手"),
     "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加載"),
     "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"),
-    "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在下載中..."),
+    "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加載中..."),
     "zhidianmendian" : MessageLookupByLibrary.simpleMessage("致電門店"),
     "zhifubao" : MessageLookupByLibrary.simpleMessage("支付寶"),
     "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"),

lib/generated/intl/messages_zh_TW.dart

@@ -493,7 +493,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
     "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
     "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"),
-    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("下載完成"),
+    "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加載完成"),
     "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"),
     "xihuan_" : m31,
     "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"),
@@ -568,7 +568,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫騎手"),
     "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加載"),
     "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"),
-    "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在下載中..."),
+    "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加載中..."),
     "zhidianmendian" : MessageLookupByLibrary.simpleMessage("致電門店"),
     "zhifubao" : MessageLookupByLibrary.simpleMessage("支付寶"),
     "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"),

lib/generated/l10n.dart

@@ -3605,10 +3605,10 @@ class S {
     );
   }
 
-  /// `正在下载中...`
+  /// `正在加载中...`
   String get zhengzaixiazaizhong {
     return Intl.message(
-      '正在下载中...',
+      '正在加载中...',
       name: 'zhengzaixiazaizhong',
       desc: '',
       args: [],
@@ -4735,10 +4735,10 @@ class S {
     );
   }
 
-  /// `下载完成`
+  /// `加载完成`
   String get xiazaiwancheng {
     return Intl.message(
-      '下载完成',
+      '加载完成',
       name: 'xiazaiwancheng',
       desc: '',
       args: [],

lib/home/home_view/home_banner.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_swiper/flutter_swiper.dart';
 import 'package:huixiang/retrofit/data/banner.dart';
@@ -70,9 +72,6 @@ class _HomeBanner extends State<HomeBanner> {
   /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章）
   bannerClick(BannerData bannerData) async {
     switch (bannerData.contentType) {
-      // case 0:
-      //   Navigator.of(context).pushNamed('/router/qr_share');
-      //   break;
       case 1:
         Navigator.of(context).pushNamed(
           '/router/integral_store_page',
@@ -91,7 +90,17 @@ class _HomeBanner extends State<HomeBanner> {
           arguments: {"articleId": bannerData.content},
         );
         break;
+      case 4:
+        String router = bannerData.content;
+        if (router.contains("?")) {
+          String params = router.substring(router.indexOf("?"));
+          params = params.replaceAll("?", "");
+          Map map = jsonDecode(params);
+          Navigator.of(context).pushNamed(router, arguments: map);
+        } else {
+          Navigator.of(context).pushNamed(router);
+        }
+        break;
     }
   }
-
 }

lib/home/huixiang_brand_page.dart

@@ -41,13 +41,16 @@ class _BrandPage extends State<BrandPage>
   List<GlobalKey> globaKeys = [];
   List<BannerData> bannerData = [];
 
-
   Future queryHome() async {
     EasyLoading.show(status: S.current.zhengzaijiazai);
 
     final SharedPreferences value = await SharedPreferences.getInstance();
-    apiService = ApiService(Dio(),
+    apiService = ApiService(
-        context: context, token: value.getString('token'), showLoading: false);
+      Dio(),
+      context: context,
+      token: value.getString('token'),
+      showLoading: false,
+    );
 
     BaseData<BrandData> baseData =
         await apiService.queryHome().catchError((error) {
@@ -107,7 +110,7 @@ class _BrandPage extends State<BrandPage>
     return Scaffold(
       appBar: AppBar(
         toolbarHeight: 40.h - MediaQuery.of(context).padding.top,
-        backgroundColor: Colors.white,
+        backgroundColor: Colors.transparent,
         elevation: 0,
       ),
       body: Container(
@@ -168,8 +171,10 @@ class _BrandPage extends State<BrandPage>
     var widgets = <Widget>[
       ///回乡banner
       HuiXiangBanner(bannerData),
+
       ///公司信息
       OriginInfo(brandData),
+
       StoreTitleTab(
         brands,
         globaKeys,
@@ -204,7 +209,6 @@ class _BrandPage extends State<BrandPage>
     return widgets;
   }
 
-
   @override
   bool get wantKeepAlive => true;
 }

lib/home/huixiang_view/huixiang_banner.dart

@@ -1,4 +1,6 @@
 
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_swiper/flutter_swiper.dart';
 import 'package:huixiang/retrofit/data/banner.dart';
@@ -82,6 +84,17 @@ class _HuiXiangBanner extends State<HuiXiangBanner> {
           "articleId": bannerData.content,
         });
         break;
+      case 4:
+        String router = bannerData.content;
+        if (router.contains("?")) {
+          String params = router.substring(router.indexOf("?"));
+          params = params.replaceAll("?", "");
+          Map map = jsonDecode(params);
+          Navigator.of(context).pushNamed(router, arguments: map);
+        } else {
+          Navigator.of(context).pushNamed(router);
+        }
+        break;
     }
   }
 

lib/home/points_mall_view/points_mall_banner.dart

@@ -1,4 +1,6 @@
 
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_swiper/flutter_swiper.dart';
 import 'package:huixiang/retrofit/data/banner.dart';
@@ -70,9 +72,6 @@ class _PointMallBanner extends State<PointMallBanner> {
   /// contentType     跳转类型（0：不跳转，1：积分商品，2：活动，3：文章）
   bannerClick(BannerData bannerData) async {
     switch (bannerData.contentType) {
-      // case 0:
-      //   Navigator.of(context).pushNamed('/router/qr_share');
-      //   break;
       case 1:
         Navigator.of(context).pushNamed('/router/integral_store_page',
             arguments: {"goodsId": bannerData.content});
@@ -89,6 +88,17 @@ class _PointMallBanner extends State<PointMallBanner> {
           "articleId": bannerData.content,
         });
         break;
+      case 4:
+        String router = bannerData.content;
+        if (router.contains("?")) {
+          String params = router.substring(router.indexOf("?"));
+          params = params.replaceAll("?", "");
+          Map map = jsonDecode(params);
+          Navigator.of(context).pushNamed(router, arguments: map);
+        } else {
+          Navigator.of(context).pushNamed(router);
+        }
+        break;
     }
   }
 

lib/l10n/intl_en.arb

@@ -373,7 +373,7 @@
   "chaungshirengushi": "创始人故事",
   "jituanchuangshiren": "集团创始人",
   "jianjie": "简介:{jianjie}",
-  "zhengzaixiazaizhong": "正在下载中...",
+  "zhengzaixiazaizhong": "正在加载中...",
   "qingxuanzeyigemendian": "请选择一个门店",
   "muqianzanwuxingdianhuodong": "目前暂无星店活动",
   "zanwuyouhuiquankelingqu": "暂无优惠券可领取",
@@ -490,8 +490,8 @@
   "qianshou": "已签收",
   "wentijian": "问题件",
   "zanwupinglun": "暂无评论，快来评论吧",
-  "xiazaiwancheng": "下载完成",
+  "xiazaiwancheng": "加载完成",
-  "zhengzaixiazaizhong": "正在下载中...",
+  "zhengzaixiazaizhong": "正在加载中...",
   "daopinglunliebiaodingbu": "到评论列表顶部",
   "dianzanxihuan_": "点赞喜欢{xihuan}",
   "wenzhang": "文章",

lib/l10n/intl_zh_CN.arb

@@ -374,7 +374,7 @@
   "chaungshirengushi": "创始人故事",
   "jituanchuangshiren": "集团创始人",
   "jianjie": "简介:{jianjie}",
-  "zhengzaixiazaizhong": "正在下载中...",
+  "zhengzaixiazaizhong": "正在加载中...",
   "qingxuanzeyigemendian": "请选择一个门店",
   "muqianzanwuxingdianhuodong": "目前暂无星店活动",
   "zanwuyouhuiquankelingqu": "暂无优惠券可领取",
@@ -492,8 +492,8 @@
   "qianshou": "已签收",
   "wentijian": "问题件",
   "zanwupinglun": "暂无评论，快来评论吧",
-  "xiazaiwancheng": "下载完成",
+  "xiazaiwancheng": "加载完成",
-  "zhengzaixiazaizhong": "正在下载中...",
+  "zhengzaixiazaizhong": "正在加载中...",
   "daopinglunliebiaodingbu": "到评论列表顶部",
   "dianzanxihuan_": "点赞喜欢{xihuan}",
   "wenzhang": "文章",

lib/l10n/intl_zh_Hans_CN.arb

@@ -374,7 +374,7 @@
   "chaungshirengushi": "创始人故事",
   "jituanchuangshiren": "集团创始人",
   "jianjie": "简介:{jianjie}",
-  "zhengzaixiazaizhong": "正在下载中...",
+  "zhengzaixiazaizhong": "正在加载中...",
   "qingxuanzeyigemendian": "请选择一个门店",
   "muqianzanwuxingdianhuodong": "目前暂无星店活动",
   "zanwuyouhuiquankelingqu": "暂无优惠券可领取",
@@ -492,8 +492,8 @@
   "qianshou": "已签收",
   "wentijian": "问题件",
   "zanwupinglun": "暂无评论，快来评论吧",
-  "xiazaiwancheng": "下载完成",
+  "xiazaiwancheng": "加载完成",
-  "zhengzaixiazaizhong": "正在下载中...",
+  "zhengzaixiazaizhong": "正在加载中...",
   "daopinglunliebiaodingbu": "到评论列表顶部",
   "dianzanxihuan_": "点赞喜欢{xihuan}",
   "wenzhang": "文章",

lib/l10n/intl_zh_Hant_CN.arb

@@ -486,8 +486,8 @@
   "qianshou": "已簽收",
   "wentijian": "問題件",
   "zanwupinglun": "暫無評論，快去評論吧～",
-  "xiazaiwancheng": "下載完成",
+  "xiazaiwancheng": "加載完成",
-  "zhengzaixiazaizhong": "正在下載中...",
+  "zhengzaixiazaizhong": "正在加載中...",
   "daopinglunliebiaodingbu": "到評論列表頂部",
   "dianzanxihuan_": "點贊喜歡{xihuan}",
   "wenzhang": "文章",

lib/l10n/intl_zh_TW.arb

@@ -484,8 +484,8 @@
   "qianshou": "已簽收",
   "wentijian": "問題件",
   "zanwupinglun": "暫無評論，快去評論吧～",
-  "xiazaiwancheng": "下載完成",
+  "xiazaiwancheng": "加載完成",
-  "zhengzaixiazaizhong": "正在下載中...",
+  "zhengzaixiazaizhong": "正在加載中...",
   "daopinglunliebiaodingbu": "到評論列表頂部",
   "dianzanxihuan_": "點贊喜歡{xihuan}",
   "wenzhang": "文章",

lib/retrofit/data/base_data.g.dart

@@ -1,37 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'base_data.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-BaseData<T> _$BaseDataFromJson<T>(
-  Map<String, dynamic> json,
-  T Function(Object json) fromJsonT,
-) {
-  return BaseData<T>()
-    ..code = json['code'] as int
-    ..data = fromJsonT(json['data'])
-    ..extra = json['extra']
-    ..isError = json['isError'] as bool
-    ..isSuccess = json['isSuccess'] as bool
-    ..msg = json['msg'] as String
-    ..path = json['path'] as String
-    ..timestamp = json['timestamp'] as String;
-}
-
-Map<String, dynamic> _$BaseDataToJson<T>(
-  BaseData<T> instance,
-  Object Function(T value) toJsonT,
-) =>
-    <String, dynamic>{
-      'code': instance.code,
-      'data': toJsonT(instance.data),
-      'extra': instance.extra,
-      'isError': instance.isError,
-      'isSuccess': instance.isSuccess,
-      'msg': instance.msg,
-      'path': instance.path,
-      'timestamp': instance.timestamp,
-    };

lib/retrofit/data/page.g.dart

@@ -1,41 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'page.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-PageInfo<D> _$PageInfoFromJson<D>(
-  Map<String, dynamic> json,
-  D Function(Object json) fromJsonD,
-) {
-  return PageInfo<D>()
-    ..pageNum = json['pageNum'] as int
-    ..current = json['current']
-    ..pageSize = json['pageSize'] as int
-    ..size = json['size']
-    ..pages = json['pages']
-    ..hasPreviousPage = json['hasPreviousPage'] as bool
-    ..hasNextPage = json['hasNextPage'] as bool
-    ..total = json['total'] as String
-    ..list = (json['list'] as List)?.map(fromJsonD)?.toList()
-    ..records = (json['records'] as List)?.map(fromJsonD)?.toList();
-}
-
-Map<String, dynamic> _$PageInfoToJson<D>(
-  PageInfo<D> instance,
-  Object Function(D value) toJsonD,
-) =>
-    <String, dynamic>{
-      'pageNum': instance.pageNum,
-      'current': instance.current,
-      'pageSize': instance.pageSize,
-      'size': instance.size,
-      'pages': instance.pages,
-      'hasPreviousPage': instance.hasPreviousPage,
-      'hasNextPage': instance.hasNextPage,
-      'total': instance.total,
-      'list': instance.list?.map(toJsonD)?.toList(),
-      'records': instance.records?.map(toJsonD)?.toList(),
-    };

lib/retrofit/retrofit_api.dart

@@ -43,8 +43,8 @@ part 'retrofit_api.g.dart';
 const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
 const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式
 
-// const base_url = "http://192.168.10.236:8766/app/";
+// const base_url = "http://192.168.10.236:8766/app/";   ///费韬
-// const baseUrl = "http://192.168.10.236:8766/app/";
+// const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
 
 // const base_url = "http://192.168.10.74:8766/app/";
 // const baseUrl = "http://192.168.10.74:8766/app/";
@@ -70,7 +70,7 @@ abstract class ApiService {
         responseType: ResponseType.json);
     dio.interceptors.add(
       InterceptorsWrapper(onRequest: (RequestOptions options) {
-        debugPrint("\n====================== 请求数据 =======================");
+        debugPrint("\n======================= 请求数据 =======================");
         debugPrint("method = ${options.method.toString()}");
         debugPrint("url = ${options.uri.toString()}");
         debugPrint("headers = ${options.headers}");
@@ -88,7 +88,7 @@ abstract class ApiService {
         if (showLoading && EasyLoading.isShow) {
           EasyLoading.dismiss();
         }
-        debugPrint("\n====================== 响应数据开始 =====================");
+        debugPrint("\n======================= 响应数据开始 =======================");
         debugPrint("code = ${response.statusCode}");
         p(jsonEncode(response.data));
         Map map = response.data;
@@ -109,7 +109,7 @@ abstract class ApiService {
         if (EasyLoading.isShow) {
           EasyLoading.dismiss();
         }
-        debugPrint("\n=======================错误响应数据 ========================");
+        debugPrint("\n======================= 错误响应数据 =======================");
         debugPrint("type = ${e.type}");
         debugPrint("message = ${e.message}");
         debugPrint("\n");

lib/union/union_details_page.dart

@@ -281,7 +281,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
   double progressValue = 0;
   String downText = S.current.zhengzaixiazaizhong;
 
-  downloadWgt(appid, savePath) async {
+  downloadWgt(appId, savePath) async {
     downText = S.of(context).zhengzaixiazaizhong;
     Response response = await Dio()
         .download(storeInfo.mini.miniDownloadUrl, savePath,
@@ -298,7 +298,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
             (value.getStringList("miniAppid") != null
                 ? value.getStringList("miniAppid")
                 : [])
-              ..add(appid));
+              ..add(appId));
       });
     } else {
       print("print 下载失败");