xt / Flutter-ReserveApp · Commits

Go to a project

Commit a775b64501c30ed8a6ba9d5c08b5034d26cab2db

Authored by wdn127929
1 parent 2985f80a
build: skipped

消息中心自己取消的订单筛选、预订安排页经理信息未填写弹窗

Inline Side-by-side
Showing 8 changed files with 143 additions and 53 deletions
@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "391" 15 +def flutterVersionCode = "392"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '391' 17 + flutterVersionCode = '392'
18 } 18 }
19 19
20 -def flutterVersionName = "3.9.1" 20 +def flutterVersionName = "3.9.2"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '3.9.1' 22 + flutterVersionName = '3.9.2'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -502,7 +502,7 @@ @@ -502,7 +502,7 @@
502 "$(inherited)", 502 "$(inherited)",
503 "$(PROJECT_DIR)/Flutter", 503 "$(PROJECT_DIR)/Flutter",
504 ); 504 );
505 - MARKETING_VERSION = 3.9.1; 505 + MARKETING_VERSION = 3.9.2;
506 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 506 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
507 PRODUCT_NAME = Runner; 507 PRODUCT_NAME = Runner;
508 PROVISIONING_PROFILE_SPECIFIER = ""; 508 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -648,7 +648,7 @@ @@ -648,7 +648,7 @@
648 "$(inherited)", 648 "$(inherited)",
649 "$(PROJECT_DIR)/Flutter", 649 "$(PROJECT_DIR)/Flutter",
650 ); 650 );
651 - MARKETING_VERSION = 3.9.1; 651 + MARKETING_VERSION = 3.9.2;
652 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 652 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
653 PRODUCT_NAME = Runner; 653 PRODUCT_NAME = Runner;
654 PROVISIONING_PROFILE_SPECIFIER = ""; 654 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -684,7 +684,7 @@ @@ -684,7 +684,7 @@
684 "$(inherited)", 684 "$(inherited)",
685 "$(PROJECT_DIR)/Flutter", 685 "$(PROJECT_DIR)/Flutter",
686 ); 686 );
687 - MARKETING_VERSION = 3.9.1; 687 + MARKETING_VERSION = 3.9.2;
688 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 688 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
689 PRODUCT_NAME = Runner; 689 PRODUCT_NAME = Runner;
690 PROVISIONING_PROFILE_SPECIFIER = ""; 690 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -728,7 +728,8 @@ class InvicationPageState extends State<InvicationPage> @@ -728,7 +728,8 @@ class InvicationPageState extends State<InvicationPage>
728 bool sucess = await detailModel.upReserveInfo( 728 bool sucess = await detailModel.upReserveInfo(
729 context, widget.rid, 729 context, widget.rid,
730 dateStr: ddateHm, 730 dateStr: ddateHm,
731 - ymd: detailEntity.ddateYMD,needToast: false); 731 + ymd: detailEntity.ddateYMD,
  732 + needToast: false);
732 733
733 if (sucess) { 734 if (sucess) {
734 EventBus() 735 EventBus()
@@ -775,7 +776,7 @@ class InvicationPageState extends State<InvicationPage> @@ -775,7 +776,7 @@ class InvicationPageState extends State<InvicationPage>
775 776
776 sex = '${sexList.indexOf(sexStr) + 1}'; 777 sex = '${sexList.indexOf(sexStr) + 1}';
777 bool sucess = await detailModel.upReserveInfo(context, widget.rid, 778 bool sucess = await detailModel.upReserveInfo(context, widget.rid,
778 - name: name, sex: sex, phone: phone, cusdem: remark,needToast: false); 779 + name: name, sex: sex, phone: phone, cusdem: remark, needToast: false);
779 if (sucess) { 780 if (sucess) {
780 reserverPhone = phone; 781 reserverPhone = phone;
781 oldPhone = phone; 782 oldPhone = phone;
@@ -1459,7 +1460,8 @@ class InvicationPageState extends State<InvicationPage> @@ -1459,7 +1460,8 @@ class InvicationPageState extends State<InvicationPage>
1459 await detailModel.upReserveInfo( 1460 await detailModel.upReserveInfo(
1460 context, widget.rid, 1461 context, widget.rid,
1461 actualPum: 1462 actualPum:
1462 - detailModel.selectNum,needToast: false); 1463 + detailModel.selectNum,
  1464 + needToast: false);
1463 1465
1464 if (sucess) { 1466 if (sucess) {
1465 EventBus().emit( 1467 EventBus().emit(
@@ -1545,7 +1547,8 @@ class InvicationPageState extends State<InvicationPage> @@ -1545,7 +1547,8 @@ class InvicationPageState extends State<InvicationPage>
1545 await detailModel.upReserveInfo( 1547 await detailModel.upReserveInfo(
1546 context, widget.rid, 1548 context, widget.rid,
1547 dateStr: ddateHm, 1549 dateStr: ddateHm,
1548 - ymd: detailEntity.ddateYMD,needToast: false); 1550 + ymd: detailEntity.ddateYMD,
  1551 + needToast: false);
1549 1552
1550 if (sucess) { 1553 if (sucess) {
1551 EventBus().emit( 1554 EventBus().emit(
@@ -2797,7 +2800,8 @@ class InvicationPageState extends State<InvicationPage> @@ -2797,7 +2800,8 @@ class InvicationPageState extends State<InvicationPage>
2797 // }); 2800 // });
2798 bool sucess = await detailModel.upReserveInfo( 2801 bool sucess = await detailModel.upReserveInfo(
2799 context, widget.rid, 2802 context, widget.rid,
2800 - actualPum: detailModel.selectNum,needToast: false); 2803 + actualPum: detailModel.selectNum,
  2804 + needToast: false);
2801 2805
2802 if (sucess) { 2806 if (sucess) {
2803 EventBus().emit("refresh_tablemanager"); //刷新桌位 2807 EventBus().emit("refresh_tablemanager"); //刷新桌位
@@ -3317,23 +3321,23 @@ class InvicationPageState extends State<InvicationPage> @@ -3317,23 +3321,23 @@ class InvicationPageState extends State<InvicationPage>
3317 // rTitle: "确定修改", lCallback: () { 3321 // rTitle: "确定修改", lCallback: () {
3318 // print("取消"); 3322 // print("取消");
3319 // }, rCallback: () { 3323 // }, rCallback: () {
3320 - setState(() {  
3321 - String fullName =  
3322 - contact.fullName.replaceAll(new RegExp(r"\s+\b|\b\s"), "");  
3323 - String phone =  
3324 - contact.phoneNumber.replaceAll(new RegExp(r"\s+\b|\b\s"), "");  
3325 - if (fullName.compareTo(phone) == 0) {  
3326 - fullName = '';  
3327 - } else {  
3328 - fullName = contact.fullName;  
3329 - }  
3330 - _baseIndoProvider.phoneController.text =  
3331 - contact.phoneNumber.replaceAll(new RegExp(r"\s+"), "");  
3332 - nameStr = fullName;  
3333 - // _homeEnterModel.nameController.text = fullName + _nameSuffix();  
3334 - _addNameSuffix(fullName, sexStr);  
3335 - });  
3336 - _updateReserve(); 3324 + setState(() {
  3325 + String fullName =
  3326 + contact.fullName.replaceAll(new RegExp(r"\s+\b|\b\s"), "");
  3327 + String phone =
  3328 + contact.phoneNumber.replaceAll(new RegExp(r"\s+\b|\b\s"), "");
  3329 + if (fullName.compareTo(phone) == 0) {
  3330 + fullName = '';
  3331 + } else {
  3332 + fullName = contact.fullName;
  3333 + }
  3334 + _baseIndoProvider.phoneController.text =
  3335 + contact.phoneNumber.replaceAll(new RegExp(r"\s+"), "");
  3336 + nameStr = fullName;
  3337 + // _homeEnterModel.nameController.text = fullName + _nameSuffix();
  3338 + _addNameSuffix(fullName, sexStr);
  3339 + });
  3340 + _updateReserve();
3337 // }); 3341 // });
3338 } 3342 }
3339 3343
@@ -3542,6 +3546,20 @@ class InvicationPageState extends State<InvicationPage> @@ -3542,6 +3546,20 @@ class InvicationPageState extends State<InvicationPage>
3542 }); 3546 });
3543 3547
3544 return; 3548 return;
  3549 + } else if (ObjectUtil.isEmpty(
  3550 + _baseIndoProvider.baseInfoSunModel) ||
  3551 + ObjectUtil.isEmpty(
  3552 + _baseIndoProvider.baseInfoSunModel.phone)) {
  3553 + // Utils.showToast('请填写经理的联系电话');
  3554 + DialogUtil.cupertinoAlertDialog(context,
  3555 + title: "填写个人信息",
  3556 + content: "暂未填写您的联系信息，请先前往填写，个人信息将会展示给您的顾客。",
  3557 + lTitle: "取消",
  3558 + rTitle: "去填写",
  3559 + lCallback: () {}, rCallback: () {
  3560 + _goBaseInfoPage();
  3561 + });
  3562 + return;
3545 } else { 3563 } else {
3546 /* 3564 /*
3547 String dateSoltStr = ''; 3565 String dateSoltStr = '';
@@ -3634,6 +3652,20 @@ class InvicationPageState extends State<InvicationPage> @@ -3634,6 +3652,20 @@ class InvicationPageState extends State<InvicationPage>
3634 erroInfo = '请正确输入11位手机号码'; 3652 erroInfo = '请正确输入11位手机号码';
3635 }); 3653 });
3636 return; 3654 return;
  3655 + } else if (ObjectUtil.isEmpty(
  3656 + _baseIndoProvider.baseInfoSunModel) ||
  3657 + ObjectUtil.isEmpty(
  3658 + _baseIndoProvider.baseInfoSunModel.phone)) {
  3659 + // Utils.showToast('请填写经理的联系电话');
  3660 + DialogUtil.cupertinoAlertDialog(context,
  3661 + title: "填写个人信息",
  3662 + content: "暂未填写您的联系信息，请先前往填写，个人信息将会展示给您的顾客。",
  3663 + lTitle: "取消",
  3664 + rTitle: "去填写",
  3665 + lCallback: () {}, rCallback: () {
  3666 + _goBaseInfoPage();
  3667 + });
  3668 + return;
3637 } else { 3669 } else {
3638 setState(() { 3670 setState(() {
3639 showErroInfo = false; 3671 showErroInfo = false;
@@ -3698,13 +3730,22 @@ class InvicationPageState extends State<InvicationPage> @@ -3698,13 +3730,22 @@ class InvicationPageState extends State<InvicationPage>
3698 _showConfirmWidget( 3730 _showConfirmWidget(
3699 needWechat: true, 3731 needWechat: true,
3700 callback: () async { 3732 callback: () async {
3701 - // if (ObjectUtil.isEmpty(  
3702 - // _baseIndoProvider.baseInfoSunModel) ||  
3703 - // ObjectUtil.isEmpty(  
3704 - // _baseIndoProvider.baseInfoSunModel.phone)) {  
3705 - // Utils.showToast('请填写经理的联系电话');  
3706 - // return;  
3707 - // } 3733 + if (ObjectUtil.isEmpty(
  3734 + _baseIndoProvider.baseInfoSunModel) ||
  3735 + ObjectUtil.isEmpty(
  3736 + _baseIndoProvider.baseInfoSunModel.phone)) {
  3737 + // Utils.showToast('请填写经理的联系电话');
  3738 + DialogUtil.cupertinoAlertDialog(context,
  3739 + title: "填写个人信息",
  3740 + content: "暂未填写您的联系信息，请先前往填写，个人信息将会展示给您的顾客。",
  3741 + lTitle: "取消",
  3742 + rTitle: "去填写",
  3743 + lCallback: () {}, rCallback: () {
  3744 + _goBaseInfoPage();
  3745 + });
  3746 +
  3747 + return;
  3748 + }
3708 if (youhui != '选择优惠') { 3749 if (youhui != '选择优惠') {
3709 Map<String, String> params = { 3750 Map<String, String> params = {
3710 "rid": widget.rid, 3751 "rid": widget.rid,
@@ -3749,7 +3790,15 @@ class InvicationPageState extends State<InvicationPage> @@ -3749,7 +3790,15 @@ class InvicationPageState extends State<InvicationPage>
3749 _baseIndoProvider.baseInfoSunModel) || 3790 _baseIndoProvider.baseInfoSunModel) ||
3750 ObjectUtil.isEmpty( 3791 ObjectUtil.isEmpty(
3751 _baseIndoProvider.baseInfoSunModel.phone)) { 3792 _baseIndoProvider.baseInfoSunModel.phone)) {
3752 - Utils.showToast('请填写经理的联系电话'); 3793 + // Utils.showToast('请填写经理的联系电话');
  3794 + DialogUtil.cupertinoAlertDialog(context,
  3795 + title: "填写个人信息",
  3796 + content: "暂未填写您的联系信息，请先前往填写，个人信息将会展示给您的顾客。",
  3797 + lTitle: "取消",
  3798 + rTitle: "去填写",
  3799 + lCallback: () {}, rCallback: () {
  3800 + _goBaseInfoPage();
  3801 + });
3753 return; 3802 return;
3754 } 3803 }
3755 if (youhui != '选择优惠') { 3804 if (youhui != '选择优惠') {
@@ -111,13 +111,13 @@ class _BaseInfoPersonnalPageState extends State<BaseInfoPersonnalPage> { @@ -111,13 +111,13 @@ class _BaseInfoPersonnalPageState extends State<BaseInfoPersonnalPage> {
111 // bool success = 111 // bool success =
112 // await _baseIndoProvider.getCustomerActivityBaseinfo(context, params); 112 // await _baseIndoProvider.getCustomerActivityBaseinfo(context, params);
113 // if (success) { 113 // if (success) {
114 - _nameController.text = widget.sunModel.nickName;  
115 - nameStr = widget.sunModel.nickName; 114 + _nameController.text = widget.sunModel.nickName??'';
  115 + nameStr = widget.sunModel.nickName??"";
116 // _uploadImageProvider.touxiang.qiniuUrl = 116 // _uploadImageProvider.touxiang.qiniuUrl =
117 // _baseIndoProvider.baseInfoSunModel.photo; 117 // _baseIndoProvider.baseInfoSunModel.photo;
118 // _uploadImageProvider.erweima.qiniuUrl = 118 // _uploadImageProvider.erweima.qiniuUrl =
119 // _baseIndoProvider.baseInfoSunModel.qrcode; 119 // _baseIndoProvider.baseInfoSunModel.qrcode;
120 - _phoneController.text = widget.sunModel.phone; 120 + _phoneController.text = widget.sunModel.phone??"";
121 phoneStr = widget.sunModel.phone ?? ''; 121 phoneStr = widget.sunModel.phone ?? '';
122 // _wechatController.text = _baseIndoProvider.baseInfoSunModel.wechat; 122 // _wechatController.text = _baseIndoProvider.baseInfoSunModel.wechat;
123 // if (_baseIndoProvider.baseInfoSunModel.wechat != null && 123 // if (_baseIndoProvider.baseInfoSunModel.wechat != null &&
@@ -7,11 +7,13 @@ import 'package:one_key/models/new_unmessage_model.dart'; @@ -7,11 +7,13 @@ import 'package:one_key/models/new_unmessage_model.dart';
7 import 'package:one_key/net/base_resp.dart'; 7 import 'package:one_key/net/base_resp.dart';
8 import 'package:one_key/net/dio_util.dart'; 8 import 'package:one_key/net/dio_util.dart';
9 import 'package:one_key/net/http_url.dart'; 9 import 'package:one_key/net/http_url.dart';
  10 +import 'package:one_key/provider/user_model.dart';
10 11
11 import 'package:one_key/utils/dialog_util.dart'; 12 import 'package:one_key/utils/dialog_util.dart';
12 // import 'package:audioplayers/audio_cache.dart'; 13 // import 'package:audioplayers/audio_cache.dart';
13 // import 'package:audioplayers/audioplayers.dart'; 14 // import 'package:audioplayers/audioplayers.dart';
14 import 'package:one_key/utils/utils.dart'; 15 import 'package:one_key/utils/utils.dart';
  16 +import 'package:provider/provider.dart';
15 17
16 class MessageDialogModel extends ChangeNotifier { 18 class MessageDialogModel extends ChangeNotifier {
17 final AudioCache _player = AudioCache(); 19 final AudioCache _player = AudioCache();
@@ -91,6 +93,7 @@ class MessageDialogModel extends ChangeNotifier { @@ -91,6 +93,7 @@ class MessageDialogModel extends ChangeNotifier {
91 messagesTemp = baseResp.data['list'].map<NewUnmessage>((value) { 93 messagesTemp = baseResp.data['list'].map<NewUnmessage>((value) {
92 return NewUnmessage.fromJson(value); 94 return NewUnmessage.fromJson(value);
93 }).toList(); 95 }).toList();
  96 + String uid = Provider.of<UserModel>(context, listen: false).user.openid;
94 messagesTemp.removeWhere((message) { 97 messagesTemp.removeWhere((message) {
95 if (message.message_type.toString() == "10") { 98 if (message.message_type.toString() == "10") {
96 if (message.status == "4") { 99 if (message.status == "4") {
@@ -98,6 +101,10 @@ class MessageDialogModel extends ChangeNotifier { @@ -98,6 +101,10 @@ class MessageDialogModel extends ChangeNotifier {
98 ///此状态移除，不展示 101 ///此状态移除，不展示
99 return true; 102 return true;
100 } 103 }
  104 + } else if (message.message_type.toString() == "16" &&
  105 + message.uid == uid) {
  106 + //移除自己取消的订单
  107 + return true;
101 } 108 }
102 return false; 109 return false;
103 }); 110 });
@@ -7,7 +7,9 @@ import 'package:one_key/models/new_unmessage_model.dart'; @@ -7,7 +7,9 @@ import 'package:one_key/models/new_unmessage_model.dart';
7 import 'package:one_key/net/base_resp.dart'; 7 import 'package:one_key/net/base_resp.dart';
8 import 'package:one_key/net/dio_util.dart'; 8 import 'package:one_key/net/dio_util.dart';
9 import 'package:one_key/net/http_url.dart'; 9 import 'package:one_key/net/http_url.dart';
  10 +import 'package:one_key/provider/user_model.dart';
10 import 'package:one_key/utils/utils.dart'; 11 import 'package:one_key/utils/utils.dart';
  12 +import 'package:provider/provider.dart';
11 13
12 class MessageModel extends ChangeNotifier { 14 class MessageModel extends ChangeNotifier {
13 List<NewUnmessage> messages = []; //消息 15 List<NewUnmessage> messages = []; //消息
@@ -56,6 +58,8 @@ class MessageModel extends ChangeNotifier { @@ -56,6 +58,8 @@ class MessageModel extends ChangeNotifier {
56 notifyListeners(); 58 notifyListeners();
57 }); 59 });
58 if (baseResp != null && baseResp.code == Constant.status_success) { 60 if (baseResp != null && baseResp.code == Constant.status_success) {
  61 + String uid = Provider.of<UserModel>(context, listen: false).user.openid;
  62 + List<NewUnmessage> temp = [];
59 if (params['offset'] == "0") { 63 if (params['offset'] == "0") {
60 messages = baseResp.data.map<NewUnmessage>((value) { 64 messages = baseResp.data.map<NewUnmessage>((value) {
61 return NewUnmessage.fromJson(value); 65 return NewUnmessage.fromJson(value);
@@ -65,6 +69,15 @@ class MessageModel extends ChangeNotifier { @@ -65,6 +69,15 @@ class MessageModel extends ChangeNotifier {
65 return NewUnmessage.fromJson(value); 69 return NewUnmessage.fromJson(value);
66 }).toList()); 70 }).toList());
67 } 71 }
  72 + temp.addAll(messages);
  73 + messages = [];
  74 + temp.forEach((element) {
  75 + if (element.uid == uid && element.message_type == '16') {
  76 + print('object');
  77 + } else {
  78 + messages.add(element);
  79 + }
  80 + });
68 81
69 // if (params["type_id"] == "10") { 82 // if (params["type_id"] == "10") {
70 // //在线预订 83 // //在线预订
@@ -162,7 +175,9 @@ class MessageModel extends ChangeNotifier { @@ -162,7 +175,9 @@ class MessageModel extends ChangeNotifier {
162 notifyListeners(); 175 notifyListeners();
163 }); 176 });
164 if (baseResp != null && baseResp.code == Constant.status_success) { 177 if (baseResp != null && baseResp.code == Constant.status_success) {
165 - allUnNum = baseResp.data['count']; 178 + int tempnum = 0;
  179 + String uid = Provider.of<UserModel>(context, listen: false).user.openid;
  180 + List<NewUnmessage> temp = [];
166 if (params['offset'] == "0") { 181 if (params['offset'] == "0") {
167 messages = baseResp.data['list'].map<NewUnmessage>((value) { 182 messages = baseResp.data['list'].map<NewUnmessage>((value) {
168 return NewUnmessage.fromJson(value); 183 return NewUnmessage.fromJson(value);
@@ -172,6 +187,21 @@ class MessageModel extends ChangeNotifier { @@ -172,6 +187,21 @@ class MessageModel extends ChangeNotifier {
172 return NewUnmessage.fromJson(value); 187 return NewUnmessage.fromJson(value);
173 }).toList()); 188 }).toList());
174 } 189 }
  190 + temp.addAll(messages);
  191 + messages = [];
  192 +
  193 + temp.forEach((element) {
  194 + if (element.uid == uid && element.message_type == '16') {
  195 + tempnum++;
  196 + } else {
  197 + messages.add(element);
  198 + }
  199 + });
  200 + if (tempnum > 0) {
  201 + allUnNum = baseResp.data['count'] - tempnum;
  202 + } else {
  203 + allUnNum = baseResp.data['count'];
  204 + }
175 205
176 // if(params["type_id"]=="10"){//在线预订 206 // if(params["type_id"]=="10"){//在线预订
177 // messages.removeWhere((message) { 207 // messages.removeWhere((message) {
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 2
3 class MyColours { 3 class MyColours {
  4 + static const Color color_E6000000 = Color(0xE6000000);
  5 + static const Color color_99000000 = Color(0x99000000);
  6 + static const Color color_E5000000 = Color(0xE5000000);
4 static const Color color_005AA7 = Color(0xff005AA7); 7 static const Color color_005AA7 = Color(0xff005AA7);
5 static const Color color_FFFDE4 = Color(0xffFFFDE4); 8 static const Color color_FFFDE4 = Color(0xffFFFDE4);
6 static const Color color_2193B0 = Color(0xff2193B0); 9 static const Color color_2193B0 = Color(0xff2193B0);
@@ -4296,7 +4296,7 @@ class DialogUtil { @@ -4296,7 +4296,7 @@ class DialogUtil {
4296 4296
4297 static Future openAlertDialog(BuildContext context, String title, 4297 static Future openAlertDialog(BuildContext context, String title,
4298 String content, String btnTitle, double height, 4298 String content, String btnTitle, double height,
4299 - {GestureTapCallback onTap, double fontSize = 36}) async { 4299 + {GestureTapCallback onTap, double fontSize = 32}) async {
4300 final action = await showDialog( 4300 final action = await showDialog(
4301 context: context, 4301 context: context,
4302 barrierDismissible: true, 4302 barrierDismissible: true,
@@ -4320,8 +4320,9 @@ class DialogUtil { @@ -4320,8 +4320,9 @@ class DialogUtil {
4320 alignment: Alignment.center, 4320 alignment: Alignment.center,
4321 child: Text(title, 4321 child: Text(title,
4322 style: TextStyle( 4322 style: TextStyle(
  4323 + fontWeight: FontWeight.bold,
4323 fontSize: ScreenUtil().setSp(fontSize), 4324 fontSize: ScreenUtil().setSp(fontSize),
4324 - color: MyColours.color_353535)), 4325 + color: MyColours.color_000000)),
4325 ), 4326 ),
4326 VEmptyView(20), 4327 VEmptyView(20),
4327 Container( 4328 Container(
@@ -4339,8 +4340,8 @@ class DialogUtil { @@ -4339,8 +4340,8 @@ class DialogUtil {
4339 child: Text( 4340 child: Text(
4340 content, 4341 content,
4341 style: TextStyle( 4342 style: TextStyle(
4342 - color: MyColours.color_353535,  
4343 - fontSize: ScreenUtil().setSp(30), 4343 + color: MyColours.color_666666,
  4344 + fontSize: ScreenUtil().setSp(32),
4344 ), 4345 ),
4345 strutStyle: StrutStyle( 4346 strutStyle: StrutStyle(
4346 forceStrutHeight: true, 4347 forceStrutHeight: true,
@@ -4530,7 +4531,7 @@ class DialogUtil { @@ -4530,7 +4531,7 @@ class DialogUtil {
4530 String content = "内容", 4531 String content = "内容",
4531 String lTitle = "取消", 4532 String lTitle = "取消",
4532 String rTitle = "确定", 4533 String rTitle = "确定",
4533 - Color rColor = MyColours.color_199095, 4534 + Color rColor = MyColours.color_438E93,
4534 bool isBold = false, 4535 bool isBold = false,
4535 bool isBoldContent = false, 4536 bool isBoldContent = false,
4536 VoidCallback lCallback, 4537 VoidCallback lCallback,
@@ -4543,21 +4544,21 @@ class DialogUtil { @@ -4543,21 +4544,21 @@ class DialogUtil {
4543 ? Text(title, 4544 ? Text(title,
4544 style: TextStyle( 4545 style: TextStyle(
4545 fontWeight: FontWeight.bold, 4546 fontWeight: FontWeight.bold,
4546 - fontSize: ScreenUtil().setSp(30),  
4547 - color: MyColours.color_353535)) 4547 + fontSize: ScreenUtil().setSp(32),
  4548 + color: MyColours.color_E6000000))
4548 : SizedBox(), 4549 : SizedBox(),
4549 content: Text(content, 4550 content: Text(content,
4550 style: TextStyle( 4551 style: TextStyle(
4551 fontWeight: 4552 fontWeight:
4552 isBoldContent ? FontWeight.bold : FontWeight.normal, 4553 isBoldContent ? FontWeight.bold : FontWeight.normal,
4553 - fontSize: ScreenUtil().setSp(30),  
4554 - color: MyColours.color_353535)), 4554 + fontSize: ScreenUtil().setSp(32),
  4555 + color: MyColours.color_99000000)),
4555 actions: [ 4556 actions: [
4556 CupertinoDialogAction( 4557 CupertinoDialogAction(
4557 child: Text(lTitle, 4558 child: Text(lTitle,
4558 style: TextStyle( 4559 style: TextStyle(
4559 - fontSize: ScreenUtil().setSp(34),  
4560 - color: MyColours.color_666666)), 4560 + fontSize: ScreenUtil().setSp(32),
  4561 + color: MyColours.color_E6000000)),
4561 onPressed: () { 4562 onPressed: () {
4562 Navigator.of(context).pop(); 4563 Navigator.of(context).pop();
4563 lCallback(); 4564 lCallback();
@@ -4567,7 +4568,7 @@ class DialogUtil { @@ -4567,7 +4568,7 @@ class DialogUtil {
4567 child: Text(rTitle, 4568 child: Text(rTitle,
4568 style: TextStyle( 4569 style: TextStyle(
4569 fontWeight: isBold ? FontWeight.bold : FontWeight.normal, 4570 fontWeight: isBold ? FontWeight.bold : FontWeight.normal,
4570 - fontSize: ScreenUtil().setSp(34), 4571 + fontSize: ScreenUtil().setSp(32),
4571 color: rColor)), 4572 color: rColor)),
4572 onPressed: () { 4573 onPressed: () {
4573 Navigator.of(context).pop(); 4574 Navigator.of(context).pop();