预订数据导出需开通客情维护功能&&消息中心不显示其他经理取消预订的消息

@@ -21,6 +21,8 @@ import 'package:one_key/widgets/system_app_bar.dart';
 import 'package:one_key/widgets/v_empty_view.dart';
 import 'package:one_key/widgets/v_empty_view.dart';
 import 'package:provider/provider.dart';
 import 'package:provider/provider.dart';
 
 
+import '../../../../provider/collect_store_provider.dart';
+import '../../../../utils/dialog_util.dart';
 import '../../../../utils/screen_util.dart';
 import '../../../../utils/screen_util.dart';
 import '../../../../widgets/page_loading.dart';
 import '../../../../widgets/page_loading.dart';
 import '../month_item.dart';
 import '../month_item.dart';
@@ -41,6 +43,8 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
   int year;
   int year;
   int month;
   int month;
 
 
+  CollectStoreProvider collectStoreProvider;
+
   @override
   @override
   void initState() {
   void initState() {
     super.initState();
     super.initState();
@@ -51,6 +55,8 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
       // _getSellerGuestManage();
       // _getSellerGuestManage();
       _getMarketingBySeller();
       _getMarketingBySeller();
       _getSellerCountsList();
       _getSellerCountsList();
+
+      getSellerVersion();
     });
     });
     bus.on("refresh_store_customer_home", (arg) {
     bus.on("refresh_store_customer_home", (arg) {
       _getMarketingBySeller();
       _getMarketingBySeller();
@@ -66,6 +72,12 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
     super.dispose();
     super.dispose();
   }
   }
 
 
+  getSellerVersion() async {
+    await collectStoreProvider.getSellerVersion(context);
+
+    setState(() {});
+  }
+
   ///全店客情首页
   ///全店客情首页
   _getSellerGuestManage() async {
   _getSellerGuestManage() async {
     StoreCustomerHomeSunModel model =
     StoreCustomerHomeSunModel model =
@@ -845,7 +857,8 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
 
 
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
-    // widget.customerProvider = Provider.of<widget.customerProvider>(context, listen: true);
+    collectStoreProvider =
+        Provider.of<CollectStoreProvider>(context, listen: true);
     return Scaffold(
     return Scaffold(
         // backgroundColor: Color.fromRGBO(246, 248, 250, 1),
         // backgroundColor: Color.fromRGBO(246, 248, 250, 1),
         // appBar: SystemAppBar('全店客情', onTap: () {
         // appBar: SystemAppBar('全店客情', onTap: () {
@@ -1582,6 +1595,14 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
                         flex: 1,
                         flex: 1,
                         child: RoundButton(
                         child: RoundButton(
                           onPressed: () {
                           onPressed: () {
+                            if (!collectStoreProvider.sellerPreserve) {
+                              //没有购买客情维护模块
+                              //提示购买
+
+                              DialogUtil.showSellerVersionBuyDialog(
+                                  context, '客情维护', (v) {});
+                              return;
+                            }
                             NavigatorUtil.goExportBookDataPage(
                             NavigatorUtil.goExportBookDataPage(
                               context,
                               context,
                             );
                             );

@@ -266,23 +266,26 @@ class _SmsTemplateSettingPageState extends State<SmsTemplateSettingPage> {
         // 获取当前光标位置
         // 获取当前光标位置
         // int cursorPosition = _cursorPosition;
         // int cursorPosition = _cursorPosition;
         int cursorPosition = controller.selection.baseOffset;
         int cursorPosition = controller.selection.baseOffset;
-
-        // 插入文本
-        controller.text = controller.text.substring(0, cursorPosition) +
-            marketingCenterProvider.smsChangeFieldData[i].show +
-            controller.text.substring(cursorPosition);
-
-        print(controller.text);
-
-        // 设置新的光标位置
-        controller.selection = TextSelection.fromPosition(TextPosition(
-            offset: cursorPosition +
-                marketingCenterProvider.smsChangeFieldData[i].show.length,
-            affinity: TextAffinity.downstream));
-        setState(() {
-          _cursorPosition = controller.selection.baseOffset;
-          // cursorPosition = _cursorPosition;
-        });
+        if (cursorPosition != -1) {
+          // 插入文本
+          controller.text = controller.text.substring(0, cursorPosition) +
+              marketingCenterProvider.smsChangeFieldData[i].show +
+              controller.text.substring(cursorPosition);
+
+          print(controller.text);
+
+          // 设置新的光标位置
+          controller.selection = TextSelection.fromPosition(TextPosition(
+              offset: cursorPosition +
+                  marketingCenterProvider.smsChangeFieldData[i].show.length,
+              affinity: TextAffinity.downstream));
+          setState(() {
+            _cursorPosition = controller.selection.baseOffset;
+            // cursorPosition = _cursorPosition;
+          });
+        } else {
+          controller.text += marketingCenterProvider.smsChangeFieldData[i].show;
+        }
       }));
       }));
     }
     }
     return data;
     return data;

@@ -125,11 +125,15 @@ class MessageDialogModel extends ChangeNotifier {
             ///此状态移除，不展示
             ///此状态移除，不展示
             return true;
             return true;
           }
           }
-        } else if (message.message_type.toString() == "16" &&
-            message.uid == uid) {
-          //移除自己取消的订单
+        } else if (message.message_type.toString() == "16") {
+          //移除经理取消的订单
           return true;
           return true;
         }
         }
+        // else if (message.message_type.toString() == "16" &&
+        //     message.uid == uid) {
+        //   //移除自己取消的订单
+        //   return true;
+        // }
         return false;
         return false;
       });
       });
 
 
@@ -158,7 +162,7 @@ class MessageDialogModel extends ChangeNotifier {
         .catchError((error) {
         .catchError((error) {
       print(error.toString());
       print(error.toString());
     });
     });
-  
+
     if (baseResp.code == Constant.status_success) {
     if (baseResp.code == Constant.status_success) {
     } else {
     } else {
       Utils.showToast(baseResp.msg);
       Utils.showToast(baseResp.msg);

@@ -77,7 +77,10 @@ class MessageModel extends ChangeNotifier {
       temp.addAll(messagesHas);
       temp.addAll(messagesHas);
       messagesHas = [];
       messagesHas = [];
       temp.forEach((element) {
       temp.forEach((element) {
-        if (element.uid == uid && element.message_type == '16') {
+        // if (element.uid == uid && element.message_type == '16') {
+        //   print('object');
+        // }
+        if (element.message_type == '16') {
           print('object');
           print('object');
         } else {
         } else {
           messagesHas.add(element);
           messagesHas.add(element);
@@ -159,7 +162,10 @@ class MessageModel extends ChangeNotifier {
       messagesUnTemp = [];
       messagesUnTemp = [];
 
 
       temp.forEach((element) {
       temp.forEach((element) {
-        if (element.uid == uid && element.message_type == '16') {
+        // if (element.uid == uid && element.message_type == '16') {
+        //   tempnum++;
+        // }
+        if (element.message_type == '16') {
           tempnum++;
           tempnum++;
         } else {
         } else {
           messagesUnTemp.add(element);
           messagesUnTemp.add(element);
@@ -226,15 +232,18 @@ class MessageModel extends ChangeNotifier {
       messagesUn = [];
       messagesUn = [];
 
 
       temp.forEach((element) {
       temp.forEach((element) {
-        if (element.uid == uid && element.message_type == '16') {
-          tempnum++;
+        // if (element.uid == uid && element.message_type == '16') {
+        //   tempnum++; // 自己取消的预订消息删除去
+        // }
+        if (element.message_type == '16') {
+          tempnum++; // 经理取消的预订消息删除去
         } else {
         } else {
-          messagesUnTemp.add(element);
+          messagesUnTemp.add(element); //其他消息加进来出去
         }
         }
       });
       });
       messagesUn.addAll(messagesUnTemp);
       messagesUn.addAll(messagesUnTemp);
       if (tempnum > 0) {
       if (tempnum > 0) {
-        allUnNum = baseResp.data['count'] - tempnum;
+        allUnNum = baseResp.data['count'] - tempnum; // 对应消息数
       } else {
       } else {
         allUnNum = baseResp.data['count'];
         allUnNum = baseResp.data['count'];
       }
       }