Showing
6 changed files
with
153 additions
and
96 deletions
| @@ -10,6 +10,7 @@ import 'package:flutter/material.dart'; | @@ -10,6 +10,7 @@ import 'package:flutter/material.dart'; | ||
| 10 | import 'package:flutter/services.dart'; | 10 | import 'package:flutter/services.dart'; |
| 11 | import 'package:flutter_screenutil/flutter_screenutil.dart'; | 11 | import 'package:flutter_screenutil/flutter_screenutil.dart'; |
| 12 | import 'package:one_key/provider/coupon_provider.dart'; | 12 | import 'package:one_key/provider/coupon_provider.dart'; |
| 13 | +import 'package:one_key/provider/marketing_center_provider.dart'; | ||
| 13 | import 'package:one_key/provider/notebook_detail_model.dart'; | 14 | import 'package:one_key/provider/notebook_detail_model.dart'; |
| 14 | import 'package:one_key/provider/user_model.dart'; | 15 | import 'package:one_key/provider/user_model.dart'; |
| 15 | import 'package:one_key/res/colors.dart'; | 16 | import 'package:one_key/res/colors.dart'; |
| @@ -62,6 +63,8 @@ class _EditReserverPageState extends State<EditReserverPage> { | @@ -62,6 +63,8 @@ class _EditReserverPageState extends State<EditReserverPage> { | ||
| 62 | 63 | ||
| 63 | ScrollController _scrollCrl = ScrollController(); | 64 | ScrollController _scrollCrl = ScrollController(); |
| 64 | 65 | ||
| 66 | + MarketingCenterProvider marketingCenterProvider; | ||
| 67 | + | ||
| 65 | @override | 68 | @override |
| 66 | void initState() { | 69 | void initState() { |
| 67 | super.initState(); | 70 | super.initState(); |
| @@ -89,9 +92,14 @@ class _EditReserverPageState extends State<EditReserverPage> { | @@ -89,9 +92,14 @@ class _EditReserverPageState extends State<EditReserverPage> { | ||
| 89 | _addNameSuffix(nameStr, _nameSuffix()); | 92 | _addNameSuffix(nameStr, _nameSuffix()); |
| 90 | setState(() {}); | 93 | setState(() {}); |
| 91 | } | 94 | } |
| 95 | + getDzSellerConf(); | ||
| 92 | }); | 96 | }); |
| 93 | } | 97 | } |
| 94 | 98 | ||
| 99 | + getDzSellerConf() async { | ||
| 100 | + await marketingCenterProvider.getDzSellerConf(context); | ||
| 101 | + } | ||
| 102 | + | ||
| 95 | _openAddressBook() async { | 103 | _openAddressBook() async { |
| 96 | if (!(await checkContactPermission())) { | 104 | if (!(await checkContactPermission())) { |
| 97 | PermissionStatus permissionStatus = await contactPermissionStatus(); | 105 | PermissionStatus permissionStatus = await contactPermissionStatus(); |
| @@ -333,6 +341,8 @@ class _EditReserverPageState extends State<EditReserverPage> { | @@ -333,6 +341,8 @@ class _EditReserverPageState extends State<EditReserverPage> { | ||
| 333 | 341 | ||
| 334 | @override | 342 | @override |
| 335 | Widget build(BuildContext context) { | 343 | Widget build(BuildContext context) { |
| 344 | + marketingCenterProvider = | ||
| 345 | + Provider.of<MarketingCenterProvider>(context, listen: true); | ||
| 336 | detailModel = Provider.of<NotebookDetailModel>(context, listen: true); | 346 | detailModel = Provider.of<NotebookDetailModel>(context, listen: true); |
| 337 | return Scaffold( | 347 | return Scaffold( |
| 338 | backgroundColor: MyColours.color_ffffff, | 348 | backgroundColor: MyColours.color_ffffff, |
| @@ -415,19 +425,23 @@ class _EditReserverPageState extends State<EditReserverPage> { | @@ -415,19 +425,23 @@ class _EditReserverPageState extends State<EditReserverPage> { | ||
| 415 | .length == | 425 | .length == |
| 416 | 0 && | 426 | 0 && |
| 417 | value.length > 0) { | 427 | value.length > 0) { |
| 418 | - detailModel.userHistorys = []; | ||
| 419 | - setState(() { | ||
| 420 | - showPhoneHistory = true; | ||
| 421 | - }); | ||
| 422 | - Map<String, String> params = { | ||
| 423 | - "keywords": value, | ||
| 424 | - "sid": Provider.of<UserModel>(context, | ||
| 425 | - listen: false) | ||
| 426 | - .user | ||
| 427 | - .sellerid, | ||
| 428 | - }; | ||
| 429 | - JhCommonUtils.debounce(() => detailModel | ||
| 430 | - .getUserHistorys(context, params)); | 428 | + if (marketingCenterProvider.nameSwich) { |
| 429 | + detailModel.userHistorys = []; | ||
| 430 | + setState(() { | ||
| 431 | + showPhoneHistory = true; | ||
| 432 | + }); | ||
| 433 | + Map<String, String> params = { | ||
| 434 | + "keywords": value, | ||
| 435 | + "sid": Provider.of<UserModel>( | ||
| 436 | + context, | ||
| 437 | + listen: false) | ||
| 438 | + .user | ||
| 439 | + .sellerid, | ||
| 440 | + }; | ||
| 441 | + JhCommonUtils.debounce(() => | ||
| 442 | + detailModel.getUserHistorys( | ||
| 443 | + context, params)); | ||
| 444 | + } | ||
| 431 | } else { | 445 | } else { |
| 432 | setState(() { | 446 | setState(() { |
| 433 | showPhoneHistory = false; | 447 | showPhoneHistory = false; |
| @@ -529,21 +543,24 @@ class _EditReserverPageState extends State<EditReserverPage> { | @@ -529,21 +543,24 @@ class _EditReserverPageState extends State<EditReserverPage> { | ||
| 529 | } | 543 | } |
| 530 | 544 | ||
| 531 | if (value.isEmpty || value.length > 0) { | 545 | if (value.isEmpty || value.length > 0) { |
| 532 | - detailModel.userHistorys = []; | ||
| 533 | - setState(() { | ||
| 534 | - showPhoneHistory = true; | ||
| 535 | - }); | ||
| 536 | - Map<String, String> params = { | ||
| 537 | - "keywords": value, | ||
| 538 | - "sid": Provider.of<UserModel>( | ||
| 539 | - context, | ||
| 540 | - listen: false) | ||
| 541 | - .user | ||
| 542 | - .sellerid, | ||
| 543 | - }; | ||
| 544 | - JhCommonUtils.debounce(() => | ||
| 545 | - detailModel.getUserHistorys( | ||
| 546 | - context, params)); | 546 | + if (marketingCenterProvider |
| 547 | + .phoneSwich) { | ||
| 548 | + detailModel.userHistorys = []; | ||
| 549 | + setState(() { | ||
| 550 | + showPhoneHistory = true; | ||
| 551 | + }); | ||
| 552 | + Map<String, String> params = { | ||
| 553 | + "keywords": value, | ||
| 554 | + "sid": Provider.of<UserModel>( | ||
| 555 | + context, | ||
| 556 | + listen: false) | ||
| 557 | + .user | ||
| 558 | + .sellerid, | ||
| 559 | + }; | ||
| 560 | + JhCommonUtils.debounce(() => | ||
| 561 | + detailModel.getUserHistorys( | ||
| 562 | + context, params)); | ||
| 563 | + } | ||
| 547 | } else { | 564 | } else { |
| 548 | setState(() { | 565 | setState(() { |
| 549 | showPhoneHistory = false; | 566 | showPhoneHistory = false; |
| @@ -38,6 +38,7 @@ import 'package:one_key/models/table_list.dart' as t; | @@ -38,6 +38,7 @@ import 'package:one_key/models/table_list.dart' as t; | ||
| 38 | import 'dart:convert' as convert; | 38 | import 'dart:convert' as convert; |
| 39 | import 'package:easy_contact_picker/easy_contact_picker.dart'; | 39 | import 'package:easy_contact_picker/easy_contact_picker.dart'; |
| 40 | import '../../models/user_history_entity.dart'; | 40 | import '../../models/user_history_entity.dart'; |
| 41 | +import '../../provider/marketing_center_provider.dart'; | ||
| 41 | import '../../utils/call_log_utils.dart'; | 42 | import '../../utils/call_log_utils.dart'; |
| 42 | import '../../utils/common_utils.dart'; | 43 | import '../../utils/common_utils.dart'; |
| 43 | import '../../utils/screen_util.dart'; | 44 | import '../../utils/screen_util.dart'; |
| @@ -81,6 +82,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | @@ -81,6 +82,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | ||
| 81 | MyTextSelectionControls(); | 82 | MyTextSelectionControls(); |
| 82 | ScrollController _scrollCrl = ScrollController(); | 83 | ScrollController _scrollCrl = ScrollController(); |
| 83 | 84 | ||
| 85 | + MarketingCenterProvider marketingCenterProvider; | ||
| 86 | + | ||
| 84 | @override | 87 | @override |
| 85 | void initState() { | 88 | void initState() { |
| 86 | super.initState(); | 89 | super.initState(); |
| @@ -119,6 +122,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | @@ -119,6 +122,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | ||
| 119 | widget.detailEntity.ddate_solt, | 122 | widget.detailEntity.ddate_solt, |
| 120 | widget.detailEntity.pnum, | 123 | widget.detailEntity.pnum, |
| 121 | widget.detailEntity.tables); | 124 | widget.detailEntity.tables); |
| 125 | + getDzSellerConf(); | ||
| 122 | _initData(); | 126 | _initData(); |
| 123 | }); | 127 | }); |
| 124 | } | 128 | } |
| @@ -130,6 +134,10 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | @@ -130,6 +134,10 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | ||
| 130 | super.dispose(); | 134 | super.dispose(); |
| 131 | } | 135 | } |
| 132 | 136 | ||
| 137 | + getDzSellerConf() async { | ||
| 138 | + await marketingCenterProvider.getDzSellerConf(context); | ||
| 139 | + } | ||
| 140 | + | ||
| 133 | _initData() async { | 141 | _initData() async { |
| 134 | print(widget.detailEntity); | 142 | print(widget.detailEntity); |
| 135 | for (var item in widget.detailEntity.tables) { | 143 | for (var item in widget.detailEntity.tables) { |
| @@ -1316,6 +1324,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | @@ -1316,6 +1324,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | ||
| 1316 | _notebookDetailChangeModel = | 1324 | _notebookDetailChangeModel = |
| 1317 | Provider.of<NotebookDetailChangeModel>(context, listen: true); | 1325 | Provider.of<NotebookDetailChangeModel>(context, listen: true); |
| 1318 | remarkManagerModel = Provider.of<RemarkManagerModel>(context, listen: true); | 1326 | remarkManagerModel = Provider.of<RemarkManagerModel>(context, listen: true); |
| 1327 | + marketingCenterProvider = | ||
| 1328 | + Provider.of<MarketingCenterProvider>(context, listen: true); | ||
| 1319 | int sum = 3; | 1329 | int sum = 3; |
| 1320 | int hide = 0; | 1330 | int hide = 0; |
| 1321 | int btnNum = 0; | 1331 | int btnNum = 0; |
| @@ -1744,21 +1754,24 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | @@ -1744,21 +1754,24 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | ||
| 1744 | .length == | 1754 | .length == |
| 1745 | 0 && | 1755 | 0 && |
| 1746 | value.length > 0) { | 1756 | value.length > 0) { |
| 1747 | - setState(() { | ||
| 1748 | - showPhoneHistory = true; | ||
| 1749 | - }); | ||
| 1750 | - Map<String, String> params = { | ||
| 1751 | - "keywords": value, | ||
| 1752 | - "sid": Provider.of<UserModel>( | ||
| 1753 | - context, | ||
| 1754 | - listen: false) | ||
| 1755 | - .user | ||
| 1756 | - .sellerid, | ||
| 1757 | - }; | ||
| 1758 | - JhCommonUtils.debounce(() => | ||
| 1759 | - _notebookDetailChangeModel | ||
| 1760 | - .getUserHistorys( | ||
| 1761 | - context, params)); | 1757 | + if (marketingCenterProvider |
| 1758 | + .nameSwich) { | ||
| 1759 | + setState(() { | ||
| 1760 | + showPhoneHistory = true; | ||
| 1761 | + }); | ||
| 1762 | + Map<String, String> params = { | ||
| 1763 | + "keywords": value, | ||
| 1764 | + "sid": Provider.of<UserModel>( | ||
| 1765 | + context, | ||
| 1766 | + listen: false) | ||
| 1767 | + .user | ||
| 1768 | + .sellerid, | ||
| 1769 | + }; | ||
| 1770 | + JhCommonUtils.debounce(() => | ||
| 1771 | + _notebookDetailChangeModel | ||
| 1772 | + .getUserHistorys( | ||
| 1773 | + context, params)); | ||
| 1774 | + } | ||
| 1762 | } else { | 1775 | } else { |
| 1763 | setState(() { | 1776 | setState(() { |
| 1764 | showPhoneHistory = false; | 1777 | showPhoneHistory = false; |
| @@ -1887,22 +1900,26 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | @@ -1887,22 +1900,26 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | ||
| 1887 | 1900 | ||
| 1888 | if (value.isEmpty || | 1901 | if (value.isEmpty || |
| 1889 | value.length > 0) { | 1902 | value.length > 0) { |
| 1890 | - setState(() { | ||
| 1891 | - showPhoneHistory = true; | ||
| 1892 | - }); | ||
| 1893 | - Map<String, String> params = { | ||
| 1894 | - "keywords": value, | ||
| 1895 | - "sid": Provider.of<UserModel>( | ||
| 1896 | - context, | ||
| 1897 | - listen: false) | ||
| 1898 | - .user | ||
| 1899 | - .sellerid, | ||
| 1900 | - }; | ||
| 1901 | - | ||
| 1902 | - JhCommonUtils.debounce(() => | ||
| 1903 | - _notebookDetailChangeModel | ||
| 1904 | - .getUserHistorys( | ||
| 1905 | - context, params)); | 1903 | + if (marketingCenterProvider |
| 1904 | + .phoneSwich) { | ||
| 1905 | + setState(() { | ||
| 1906 | + showPhoneHistory = true; | ||
| 1907 | + }); | ||
| 1908 | + Map<String, String> params = { | ||
| 1909 | + "keywords": value, | ||
| 1910 | + "sid": | ||
| 1911 | + Provider.of<UserModel>( | ||
| 1912 | + context, | ||
| 1913 | + listen: false) | ||
| 1914 | + .user | ||
| 1915 | + .sellerid, | ||
| 1916 | + }; | ||
| 1917 | + | ||
| 1918 | + JhCommonUtils.debounce(() => | ||
| 1919 | + _notebookDetailChangeModel | ||
| 1920 | + .getUserHistorys( | ||
| 1921 | + context, params)); | ||
| 1922 | + } | ||
| 1906 | } else { | 1923 | } else { |
| 1907 | setState(() { | 1924 | setState(() { |
| 1908 | showPhoneHistory = false; | 1925 | showPhoneHistory = false; |
| @@ -27,6 +27,7 @@ import 'package:one_key/provider/notebook_detail_model.dart'; | @@ -27,6 +27,7 @@ import 'package:one_key/provider/notebook_detail_model.dart'; | ||
| 27 | import 'package:one_key/provider/remark_manager_model.dart'; | 27 | import 'package:one_key/provider/remark_manager_model.dart'; |
| 28 | import 'package:one_key/provider/user_model.dart'; | 28 | import 'package:one_key/provider/user_model.dart'; |
| 29 | import 'package:one_key/res/colors.dart'; | 29 | import 'package:one_key/res/colors.dart'; |
| 30 | +import 'package:one_key/route/route_handles.dart'; | ||
| 30 | import 'package:one_key/utils/dialog_util.dart'; | 31 | import 'package:one_key/utils/dialog_util.dart'; |
| 31 | import 'package:one_key/utils/event_bus.dart'; | 32 | import 'package:one_key/utils/event_bus.dart'; |
| 32 | import 'package:one_key/utils/misc.dart'; | 33 | import 'package:one_key/utils/misc.dart'; |
| @@ -184,6 +185,8 @@ class InvicationPageState extends State<InvicationPage> | @@ -184,6 +185,8 @@ class InvicationPageState extends State<InvicationPage> | ||
| 184 | 185 | ||
| 185 | String smsContent = ''; | 186 | String smsContent = ''; |
| 186 | 187 | ||
| 188 | + MarketingCenterProvider marketingCenterProvider; | ||
| 189 | + | ||
| 187 | @override | 190 | @override |
| 188 | void initState() { | 191 | void initState() { |
| 189 | super.initState(); | 192 | super.initState(); |
| @@ -308,20 +311,16 @@ class InvicationPageState extends State<InvicationPage> | @@ -308,20 +311,16 @@ class InvicationPageState extends State<InvicationPage> | ||
| 308 | bus.on("refresh_photo_invication", (args) { | 311 | bus.on("refresh_photo_invication", (args) { |
| 309 | _getTablesPhoto(); | 312 | _getTablesPhoto(); |
| 310 | }); | 313 | }); |
| 311 | - bus.on("getDzSellerConf", (args) { | ||
| 312 | - getDzSellerConf(); | 314 | + bus.on("getDzSellerConf", (args) { |
| 315 | + getDzSellerConf(); | ||
| 313 | }); | 316 | }); |
| 314 | 317 | ||
| 315 | - | ||
| 316 | - | ||
| 317 | // Utils.changeStatusColor(color: Colors.transparent); | 318 | // Utils.changeStatusColor(color: Colors.transparent); |
| 318 | 319 | ||
| 319 | user = Provider.of<UserModel>(context, listen: false).user; | 320 | user = Provider.of<UserModel>(context, listen: false).user; |
| 320 | } | 321 | } |
| 321 | 322 | ||
| 322 | getDzSellerConf() async { | 323 | getDzSellerConf() async { |
| 323 | - MarketingCenterProvider marketingCenterProvider = | ||
| 324 | - Provider.of<MarketingCenterProvider>(context, listen: false); | ||
| 325 | bool success = await marketingCenterProvider.getDzSellerConf(context); | 324 | bool success = await marketingCenterProvider.getDzSellerConf(context); |
| 326 | if (success && marketingCenterProvider.dzSellerConfModel != null) { | 325 | if (success && marketingCenterProvider.dzSellerConfModel != null) { |
| 327 | noticeSms = marketingCenterProvider.dzSellerConfModel.isNotice == '1' | 326 | noticeSms = marketingCenterProvider.dzSellerConfModel.isNotice == '1' |
| @@ -429,9 +428,8 @@ class InvicationPageState extends State<InvicationPage> | @@ -429,9 +428,8 @@ class InvicationPageState extends State<InvicationPage> | ||
| 429 | bus.off("refresh_coupon_invitation"); | 428 | bus.off("refresh_coupon_invitation"); |
| 430 | bus.off("refresh_invitaion_info"); | 429 | bus.off("refresh_invitaion_info"); |
| 431 | bus.off("refresh_photo_invication"); | 430 | bus.off("refresh_photo_invication"); |
| 432 | - bus.off("getDzSellerConf"); | 431 | + bus.off("getDzSellerConf"); |
| 433 | 432 | ||
| 434 | - | ||
| 435 | WidgetsBinding.instance.removeObserver(this); //销毁观察者 | 433 | WidgetsBinding.instance.removeObserver(this); //销毁观察者 |
| 436 | if (_timer != null) { | 434 | if (_timer != null) { |
| 437 | _timer.cancel(); | 435 | _timer.cancel(); |
| @@ -2157,10 +2155,12 @@ class InvicationPageState extends State<InvicationPage> | @@ -2157,10 +2155,12 @@ class InvicationPageState extends State<InvicationPage> | ||
| 2157 | } | 2155 | } |
| 2158 | 2156 | ||
| 2159 | if (value.isEmpty || value.length > 0) { | 2157 | if (value.isEmpty || value.length > 0) { |
| 2160 | - setState(() { | ||
| 2161 | - showPhoneHistory = true; | ||
| 2162 | - }); | ||
| 2163 | - JhCommonUtils.debounce(() => _searchMethod(value)); | 2158 | + if (marketingCenterProvider.phoneSwich) { |
| 2159 | + setState(() { | ||
| 2160 | + showPhoneHistory = true; | ||
| 2161 | + }); | ||
| 2162 | + JhCommonUtils.debounce(() => _searchMethod(value)); | ||
| 2163 | + } | ||
| 2164 | } else { | 2164 | } else { |
| 2165 | setState(() { | 2165 | setState(() { |
| 2166 | showPhoneHistory = false; | 2166 | showPhoneHistory = false; |
| @@ -2291,19 +2291,22 @@ class InvicationPageState extends State<InvicationPage> | @@ -2291,19 +2291,22 @@ class InvicationPageState extends State<InvicationPage> | ||
| 2291 | .phoneController.text.length == | 2291 | .phoneController.text.length == |
| 2292 | 0 && | 2292 | 0 && |
| 2293 | value.length > 0) { | 2293 | value.length > 0) { |
| 2294 | - setState(() { | ||
| 2295 | - showPhoneHistory = true; | ||
| 2296 | - }); | ||
| 2297 | - Map<String, String> params = { | ||
| 2298 | - "keywords": value.trim(), | ||
| 2299 | - "sid": Provider.of<UserModel>(context, | ||
| 2300 | - listen: false) | ||
| 2301 | - .user | ||
| 2302 | - .sellerid, | ||
| 2303 | - }; | 2294 | + if (marketingCenterProvider.nameSwich) { |
| 2295 | + setState(() { | ||
| 2296 | + showPhoneHistory = true; | ||
| 2297 | + }); | ||
| 2298 | + Map<String, String> params = { | ||
| 2299 | + "keywords": value.trim(), | ||
| 2300 | + "sid": Provider.of<UserModel>(context, | ||
| 2301 | + listen: false) | ||
| 2302 | + .user | ||
| 2303 | + .sellerid, | ||
| 2304 | + }; | ||
| 2304 | 2305 | ||
| 2305 | - JhCommonUtils.debounce(() => _baseIndoProvider | ||
| 2306 | - .getUserHistorys(context, params)); | 2306 | + JhCommonUtils.debounce(() => |
| 2307 | + _baseIndoProvider.getUserHistorys( | ||
| 2308 | + context, params)); | ||
| 2309 | + } | ||
| 2307 | } else { | 2310 | } else { |
| 2308 | setState(() { | 2311 | setState(() { |
| 2309 | showPhoneHistory = false; | 2312 | showPhoneHistory = false; |
| @@ -5220,6 +5223,8 @@ class InvicationPageState extends State<InvicationPage> | @@ -5220,6 +5223,8 @@ class InvicationPageState extends State<InvicationPage> | ||
| 5220 | _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true); | 5223 | _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true); |
| 5221 | couponProvider = Provider.of<CouponProvider>(context, listen: true); | 5224 | couponProvider = Provider.of<CouponProvider>(context, listen: true); |
| 5222 | remarkManagerModel = Provider.of<RemarkManagerModel>(context, listen: true); | 5225 | remarkManagerModel = Provider.of<RemarkManagerModel>(context, listen: true); |
| 5226 | + marketingCenterProvider = | ||
| 5227 | + Provider.of<MarketingCenterProvider>(context, listen: true); | ||
| 5223 | myModel = Provider.of<MyModel>(context, listen: true); | 5228 | myModel = Provider.of<MyModel>(context, listen: true); |
| 5224 | return SafeArea( | 5229 | return SafeArea( |
| 5225 | child: Scaffold( | 5230 | child: Scaffold( |
| @@ -113,7 +113,7 @@ class _InputNamePhoneSettingPageState extends State<InputNamePhoneSettingPage> { | @@ -113,7 +113,7 @@ class _InputNamePhoneSettingPageState extends State<InputNamePhoneSettingPage> { | ||
| 113 | 113 | ||
| 114 | _setConfing() async { | 114 | _setConfing() async { |
| 115 | List<String> setting = | 115 | List<String> setting = |
| 116 | - marketingCenterProvider.dzSellerConfModel.isShowRnamePhone; | 116 | + marketingCenterProvider.dzSellerConfModel.isShowRnamePhone.toList(); |
| 117 | String uid = Provider.of<UserModel>(context, listen: false).user.openid; | 117 | String uid = Provider.of<UserModel>(context, listen: false).user.openid; |
| 118 | 118 | ||
| 119 | marketingCenterProvider.dzSellerConfModel.isShowRnamePhone | 119 | marketingCenterProvider.dzSellerConfModel.isShowRnamePhone |
| @@ -121,7 +121,8 @@ class _InputNamePhoneSettingPageState extends State<InputNamePhoneSettingPage> { | @@ -121,7 +121,8 @@ class _InputNamePhoneSettingPageState extends State<InputNamePhoneSettingPage> { | ||
| 121 | List subdata = element.split('-'); | 121 | List subdata = element.split('-'); |
| 122 | if (subdata[0] == uid) { | 122 | if (subdata[0] == uid) { |
| 123 | //设置过 | 123 | //设置过 |
| 124 | - setting.remove(element); //如果有,则移除,重新设置 | 124 | + //如果有,则移除,重新设置 |
| 125 | + setting.remove(element); | ||
| 125 | } | 126 | } |
| 126 | }); | 127 | }); |
| 127 | String inputSetting = | 128 | String inputSetting = |
| @@ -49,6 +49,8 @@ class MarketingCenterProvider extends ChangeNotifier { | @@ -49,6 +49,8 @@ class MarketingCenterProvider extends ChangeNotifier { | ||
| 49 | List<SaiYouYunChangeSunModel> saiYouYunchangedData = []; //塞邮云可变模版数据 | 49 | List<SaiYouYunChangeSunModel> saiYouYunchangedData = []; //塞邮云可变模版数据 |
| 50 | 50 | ||
| 51 | List<SmsChangeFieldSunModel> smsChangeFieldData = []; // 获取可变模板允许配置字段 | 51 | List<SmsChangeFieldSunModel> smsChangeFieldData = []; // 获取可变模板允许配置字段 |
| 52 | + bool phoneSwich = true; | ||
| 53 | + bool nameSwich = true; | ||
| 52 | 54 | ||
| 53 | // 获取赛邮云短信模板列表 (固定模版) | 55 | // 获取赛邮云短信模板列表 (固定模版) |
| 54 | 56 | ||
| @@ -165,6 +167,17 @@ class MarketingCenterProvider extends ChangeNotifier { | @@ -165,6 +167,17 @@ class MarketingCenterProvider extends ChangeNotifier { | ||
| 165 | if (baseResp.code == Constant.status_success) { | 167 | if (baseResp.code == Constant.status_success) { |
| 166 | dzSellerConfModel = | 168 | dzSellerConfModel = |
| 167 | GetDzSellerConfModel.fromJson(baseResp.responseData).data; | 169 | GetDzSellerConfModel.fromJson(baseResp.responseData).data; |
| 170 | + if (dzSellerConfModel.isShowRnamePhone.length > 0) { | ||
| 171 | + String uid = Provider.of<UserModel>(context, listen: false).user.openid; | ||
| 172 | + dzSellerConfModel.isShowRnamePhone.forEach((element) { | ||
| 173 | + List subdata = element.split('-'); | ||
| 174 | + if (subdata[0] == uid) { | ||
| 175 | + //设置过 | ||
| 176 | + phoneSwich = subdata[1] == '1' ? true : false; | ||
| 177 | + nameSwich = subdata[2] == '1' ? true : false; | ||
| 178 | + } | ||
| 179 | + }); | ||
| 180 | + } | ||
| 168 | return true; | 181 | return true; |
| 169 | } else { | 182 | } else { |
| 170 | Utils.showToast(baseResp.msg ?? '请求失败,请重试'); | 183 | Utils.showToast(baseResp.msg ?? '请求失败,请重试'); |
| @@ -237,7 +250,7 @@ class MarketingCenterProvider extends ChangeNotifier { | @@ -237,7 +250,7 @@ class MarketingCenterProvider extends ChangeNotifier { | ||
| 237 | }); | 250 | }); |
| 238 | if (baseResp.code == Constant.status_success) { | 251 | if (baseResp.code == Constant.status_success) { |
| 239 | // if (baseResp.data == 0 || baseResp.data == 1) { | 252 | // if (baseResp.data == 0 || baseResp.data == 1) { |
| 240 | - return true; | 253 | + return true; |
| 241 | // } else { | 254 | // } else { |
| 242 | // Utils.showToast('配置可变模板内容失败,请重试'); | 255 | // Utils.showToast('配置可变模板内容失败,请重试'); |
| 243 | // } | 256 | // } |
| @@ -346,11 +346,13 @@ var editReserverPageHandle = new Handler( | @@ -346,11 +346,13 @@ var editReserverPageHandle = new Handler( | ||
| 346 | create: (_) => CouponProvider(), | 346 | create: (_) => CouponProvider(), |
| 347 | child: ChangeNotifierProvider<CustomerProvider>( | 347 | child: ChangeNotifierProvider<CustomerProvider>( |
| 348 | create: (_) => CustomerProvider(), | 348 | create: (_) => CustomerProvider(), |
| 349 | - child: EditReserverPage(rid, name, sex, mid, needBtn: needBtn | ||
| 350 | - // | ||
| 351 | - // uid: uid, | ||
| 352 | - // fromNotify: fromNotify, | ||
| 353 | - )))); | 349 | + child: ChangeNotifierProvider<MarketingCenterProvider>( |
| 350 | + create: (_) => MarketingCenterProvider(), | ||
| 351 | + child: EditReserverPage(rid, name, sex, mid, needBtn: needBtn | ||
| 352 | + // | ||
| 353 | + // uid: uid, | ||
| 354 | + // fromNotify: fromNotify, | ||
| 355 | + ))))); | ||
| 354 | }); | 356 | }); |
| 355 | 357 | ||
| 356 | // 跳转到处理在线预订 | 358 | // 跳转到处理在线预订 |
| @@ -542,11 +544,13 @@ var noteBookChangeFPageHandle = new Handler( | @@ -542,11 +544,13 @@ var noteBookChangeFPageHandle = new Handler( | ||
| 542 | create: (_) => RemarkManagerModel(), | 544 | create: (_) => RemarkManagerModel(), |
| 543 | child: ChangeNotifierProvider<CustomerProvider>( | 545 | child: ChangeNotifierProvider<CustomerProvider>( |
| 544 | create: (_) => CustomerProvider(), | 546 | create: (_) => CustomerProvider(), |
| 545 | - child: NoteBookChangeFPage( | ||
| 546 | - detailEntity: detailEntity, | ||
| 547 | - rid: rid, | ||
| 548 | - back: back, | ||
| 549 | - )))); | 547 | + child: ChangeNotifierProvider<MarketingCenterProvider>( |
| 548 | + create: (_) => MarketingCenterProvider(), | ||
| 549 | + child: NoteBookChangeFPage( | ||
| 550 | + detailEntity: detailEntity, | ||
| 551 | + rid: rid, | ||
| 552 | + back: back, | ||
| 553 | + ))))); | ||
| 550 | }); | 554 | }); |
| 551 | 555 | ||
| 552 | // 跳转可订时段管理页面 | 556 | // 跳转可订时段管理页面 |
-
Please register or login to post a comment