10.12

lib/my_tools/my_tools.dart

@@ -201,6 +201,7 @@ getTime(int timeIndex) {
   String sTime = '00';
   String eTime = '23';
   var dateTime = DateTime.now();
+  //今天
   if (timeIndex == 0) {
     if (sTime != '00') {
       if (dateTime.hour >= int.parse(sTime)) {
@@ -220,7 +221,9 @@ getTime(int timeIndex) {
       paidAt.add(
           '${dateTime.year}-${numberComplement('${dateTime.month}')}-${numberComplement('${dateTime.day}')} $eTime:59:59');
     }
-  } else if (timeIndex == 1) {
+  }
+  //昨天
+  else if (timeIndex == 1) {
     if (sTime == '00') {
       paidAt.add(
           '${dateTime.subtract(Duration(days: 1)).year}-${numberComplement('${dateTime.subtract(Duration(days: 1)).month}')}-${numberComplement('${dateTime.subtract(Duration(days: 1)).day}')} $sTime:00:00');
@@ -239,28 +242,43 @@ getTime(int timeIndex) {
             '${dateTime.subtract(Duration(days: 1)).year}-${numberComplement('${dateTime.subtract(Duration(days: 1)).month}')}-${numberComplement('${dateTime.subtract(Duration(days: 1)).day}')} $eTime:59:59');
       }
     }
-  } else if (timeIndex == 2) {
+  }
+  //本周
+  else if (timeIndex == 2) {
     paidAt.add(
         '${dateTime.subtract(Duration(days: dateTime.weekday - 1)).year}-${numberComplement('${dateTime.subtract(Duration(days: dateTime.weekday - 1)).month}')}-${numberComplement('${dateTime.subtract(Duration(days: dateTime.weekday - 1)).day}')} 00:00:00');
     paidAt.add(
         '${dateTime.add(Duration(days: 7 - dateTime.weekday)).year}-${numberComplement('${dateTime.add(Duration(days: 7 - dateTime.weekday)).month}')}-${numberComplement('${dateTime.add(Duration(days: 7 - dateTime.weekday)).day}')} 23:59:59');
-  } else if (timeIndex == 3) {
+  }
+  //上周
+  else if (timeIndex == 3) {
     DateTime lastWeek = dateTime.subtract(Duration(days: 7));
     paidAt.add(
         '${lastWeek.subtract(Duration(days: lastWeek.weekday - 1)).year}-${numberComplement('${lastWeek.subtract(Duration(days: lastWeek.weekday - 1)).month}')}-${numberComplement('${lastWeek.subtract(Duration(days: lastWeek.weekday - 1)).day}')} 00:00:00');
     paidAt.add(
         '${lastWeek.add(Duration(days: 7 - lastWeek.weekday)).year}-${numberComplement('${lastWeek.add(Duration(days: 7 - lastWeek.weekday)).month}')}-${numberComplement('${lastWeek.add(Duration(days: 7 - lastWeek.weekday)).day}')} 23:59:59');
-  } else if (timeIndex == 4) {
+  }
+  //本月
+  else if (timeIndex == 4) {
     paidAt.add(
         '${dateTime.year}-${numberComplement('${dateTime.month}')}-01 00:00:00');
     paidAt.add(
         '${dateTime.year}-${numberComplement('${dateTime.month}')}-${numberComplement('${MonthDay().getDays(dateTime)}')} 23:59:59');
-  } else if (timeIndex == 5) {
+  }
+  //上月
+  else if (timeIndex == 5) {
     DateTime firstMonth = dateTime.subtract(Duration(days: dateTime.day));
     paidAt.add('${firstMonth.year}-${firstMonth.month}-01 00:00:00');
     paidAt.add(
         '${firstMonth.year}-${numberComplement('${firstMonth.month}')}-${numberComplement('${MonthDay().getDays(firstMonth)}')} 23:59:59');
   }
+  //两周内
+  else if(timeIndex == 6){
+    paidAt.add(
+        '${dateTime.subtract(Duration(days: 14)).year}-${numberComplement('${dateTime.subtract(Duration(days: 14)).month}')}-${numberComplement('${dateTime.subtract(Duration(days: 14)).day}')} $sTime:00:00');
+    paidAt.add(
+        '${dateTime.year}-${numberComplement('${dateTime.month}')}-${numberComplement('${dateTime.day}')} $eTime:59:59');
+  }
   print(json.encode(paidAt));
   return paidAt;
 }

lib/paegs/gang_page/gang_in_page/gang_information_page/member_list_page/member_order_flow.dart

@@ -320,8 +320,9 @@ class _MemberOrderFlowPageState extends State<MemberOrderFlowPage> {
   StateSetter ss;
   List<String> types = ['全部', '订单', '佣金', '提现'];
   int typeIndex = 0;
-  List<String> times = ['全部', '今天', '昨天', '本周', '上周', '本月'];
-  int timeIndex = 0;
+  // List<String> times = ['全部', '今天', '昨天', '本周', '上周', '本月'];
+  List<String> times = ['昨天', '本周', '上周'];
+  int timeIndex = -1;
 
   void showSelect() {
     showModalBottomSheet(
@@ -532,8 +533,8 @@ class _MemberOrderFlowPageState extends State<MemberOrderFlowPage> {
               timeIndex = i;
             }
           });
-          if (timeIndex != 0) {
-            getTime(timeIndex - 1);
+          if (timeIndex != -1) {
+            getTime(timeIndex +1);
           }
         },
         behavior: HitTestBehavior.translucent,
@@ -592,8 +593,10 @@ class _MemberOrderFlowPageState extends State<MemberOrderFlowPage> {
       //     flowTypeScancodeAilyPay
       //   ] : [flowTypeShopCommission]}");
     }
-    if (timeIndex != 0 && timeIndex != -1) {
-      conditions.add("pay_time between ${getTime(timeIndex - 1)}");
+    if (timeIndex != -1) {
+      conditions.add("pay_time between ${getTime(timeIndex +1)}");
+    }else{
+      conditions.add("pay_time between ${getTime(6)}");
     }
     MyDio().query({
       "key": "flow",

lib/paegs/gang_page/gang_in_page/shop_flow_page/shop_flow_page.dart

@@ -254,13 +254,14 @@ class _ShopFlowPageState extends State<ShopFlowPage> {
                         return GestureDetector(
                           child: MyViews().getWalletItem(flow[index], context),
                           onTap: () {
-                           if(flow[index].traderUid!=0){
-                             MyShopBeanDataData data = MyShopBeanDataData();
-                             data.userName = flow[index].traderName;
-                             data.userUid = flow[index].traderUid;
-                             data.userPic = flow[index].traderPic;
-                             MyTools().toPage(context, MemberOrderFlowPage(data), (then){});
-                           }
+                            if (flow[index].traderUid != 0) {
+                              MyShopBeanDataData data = MyShopBeanDataData();
+                              data.userName = flow[index].traderName;
+                              data.userUid = flow[index].traderUid;
+                              data.userPic = flow[index].traderPic;
+                              MyTools().toPage(context,
+                                  MemberOrderFlowPage(data), (then) {});
+                            }
                           },
                           behavior: HitTestBehavior.translucent,
                         );
@@ -278,8 +279,10 @@ class _ShopFlowPageState extends State<ShopFlowPage> {
   StateSetter ss;
   List<String> types = ['全部', '订单', '佣金'];
   int typeIndex = 0;
-  List<String> times = ['全部', '今天', '昨天', '本周', '上周', '本月'];
-  int timeIndex = 0;
+
+  // List<String> times = ['全部', '今天', '昨天', '本周', '上周', '本月'];
+  List<String> times = ['昨天', '本周', '上周'];
+  int timeIndex = -1;
 
   void showSelect() {
     showModalBottomSheet(
@@ -490,8 +493,8 @@ class _ShopFlowPageState extends State<ShopFlowPage> {
               timeIndex = i;
             }
           });
-          if (timeIndex != 0) {
-            getTime(timeIndex - 1);
+          if (timeIndex != -1) {
+            getTime(timeIndex +1);
           }
         },
         behavior: HitTestBehavior.translucent,
@@ -532,8 +535,10 @@ class _ShopFlowPageState extends State<ShopFlowPage> {
           flowTypeScancodeAilyPay
         ] : [flowTypeShopCommission]}");
     }
-    if (timeIndex != 0 && timeIndex != -1) {
-      conditions.add("pay_time between ${getTime(timeIndex - 1)}");
+    if ( timeIndex != -1) {
+      conditions.add("pay_time between ${getTime(timeIndex +1)}");
+    }else{
+      conditions.add("pay_time between ${getTime(6)}");
     }
     if (typeIndex == 2) {
       conditions.add('paid_amount>0');

lib/paegs/home_page/qr_code_payment/qr_code_payment_page.dart

@@ -161,7 +161,7 @@ class _PayToTheGangPageState extends State<PayToTheGangPage> {
       MyDio().save({
         'key': 'order',
         'object': {
-          'uuid': generateMd5(reOS('付款给店主${DateTime.now()}')),
+          'uuid': generateMd5(reOS('扫码付款${DateTime.now()}')),
           'shop_uid': store.uid,
           'shop_pic': store.picture,
           'shop_name': store.name,

lib/paegs/mine_page/referrer_page/referrer_flow_page.dart

@@ -177,8 +177,9 @@ class _ReferrerFlowPageState extends State<ReferrerFlowPage> {
   StateSetter ss;
   List<String> types = ['全部', '订单', '佣金'];
   int typeIndex = 0;
-  List<String> times = ['全部', '今天', '昨天', '本周', '上周', '本月'];
-  int timeIndex = 0;
+  // List<String> times = ['全部', '今天', '昨天', '本周', '上周', '本月'];
+  List<String> times = ['昨天', '本周', '上周'];
+  int timeIndex = -1;
 
   void showSelect() {
     showModalBottomSheet(
@@ -389,8 +390,8 @@ class _ReferrerFlowPageState extends State<ReferrerFlowPage> {
               timeIndex = i;
             }
           });
-          if (timeIndex != 0) {
-            getTime(timeIndex - 1);
+          if (timeIndex != -1) {
+            getTime(timeIndex +1);
           }
         },
         behavior: HitTestBehavior.translucent,
@@ -434,8 +435,10 @@ class _ReferrerFlowPageState extends State<ReferrerFlowPage> {
           flowTypeScancodeAilyPay
           ] : [flowTypeShopCommission]}");
     }
-    if (timeIndex != 0 && timeIndex != -1) {
-      conditions.add("pay_time between ${getTime(timeIndex - 1)}");
+    if (timeIndex != -1) {
+      conditions.add("pay_time between ${getTime(timeIndex +1)}");
+    }else{
+      conditions.add("pay_time between ${getTime(6)}");
     }
     MyDio().query({
       "key": "flow",

lib/paegs/mine_page/wallet_page/wallet_page.dart

@@ -305,8 +305,9 @@ class _WalletPageState extends State<WalletPage> {
   StateSetter ss;
   List<String> types = ['全部', '订单', '佣金','提现'];
   int typeIndex = 0;
-  List<String> times = ['全部', '今天', '昨天', '本周', '上周', '本月'];
-  int timeIndex = 0;
+  // List<String> times = ['全部', '今天', '昨天', '本周', '上周', '本月'];
+  List<String> times = ['昨天', '本周', '上周'];
+  int timeIndex = -1;
 
   void showSelect() {
     showModalBottomSheet(
@@ -517,8 +518,8 @@ class _WalletPageState extends State<WalletPage> {
               timeIndex = i;
             }
           });
-          if (timeIndex != 0) {
-            getTime(timeIndex - 1);
+          if (timeIndex != -1) {
+            getTime(timeIndex +1);
           }
         },
         behavior: HitTestBehavior.translucent,
@@ -589,8 +590,10 @@ class _WalletPageState extends State<WalletPage> {
       //     flowTypeScancodeAilyPay
       //   ] : [flowTypeShopCommission]}");
     }
-    if (timeIndex != 0 && timeIndex != -1) {
-      conditions.add("pay_time between ${getTime(timeIndex - 1)}");
+    if (timeIndex != -1) {
+      conditions.add("pay_time between ${getTime(timeIndex +1)}");
+    }else{
+      conditions.add("pay_time between ${getTime(6)}");
     }
     MyDio().query({
       "key": "flow",