|
@@ -10,7 +10,7 @@ import '../net/HttpManager.dart';
|
|
|
import '../net/Result.dart';
|
|
import '../net/Result.dart';
|
|
|
import 'dart:ui';
|
|
import 'dart:ui';
|
|
|
import '../styles/totast.dart';
|
|
import '../styles/totast.dart';
|
|
|
-import 'Recharge.dart';
|
|
|
|
|
|
|
+import 'ShoppingMall.dart';
|
|
|
|
|
|
|
|
class MyWallet extends StatefulWidget {
|
|
class MyWallet extends StatefulWidget {
|
|
|
@override
|
|
@override
|
|
@@ -99,7 +99,7 @@ class MyWalletState extends State<MyWallet> {
|
|
|
getWalletPage();
|
|
getWalletPage();
|
|
|
},
|
|
},
|
|
|
child: Container(
|
|
child: Container(
|
|
|
- color: BG_COLOR,
|
|
|
|
|
|
|
+ color: Color(0xFF2E3049),
|
|
|
child: Stack(
|
|
child: Stack(
|
|
|
children: <Widget>[
|
|
children: <Widget>[
|
|
|
CustomScrollView(
|
|
CustomScrollView(
|
|
@@ -149,7 +149,7 @@ class MyWalletState extends State<MyWallet> {
|
|
|
//背景装饰
|
|
//背景装饰
|
|
|
gradient: LinearGradient(
|
|
gradient: LinearGradient(
|
|
|
begin: Alignment.bottomRight,
|
|
begin: Alignment.bottomRight,
|
|
|
- colors: [Color(0xFFFFA6A2),Color(0xFFCE5C57), Theme.of(context).primaryColor],
|
|
|
|
|
|
|
+ colors: [Color(0xFFFEA5A1),Color(0xFFE17874), Theme.of(context).primaryColor],
|
|
|
)),
|
|
)),
|
|
|
child: Stack(
|
|
child: Stack(
|
|
|
overflow: Overflow.visible,
|
|
overflow: Overflow.visible,
|
|
@@ -178,13 +178,13 @@ class MyWalletState extends State<MyWallet> {
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
|
children: <Widget>[
|
|
children: <Widget>[
|
|
|
Image(
|
|
Image(
|
|
|
- image: AssetImage('images/icon_menpiao.png'),
|
|
|
|
|
|
|
+ image: AssetImage('images/金币/小_白色.png'),
|
|
|
width: 20,
|
|
width: 20,
|
|
|
),
|
|
),
|
|
|
Container(width: 5,),
|
|
Container(width: 5,),
|
|
|
- Text('我的门票',
|
|
|
|
|
|
|
+ Text('我的参赛券',
|
|
|
style: TextStyle(
|
|
style: TextStyle(
|
|
|
- color: Colors.white,
|
|
|
|
|
|
|
+ color: Color(0xFFC2524D),
|
|
|
fontSize: 14,
|
|
fontSize: 14,
|
|
|
))
|
|
))
|
|
|
],
|
|
],
|
|
@@ -192,28 +192,29 @@ class MyWalletState extends State<MyWallet> {
|
|
|
],
|
|
],
|
|
|
),
|
|
),
|
|
|
),
|
|
),
|
|
|
- // Positioned(
|
|
|
|
|
- // bottom: -23,
|
|
|
|
|
- // left: -(ScreenUtil().setWidth(345) - 216) / 2,
|
|
|
|
|
- // child: Container(
|
|
|
|
|
- // width: ScreenUtil().setWidth(345),
|
|
|
|
|
- // height: 46,
|
|
|
|
|
- // color: PRIMARY_COLOR,
|
|
|
|
|
- // child: _newRouterTab(context),
|
|
|
|
|
- // ),
|
|
|
|
|
- // )
|
|
|
|
|
|
|
+ Positioned(
|
|
|
|
|
+ bottom: -23,
|
|
|
|
|
+ left: -(ScreenUtil().setWidth(345) - 216) / 2,
|
|
|
|
|
+ child: Container(
|
|
|
|
|
+ width: ScreenUtil().setWidth(345),
|
|
|
|
|
+ height: 46,
|
|
|
|
|
+ color: PRIMARY_COLOR,
|
|
|
|
|
+ child: _newRouterTab(context),
|
|
|
|
|
+ ),
|
|
|
|
|
+ )
|
|
|
],
|
|
],
|
|
|
),
|
|
),
|
|
|
),
|
|
),
|
|
|
Container(
|
|
Container(
|
|
|
width: double.infinity,
|
|
width: double.infinity,
|
|
|
|
|
+ // color: Color(0xFF2E3049),
|
|
|
child: Text(
|
|
child: Text(
|
|
|
'余额明细',
|
|
'余额明细',
|
|
|
style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
|
|
style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
|
|
|
),
|
|
),
|
|
|
padding: EdgeInsets.only(
|
|
padding: EdgeInsets.only(
|
|
|
left: 15,
|
|
left: 15,
|
|
|
- top: 15,
|
|
|
|
|
|
|
+ top: 55,
|
|
|
bottom: 15,
|
|
bottom: 15,
|
|
|
),
|
|
),
|
|
|
)
|
|
)
|
|
@@ -225,25 +226,25 @@ class MyWalletState extends State<MyWallet> {
|
|
|
Widget _newRouterTab(BuildContext context) {
|
|
Widget _newRouterTab(BuildContext context) {
|
|
|
return Row(
|
|
return Row(
|
|
|
children: <Widget>[
|
|
children: <Widget>[
|
|
|
- Expanded(
|
|
|
|
|
- flex: 1,
|
|
|
|
|
- child: GestureDetector(
|
|
|
|
|
- child: Container(
|
|
|
|
|
- padding: EdgeInsets.all(10),
|
|
|
|
|
- child: Text(
|
|
|
|
|
- '提现',
|
|
|
|
|
- textAlign: TextAlign.center,
|
|
|
|
|
- style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
|
|
|
|
|
- ),
|
|
|
|
|
- ),
|
|
|
|
|
- onTap: () {},
|
|
|
|
|
- ),
|
|
|
|
|
- ),
|
|
|
|
|
- Container(
|
|
|
|
|
- width: 1,
|
|
|
|
|
- height: 20,
|
|
|
|
|
- color: Color(0x2E000000),
|
|
|
|
|
- ),
|
|
|
|
|
|
|
+ // Expanded(
|
|
|
|
|
+ // flex: 1,
|
|
|
|
|
+ // child: GestureDetector(
|
|
|
|
|
+ // child: Container(
|
|
|
|
|
+ // padding: EdgeInsets.all(10),
|
|
|
|
|
+ // child: Text(
|
|
|
|
|
+ // '提现',
|
|
|
|
|
+ // textAlign: TextAlign.center,
|
|
|
|
|
+ // style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
|
|
|
|
|
+ // ),
|
|
|
|
|
+ // ),
|
|
|
|
|
+ // onTap: () {},
|
|
|
|
|
+ // ),
|
|
|
|
|
+ // ),
|
|
|
|
|
+ // Container(
|
|
|
|
|
+ // width: 1,
|
|
|
|
|
+ // height: 20,
|
|
|
|
|
+ // color: Color(0x2E000000),
|
|
|
|
|
+ // ),
|
|
|
Expanded(
|
|
Expanded(
|
|
|
flex: 1,
|
|
flex: 1,
|
|
|
child: GestureDetector(
|
|
child: GestureDetector(
|
|
@@ -255,7 +256,7 @@ class MyWalletState extends State<MyWallet> {
|
|
|
style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
|
|
style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
|
|
|
)),
|
|
)),
|
|
|
onTap: () {
|
|
onTap: () {
|
|
|
- Navigator.push(context, CupertinoPageRoute(builder: (context) => Rechrage()));
|
|
|
|
|
|
|
+ Navigator.push(context, CupertinoPageRoute(builder: (context) => ShoppingMall()));
|
|
|
},
|
|
},
|
|
|
),
|
|
),
|
|
|
)
|
|
)
|
|
@@ -272,7 +273,7 @@ class MyWalletState extends State<MyWallet> {
|
|
|
padding: EdgeInsets.all(15),
|
|
padding: EdgeInsets.all(15),
|
|
|
decoration: BoxDecoration(
|
|
decoration: BoxDecoration(
|
|
|
border: BorderDirectional(top: BorderSide(width: 1, color: Color(0x2E000000), style: BorderStyle.solid)),
|
|
border: BorderDirectional(top: BorderSide(width: 1, color: Color(0x2E000000), style: BorderStyle.solid)),
|
|
|
- color: BG_COLOR,
|
|
|
|
|
|
|
+ color: Color(0xFF2E3049),
|
|
|
),
|
|
),
|
|
|
child: Row(
|
|
child: Row(
|
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
mainAxisAlignment: MainAxisAlignment.center,
|