'.'

lib/models/entities/Log.dart

@@ -0,0 +1,37 @@
+class LogModel {
+  int? logId;
+  String? payId;
+  String? accountId;
+  int? feeType;
+  String? chargeType;
+  int? money;
+  String? orderId;
+  String? remarks;
+  String? createDate;
+
+  LogModel();
+
+  LogModel.fromJson(Map<String, dynamic> json):
+  logId=json['logId'],
+  payId=json['payId'],
+  accountId=json['accountId'],
+  feeType=json['feeType'],
+  chargeType=json['chargeType'],
+  money=json['money'],
+  orderId=json['orderId'],
+  remarks=json['remarks'],
+  createDate=json['createDate'];
+
+  Map<String, dynamic> toJson() => {
+    'logId':logId,
+    'payId':payId,
+    'accountId':accountId,
+    'feeType':feeType,
+    'chargeType':chargeType,
+    'money':money,
+    'orderId':orderId,
+    'remarks':remarks,
+    'createDate':createDate,
+  };
+
+}

lib/pages/bankList/index.dart

@@ -85,7 +85,7 @@ class BankListPages extends BasicPage {
                         },
                       );
                     }).toList())
-                  : const NullCard(text: '暂未绑定银行卡'),
+                  : const NullCard(text: '暂未添加银行卡'),
             ),
           ),
           Container(

lib/pages/wallet/index.dart

@@ -1,75 +1,64 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:worker_client/pages/wallet/widget/money.dart';
+import 'package:worker_client/models/entities/Log.dart';
 import 'package:worker_client/pages/wallet/widget/moneyInfo.dart';
-
-import '../../widgets/layout/BasicPage.dart';
+import 'package:worker_client/services/account.dart';
+import 'package:worker_client/widgets/MoneyCard/index.dart';
+import 'package:worker_client/widgets/MyTitle/index.dart';
+import 'package:worker_client/widgets/NullCard.dart';
+import 'package:worker_client/widgets/layout/BasicPage.dart';
 
 class MyWallet extends BasicPage {
   MyWallet({Key? key}) : super(key: key) {
     naviTitle = '我的钱包';
   }
+  final amounts = Rx<double>(0);
+  final logList = Rx<List<LogModel>>([]);
+  @override
+  void beforeShow() {
+    // TODO: implement beforeShow
+    super.beforeShow();
+
+    getAccount().then((res) {
+      amounts(double.parse(res['amounts'].toString()));
+    });
+    getLogList({'pageNum': 1}).then((value) {
+      var list = <LogModel>[];
+      value['records'].forEach((item) {
+        list.add(LogModel.fromJson(item));
+      });
+      logList(list);
+    });
+  }
+
+  void goWithDrawal() {
+    Get.toNamed('/withdrawal');
+  }
 
   @override
   Widget builder(BuildContext context) {
     return ListView(
+      padding: EdgeInsets.all(15.w),
       children: [
-        Container(
-          alignment: Alignment.center,
-          child: Column(
-            children: [
-              MoneyCard(),
-              Container(
-                  alignment: Alignment.center,
-                  width: 345.w,
-                  margin: EdgeInsets.fromLTRB(0, 15.w, 0, 15.w),
-                  decoration: BoxDecoration(
-                    borderRadius: BorderRadius.circular(10),
-                    color: Colors.white,
-                  ),
-                  child: Column(
-                    children: [
-                      Container(
-                          margin: EdgeInsets.fromLTRB(0, 30.w, 0, 20.w),
-                          alignment: Alignment.topLeft,
-                          decoration: const BoxDecoration(
-                              border: Border(
-                                  left: BorderSide(
-                                      width: 5, color: Color(0xff000000)
-                                      // 0x17000000
-                                      ))),
-                          child: Padding(
-                            padding: EdgeInsets.fromLTRB(13.w, 0, 0, 0),
-                            child: Text(
-                              '零钱明细',
-                              style: TextStyle(
-                                color: Color(0xff333333),
-                                fontWeight: FontWeight.bold,
-                                fontSize: 17,
-                              ),
-                            ),
-                          )),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                      MoneyInfoCard(),
-                    ],
-                  )),
-            ],
+        Obx(
+          () => MoneyCard(
+            amounts: amounts.value,
+            goWithDrawal: () {
+              goWithDrawal();
+            },
           ),
         ),
+        const MyTitle(title: '零钱明细'),
+        Obx(() => logList.value != []
+            ? Column(
+                children: logList.value
+                    .map((e) => MoneyInfoCard(
+                          logData: e,
+                        ))
+                    .toList(),
+              )
+            : const NullCard(text: '暂无明细')),
       ],
     );
   }

lib/pages/wallet/widget/money.dart

@@ -1,132 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:get/get.dart';
-import 'package:get/get_core/src/get_main.dart';
-
-class MoneyCard extends StatefulWidget {
-  final bool type;
-  const MoneyCard({Key? key, this.type = false}) : super(key: key);
-
-  @override
-  State<MoneyCard> createState() => _MoneyCardState();
-}
-
-class _MoneyCardState extends State<MoneyCard> {
-  void _goWithdrawPage() {
-    print('asdasdsad');
-    Get.toNamed('/withdrawal');
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    if (!widget.type) {
-      return Container(
-        width: 345.w,
-        height: 173.w,
-        padding: EdgeInsets.fromLTRB(40, 33, 0, 0),
-        alignment: Alignment.centerLeft,
-        decoration: BoxDecoration(
-          borderRadius: new BorderRadius.all(new Radius.circular(20.0)),
-          image: const DecorationImage(
-            image: AssetImage(
-              'images/main/walletBgi.png',
-            ),
-          ),
-        ),
-        child: Column(
-          children: [
-            Text(
-              '钱包余额(元)',
-              style: TextStyle(fontSize: 20.sp, color: Colors.white),
-            ),
-            Container(
-              margin: EdgeInsets.fromLTRB(0, 20, 0, 10),
-              child: Text(
-                (5 / 100).toString(),
-                style: TextStyle(
-                  fontSize: 35.sp,
-                  color: Colors.white,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ),
-            GestureDetector(
-              onTap: () {
-                _goWithdrawPage();
-              },
-              child: Container(
-                alignment: Alignment.center,
-                width: 70.w,
-                height: 34.w,
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(20),
-                  gradient: LinearGradient(
-
-
-                    begin: Alignment.topCenter,
-                    end: Alignment.bottomCenter,
-                    colors: [
-                      Color(0xff37BC6A),
-                      Color(0xff127B39),
-                    ],
-                  ),
-                ),
-                child: Text(
-                  '提现',
-                  style: TextStyle(
-                    fontSize: 24.sp,
-                    color: Colors.white,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ),
-            )
-          ],
-        ),
-      );
-    } else {
-      return _initWidget();
-    }
-  }
-}
-
-class _initWidget extends StatelessWidget {
-  const _initWidget({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      width: 345.w,
-      height: 173.w,
-      padding: EdgeInsets.fromLTRB(40, 33, 0, 0),
-      alignment: Alignment.centerLeft,
-      decoration: BoxDecoration(
-        borderRadius: new BorderRadius.all(new Radius.circular(20.0)),
-        image: const DecorationImage(
-          image: AssetImage(
-            'images/main/walletBgi.png',
-          ),
-        ),
-      ),
-      child: Column(
-        children: [
-          Text(
-            '钱包余额(元)',
-            style: TextStyle(fontSize: 20.sp, color: Colors.white),
-          ),
-          Container(
-            margin: EdgeInsets.fromLTRB(0, 20, 0, 10),
-            child: Text(
-              (5 / 100).toString(),
-              style: TextStyle(
-                fontSize: 35.sp,
-                color: Colors.white,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

lib/pages/wallet/widget/moneyInfo.dart

@@ -1,77 +1,74 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:worker_client/models/entities/Log.dart';
 
 class MoneyInfoCard extends StatelessWidget {
-  const MoneyInfoCard({Key? key}) : super(key: key);
+  final LogModel logData;
+  const MoneyInfoCard({Key? key, required this.logData}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      alignment: Alignment.topLeft,
-      padding: EdgeInsets.fromLTRB(15, 10, 15, 10),
-      decoration: const BoxDecoration(
-          border: Border(
-              bottom: BorderSide(width: 1, color: Color(0x20000000)
-                  // 0x17000000
-                  ))),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      margin: EdgeInsets.only(bottom: 1.h),
+      padding: EdgeInsets.symmetric(vertical: 15.h, horizontal: 10.w),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        boxShadow: [
+          BoxShadow(color: const Color(0x20000000), offset: Offset(0, 0.5.h))
+        ],
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            //交叉轴方向从起点开始，默认为center
-            crossAxisAlignment: CrossAxisAlignment.start,
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Container(
-                alignment: Alignment.topLeft,
-                child: Text(
-                  '订单收入',
-                  textAlign: TextAlign.left,
-                  style: TextStyle(
-                    fontWeight: FontWeight.w500,
-                    fontSize: 17,
-                  ),
+              Text(
+                logData.chargeType == 'order_pay'
+                    ? '订单收入'
+                    : logData.chargeType == 'order_refund'
+                        ? '用户退款'
+                        : logData.chargeType == 'withdraw'
+                            ? '提现'
+                            : '',
+                style: TextStyle(
+                  fontWeight: FontWeight.bold,
+                  color: const Color(0xff333333),
+                  fontSize: 16.sp,
                 ),
               ),
-              Padding(
-                padding: EdgeInsets.fromLTRB(0, 8, 0, 5),
-                child: Text('2022-05-01 16:66',
-                    style: TextStyle(fontSize: 15, color: Color(0xff666666))),
+              Container(
+                margin: EdgeInsets.only(right: 5.w),
+                child: logData.chargeType == 'order_pay'
+                    ? Text(
+                        '+${(logData.money ?? 0) / 100}',
+                        style: TextStyle(
+                          color: const Color(0xffff3f3f),
+                          fontSize: 20.sp,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      )
+                    : Text(
+                        '-${(logData.money ?? 0) / 100}',
+                        style: TextStyle(
+                          color: const Color(0xff00ae3a),
+                          fontSize: 15.sp,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
               ),
             ],
           ),
-          RichText(
-            text: TextSpan(children: <InlineSpan>[
-              const TextSpan(
-                  text: '+',
-                  style: TextStyle(
-                      color: Color(
-                        0xffFF3F3F,
-                      ),
-                      fontSize: 22,
-                      fontWeight: FontWeight.bold)),
-              TextSpan(
-                  text: (2559 / 100).toString(),
-                  style: TextStyle(
-                      color: Color(
-                        0xffFF3F3F,
-                      ),
-                      fontSize: 22,
-                      fontWeight: FontWeight.bold)),
-            ]),
+          Padding(
+            padding: EdgeInsets.only(top: 13.h),
+            child: Text(
+              logData.createDate.toString().substring(0, 16),
+              style: TextStyle(
+                fontSize: 15.sp,
+                color: const Color(0xff666666),
+              ),
+            ),
           ),
-
-          // RichText(
-          //   text: TextSpan(children: <InlineSpan>[
-          //     const TextSpan(
-          //         text: '-',
-          //         style: TextStyle(color: Color(0xff00AE3A,),fontSize: 15,fontWeight: FontWeight.bold)),
-          //     TextSpan(
-          //         text: (5500/100).toString(),
-          //         style: TextStyle(color: Color(0xff00AE3A,),fontSize: 15,fontWeight: FontWeight.bold)),
-          //   ]),
-          // ),
         ],
       ),
     );

lib/pages/withdrawal/index.dart

@@ -3,8 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_picker/Picker.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:worker_client/pages/wallet/widget/money.dart';
-import 'package:worker_client/pages/wallet/widget/moneyInfo.dart';
+import 'package:worker_client/widgets/MoneyCard/index.dart';
 
 import '../../widgets/MyButton/index.dart';
 import '../../widgets/layout/BasicPage.dart';
@@ -24,7 +23,7 @@ class MyWithdrawal extends BasicPage {
           alignment: Alignment.center,
           child: Column(
             children: [
-              MoneyCard(type: true,),
+              MoneyCard(type: true, amounts: 6, goWithDrawal: () {  },),
               Container(
                   margin: EdgeInsets.fromLTRB(20, 30.w, 0, 20.w),
                   alignment: Alignment.topLeft,

lib/services/account.dart

@@ -0,0 +1,23 @@
+import 'package:dio/dio.dart';
+import '../utils/Request.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+
+/// 账户余额
+/// @param {*} data
+/// @returns
+Future getAccount() async {
+  return request('/account/mine',
+      options: Options(method: 'GET'))
+      .catchError((error) =>
+  {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
+}
+
+/// 我的流水
+/// @param {*} data
+/// @returns
+Future getLogList(params) async {
+  return request('/account-log',
+      options: Options(method: 'GET'), queryParameters: params)
+      .catchError((error) =>
+  {Fluttertoast.showToast(msg: error.error.toString()), print(error)});
+}

lib/widgets/MoneyCard/index.dart

@@ -0,0 +1,87 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class MoneyCard extends StatefulWidget {
+  final bool type;
+  final double amounts;
+  final GestureTapCallback goWithDrawal;
+  const MoneyCard({Key? key, this.type = false, required this.amounts, required this.goWithDrawal}) : super(key: key);
+
+  @override
+  State<MoneyCard> createState() => _MoneyCardState();
+}
+
+class _MoneyCardState extends State<MoneyCard> {
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 345.w,
+      height: 172.5.w,
+      padding: EdgeInsets.fromLTRB(40.w, 33.5.w, 0, 22.5.w),
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.all(Radius.circular(20.w)),
+        image: const DecorationImage(
+          image: AssetImage(
+            'images/main/walletBgi.png',
+          ),
+        ),
+      ),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            '钱包余额(元)',
+            style: TextStyle(
+              fontSize: 16.sp,
+              color: Colors.white,
+            ),
+          ),
+          Container(
+            margin: EdgeInsets.only(top: 20.w),
+            child: Text(
+              (widget.amounts / 100).toString(),
+              style: TextStyle(
+                fontSize: 33.sp,
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+          ),
+          Visibility(
+            visible: !widget.type,
+            child: GestureDetector(
+              onTap: widget.goWithDrawal,
+              child: Container(
+                alignment: Alignment.center,
+                width: 80.w,
+                height: 34.w,
+                margin: EdgeInsets.only(top: 12.w),
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(16.w),
+                  gradient: const LinearGradient(
+                    begin: Alignment.topCenter,
+                    end: Alignment.bottomCenter,
+                    colors: [
+                      Color(0xff37BC6A),
+                      Color(0xff127B39),
+                    ],
+                  ),
+                ),
+                child: Text(
+                  '提现',
+                  style: TextStyle(
+                    fontSize: 19.sp,
+                    color: Colors.white,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/widgets/MyTitle/index.dart

@@ -0,0 +1,32 @@
+
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class MyTitle extends StatelessWidget{
+  final String title;
+
+  const MyTitle({Key? key, required this.title}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: EdgeInsets.fromLTRB(0, 30.w, 0, 5.w),
+      decoration: BoxDecoration(
+        border: Border(
+          left: BorderSide(width: 4.w, color: const Color(0xff000000)),
+        ),
+      ),
+      child: Padding(
+        padding: EdgeInsets.only(left: 11.5.w),
+        child: Text(
+          title,
+          style: TextStyle(
+            color: const Color(0xff333333),
+            fontWeight: FontWeight.bold,
+            fontSize: 17.sp,
+          ),
+        ),
+      ),
+    );
+  }
+}