diff --git a/lib/pages/security_page/security_page.dart b/lib/pages/security_page/security_page.dart new file mode 100644 index 0000000..9caa9d2 --- /dev/null +++ b/lib/pages/security_page/security_page.dart @@ -0,0 +1,57 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +class SecurityPage extends StatefulWidget { + final Map<String, dynamic> data; + + const SecurityPage(this.data, {Key key}) : super(key: key); + + @override + _SecurityPageState createState() => _SecurityPageState(); +} + +class _SecurityPageState extends State<SecurityPage> { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: _createNav(), + ); + } + + // 导航栏 + Widget _createNav() { + return CupertinoNavigationBar( + border: Border( + bottom: BorderSide( + width: 0.0, // One physical pixel. + style: BorderStyle.none, + ), + ), + backgroundColor: Color(0xfff9f9f9), + leading: Navigator.canPop(context) + ? GestureDetector( + child: Container( + padding: EdgeInsets.zero, + child: Icon( + Icons.arrow_back_ios, + size: 20, + ), + ), + onTap: () { + if (Navigator.canPop(context)) { + Navigator.pop(context); + } + }, + ) + : Container(), + middle: Text( + '账号安全', + style: TextStyle( + fontSize: 15, + color: HexColor.fromHex('#333333'), + ), + ), + ); + } +} diff --git a/lib/pages/setting_page/setting_page.dart b/lib/pages/setting_page/setting_page.dart index 306d7da..09245dd 100644 --- a/lib/pages/setting_page/setting_page.dart +++ b/lib/pages/setting_page/setting_page.dart @@ -152,6 +152,11 @@ class _SettingContainerState extends State<_SettingContainer> { ), ), ), + Icon( + Icons.arrow_forward_ios, + size: 14, + color: Color(0xff999999), + ) ], ), ), diff --git a/lib/pages/wallet_page/wallet_page.dart b/lib/pages/wallet_page/wallet_page.dart index ba71a1a..df95e6c 100644 --- a/lib/pages/wallet_page/wallet_page.dart +++ b/lib/pages/wallet_page/wallet_page.dart @@ -70,22 +70,6 @@ class _WalletPageContainerState extends State<_WalletPageContainer> { CustomScrollView( slivers: _createContent(context), ), - Center( - child: FlatButton( - child: Text( - 'aaaaaa', - style: TextStyle(color: Colors.black), - ), - onPressed: () { - Provider.of<MainPageBgNotifier>(context, listen: false) - .switchBg(Container( - width: double.infinity, - height: 200, - color: Colors.purpleAccent, - )); - }, - ), - ) ], ), ), diff --git a/lib/register.dart b/lib/register.dart index 7e5286b..03401e0 100644 --- a/lib/register.dart +++ b/lib/register.dart @@ -3,6 +3,7 @@ import 'package:zhiying_base_widget/pages/home_page/home_page.dart'; import 'package:zhiying_base_widget/pages/main_page/main_page.dart'; import 'package:zhiying_base_widget/pages/mine_detail_page/mine_detail_page.dart'; import 'package:zhiying_base_widget/pages/orders_page/orders_page.dart'; +import 'package:zhiying_base_widget/pages/security_page/security_page.dart'; import 'package:zhiying_base_widget/pages/setting_page/setting_page.dart'; import 'package:zhiying_base_widget/pages/sreach_page/sreach_page.dart'; import 'package:zhiying_base_widget/pages/sreach_result_page/sreach_result_page.dart'; @@ -63,9 +64,14 @@ class BaseWidgetRegister { 'pub.flutter.profile_settings', (model) => MineDetailPage()); PageFactory.regist('pub.flutter.settings', (model) => SettingPage(model)); - PageFactory.regist('pub.flutter.my_orders', (model) => OrdersPage(model)); - + PageFactory.regist('pub.flutter.my_order', (model) => OrdersPage(model)); + // webview PageFactory.regist('pub.flutter.url', (model) => BaseWebview(model)); + + // 钱包 + PageFactory.regist('pub.flutter.my_wallet', (model) => WalletPage()); + PageFactory.regist( + 'pub.flutter.account_security', (model) => SecurityPage(model)); } // 注册控件 diff --git a/lib/widgets/mine/mine_quick_entry/mine_quick_entry.dart b/lib/widgets/mine/mine_quick_entry/mine_quick_entry.dart index 7ab115c..ba14d4b 100644 --- a/lib/widgets/mine/mine_quick_entry/mine_quick_entry.dart +++ b/lib/widgets/mine/mine_quick_entry/mine_quick_entry.dart @@ -60,6 +60,7 @@ class MineQuickEntry extends StatelessWidget { itemBuilder: (BuildContext context, int index) { return GestureDetector( child: Container( + color: Colors.transparent, child: Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, @@ -84,7 +85,8 @@ class MineQuickEntry extends StatelessWidget { ), ), onTap: () { - RouterUtil.route(model.functionsList[index], model.functionsList[index].toJson(), context); + RouterUtil.route(model.functionsList[index], + model.functionsList[index].toJson(), context); }, ); },