Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app

 Conflicts:

	pubspec.yaml

lib/home/points_mall_page.dart

@@ -47,6 +47,12 @@ class _PointsMallPage extends State<PointsMallPage>
     S.current.jifendidaogao,
   ];
 
+  @override
+  void dispose() {
+    super.dispose();
+    _refreshController.dispose();
+  }
+
   @override
   void initState() {
     super.initState();

lib/main.dart

@@ -147,7 +147,7 @@ class MyApp extends StatelessWidget {
             data: MediaQuery.of(context).copyWith(
               textScaleFactor: textScaleFactor > 1.15 ? 1.15 : textScaleFactor,
             ),
-            child: FlutterSmartDialog(child: widget),
+            child: FlutterSmartDialog(child:widget),
           );
         },
         onGenerateRoute: (settings) {

lib/mine/coupons_page.dart

@@ -27,6 +27,12 @@ class _CouponsPage extends State<CouponsPage> {
   ApiService apiService;
   RefreshController _refreshController;
 
+  @override
+  void dispose() {
+    super.dispose();
+    _refreshController.dispose();
+  }
+
   @override
   void initState() {
     super.initState();

lib/mine/manage_address_page.dart

@@ -256,11 +256,14 @@ class _ManageAddressPage extends State<ManageAddressPage> {
                 ),
               ),
               InkWell(
-                child: Text(
+                child: Padding(
-                  "删除",
+                  padding: EdgeInsets.only(top:5,),
-                  style: TextStyle(
+                  child: Text(
-                    fontSize: 16,
+                    "删除",
-                    color: Colors.black,
+                    style: TextStyle(
+                      fontSize: 16,
+                      color: Colors.black,
+                    ),
                   ),
                 ),
                 onTap: () {

lib/mine/mine_card_invalid_page.dart

@@ -23,6 +23,12 @@ class _MineCardInvalidPage extends State<MineCardInvalidPage> {
 
   ApiService apiService;
 
+  @override
+  void dispose() {
+    super.dispose();
+    _refreshController.dispose();
+  }
+
   @override
   void initState() {
     super.initState();

pubspec.yaml

@@ -93,7 +93,6 @@ dependencies:
   package_info: ^2.0.2
 
   sharesdk_plugin: ^1.3.0
-#  jshare_flutter_plugin: ^2.1.2
 
 dev_dependencies:
   flutter_test: