Merge branch 'master' of https://git.lotus-wallet.com/fmk/huixiang_app

lib/home/home_page.dart

@@ -181,7 +181,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
                 moreText: S.of(context).renwuzhongxin,
                 onTap: () {
                   SharedPreferences.getInstance().then((value) {
-                    if (value.getString('token') == null) {
+                    if (value.getString('token') == null || value.getString('token') == "") {
                       loginTips();
                     } else {
                       Navigator.of(context).pushNamed('/router/integral_page');
@@ -192,7 +192,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
               InkWell(
                 onTap: () {
                   SharedPreferences.getInstance().then((value) {
-                    if (value.getString('token') == null) {
+                    if (value.getString('token') == null || value.getString('token') == "") {
                       loginTips();
                     } else {
                       Navigator.of(context).pushNamed('/router/integral_page');

lib/home/points_mall_page.dart

@@ -292,7 +292,7 @@ class _PointsMallPage extends State<PointsMallPage>
         arguments: {"goodsId": goods[index].id});
     SharedPreferences sharedPreferences = await SharedPreferences.getInstance();
     String token = sharedPreferences.getString("token");
-    if (token != null) queryUser();
+    if (token != null && token != "") queryUser();
   }
 
   _sortChange(item) {

lib/integral/integral_page.dart

@@ -322,7 +322,7 @@ class _IntegralPage extends State<IntegralPage> {
                     style: TextStyle(
                         color: Color(0xFF353535),
                         fontSize: 14.sp,
-                        fontWeight: FontWeight.w500),
+                        fontWeight: FontWeight.w500,),
                   ),
                   SizedBox(
                     height: 10.h,
@@ -442,7 +442,7 @@ class _IntegralPage extends State<IntegralPage> {
             style: TextStyle(
                 fontWeight: FontWeight.bold,
                 fontSize: 16.sp,
-                color: Color(0xFF353535)),
+                color: Color(0xFF353535),),
           ),
           SizedBox(
             height: 10.h,
@@ -465,7 +465,7 @@ class _IntegralPage extends State<IntegralPage> {
               mainAxisSpacing: 8.h,
               crossAxisSpacing: 18.w,
               padding: EdgeInsets.only(bottom: 32.h),
-              physics: new NeverScrollableScrollPhysics(),
+              physics: NeverScrollableScrollPhysics(),
               itemBuilder: (context, position) {
                 return signInItem(position);
               },
@@ -557,13 +557,19 @@ class _IntegralPage extends State<IntegralPage> {
             flex: 1,
             child: InkWell(
               onTap: () {
-                Navigator.of(context)
-                    .pushNamed('/router/mine_vip_level_page', arguments: {
-                  "rankLevel": rankLevel,
-                  "createTime":
+                SharedPreferences.getInstance().then((value) {
+                  if (value.getString("token") != null && value.getString("token") != "") {
+                    Navigator.of(context)
+                        .pushNamed('/router/mine_vip_level_page', arguments: {
+                      "rankLevel": rankLevel,
+                      "createTime":
                       (userinfo != null) ? "${userinfo.createTime}" : "",
-                  "points":
+                      "points":
                       (userinfo != null) ? int.tryParse(userinfo.points) : 0,
+                    });
+                  } else {
+
+                  }
                 });
               },
               child: Column(

lib/mine/mine_vip_level_page.dart

@@ -70,7 +70,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
         child: Column(
           children: [
             AspectRatio(
-              aspectRatio: 1.8,
+              aspectRatio: 1.7,
               child: Swiper(
                 viewportFraction: 0.95,
                 loop: false,