Merge branch 'master' into dev

# Conflicts:
#	lib/mine/mine_page.dart

lib/home/points_mall_page.dart

@@ -72,15 +72,16 @@ class _PointsMallPage extends State<PointsMallPage>
   }
 
   refreshUserInfo() {
-    SharedPreferences.getInstance().then((value) => {
+    if(mounted)
-          client = ApiService(Dio(),
+      SharedPreferences.getInstance().then((value) => {
-              context: context,
+            client = ApiService(Dio(),
-              token: value.getString('token'),
+                context: context,
-              showLoading: false),
+                token: value.getString('token'),
-          SmartDialog.showLoading(msg: S.current.zhengzaijiazai),
+                showLoading: false),
-          creditGoods(categoryId),
+            SmartDialog.showLoading(msg: S.current.zhengzaijiazai),
-          queryUser(),
+            creditGoods(categoryId),
-        });
+            queryUser(),
+          });
   }
 
   int pageNum = 1;