xt / Flutter-ReserveApp · Commits

Go to a project

Commit be91dd898e92ccd8d116df519c77ef9bd4ddae46

Authored by wdn127929
1 parent 9e428c25
build: skipped

客户通知短信及客情筛选更新 231127 UI OK

Inline Side-by-side
Showing 10 changed files with 964 additions and 477 deletions
@@ -18,19 +18,19 @@ if (flutterRoot == null) { @@ -18,19 +18,19 @@ if (flutterRoot == null) {
18 18
19 19
20 20
21 -def flutterVersionCode = "514" 21 +def flutterVersionCode = "515"
22 if (flutterVersionCode == null) { 22 if (flutterVersionCode == null) {
23 - flutterVersionCode = '514' 23 + flutterVersionCode = '515'
24 24
25 25
26 26
27 } 27 }
28 28
29 29
30 -def flutterVersionName = "5.1.4" 30 +def flutterVersionName = "5.1.5"
31 31
32 if (flutterVersionName == null) { 32 if (flutterVersionName == null) {
33 - flutterVersionName = '5.1.4' 33 + flutterVersionName = '5.1.5'
34 34
35 35
36 } 36 }
@@ -136,6 +136,6 @@ class Table { @@ -136,6 +136,6 @@ class Table {
136 136
137 @override 137 @override
138 String toString() { 138 String toString() {
139 - return 'Table{id: $id,isPhoto:$isPhoto rid: $rid, tid: $tid, name: $name, table_pnum: $table_pnum, most_pnum: $most_pnum, order_o: $order_o, status: $status, tablestatus: $tablestatus, enable: $enable, spell: $spell, rname: $rname, isExitsClass:$isExitsClass,max: $max, low: $low, is_lock: $isLock, is_merge: $isMerge,tids:$tids,lock_tname:$lockTname,reserveCount:$reserveCount,phone:$phone,lock_tid:$lockTid}'; 139 + return 'Table{id: $id,isPhoto:$isPhoto rid: $rid, tid: $tid, name: $name, table_pnum: $table_pnum, most_pnum: $most_pnum, order_o: $order_o, status: $status, tablestatus: $tablestatus, enable: $enable, spell: $spell, rname: $rname, isExitsClass:$isExitsClass,max: $max, low: $low, is_lock: $isLock, is_merge: $isMerge,tids:$tids,lock_tname:$lockTname,reserveCount:$reserveCount,phone:$phone,lock_tid:$lockTid,rname:$rname,}';
140 } 140 }
141 } 141 }
@@ -51,6 +51,7 @@ import 'package:one_key/models/table.dart' as t; @@ -51,6 +51,7 @@ import 'package:one_key/models/table.dart' as t;
51 51
52 import '../../app.dart'; 52 import '../../app.dart';
53 53
  54 +import '../../models/customer_by_seller_model.dart';
54 import '../../models/reserve_deposit_model.dart'; 55 import '../../models/reserve_deposit_model.dart';
55 import '../../provider/collect_store_provider.dart'; 56 import '../../provider/collect_store_provider.dart';
56 import '../../utils/screen_util.dart'; 57 import '../../utils/screen_util.dart';
@@ -3055,7 +3056,76 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -3055,7 +3056,76 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
3055 : Utils.starPhone(detailEntity 3056 : Utils.starPhone(detailEntity
3056 .phone), 3057 .phone),
3057 textColor: MyColours 3058 textColor: MyColours
3058 - .color_515151)) 3059 + .color_515151)),
  3060 + (detailEntity.status ==
  3061 + "4" &&
  3062 + detailEntity
  3063 + .cancel !=
  3064 + null &&
  3065 + (detailEntity
  3066 + .rnameStr ==
  3067 + null ||
  3068 + detailEntity
  3069 + .rnameStr ==
  3070 + ''))
  3071 + ? SizedBox()
  3072 + : Padding(
  3073 + padding:
  3074 + EdgeInsets.only(
  3075 + top: w(10)),
  3076 + child: Align(
  3077 + alignment: Alignment
  3078 + .centerRight,
  3079 + child:
  3080 + RoundButton(
  3081 + text: '客户详情',
  3082 + width: w(72),
  3083 + height: w(22),
  3084 + borderColor:
  3085 + MyColours
  3086 + .color_438E93,
  3087 + textColor: MyColours
  3088 + .color_438E93,
  3089 + gradientStart:
  3090 + MyColours
  3091 + .color_ffffff,
  3092 + gradientEnd:
  3093 + MyColours
  3094 + .color_ffffff,
  3095 + isBold: true,
  3096 + fontSize: 24,
  3097 + onPressed: () {
  3098 + //gid 跳转客户详情页面
  3099 + CustomerBySellerSunModel
  3100 + userHistoryEntity =
  3101 + CustomerBySellerSunModel(
  3102 + null,
  3103 + null,
  3104 + detailEntity
  3105 + .phone,
  3106 + null,
  3107 + null,
  3108 + null,
  3109 + null,
  3110 + null,
  3111 + null,
  3112 + null,
  3113 + null,
  3114 + detailEntity
  3115 + .gid,
  3116 + null,
  3117 + null,
  3118 + null,
  3119 + null);
  3120 +
  3121 + NavigatorUtil.goCustomerDetailPage(
  3122 + context,
  3123 + userHistoryEntity,
  3124 + FromPage
  3125 + .FromPageMessagePage);
  3126 + },
  3127 + ),
  3128 + ))
3059 ], 3129 ],
3060 ), 3130 ),
3061 3131
@@ -28,6 +28,7 @@ import 'package:provider/provider.dart'; @@ -28,6 +28,7 @@ import 'package:provider/provider.dart';
28 28
29 import '../../../../provider/collect_store_provider.dart'; 29 import '../../../../provider/collect_store_provider.dart';
30 import '../../../../utils/dialog_util.dart'; 30 import '../../../../utils/dialog_util.dart';
  31 +import '../../../../utils/screen_util.dart';
31 32
32 typedef ClickCallback = void Function(dynamic value); 33 typedef ClickCallback = void Function(dynamic value);
33 typedef ClickCall = void Function(FilterBtnModel value); 34 typedef ClickCall = void Function(FilterBtnModel value);
@@ -330,7 +331,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -330,7 +331,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
330 color: MyColours.color_ffffff, 331 color: MyColours.color_ffffff,
331 boxShadow: [ 332 boxShadow: [
332 BoxShadow( 333 BoxShadow(
333 - color: MyColours.color_333333, 334 + color: MyColours.color_515151,
334 blurRadius: ScreenUtil().setWidth(14)) 335 blurRadius: ScreenUtil().setWidth(14))
335 ], 336 ],
336 borderRadius: BorderRadius.only( 337 borderRadius: BorderRadius.only(
@@ -359,7 +360,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -359,7 +360,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
359 '全选', 360 '全选',
360 style: TextStyle( 361 style: TextStyle(
361 fontSize: ScreenUtil().setSp(26), 362 fontSize: ScreenUtil().setSp(26),
362 - color: MyColours.color_333333), 363 + color: MyColours.color_515151),
363 ), 364 ),
364 HEmptyView(20), 365 HEmptyView(20),
365 ], 366 ],
@@ -471,7 +472,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -471,7 +472,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
471 // autofocus: true, 472 // autofocus: true,
472 473
473 style: TextStyle( 474 style: TextStyle(
474 - color: MyColours.color_333333, 475 + color: MyColours.color_515151,
475 fontSize: ScreenUtil().setSp(26)), 476 fontSize: ScreenUtil().setSp(26)),
476 // textAlignVertical: TextAlignVertical.center, 477 // textAlignVertical: TextAlignVertical.center,
477 decoration: InputDecoration( 478 decoration: InputDecoration(
@@ -837,7 +838,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -837,7 +838,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
837 // Row( 838 // Row(
838 // mainAxisAlignment: MainAxisAlignment.spaceBetween, 839 // mainAxisAlignment: MainAxisAlignment.spaceBetween,
839 // children: [ 840 // children: [
840 - // _textWidget('客户经理', MyColours.color_333333, FontWeight.bold, 28), 841 + // _textWidget('客户经理', MyColours.color_515151, FontWeight.bold, 28),
841 // GestureDetector( 842 // GestureDetector(
842 // onTap: () {}, 843 // onTap: () {},
843 // child: _textWidget( 844 // child: _textWidget(
@@ -873,7 +874,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -873,7 +874,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
873 Row( 874 Row(
874 mainAxisAlignment: MainAxisAlignment.spaceBetween, 875 mainAxisAlignment: MainAxisAlignment.spaceBetween,
875 children: [ 876 children: [
876 - _textWidget('活跃度', MyColours.color_333333, FontWeight.bold, 28), 877 + _textWidget('活跃度', MyColours.color_515151, FontWeight.bold, 28),
877 GestureDetector( 878 GestureDetector(
878 onTap: () { 879 onTap: () {
879 state(() { 880 state(() {
@@ -901,29 +902,32 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -901,29 +902,32 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
901 ) 902 )
902 ], 903 ],
903 ), 904 ),
904 - VEmptyView(30),  
905 - Wrap(  
906 - spacing: ScreenUtil().setWidth(20),  
907 - runSpacing: ScreenUtil().setWidth(20),  
908 - children: _buildFilterItem(customerProvider.filterHydList, false,  
909 - (FilterBtnModel item) {  
910 - state(() {  
911 - item.select = !item.select; 905 + VEmptyView(20),
  906 + Padding(
  907 + padding: EdgeInsets.only(left: w(10)),
  908 + child: Wrap(
  909 + spacing: ScreenUtil().setWidth(20),
  910 + runSpacing: ScreenUtil().setWidth(20),
  911 + children:
  912 + _buildFilterItem(customerProvider.filterHydList, false,
  913 + (FilterBtnModel item) {
  914 + state(() {
  915 + item.select = !item.select;
912 916
913 - // }  
914 - });  
915 - customerProvider.getCheckhydSelAll();  
916 - // for (FilterBtnModel value in customerProvider.filterHydList) {  
917 - // value.select = false;  
918 - // }  
919 - // for (FilterBtnModel value in customerProvider.filterHydList) {  
920 - // if (item.id == value.id) {  
921 - // state(() {  
922 - // value.select = true;  
923 - // });  
924 - // }  
925 - // }  
926 - })), 917 + // }
  918 + });
  919 + customerProvider.getCheckhydSelAll();
  920 + // for (FilterBtnModel value in customerProvider.filterHydList) {
  921 + // value.select = false;
  922 + // }
  923 + // for (FilterBtnModel value in customerProvider.filterHydList) {
  924 + // if (item.id == value.id) {
  925 + // state(() {
  926 + // value.select = true;
  927 + // });
  928 + // }
  929 + // }
  930 + }))),
927 ], 931 ],
928 ); 932 );
929 } 933 }
@@ -936,7 +940,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -936,7 +940,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
936 Row( 940 Row(
937 mainAxisAlignment: MainAxisAlignment.spaceBetween, 941 mainAxisAlignment: MainAxisAlignment.spaceBetween,
938 children: [ 942 children: [
939 - _textWidget('自定义标签', MyColours.color_333333, FontWeight.bold, 28), 943 + _textWidget('自定义标签', MyColours.color_515151, FontWeight.bold, 28),
940 GestureDetector( 944 GestureDetector(
941 onTap: () { 945 onTap: () {
942 state(() { 946 state(() {
@@ -967,17 +971,20 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -967,17 +971,20 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
967 24))), 971 24))),
968 ], 972 ],
969 ), 973 ),
970 - VEmptyView(30),  
971 - Wrap(  
972 - spacing: ScreenUtil().setWidth(20),  
973 - runSpacing: ScreenUtil().setWidth(20),  
974 - children: _buildFilterItem(customerProvider.filterLabelList, true,  
975 - (FilterBtnModel item) {  
976 - state(() {  
977 - item.select = !item.select;  
978 - });  
979 - customerProvider.getChecklabelSelAll();  
980 - })), 974 + VEmptyView(20),
  975 + Padding(
  976 + padding: EdgeInsets.only(left: w(10)),
  977 + child: Wrap(
  978 + spacing: ScreenUtil().setWidth(20),
  979 + runSpacing: ScreenUtil().setWidth(20),
  980 + children:
  981 + _buildFilterItem(customerProvider.filterLabelList, false,
  982 + (FilterBtnModel item) {
  983 + state(() {
  984 + item.select = !item.select;
  985 + });
  986 + customerProvider.getChecklabelSelAll();
  987 + }))),
981 ], 988 ],
982 ); 989 );
983 } 990 }
@@ -1035,6 +1042,85 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1035,6 +1042,85 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1035 })); 1042 }));
1036 } 1043 }
1037 1044
  1045 + //消费UI
  1046 + Widget _consume(state) {
  1047 + return Column(
  1048 + crossAxisAlignment: CrossAxisAlignment.start,
  1049 + children: [
  1050 + Row(
  1051 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  1052 + children: [
  1053 + _textWidget('人均消费金额', MyColours.color_515151, FontWeight.bold, 28),
  1054 + // GestureDetector(
  1055 + // onTap: () {
  1056 + // customerProvider.controllersmoney.text = '';
  1057 + // customerProvider.controlleremoney.text = '';
  1058 + // },
  1059 + // child: Container(
  1060 + // color: Colors.white,
  1061 + // height: ScreenUtil().setWidth(40),
  1062 + // alignment: Alignment.center,
  1063 + // padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
  1064 + // child: _textWidget(
  1065 + // '清空', MyColours.color_199095, FontWeight.normal, 24),
  1066 + // ))
  1067 + ],
  1068 + ),
  1069 + VEmptyView(20),
  1070 + Padding(
  1071 + padding: EdgeInsets.only(left: w(10)),
  1072 + child: Row(
  1073 + children: [
  1074 + Expanded(
  1075 + child: _textFeildWidget(customerProvider.controllersmoney,
  1076 + customerProvider.smoneyFocus, state, (value) {
  1077 + //输入框
  1078 + }, unit: '元')),
  1079 + HEmptyView(10),
  1080 + _textWidget('至', MyColours.color_199095, FontWeight.normal, 24),
  1081 + HEmptyView(10),
  1082 + Expanded(
  1083 + child: _textFeildWidget(customerProvider.controlleremoney,
  1084 + customerProvider.emoneyFocus, state, (value) {},
  1085 + unit: '元')),
  1086 + ],
  1087 + )),
  1088 + VEmptyView(40),
  1089 + Row(
  1090 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  1091 + children: [
  1092 + _textWidget('人均消费能力', MyColours.color_515151, FontWeight.bold, 28),
  1093 + // GestureDetector(
  1094 + // onTap: () {
  1095 + // customerProvider.controllersmoney.text = '';
  1096 + // customerProvider.controlleremoney.text = '';
  1097 + // },
  1098 + // child: Container(
  1099 + // color: Colors.white,
  1100 + // height: ScreenUtil().setWidth(40),
  1101 + // alignment: Alignment.center,
  1102 + // padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
  1103 + // child: _textWidget(
  1104 + // '清空', MyColours.color_199095, FontWeight.normal, 24),
  1105 + // ))
  1106 + ],
  1107 + ),
  1108 + VEmptyView(20),
  1109 + Row(
  1110 + children: [
  1111 + HEmptyView(20),
  1112 + _textWidget('最高的', MyColours.color_199095, FontWeight.normal, 24),
  1113 + HEmptyView(10),
  1114 + Expanded(
  1115 + child: _textFeildWidget(customerProvider.controllermaxmoney,
  1116 + customerProvider.maxmoneyFocus, state, (value) {},
  1117 + unit: '%')),
  1118 + ],
  1119 + ),
  1120 + ],
  1121 + );
  1122 + }
  1123 +
1038 ///高级筛选 1124 ///高级筛选
1039 Widget _advancedFilterWidget(StateSetter state) { 1125 Widget _advancedFilterWidget(StateSetter state) {
1040 return Column( 1126 return Column(
@@ -1043,7 +1129,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1043,7 +1129,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1043 Row( 1129 Row(
1044 mainAxisAlignment: MainAxisAlignment.spaceBetween, 1130 mainAxisAlignment: MainAxisAlignment.spaceBetween,
1045 children: [ 1131 children: [
1046 - _textWidget('高级筛选', MyColours.color_333333, FontWeight.bold, 28), 1132 + _textWidget('自定义时间', MyColours.color_515151, FontWeight.bold, 28),
1047 GestureDetector( 1133 GestureDetector(
1048 onTap: () { 1134 onTap: () {
1049 customerProvider.controllerstime.text = ''; 1135 customerProvider.controllerstime.text = '';
@@ -1063,54 +1149,85 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1063,54 +1149,85 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1063 )) 1149 ))
1064 ], 1150 ],
1065 ), 1151 ),
1066 - VEmptyView(30),  
1067 - Row(  
1068 - children: [  
1069 - Expanded(  
1070 - child: _textFeildWidget(customerProvider.controllerstime,  
1071 - customerProvider.stimeFocus, state)),  
1072 - HEmptyView(10),  
1073 - _textWidget('至', MyColours.color_199095, FontWeight.normal, 24),  
1074 - HEmptyView(10),  
1075 - Expanded(  
1076 - child: _textFeildWidget(customerProvider.controlleretime,  
1077 - customerProvider.etimeFocus, state)),  
1078 - ],  
1079 - ),  
1080 - VEmptyView(30),  
1081 - Wrap(  
1082 - spacing: ScreenUtil().setWidth(20),  
1083 - runSpacing: ScreenUtil().setWidth(20),  
1084 - children: _buildFilterItem(  
1085 - customerProvider.filterDayList,  
1086 - true,  
1087 - (FilterBtnModel item) {  
1088 - // if (customerProvider.stimeFocus.hasFocus) {  
1089 - // customerProvider.controllerstime.text = item.id;  
1090 - // }  
1091 - // if (customerProvider.etimeFocus.hasFocus) {  
1092 - // customerProvider.controlleretime.text = item.id;  
1093 - // }  
1094 - customerProvider.controllerstime.text = '';  
1095 - customerProvider.controlleretime.text = '';  
1096 - for (FilterBtnModel value in customerProvider.filterDayList) {  
1097 - value.select = false;  
1098 - }  
1099 - for (FilterBtnModel value in customerProvider.filterDayList) {  
1100 - if (item.id == value.id) {  
1101 - state(() {  
1102 - value.select = true;  
1103 - }); 1152 + VEmptyView(20),
  1153 + Padding(
  1154 + padding: EdgeInsets.only(left: w(10)),
  1155 + child: Row(
  1156 + children: [
  1157 + Expanded(
  1158 + child: _textFeildWidget(customerProvider.controllerstime,
  1159 + customerProvider.stimeFocus, state, (value) {
  1160 + for (FilterBtnModel value in customerProvider.filterDayList) {
  1161 + value.select = false;
1104 } 1162 }
1105 - }  
1106 - // state(() {  
1107 - // item.select = !item.select;  
1108 - // });  
1109 - }, 1163 + customerProvider.controllernum.text = '';
  1164 + state(() {});
  1165 +
  1166 + // setState(() {});
  1167 + // _searchSellerLocation();
  1168 + // customerProvider.searchData(value);
  1169 + })),
  1170 + HEmptyView(10),
  1171 + _textWidget('至', MyColours.color_199095, FontWeight.normal, 24),
  1172 + HEmptyView(10),
  1173 + Expanded(
  1174 + child: _textFeildWidget(customerProvider.controlleretime,
  1175 + customerProvider.etimeFocus, state, (value) {
  1176 + for (FilterBtnModel value in customerProvider.filterDayList) {
  1177 + value.select = false;
  1178 + }
  1179 + customerProvider.controllernum.text = '';
  1180 + state(() {});
  1181 +
  1182 + // setState(() {});
  1183 + // _searchSellerLocation();
  1184 + // customerProvider.searchData(value);
  1185 + })),
  1186 + ],
1110 )), 1187 )),
1111 - VEmptyView(30),  
1112 - _textWidget('时间内预订次数', MyColours.color_333333, FontWeight.normal, 24),  
1113 - VEmptyView(30), 1188 + VEmptyView(20),
  1189 + Padding(
  1190 + padding: EdgeInsets.only(left: w(10)),
  1191 + child: Row(children: [
  1192 + _textWidget('或', MyColours.color_000000, FontWeight.normal, 24),
  1193 + HEmptyView(20),
  1194 + Wrap(
  1195 + spacing: ScreenUtil().setWidth(20),
  1196 + runSpacing: ScreenUtil().setWidth(20),
  1197 + children: _buildFilterItem(
  1198 + customerProvider.filterDayList,
  1199 + false,
  1200 + (FilterBtnModel item) {
  1201 + // if (customerProvider.stimeFocus.hasFocus) {
  1202 + // customerProvider.controllerstime.text = item.id;
  1203 + // }
  1204 + // if (customerProvider.etimeFocus.hasFocus) {
  1205 + // customerProvider.controlleretime.text = item.id;
  1206 + // }
  1207 + customerProvider.controllerstime.text = '';
  1208 + customerProvider.controlleretime.text = '';
  1209 + for (FilterBtnModel value
  1210 + in customerProvider.filterDayList) {
  1211 + value.select = false;
  1212 + }
  1213 + for (FilterBtnModel value
  1214 + in customerProvider.filterDayList) {
  1215 + if (item.id == value.id) {
  1216 + state(() {
  1217 + value.select = true;
  1218 + });
  1219 + }
  1220 + }
  1221 + // state(() {
  1222 + // item.select = !item.select;
  1223 + // });
  1224 + },
  1225 + ))
  1226 + ])),
  1227 + VEmptyView(40),
  1228 + // _textWidget('时间内预订次数', MyColours.color_515151, FontWeight.normal, 24),
  1229 + _textWidget('预订次数', MyColours.color_515151, FontWeight.bold, 28),
  1230 + VEmptyView(20),
1114 /** 1231 /**
1115 Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ 1232 Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
1116 Material( 1233 Material(
@@ -1148,6 +1265,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1148,6 +1265,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1148 */ 1265 */
1149 Row(children: [ 1266 Row(children: [
1150 Material( 1267 Material(
  1268 + color: Colors.white,
1151 child: Container( 1269 child: Container(
1152 height: ScreenUtil().setWidth(50), 1270 height: ScreenUtil().setWidth(50),
1153 // width: ScreenUtil().setWidth(100), 1271 // width: ScreenUtil().setWidth(100),
@@ -1155,14 +1273,14 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1155,14 +1273,14 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1155 horizontal: ScreenUtil().setWidth(20)), 1273 horizontal: ScreenUtil().setWidth(20)),
1156 decoration: BoxDecoration( 1274 decoration: BoxDecoration(
1157 borderRadius: 1275 borderRadius:
1158 - BorderRadius.circular(ScreenUtil().setWidth(30)),  
1159 - color: Color.fromRGBO(239, 239, 239, 1)), 1276 + BorderRadius.circular(ScreenUtil().setWidth(10)),
  1277 + color: MyColours.color_DBDBDB),
1160 child: DropdownButton( 1278 child: DropdownButton(
1161 underline: SizedBox(), 1279 underline: SizedBox(),
1162 value: dropValue, 1280 value: dropValue,
1163 isDense: true, 1281 isDense: true,
1164 style: TextStyle( 1282 style: TextStyle(
1165 - color: MyColours.color_333333, 1283 + color: MyColours.color_515151,
1166 fontSize: ScreenUtil().setSp(28)), 1284 fontSize: ScreenUtil().setSp(28)),
1167 focusColor: MyColours.color_199095, 1285 focusColor: MyColours.color_199095,
1168 items: _dropdownMenuItem(), 1286 items: _dropdownMenuItem(),
@@ -1170,7 +1288,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1170,7 +1288,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1170 children: [ 1288 children: [
1171 HEmptyView(10), 1289 HEmptyView(10),
1172 Image.asset( 1290 Image.asset(
1173 - Utils.getImgPath('c_arrow_down'), 1291 + Utils.getImgPath('c_arrow_d'),
1174 width: ScreenUtil().setWidth(24), 1292 width: ScreenUtil().setWidth(24),
1175 // height: ScreenUtil().setWidth(10), 1293 // height: ScreenUtil().setWidth(10),
1176 ) 1294 )
@@ -1205,7 +1323,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1205,7 +1323,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1205 // autofocus: true, 1323 // autofocus: true,
1206 1324
1207 style: TextStyle( 1325 style: TextStyle(
1208 - color: MyColours.color_333333, 1326 + color: MyColours.color_515151,
1209 fontSize: ScreenUtil().setSp(26)), 1327 fontSize: ScreenUtil().setSp(26)),
1210 // textAlignVertical: TextAlignVertical.center, 1328 // textAlignVertical: TextAlignVertical.center,
1211 decoration: InputDecoration( 1329 decoration: InputDecoration(
@@ -1241,7 +1359,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1241,7 +1359,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1241 ), 1359 ),
1242 )), 1360 )),
1243 HEmptyView(20), 1361 HEmptyView(20),
1244 - _textWidget('次预订', MyColours.color_333333, FontWeight.normal, 24), 1362 + _textWidget('次预订', MyColours.color_515151, FontWeight.normal, 24),
1245 ]), 1363 ]),
1246 VEmptyView(50), 1364 VEmptyView(50),
1247 ], 1365 ],
@@ -1285,7 +1403,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1285,7 +1403,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1285 1403
1286 /// 高级筛选输入框 1404 /// 高级筛选输入框
1287 Widget _textFeildWidget(TextEditingController controller, FocusNode focusNode, 1405 Widget _textFeildWidget(TextEditingController controller, FocusNode focusNode,
1288 - StateSetter state) { 1406 + StateSetter state, ValueChanged<String> onChanged,
  1407 + {String unit = '天'}) {
1289 return Container( 1408 return Container(
1290 padding: EdgeInsets.symmetric( 1409 padding: EdgeInsets.symmetric(
1291 horizontal: ScreenUtil().setWidth(20), 1410 horizontal: ScreenUtil().setWidth(20),
@@ -1294,7 +1413,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1294,7 +1413,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1294 // alignment: Alignment.center, 1413 // alignment: Alignment.center,
1295 decoration: BoxDecoration( 1414 decoration: BoxDecoration(
1296 color: Color.fromRGBO(239, 239, 239, 1), 1415 color: Color.fromRGBO(239, 239, 239, 1),
1297 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))), 1416 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
1298 child: Material( 1417 child: Material(
1299 color: Color.fromRGBO(239, 239, 239, 1), 1418 color: Color.fromRGBO(239, 239, 239, 1),
1300 child: Row(children: [ 1419 child: Row(children: [
@@ -1306,7 +1425,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1306,7 +1425,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1306 // autofocus: true, 1425 // autofocus: true,
1307 1426
1308 style: TextStyle( 1427 style: TextStyle(
1309 - color: MyColours.color_333333, 1428 + color: MyColours.color_515151,
1310 fontSize: ScreenUtil().setSp(26)), 1429 fontSize: ScreenUtil().setSp(26)),
1311 // textAlignVertical: TextAlignVertical.center, 1430 // textAlignVertical: TextAlignVertical.center,
1312 decoration: InputDecoration( 1431 decoration: InputDecoration(
@@ -1323,18 +1442,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1323,18 +1442,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1323 keyboardType: TextInputType.numberWithOptions(decimal: true), 1442 keyboardType: TextInputType.numberWithOptions(decimal: true),
1324 textInputAction: TextInputAction.done, 1443 textInputAction: TextInputAction.done,
1325 1444
1326 - onChanged: (value) {  
1327 - for (FilterBtnModel value  
1328 - in customerProvider.filterDayList) {  
1329 - value.select = false;  
1330 - }  
1331 - customerProvider.controllernum.text = '';  
1332 - state(() {});  
1333 -  
1334 - // setState(() {});  
1335 - // _searchSellerLocation();  
1336 - // customerProvider.searchData(value);  
1337 - }, 1445 + onChanged: onChanged,
1338 onEditingComplete: () { 1446 onEditingComplete: () {
1339 FocusScope.of(context) 1447 FocusScope.of(context)
1340 .requestFocus(FocusNode()); //点击空白处隐藏键盘 1448 .requestFocus(FocusNode()); //点击空白处隐藏键盘
@@ -1345,7 +1453,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1345,7 +1453,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1345 }, 1453 },
1346 ), 1454 ),
1347 ), 1455 ),
1348 - _textWidget('天', MyColours.color_333333, FontWeight.normal, 24), 1456 + _textWidget(unit, MyColours.color_515151, FontWeight.normal, 24),
1349 ]))); 1457 ])));
1350 } 1458 }
1351 1459
@@ -1383,34 +1491,39 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1383,34 +1491,39 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1383 child: Column( 1491 child: Column(
1384 children: [ 1492 children: [
1385 Expanded( 1493 Expanded(
1386 - // child: Scrollbar(  
1387 - // isAlwaysShown: true, //设置滚动条常亮  
1388 - // controller: _scrollCrl, //必须设置一个controller  
1389 -  
1390 - // ///添加进度条  
1391 - child: SingleChildScrollView(  
1392 - controller: _scrollCrl,  
1393 - // primary: true,  
1394 - // reverse: true,  
1395 - // physics: BouncingScrollPhysics(),  
1396 - // padding: EdgeInsets.only(  
1397 - // bottom:  
1398 - // MediaQuery.of(context).viewInsets.bottom),  
1399 - child: Column(  
1400 - crossAxisAlignment: CrossAxisAlignment.start,  
1401 - children: [  
1402 - VEmptyView(20),  
1403 - // _managerWidget(),  
1404 - // VEmptyView(30),  
1405 - _activityWidget(state),  
1406 - VEmptyView(30),  
1407 - _labelWidget(state),  
1408 - VEmptyView(30),  
1409 - _advancedFilterWidget(state)  
1410 - ],  
1411 - ),  
1412 - )),  
1413 - // ), 1494 + child: Scrollbar(
  1495 + isAlwaysShown: true, //设置滚动条常亮
  1496 + controller: _scrollCrl, //必须设置一个controller
  1497 +
  1498 + // ///添加进度条
  1499 + child: SingleChildScrollView(
  1500 + controller: _scrollCrl,
  1501 + // primary: true,
  1502 + // reverse: true,
  1503 + // physics: BouncingScrollPhysics(),
  1504 + // padding: EdgeInsets.only(
  1505 + // bottom:
  1506 + // MediaQuery.of(context).viewInsets.bottom),
  1507 + child: Column(
  1508 + crossAxisAlignment: CrossAxisAlignment.start,
  1509 + children: [
  1510 + VEmptyView(20),
  1511 + // _managerWidget(),
  1512 + // VEmptyView(30),
  1513 + _activityWidget(state),
  1514 + VEmptyView(40),
  1515 + _labelWidget(state),
  1516 + VEmptyView(40),
  1517 +
  1518 + // 消费
  1519 +
  1520 + _consume(state),
  1521 + VEmptyView(40),
  1522 + _advancedFilterWidget(state)
  1523 + ],
  1524 + ),
  1525 + )),
  1526 + ),
1414 Row( 1527 Row(
1415 children: [ 1528 children: [
1416 Container( 1529 Container(
@@ -1453,7 +1566,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1453,7 +1566,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1453 alignment: Alignment.center, 1566 alignment: Alignment.center,
1454 child: _textWidget( 1567 child: _textWidget(
1455 '重置', 1568 '重置',
1456 - MyColours.color_333333, 1569 + MyColours.color_515151,
1457 FontWeight.normal, 1570 FontWeight.normal,
1458 30), 1571 30),
1459 ), 1572 ),
@@ -1529,11 +1642,11 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1529,11 +1642,11 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1529 child: _textWidget( 1642 child: _textWidget(
1530 item.title, 1643 item.title,
1531 grayBack 1644 grayBack
1532 - ? MyColours.color_333333 1645 + ? MyColours.color_515151
1533 : item.select 1646 : item.select
1534 ? MyColours.color_ffffff 1647 ? MyColours.color_ffffff
1535 : round 1648 : round
1536 - ? MyColours.color_333333 1649 + ? MyColours.color_515151
1537 : MyColours.color_199095, 1650 : MyColours.color_199095,
1538 FontWeight.normal, 1651 FontWeight.normal,
1539 24)))); 1652 24))));
@@ -1561,7 +1674,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -1561,7 +1674,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
1561 ); 1674 );
1562 } else { 1675 } else {
1563 return MyContactListPage( 1676 return MyContactListPage(
1564 - uid:widget.uid, 1677 + uid: widget.uid,
1565 contacts: model.userHistorys, 1678 contacts: model.userHistorys,
1566 provider: customerProvider, 1679 provider: customerProvider,
1567 fromPage: widget.fromPage, 1680 fromPage: widget.fromPage,
@@ -30,6 +30,7 @@ import 'package:provider/provider.dart'; @@ -30,6 +30,7 @@ import 'package:provider/provider.dart';
30 30
31 import '../../../../provider/collect_store_provider.dart'; 31 import '../../../../provider/collect_store_provider.dart';
32 import '../../../../utils/dialog_util.dart'; 32 import '../../../../utils/dialog_util.dart';
  33 +import '../../../../utils/screen_util.dart';
33 34
34 typedef ClickCallback = void Function(dynamic value); 35 typedef ClickCallback = void Function(dynamic value);
35 typedef ClickCall = void Function(FilterBtnModel value); 36 typedef ClickCall = void Function(FilterBtnModel value);
@@ -435,7 +436,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -435,7 +436,7 @@ class _CustomerListPageState extends State<CustomerListPage>
435 color: MyColours.color_ffffff, 436 color: MyColours.color_ffffff,
436 boxShadow: [ 437 boxShadow: [
437 BoxShadow( 438 BoxShadow(
438 - color: MyColours.color_333333, 439 + color: MyColours.color_515151,
439 blurRadius: ScreenUtil().setWidth(14)) 440 blurRadius: ScreenUtil().setWidth(14))
440 ], 441 ],
441 borderRadius: BorderRadius.only( 442 borderRadius: BorderRadius.only(
@@ -464,7 +465,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -464,7 +465,7 @@ class _CustomerListPageState extends State<CustomerListPage>
464 '全选', 465 '全选',
465 style: TextStyle( 466 style: TextStyle(
466 fontSize: ScreenUtil().setSp(26), 467 fontSize: ScreenUtil().setSp(26),
467 - color: MyColours.color_333333), 468 + color: MyColours.color_515151),
468 ), 469 ),
469 HEmptyView(20), 470 HEmptyView(20),
470 ], 471 ],
@@ -578,7 +579,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -578,7 +579,7 @@ class _CustomerListPageState extends State<CustomerListPage>
578 // autofocus: true, 579 // autofocus: true,
579 580
580 style: TextStyle( 581 style: TextStyle(
581 - color: MyColours.color_333333, 582 + color: MyColours.color_515151,
582 fontSize: ScreenUtil().setSp(26)), 583 fontSize: ScreenUtil().setSp(26)),
583 // textAlignVertical: TextAlignVertical.center, 584 // textAlignVertical: TextAlignVertical.center,
584 decoration: InputDecoration( 585 decoration: InputDecoration(
@@ -967,7 +968,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -967,7 +968,7 @@ class _CustomerListPageState extends State<CustomerListPage>
967 Row( 968 Row(
968 mainAxisAlignment: MainAxisAlignment.spaceBetween, 969 mainAxisAlignment: MainAxisAlignment.spaceBetween,
969 children: [ 970 children: [
970 - _textWidget('客户经理', MyColours.color_333333, FontWeight.bold, 28), 971 + _textWidget('客户经理', MyColours.color_515151, FontWeight.bold, 28),
971 GestureDetector( 972 GestureDetector(
972 onTap: () { 973 onTap: () {
973 state(() { 974 state(() {
@@ -1001,18 +1002,21 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1001,18 +1002,21 @@ class _CustomerListPageState extends State<CustomerListPage>
1001 ) 1002 )
1002 ], 1003 ],
1003 ), 1004 ),
1004 - VEmptyView(30),  
1005 - Wrap(  
1006 - spacing: ScreenUtil().setWidth(20),  
1007 - runSpacing: ScreenUtil().setWidth(20),  
1008 - children: _buildFilterItem(customerProvider.filterManageList, false,  
1009 - (FilterBtnModel item) {  
1010 - state(() {  
1011 - item.select = !item.select;  
1012 - });  
1013 - _getUid();  
1014 - customerProvider.getCheckmanageSelAll();  
1015 - })), 1005 + VEmptyView(20),
  1006 + Padding(
  1007 + padding: EdgeInsets.only(left: w(10)),
  1008 + child: Wrap(
  1009 + spacing: ScreenUtil().setWidth(20),
  1010 + runSpacing: ScreenUtil().setWidth(20),
  1011 + children:
  1012 + _buildFilterItem(customerProvider.filterManageList, false,
  1013 + (FilterBtnModel item) {
  1014 + state(() {
  1015 + item.select = !item.select;
  1016 + });
  1017 + _getUid();
  1018 + customerProvider.getCheckmanageSelAll();
  1019 + }))),
1016 ], 1020 ],
1017 ); 1021 );
1018 } 1022 }
@@ -1025,7 +1029,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1025,7 +1029,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1025 Row( 1029 Row(
1026 mainAxisAlignment: MainAxisAlignment.spaceBetween, 1030 mainAxisAlignment: MainAxisAlignment.spaceBetween,
1027 children: [ 1031 children: [
1028 - _textWidget('活跃度', MyColours.color_333333, FontWeight.bold, 28), 1032 + _textWidget('活跃度', MyColours.color_515151, FontWeight.bold, 28),
1029 GestureDetector( 1033 GestureDetector(
1030 onTap: () { 1034 onTap: () {
1031 state(() { 1035 state(() {
@@ -1053,32 +1057,35 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1053,32 +1057,35 @@ class _CustomerListPageState extends State<CustomerListPage>
1053 ) 1057 )
1054 ], 1058 ],
1055 ), 1059 ),
1056 - VEmptyView(30),  
1057 - Wrap(  
1058 - spacing: ScreenUtil().setWidth(20),  
1059 - runSpacing: ScreenUtil().setWidth(20),  
1060 - children: _buildFilterItem(customerProvider.filterHydList, false,  
1061 - (FilterBtnModel item) {  
1062 - state(() {  
1063 - item.select = !item.select; 1060 + VEmptyView(20),
  1061 + Padding(
  1062 + padding: EdgeInsets.only(left: w(10)),
  1063 + child: Wrap(
  1064 + spacing: ScreenUtil().setWidth(20),
  1065 + runSpacing: ScreenUtil().setWidth(20),
  1066 + children:
  1067 + _buildFilterItem(customerProvider.filterHydList, false,
  1068 + (FilterBtnModel item) {
  1069 + state(() {
  1070 + item.select = !item.select;
1064 1071
1065 - // }  
1066 - });  
1067 - customerProvider.getCheckhydSelAll();  
1068 - // state(() {  
1069 - // item.select = !item.select;  
1070 - // });  
1071 - // for (FilterBtnModel value in customerProvider.filterHydList) {  
1072 - // value.select = false;  
1073 - // }  
1074 - // for (FilterBtnModel value in customerProvider.filterHydList) {  
1075 - // if (item.id == value.id) {  
1076 - // state(() {  
1077 - // value.select = true;  
1078 - // });  
1079 - // }  
1080 - // }  
1081 - })), 1072 + // }
  1073 + });
  1074 + customerProvider.getCheckhydSelAll();
  1075 + // state(() {
  1076 + // item.select = !item.select;
  1077 + // });
  1078 + // for (FilterBtnModel value in customerProvider.filterHydList) {
  1079 + // value.select = false;
  1080 + // }
  1081 + // for (FilterBtnModel value in customerProvider.filterHydList) {
  1082 + // if (item.id == value.id) {
  1083 + // state(() {
  1084 + // value.select = true;
  1085 + // });
  1086 + // }
  1087 + // }
  1088 + }))),
1082 ], 1089 ],
1083 ); 1090 );
1084 } 1091 }
@@ -1091,7 +1098,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1091,7 +1098,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1091 Row( 1098 Row(
1092 mainAxisAlignment: MainAxisAlignment.spaceBetween, 1099 mainAxisAlignment: MainAxisAlignment.spaceBetween,
1093 children: [ 1100 children: [
1094 - _textWidget('自定义标签', MyColours.color_333333, FontWeight.bold, 28), 1101 + _textWidget('自定义标签', MyColours.color_515151, FontWeight.bold, 28),
1095 GestureDetector( 1102 GestureDetector(
1096 onTap: () { 1103 onTap: () {
1097 state(() { 1104 state(() {
@@ -1122,17 +1129,99 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1122,17 +1129,99 @@ class _CustomerListPageState extends State<CustomerListPage>
1122 24))), 1129 24))),
1123 ], 1130 ],
1124 ), 1131 ),
1125 - VEmptyView(30),  
1126 - Wrap(  
1127 - spacing: ScreenUtil().setWidth(20),  
1128 - runSpacing: ScreenUtil().setWidth(20),  
1129 - children: _buildFilterItem(customerProvider.filterLabelList, true,  
1130 - (FilterBtnModel item) {  
1131 - state(() {  
1132 - item.select = !item.select;  
1133 - });  
1134 - customerProvider.getChecklabelSelAll();  
1135 - })), 1132 + VEmptyView(20),
  1133 + Padding(
  1134 + padding: EdgeInsets.only(left: w(10)),
  1135 + child: Wrap(
  1136 + spacing: ScreenUtil().setWidth(20),
  1137 + runSpacing: ScreenUtil().setWidth(20),
  1138 + children:
  1139 + _buildFilterItem(customerProvider.filterLabelList, false,
  1140 + (FilterBtnModel item) {
  1141 + state(() {
  1142 + item.select = !item.select;
  1143 + });
  1144 + customerProvider.getChecklabelSelAll();
  1145 + }))),
  1146 + ],
  1147 + );
  1148 + }
  1149 +
  1150 + //消费UI
  1151 + Widget _consume(state) {
  1152 + return Column(
  1153 + crossAxisAlignment: CrossAxisAlignment.start,
  1154 + children: [
  1155 + Row(
  1156 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  1157 + children: [
  1158 + _textWidget('人均消费金额', MyColours.color_515151, FontWeight.bold, 28),
  1159 + // GestureDetector(
  1160 + // onTap: () {
  1161 + // customerProvider.controllersmoney.text = '';
  1162 + // customerProvider.controlleremoney.text = '';
  1163 + // },
  1164 + // child: Container(
  1165 + // color: Colors.white,
  1166 + // height: ScreenUtil().setWidth(40),
  1167 + // alignment: Alignment.center,
  1168 + // padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
  1169 + // child: _textWidget(
  1170 + // '清空', MyColours.color_199095, FontWeight.normal, 24),
  1171 + // ))
  1172 + ],
  1173 + ),
  1174 + VEmptyView(20),
  1175 + Padding(
  1176 + padding: EdgeInsets.only(left: w(10)),
  1177 + child: Row(
  1178 + children: [
  1179 + Expanded(
  1180 + child: _textFeildWidget(customerProvider.controllersmoney,
  1181 + customerProvider.smoneyFocus, state, (value) {
  1182 + //输入框
  1183 + }, unit: '元')),
  1184 + HEmptyView(10),
  1185 + _textWidget('至', MyColours.color_199095, FontWeight.normal, 24),
  1186 + HEmptyView(10),
  1187 + Expanded(
  1188 + child: _textFeildWidget(customerProvider.controlleremoney,
  1189 + customerProvider.emoneyFocus, state, (value) {},
  1190 + unit: '元')),
  1191 + ],
  1192 + )),
  1193 + VEmptyView(40),
  1194 + Row(
  1195 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  1196 + children: [
  1197 + _textWidget('人均消费能力', MyColours.color_515151, FontWeight.bold, 28),
  1198 + // GestureDetector(
  1199 + // onTap: () {
  1200 + // customerProvider.controllersmoney.text = '';
  1201 + // customerProvider.controlleremoney.text = '';
  1202 + // },
  1203 + // child: Container(
  1204 + // color: Colors.white,
  1205 + // height: ScreenUtil().setWidth(40),
  1206 + // alignment: Alignment.center,
  1207 + // padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
  1208 + // child: _textWidget(
  1209 + // '清空', MyColours.color_199095, FontWeight.normal, 24),
  1210 + // ))
  1211 + ],
  1212 + ),
  1213 + VEmptyView(20),
  1214 + Row(
  1215 + children: [
  1216 + HEmptyView(20),
  1217 + _textWidget('最高的', MyColours.color_199095, FontWeight.normal, 24),
  1218 + HEmptyView(10),
  1219 + Expanded(
  1220 + child: _textFeildWidget(customerProvider.controllermaxmoney,
  1221 + customerProvider.maxmoneyFocus, state, (value) {},
  1222 + unit: '%')),
  1223 + ],
  1224 + ),
1136 ], 1225 ],
1137 ); 1226 );
1138 } 1227 }
@@ -1198,7 +1287,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1198,7 +1287,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1198 Row( 1287 Row(
1199 mainAxisAlignment: MainAxisAlignment.spaceBetween, 1288 mainAxisAlignment: MainAxisAlignment.spaceBetween,
1200 children: [ 1289 children: [
1201 - _textWidget('高级筛选', MyColours.color_333333, FontWeight.bold, 28), 1290 + _textWidget('自定义时间', MyColours.color_515151, FontWeight.bold, 28),
1202 GestureDetector( 1291 GestureDetector(
1203 onTap: () { 1292 onTap: () {
1204 customerProvider.controllerstime.text = ''; 1293 customerProvider.controllerstime.text = '';
@@ -1218,51 +1307,80 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1218,51 +1307,80 @@ class _CustomerListPageState extends State<CustomerListPage>
1218 )) 1307 ))
1219 ], 1308 ],
1220 ), 1309 ),
  1310 + VEmptyView(20),
  1311 + Padding(
  1312 + padding: EdgeInsets.only(left: w(10)),
  1313 + child: Row(
  1314 + children: [
  1315 + Expanded(
  1316 + child: _textFeildWidget(customerProvider.controllerstime,
  1317 + customerProvider.stimeFocus, state, (value) {
  1318 + for (FilterBtnModel value in customerProvider.filterDayList) {
  1319 + value.select = false;
  1320 + }
  1321 + customerProvider.controllernum.text = '';
  1322 + state(() {});
  1323 + // setState(() {});
  1324 + // _searchSellerLocation();
  1325 + // customerProvider.searchData(value);
  1326 + })),
  1327 + HEmptyView(10),
  1328 + _textWidget('至', MyColours.color_199095, FontWeight.normal, 24),
  1329 + HEmptyView(10),
  1330 + Expanded(
  1331 + child: _textFeildWidget(customerProvider.controlleretime,
  1332 + customerProvider.etimeFocus, state, (value) {
  1333 + for (FilterBtnModel value in customerProvider.filterDayList) {
  1334 + value.select = false;
  1335 + }
  1336 + customerProvider.controllernum.text = '';
  1337 + state(() {});
  1338 + // setState(() {});
  1339 + // _searchSellerLocation();
  1340 + // customerProvider.searchData(value);
  1341 + })),
  1342 + ],
  1343 + )),
1221 VEmptyView(30), 1344 VEmptyView(30),
1222 - Row(  
1223 - children: [  
1224 - Expanded(  
1225 - child: _textFeildWidget(customerProvider.controllerstime,  
1226 - customerProvider.stimeFocus, state)),  
1227 - HEmptyView(10),  
1228 - _textWidget('至', MyColours.color_199095, FontWeight.normal, 24),  
1229 - HEmptyView(10),  
1230 - Expanded(  
1231 - child: _textFeildWidget(customerProvider.controlleretime,  
1232 - customerProvider.etimeFocus, state)),  
1233 - ],  
1234 - ),  
1235 - VEmptyView(30),  
1236 - Wrap(  
1237 - spacing: ScreenUtil().setWidth(20),  
1238 - runSpacing: ScreenUtil().setWidth(20),  
1239 - children: _buildFilterItem(customerProvider.filterDayList, true,  
1240 - (FilterBtnModel item) {  
1241 - customerProvider.controllerstime.text = '';  
1242 - customerProvider.controlleretime.text = '';  
1243 - for (FilterBtnModel value in customerProvider.filterDayList) {  
1244 - value.select = false;  
1245 - }  
1246 - for (FilterBtnModel value in customerProvider.filterDayList) {  
1247 - if (item.id == value.id) {  
1248 - state(() {  
1249 - value.select = true;  
1250 - });  
1251 - }  
1252 - }  
1253 - // if (customerProvider.stimeFocus.hasFocus) {  
1254 - // customerProvider.controllerstime.text = item.id;  
1255 - // }  
1256 - // if (customerProvider.etimeFocus.hasFocus) {  
1257 - // customerProvider.controlleretime.text = item.id;  
1258 - // }  
1259 - // state(() {  
1260 - // item.select = !item.select;  
1261 - // });  
1262 - })),  
1263 - VEmptyView(30),  
1264 - _textWidget('时间内预订次数', MyColours.color_333333, FontWeight.normal, 24),  
1265 - VEmptyView(30), 1345 + Padding(
  1346 + padding: EdgeInsets.only(left: w(10)),
  1347 + child: Row(children: [
  1348 + _textWidget('或', MyColours.color_000000, FontWeight.normal, 24),
  1349 + HEmptyView(20),
  1350 + Wrap(
  1351 + spacing: ScreenUtil().setWidth(20),
  1352 + runSpacing: ScreenUtil().setWidth(20),
  1353 + children:
  1354 + _buildFilterItem(customerProvider.filterDayList, false,
  1355 + (FilterBtnModel item) {
  1356 + customerProvider.controllerstime.text = '';
  1357 + customerProvider.controlleretime.text = '';
  1358 + for (FilterBtnModel value
  1359 + in customerProvider.filterDayList) {
  1360 + value.select = false;
  1361 + }
  1362 + for (FilterBtnModel value
  1363 + in customerProvider.filterDayList) {
  1364 + if (item.id == value.id) {
  1365 + state(() {
  1366 + value.select = true;
  1367 + });
  1368 + }
  1369 + }
  1370 + // if (customerProvider.stimeFocus.hasFocus) {
  1371 + // customerProvider.controllerstime.text = item.id;
  1372 + // }
  1373 + // if (customerProvider.etimeFocus.hasFocus) {
  1374 + // customerProvider.controlleretime.text = item.id;
  1375 + // }
  1376 + // state(() {
  1377 + // item.select = !item.select;
  1378 + // });
  1379 + }))
  1380 + ])),
  1381 + VEmptyView(40),
  1382 + _textWidget('预订次数', MyColours.color_515151, FontWeight.bold, 28),
  1383 + VEmptyView(20),
1266 /** 1384 /**
1267 Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ 1385 Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
1268 Material( 1386 Material(
@@ -1300,6 +1418,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1300,6 +1418,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1300 */ 1418 */
1301 Row(children: [ 1419 Row(children: [
1302 Material( 1420 Material(
  1421 + color: MyColours.color_ffffff,
1303 child: Container( 1422 child: Container(
1304 height: ScreenUtil().setWidth(50), 1423 height: ScreenUtil().setWidth(50),
1305 // width: ScreenUtil().setWidth(100), 1424 // width: ScreenUtil().setWidth(100),
@@ -1307,14 +1426,14 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1307,14 +1426,14 @@ class _CustomerListPageState extends State<CustomerListPage>
1307 horizontal: ScreenUtil().setWidth(20)), 1426 horizontal: ScreenUtil().setWidth(20)),
1308 decoration: BoxDecoration( 1427 decoration: BoxDecoration(
1309 borderRadius: 1428 borderRadius:
1310 - BorderRadius.circular(ScreenUtil().setWidth(30)),  
1311 - color: Color.fromRGBO(239, 239, 239, 1)), 1429 + BorderRadius.circular(ScreenUtil().setWidth(10)),
  1430 + color: MyColours.color_DBDBDB),
1312 child: DropdownButton( 1431 child: DropdownButton(
1313 underline: SizedBox(), 1432 underline: SizedBox(),
1314 value: dropValue, 1433 value: dropValue,
1315 isDense: true, 1434 isDense: true,
1316 style: TextStyle( 1435 style: TextStyle(
1317 - color: MyColours.color_333333, 1436 + color: MyColours.color_515151,
1318 fontSize: ScreenUtil().setSp(28)), 1437 fontSize: ScreenUtil().setSp(28)),
1319 focusColor: MyColours.color_199095, 1438 focusColor: MyColours.color_199095,
1320 items: _dropdownMenuItem(), 1439 items: _dropdownMenuItem(),
@@ -1322,7 +1441,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1322,7 +1441,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1322 children: [ 1441 children: [
1323 HEmptyView(10), 1442 HEmptyView(10),
1324 Image.asset( 1443 Image.asset(
1325 - Utils.getImgPath('c_arrow_down'), 1444 + Utils.getImgPath('c_arrow_d'),
1326 width: ScreenUtil().setWidth(24), 1445 width: ScreenUtil().setWidth(24),
1327 // height: ScreenUtil().setWidth(10), 1446 // height: ScreenUtil().setWidth(10),
1328 ) 1447 )
@@ -1357,7 +1476,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1357,7 +1476,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1357 // autofocus: true, 1476 // autofocus: true,
1358 1477
1359 style: TextStyle( 1478 style: TextStyle(
1360 - color: MyColours.color_333333, 1479 + color: MyColours.color_515151,
1361 fontSize: ScreenUtil().setSp(26)), 1480 fontSize: ScreenUtil().setSp(26)),
1362 // textAlignVertical: TextAlignVertical.center, 1481 // textAlignVertical: TextAlignVertical.center,
1363 decoration: InputDecoration( 1482 decoration: InputDecoration(
@@ -1393,7 +1512,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1393,7 +1512,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1393 ), 1512 ),
1394 )), 1513 )),
1395 HEmptyView(20), 1514 HEmptyView(20),
1396 - _textWidget('次预订', MyColours.color_333333, FontWeight.normal, 24), 1515 + _textWidget('次预订', MyColours.color_515151, FontWeight.normal, 24),
1397 ]), 1516 ]),
1398 VEmptyView(50), 1517 VEmptyView(50),
1399 ], 1518 ],
@@ -1437,7 +1556,8 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1437,7 +1556,8 @@ class _CustomerListPageState extends State<CustomerListPage>
1437 1556
1438 /// 高级筛选输入框 1557 /// 高级筛选输入框
1439 Widget _textFeildWidget(TextEditingController controller, FocusNode focusNode, 1558 Widget _textFeildWidget(TextEditingController controller, FocusNode focusNode,
1440 - StateSetter state) { 1559 + StateSetter state, ValueChanged<String> onChanged,
  1560 + {String unit = '天'}) {
1441 return Container( 1561 return Container(
1442 padding: EdgeInsets.symmetric( 1562 padding: EdgeInsets.symmetric(
1443 horizontal: ScreenUtil().setWidth(20), 1563 horizontal: ScreenUtil().setWidth(20),
@@ -1446,7 +1566,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1446,7 +1566,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1446 // alignment: Alignment.center, 1566 // alignment: Alignment.center,
1447 decoration: BoxDecoration( 1567 decoration: BoxDecoration(
1448 color: Color.fromRGBO(239, 239, 239, 1), 1568 color: Color.fromRGBO(239, 239, 239, 1),
1449 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(30))), 1569 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10))),
1450 child: Material( 1570 child: Material(
1451 color: Color.fromRGBO(239, 239, 239, 1), 1571 color: Color.fromRGBO(239, 239, 239, 1),
1452 child: Row(children: [ 1572 child: Row(children: [
@@ -1458,7 +1578,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1458,7 +1578,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1458 // autofocus: true, 1578 // autofocus: true,
1459 1579
1460 style: TextStyle( 1580 style: TextStyle(
1461 - color: MyColours.color_333333, 1581 + color: MyColours.color_515151,
1462 fontSize: ScreenUtil().setSp(26)), 1582 fontSize: ScreenUtil().setSp(26)),
1463 // textAlignVertical: TextAlignVertical.center, 1583 // textAlignVertical: TextAlignVertical.center,
1464 decoration: InputDecoration( 1584 decoration: InputDecoration(
@@ -1475,17 +1595,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1475,17 +1595,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1475 keyboardType: TextInputType.numberWithOptions(decimal: true), 1595 keyboardType: TextInputType.numberWithOptions(decimal: true),
1476 textInputAction: TextInputAction.done, 1596 textInputAction: TextInputAction.done,
1477 1597
1478 - onChanged: (value) {  
1479 - for (FilterBtnModel value  
1480 - in customerProvider.filterDayList) {  
1481 - value.select = false;  
1482 - }  
1483 - customerProvider.controllernum.text = '';  
1484 - state(() {});  
1485 - // setState(() {});  
1486 - // _searchSellerLocation();  
1487 - // customerProvider.searchData(value);  
1488 - }, 1598 + onChanged: onChanged,
1489 onEditingComplete: () { 1599 onEditingComplete: () {
1490 FocusScope.of(context) 1600 FocusScope.of(context)
1491 .requestFocus(FocusNode()); //点击空白处隐藏键盘 1601 .requestFocus(FocusNode()); //点击空白处隐藏键盘
@@ -1496,7 +1606,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1496,7 +1606,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1496 }, 1606 },
1497 ), 1607 ),
1498 ), 1608 ),
1499 - _textWidget('天', MyColours.color_333333, FontWeight.normal, 24), 1609 + _textWidget(unit, MyColours.color_515151, FontWeight.normal, 24),
1500 ]))); 1610 ])));
1501 } 1611 }
1502 1612
@@ -1534,34 +1644,36 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1534,34 +1644,36 @@ class _CustomerListPageState extends State<CustomerListPage>
1534 child: Column( 1644 child: Column(
1535 children: [ 1645 children: [
1536 Expanded( 1646 Expanded(
1537 - // child: Scrollbar(  
1538 - // isAlwaysShown: true, //设置滚动条常亮  
1539 - // controller: _scrollCrl, //必须设置一个controller  
1540 -  
1541 - // ///添加进度条  
1542 - child: SingleChildScrollView(  
1543 - controller: _scrollCrl,  
1544 - // primary: true,  
1545 - // reverse: true,  
1546 - // physics: BouncingScrollPhysics(),  
1547 - // padding: EdgeInsets.only(  
1548 - // bottom:  
1549 - // MediaQuery.of(context).viewInsets.bottom),  
1550 - child: Column(  
1551 - crossAxisAlignment: CrossAxisAlignment.start,  
1552 - children: [  
1553 - VEmptyView(20),  
1554 - _managerWidget(state),  
1555 - VEmptyView(30),  
1556 - _activityWidget(state),  
1557 - VEmptyView(30),  
1558 - _labelWidget(state),  
1559 - VEmptyView(30),  
1560 - _advancedFilterWidget(state)  
1561 - ],  
1562 - ),  
1563 - )),  
1564 - // ), 1647 + child: Scrollbar(
  1648 + isAlwaysShown: true, //设置滚动条常亮
  1649 + controller: _scrollCrl, //必须设置一个controller
  1650 +
  1651 + // ///添加进度条
  1652 + child: SingleChildScrollView(
  1653 + controller: _scrollCrl,
  1654 + // primary: true,
  1655 + // reverse: true,
  1656 + // physics: BouncingScrollPhysics(),
  1657 + // padding: EdgeInsets.only(
  1658 + // bottom:
  1659 + // MediaQuery.of(context).viewInsets.bottom),
  1660 + child: Column(
  1661 + crossAxisAlignment: CrossAxisAlignment.start,
  1662 + children: [
  1663 + VEmptyView(20),
  1664 + _managerWidget(state),
  1665 + VEmptyView(40),
  1666 + _activityWidget(state),
  1667 + VEmptyView(40),
  1668 + _labelWidget(state),
  1669 + VEmptyView(40),
  1670 + _consume(state),
  1671 + VEmptyView(40),
  1672 + _advancedFilterWidget(state)
  1673 + ],
  1674 + ),
  1675 + )),
  1676 + ),
1565 Row( 1677 Row(
1566 children: [ 1678 children: [
1567 Container( 1679 Container(
@@ -1604,7 +1716,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1604,7 +1716,7 @@ class _CustomerListPageState extends State<CustomerListPage>
1604 alignment: Alignment.center, 1716 alignment: Alignment.center,
1605 child: _textWidget( 1717 child: _textWidget(
1606 '重置', 1718 '重置',
1607 - MyColours.color_333333, 1719 + MyColours.color_515151,
1608 FontWeight.normal, 1720 FontWeight.normal,
1609 30), 1721 30),
1610 ), 1722 ),
@@ -1680,11 +1792,11 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -1680,11 +1792,11 @@ class _CustomerListPageState extends State<CustomerListPage>
1680 child: _textWidget( 1792 child: _textWidget(
1681 item.title, 1793 item.title,
1682 grayBack 1794 grayBack
1683 - ? MyColours.color_333333 1795 + ? MyColours.color_515151
1684 : item.select 1796 : item.select
1685 ? MyColours.color_ffffff 1797 ? MyColours.color_ffffff
1686 : round 1798 : round
1687 - ? MyColours.color_333333 1799 + ? MyColours.color_515151
1688 : MyColours.color_199095, 1800 : MyColours.color_199095,
1689 FontWeight.normal, 1801 FontWeight.normal,
1690 24)))); 1802 24))));
@@ -23,7 +23,6 @@ class CustomerSettingPage extends StatefulWidget { @@ -23,7 +23,6 @@ class CustomerSettingPage extends StatefulWidget {
23 } 23 }
24 24
25 class _CustomerSettingPageState extends State<CustomerSettingPage> { 25 class _CustomerSettingPageState extends State<CustomerSettingPage> {
26 - bool swichState = false;  
27 CustomerProvider customerProvider; 26 CustomerProvider customerProvider;
28 bool swichSync = false; //会员系统同步 27 bool swichSync = false; //会员系统同步
29 28
@@ -43,9 +42,10 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -43,9 +42,10 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
43 _sellerGuestSet() async { 42 _sellerGuestSet() async {
44 Map<String, String> params = { 43 Map<String, String> params = {
45 "sellerid": Provider.of<UserModel>(context, listen: false).user.sellerid, 44 "sellerid": Provider.of<UserModel>(context, listen: false).user.sellerid,
46 - 'is_additional': swichState ? "1" : "0" 45 + 'is_additional': customerProvider.isrepair ? "1" : "0"
47 }; 46 };
48 - bool success = await customerProvider.setSellerGuest(context, params,showLoading: true); 47 + bool success = await customerProvider.setSellerGuest(context, params,
  48 + showLoading: true);
49 if (success) {} 49 if (success) {}
50 } 50 }
51 51
@@ -56,11 +56,11 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -56,11 +56,11 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
56 }; 56 };
57 bool success = await customerProvider.getSellerGuest(context, params); 57 bool success = await customerProvider.getSellerGuest(context, params);
58 58
59 - if (success) {  
60 - swichState = true;  
61 - } else {  
62 - swichState = false;  
63 - } 59 + // if (success) {
  60 + // customerProvider.isrepair = true;
  61 + // } else {
  62 + // customerProvider.isrepair = false;
  63 + // }
64 setState(() {}); 64 setState(() {});
65 } 65 }
66 66
@@ -183,7 +183,7 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -183,7 +183,7 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
183 decoration: BoxDecoration( 183 decoration: BoxDecoration(
184 borderRadius: BorderRadius.circular(r(5)), 184 borderRadius: BorderRadius.circular(r(5)),
185 border: 185 border:
186 - Border.all(color: MyColours.color_DBDBDB, width: w(1)), 186 + Border.all(color: MyColours.color_E7E7E7, width: w(1)),
187 ), 187 ),
188 child: TextField( 188 child: TextField(
189 controller: controller, 189 controller: controller,
@@ -225,59 +225,124 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -225,59 +225,124 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
225 }, 225 },
226 ), 226 ),
227 body: Padding( 227 body: Padding(
228 - padding: EdgeInsets.symmetric(  
229 - horizontal: ScreenUtil().setWidth(40),  
230 - vertical: ScreenUtil().setWidth(40)), 228 + padding: EdgeInsets.only(
  229 + left: ScreenUtil().setWidth(32), top: ScreenUtil().setWidth(40)),
231 child: SingleChildScrollView( 230 child: SingleChildScrollView(
232 child: Column( 231 child: Column(
233 crossAxisAlignment: CrossAxisAlignment.start, 232 crossAxisAlignment: CrossAxisAlignment.start,
234 children: [ 233 children: [
  234 + Container(
  235 + padding: EdgeInsets.symmetric(vertical: w(8)),
  236 + child: Text('客人信息录入',
  237 + style: TextStyle(
  238 + color: MyColours.color_515151,
  239 + fontSize: ScreenUtil().setSp(32)))),
  240 + MyDivider(
  241 + double.infinity,
  242 + w(1),
  243 + color: MyColours.color_E7E7E7,
  244 + ),
  245 +
  246 + VEmptyView(24),
  247 +
235 InkWell( 248 InkWell(
236 onTap: () { 249 onTap: () {
237 setState(() { 250 setState(() {
238 - swichState = !swichState; 251 + customerProvider.isselfphone =
  252 + !customerProvider.isselfphone;
239 }); 253 });
240 _sellerGuestSet(); 254 _sellerGuestSet();
241 }, 255 },
242 - child: Row(  
243 - mainAxisAlignment: MainAxisAlignment.spaceBetween,  
244 - crossAxisAlignment: CrossAxisAlignment.center,  
245 - children: [  
246 - Text('预订要求补录客人信息',  
247 - style: TextStyle(  
248 - color: MyColours.color_515151,  
249 - fontSize: ScreenUtil().setSp(32))),  
250 - Image.asset(  
251 - swichState  
252 - ? Utils.getImgPath('f_swich_on')  
253 - : Utils.getImgPath('f_swich_off'),  
254 - width: ScreenUtil().setWidth(70),  
255 - // height: ScreenUtil().setWidth(82),  
256 - ),  
257 - ],  
258 - ),  
259 - ),  
260 - VEmptyView(20),  
261 - MyDivider(  
262 - double.infinity,  
263 - w(1),  
264 - color: MyColours.color_DBDBDB, 256 + child: Container(
  257 + padding:
  258 + EdgeInsets.symmetric(vertical: w(8), horizontal: w(14)),
  259 + child: Row(
  260 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  261 + crossAxisAlignment: CrossAxisAlignment.center,
  262 + children: [
  263 + Text('录入客户电话时不能用自己手机号',
  264 + style: TextStyle(
  265 + color: MyColours.color_515151,
  266 + fontSize: ScreenUtil().setSp(28))),
  267 + Image.asset(
  268 + customerProvider.isselfphone
  269 + ? Utils.getImgPath('swich_on')
  270 + : Utils.getImgPath('swich_off'),
  271 + width: ScreenUtil().setWidth(88),
  272 + // height: ScreenUtil().setWidth(82),
  273 + ),
  274 + ],
  275 + )),
265 ), 276 ),
  277 + Padding(
  278 + padding: EdgeInsets.only(left: w(14), right: w(10)),
  279 + child: MyDivider(
  280 + double.infinity,
  281 + w(1),
  282 + color: MyColours.color_E7E7E7,
  283 + )),
  284 + VEmptyView(24),
  285 + InkWell(
  286 + onTap: () {
  287 + setState(() {
  288 + customerProvider.isrepair = !customerProvider.isrepair;
  289 + });
  290 + _sellerGuestSet();
  291 + },
  292 + child: Container(
  293 + padding:
  294 + EdgeInsets.symmetric(vertical: w(8), horizontal: w(14)),
  295 + child: Row(
  296 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  297 + crossAxisAlignment: CrossAxisAlignment.center,
  298 + children: [
  299 + Text('预订要求补录客人信息',
  300 + style: TextStyle(
  301 + color: MyColours.color_515151,
  302 + fontSize: ScreenUtil().setSp(28))),
  303 + Image.asset(
  304 + customerProvider.isrepair
  305 + ? Utils.getImgPath('swich_on')
  306 + : Utils.getImgPath('swich_off'),
  307 + width: ScreenUtil().setWidth(88),
  308 + // height: ScreenUtil().setWidth(82),
  309 + ),
  310 + ],
  311 + ),
  312 + )),
  313 +
  314 + Padding(
  315 + padding: EdgeInsets.only(left: w(14), right: w(10)),
  316 + child: MyDivider(
  317 + double.infinity,
  318 + w(1),
  319 + color: MyColours.color_E7E7E7,
  320 + )),
266 VEmptyView(48), 321 VEmptyView(48),
267 Text('店内自定义标签', 322 Text('店内自定义标签',
268 style: TextStyle( 323 style: TextStyle(
269 color: MyColours.color_515151, 324 color: MyColours.color_515151,
270 fontSize: ScreenUtil().setSp(32))), 325 fontSize: ScreenUtil().setSp(32))),
271 - VEmptyView(30),  
272 - Wrap(  
273 - spacing: ScreenUtil().setWidth(20),  
274 - runSpacing: ScreenUtil().setWidth(10),  
275 - children: _buildLabelItem(customerProvider.labelList)), 326 + VEmptyView(48),
  327 + Container(
  328 + padding:
  329 + EdgeInsets.symmetric(vertical: w(18), horizontal: w(14)),
  330 + child: Wrap(
  331 + spacing: ScreenUtil().setWidth(20),
  332 + runSpacing: ScreenUtil().setWidth(10),
  333 + children: _buildLabelItem(customerProvider.labelList))),
  334 + Padding(
  335 + padding: EdgeInsets.only(left: w(14), right: w(10)),
  336 + child: MyDivider(
  337 + double.infinity,
  338 + w(1),
  339 + color: MyColours.color_E7E7E7,
  340 + )),
276 // VEmptyView(34), 341 // VEmptyView(34),
277 // MyDivider( 342 // MyDivider(
278 // double.infinity, 343 // double.infinity,
279 // w(1), 344 // w(1),
280 - // color: MyColours.color_DBDBDB, 345 + // color: MyColours.color_E7E7E7,
281 // ), 346 // ),
282 // VEmptyView(52), 347 // VEmptyView(52),
283 // InkWell( 348 // InkWell(
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:one_key/models/seller_template_color_list_model.dart'; 2 import 'package:one_key/models/seller_template_color_list_model.dart';
3 import 'package:one_key/widgets/system_app_bar.dart'; 3 import 'package:one_key/widgets/system_app_bar.dart';
  4 +import 'package:one_key/widgets/v_empty_view.dart';
4 import 'package:provider/provider.dart'; 5 import 'package:provider/provider.dart';
5 6
6 import '../../../provider/marketing_center_provider.dart'; 7 import '../../../provider/marketing_center_provider.dart';
@@ -27,7 +28,9 @@ class CustomerNoticeSettingPage extends StatefulWidget { @@ -27,7 +28,9 @@ class CustomerNoticeSettingPage extends StatefulWidget {
27 } 28 }
28 29
29 class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> { 30 class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> {
30 - bool selectSms = false; //取消预订发送短信默认关闭 31 + bool cancelSms = false; //取消预订发送短信默认关闭
  32 + bool noticeSms = false; //使用店铺手机发送通知短信
  33 + bool marketingSms = false; //使用店铺手机发送营销短信
31 bool select = false; //启用预订安排通知图文模式 34 bool select = false; //启用预订安排通知图文模式
32 MarketingCenterProvider marketingCenterProvider; 35 MarketingCenterProvider marketingCenterProvider;
33 String themeName = ''; 36 String themeName = '';
@@ -62,7 +65,7 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> { @@ -62,7 +65,7 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> {
62 select = marketingCenterProvider.dzSellerConfModel.isNewTemplate == '1' 65 select = marketingCenterProvider.dzSellerConfModel.isNewTemplate == '1'
63 ? true 66 ? true
64 : false; 67 : false;
65 - selectSms = marketingCenterProvider.dzSellerConfModel.isOpenCancel == '1' 68 + cancelSms = marketingCenterProvider.dzSellerConfModel.isOpenCancel == '1'
66 ? true 69 ? true
67 : false; 70 : false;
68 setState(() {}); 71 setState(() {});
@@ -151,7 +154,7 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> { @@ -151,7 +154,7 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> {
151 Map<String, String> params = { 154 Map<String, String> params = {
152 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid, 155 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
153 'key': 'is_open_cancel_temp', 156 'key': 'is_open_cancel_temp',
154 - 'value': selectSms ? '1' : '0' 157 + 'value': cancelSms ? '1' : '0'
155 }; 158 };
156 159
157 bool success = await marketingCenterProvider.setConfing(context, params, 160 bool success = await marketingCenterProvider.setConfing(context, params,
@@ -252,14 +255,14 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> { @@ -252,14 +255,14 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> {
252 bottom: BorderSide( 255 bottom: BorderSide(
253 color: MyColours.color_E7E7E7, width: w(0.5)))), 256 color: MyColours.color_E7E7E7, width: w(0.5)))),
254 margin: EdgeInsets.only( 257 margin: EdgeInsets.only(
255 - right: w(24), left: w(36), bottom: w(12), top: w(12)),  
256 - padding: EdgeInsets.only(top: w(12), bottom: w(12)), 258 + right: w(12), left: w(16), bottom: w(0), top: w(14)),
  259 + padding: EdgeInsets.only(top: w(12), bottom: w(3)),
257 child: Row( 260 child: Row(
258 children: [ 261 children: [
259 Text( 262 Text(
260 title, 263 title,
261 style: TextStyle( 264 style: TextStyle(
262 - color: MyColours.color_515151, fontSize: font(16)), 265 + color: MyColours.color_515151, fontSize: font(14)),
263 ), 266 ),
264 Spacer(), 267 Spacer(),
265 Container( 268 Container(
@@ -275,6 +278,75 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> { @@ -275,6 +278,75 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> {
275 ))); 278 )));
276 } 279 }
277 280
  281 + Widget _itemSmsWidget(bool isSelect, String title) {
  282 + return Column(
  283 + children: [
  284 + InkWell(
  285 + onTap: () {
  286 + setState(() {
  287 + isSelect = !isSelect;
  288 + });
  289 + },
  290 + child: Padding(
  291 + padding: EdgeInsets.only(
  292 + left: w(16), top: w(14), bottom: w(3), right: w(12)),
  293 + child: Row(
  294 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  295 + children: [
  296 + Text(
  297 + title,
  298 + style: TextStyle(
  299 + color: MyColours.color_515151, fontSize: font(14)),
  300 + ),
  301 + Spacer(),
  302 + Container(
  303 + padding: EdgeInsets.symmetric(
  304 + horizontal: w(7), vertical: w(4)),
  305 + child: Image.asset(
  306 + Utils.getImgPath(isSelect ? 'swich_on' : 'swich_off'),
  307 + width: w(44),
  308 + ),
  309 + )
  310 + // RoundButton(
  311 + // text: '预览',
  312 + // gradientStart: MyColours.color_ffffff,
  313 + // gradientEnd: MyColours.color_ffffff,
  314 + // borderColor: MyColours.color_438E93,
  315 + // textColor: MyColours.color_438E93,
  316 + // radius: ScreenUtil().setWidth(22),
  317 + // fontSize: 24,
  318 + // width: w(72),
  319 + // height: ScreenUtil().setWidth(44),
  320 + // isBold: true,
  321 + // onPressed: () {
  322 + // NavigatorUtil.goMarkingPreviewPage(context);
  323 + // },
  324 + // ),
  325 + ]))),
  326 + Padding(
  327 + padding: EdgeInsets.only(left: w(16)),
  328 + child: MyDivider(double.infinity, w(0.5),
  329 + color: MyColours.color_E7E7E7)),
  330 + ],
  331 + );
  332 + }
  333 +
  334 + Widget _title(String title) {
  335 + return Column(
  336 + crossAxisAlignment: CrossAxisAlignment.start,
  337 + children: [
  338 + Padding(
  339 + padding: EdgeInsets.symmetric(vertical: w(8)),
  340 + child: Text(
  341 + title,
  342 + style: TextStyle(color: MyColours.color_515151, fontSize: font(16)),
  343 + ),
  344 + ),
  345 + MyDivider(double.infinity, w(0.5), color: MyColours.color_E7E7E7),
  346 + ],
  347 + );
  348 + }
  349 +
278 @override 350 @override
279 Widget build(BuildContext context) { 351 Widget build(BuildContext context) {
280 marketingCenterProvider = 352 marketingCenterProvider =
@@ -286,137 +358,99 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> { @@ -286,137 +358,99 @@ class _CustomerNoticeSettingPageState extends State<CustomerNoticeSettingPage> {
286 children: [ 358 children: [
287 Expanded( 359 Expanded(
288 child: SingleChildScrollView( 360 child: SingleChildScrollView(
289 - child: Column(  
290 - children: [  
291 - InkWell(  
292 - onTap: () {  
293 - setState(() {  
294 - selectSms = !selectSms;  
295 - });  
296 - },  
297 - child: Padding(  
298 - padding: EdgeInsets.only(  
299 - left: w(16),  
300 - top: w(12),  
301 - bottom: w(12),  
302 - right: w(12)),  
303 - child: Row(  
304 - mainAxisAlignment: MainAxisAlignment.spaceBetween,  
305 - children: [  
306 - Text(  
307 - '客户取消预订时自动发送通知短信',  
308 - style: TextStyle(  
309 - color: MyColours.color_515151,  
310 - fontSize: font(16)),  
311 - ),  
312 - Spacer(),  
313 - Container(  
314 - padding: EdgeInsets.symmetric(  
315 - horizontal: w(7), vertical: w(4)),  
316 - child: Image.asset(  
317 - Utils.getImgPath(  
318 - selectSms ? 'swich_on' : 'swich_off'),  
319 - width: w(44),  
320 - ),  
321 - )  
322 - // RoundButton(  
323 - // text: '预览',  
324 - // gradientStart: MyColours.color_ffffff,  
325 - // gradientEnd: MyColours.color_ffffff,  
326 - // borderColor: MyColours.color_438E93,  
327 - // textColor: MyColours.color_438E93,  
328 - // radius: ScreenUtil().setWidth(22),  
329 - // fontSize: 24,  
330 - // width: w(72),  
331 - // height: ScreenUtil().setWidth(44),  
332 - // isBold: true,  
333 - // onPressed: () {  
334 - // NavigatorUtil.goMarkingPreviewPage(context);  
335 - // },  
336 - // ),  
337 - ]))),  
338 - Padding(  
339 - padding: EdgeInsets.only(left: w(16)),  
340 - child: MyDivider(double.infinity, w(0.5),  
341 - color: MyColours.color_E7E7E7)),  
342 - InkWell(  
343 - onTap: () {  
344 - NavigatorUtil.goInvitationThemeHomePage(context);  
345 - },  
346 - child: Padding(  
347 - padding: EdgeInsets.only(  
348 - left: w(16),  
349 - top: w(12),  
350 - bottom: w(12),  
351 - right: w(24)),  
352 - child: Row(  
353 - mainAxisAlignment: MainAxisAlignment.spaceBetween,  
354 - children: [  
355 - Text(  
356 - '客户通知主题选择',  
357 - style: TextStyle(  
358 - color: MyColours.color_515151,  
359 - fontSize: font(16)),  
360 - ),  
361 - HEmptyView(20), 361 + child: Padding(
  362 + padding: EdgeInsets.only(left: w(16)),
  363 + child: Column(
  364 + crossAxisAlignment: CrossAxisAlignment.start,
  365 + children: [
  366 + _title('短信通知'),
  367 + _itemSmsWidget(cancelSms, '客户取消预订时自动发送通知短信'),
  368 + _itemSmsWidget(noticeSms, '使用店铺手机发送通知短信'),
  369 + _itemSmsWidget(marketingSms, '使用店铺手机发送营销短信'),
  370 + VEmptyView(24),
362 371
363 - Expanded(  
364 - child: Text(  
365 - themeName,  
366 - textAlign: TextAlign.right,  
367 - style: TextStyle(  
368 - color: MyColours.color_515151,  
369 - fontSize: font(16)),  
370 - )),  
371 - Container(  
372 - padding: EdgeInsets.symmetric(  
373 - horizontal: w(11), vertical: w(4)),  
374 - child: Image.asset(  
375 - "assets/arrow_right_new.png",  
376 - width: w(9),  
377 - height: w(16),  
378 - ),  
379 - )  
380 - // RoundButton(  
381 - // text: '预览',  
382 - // gradientStart: MyColours.color_ffffff,  
383 - // gradientEnd: MyColours.color_ffffff,  
384 - // borderColor: MyColours.color_438E93,  
385 - // textColor: MyColours.color_438E93,  
386 - // radius: ScreenUtil().setWidth(22),  
387 - // fontSize: 24,  
388 - // width: w(72),  
389 - // height: ScreenUtil().setWidth(44),  
390 - // isBold: true,  
391 - // onPressed: () {  
392 - // NavigatorUtil.goMarkingPreviewPage(context);  
393 - // },  
394 - // ),  
395 - ]))),  
396 - Padding(  
397 - padding: EdgeInsets.only(left: w(16)),  
398 - child: MyDivider(double.infinity, w(0.5),  
399 - color: MyColours.color_E7E7E7)),  
400 - // _item('首图形象展示', onTap: () {  
401 - // NavigatorUtil.goFirstImagePage(context);  
402 - // }),  
403 - _item('预订信息模块设置', onTap: () {  
404 - NavigatorUtil.goBookInfoPage(context);  
405 - }),  
406 - _item('店铺介绍模块设置', onTap: () {  
407 - NavigatorUtil.goStoreIntroducePage(context);  
408 - }),  
409 - _item('主厨介绍设置', onTap: () {  
410 - NavigatorUtil.goChefIntroducePage(context);  
411 - }),  
412 - _item('招牌菜展示设置', onTap: () {  
413 - NavigatorUtil.goDishShowPage(context);  
414 - }),  
415 - _item('客户互动设置', onTap: () {  
416 - NavigatorUtil.goMarkingInteractionPage(context);  
417 - }),  
418 - ],  
419 - ), 372 + _title('微信通知'),
  373 + VEmptyView(24),
  374 +
  375 + InkWell(
  376 + onTap: () {
  377 + NavigatorUtil.goInvitationThemeHomePage(context);
  378 + },
  379 + child: Padding(
  380 + padding: EdgeInsets.only(
  381 + left: w(16),
  382 + top: w(14),
  383 + bottom: w(3),
  384 + right: w(12)),
  385 + child: Row(
  386 + mainAxisAlignment:
  387 + MainAxisAlignment.spaceBetween,
  388 + children: [
  389 + Text(
  390 + '客户通知主题选择',
  391 + style: TextStyle(
  392 + color: MyColours.color_515151,
  393 + fontSize: font(14)),
  394 + ),
  395 + HEmptyView(20),
  396 +
  397 + Expanded(
  398 + child: Text(
  399 + themeName,
  400 + textAlign: TextAlign.right,
  401 + style: TextStyle(
  402 + color: MyColours.color_515151,
  403 + fontSize: font(14)),
  404 + )),
  405 + Container(
  406 + padding: EdgeInsets.symmetric(
  407 + horizontal: w(11), vertical: w(4)),
  408 + child: Image.asset(
  409 + "assets/arrow_right_new.png",
  410 + width: w(9),
  411 + height: w(16),
  412 + ),
  413 + )
  414 + // RoundButton(
  415 + // text: '预览',
  416 + // gradientStart: MyColours.color_ffffff,
  417 + // gradientEnd: MyColours.color_ffffff,
  418 + // borderColor: MyColours.color_438E93,
  419 + // textColor: MyColours.color_438E93,
  420 + // radius: ScreenUtil().setWidth(22),
  421 + // fontSize: 24,
  422 + // width: w(72),
  423 + // height: ScreenUtil().setWidth(44),
  424 + // isBold: true,
  425 + // onPressed: () {
  426 + // NavigatorUtil.goMarkingPreviewPage(context);
  427 + // },
  428 + // ),
  429 + ]))),
  430 + Padding(
  431 + padding: EdgeInsets.only(left: w(16),right: w(12)),
  432 + child: MyDivider(double.infinity, w(0.5),
  433 + color: MyColours.color_E7E7E7)),
  434 + // _item('首图形象展示', onTap: () {
  435 + // NavigatorUtil.goFirstImagePage(context);
  436 + // }),
  437 + _item('预订信息模块设置', onTap: () {
  438 + NavigatorUtil.goBookInfoPage(context);
  439 + }),
  440 + _item('店铺介绍模块设置', onTap: () {
  441 + NavigatorUtil.goStoreIntroducePage(context);
  442 + }),
  443 + _item('主厨介绍设置', onTap: () {
  444 + NavigatorUtil.goChefIntroducePage(context);
  445 + }),
  446 + _item('招牌菜展示设置', onTap: () {
  447 + NavigatorUtil.goDishShowPage(context);
  448 + }),
  449 + _item('客户互动设置', onTap: () {
  450 + NavigatorUtil.goMarkingInteractionPage(context);
  451 + }),
  452 + ],
  453 + )),
420 )), 454 )),
421 Container( 455 Container(
422 color: MyColours.color_ffffff, 456 color: MyColours.color_ffffff,
@@ -44,9 +44,17 @@ class CustomerProvider extends ChangeNotifier { @@ -44,9 +44,17 @@ class CustomerProvider extends ChangeNotifier {
44 TextEditingController controlleretime = TextEditingController(); //高级筛选结束时间 44 TextEditingController controlleretime = TextEditingController(); //高级筛选结束时间
45 TextEditingController controllernum = TextEditingController(); //预订次数 45 TextEditingController controllernum = TextEditingController(); //预订次数
46 46
  47 + TextEditingController controllersmoney = TextEditingController(); //人均消费金额低
  48 + TextEditingController controlleremoney = TextEditingController(); //人均消费金额高
  49 + TextEditingController controllermaxmoney = TextEditingController(); //人均消费能力
  50 +
47 FocusNode stimeFocus = FocusNode(); //高级筛选开始时间 51 FocusNode stimeFocus = FocusNode(); //高级筛选开始时间
48 FocusNode etimeFocus = FocusNode(); //高级筛选结束时间 52 FocusNode etimeFocus = FocusNode(); //高级筛选结束时间
49 53
  54 + FocusNode smoneyFocus = FocusNode(); //人均消费金额开始
  55 + FocusNode emoneyFocus = FocusNode(); //人均消费金额结束
  56 + FocusNode maxmoneyFocus = FocusNode(); //人均消费能力
  57 +
50 PageState pageStateMyHome = PageState.Loading; 58 PageState pageStateMyHome = PageState.Loading;
51 PageState pageStateStoreHome = PageState.Loading; 59 PageState pageStateStoreHome = PageState.Loading;
52 60
@@ -111,6 +119,9 @@ class CustomerProvider extends ChangeNotifier { @@ -111,6 +119,9 @@ class CustomerProvider extends ChangeNotifier {
111 PageState pageStateMonth = PageState.Loading; 119 PageState pageStateMonth = PageState.Loading;
112 PageState pageStateDay = PageState.Loading; 120 PageState pageStateDay = PageState.Loading;
113 121
  122 + bool isrepair = false;
  123 + bool isselfphone = false;
  124 +
114 /// 获取全店日订单统计数据 125 /// 获取全店日订单统计数据
115 Future<DayStaticsSunModel> getSellerCountsListByDay( 126 Future<DayStaticsSunModel> getSellerCountsListByDay(
116 BuildContext context, Map<String, String> params, 127 BuildContext context, Map<String, String> params,
@@ -267,7 +278,7 @@ class CustomerProvider extends ChangeNotifier { @@ -267,7 +278,7 @@ class CustomerProvider extends ChangeNotifier {
267 } else { 278 } else {
268 manageSelAll = true; 279 manageSelAll = true;
269 } 280 }
270 - 281 +
271 notifyListeners(); 282 notifyListeners();
272 } 283 }
273 284
@@ -1896,9 +1907,16 @@ class CustomerProvider extends ChangeNotifier { @@ -1896,9 +1907,16 @@ class CustomerProvider extends ChangeNotifier {
1896 if (baseResp != null && baseResp.code == Constant.status_success) { 1907 if (baseResp != null && baseResp.code == Constant.status_success) {
1897 // guestReserveSunModel = 1908 // guestReserveSunModel =
1898 // GuestReserveModel.fromJson(baseResp.responseData).data; 1909 // GuestReserveModel.fromJson(baseResp.responseData).data;
1899 - if (baseResp.responseData['data']['is_additional'] == '1') { 1910 +
  1911 + if (baseResp.responseData['data'] is Map) {
  1912 + isrepair = baseResp.responseData['data']['is_additional'] == '1'
  1913 + ? true
  1914 + : false;
  1915 + isselfphone =
  1916 + baseResp.responseData['data']['isselfphone'] == '1' ? true : false;
1900 return true; 1917 return true;
1901 } 1918 }
  1919 +
1902 return false; 1920 return false;
1903 } else { 1921 } else {
1904 if (baseResp != null) { 1922 if (baseResp != null) {
@@ -3826,6 +3826,81 @@ class DialogUtil { @@ -3826,6 +3826,81 @@ class DialogUtil {
3826 ), 3826 ),
3827 ), 3827 ),
3828 VEmptyView(32), 3828 VEmptyView(32),
  3829 + InkWell(
  3830 + onTap: () async {
  3831 + // if (isMerge != '1') {
  3832 + // return;
  3833 + // }
  3834 + // //跳转到被合并桌位展示页面
  3835 + // Map object;
  3836 + // if (selectTables.length > 0) {
  3837 + // object = await NavigatorUtil
  3838 + // .goMergeTableSelectPage(context,
  3839 + // tableidNow: tableid,
  3840 + // tids: table.tids,
  3841 + // object: {'object': selectTables});
  3842 + // } else {
  3843 + // object = await NavigatorUtil
  3844 + // .goMergeTableSelectPage(
  3845 + // context,
  3846 + // tableidNow: tableid,
  3847 + // tids: table.tids,
  3848 + // );
  3849 + // }
  3850 +
  3851 + // if (object != null) {
  3852 + // selectTables = object['object'];
  3853 + // tids = object['tid'];
  3854 + // }
  3855 + // // else {
  3856 + // // selectTables = []; //没有选择桌子
  3857 + // // tids = '';
  3858 + // // }
  3859 + // tableNames = '';
  3860 + // selectTables.forEach((element) {
  3861 + // tableNames += '${element.name}、';
  3862 + // });
  3863 + // if (tableNames.endsWith('、')) {
  3864 + // tableNames = tableNames.substring(
  3865 + // 0, tableNames.length - 1);
  3866 + // }
  3867 + // print(object);
  3868 + // state(() {});
  3869 + },
  3870 + child: Container(
  3871 + padding: EdgeInsets.only(
  3872 + left: ScreenUtil().setWidth(44),
  3873 + right: ScreenUtil().setWidth(44)),
  3874 + height: ScreenUtil().setWidth(48 * 2),
  3875 + child: Row(
  3876 + mainAxisAlignment:
  3877 + MainAxisAlignment.center,
  3878 + children: [
  3879 + HEmptyView(32),
  3880 + Text(
  3881 + '所属区域',
  3882 + style: TextStyle(
  3883 + fontSize: ScreenUtil().setSp(32),
  3884 + color: MyColours.color_000000),
  3885 + ),
  3886 + HEmptyView(40),
  3887 + Expanded(
  3888 + child: Text(
  3889 + table.rname??'ff',
  3890 + maxLines: 1,
  3891 + textAlign: TextAlign.right,
  3892 + overflow: TextOverflow.ellipsis,
  3893 + style: TextStyle(
  3894 + fontSize: ScreenUtil().setSp(32),
  3895 + color: MyColours.color_66000000),
  3896 + )),
  3897 + Image.asset(
  3898 + Utils.getImgPath('merge_arrow'),
  3899 + width: w(24)),
  3900 + HEmptyView(22),
  3901 + ],
  3902 + ))),
  3903 + VEmptyView(32),
3829 isLock == '1' 3904 isLock == '1'
3830 ? 3905 ?
3831 // 已被合并到 3906 // 已被合并到