7.9 ios

ios/Podfile.lock

@@ -197,7 +197,7 @@ SPEC CHECKSUMS:
   image_picker: 50e7c7ff960e5f58faa4d1f4af84a771c671bc4a
   install_plugin: a13e7ddd2bab0c701b48cd359c26d0394125b6fb
   launch_review: 75d5a956ba8eaa493e9c9d4bf4c05e505e8d5ed0
-  libwebp: 6bac0a99ba5a6bb7449a951ff22c484201985f68
+  libwebp: 3aa3dfd4b00d3caf4c12b4bbc17e9b7b2df3f6fb
   Mantle: 4c0ed6ce47c96eccc4dc3bb071deb3def0e2c3be
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
@@ -216,4 +216,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.0

ios/Runner.xcodeproj/project.pbxproj

@@ -375,7 +375,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 39;
 				DEVELOPMENT_TEAM = 4699C5C3US;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -391,7 +391,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.07;
+				MARKETING_VERSION = 1.1.08;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bh.bbyyy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -514,7 +514,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 39;
 				DEVELOPMENT_TEAM = 4699C5C3US;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -530,7 +530,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.07;
+				MARKETING_VERSION = 1.1.08;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bh.bbyyy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -547,7 +547,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 38;
+				CURRENT_PROJECT_VERSION = 39;
 				DEVELOPMENT_TEAM = 4699C5C3US;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -563,7 +563,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.1.07;
+				MARKETING_VERSION = 1.1.08;
 				PRODUCT_BUNDLE_IDENTIFIER = com.bh.bbyyy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

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

@@ -137,96 +137,97 @@ class _ShopFlowPageState extends State<ShopFlowPage> {
                   ? SingleChildScrollView(child: noData())
                   : ListView.builder(
                       itemBuilder: (c, index) {
-                        return Container(
-                          padding: EdgeInsets.symmetric(horizontal: 15),
-                          child: Column(
-                            children: [
-                              Row(
-                                children: [
-                                  Container(
-                                    child: ClipRRect(
-                                      child: flow[index].userUid == 0
-                                          ? Image.asset(
-                                        'images/app_logo.png',
-                                        width: 50,
-                                        height: 50,
-                                      )
-                                          : MyViews().netImg(imgURL(flow[index].userPic), 50, 50),
-                                      borderRadius: BorderRadius.all(Radius.circular(25)),
-                                    ),
-                                    margin: EdgeInsets.only(right: 12),
-                                  ),
-                                  Expanded(
-                                    child: Column(
-                                      children: [
-                                        Row(
-                                          children: [
-                                            Expanded(
-                                              child: Text(
-                                                flow[index].userUid == 0 ? '平台' : flow[index].userName,
-                                                style: TextStyle(
-                                                    color: MyColors.c333333, fontSize: 14),
-                                                maxLines: 1,
-                                                overflow: TextOverflow.ellipsis,
-                                                softWrap: true,
-                                              ),
-                                            ),
-                                            Text(
-                                              '${flow[index].paidAmount}',
-                                              style: TextStyle(
-                                                  color: flow[index].paidAmount > 0
-                                                      ? MyColors.cff3646
-                                                      : MyColors.c237C02,
-                                                  fontSize: 15,
-                                                  fontWeight: FontWeight.bold),
-                                            ),
-                                          ],
-                                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                        ),
-                                        Row(
-                                          children: [
-                                            Text(
-                                              flow[index].userUid == 0 ? "" : 'ID：${hideUID(flow[index].userUid.toString())}',
-                                              style:
-                                              TextStyle(color: MyColors.c666666, fontSize: 12),
-                                            ),
-                                            Text(
-                                              flow[index].payTime,
-                                              style:
-                                              TextStyle(color: MyColors.c666666, fontSize: 11),
-                                            ),
-                                          ],
-                                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                        ),
-                                        Row(
-                                          children: [
-                                            Text(
-                                              '${flowType(flow[index].type)}',
-                                              style:
-                                              TextStyle(color: MyColors.c666666, fontSize: 12),
-                                            ),
-                                            if(flow[index].userUid!=0)
-                                            Text(
-                                              '${flow[index].userBalance}',
-                                              style:
-                                              TextStyle(color: MyColors.c666666, fontSize: 11),
-                                            ),
-                                          ],
-                                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                        )
-                                      ],
-                                    ),
-                                  )
-                                ],
-                              ),
-                              Container(
-                                color: MyColors.cE7E7E7,
-                                height: 0.5,
-                                margin: EdgeInsets.only(top: 14, bottom: 12),
-                              )
-                            ],
-                          ),
-                        );
+//                        return Container(
+//                          padding: EdgeInsets.symmetric(horizontal: 15),
+//                          child: Column(
+//                            children: [
+//                              Row(
+//                                children: [
+//                                  Container(
+//                                    child: ClipRRect(
+//                                      child: flow[index].userUid == 0
+//                                          ? Image.asset(
+//                                        'images/app_logo.png',
+//                                        width: 50,
+//                                        height: 50,
+//                                      )
+//                                          : MyViews().netImg(imgURL(flow[index].userPic), 50, 50),
+//                                      borderRadius: BorderRadius.all(Radius.circular(25)),
+//                                    ),
+//                                    margin: EdgeInsets.only(right: 12),
+//                                  ),
+//                                  Expanded(
+//                                    child: Column(
+//                                      children: [
+//                                        Row(
+//                                          children: [
+//                                            Expanded(
+//                                              child: Text(
+//                                                flow[index].userUid == 0 ? '平台' : flow[index].userName,
+//                                                style: TextStyle(
+//                                                    color: MyColors.c333333, fontSize: 14),
+//                                                maxLines: 1,
+//                                                overflow: TextOverflow.ellipsis,
+//                                                softWrap: true,
+//                                              ),
+//                                            ),
+//                                            Text(
+//                                              '${flow[index].paidAmount}',
+//                                              style: TextStyle(
+//                                                  color: flow[index].paidAmount > 0
+//                                                      ? MyColors.cff3646
+//                                                      : MyColors.c237C02,
+//                                                  fontSize: 15,
+//                                                  fontWeight: FontWeight.bold),
+//                                            ),
+//                                          ],
+//                                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+//                                        ),
+//                                        Row(
+//                                          children: [
+//                                            Text(
+//                                              flow[index].userUid == 0 ? "" : 'ID：${hideUID(flow[index].userUid.toString())}',
+//                                              style:
+//                                              TextStyle(color: MyColors.c666666, fontSize: 12),
+//                                            ),
+//                                            Text(
+//                                              flow[index].payTime,
+//                                              style:
+//                                              TextStyle(color: MyColors.c666666, fontSize: 11),
+//                                            ),
+//                                          ],
+//                                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+//                                        ),
+//                                        Row(
+//                                          children: [
+//                                            Text(
+//                                              '${flowType(flow[index].type)}',
+//                                              style:
+//                                              TextStyle(color: MyColors.c666666, fontSize: 12),
+//                                            ),
+//                                            if(flow[index].userUid!=0)
+//                                            Text(
+//                                              '${flow[index].userBalance}',
+//                                              style:
+//                                              TextStyle(color: MyColors.c666666, fontSize: 11),
+//                                            ),
+//                                          ],
+//                                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+//                                        )
+//                                      ],
+//                                    ),
+//                                  )
+//                                ],
+//                              ),
+//                              Container(
+//                                color: MyColors.cE7E7E7,
+//                                height: 0.5,
+//                                margin: EdgeInsets.only(top: 14, bottom: 12),
+//                              )
+//                            ],
+//                          ),
+//                        );
+                        return MyViews().getWalletItem(flow[index], context);
                       },
                       padding: EdgeInsets.only(top: 13),
                       itemCount: flow.length,
@@ -482,7 +483,8 @@ class _ShopFlowPageState extends State<ShopFlowPage> {
 
   void myFlow() {
     var conditions = [
-      'shop_uid == ${widget.data.shopUid}'
+      'shop_uid == ${widget.data.shopUid}',
+      'user_uid == ${widget.data.ownerUid}'
     ];
     if (typeIndex != 0 && typeIndex != -1) {
       conditions.add("type IN ${typeIndex == 1 ? [

pubspec.lock

@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.6.1"
+    version: "2.5.0"
   audioplayers:
     dependency: "direct main"
     description:
@@ -739,7 +739,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.0"
   sp_util:
     dependency: transitive
     description:
@@ -802,7 +802,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.3.0"
+    version: "0.2.19"
   timezone:
     dependency: transitive
     description: