不能使用自己手机号录入订单、客情模块未开通不得跳转客情详情页

wdn127929
2 parents 094336bd 4d50704b
Showing 18 changed files with 298 additions and 76 deletions
lib/main.dart
lib/models/user.dart
lib/models/user.g.dart
lib/pages/detail/notebook_detail_page.dart
lib/pages/home/home_page.dart
lib/pages/message/message_dialog_item_f.dart
lib/pages/message/message_item_f.dart
lib/pages/message/message_treated_page.dart
lib/pages/message/message_untreated_page.dart
lib/pages/my/base_info.dart
lib/pages/my/store_wine_manage/create_store_wine_page.dart
lib/provider/base_info_provider.dart
lib/provider/message_dialog_model.dart
lib/provider/notebook_detail_change_model.dart
lib/provider/notebook_detail_model.dart
lib/provider/table_manager_model.dart
lib/route/route_handles.dart
lib/utils/dialog_util.dart
--- a/lib/main.dart
View file @a4b03da
+++ b/lib/main.dart
View file @a4b03da
@@ -16,6 +16,7 @@ import 'package:one_key/pages/home/home_page.dart';
 import 'package:one_key/pages/login/first_page.dart';
 import 'package:one_key/pages/login/login_page_f.dart';
 import 'package:one_key/provider/base_info_provider.dart';
+import 'package:one_key/provider/collect_store_provider.dart';
 import 'package:one_key/provider/coupon_provider.dart';
 import 'package:one_key/provider/create_store_model.dart';
 import 'package:one_key/provider/customer_making_provider.dart';
@@ -26,6 +27,8 @@ import 'package:one_key/provider/notebook_detail_model.dart';
 import 'package:one_key/provider/online_check_edit_provider.dart';
 import 'package:one_key/provider/other_login_provider.dart';
 import 'package:one_key/provider/remark_manager_model.dart';
+import 'package:one_key/provider/store_base_info_provider.dart';
+import 'package:one_key/provider/table_manager_model.dart';
 import 'package:one_key/provider/tools.dart';
 import 'package:one_key/provider/upload_img_provider.dart';
 import 'package:one_key/route/navigator_util.dart';
@@ -240,7 +243,7 @@ class MyAppState extends State<MyApp> {
     return ScreenUtilInit(
         designSize: const Size(750, 1334),
         // designSize: const Size(900, 1200),//话机尺寸,不能按照屏幕尺寸,大概调整合适
-       
+
         minTextAdapt: true,
         splitScreenMode: true,
         builder: (context, child) {
@@ -270,7 +273,15 @@ class MyAppState extends State<MyApp> {
             home: isFirst
                 ? FirstPage()
                 : isLogin
-                    ? HomePage(initialIndex: 1)
+                    ? ChangeNotifierProvider<TableManagerModel>(
+                        create: (_) => TableManagerModel(),
+                        child: ChangeNotifierProvider<StoreBaseIndoProvider>(
+                            create: (_) => StoreBaseIndoProvider(),
+                            child: ChangeNotifierProvider<CollectStoreProvider>(
+                                create: (_) => CollectStoreProvider(),
+                                child: ChangeNotifierProvider<BaseIndoProvider>(
+                                    create: (_) => BaseIndoProvider(),
+                                    child: HomePage(initialIndex: 1)))))
                     : ChangeNotifierProvider<OtherLoginProvider>(
                         create: (_) => OtherLoginProvider(),
                         child: LoginPage()),
--- a/lib/models/user.dart
View file @a4b03da
+++ b/lib/models/user.dart
View file @a4b03da
@@ -19,7 +19,8 @@ class User {
   String morning; //早市时间段
   String noon; //午市时间段
   String night; //晚市时间段
-  String userphone; //角色电话
+  String userphone; //角色电话 -----员工管理----员工详情里面的手机号
+  String userphoneMyPage; //我的页面---个人信息页面的手机号
   String token; //token
   String nickName; // 昵称
   String edate; //店铺过期日期
@@ -43,6 +44,7 @@ class User {
       this.noon,
       this.night,
       this.userphone,
+      this.userphoneMyPage,
       this.token,
       this.nickName,
       this.edate,
@@ -54,6 +56,6 @@ class User {
   @override
   String toString() {
-    return 'User{openid: $openid, account: $account, role_name: $role_name, sellerid: $sellerid, sellercode: $sellercode, sellername: $sellername,sellerimage:$sellerimage, sellerphone: $sellerphone, sellerAddr: $sellerAddr, scatter: $scatter, room: $room, cassette: $cassette, morning: $morning, noon: $noon, night: $night ,userphone:$userphone,token:$token,nickName:$nickName,edate:$edate},tokenLoginOut:$tokenLoginOut}';
+    return 'User{openid: $openid, account: $account, role_name: $role_name, sellerid: $sellerid, sellercode: $sellercode, sellername: $sellername,sellerimage:$sellerimage, sellerphone: $sellerphone, sellerAddr: $sellerAddr, scatter: $scatter, room: $room, cassette: $cassette, morning: $morning, noon: $noon, night: $night ,userphone:$userphone,userphoneMyPage:$userphoneMyPage,token:$token,nickName:$nickName,edate:$edate},tokenLoginOut:$tokenLoginOut}';
   }
 }
--- a/lib/models/user.g.dart
View file @a4b03da
+++ b/lib/models/user.g.dart
View file @a4b03da
@@ -24,6 +24,7 @@ User _$UserFromJson(Map<String, dynamic> json) {
     json['noon'] as String,
     json['night'] as String,
     json['userphone'] as String,
+    json['userphoneMyPage'] as String,
     json['token'] as String,
     json['nickname'] as String,
     json['edate'] as String,
@@ -48,6 +49,7 @@ Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{
       'noon': instance.noon,
       'night': instance.night,
       'userphone': instance.userphone,
+      'userphoneMyPage':instance.userphoneMyPage,
       'token': instance.token,
       'nickname': instance.nickName,
       'edate': instance.edate,
--- a/lib/pages/detail/notebook_detail_page.dart
View file @a4b03da
+++ b/lib/pages/detail/notebook_detail_page.dart
View file @a4b03da
@@ -3096,6 +3096,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
                                                                 isBold: true,
                                                                 fontSize: 24,
                                                                 onPressed: () {
+                                                                  if (!collectStoreProvider
+                                                                      .sellerPreserve) {
+                                                                    //没有购买客情维护模块
+                                                                    //提示购买
+
+                                                                    DialogUtil.showSellerVersionBuyDialog(
+                                                                        context,
+                                                                        '客情维护',
+                                                                        (v) {});
+                                                                    return;
+                                                                  }
                                                                   //gid  跳转客户详情页面
                                                                   CustomerBySellerSunModel
                                                                       userHistoryEntity =
--- a/lib/pages/home/home_page.dart
View file @a4b03da
+++ b/lib/pages/home/home_page.dart
View file @a4b03da
@@ -233,6 +233,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
       initPlatformState();
       _getTableList();
       _getSellerById();
+      _getCustomerActivityBaseinfo();
       List<PullMarketingByUidSunModel> data =
           Provider.of<UserModel>(context, listen: false)
@@ -675,6 +676,19 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
     }
   }
+  _getCustomerActivityBaseinfo() async {
+    Map<String, String> params = {
+      'sellerid': Provider.of<UserModel>(context, listen: false).user.sellerid,
+      "uid": Provider.of<UserModel>(context, listen: false).user.openid,
+    };
+
+    BaseIndoProvider _baseIndoProvider =
+        Provider.of<BaseIndoProvider>(context, listen: false);
+    bool success =
+        await _baseIndoProvider.getCustomerActivityBaseinfo(context, params);
+    if (success) {}
+  }
+
   _initNotification() async {
     Map param = await Tools().getIntent();
     _getIntent(param);
@@ -816,6 +830,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
           break;
         case "18":
+          if (!collectStoreProvider.sellerPreserve) {
+            //没有购买客情维护模块
+            //提示购买
+
+            DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
+            return;
+          }
           CustomerBySellerSunModel userHistoryEntity = CustomerBySellerSunModel(
               null,
               null,
@@ -864,6 +885,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
           break;
         case "19":
+          if (!collectStoreProvider.sellerPreserve) {
+            //没有购买客情维护模块
+            //提示购买
+
+            DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
+            return;
+          }
           print(notifyParam);
           //纪念日
           CustomerBySellerSunModel userHistoryEntity = CustomerBySellerSunModel(
@@ -901,7 +929,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
           print(notifyParam);
           //补充预订信息
           //完善客人信息
-          
+
           NavigatorUtil.goNotebookDetailPage(
               context, notifyParam['id'].toString(), notifyParam['uid'],
               mid: notifyParam['mid']);
@@ -1126,6 +1154,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
             case "18":
               //存酒
               print('fff');
+              if (!collectStoreProvider.sellerPreserve) {
+                //没有购买客情维护模块
+                //提示购买
+
+                DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
+                return;
+              }
               CustomerBySellerSunModel userHistoryEntity =
                   CustomerBySellerSunModel(
                       null,
@@ -1182,7 +1217,15 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
             case "19":
               print(custom);
+
               //纪念日
+              if (!collectStoreProvider.sellerPreserve) {
+                //没有购买客情维护模块
+                //提示购买
+
+                DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
+                return;
+              }
               CustomerBySellerSunModel userHistoryEntity =
                   CustomerBySellerSunModel(
                       null,
@@ -1380,7 +1423,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
             return false;
           });
-          DialogUtil.showMessageDialog(context);
+          DialogUtil.showMessageDialog(context, collectStoreProvider);
           for (NewUnmessage item in messageModel.messages) {
             if (item.message_type == '11') {
               messageModel.messagesCancelOnlyOneShow.add(item.id);
--- a/lib/pages/message/message_dialog_item_f.dart
View file @a4b03da
+++ b/lib/pages/message/message_dialog_item_f.dart
View file @a4b03da
@@ -19,11 +19,15 @@ import 'package:provider/provider.dart';
 import '../../app.dart';
 import '../../constant/state.dart';
 import '../../models/customer_by_seller_model.dart';
+import '../../provider/collect_store_provider.dart';
+import '../../utils/dialog_util.dart';
 class MessageDialogItemF extends StatelessWidget {
   final NewUnmessage message;
   final bool isTreated;
-  MessageDialogItemF(this.message, {this.isTreated = false});
+  final CollectStoreProvider collectStoreProvider;
+  MessageDialogItemF(this.message, this.collectStoreProvider,
+      {this.isTreated = false});
   @override
   Widget build(BuildContext context) {
@@ -209,6 +213,13 @@ class MessageDialogItemF extends StatelessWidget {
             bus.emit("refresh_untreated_num"); //刷新未读消息数目
           } else if (message.message_type == "18") {
+            if (!collectStoreProvider.sellerPreserve) {
+              //没有购买客情维护模块
+              //提示购买
+
+              DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
+              return;
+            }
             //存酒超期
             CustomerBySellerSunModel userHistoryEntity =
                 CustomerBySellerSunModel(
@@ -243,6 +254,13 @@ class MessageDialogItemF extends StatelessWidget {
             bus.emit("refresh_untreated_num"); //刷新未读消息数目
           } else if (message.message_type == "19") {
             //纪念日提醒
+            if (!collectStoreProvider.sellerPreserve) {
+              //没有购买客情维护模块
+              //提示购买
+
+              DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
+              return;
+            }
             CustomerBySellerSunModel userHistoryEntity =
                 CustomerBySellerSunModel(
                     null,
@@ -718,6 +736,15 @@ class MessageDialogItemF extends StatelessWidget {
                       bus.emit("refresh_untreated_num"); //刷新未读消息数目
                     } else if (message.message_type == "18") {
+                      if (!collectStoreProvider.sellerPreserve) {
+                        //没有购买客情维护模块
+                        //提示购买
+
+                        DialogUtil.showSellerVersionBuyDialog(
+                            context, '客情维护', (v) {});
+                        return;
+                      }
+
                       //存酒超期
                       CustomerBySellerSunModel userHistoryEntity =
                           CustomerBySellerSunModel(
@@ -754,6 +781,14 @@ class MessageDialogItemF extends StatelessWidget {
                       bus.emit("refresh_untreated_num"); //刷新未读消息数目
                     } else if (message.message_type == "19") {
                       //纪念日提醒
+                      if (!collectStoreProvider.sellerPreserve) {
+                        //没有购买客情维护模块
+                        //提示购买
+
+                        DialogUtil.showSellerVersionBuyDialog(
+                            context, '客情维护', (v) {});
+                        return;
+                      }
                       CustomerBySellerSunModel userHistoryEntity =
                           CustomerBySellerSunModel(
                               null,
--- a/lib/pages/message/message_item_f.dart
View file @a4b03da
+++ b/lib/pages/message/message_item_f.dart
View file @a4b03da
@@ -16,11 +16,15 @@ import 'package:provider/provider.dart';
 import '../../constant/state.dart';
 import '../../models/customer_by_seller_model.dart';
+import '../../provider/collect_store_provider.dart';
+import '../../utils/dialog_util.dart';
 class MessageItemF extends StatelessWidget {
   final NewUnmessage message;
   final bool isTreated;
-  MessageItemF(this.message, {this.isTreated = false});
+  final CollectStoreProvider collectStoreProvider;
+  MessageItemF(this.message, this.collectStoreProvider,
+      {this.isTreated = false});
   @override
   Widget build(BuildContext context) {
@@ -137,6 +141,13 @@ class MessageItemF extends StatelessWidget {
               //会员充值
               NavigatorUtil.goMessageRechargeInfoPage(context, message.payid);
             } else if (message.message_type == "18") {
+              if (!collectStoreProvider.sellerPreserve) {
+                //没有购买客情维护模块
+                //提示购买
+
+                DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
+                return;
+              }
               //存酒超期
               CustomerBySellerSunModel userHistoryEntity =
                   CustomerBySellerSunModel(
@@ -162,6 +173,13 @@ class MessageItemF extends StatelessWidget {
               NavigatorUtil.goCustomerDetailPage(
                   context, userHistoryEntity, FromPage.FromPageMessagePage);
             } else if (message.message_type == "19") {
+              if (!collectStoreProvider.sellerPreserve) {
+                //没有购买客情维护模块
+                //提示购买
+
+                DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
+                return;
+              }
               //纪念日提醒
               CustomerBySellerSunModel userHistoryEntity =
                   CustomerBySellerSunModel(
@@ -308,6 +326,13 @@ class MessageItemF extends StatelessWidget {
               bus.emit("refresh_untreated_num"); //刷新未读消息数目
             } else if (message.message_type == "18") {
+              if (!collectStoreProvider.sellerPreserve) {
+                //没有购买客情维护模块
+                //提示购买
+
+                DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
+                return;
+              }
               //存酒超期
               CustomerBySellerSunModel userHistoryEntity =
                   CustomerBySellerSunModel(
@@ -343,6 +368,13 @@ class MessageItemF extends StatelessWidget {
               bus.emit("refresh_untreated_num"); //刷新未读消息数目
             } else if (message.message_type == "19") {
               //纪念日提醒
+              if (!collectStoreProvider.sellerPreserve) {
+                //没有购买客情维护模块
+                //提示购买
+
+                DialogUtil.showSellerVersionBuyDialog(context, '客情维护', (v) {});
+                return;
+              }
               CustomerBySellerSunModel userHistoryEntity =
                   CustomerBySellerSunModel(
                       null,
@@ -376,7 +408,6 @@ class MessageItemF extends StatelessWidget {
               await messageDialogModel.setMessageStatus(context, params1);
               bus.emit("refresh_untreated_num"); //刷新未读消息数目
             } else if (message.message_type == "20") {
-              
               //完善客人信息
               NavigatorUtil.goNotebookDetailPage(
                   context, message.rid.toString(), message.uid,
@@ -822,6 +853,14 @@ class MessageItemF extends StatelessWidget {
                       bus.emit("refresh_untreated_num"); //刷新未读消息数目
                     } else if (message.message_type == "18") {
+                      if (!collectStoreProvider.sellerPreserve) {
+                        //没有购买客情维护模块
+                        //提示购买
+
+                        DialogUtil.showSellerVersionBuyDialog(
+                            context, '客情维护', (v) {});
+                        return;
+                      }
                       //存酒超期
                       CustomerBySellerSunModel userHistoryEntity =
                           CustomerBySellerSunModel(
@@ -858,6 +897,14 @@ class MessageItemF extends StatelessWidget {
                       bus.emit("refresh_untreated_num"); //刷新未读消息数目
                     } else if (message.message_type == "19") {
                       //纪念日提醒
+                      if (!collectStoreProvider.sellerPreserve) {
+                        //没有购买客情维护模块
+                        //提示购买
+
+                        DialogUtil.showSellerVersionBuyDialog(
+                            context, '客情维护', (v) {});
+                        return;
+                      }
                       CustomerBySellerSunModel userHistoryEntity =
                           CustomerBySellerSunModel(
                               null,
--- a/lib/pages/message/message_treated_page.dart
View file @a4b03da
+++ b/lib/pages/message/message_treated_page.dart
View file @a4b03da
@@ -16,6 +16,8 @@ import 'package:one_key/widgets/page_exception.dart';
 import 'package:provider/provider.dart';
 import 'package:one_key/utils/event_bus.dart';
+import '../../provider/collect_store_provider.dart';
+
 /**
  * 已处理消息
  */
@@ -41,6 +43,8 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
   MessageDialogModel messageDialogModel;
   List<MessageMenuModel> menuTitle = [];
   String typeid = ''; //默认全部
+
+  CollectStoreProvider collectStoreProvider;
   @override
   void initState() {
     // TODO: implement initState
@@ -57,12 +61,19 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
       messageModel.pageState = PageState.Loading;
       messageModel.notifyListeners();
       getMessage(typeid);
+      getSellerVersion();
     });
     bus.on("refresh_treated_list", (arg) {
       getMessage(typeid);
     });
   }
+  getSellerVersion() async {
+    await collectStoreProvider.getSellerVersion(context);
+
+    setState(() {});
+  }
+
   _initMenu() {
     MessageMenuModel model1 = MessageMenuModel();
     model1.title = '全部';
@@ -135,6 +146,8 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
   @override
   Widget build(BuildContext context) {
+    collectStoreProvider =
+        Provider.of<CollectStoreProvider>(context, listen: true);
     messageModel = Provider.of<MessageModel>(context, listen: true);
     userModel = Provider.of<UserModel>(context, listen: false);
     messageDialogModel =
@@ -257,6 +270,7 @@ class MessageTreatedPageState extends State<MessageTreatedPage> {
                                     (BuildContext context, int index) {
                                   return MessageItemF(
                                     model.messagesHas[index],
+                                    collectStoreProvider,
                                     isTreated: true,
                                   );
                                 }, childCount: model.messagesHas.length),
--- a/lib/pages/message/message_untreated_page.dart
View file @a4b03da
+++ b/lib/pages/message/message_untreated_page.dart
View file @a4b03da
@@ -15,6 +15,8 @@ import 'package:one_key/widgets/page_exception.dart';
 import 'package:provider/provider.dart';
 import 'package:one_key/utils/event_bus.dart';
+import '../../provider/collect_store_provider.dart';
+
 /**
  * 未处理消息
  */
@@ -39,6 +41,8 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
   UserModel userModel;
   MessageDialogModel messageDialogModel;
+  CollectStoreProvider collectStoreProvider;
+
   @override
   void initState() {
     // TODO: implement initState
@@ -56,11 +60,12 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
       // });
       messageModel.pageStateUn = PageState.Loading;
       messageModel.notifyListeners();
-       offset = 0;
+      offset = 0;
       getMessage();
+      getSellerVersion();
     });
     bus.on("refresh_untreated_list", (arg) {
-       offset = 0;
+      offset = 0;
       getMessage();
     });
   }
@@ -78,6 +83,12 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
   //   await messageModel.getUnMsgNum(context, params);
   // }
+  getSellerVersion() async {
+    await collectStoreProvider.getSellerVersion(context);
+
+    setState(() {});
+  }
+
   //获取在线预订消息status 0未处理 1已处理
   getMessage({bool showLoading = true}) async {
     Map<String, String> params = {
@@ -122,12 +133,14 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
       "id": messageids,
     };
     await messageModel.setMessageStatus(context, params);
-     offset = 0;
+    offset = 0;
     getMessage(showLoading: false);
   }
   @override
   Widget build(BuildContext context) {
+    collectStoreProvider =
+        Provider.of<CollectStoreProvider>(context, listen: true);
     messageModel = Provider.of<MessageModel>(context, listen: true);
     userModel = Provider.of<UserModel>(context, listen: false);
     messageDialogModel =
@@ -175,6 +188,7 @@ class MessageUntreatedPageState extends State<MessageUntreatedPage> {
                     }
                     return MessageItemF(
                       model.messagesUn[index],
+                      collectStoreProvider,
                       isTreated: false,
                     );
                   }, childCount: model.messagesUn.length),
--- a/lib/pages/my/base_info.dart
View file @a4b03da
+++ b/lib/pages/my/base_info.dart
View file @a4b03da
@@ -221,7 +221,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
         String s = App.sp.getString('user');
         User _user = User.fromJson(json.decode(s));
         _user.nickName = nameStr;
-        _user.userphone = phoneTemp;
+        _user.userphoneMyPage = phoneTemp;
         await UserModel().saveUserInfo(_user);
       }
--- a/lib/pages/my/store_wine_manage/create_store_wine_page.dart
View file @a4b03da
+++ b/lib/pages/my/store_wine_manage/create_store_wine_page.dart
View file @a4b03da
@@ -548,18 +548,20 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
                       Utils.showToast('请输入联系电话!');
                       return false;
                     }
+                    if (phoneC.text.trim().length > 0) {
+                      UserModel userModel =
+                          Provider.of<UserModel>(context, listen: false);
-                    UserModel userModel =
-                        Provider.of<UserModel>(context, listen: false);
-
-                    //判断是否可以输入自己的手机号
-                    CustomerProvider customerProvider =
-                        Provider.of<CustomerProvider>(context, listen: false);
-                    await customerProvider.getSellerGuest(context);
-                    if (customerProvider.isselfphone) {
-                      //录入客户电话时不能用自己手机号（管店）
-                      if (phoneC.text.trim().length > 0) {
-                        if (userModel.user.userphone == phoneC.text.trim()) {
+                      //判断是否可以输入自己的手机号
+                      CustomerProvider customerProvider =
+                          Provider.of<CustomerProvider>(context, listen: false);
+                      await customerProvider.getSellerGuest(context);
+                      if (customerProvider.isselfphone) {
+                        //录入客户电话时不能用自己手机号（管店）
+
+                        if (userModel.user.userphone == phoneC.text.trim() ||
+                            userModel.user.userphoneMyPage ==
+                                phoneC.text.trim()) {
                           Utils.showToast('录入客户电话时不能用自己手机号!');
                           return null;
                         }
--- a/lib/provider/base_info_provider.dart
View file @a4b03da
+++ b/lib/provider/base_info_provider.dart
View file @a4b03da
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:one_key/constant/constant.dart';
 import 'package:one_key/constant/error.dart';
@@ -13,6 +15,9 @@ import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/utils/utils.dart';
 import 'package:provider/provider.dart';
+import '../app.dart';
+import '../models/user.dart';
+
 class BaseIndoProvider with ChangeNotifier {
   BaseInfoSunModel baseInfoSunModel; //客户经理基础信息
   Map<String, List<String>> photoList = {}; //商家图片信息
@@ -127,6 +132,13 @@ class BaseIndoProvider with ChangeNotifier {
         //   // couponsShow.add(couponTemp[i].id);
         // }
         // hasModify = true;
+        if (App.sp.containsKey('user')) {
+          String s = App.sp.getString('user');
+          User _user = User.fromJson(json.decode(s));
+          _user.userphoneMyPage = baseInfoSunModel.phone;
+
+          await UserModel().saveUserInfo(_user);
+        }
         notifyListeners();
         return true;
--- a/lib/provider/message_dialog_model.dart
View file @a4b03da
+++ b/lib/provider/message_dialog_model.dart
View file @a4b03da
@@ -84,16 +84,16 @@ class MessageDialogModel extends ChangeNotifier {
   }
   //添加一条信息
-  addMessage(BuildContext context, NewUnmessage message) {
-    LogUtil.v(message.toString());
-    play(message.message_type);
-    messages.add(message);
-    if (!showMessageDialog) {
-      DialogUtil.showMessageDialog(context);
-    } else {
-      notifyListeners();
-    }
-  }
+  // addMessage(BuildContext context, NewUnmessage message) {
+  //   LogUtil.v(message.toString());
+  //   play(message.message_type);
+  //   messages.add(message);
+  //   if (!showMessageDialog) {
+  //     DialogUtil.showMessageDialog(context);
+  //   } else {
+  //     notifyListeners();
+  //   }
+  // }
   //移除一条信息
   removeMessage(String mid) {
--- a/lib/provider/notebook_detail_change_model.dart
View file @a4b03da
+++ b/lib/provider/notebook_detail_change_model.dart
View file @a4b03da
@@ -576,15 +576,17 @@ class NotebookDetailChangeModel with ChangeNotifier {
   Future<SunReserveInfoModel> setReserveInfo(
       BuildContext context, String nameStr, String uid) async {
     UserModel userModel = Provider.of<UserModel>(context, listen: false);
-
-    //判断是否可以输入自己的手机号
-    CustomerProvider customerProvider =
-        Provider.of<CustomerProvider>(context, listen: false);
-    await customerProvider.getSellerGuest(context);
-    if (customerProvider.isselfphone) {
-      //录入客户电话时不能用自己手机号（管店）
-      if (phoneController.text.trim().length > 0) {
-        if (userModel.user.userphone == phoneController.text.trim()) {
+    if (phoneController.text.trim().length > 0) {
+      //判断是否可以输入自己的手机号
+      CustomerProvider customerProvider =
+          Provider.of<CustomerProvider>(context, listen: false);
+      await customerProvider.getSellerGuest(context);
+      if (customerProvider.isselfphone) {
+        //录入客户电话时不能用自己手机号（管店）
+
+        if (userModel.user.userphone == phoneController.text.trim() ||
+                            userModel.user.userphoneMyPage ==
+                                phoneController.text.trim()) {
           Utils.showToast('录入客户电话时不能用自己手机号!');
           return null;
         }
@@ -749,15 +751,17 @@ class NotebookDetailChangeModel with ChangeNotifier {
   Future<SunReserveInfoModel> updateOnlineReserveInfo(
       BuildContext context, String nameStr, String uid) async {
     UserModel userModel = Provider.of<UserModel>(context, listen: false);
-
-    //判断是否可以输入自己的手机号
-    CustomerProvider customerProvider =
-        Provider.of<CustomerProvider>(context, listen: false);
-    await customerProvider.getSellerGuest(context);
-    if (customerProvider.isselfphone) {
-      //录入客户电话时不能用自己手机号（管店）
-      if (phoneController.text.trim().length > 0) {
-        if (userModel.user.userphone == phoneController.text.trim()) {
+    if (phoneController.text.trim().length > 0) {
+      //判断是否可以输入自己的手机号
+      CustomerProvider customerProvider =
+          Provider.of<CustomerProvider>(context, listen: false);
+      await customerProvider.getSellerGuest(context);
+      if (customerProvider.isselfphone) {
+        //录入客户电话时不能用自己手机号（管店）
+
+        if (userModel.user.userphone == phoneController.text.trim()||
+                            userModel.user.userphoneMyPage ==
+                                phoneController.text.trim()) {
           Utils.showToast('录入客户电话时不能用自己手机号!');
           return null;
         }
--- a/lib/provider/notebook_detail_model.dart
View file @a4b03da
+++ b/lib/provider/notebook_detail_model.dart
View file @a4b03da
@@ -9,6 +9,7 @@ import 'package:one_key/models/user_history_entity.dart';
 import 'package:one_key/net/base_resp.dart';
 import 'package:one_key/net/dio_util.dart';
 import 'package:one_key/net/http_url.dart';
+import 'package:one_key/provider/customer_provider.dart';
 import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/route/navigator_util.dart';
 import 'package:one_key/utils/utils.dart';
@@ -18,6 +19,7 @@ import 'package:provider/provider.dart';
 import '../models/notebook.dart';
 import '../models/reserve_deposit_model.dart';
 import '../models/reserve_recheck_model.dart';
+import '../models/user.dart';
 class NotebookDetailModel extends ChangeNotifier {
   PageState pageState = PageState.Loading;
@@ -355,6 +357,21 @@ class NotebookDetailModel extends ChangeNotifier {
       String ymd,
       bool showLoading = false,
       bool needToast = true}) async {
+    if (phone != null && phone != '') {
+      //判断是否可以输入自己的手机号
+      CustomerProvider customerProvider =
+          Provider.of<CustomerProvider>(context, listen: false);
+      await customerProvider.getSellerGuest(context);
+      if (customerProvider.isselfphone) {
+        //录入客户电话时不能用自己手机号（管店）
+
+        User user = Provider.of<UserModel>(context, listen: false).user;
+        if (user.userphone == phone || user.userphoneMyPage == phone) {
+          Utils.showToast('录入客户电话时不能用自己手机号!');
+          return false;
+        }
+      }
+    }
     Map<String, dynamic> params = {
       "rid": rid,
       'note_name': Provider.of<UserModel>(context, listen: false).user.account
--- a/lib/provider/table_manager_model.dart
View file @a4b03da
+++ b/lib/provider/table_manager_model.dart
View file @a4b03da
@@ -27,6 +27,7 @@ import 'package:one_key/utils/utils.dart';
 import 'package:provider/provider.dart';
 import '../models/get_board_model.dart';
+import '../models/user.dart';
 import '../widgets/loading.dart';
 import 'notebook_model.dart';
@@ -428,22 +429,24 @@ class TableManagerModel with ChangeNotifier {
       Utils.showToast('请选择桌位');
       return null;
     }
-    
-    //判断是否可以输入自己的手机号
-    CustomerProvider customerProvider =
-        Provider.of<CustomerProvider>(context, listen: false);
-    await customerProvider.getSellerGuest(context);
-    if (customerProvider.isselfphone) {
-      //录入客户电话时不能用自己手机号（管店）
-      if (guest != null && guest.phone != null) {
-        print(Provider.of<UserModel>(context, listen: false).user.userphone);
-        if (Provider.of<UserModel>(context, listen: false).user.userphone ==
-            guest.phone) {
+    if (guest != null && guest.phone != null) {
+      //判断是否可以输入自己的手机号
+      CustomerProvider customerProvider =
+          Provider.of<CustomerProvider>(context, listen: false);
+      await customerProvider.getSellerGuest(context);
+      if (customerProvider.isselfphone) {
+        //录入客户电话时不能用自己手机号（管店）
+
+        User user = Provider.of<UserModel>(context, listen: false).user;
+        if (user.userphone == guest.phone ||
+            user.userphoneMyPage == guest.phone) {
           Utils.showToast('录入客户电话时不能用自己手机号!');
+          callback(false);
           return null;
         }
       }
     }
+
     bool sucess = await getReserveList(
       context,
       showMsg: true,
--- a/lib/route/route_handles.dart
View file @a4b03da
+++ b/lib/route/route_handles.dart
View file @a4b03da
@@ -291,12 +291,14 @@ var homeHandler = new Handler(
           create: (_) => StoreBaseIndoProvider(),
           child: ChangeNotifierProvider<CollectStoreProvider>(
               create: (_) => CollectStoreProvider(),
-              child: HomePage(
-                  initialIndex: int.parse(initialIndex),
-                  needReresh: needRefresh,
-                  mine: mine,
-                  date: dateTime,
-                  solt: solt))));
+              child: ChangeNotifierProvider<BaseIndoProvider>(
+                  create: (_) => BaseIndoProvider(),
+                  child: HomePage(
+                      initialIndex: int.parse(initialIndex),
+                      needReresh: needRefresh,
+                      mine: mine,
+                      date: dateTime,
+                      solt: solt)))));
 });
 // 跳转预订详情页
@@ -337,11 +339,13 @@ var editReserverPageHandle = new Handler(
       create: (_) => NotebookDetailModel(),
       child: ChangeNotifierProvider<CouponProvider>(
           create: (_) => CouponProvider(),
-          child: EditReserverPage(rid, name, sex, mid, needBtn: needBtn
-              // mid:
-              // uid: uid,
-              // fromNotify: fromNotify,
-              )));
+          child: ChangeNotifierProvider<CustomerProvider>(
+              create: (_) => CustomerProvider(),
+              child: EditReserverPage(rid, name, sex, mid, needBtn: needBtn
+                  //
+                  // uid: uid,
+                  // fromNotify: fromNotify,
+                  ))));
 });
 // 跳转到处理在线预订
--- a/lib/utils/dialog_util.dart
View file @a4b03da
+++ b/lib/utils/dialog_util.dart
View file @a4b03da
@@ -42,6 +42,7 @@ import '../models/seller_template_color_list_model.dart';
 import '../models/seller_version_model.dart';
 import '../models/theme_color_model.dart';
 import '../pages/my/marketing_center/theme_model.dart';
+import '../provider/collect_store_provider.dart';
 typedef CustomCallBack = void Function(Object object);
 typedef CustomCallBackMap = void Function(Map<String, String> object);
@@ -5620,7 +5621,7 @@ class DialogUtil {
   }
   //显示消息弹框
-  static showMessageDialog(BuildContext context) async {
+  static showMessageDialog(BuildContext context,CollectStoreProvider collectStoreProvider) async {
     MessageDialogModel messageModel =
         Provider.of<MessageDialogModel>(context, listen: false);
     if (messageModel.messages.isEmpty) return null;
@@ -5743,7 +5744,7 @@ class DialogUtil {
                           : ListView.builder(
                               itemBuilder: (context, index) {
                                 return MessageDialogItemF(
-                                    model.messages[index]);
+                                    model.messages[index],collectStoreProvider);
                               },
                               itemCount: model.messages.length,
                               shrinkWrap: true)