Skip to content

B
book-app
提交 093163d3 authored 作者: yueweilu's avatar yueweilu
浏览文件
操作

Merge remote-tracking branch 'origin/test' into test

上级 e39d7286 586ac1e7
隐藏空白字符变更
内嵌 并排
正在显示 包含 129 行增加 和 49 行删除
lib/pages/book_pay/controller.dart
浏览文件 @ 093163d3
...@@ -24,7 +24,7 @@ class BookPayController extends GetxController { ...@@ -24,7 +24,7 @@ class BookPayController extends GetxController {
PayModel(type: 3, name: '紫荆币', icon: 'assets/images/pay_coin.png', selected: true), PayModel(type: 3, name: '紫荆币', icon: 'assets/images/pay_coin.png', selected: true),
]:[ ]:[
// PayModel(type: 1, name: '微信', icon: 'assets/images/pay_wechat.png', selected: true), // PayModel(type: 1, name: '微信', icon: 'assets/images/pay_wechat.png', selected: true),
PayModel(type: 2, name: '支付宝', icon: 'assets/images/pay_ali.png', selected: false), PayModel(type: 2, name: '支付宝', icon: 'assets/images/pay_ali.png', selected: true),
PayModel(type: 3, name: '紫荆币', icon: 'assets/images/pay_coin.png', selected: false), PayModel(type: 3, name: '紫荆币', icon: 'assets/images/pay_coin.png', selected: false),
]; ];
...@@ -161,7 +161,7 @@ class BookPayController extends GetxController { ...@@ -161,7 +161,7 @@ class BookPayController extends GetxController {
// 书豆支付的话先判断书豆数量 // 书豆支付的话先判断书豆数量
if (payModel.type == 3){ if (payModel.type == 3){
if (finalPrice.toDouble() > double.parse(showModel.membersBean.toString())){ if (finalPrice.toDouble() > double.parse(showModel.membersBean.toString())){
Toast.show('紫金币不足，请先充值紫荆币'); Toast.show('紫荆币不足，请先充值紫荆币');
return; return;
} }
} }
......
lib/pages/user_info/view.dart
浏览文件 @ 093163d3
...@@ -173,6 +173,7 @@ class _UserInfoPageState extends State<UserInfoPage> { ...@@ -173,6 +173,7 @@ class _UserInfoPageState extends State<UserInfoPage> {
}, },
child: Container( child: Container(
height: 45.w, height: 45.w,
color: Colours.cFF,
padding: EdgeInsets.all(12.w), padding: EdgeInsets.all(12.w),
child: const Row( child: const Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
...@@ -206,6 +207,7 @@ class _UserInfoPageState extends State<UserInfoPage> { ...@@ -206,6 +207,7 @@ class _UserInfoPageState extends State<UserInfoPage> {
}, },
child: Container( child: Container(
height: 45.w, height: 45.w,
color: Colours.cFF,
padding: EdgeInsets.all(12.w), padding: EdgeInsets.all(12.w),
child: const Row( child: const Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
...@@ -235,6 +237,7 @@ class _UserInfoPageState extends State<UserInfoPage> { ...@@ -235,6 +237,7 @@ class _UserInfoPageState extends State<UserInfoPage> {
}, },
child: Container( child: Container(
height: 45.w, height: 45.w,
color: Colours.cFF,
padding: EdgeInsets.all(12.w), padding: EdgeInsets.all(12.w),
child: const Row( child: const Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
......
lib/pages/user_order/widgets/awaiting.dart
浏览文件 @ 093163d3
...@@ -8,28 +8,30 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -8,28 +8,30 @@ class BuiltAwaiting extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return GestureDetector(
onTap: () { context.pushNamed(Routes.orderAwaiting,queryParameters: {'orderNum':model.ordersnum});}, onTap: () {
child: Container( context.pushNamed(Routes.orderAwaiting,
margin: EdgeInsets.only(left: 10.w, right: 10.w, top: 10.w), queryParameters: {'orderNum': model.ordersnum});
padding: EdgeInsets.only(left: 11.5.w, bottom: 12.w), },
decoration: BoxDecoration( child: Container(
borderRadius: BorderRadius.circular(8.w), margin: EdgeInsets.only(left: 10.w, right: 10.w, top: 10.w),
color: Colors.white, padding: EdgeInsets.only(left: 11.5.w, bottom: 12.w),
boxShadow: [ decoration: BoxDecoration(
BoxShadow( borderRadius: BorderRadius.circular(8.w),
color: const Color(0xFFC7C7C7).withOpacity(0.5), color: Colors.white,
offset: Offset(1.5.w, 0), boxShadow: [
blurRadius: 7.w, BoxShadow(
spreadRadius: 0.w, color: const Color(0xFFC7C7C7).withOpacity(0.5),
), offset: Offset(1.5.w, 0),
], blurRadius: 7.w,
spreadRadius: 0.w,
),
],
),
child: _buildCom(context),
), ),
child:_buildCom(context), );
),);
} }
Widget _buildCom(BuildContext context) { Widget _buildCom(BuildContext context) {
if (model.cartList!.length == 1) { if (model.cartList!.length == 1) {
return _buildOne(context); return _buildOne(context);
...@@ -40,7 +42,7 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -40,7 +42,7 @@ class BuiltAwaiting extends StatelessWidget {
} }
Widget _buildOne(BuildContext context) { Widget _buildOne(BuildContext context) {
return Row( return Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
...@@ -63,7 +65,7 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -63,7 +65,7 @@ class BuiltAwaiting extends StatelessWidget {
], ],
), ),
child: Image.network( child: Image.network(
model.cartList![0].img??'', model.cartList![0].img ?? '',
// 用实际图片链接替换 // 用实际图片链接替换
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
...@@ -121,7 +123,8 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -121,7 +123,8 @@ class BuiltAwaiting extends StatelessWidget {
child: Align( child: Align(
alignment: Alignment.center, alignment: Alignment.center,
child: Text( child: Text(
'29分钟', '${30 - (DateTime.now().difference(
DateTime.parse(model.createTime.toString()))).inMinutes}分钟',
style: TextStyle( style: TextStyle(
color: Colours.cC31F4C, color: Colours.cC31F4C,
fontSize: 10.w, fontSize: 10.w,
...@@ -133,7 +136,7 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -133,7 +136,7 @@ class BuiltAwaiting extends StatelessWidget {
), ),
), ),
), ),
/* Align( /* Align(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Container( child: Container(
padding: EdgeInsets.only(left: 12.0.w, top: 8.w, right: 49.5.w), padding: EdgeInsets.only(left: 12.0.w, top: 8.w, right: 49.5.w),
...@@ -176,27 +179,25 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -176,27 +179,25 @@ class BuiltAwaiting extends StatelessWidget {
), ),
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
)), )),
SizedBox(height: 10.5.w), SizedBox(height: 10.5.w),
], ],
), ),
Container( Container(
height: Checkbox.width, height: Checkbox.width,
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
margin: EdgeInsets.only(left: 12.w), margin: EdgeInsets.only(left: 12.w),
child: Text( child: Text(
"¥${model.finalTotalPrice}", "¥${model.finalTotalPrice}",
style: TextStyle( style: TextStyle(
color: Colours.cAB1941, color: Colours.cAB1941,
fontWeight: Fonts.medium, fontWeight: Fonts.medium,
fontSize: 14.w, fontSize: 14.w,
),
), ),
), ),
), /* Align(
/* Align(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Container( child: Container(
margin: EdgeInsets.only(left: 12.w), margin: EdgeInsets.only(left: 12.w),
...@@ -280,7 +281,9 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -280,7 +281,9 @@ class BuiltAwaiting extends StatelessWidget {
), ),
), ),
), ),
SizedBox(height: 2.w,), SizedBox(
height: 2.w,
),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
...@@ -310,7 +313,7 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -310,7 +313,7 @@ class BuiltAwaiting extends StatelessWidget {
], ],
), ),
child: Image.network( child: Image.network(
cartModel.img??'', cartModel.img ?? '',
// 用实际图片链接替换 // 用实际图片链接替换
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
...@@ -332,7 +335,7 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -332,7 +335,7 @@ class BuiltAwaiting extends StatelessWidget {
Padding( Padding(
padding: EdgeInsets.only(right: 26.w), padding: EdgeInsets.only(right: 26.w),
child: Text( child: Text(
'¥${model.totalPrice??''}', '¥${model.totalPrice ?? ''}',
style: TextStyle( style: TextStyle(
color: Colours.cAB1941, color: Colours.cAB1941,
fontWeight: Fonts.medium, fontWeight: Fonts.medium,
...@@ -343,7 +346,7 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -343,7 +346,7 @@ class BuiltAwaiting extends StatelessWidget {
Padding( Padding(
padding: EdgeInsets.only(right: 26.w, top: 0.5), padding: EdgeInsets.only(right: 26.w, top: 0.5),
child: Text( child: Text(
'共${model.cartList!.isEmpty?0:model.cartList?.length}件', '共${model.cartList!.isEmpty ? 0 : model.cartList?.length}件',
style: TextStyle( style: TextStyle(
color: Colours.c9, color: Colours.c9,
fontSize: 10.w, fontSize: 10.w,
...@@ -360,7 +363,7 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -360,7 +363,7 @@ class BuiltAwaiting extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.w), borderRadius: BorderRadius.circular(10.w),
border: border:
Border.all(color: Colours.cC31F4C, width: 0.5.w)), Border.all(color: Colours.cC31F4C, width: 0.5.w)),
child: Center( child: Center(
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
......
lib/pages/user_security/view.dart
浏览文件 @ 093163d3
...@@ -77,15 +77,89 @@ class _UserSecurityPageState extends State<UserSecurityPage> { ...@@ -77,15 +77,89 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
GestureDetector( GestureDetector(
child: _buildItem(title: '账号注销', value: ''), child: _buildItem(title: '账号注销', value: ''),
onTap: () async { onTap: () async {
final result = await AccountAPI.delete(); showDialog(
if (result){ context: context,
CustomToast.loading(); builder: (BuildContext context) {
await UserStore.to.logout(); return AlertDialog(
CustomToast.dismiss(); shape: RoundedRectangleBorder(
if(context.mounted){ borderRadius: BorderRadius.circular(8.0.w),
context.goNamed(Routes.splash); ),
} contentPadding: EdgeInsets.zero, // 移除内容部分的内边距
} content: Wrap(children: [
Container(
margin: EdgeInsets.only(top: 44.w, bottom: 29.w), // 调整上下间距
child: Center(
child: Text(
'确定注销账号吗',
style: TextStyle(
fontSize: 15.w,
fontWeight: Fonts.medium,
color: Colours.c3,
),
),
),
),
Container(
height: 1.w, // 设置分割线的高度
width: double.infinity, // 设置分割线的宽度
color: Colours.cLine, // 设置分割线的颜色
),
],),
// 去除操作按钮区域的内边距
actionsPadding: EdgeInsets.zero,
actions: <Widget>[
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, // 或者使用MainAxisAlignment.spaceEvenly
children: [
GestureDetector(
onTap: () => Navigator.of(context).pop(),
child: const Text(
'取消',
style: TextStyle(
fontSize: 12,
fontWeight: Fonts.medium,
color: Colours.c6,
),
),
),
Container(
height: 39.5.w, // 设置分割线的高度
width: 1, // 设置分割线的宽度
color: Colours.cLine, // 设置分割线的颜色
),
GestureDetector(
onTap: () async {
final result = await AccountAPI.delete();
if (result){
CustomToast.loading();
await UserStore.to.logout();
CustomToast.dismiss();
if(context.mounted){
context.goNamed(Routes.splash);
}
}
},
child: const Text(
'确定',
style: TextStyle(
fontSize: 12,
fontWeight: Fonts.medium,
color: Colours.cAB1941,
),
),
),
],
),
],
);
},
);
}, },
), ),
], ],
......
lib/routes/routes.dart
浏览文件 @ 093163d3
...@@ -112,7 +112,7 @@ abstract class Routes { ...@@ -112,7 +112,7 @@ abstract class Routes {
static const orderAwaiting= 'order_awaiting'; static const orderAwaiting= 'order_awaiting';
// 已退款订单 // 已退款订单
static const orderRefunded= 'order_refunded'; static const orderRefunded= 'order_refunded';
// 已退款订单 // 搜索订单
static const orderSearch= 'order_search'; static const orderSearch= 'order_search';
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论