xt / Flutter-ReserveApp · Commits

Go to a project

Commit cc39186c85953ff88d9d2e67b06c9bdc12941751

Authored by weixin_45529955
1 parent 77364708
build: skipped

线上版本5.6.1

Inline Side-by-side
Showing 3 changed files with 334 additions and 334 deletions
@@ -20,19 +20,19 @@ if (flutterRoot == null) { @@ -20,19 +20,19 @@ if (flutterRoot == null) {
20 20
21 21
22 22
23 -def flutterVersionCode = "562" 23 +def flutterVersionCode = "561"
24 if (flutterVersionCode == null) { 24 if (flutterVersionCode == null) {
25 - flutterVersionCode = '562' 25 + flutterVersionCode = '561'
26 26
27 27
28 28
29 } 29 }
30 30
31 31
32 -def flutterVersionName = "5.6.2" 32 +def flutterVersionName = "5.6.1"
33 33
34 if (flutterVersionName == null) { 34 if (flutterVersionName == null) {
35 - flutterVersionName = '5.6.2' 35 + flutterVersionName = '5.6.1'
36 36
37 } 37 }
38 38
@@ -83,8 +83,8 @@ android { @@ -83,8 +83,8 @@ android {
83 83
84 ndk { 84 ndk {
85 //选择要添加的对应 cpu 类型的 .so 库。 85 //选择要添加的对应 cpu 类型的 .so 库。
86 - // abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位  
87 - abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64' 86 + abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位
  87 + // abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
88 } 88 }
89 89
90 lintOptions { 90 lintOptions {
@@ -535,7 +535,7 @@ @@ -535,7 +535,7 @@
535 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 535 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
536 CLANG_ENABLE_MODULES = YES; 536 CLANG_ENABLE_MODULES = YES;
537 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 537 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
538 - CURRENT_PROJECT_VERSION = 5615; 538 + CURRENT_PROJECT_VERSION = 561;
539 DEVELOPMENT_TEAM = 8J59HM8B82; 539 DEVELOPMENT_TEAM = 8J59HM8B82;
540 ENABLE_BITCODE = NO; 540 ENABLE_BITCODE = NO;
541 INFOPLIST_FILE = Runner/Info.plist; 541 INFOPLIST_FILE = Runner/Info.plist;
@@ -718,7 +718,7 @@ @@ -718,7 +718,7 @@
718 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 718 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
719 CLANG_ENABLE_MODULES = YES; 719 CLANG_ENABLE_MODULES = YES;
720 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 720 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
721 - CURRENT_PROJECT_VERSION = 5615; 721 + CURRENT_PROJECT_VERSION = 561;
722 DEVELOPMENT_TEAM = 8J59HM8B82; 722 DEVELOPMENT_TEAM = 8J59HM8B82;
723 ENABLE_BITCODE = NO; 723 ENABLE_BITCODE = NO;
724 INFOPLIST_FILE = Runner/Info.plist; 724 INFOPLIST_FILE = Runner/Info.plist;
@@ -744,7 +744,7 @@ @@ -744,7 +744,7 @@
744 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 744 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
745 CLANG_ENABLE_MODULES = YES; 745 CLANG_ENABLE_MODULES = YES;
746 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 746 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
747 - CURRENT_PROJECT_VERSION = 5615; 747 + CURRENT_PROJECT_VERSION = 561;
748 DEVELOPMENT_TEAM = 8J59HM8B82; 748 DEVELOPMENT_TEAM = 8J59HM8B82;
749 ENABLE_BITCODE = NO; 749 ENABLE_BITCODE = NO;
750 INFOPLIST_FILE = Runner/Info.plist; 750 INFOPLIST_FILE = Runner/Info.plist;
@@ -106,11 +106,11 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -106,11 +106,11 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
106 "sellerid": Provider.of<UserModel>(context, listen: false).user!.sellerid, 106 "sellerid": Provider.of<UserModel>(context, listen: false).user!.sellerid,
107 'is_additional': customerProvider.isrepair ? "1" : "0", 107 'is_additional': customerProvider.isrepair ? "1" : "0",
108 'is_enter_self': customerProvider.isselfphone ? '1' : '0', 108 'is_enter_self': customerProvider.isselfphone ? '1' : '0',
109 - 'is_high_frequency': customerProvider.isHighFrequency ? '1' : '0',  
110 - 'high_frequency_day': controllerDeadline.text,  
111 - 'high_frequency_reserve': controllerConsumptionTimes.text,  
112 - 'is_high_consumption': customerProvider.isHighConsumption ? '1' : '0',  
113 - 'is_high_money': controllerHighValue.text 109 + // 'is_high_frequency': customerProvider.isHighFrequency ? '1' : '0',
  110 + // 'high_frequency_day': controllerDeadline.text,
  111 + // 'high_frequency_reserve': controllerConsumptionTimes.text,
  112 + // 'is_high_consumption': customerProvider.isHighConsumption ? '1' : '0',
  113 + // 'is_high_money': controllerHighValue.text
114 }; 114 };
115 bool success = await customerProvider.setSellerGuest(context, params, 115 bool success = await customerProvider.setSellerGuest(context, params,
116 showLoading: true); 116 showLoading: true);
@@ -846,311 +846,311 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -846,311 +846,311 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
846 color: MyColours.color_E7E7E7, 846 color: MyColours.color_E7E7E7,
847 )), 847 )),
848 VEmptyView(48), 848 VEmptyView(48),
849 - Container(  
850 - padding: EdgeInsets.symmetric(vertical: w(8)),  
851 - child: Text('优质客户标记',  
852 - style: TextStyle(  
853 - color: MyColours.color_515151,  
854 - fontSize: ScreenUtil().setSp(32)))),  
855 - VEmptyView(22),  
856 - MyDivider(  
857 - double.infinity,  
858 - w(1),  
859 - color: MyColours.color_E7E7E7,  
860 - ), 849 + // Container(
  850 + // padding: EdgeInsets.symmetric(vertical: w(8)),
  851 + // child: Text('优质客户标记',
  852 + // style: TextStyle(
  853 + // color: MyColours.color_515151,
  854 + // fontSize: ScreenUtil().setSp(32)))),
  855 + // VEmptyView(22),
  856 + // MyDivider(
  857 + // double.infinity,
  858 + // w(1),
  859 + // color: MyColours.color_E7E7E7,
  860 + // ),
  861 + // VEmptyView(24),
  862 + // InkWell(
  863 + // onTap: () {
  864 + // setState(() {
  865 + // customerProvider.isHighFrequency =
  866 + // !customerProvider.isHighFrequency;
  867 + // });
  868 + // },
  869 + // child: Container(
  870 + // padding: EdgeInsets.symmetric(
  871 + // vertical: w(8), horizontal: w(14)),
  872 + // child: Row(
  873 + // mainAxisAlignment: MainAxisAlignment.spaceBetween,
  874 + // crossAxisAlignment: CrossAxisAlignment.center,
  875 + // children: [
  876 + // Text('高频客户标记',
  877 + // style: TextStyle(
  878 + // color: MyColours.color_515151,
  879 + // fontSize: ScreenUtil().setSp(28))),
  880 + // Image.asset(
  881 + // customerProvider.isHighFrequency
  882 + // ? Utils.getImgPath('swich_on')
  883 + // : Utils.getImgPath('swich_off'),
  884 + // width: ScreenUtil().setWidth(88),
  885 + // // height: ScreenUtil().setWidth(82),
  886 + // ),
  887 + // ],
  888 + // ),
  889 + // )),
  890 + // Padding(
  891 + // padding: EdgeInsets.only(left: w(14), right: w(10)),
  892 + // child: MyDivider(
  893 + // double.infinity,
  894 + // w(1),
  895 + // color: MyColours.color_E7E7E7,
  896 + // )),
  897 + // VEmptyView(24),
  898 + // Container(
  899 + // padding:
  900 + // EdgeInsets.symmetric(vertical: w(8), horizontal: w(14)),
  901 + // child: Row(
  902 + // children: [
  903 + // Expanded(
  904 + // child: Container(
  905 + // padding: EdgeInsets.symmetric(vertical: w(8)),
  906 + // child: Text('指定期限',
  907 + // overflow: TextOverflow.ellipsis,
  908 + // maxLines: 10,
  909 + // style: TextStyle(
  910 + // color: MyColours.color_515151,
  911 + // fontSize: ScreenUtil().setSp(28))))),
  912 + // HEmptyView(2),
  913 + // Container(
  914 + // width: w(40),
  915 + // child: TextField(
  916 + // controller: controllerDeadline,
  917 + // textAlign: TextAlign.right,
  918 + // textAlignVertical: TextAlignVertical.bottom,
  919 + // maxLines: 1,
  920 + // // //光标颜色
  921 + // // cursorColor:
  922 + // // widget.isSelect ? Colors.white : MyColours.color_199095,
  923 + // //输入文本的样式
  924 + // style: TextStyle(
  925 + // color: MyColours.color_515151,
  926 + // fontSize: ScreenUtil().setSp(28),
  927 + // ),
  928 + // inputFormatters: <TextInputFormatter>[
  929 + // FilteringTextInputFormatter.allow(
  930 + // RegExp(r'[0-9]')), //设置只允许输入数字
  931 + // ],
  932 + // decoration: InputDecoration(
  933 + // isCollapsed: true,
  934 + // border: OutlineInputBorder(
  935 + // borderSide: BorderSide.none),
  936 + // hintText: '输入',
  937 + // hintStyle: TextStyle(
  938 + // color: MyColours.color_999999,
  939 + // fontSize: ScreenUtil().setSp(28),
  940 + // ),
  941 + // enabledBorder: new UnderlineInputBorder(
  942 + // borderSide: BorderSide.none,
  943 + // ),
  944 + // focusedBorder: new UnderlineInputBorder(
  945 + // borderSide: BorderSide.none,
  946 + // ),
  947 + // ),
  948 + // onChanged: (value) {},
  949 + // onEditingComplete: () {
  950 + // FocusScope.of(context)
  951 + // .requestFocus(FocusNode()); //点击空白处隐藏键盘
  952 + // },
  953 + // keyboardType: TextInputType.number),
  954 + // ),
  955 + // HEmptyView(5),
  956 + // Text('天',
  957 + // style: TextStyle(
  958 + // color: MyColours.color_999999,
  959 + // fontSize: ScreenUtil().setSp(28))),
  960 + // // HEmptyView(24),
  961 + // ],
  962 + // )),
  963 + // Padding(
  964 + // padding: EdgeInsets.only(left: w(14), right: w(10)),
  965 + // child: MyDivider(
  966 + // double.infinity,
  967 + // w(1),
  968 + // color: MyColours.color_E7E7E7,
  969 + // )),
  970 + // VEmptyView(24),
  971 + // Container(
  972 + // padding:
  973 + // EdgeInsets.symmetric(vertical: w(8), horizontal: w(14)),
  974 + // child: Row(
  975 + // children: [
  976 + // Expanded(
  977 + // child: Container(
  978 + // padding: EdgeInsets.symmetric(vertical: w(8)),
  979 + // child: Text('消费次数',
  980 + // overflow: TextOverflow.ellipsis,
  981 + // maxLines: 10,
  982 + // style: TextStyle(
  983 + // color: MyColours.color_515151,
  984 + // fontSize: ScreenUtil().setSp(28))))),
  985 + // HEmptyView(2),
  986 + // Container(
  987 + // width: w(40),
  988 + // child: TextField(
  989 + // controller: controllerConsumptionTimes,
  990 + // textAlign: TextAlign.right,
  991 + // textAlignVertical: TextAlignVertical.bottom,
  992 + // maxLines: 1,
  993 + // // //光标颜色
  994 + // // cursorColor:
  995 + // // widget.isSelect ? Colors.white : MyColours.color_199095,
  996 + // //输入文本的样式
  997 + // style: TextStyle(
  998 + // color: MyColours.color_515151,
  999 + // fontSize: ScreenUtil().setSp(28),
  1000 + // ),
  1001 + // inputFormatters: <TextInputFormatter>[
  1002 + // FilteringTextInputFormatter.allow(
  1003 + // RegExp(r'[0-9]')), //设置只允许输入数字
  1004 + // ],
  1005 + // decoration: InputDecoration(
  1006 + // isCollapsed: true,
  1007 + // border: OutlineInputBorder(
  1008 + // borderSide: BorderSide.none),
  1009 + // hintText: '输入',
  1010 + // hintStyle: TextStyle(
  1011 + // color: MyColours.color_999999,
  1012 + // fontSize: ScreenUtil().setSp(28),
  1013 + // ),
  1014 + // enabledBorder: new UnderlineInputBorder(
  1015 + // borderSide: BorderSide.none,
  1016 + // ),
  1017 + // focusedBorder: new UnderlineInputBorder(
  1018 + // borderSide: BorderSide.none,
  1019 + // ),
  1020 + // ),
  1021 + // onChanged: (value) {},
  1022 + // onEditingComplete: () {
  1023 + // FocusScope.of(context)
  1024 + // .requestFocus(FocusNode()); //点击空白处隐藏键盘
  1025 + // },
  1026 + // keyboardType: TextInputType.number),
  1027 + // ),
  1028 + // HEmptyView(5),
  1029 + // Text('次',
  1030 + // style: TextStyle(
  1031 + // color: MyColours.color_999999,
  1032 + // fontSize: ScreenUtil().setSp(28))),
  1033 + // // HEmptyView(24),
  1034 + // ],
  1035 + // )),
  1036 + // Padding(
  1037 + // padding: EdgeInsets.only(left: w(14), right: w(10)),
  1038 + // child: MyDivider(
  1039 + // double.infinity,
  1040 + // w(1),
  1041 + // color: MyColours.color_E7E7E7,
  1042 + // )),
  1043 + // VEmptyView(24),
  1044 + // InkWell(
  1045 + // onTap: () {
  1046 + // setState(() {
  1047 + // customerProvider.isHighConsumption =
  1048 + // !customerProvider.isHighConsumption;
  1049 + // });
  1050 + // },
  1051 + // child: Container(
  1052 + // padding: EdgeInsets.symmetric(
  1053 + // vertical: w(8), horizontal: w(14)),
  1054 + // child: Row(
  1055 + // mainAxisAlignment: MainAxisAlignment.spaceBetween,
  1056 + // crossAxisAlignment: CrossAxisAlignment.center,
  1057 + // children: [
  1058 + // Text('高消费客户标记',
  1059 + // style: TextStyle(
  1060 + // color: MyColours.color_515151,
  1061 + // fontSize: ScreenUtil().setSp(28))),
  1062 + // Image.asset(
  1063 + // customerProvider.isHighConsumption
  1064 + // ? Utils.getImgPath('swich_on')
  1065 + // : Utils.getImgPath('swich_off'),
  1066 + // width: ScreenUtil().setWidth(88),
  1067 + // // height: ScreenUtil().setWidth(82),
  1068 + // ),
  1069 + // ],
  1070 + // ),
  1071 + // )),
  1072 + // Padding(
  1073 + // padding: EdgeInsets.only(left: w(14), right: w(10)),
  1074 + // child: MyDivider(
  1075 + // double.infinity,
  1076 + // w(1),
  1077 + // color: MyColours.color_E7E7E7,
  1078 + // )),
  1079 + // VEmptyView(24),
  1080 + // Container(
  1081 + // padding:
  1082 + // EdgeInsets.symmetric(vertical: w(8), horizontal: w(14)),
  1083 + // child: Row(
  1084 + // children: [
  1085 + // Expanded(
  1086 + // child: Container(
  1087 + // padding: EdgeInsets.symmetric(vertical: w(8)),
  1088 + // child: Text('客户人均消费到达设置金额标记为高单值',
  1089 + // overflow: TextOverflow.ellipsis,
  1090 + // maxLines: 10,
  1091 + // style: TextStyle(
  1092 + // color: MyColours.color_515151,
  1093 + // fontSize: ScreenUtil().setSp(28))))),
  1094 + // HEmptyView(2),
  1095 + // Container(
  1096 + // width: w(40),
  1097 + // child: TextField(
  1098 + // controller: controllerHighValue,
  1099 + // textAlign: TextAlign.right,
  1100 + // textAlignVertical: TextAlignVertical.bottom,
  1101 + // maxLines: 1,
  1102 + // // //光标颜色
  1103 + // // cursorColor:
  1104 + // // widget.isSelect ? Colors.white : MyColours.color_199095,
  1105 + // //输入文本的样式
  1106 + // style: TextStyle(
  1107 + // color: MyColours.color_515151,
  1108 + // fontSize: ScreenUtil().setSp(28),
  1109 + // ),
  1110 + // inputFormatters: <TextInputFormatter>[
  1111 + // FilteringTextInputFormatter.allow(
  1112 + // RegExp("[0-9.]")),
  1113 + // ],
  1114 + // decoration: InputDecoration(
  1115 + // isCollapsed: true,
  1116 + // border: OutlineInputBorder(
  1117 + // borderSide: BorderSide.none),
  1118 + // hintText: '输入',
  1119 + // hintStyle: TextStyle(
  1120 + // color: MyColours.color_999999,
  1121 + // fontSize: ScreenUtil().setSp(28),
  1122 + // ),
  1123 + // enabledBorder: new UnderlineInputBorder(
  1124 + // borderSide: BorderSide.none,
  1125 + // ),
  1126 + // focusedBorder: new UnderlineInputBorder(
  1127 + // borderSide: BorderSide.none,
  1128 + // ),
  1129 + // ),
  1130 + // onChanged: (value) {},
  1131 + // onEditingComplete: () {
  1132 + // FocusScope.of(context)
  1133 + // .requestFocus(FocusNode()); //点击空白处隐藏键盘
  1134 + // },
  1135 + // keyboardType: TextInputType.number),
  1136 + // ),
  1137 + // HEmptyView(5),
  1138 + // Text('元',
  1139 + // style: TextStyle(
  1140 + // color: MyColours.color_999999,
  1141 + // fontSize: ScreenUtil().setSp(28))),
  1142 + // // HEmptyView(24),
  1143 + // ],
  1144 + // )),
  1145 + // Padding(
  1146 + // padding: EdgeInsets.only(left: w(14), right: w(10)),
  1147 + // child: MyDivider(
  1148 + // double.infinity,
  1149 + // w(1),
  1150 + // color: MyColours.color_E7E7E7,
  1151 + // )),
861 VEmptyView(24), 1152 VEmptyView(24),
862 - InkWell(  
863 - onTap: () {  
864 - setState(() {  
865 - customerProvider.isHighFrequency =  
866 - !customerProvider.isHighFrequency;  
867 - });  
868 - },  
869 - child: Container(  
870 - padding: EdgeInsets.symmetric(  
871 - vertical: w(8), horizontal: w(14)),  
872 - child: Row(  
873 - mainAxisAlignment: MainAxisAlignment.spaceBetween,  
874 - crossAxisAlignment: CrossAxisAlignment.center,  
875 - children: [  
876 - Text('高频客户标记',  
877 - style: TextStyle(  
878 - color: MyColours.color_515151,  
879 - fontSize: ScreenUtil().setSp(28))),  
880 - Image.asset(  
881 - customerProvider.isHighFrequency  
882 - ? Utils.getImgPath('swich_on')  
883 - : Utils.getImgPath('swich_off'),  
884 - width: ScreenUtil().setWidth(88),  
885 - // height: ScreenUtil().setWidth(82),  
886 - ),  
887 - ],  
888 - ),  
889 - )),  
890 - Padding(  
891 - padding: EdgeInsets.only(left: w(14), right: w(10)),  
892 - child: MyDivider(  
893 - double.infinity,  
894 - w(1),  
895 - color: MyColours.color_E7E7E7,  
896 - )),  
897 - VEmptyView(24),  
898 - Container(  
899 - padding:  
900 - EdgeInsets.symmetric(vertical: w(8), horizontal: w(14)),  
901 - child: Row(  
902 - children: [  
903 - Expanded(  
904 - child: Container(  
905 - padding: EdgeInsets.symmetric(vertical: w(8)),  
906 - child: Text('指定期限',  
907 - overflow: TextOverflow.ellipsis,  
908 - maxLines: 10,  
909 - style: TextStyle(  
910 - color: MyColours.color_515151,  
911 - fontSize: ScreenUtil().setSp(28))))),  
912 - HEmptyView(2),  
913 - Container(  
914 - width: w(40),  
915 - child: TextField(  
916 - controller: controllerDeadline,  
917 - textAlign: TextAlign.right,  
918 - textAlignVertical: TextAlignVertical.bottom,  
919 - maxLines: 1,  
920 - // //光标颜色  
921 - // cursorColor:  
922 - // widget.isSelect ? Colors.white : MyColours.color_199095,  
923 - //输入文本的样式  
924 - style: TextStyle(  
925 - color: MyColours.color_515151,  
926 - fontSize: ScreenUtil().setSp(28),  
927 - ),  
928 - inputFormatters: <TextInputFormatter>[  
929 - FilteringTextInputFormatter.allow(  
930 - RegExp(r'[0-9]')), //设置只允许输入数字  
931 - ],  
932 - decoration: InputDecoration(  
933 - isCollapsed: true,  
934 - border: OutlineInputBorder(  
935 - borderSide: BorderSide.none),  
936 - hintText: '输入',  
937 - hintStyle: TextStyle(  
938 - color: MyColours.color_999999,  
939 - fontSize: ScreenUtil().setSp(28),  
940 - ),  
941 - enabledBorder: new UnderlineInputBorder(  
942 - borderSide: BorderSide.none,  
943 - ),  
944 - focusedBorder: new UnderlineInputBorder(  
945 - borderSide: BorderSide.none,  
946 - ),  
947 - ),  
948 - onChanged: (value) {},  
949 - onEditingComplete: () {  
950 - FocusScope.of(context)  
951 - .requestFocus(FocusNode()); //点击空白处隐藏键盘  
952 - },  
953 - keyboardType: TextInputType.number),  
954 - ),  
955 - HEmptyView(5),  
956 - Text('天',  
957 - style: TextStyle(  
958 - color: MyColours.color_999999,  
959 - fontSize: ScreenUtil().setSp(28))),  
960 - // HEmptyView(24),  
961 - ],  
962 - )),  
963 - Padding(  
964 - padding: EdgeInsets.only(left: w(14), right: w(10)),  
965 - child: MyDivider(  
966 - double.infinity,  
967 - w(1),  
968 - color: MyColours.color_E7E7E7,  
969 - )),  
970 - VEmptyView(24),  
971 - Container(  
972 - padding:  
973 - EdgeInsets.symmetric(vertical: w(8), horizontal: w(14)),  
974 - child: Row(  
975 - children: [  
976 - Expanded(  
977 - child: Container(  
978 - padding: EdgeInsets.symmetric(vertical: w(8)),  
979 - child: Text('消费次数',  
980 - overflow: TextOverflow.ellipsis,  
981 - maxLines: 10,  
982 - style: TextStyle(  
983 - color: MyColours.color_515151,  
984 - fontSize: ScreenUtil().setSp(28))))),  
985 - HEmptyView(2),  
986 - Container(  
987 - width: w(40),  
988 - child: TextField(  
989 - controller: controllerConsumptionTimes,  
990 - textAlign: TextAlign.right,  
991 - textAlignVertical: TextAlignVertical.bottom,  
992 - maxLines: 1,  
993 - // //光标颜色  
994 - // cursorColor:  
995 - // widget.isSelect ? Colors.white : MyColours.color_199095,  
996 - //输入文本的样式  
997 - style: TextStyle(  
998 - color: MyColours.color_515151,  
999 - fontSize: ScreenUtil().setSp(28),  
1000 - ),  
1001 - inputFormatters: <TextInputFormatter>[  
1002 - FilteringTextInputFormatter.allow(  
1003 - RegExp(r'[0-9]')), //设置只允许输入数字  
1004 - ],  
1005 - decoration: InputDecoration(  
1006 - isCollapsed: true,  
1007 - border: OutlineInputBorder(  
1008 - borderSide: BorderSide.none),  
1009 - hintText: '输入',  
1010 - hintStyle: TextStyle(  
1011 - color: MyColours.color_999999,  
1012 - fontSize: ScreenUtil().setSp(28),  
1013 - ),  
1014 - enabledBorder: new UnderlineInputBorder(  
1015 - borderSide: BorderSide.none,  
1016 - ),  
1017 - focusedBorder: new UnderlineInputBorder(  
1018 - borderSide: BorderSide.none,  
1019 - ),  
1020 - ),  
1021 - onChanged: (value) {},  
1022 - onEditingComplete: () {  
1023 - FocusScope.of(context)  
1024 - .requestFocus(FocusNode()); //点击空白处隐藏键盘  
1025 - },  
1026 - keyboardType: TextInputType.number),  
1027 - ),  
1028 - HEmptyView(5),  
1029 - Text('次',  
1030 - style: TextStyle(  
1031 - color: MyColours.color_999999,  
1032 - fontSize: ScreenUtil().setSp(28))),  
1033 - // HEmptyView(24),  
1034 - ],  
1035 - )),  
1036 - Padding(  
1037 - padding: EdgeInsets.only(left: w(14), right: w(10)),  
1038 - child: MyDivider(  
1039 - double.infinity,  
1040 - w(1),  
1041 - color: MyColours.color_E7E7E7,  
1042 - )),  
1043 - VEmptyView(24),  
1044 - InkWell(  
1045 - onTap: () {  
1046 - setState(() {  
1047 - customerProvider.isHighConsumption =  
1048 - !customerProvider.isHighConsumption;  
1049 - });  
1050 - },  
1051 - child: Container(  
1052 - padding: EdgeInsets.symmetric(  
1053 - vertical: w(8), horizontal: w(14)),  
1054 - child: Row(  
1055 - mainAxisAlignment: MainAxisAlignment.spaceBetween,  
1056 - crossAxisAlignment: CrossAxisAlignment.center,  
1057 - children: [  
1058 - Text('高消费客户标记',  
1059 - style: TextStyle(  
1060 - color: MyColours.color_515151,  
1061 - fontSize: ScreenUtil().setSp(28))),  
1062 - Image.asset(  
1063 - customerProvider.isHighConsumption  
1064 - ? Utils.getImgPath('swich_on')  
1065 - : Utils.getImgPath('swich_off'),  
1066 - width: ScreenUtil().setWidth(88),  
1067 - // height: ScreenUtil().setWidth(82),  
1068 - ),  
1069 - ],  
1070 - ),  
1071 - )),  
1072 - Padding(  
1073 - padding: EdgeInsets.only(left: w(14), right: w(10)),  
1074 - child: MyDivider(  
1075 - double.infinity,  
1076 - w(1),  
1077 - color: MyColours.color_E7E7E7,  
1078 - )),  
1079 - VEmptyView(24),  
1080 - Container(  
1081 - padding:  
1082 - EdgeInsets.symmetric(vertical: w(8), horizontal: w(14)),  
1083 - child: Row(  
1084 - children: [  
1085 - Expanded(  
1086 - child: Container(  
1087 - padding: EdgeInsets.symmetric(vertical: w(8)),  
1088 - child: Text('客户人均消费到达设置金额标记为高单值',  
1089 - overflow: TextOverflow.ellipsis,  
1090 - maxLines: 10,  
1091 - style: TextStyle(  
1092 - color: MyColours.color_515151,  
1093 - fontSize: ScreenUtil().setSp(28))))),  
1094 - HEmptyView(2),  
1095 - Container(  
1096 - width: w(40),  
1097 - child: TextField(  
1098 - controller: controllerHighValue,  
1099 - textAlign: TextAlign.right,  
1100 - textAlignVertical: TextAlignVertical.bottom,  
1101 - maxLines: 1,  
1102 - // //光标颜色  
1103 - // cursorColor:  
1104 - // widget.isSelect ? Colors.white : MyColours.color_199095,  
1105 - //输入文本的样式  
1106 - style: TextStyle(  
1107 - color: MyColours.color_515151,  
1108 - fontSize: ScreenUtil().setSp(28),  
1109 - ),  
1110 - inputFormatters: <TextInputFormatter>[  
1111 - FilteringTextInputFormatter.allow(  
1112 - RegExp("[0-9.]")),  
1113 - ],  
1114 - decoration: InputDecoration(  
1115 - isCollapsed: true,  
1116 - border: OutlineInputBorder(  
1117 - borderSide: BorderSide.none),  
1118 - hintText: '输入',  
1119 - hintStyle: TextStyle(  
1120 - color: MyColours.color_999999,  
1121 - fontSize: ScreenUtil().setSp(28),  
1122 - ),  
1123 - enabledBorder: new UnderlineInputBorder(  
1124 - borderSide: BorderSide.none,  
1125 - ),  
1126 - focusedBorder: new UnderlineInputBorder(  
1127 - borderSide: BorderSide.none,  
1128 - ),  
1129 - ),  
1130 - onChanged: (value) {},  
1131 - onEditingComplete: () {  
1132 - FocusScope.of(context)  
1133 - .requestFocus(FocusNode()); //点击空白处隐藏键盘  
1134 - },  
1135 - keyboardType: TextInputType.number),  
1136 - ),  
1137 - HEmptyView(5),  
1138 - Text('元',  
1139 - style: TextStyle(  
1140 - color: MyColours.color_999999,  
1141 - fontSize: ScreenUtil().setSp(28))),  
1142 - // HEmptyView(24),  
1143 - ],  
1144 - )),  
1145 - Padding(  
1146 - padding: EdgeInsets.only(left: w(14), right: w(10)),  
1147 - child: MyDivider(  
1148 - double.infinity,  
1149 - w(1),  
1150 - color: MyColours.color_E7E7E7,  
1151 - )),  
1152 - VEmptyView(24),  
1153 - VEmptyView(48), 1153 + // VEmptyView(48),
1154 Text('店内自定义标签', 1154 Text('店内自定义标签',
1155 style: TextStyle( 1155 style: TextStyle(
1156 color: MyColours.color_515151, 1156 color: MyColours.color_515151,
@@ -1196,22 +1196,22 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> { @@ -1196,22 +1196,22 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
1196 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 1196 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
1197 1197
1198 //前置条件判断 1198 //前置条件判断
1199 - if (customerProvider.isHighFrequency) {  
1200 - if (controllerDeadline.text.trim().length == 0) {  
1201 - Utils.showToast('请输入指定期限');  
1202 - return;  
1203 - }  
1204 - if (controllerConsumptionTimes.text.trim().length == 0) {  
1205 - Utils.showToast('请输入消费次数');  
1206 - return;  
1207 - }  
1208 - }  
1209 - if (customerProvider.isHighConsumption) {  
1210 - if (controllerHighValue.text.trim().length == 0) {  
1211 - Utils.showToast('请设置客户人均消费到达金额');  
1212 - return;  
1213 - }  
1214 - } 1199 + // if (customerProvider.isHighFrequency) {
  1200 + // if (controllerDeadline.text.trim().length == 0) {
  1201 + // Utils.showToast('请输入指定期限');
  1202 + // return;
  1203 + // }
  1204 + // if (controllerConsumptionTimes.text.trim().length == 0) {
  1205 + // Utils.showToast('请输入消费次数');
  1206 + // return;
  1207 + // }
  1208 + // }
  1209 + // if (customerProvider.isHighConsumption) {
  1210 + // if (controllerHighValue.text.trim().length == 0) {
  1211 + // Utils.showToast('请设置客户人均消费到达金额');
  1212 + // return;
  1213 + // }
  1214 + // }
1215 _saveData(); 1215 _saveData();
1216 }, 1216 },
1217 ), 1217 ),