From 7034f87a75b54a712b69c47b9282b89fd8b289a0 Mon Sep 17 00:00:00 2001
From: wylyl22 <2373073266@qq.com>
Date: Fri, 26 Aug 2022 16:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/ui/login/login_page.dart  | 18 +++++++++---------
 lib/ui/user/members_page.dart | 15 +++++++++------
 lib/ui/user/user_page.dart    |  3 ++-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/lib/ui/login/login_page.dart b/lib/ui/login/login_page.dart
index 10108bf..ce70b7a 100644
--- a/lib/ui/login/login_page.dart
+++ b/lib/ui/login/login_page.dart
@@ -51,14 +51,14 @@ class _LoginPageState extends State<LoginPage> {
     _phoneController = TextEditingController();
     _smsCodeController = TextEditingController();
     final userProvider = Provider.of<UserProvider>(context, listen: false);
-    var env = const String.fromEnvironment('ENV', defaultValue: 'dev');
-    if (kDebugMode) {
-      print('env :$env');
-    }
-    DevEV.instance.setEnvironment(
-      context,
-      environment: env == 'dev',
-    );
+    // var env = const String.fromEnvironment('ENV', defaultValue: 'dev');
+    // if (kDebugMode) {
+    //   print('env :$env');
+    // }
+    // DevEV.instance.setEnvironment(
+    //   context,
+    //   environment: env == 'dev',
+    // );
   }
 
   @override
@@ -130,7 +130,7 @@ class _LoginPageState extends State<LoginPage> {
                   BotToast.showText(text: "请同意并勾选隐私政策");
                 }else{
                   if(_lastTap != null &&DateTime.now().difference(_lastTap!).inSeconds < 2){
-                    BotToast.showText(text: "过快");
+                    // BotToast.showText(text: "过快");
                     return ;
                   }
                     _lastTap = DateTime.now();
diff --git a/lib/ui/user/members_page.dart b/lib/ui/user/members_page.dart
index e92be12..e7f3a15 100644
--- a/lib/ui/user/members_page.dart
+++ b/lib/ui/user/members_page.dart
@@ -1,4 +1,5 @@
 import 'package:bot_toast/bot_toast.dart';
+import 'package:flustars/flustars.dart';
 import 'package:flutter/material.dart';
 import 'package:project_telephony/base/base_style.dart';
 
@@ -7,6 +8,7 @@ import 'package:project_telephony/ui/widget/plone_back_button.dart';
 import 'package:project_telephony/ui/widget/plone_bottom.dart';
 import 'package:project_telephony/ui/widget/putup_widget.dart';
 import 'package:project_telephony/utils/headers.dart';
+import 'package:project_telephony/utils/user_tool.dart';
 import 'package:tobias/tobias.dart';
 import 'package:fluwx/fluwx.dart' as fluwx;
 
@@ -106,7 +108,8 @@ class _MembersPageState extends State<MembersPage> {
                       }
                     },
                     textColor: const Color(0xFF333333),
-                    text: "立即开通",
+                    text: UserTool.userProvider.userInfo.isVip!=1?"立即开通":"立即续费",
+
                     color1: const Color(0xFFFFF6D8),
                     color2: const Color(0xFFFFEAB0),
                   )
@@ -159,7 +162,7 @@ class _MembersPageState extends State<MembersPage> {
         _getVip(),
         18.hb,
         Text(
-          "解锁全部功能",
+          UserTool.userProvider.userInfo.name,
           style: TextStyle(
               color: Colors.white,
               fontSize: BaseStyle.fontSize32,
@@ -167,7 +170,7 @@ class _MembersPageState extends State<MembersPage> {
         ),
         16.hb,
         Text(
-          "暂未开通会员",
+          UserTool.userProvider.userInfo.isVip!=1?"暂未开通会员":"${DateUtil.formatDateMs(UserTool.userProvider.userInfo.end * 1000, format: DateFormats.y_mo_d)}到期",
           style: TextStyle(color: Colors.white, fontSize: BaseStyle.fontSize24),
         ),
       ],
@@ -194,9 +197,9 @@ class _MembersPageState extends State<MembersPage> {
             color: const Color(0xFFFFEAB0),
           ),
         ),
-        const Text(
-          "未开通会员",
-          style: TextStyle(
+         Text(
+          UserTool.userProvider.userInfo.isVip!=1?"未开通会员":"已成为会员",
+          style: const TextStyle(
               color: Color(
                 0xFFFFEAB0,
               ),
diff --git a/lib/ui/user/user_page.dart b/lib/ui/user/user_page.dart
index 34368d1..aaa8ca7 100644
--- a/lib/ui/user/user_page.dart
+++ b/lib/ui/user/user_page.dart
@@ -59,7 +59,8 @@ class _UserPageState extends State<UserPage> {
       if ( UserTool.userProvider.isLogin) {
         print(UserTool.userProvider.userInfo.end*1000);
         print(DateTime.now().millisecondsSinceEpoch);
-        if (UserTool.userProvider.userInfo.end*1000<=DateTime.now().millisecondsSinceEpoch ) {
+        // UserTool.userProvider.userInfo.end*1000<=DateTime.now().millisecondsSinceEpoch
+        if (UserTool.userProvider.userInfo.isVip!=1) {
           isVip = false;
           vle=false;
         } else {