预订安排页面优惠不对应bug

wdn127929
1 parent ac591aa2
Showing 7 changed files with 44 additions and 46 deletions
android/app/build.gradle
android/app/src/main/AndroidManifest.xml
ios/Runner.xcodeproj/project.pbxproj
lib/pages/invicate/invitation_page.dart
lib/pages/message/message_treated_page.dart
lib/pages/message/message_untreated_page.dart
lib/provider/message_model.dart
--- a/android/app/build.gradle
View file @ca95858
+++ b/android/app/build.gradle
View file @ca95858
@@ -12,14 +12,14 @@ if (flutterRoot == null) {
 }
-def flutterVersionCode = "441"
+def flutterVersionCode = "442"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '441'
+    flutterVersionCode = '442'
 }
-def flutterVersionName = "4.4.1"
+def flutterVersionName = "4.4.2"
 if (flutterVersionName == null) {
-    flutterVersionName = '4.4.1'
+    flutterVersionName = '4.4.2'
 }
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
--- a/android/app/src/main/AndroidManifest.xml
View file @ca95858
+++ b/android/app/src/main/AndroidManifest.xml
View file @ca95858
@@ -14,7 +14,6 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.per酒精，kmission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.CAMERA"/>
      <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
       <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
--- a/ios/Runner.xcodeproj/project.pbxproj
View file @ca95858
+++ b/ios/Runner.xcodeproj/project.pbxproj
View file @ca95858
@@ -491,7 +491,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 436;
+				CURRENT_PROJECT_VERSION = 441;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -501,15 +501,12 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.3.6;
+				MARKETING_VERSION = 4.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -640,7 +637,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 436;
+				CURRENT_PROJECT_VERSION = 441;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -650,15 +647,12 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.3.6;
+				MARKETING_VERSION = 4.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -679,7 +673,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 436;
+				CURRENT_PROJECT_VERSION = 441;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -689,15 +683,12 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 4.3.6;
+				MARKETING_VERSION = 4.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/lib/pages/invicate/invitation_page.dart
View file @ca95858
+++ b/lib/pages/invicate/invitation_page.dart
View file @ca95858
@@ -1027,9 +1027,10 @@ class InvicationPageState extends State<InvicationPage>
               List<String> listuids =
                   couponProvider.couponListSelect[i].uidList.split(',');
               if (listuids.contains(
-                  Provider.of<UserModel>(context, listen: false).user.openid))
+                  Provider.of<UserModel>(context, listen: false).user.openid)) {
                 couponsCan.add(couponProvider.couponListSelect[i].aname);
-              temp.add(couponProvider.couponListSelect[i]);
+                temp.add(couponProvider.couponListSelect[i]);
+              }
             }
           } else {
             //我的优惠券
--- a/lib/pages/message/message_treated_page.dart
View file @ca95858
+++ b/lib/pages/message/message_treated_page.dart
View file @ca95858
@@ -225,10 +225,10 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
                                 delegate: SliverChildBuilderDelegate(
                                     (BuildContext context, int index) {
                                   return MessageItemF(
-                                    model.messages[index],
+                                    model.messagesHas[index],
                                     isTreated: true,
                                   );
-                                }, childCount: model.messages.length),
+                                }, childCount: model.messagesHas.length),
                               )
                             ],
                             onRefresh: () async {
--- a/lib/pages/message/message_untreated_page.dart
View file @ca95858
+++ b/lib/pages/message/message_untreated_page.dart
View file @ca95858
@@ -56,9 +56,11 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
       // });
       messageModel.pageStateUn = PageState.Loading;
       messageModel.notifyListeners();
+       offset = 0;
       getMessage();
     });
     bus.on("refresh_untreated_list", (arg) {
+       offset = 0;
       getMessage();
     });
   }
@@ -94,7 +96,7 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
   _cancelMessage() async {
     String messageids = ''; //超过24小时
-    for (NewUnmessage item in messageModel.messages) {
+    for (NewUnmessage item in messageModel.messagesUn) {
       if (item.message_type == '11') {
         DateTime cdate = DateTime.fromMillisecondsSinceEpoch(
             int.parse(item.cdate.toString()) * 1000);
@@ -119,6 +121,7 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
       "id": messageids,
     };
     await messageModel.setMessageStatus(context, params);
+     offset = 0;
     getMessage(showLoading: false);
   }
@@ -150,7 +153,7 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
                 SliverList(
                   delegate: SliverChildBuilderDelegate(
                       (BuildContext context, int index) {
-                    NewUnmessage message = model.messages[index];
+                    NewUnmessage message = model.messagesUn[index];
                     if (message.message_type == "10") {
                       // titleText = "在线预订";
@@ -170,10 +173,10 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
                     }
                     return MessageItemF(
-                      model.messages[index],
+                      model.messagesUn[index],
                       isTreated: false,
                     );
-                  }, childCount: model.messages.length),
+                  }, childCount: model.messagesUn.length),
                 )
               ],
               onRefresh: () async {
@@ -181,8 +184,8 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
                 getMessage(showLoading: false);
               },
               onLoad: () async {
-                // offset++;
-                // getMessage(showLoading: false);
+                offset++;
+                getMessage(showLoading: false);
               },
             );
           }
--- a/lib/provider/message_model.dart
View file @ca95858
+++ b/lib/provider/message_model.dart
View file @ca95858
@@ -12,7 +12,7 @@ import 'package:one_key/utils/utils.dart';
 import 'package:provider/provider.dart';
 class MessageModel extends ChangeNotifier {
-  List<NewUnmessage> messages = []; //消息
+  List<NewUnmessage> messagesHas = []; //消息
   List<NewUnmessage> messagesUn = []; //消息未处理的,用来清理消息的时候判断是否可清理
   PageState pageStateUn = PageState.Loading; //未处理
@@ -26,7 +26,8 @@ class MessageModel extends ChangeNotifier {
   int allUnNum = 0; //全部未读
   initData() {
-    messages = []; //消息
+    messagesHas = []; //消息
+    messagesUn = [];
     pageStateUn = PageState.Loading; //未处理
     pageState = PageState.Loading; //已处理
   }
@@ -36,7 +37,7 @@ class MessageModel extends ChangeNotifier {
       {showLoading = true}) async {
     if (showLoading) {
       pageState = PageState.Loading;
-      messages = [];
+      messagesHas = [];
       notifyListeners();
     }
     BaseResp<List> baseResp = await DioUtil()
@@ -63,21 +64,21 @@ class MessageModel extends ChangeNotifier {
       String uid = Provider.of<UserModel>(context, listen: false).user.openid;
       List<NewUnmessage> temp = [];
       if (params['offset'] == "0") {
-        messages = baseResp.data.map<NewUnmessage>((value) {
+        messagesHas = baseResp.data.map<NewUnmessage>((value) {
           return NewUnmessage.fromJson(value);
         }).toList();
       } else {
-        messages.addAll(baseResp.data.map<NewUnmessage>((value) {
+        messagesHas.addAll(baseResp.data.map<NewUnmessage>((value) {
           return NewUnmessage.fromJson(value);
         }).toList());
       }
-      temp.addAll(messages);
-      messages = [];
+      temp.addAll(messagesHas);
+      messagesHas = [];
       temp.forEach((element) {
         if (element.uid == uid && element.message_type == '16') {
           print('object');
         } else {
-          messages.add(element);
+          messagesHas.add(element);
         }
       });
@@ -98,7 +99,7 @@ class MessageModel extends ChangeNotifier {
       //     return true;
       //   });
       // }
-      if (messages.isEmpty) {
+      if (messagesHas.isEmpty) {
         pageState = PageState.Empty;
       } else {
         pageState = PageState.Success;
@@ -112,7 +113,7 @@ class MessageModel extends ChangeNotifier {
       {showLoading = true}) async {
     if (showLoading) {
       pageStateUn = PageState.Loading;
-      messages = [];
+      messagesUn = [];
       notifyListeners();
     }
     BaseResp<dynamic> baseResp = await DioUtil()
@@ -142,6 +143,7 @@ class MessageModel extends ChangeNotifier {
       int tempnum = 0;
       String uid = Provider.of<UserModel>(context, listen: false).user.openid;
       List<NewUnmessage> temp = [];
+      List<NewUnmessage> messages = [];
       if (params['offset'] == "0") {
         messages = baseResp.data['list'].map<NewUnmessage>((value) {
           return NewUnmessage.fromJson(value);
@@ -161,6 +163,7 @@ class MessageModel extends ChangeNotifier {
           messages.add(element);
         }
       });
+      messagesUn.addAll(messages);
       if (tempnum > 0) {
         allUnNum = baseResp.data['count'] - tempnum;
       } else {
@@ -175,7 +178,7 @@ class MessageModel extends ChangeNotifier {
       {showLoading = true}) async {
     if (showLoading) {
       pageStateUn = PageState.Loading;
-      messages = [];
+      // messagesUn = [];
       notifyListeners();
     }
     BaseResp<dynamic> baseResp = await DioUtil()
@@ -202,6 +205,7 @@ class MessageModel extends ChangeNotifier {
       notifyListeners();
     });
     if (baseResp != null && baseResp.code == Constant.status_success) {
+      List<NewUnmessage> messages = [];
       int tempnum = 0;
       String uid = Provider.of<UserModel>(context, listen: false).user.openid;
       List<NewUnmessage> temp = [];
@@ -318,8 +322,8 @@ class MessageModel extends ChangeNotifier {
   //根据消息id移除消息
   removeUntreatedMessageByMid(String mid) {
-    messages.removeWhere((element) => element.id == mid);
-    if (messages.length == 0) {
+    messagesUn.removeWhere((element) => element.id == mid);
+    if (messagesUn.length == 0) {
       pageStateUn = PageState.Empty;
     }
     notifyListeners();