更改类型

3 years ago · 6bb0a8ae64
12 changed files with 13 additions and 13 deletions
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@ -337,7 +337,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
    "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
    "manlijiandaijinquan" : m17,
    "manyuankeyong" : m18,
--- a/lib/generated/intl/messages_zh_CN.dart
+++ b/lib/generated/intl/messages_zh_CN.dart
@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
    "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
    "manlijiandaijinquan" : m17,
    "manyuankeyong" : m18,
--- a/lib/generated/intl/messages_zh_Hans_CN.dart
+++ b/lib/generated/intl/messages_zh_Hans_CN.dart
@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
    "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
    "manlijiandaijinquan" : m17,
    "manyuankeyong" : m18,
--- a/lib/generated/intl/messages_zh_Hant_CN.dart
+++ b/lib/generated/intl/messages_zh_Hant_CN.dart
@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("發現"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"),
    "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
    "manlijiandaijinquan" : m17,
    "manyuankeyong" : m18,
--- a/lib/generated/intl/messages_zh_TW.dart
+++ b/lib/generated/intl/messages_zh_TW.dart
@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary {
    "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"),
    "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
    "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("發現"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"),
    "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
    "manlijiandaijinquan" : m17,
    "manyuankeyong" : m18,
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@ -185,10 +185,10 @@ class S {
    );
  }

-  /// `发现`
+  /// `有机生活`
  String get main_menu3 {
    return Intl.message(
-      '发现',
+      '有机生活',
      name: 'main_menu3',
      desc: '',
      args: [],
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@ -14,7 +14,7 @@
  "privacy_policy3": "《隐私服务》",
  "main_menu1": "净弼",
  "main_menu2": "联盟",
-  "main_menu3": "发现",
+  "main_menu3": "有机生活",
  "main_menu4": "我的",
  "shouye": "首页",
  "huodongliebiao": "活动列表",
--- a/lib/l10n/intl_zh_CN.arb
+++ b/lib/l10n/intl_zh_CN.arb
@ -14,7 +14,7 @@
  "privacy_policy3": "《隐私服务》",
  "main_menu1": "净弼",
  "main_menu2": "联盟",
-  "main_menu3": "发现",
+  "main_menu3": "有机生活",
  "main_menu4": "我的",
  "shouye": "首页",
  "huodongliebiao": "活动列表",
--- a/lib/l10n/intl_zh_Hans_CN.arb
+++ b/lib/l10n/intl_zh_Hans_CN.arb
@ -14,7 +14,7 @@
  "privacy_policy3": "《隐私服务》",
  "main_menu1": "净弼",
  "main_menu2": "联盟",
-  "main_menu3": "发现",
+  "main_menu3": "有机生活",
  "main_menu4": "我的",
  "shouye": "首页",
  "huodongliebiao": "活动列表",
--- a/lib/l10n/intl_zh_Hant_CN.arb
+++ b/lib/l10n/intl_zh_Hant_CN.arb
@ -14,7 +14,7 @@
  "privacy_policy3": "《隱私服務》",
  "main_menu1": "淨弼",
  "main_menu2": "聯盟",
-  "main_menu3": "發現",
+  "main_menu3": "有機生活",
  "main_menu4": "我的",
  "shouye": "首頁",
  "huodongliebiao": "活動列表",
--- a/lib/l10n/intl_zh_TW.arb
+++ b/lib/l10n/intl_zh_TW.arb
@ -14,7 +14,7 @@
  "privacy_policy3": "《隱私服務》",
  "main_menu1": "淨弼",
  "main_menu2": "聯盟",
-  "main_menu3": "發現",
+  "main_menu3": "有機生活",
  "main_menu4": "我的",
  "shouye": "首頁",
  "huodongliebiao": "活動列表",
--- a/lib/retrofit/data/shoppingCart.dart
+++ b/lib/retrofit/data/shoppingCart.dart
@ -336,7 +336,7 @@ class CouponListBean {
  String useStartTime;
  String useEndTime;
  String promotionId;
-  String mid;
+  dynamic mid;
  String couponId;
  String receiveTime;
  dynamic useTime;