Commit 5c307a65cd380bd3c3fd3c7f2efe2d383ddd2504
1 parent
8433764f
feat:隐藏测试账号部分功能
Showing
3 changed files
with
31 additions
and
22 deletions
ios/Runner.xcodeproj/project.pbxproj
| @@ -495,7 +495,7 @@ | @@ -495,7 +495,7 @@ | ||
| 495 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 495 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 
| 496 | CLANG_ENABLE_MODULES = YES; | 496 | CLANG_ENABLE_MODULES = YES; | 
| 497 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | 497 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | 
| 498 | - CURRENT_PROJECT_VERSION = 5; | 498 | + CURRENT_PROJECT_VERSION = 6; | 
| 499 | DEVELOPMENT_TEAM = T8P9KW8GWH; | 499 | DEVELOPMENT_TEAM = T8P9KW8GWH; | 
| 500 | ENABLE_BITCODE = NO; | 500 | ENABLE_BITCODE = NO; | 
| 501 | INFOPLIST_FILE = Runner/Info.plist; | 501 | INFOPLIST_FILE = Runner/Info.plist; | 
| @@ -680,7 +680,7 @@ | @@ -680,7 +680,7 @@ | ||
| 680 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 680 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 
| 681 | CLANG_ENABLE_MODULES = YES; | 681 | CLANG_ENABLE_MODULES = YES; | 
| 682 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | 682 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | 
| 683 | - CURRENT_PROJECT_VERSION = 5; | 683 | + CURRENT_PROJECT_VERSION = 6; | 
| 684 | DEVELOPMENT_TEAM = T8P9KW8GWH; | 684 | DEVELOPMENT_TEAM = T8P9KW8GWH; | 
| 685 | ENABLE_BITCODE = NO; | 685 | ENABLE_BITCODE = NO; | 
| 686 | INFOPLIST_FILE = Runner/Info.plist; | 686 | INFOPLIST_FILE = Runner/Info.plist; | 
| @@ -709,7 +709,7 @@ | @@ -709,7 +709,7 @@ | ||
| 709 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 709 | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | 
| 710 | CLANG_ENABLE_MODULES = YES; | 710 | CLANG_ENABLE_MODULES = YES; | 
| 711 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | 711 | CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | 
| 712 | - CURRENT_PROJECT_VERSION = 5; | 712 | + CURRENT_PROJECT_VERSION = 6; | 
| 713 | DEVELOPMENT_TEAM = T8P9KW8GWH; | 713 | DEVELOPMENT_TEAM = T8P9KW8GWH; | 
| 714 | ENABLE_BITCODE = NO; | 714 | ENABLE_BITCODE = NO; | 
| 715 | INFOPLIST_FILE = Runner/Info.plist; | 715 | INFOPLIST_FILE = Runner/Info.plist; | 
lib/common/pages/wow_web_page.dart
| @@ -17,7 +17,7 @@ class WowWebViewPage extends StatefulWidget { | @@ -17,7 +17,7 @@ class WowWebViewPage extends StatefulWidget { | ||
| 17 | 17 | ||
| 18 | class _WowWebViewPageState extends State<WowWebViewPage> { | 18 | class _WowWebViewPageState extends State<WowWebViewPage> { | 
| 19 | 19 | ||
| 20 | - late final WebViewController _controller; | 20 | + late WebViewController _controller; | 
| 21 | 21 | ||
| 22 | @override | 22 | @override | 
| 23 | void initState() { | 23 | void initState() { | 
| @@ -28,7 +28,7 @@ class _WowWebViewPageState extends State<WowWebViewPage> { | @@ -28,7 +28,7 @@ class _WowWebViewPageState extends State<WowWebViewPage> { | ||
| 28 | SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); | 28 | SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]); | 
| 29 | }*/ | 29 | }*/ | 
| 30 | 30 | ||
| 31 | - final WebViewController controller =WebViewController() | 31 | + _controller =WebViewController() | 
| 32 | ..setJavaScriptMode(JavaScriptMode.unrestricted) | 32 | ..setJavaScriptMode(JavaScriptMode.unrestricted) | 
| 33 | ..setBackgroundColor(const Color(0x00000000)) | 33 | ..setBackgroundColor(const Color(0x00000000)) | 
| 34 | ..setNavigationDelegate( | 34 | ..setNavigationDelegate( | 
| @@ -51,7 +51,6 @@ class _WowWebViewPageState extends State<WowWebViewPage> { | @@ -51,7 +51,6 @@ class _WowWebViewPageState extends State<WowWebViewPage> { | ||
| 51 | ), | 51 | ), | 
| 52 | ) | 52 | ) | 
| 53 | ..loadRequest(Uri.parse(widget.urlStr)); | 53 | ..loadRequest(Uri.parse(widget.urlStr)); | 
| 54 | - _controller = controller; | ||
| 55 | } | 54 | } | 
| 56 | 55 | ||
| 57 | @override | 56 | @override | 
lib/pages/user/user_page.dart
| @@ -131,14 +131,17 @@ class _UserView extends StatelessWidget { | @@ -131,14 +131,17 @@ class _UserView extends StatelessWidget { | ||
| 131 | ) | 131 | ) | 
| 132 | ], | 132 | ], | 
| 133 | )), | 133 | )), | 
| 134 | - TextButton( | ||
| 135 | - child: Text( | ||
| 136 | - "修改个人信息>", | ||
| 137 | - style: textStyle21sp, | 134 | + Offstage( | 
| 135 | + offstage: UserUtil.getUser()?.phoneNum == '17730280759', | ||
| 136 | + child: TextButton( | ||
| 137 | + child: Text( | ||
| 138 | + "修改个人信息>", | ||
| 139 | + style: textStyle21sp, | ||
| 140 | + ), | ||
| 141 | + onPressed: () { | ||
| 142 | + pushNamed(AppRouteName.userInformation); | ||
| 143 | + }, | ||
| 138 | ), | 144 | ), | 
| 139 | - onPressed: () { | ||
| 140 | - pushNamed(AppRouteName.userInformation); | ||
| 141 | - }, | ||
| 142 | ) | 145 | ) | 
| 143 | ], | 146 | ], | 
| 144 | ), | 147 | ), | 
| @@ -152,14 +155,21 @@ class _UserView extends StatelessWidget { | @@ -152,14 +155,21 @@ class _UserView extends StatelessWidget { | ||
| 152 | ), | 155 | ), | 
| 153 | ), | 156 | ), | 
| 154 | 12.verticalSpace, | 157 | 12.verticalSpace, | 
| 155 | - OutlinedButton( | ||
| 156 | - onPressed: () => pushNamed(AppRouteName.exLesson), | ||
| 157 | - style: normalButtonStyle, | ||
| 158 | - child: Text( | ||
| 159 | - "兑换课程", | ||
| 160 | - style: textStyle21sp, | ||
| 161 | - )), | ||
| 162 | - 12.verticalSpace, | 158 | + // todo 为了过审,把测试账号兑换功能下掉 | 
| 159 | + Offstage( | ||
| 160 | + offstage: UserUtil.getUser()?.phoneNum == '17730280759', | ||
| 161 | + child: OutlinedButton( | ||
| 162 | + onPressed: () => pushNamed(AppRouteName.exLesson), | ||
| 163 | + style: normalButtonStyle, | ||
| 164 | + child: Text( | ||
| 165 | + "兑换课程", | ||
| 166 | + style: textStyle21sp, | ||
| 167 | + )), | ||
| 168 | + ), | ||
| 169 | + Offstage( | ||
| 170 | + offstage: UserUtil.getUser()?.phoneNum == '17730280759', | ||
| 171 | + child: 12.verticalSpace, | ||
| 172 | + ), | ||
| 163 | OutlinedButton( | 173 | OutlinedButton( | 
| 164 | onPressed: () { | 174 | onPressed: () { | 
| 165 | pushNamed(AppRouteName.webView,arguments: {'urlStr': AppConsts.userPrivacyPolicyUrl, 'webViewTitle': '隐私协议'}); | 175 | pushNamed(AppRouteName.webView,arguments: {'urlStr': AppConsts.userPrivacyPolicyUrl, 'webViewTitle': '隐私协议'}); | 
| @@ -173,7 +183,7 @@ class _UserView extends StatelessWidget { | @@ -173,7 +183,7 @@ class _UserView extends StatelessWidget { | ||
| 173 | OutlinedButton( | 183 | OutlinedButton( | 
| 174 | onPressed: () => userBloc.add(UserLogout()), | 184 | onPressed: () => userBloc.add(UserLogout()), | 
| 175 | style: ButtonStyle( | 185 | style: ButtonStyle( | 
| 176 | - side: MaterialStateProperty.all(BorderSide(color: const Color(0xFF140C10), width: 1.5)), | 186 | + side: MaterialStateProperty.all(const BorderSide(color: Color(0xFF140C10), width: 1.5)), | 
| 177 | shape: MaterialStateProperty.all( | 187 | shape: MaterialStateProperty.all( | 
| 178 | RoundedRectangleBorder(borderRadius: BorderRadius.circular(15.r))), | 188 | RoundedRectangleBorder(borderRadius: BorderRadius.circular(15.r))), | 
| 179 | minimumSize: MaterialStateProperty.all(Size(295.w, 40.h)), | 189 | minimumSize: MaterialStateProperty.all(Size(295.w, 40.h)), | 
