Showing
46 changed files
with
231 additions
and
98 deletions
| @@ -99,6 +99,9 @@ class CustomerBySellerSunModel extends Object with ISuspensionBean { | @@ -99,6 +99,9 @@ class CustomerBySellerSunModel extends Object with ISuspensionBean { | ||
| 99 | case "3": //公司 | 99 | case "3": //公司 |
| 100 | case "公司": | 100 | case "公司": |
| 101 | return "公司"; | 101 | return "公司"; |
| 102 | + case "4": //贵宾 | ||
| 103 | + case "贵宾": | ||
| 104 | + return "贵宾"; | ||
| 102 | } | 105 | } |
| 103 | } | 106 | } |
| 104 | 107 |
| @@ -96,9 +96,6 @@ class CustomerListSunModel extends Object with ISuspensionBean { | @@ -96,9 +96,6 @@ class CustomerListSunModel extends Object with ISuspensionBean { | ||
| 96 | @JsonKey(name: 'store_day') | 96 | @JsonKey(name: 'store_day') |
| 97 | dynamic storeDay; | 97 | dynamic storeDay; |
| 98 | 98 | ||
| 99 | - | ||
| 100 | - | ||
| 101 | - | ||
| 102 | bool select = false; | 99 | bool select = false; |
| 103 | 100 | ||
| 104 | List<String> pinyinList; //全拼数组 | 101 | List<String> pinyinList; //全拼数组 |
| @@ -124,37 +121,39 @@ class CustomerListSunModel extends Object with ISuspensionBean { | @@ -124,37 +121,39 @@ class CustomerListSunModel extends Object with ISuspensionBean { | ||
| 124 | case "3": //公司 | 121 | case "3": //公司 |
| 125 | case "公司": | 122 | case "公司": |
| 126 | return "公司"; | 123 | return "公司"; |
| 124 | + case "4": //贵宾 | ||
| 125 | + case "贵宾": | ||
| 126 | + return "贵宾"; | ||
| 127 | } | 127 | } |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | CustomerListSunModel( | 130 | CustomerListSunModel( |
| 131 | - this.id, | ||
| 132 | - this.sellerid, | ||
| 133 | - this.uid, | ||
| 134 | - this.rname, | ||
| 135 | - this.sex, | ||
| 136 | - this.phone, | ||
| 137 | - this.cdate, | ||
| 138 | - this.leiji, | ||
| 139 | - this.attr, | ||
| 140 | - this.ddate, | ||
| 141 | - this.ddateSolt, | ||
| 142 | - this.company, | ||
| 143 | - this.section, | ||
| 144 | - this.position, | ||
| 145 | - this.taboos, | ||
| 146 | - this.like, | ||
| 147 | - this.serve, | ||
| 148 | - this.cDay, | ||
| 149 | - this.udate, | ||
| 150 | - this.monthCount, | ||
| 151 | - this.label, | ||
| 152 | - this.nickName, | ||
| 153 | - this.gid, | ||
| 154 | - this.isMember, | ||
| 155 | - this.conAmount, | ||
| 156 | - this.storeDay | ||
| 157 | - ); | 131 | + this.id, |
| 132 | + this.sellerid, | ||
| 133 | + this.uid, | ||
| 134 | + this.rname, | ||
| 135 | + this.sex, | ||
| 136 | + this.phone, | ||
| 137 | + this.cdate, | ||
| 138 | + this.leiji, | ||
| 139 | + this.attr, | ||
| 140 | + this.ddate, | ||
| 141 | + this.ddateSolt, | ||
| 142 | + this.company, | ||
| 143 | + this.section, | ||
| 144 | + this.position, | ||
| 145 | + this.taboos, | ||
| 146 | + this.like, | ||
| 147 | + this.serve, | ||
| 148 | + this.cDay, | ||
| 149 | + this.udate, | ||
| 150 | + this.monthCount, | ||
| 151 | + this.label, | ||
| 152 | + this.nickName, | ||
| 153 | + this.gid, | ||
| 154 | + this.isMember, | ||
| 155 | + this.conAmount, | ||
| 156 | + this.storeDay); | ||
| 158 | 157 | ||
| 159 | factory CustomerListSunModel.fromJson(Map<String, dynamic> srcJson) => | 158 | factory CustomerListSunModel.fromJson(Map<String, dynamic> srcJson) => |
| 160 | _$CustomerListSunModelFromJson(srcJson); | 159 | _$CustomerListSunModelFromJson(srcJson); |
| @@ -178,6 +178,9 @@ class DsoltListModel { | @@ -178,6 +178,9 @@ class DsoltListModel { | ||
| 178 | case "3": //公司 | 178 | case "3": //公司 |
| 179 | case "公司": | 179 | case "公司": |
| 180 | return rname + "公司"; | 180 | return rname + "公司"; |
| 181 | + case "4": //贵宾 | ||
| 182 | + case "贵宾": | ||
| 183 | + return rname + "贵宾"; | ||
| 181 | } | 184 | } |
| 182 | } | 185 | } |
| 183 | 186 |
| @@ -246,11 +246,11 @@ class DetailModelAllSunModel { | @@ -246,11 +246,11 @@ class DetailModelAllSunModel { | ||
| 246 | // break; | 246 | // break; |
| 247 | // } | 247 | // } |
| 248 | // } else { | 248 | // } else { |
| 249 | - DateTime dateTime = | ||
| 250 | - DateTime.fromMillisecondsSinceEpoch(int.parse(ddate) * 1000); | ||
| 251 | - ddateStr = Utils.addZeroNumber(dateTime.hour) + | ||
| 252 | - ":" + | ||
| 253 | - Utils.addZeroNumber(dateTime.minute); | 249 | + DateTime dateTime = |
| 250 | + DateTime.fromMillisecondsSinceEpoch(int.parse(ddate) * 1000); | ||
| 251 | + ddateStr = Utils.addZeroNumber(dateTime.hour) + | ||
| 252 | + ":" + | ||
| 253 | + Utils.addZeroNumber(dateTime.minute); | ||
| 254 | // } | 254 | // } |
| 255 | return ddateStr; | 255 | return ddateStr; |
| 256 | } | 256 | } |
| @@ -264,18 +264,19 @@ class DetailModelAllSunModel { | @@ -264,18 +264,19 @@ class DetailModelAllSunModel { | ||
| 264 | return rname + "女士"; | 264 | return rname + "女士"; |
| 265 | case "3": //公司 | 265 | case "3": //公司 |
| 266 | return rname + "公司"; | 266 | return rname + "公司"; |
| 267 | + case "4": //贵宾 | ||
| 268 | + return rname + "贵宾"; | ||
| 267 | } | 269 | } |
| 268 | return rname; | 270 | return rname; |
| 269 | } | 271 | } |
| 270 | 272 | ||
| 271 | List get tables { | 273 | List get tables { |
| 272 | - if( tableinfo ==''|| tableinfo == null){ | 274 | + if (tableinfo == '' || tableinfo == null) { |
| 273 | return []; | 275 | return []; |
| 274 | - }else{ | ||
| 275 | - List temp = tableinfo.split(','); | ||
| 276 | - return temp; | 276 | + } else { |
| 277 | + List temp = tableinfo.split(','); | ||
| 278 | + return temp; | ||
| 277 | } | 279 | } |
| 278 | - | ||
| 279 | } | 280 | } |
| 280 | 281 | ||
| 281 | String get tableinfoStr { | 282 | String get tableinfoStr { |
| @@ -453,12 +454,14 @@ class DetailModelAllSunModel { | @@ -453,12 +454,14 @@ class DetailModelAllSunModel { | ||
| 453 | : (json["demands"] as List).map((e) => Demands.fromJson(e)).toList(); | 454 | : (json["demands"] as List).map((e) => Demands.fromJson(e)).toList(); |
| 454 | } | 455 | } |
| 455 | if (json["table_photo"] is List) { | 456 | if (json["table_photo"] is List) { |
| 456 | - tablePhoto= json["table_photo"] == null | 457 | + tablePhoto = json["table_photo"] == null |
| 457 | ? null | 458 | ? null |
| 458 | - : (json["table_photo"] as List).map((e) => TablePhotos.fromJson(e)).toList(); | 459 | + : (json["table_photo"] as List) |
| 460 | + .map((e) => TablePhotos.fromJson(e)) | ||
| 461 | + .toList(); | ||
| 459 | } | 462 | } |
| 460 | 463 | ||
| 461 | - orderInfoStatus = json["order_info_status"]; | 464 | + orderInfoStatus = json["order_info_status"]; |
| 462 | if (json["reserve_type_field"] is List) { | 465 | if (json["reserve_type_field"] is List) { |
| 463 | reserveTypeField = json["reserve_type_field"] == null | 466 | reserveTypeField = json["reserve_type_field"] == null |
| 464 | ? null | 467 | ? null |
| @@ -540,10 +543,10 @@ class DetailModelAllSunModel { | @@ -540,10 +543,10 @@ class DetailModelAllSunModel { | ||
| 540 | if (demands != null) { | 543 | if (demands != null) { |
| 541 | _data["demands"] = demands?.map((e) => e.toJson()).toList(); | 544 | _data["demands"] = demands?.map((e) => e.toJson()).toList(); |
| 542 | } | 545 | } |
| 543 | -if (tablePhoto != null) { | 546 | + if (tablePhoto != null) { |
| 544 | _data["table_photo"] = tablePhoto?.map((e) => e.toJson()).toList(); | 547 | _data["table_photo"] = tablePhoto?.map((e) => e.toJson()).toList(); |
| 545 | } | 548 | } |
| 546 | - | 549 | + |
| 547 | _data["order_info_status"] = orderInfoStatus; | 550 | _data["order_info_status"] = orderInfoStatus; |
| 548 | if (reserveTypeField != null) { | 551 | if (reserveTypeField != null) { |
| 549 | _data["reserve_type_field"] = reserveTypeField; | 552 | _data["reserve_type_field"] = reserveTypeField; |
| @@ -131,13 +131,13 @@ class NewUnmessage extends Object { | @@ -131,13 +131,13 @@ class NewUnmessage extends Object { | ||
| 131 | @JsonKey(name: 'store_cdate') | 131 | @JsonKey(name: 'store_cdate') |
| 132 | String storeCdate; | 132 | String storeCdate; |
| 133 | 133 | ||
| 134 | - @JsonKey(name: 'desc') | 134 | + @JsonKey(name: 'desc') |
| 135 | String desc; | 135 | String desc; |
| 136 | 136 | ||
| 137 | - @JsonKey(name: 'dtime') | 137 | + @JsonKey(name: 'dtime') |
| 138 | String dtime; | 138 | String dtime; |
| 139 | 139 | ||
| 140 | - @JsonKey(name: 'wid') | 140 | + @JsonKey(name: 'wid') |
| 141 | String wid; | 141 | String wid; |
| 142 | 142 | ||
| 143 | NewUnmessage( | 143 | NewUnmessage( |
| @@ -187,6 +187,9 @@ class NewUnmessage extends Object { | @@ -187,6 +187,9 @@ class NewUnmessage extends Object { | ||
| 187 | case "3": //公司 | 187 | case "3": //公司 |
| 188 | case "公司": | 188 | case "公司": |
| 189 | return rname + "公司"; | 189 | return rname + "公司"; |
| 190 | + case "4": //贵宾 | ||
| 191 | + case "贵宾": | ||
| 192 | + return rname + "贵宾"; | ||
| 190 | } | 193 | } |
| 191 | } | 194 | } |
| 192 | 195 | ||
| @@ -220,7 +223,7 @@ class NewUnmessage extends Object { | @@ -220,7 +223,7 @@ class NewUnmessage extends Object { | ||
| 220 | return '会员充值${price}元'; | 223 | return '会员充值${price}元'; |
| 221 | } else if (message_type == '18') { | 224 | } else if (message_type == '18') { |
| 222 | return '${storeCdateShow} 存酒'; | 225 | return '${storeCdateShow} 存酒'; |
| 223 | - }else if (message_type == '19') { | 226 | + } else if (message_type == '19') { |
| 224 | return '${desc} ${dtime}'; | 227 | return '${desc} ${dtime}'; |
| 225 | } | 228 | } |
| 226 | } | 229 | } |
| @@ -83,6 +83,9 @@ class NoteBookOnlySunModel { | @@ -83,6 +83,9 @@ class NoteBookOnlySunModel { | ||
| 83 | case "3": //公司 | 83 | case "3": //公司 |
| 84 | return rname + "公司"; | 84 | return rname + "公司"; |
| 85 | break; | 85 | break; |
| 86 | + case "4": //贵宾 | ||
| 87 | + return rname + "贵宾"; | ||
| 88 | + break; | ||
| 86 | default: | 89 | default: |
| 87 | return rname; | 90 | return rname; |
| 88 | } | 91 | } |
| @@ -7,16 +7,11 @@ import 'dart:convert' as convert; | @@ -7,16 +7,11 @@ import 'dart:convert' as convert; | ||
| 7 | import 'package:one_key/models/table_list.dart' as t; | 7 | import 'package:one_key/models/table_list.dart' as t; |
| 8 | part 'notebook.g.dart'; | 8 | part 'notebook.g.dart'; |
| 9 | 9 | ||
| 10 | - | ||
| 11 | @JsonSerializable() | 10 | @JsonSerializable() |
| 12 | class Notebook { | 11 | class Notebook { |
| 13 | Notebook(); | 12 | Notebook(); |
| 14 | List<t.TableList> tableinfoList; | 13 | List<t.TableList> tableinfoList; |
| 15 | 14 | ||
| 16 | - | ||
| 17 | - | ||
| 18 | - | ||
| 19 | - | ||
| 20 | String tableinfo; | 15 | String tableinfo; |
| 21 | String id; | 16 | String id; |
| 22 | String orderid; | 17 | String orderid; |
| @@ -106,6 +101,9 @@ class Notebook { | @@ -106,6 +101,9 @@ class Notebook { | ||
| 106 | case "3": //公司 | 101 | case "3": //公司 |
| 107 | return rname + "公司"; | 102 | return rname + "公司"; |
| 108 | break; | 103 | break; |
| 104 | + case "4": //贵宾 | ||
| 105 | + return rname + "贵宾"; | ||
| 106 | + break; | ||
| 109 | default: | 107 | default: |
| 110 | return rname; | 108 | return rname; |
| 111 | } | 109 | } |
| @@ -11,7 +11,6 @@ import 'package:one_key/models/table.dart' as t; | @@ -11,7 +11,6 @@ import 'package:one_key/models/table.dart' as t; | ||
| 11 | import 'dart:convert' as convert; | 11 | import 'dart:convert' as convert; |
| 12 | part 'notebook_detail.g.dart'; | 12 | part 'notebook_detail.g.dart'; |
| 13 | 13 | ||
| 14 | - | ||
| 15 | @JsonSerializable() | 14 | @JsonSerializable() |
| 16 | class NotebookDetail { | 15 | class NotebookDetail { |
| 17 | NotebookDetail(); | 16 | NotebookDetail(); |
| @@ -118,9 +117,8 @@ class NotebookDetail { | @@ -118,9 +117,8 @@ class NotebookDetail { | ||
| 118 | 117 | ||
| 119 | List<String> photo_note; //图片备注 | 118 | List<String> photo_note; //图片备注 |
| 120 | 119 | ||
| 121 | - String serve_name;//服务人员 | ||
| 122 | - String serve_uid;//服务人员uid | ||
| 123 | - | 120 | + String serve_name; //服务人员 |
| 121 | + String serve_uid; //服务人员uid | ||
| 124 | 122 | ||
| 125 | String get statuImgAssets { | 123 | String get statuImgAssets { |
| 126 | switch (status) { | 124 | switch (status) { |
| @@ -300,6 +298,8 @@ class NotebookDetail { | @@ -300,6 +298,8 @@ class NotebookDetail { | ||
| 300 | return rname + "女士"; | 298 | return rname + "女士"; |
| 301 | case "3": //公司 | 299 | case "3": //公司 |
| 302 | return rname + "公司"; | 300 | return rname + "公司"; |
| 301 | + case "4": //贵宾 | ||
| 302 | + return rname + "贵宾"; | ||
| 303 | } | 303 | } |
| 304 | return rname; | 304 | return rname; |
| 305 | } | 305 | } |
| @@ -186,6 +186,8 @@ class Guest { | @@ -186,6 +186,8 @@ class Guest { | ||
| 186 | return rname + "女士"; | 186 | return rname + "女士"; |
| 187 | case "3": //公司 | 187 | case "3": //公司 |
| 188 | return rname + "公司"; | 188 | return rname + "公司"; |
| 189 | + case "4": //贵宾 | ||
| 190 | + return rname + "贵宾"; | ||
| 189 | } | 191 | } |
| 190 | return rname; | 192 | return rname; |
| 191 | } | 193 | } |
| @@ -53,19 +53,14 @@ class UserHistoryEntity extends Object with ISuspensionBean { | @@ -53,19 +53,14 @@ class UserHistoryEntity extends Object with ISuspensionBean { | ||
| 53 | case "3": //公司 | 53 | case "3": //公司 |
| 54 | case "公司": | 54 | case "公司": |
| 55 | return "公司"; | 55 | return "公司"; |
| 56 | + case "4": //贵宾 | ||
| 57 | + case "贵宾": | ||
| 58 | + return "贵宾"; | ||
| 56 | } | 59 | } |
| 57 | } | 60 | } |
| 58 | 61 | ||
| 59 | - UserHistoryEntity( | ||
| 60 | - this.id, | ||
| 61 | - this.sid, | ||
| 62 | - this.rname, | ||
| 63 | - this.sex, | ||
| 64 | - this.phone, | ||
| 65 | - this.cusdem, | ||
| 66 | - this.nickName, | ||
| 67 | - this.uid | ||
| 68 | - ); | 62 | + UserHistoryEntity(this.id, this.sid, this.rname, this.sex, this.phone, |
| 63 | + this.cusdem, this.nickName, this.uid); | ||
| 69 | 64 | ||
| 70 | factory UserHistoryEntity.fromJson(Map<String, dynamic> srcJson) => | 65 | factory UserHistoryEntity.fromJson(Map<String, dynamic> srcJson) => |
| 71 | _$UserHistoryEntityFromJson(srcJson); | 66 | _$UserHistoryEntityFromJson(srcJson); |
| @@ -414,7 +414,8 @@ class _EditReserverPageState extends State<EditReserverPage> { | @@ -414,7 +414,8 @@ class _EditReserverPageState extends State<EditReserverPage> { | ||
| 414 | print('ggg'); | 414 | print('ggg'); |
| 415 | if (value.endsWith('先生') || | 415 | if (value.endsWith('先生') || |
| 416 | value.endsWith('女士') || | 416 | value.endsWith('女士') || |
| 417 | - value.endsWith('公司')) { | 417 | + value.endsWith('公司')|| |
| 418 | + value.endsWith('贵宾')) { | ||
| 418 | nameStr = value.substring( | 419 | nameStr = value.substring( |
| 419 | 0, value.length - 2); | 420 | 0, value.length - 2); |
| 420 | } else { | 421 | } else { |
| @@ -1209,6 +1209,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | @@ -1209,6 +1209,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | ||
| 1209 | } | 1209 | } |
| 1210 | if (nameStr.endsWith('公司')) { | 1210 | if (nameStr.endsWith('公司')) { |
| 1211 | nameStr = nameStr.replaceAll('公司', ''); | 1211 | nameStr = nameStr.replaceAll('公司', ''); |
| 1212 | + }if (nameStr.endsWith('贵宾')) { | ||
| 1213 | + nameStr = nameStr.replaceAll('贵宾', ''); | ||
| 1212 | } | 1214 | } |
| 1213 | } else { | 1215 | } else { |
| 1214 | nameStr = userHistoryEntity.rname; | 1216 | nameStr = userHistoryEntity.rname; |
| @@ -1762,7 +1764,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | @@ -1762,7 +1764,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { | ||
| 1762 | 1764 | ||
| 1763 | if (value.endsWith('先生') || | 1765 | if (value.endsWith('先生') || |
| 1764 | value.endsWith('女士') || | 1766 | value.endsWith('女士') || |
| 1765 | - value.endsWith('公司')) { | 1767 | + value.endsWith('公司')|| |
| 1768 | + value.endsWith('贵宾')) { | ||
| 1766 | nameStr = value.substring( | 1769 | nameStr = value.substring( |
| 1767 | 0, value.length - 2); | 1770 | 0, value.length - 2); |
| 1768 | } else { | 1771 | } else { |
| @@ -604,6 +604,8 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> { | @@ -604,6 +604,8 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> { | ||
| 604 | } | 604 | } |
| 605 | if (nameStr.endsWith('公司')) { | 605 | if (nameStr.endsWith('公司')) { |
| 606 | nameStr = nameStr.replaceAll('公司', ''); | 606 | nameStr = nameStr.replaceAll('公司', ''); |
| 607 | + }if (nameStr.endsWith('贵宾')) { | ||
| 608 | + nameStr = nameStr.replaceAll('贵宾', ''); | ||
| 607 | } | 609 | } |
| 608 | } else { | 610 | } else { |
| 609 | nameStr = userHistoryEntity.rname; | 611 | nameStr = userHistoryEntity.rname; |
| @@ -1366,7 +1368,8 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> { | @@ -1366,7 +1368,8 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> { | ||
| 1366 | 1368 | ||
| 1367 | if (value.endsWith('先生') || | 1369 | if (value.endsWith('先生') || |
| 1368 | value.endsWith('女士') || | 1370 | value.endsWith('女士') || |
| 1369 | - value.endsWith('公司')) { | 1371 | + value.endsWith('公司')|| |
| 1372 | + value.endsWith('贵宾')) { | ||
| 1370 | nameStr = value.substring( | 1373 | nameStr = value.substring( |
| 1371 | 0, value.length - 2); | 1374 | 0, value.length - 2); |
| 1372 | } else { | 1375 | } else { |
| @@ -3359,7 +3359,9 @@ bool showPhone = (Utils.getAuthority(context, '订座详情-电话') || | @@ -3359,7 +3359,9 @@ bool showPhone = (Utils.getAuthority(context, '订座详情-电话') || | ||
| 3359 | value.endsWith( | 3359 | value.endsWith( |
| 3360 | '女士') || | 3360 | '女士') || |
| 3361 | value.endsWith( | 3361 | value.endsWith( |
| 3362 | - '公司')) { | 3362 | + '公司')|| |
| 3363 | + value.endsWith( | ||
| 3364 | + '贵宾')) { | ||
| 3363 | nameStr = value.substring( | 3365 | nameStr = value.substring( |
| 3364 | 0, | 3366 | 0, |
| 3365 | value.length - | 3367 | value.length - |
| @@ -642,6 +642,12 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | @@ -642,6 +642,12 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | ||
| 642 | 'select': sexStr == '3' ? true : false, | 642 | 'select': sexStr == '3' ? true : false, |
| 643 | 'code': '3', | 643 | 'code': '3', |
| 644 | 'hasLeftBorder': false | 644 | 'hasLeftBorder': false |
| 645 | + }, | ||
| 646 | + { | ||
| 647 | + 'title': '贵宾', | ||
| 648 | + 'select': sexStr == '4' ? true : false, | ||
| 649 | + 'code': '4', | ||
| 650 | + 'hasLeftBorder': false | ||
| 645 | } | 651 | } |
| 646 | ]; | 652 | ]; |
| 647 | } | 653 | } |
| @@ -59,7 +59,7 @@ class _FeastPageState extends State<FeastPage> { | @@ -59,7 +59,7 @@ class _FeastPageState extends State<FeastPage> { | ||
| 59 | "sid": Provider.of<UserModel>(context, listen: false).user.sellerid, | 59 | "sid": Provider.of<UserModel>(context, listen: false).user.sellerid, |
| 60 | 'type': '2' | 60 | 'type': '2' |
| 61 | }; // | 61 | }; // |
| 62 | - bool success = await feastModel.getBanquetBeFollow(context, pramas); | 62 | + bool success = await feastModel.getBanquetBeFollow(context, pramas); |
| 63 | if (success) {} | 63 | if (success) {} |
| 64 | } | 64 | } |
| 65 | 65 |
| @@ -201,7 +201,7 @@ class InvicationPageState extends State<InvicationPage> | @@ -201,7 +201,7 @@ class InvicationPageState extends State<InvicationPage> | ||
| 201 | enterMore = App.sp.getBool("enterMore") ?? false; | 201 | enterMore = App.sp.getBool("enterMore") ?? false; |
| 202 | 202 | ||
| 203 | personNumList = Utils.getPersonNumList(); | 203 | personNumList = Utils.getPersonNumList(); |
| 204 | - sexList = ['先生', '女士', '公司']; | 204 | + sexList = ['先生', '女士', '公司','贵宾']; |
| 205 | memberList = ['会员', '非会员']; | 205 | memberList = ['会员', '非会员']; |
| 206 | styleList = ['生日宴', '普通聚餐']; | 206 | styleList = ['生日宴', '普通聚餐']; |
| 207 | _nameNode.addListener(() { | 207 | _nameNode.addListener(() { |
| @@ -417,6 +417,8 @@ class InvicationPageState extends State<InvicationPage> | @@ -417,6 +417,8 @@ class InvicationPageState extends State<InvicationPage> | ||
| 417 | sexStr = '女士'; | 417 | sexStr = '女士'; |
| 418 | } else if (sex == '3') { | 418 | } else if (sex == '3') { |
| 419 | sexStr = '公司'; | 419 | sexStr = '公司'; |
| 420 | + }else if (sex == '4') { | ||
| 421 | + sexStr = '贵宾'; | ||
| 420 | } | 422 | } |
| 421 | sexSelectIndex = sexList.indexOf(sexStr); | 423 | sexSelectIndex = sexList.indexOf(sexStr); |
| 422 | _addNameSuffix(nameStr, sexStr); | 424 | _addNameSuffix(nameStr, sexStr); |
| @@ -340,7 +340,8 @@ class _CollectStoreInfoPageState extends State<CollectStoreInfoPage> { | @@ -340,7 +340,8 @@ class _CollectStoreInfoPageState extends State<CollectStoreInfoPage> { | ||
| 340 | "shopname": nameC.text, | 340 | "shopname": nameC.text, |
| 341 | "shopnumber": phoneC.text, | 341 | "shopnumber": phoneC.text, |
| 342 | "name": personC.text, | 342 | "name": personC.text, |
| 343 | - "address": storeAddress | 343 | + "address": storeAddress, |
| 344 | + "laiyuan":'app' | ||
| 344 | }); | 345 | }); |
| 345 | //成功 | 346 | //成功 |
| 346 | NavigatorUtil.goCompleteStorePage(context, | 347 | NavigatorUtil.goCompleteStorePage(context, |
| @@ -204,6 +204,12 @@ class _MyCustomerDetailEditPageState extends State<MyCustomerDetailEditPage> { | @@ -204,6 +204,12 @@ class _MyCustomerDetailEditPageState extends State<MyCustomerDetailEditPage> { | ||
| 204 | 'select': sexStr == '3' ? true : false, | 204 | 'select': sexStr == '3' ? true : false, |
| 205 | 'code': '3', | 205 | 'code': '3', |
| 206 | 'hasLeftBorder': false | 206 | 'hasLeftBorder': false |
| 207 | + }, | ||
| 208 | + { | ||
| 209 | + 'title': '贵宾', | ||
| 210 | + 'select': sexStr == '4' ? true : false, | ||
| 211 | + 'code': '4', | ||
| 212 | + 'hasLeftBorder': false | ||
| 207 | } | 213 | } |
| 208 | ]; | 214 | ]; |
| 209 | } | 215 | } |
| @@ -484,7 +490,8 @@ class _MyCustomerDetailEditPageState extends State<MyCustomerDetailEditPage> { | @@ -484,7 +490,8 @@ class _MyCustomerDetailEditPageState extends State<MyCustomerDetailEditPage> { | ||
| 484 | 490 | ||
| 485 | if (value.endsWith('先生') || | 491 | if (value.endsWith('先生') || |
| 486 | value.endsWith('女士') || | 492 | value.endsWith('女士') || |
| 487 | - value.endsWith('公司')) { | 493 | + value.endsWith('公司') || |
| 494 | + value.endsWith('贵宾')) { | ||
| 488 | nameStr = | 495 | nameStr = |
| 489 | value.substring(0, value.length - 2); | 496 | value.substring(0, value.length - 2); |
| 490 | } else { | 497 | } else { |
| @@ -221,6 +221,12 @@ class _CustomerDetailEditPageState extends State<CustomerDetailEditPage> { | @@ -221,6 +221,12 @@ class _CustomerDetailEditPageState extends State<CustomerDetailEditPage> { | ||
| 221 | 'select': sexStr == '3' ? true : false, | 221 | 'select': sexStr == '3' ? true : false, |
| 222 | 'code': '3', | 222 | 'code': '3', |
| 223 | 'hasLeftBorder': false | 223 | 'hasLeftBorder': false |
| 224 | + }, | ||
| 225 | + { | ||
| 226 | + 'title': '贵宾', | ||
| 227 | + 'select': sexStr == '4' ? true : false, | ||
| 228 | + 'code': '4', | ||
| 229 | + 'hasLeftBorder': false | ||
| 224 | } | 230 | } |
| 225 | ]; | 231 | ]; |
| 226 | } | 232 | } |
| @@ -500,7 +506,8 @@ class _CustomerDetailEditPageState extends State<CustomerDetailEditPage> { | @@ -500,7 +506,8 @@ class _CustomerDetailEditPageState extends State<CustomerDetailEditPage> { | ||
| 500 | 506 | ||
| 501 | if (value.endsWith('先生') || | 507 | if (value.endsWith('先生') || |
| 502 | value.endsWith('女士') || | 508 | value.endsWith('女士') || |
| 503 | - value.endsWith('公司')) { | 509 | + value.endsWith('公司')|| |
| 510 | + value.endsWith('贵宾')) { | ||
| 504 | nameStr = | 511 | nameStr = |
| 505 | value.substring(0, value.length - 2); | 512 | value.substring(0, value.length - 2); |
| 506 | } else { | 513 | } else { |
| @@ -69,7 +69,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { | @@ -69,7 +69,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { | ||
| 69 | showLoading: false, selfDismiss: true); | 69 | showLoading: false, selfDismiss: true); |
| 70 | if (success) { | 70 | if (success) { |
| 71 | marketingCenterProvider.pageStateSettingMini = PageState.Success; | 71 | marketingCenterProvider.pageStateSettingMini = PageState.Success; |
| 72 | - miniType = marketingCenterProvider.dzSellerConfModel.liteStyle ?? '2'; | 72 | + miniType = marketingCenterProvider.dzSellerConfModel.liteStyle ?? '3'; |
| 73 | int index = types.indexOf(miniType); | 73 | int index = types.indexOf(miniType); |
| 74 | if (index >= 0) { | 74 | if (index >= 0) { |
| 75 | swiperController.index = index; | 75 | swiperController.index = index; |
| @@ -165,7 +165,7 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> { | @@ -165,7 +165,7 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> { | ||
| 165 | 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid, | 165 | 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid, |
| 166 | 'uid': Provider.of<UserModel>(context, listen: false).user.openid, | 166 | 'uid': Provider.of<UserModel>(context, listen: false).user.openid, |
| 167 | 'rname': detail.rname, | 167 | 'rname': detail.rname, |
| 168 | - 'sex': detail.sex, //性别 1 男 2 女 3 公司 | 168 | + 'sex': detail.sex, //性别 1 男 2 女 3 公司 4 贵宾 |
| 169 | 'is_member': detail.isMember, //会员状态 | 169 | 'is_member': detail.isMember, //会员状态 |
| 170 | 'phone': detail.phone, | 170 | 'phone': detail.phone, |
| 171 | 'wine': json.encode(data) | 171 | 'wine': json.encode(data) |
| @@ -65,7 +65,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { | @@ -65,7 +65,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { | ||
| 65 | super.initState(); | 65 | super.initState(); |
| 66 | 66 | ||
| 67 | wineSerialSub = App.sp.getInt("wineSerialSub") ?? 1; | 67 | wineSerialSub = App.sp.getInt("wineSerialSub") ?? 1; |
| 68 | - sexList = ['先生', '女士', '公司']; | 68 | + sexList = ['先生', '女士', '公司','贵宾']; |
| 69 | memberList = ['会员', '非会员']; | 69 | memberList = ['会员', '非会员']; |
| 70 | _initWineSerial(); | 70 | _initWineSerial(); |
| 71 | WineManageSunModel wineManageModel = WineManageSunModel(); | 71 | WineManageSunModel wineManageModel = WineManageSunModel(); |
| @@ -669,7 +669,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { | @@ -669,7 +669,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { | ||
| 669 | .user | 669 | .user |
| 670 | .openid, | 670 | .openid, |
| 671 | 'rname': nameC.text, | 671 | 'rname': nameC.text, |
| 672 | - 'sex': '${sexSelectIndex + 1}', //性别 1 男 2 女 3 公司 | 672 | + 'sex': '${sexSelectIndex + 1}', //性别 1 男 2 女 3 公司 4 贵宾 |
| 673 | 'is_member': memberIndex == 0 ? '1' : '0', //会员状态 | 673 | 'is_member': memberIndex == 0 ? '1' : '0', //会员状态 |
| 674 | 'phone': phoneC.text, | 674 | 'phone': phoneC.text, |
| 675 | 'wine': json.encode(data) | 675 | 'wine': json.encode(data) |
| @@ -297,7 +297,7 @@ class _SmsCodeInputPageState extends State<SmsCodeInputPage> { | @@ -297,7 +297,7 @@ class _SmsCodeInputPageState extends State<SmsCodeInputPage> { | ||
| 297 | .user | 297 | .user |
| 298 | .openid, | 298 | .openid, |
| 299 | 'rname': widget.wineManageDetail.rname, | 299 | 'rname': widget.wineManageDetail.rname, |
| 300 | - 'sex': widget.wineManageDetail.sex, //性别 1 男 2 女 3 公司 | 300 | + 'sex': widget.wineManageDetail.sex, //性别 1 男 2 女 3 公司 4 贵宾 |
| 301 | 'is_member': widget.wineManageDetail.isMember, //会员状态 | 301 | 'is_member': widget.wineManageDetail.isMember, //会员状态 |
| 302 | 'phone': widget.wineManageDetail.phone, | 302 | 'phone': widget.wineManageDetail.phone, |
| 303 | 'wine': json.encode(data) | 303 | 'wine': json.encode(data) |
| @@ -56,11 +56,11 @@ class NoteBookPageState extends State<NoteBookPage> { | @@ -56,11 +56,11 @@ class NoteBookPageState extends State<NoteBookPage> { | ||
| 56 | 56 | ||
| 57 | String dateText = "更多\n日期"; //当前显示日期时间 | 57 | String dateText = "更多\n日期"; //当前显示日期时间 |
| 58 | int currTimeIndex = 1; //当前选中时间段 | 58 | int currTimeIndex = 1; //当前选中时间段 |
| 59 | - String morning; //早市时间段 | ||
| 60 | - String noon; //午市时间段 | ||
| 61 | - String night; //晚市时间段 | ||
| 62 | - String meal1; | ||
| 63 | - String meal2; | 59 | + String morning = '00:00-00:00'; //早市时间段 |
| 60 | + String noon= '00:00-00:00'; //午市时间段 | ||
| 61 | + String night= '00:00-00:00'; //晚市时间段 | ||
| 62 | + String meal1= '00:00-00:00'; | ||
| 63 | + String meal2= '00:00-00:00'; | ||
| 64 | 64 | ||
| 65 | DateTime dateTimeNow; //当前日期 | 65 | DateTime dateTimeNow; //当前日期 |
| 66 | 66 |
| @@ -220,6 +220,12 @@ class _OrderCustomerDetailPageState extends State<OrderCustomerDetailPage> { | @@ -220,6 +220,12 @@ class _OrderCustomerDetailPageState extends State<OrderCustomerDetailPage> { | ||
| 220 | 'select': sexStr == '3' ? true : false, | 220 | 'select': sexStr == '3' ? true : false, |
| 221 | 'code': '3', | 221 | 'code': '3', |
| 222 | 'hasLeftBorder': false | 222 | 'hasLeftBorder': false |
| 223 | + }, | ||
| 224 | + { | ||
| 225 | + 'title': '贵宾', | ||
| 226 | + 'select': sexStr == '4' ? true : false, | ||
| 227 | + 'code': '4', | ||
| 228 | + 'hasLeftBorder': false | ||
| 223 | } | 229 | } |
| 224 | ]; | 230 | ]; |
| 225 | } | 231 | } |
| @@ -504,7 +510,8 @@ class _OrderCustomerDetailPageState extends State<OrderCustomerDetailPage> { | @@ -504,7 +510,8 @@ class _OrderCustomerDetailPageState extends State<OrderCustomerDetailPage> { | ||
| 504 | 510 | ||
| 505 | if (value.endsWith('先生') || | 511 | if (value.endsWith('先生') || |
| 506 | value.endsWith('女士') || | 512 | value.endsWith('女士') || |
| 507 | - value.endsWith('公司')) { | 513 | + value.endsWith('公司')|| |
| 514 | + value.endsWith('贵宾')) { | ||
| 508 | nameStr = value.substring( | 515 | nameStr = value.substring( |
| 509 | 0, value.length - 2); | 516 | 0, value.length - 2); |
| 510 | } else { | 517 | } else { |
| @@ -77,6 +77,9 @@ class TableItemOrReserveState extends State<TableItemOrReserve> { | @@ -77,6 +77,9 @@ class TableItemOrReserveState extends State<TableItemOrReserve> { | ||
| 77 | case "3": //公司 | 77 | case "3": //公司 |
| 78 | case "公司": | 78 | case "公司": |
| 79 | return "公司"; | 79 | return "公司"; |
| 80 | + case "4": //贵宾 | ||
| 81 | + case "贵宾": | ||
| 82 | + return "贵宾"; | ||
| 80 | } | 83 | } |
| 81 | } | 84 | } |
| 82 | 85 | ||
| @@ -162,13 +165,13 @@ class TableItemOrReserveState extends State<TableItemOrReserve> { | @@ -162,13 +165,13 @@ class TableItemOrReserveState extends State<TableItemOrReserve> { | ||
| 162 | return; | 165 | return; |
| 163 | } | 166 | } |
| 164 | //从变更页面进来 canChoose = true | 167 | //从变更页面进来 canChoose = true |
| 165 | - if (widget.canSelected && table.signStr== null) { | 168 | + if (widget.canSelected && table.signStr == null) { |
| 166 | setState(() { | 169 | setState(() { |
| 167 | table.selected = !(table.selected ?? false); | 170 | table.selected = !(table.selected ?? false); |
| 168 | }); | 171 | }); |
| 169 | widget.onSelected(table); | 172 | widget.onSelected(table); |
| 170 | } else { | 173 | } else { |
| 171 | - if (table.sign == '5' || table.sign == '1'|| table.sign == '10') { | 174 | + if (table.sign == '5' || table.sign == '1' || table.sign == '10') { |
| 172 | // 1一般是商户端 | 175 | // 1一般是商户端 |
| 173 | // 5是用户端 | 176 | // 5是用户端 |
| 174 | //已预订状态 不是自己的不可以选择,是自己的可以选择 | 177 | //已预订状态 不是自己的不可以选择,是自己的可以选择 |
| @@ -1074,6 +1074,8 @@ class TableManagerPageState extends State<TableManagerPage> { | @@ -1074,6 +1074,8 @@ class TableManagerPageState extends State<TableManagerPage> { | ||
| 1074 | } | 1074 | } |
| 1075 | if (nameStr.endsWith('公司')) { | 1075 | if (nameStr.endsWith('公司')) { |
| 1076 | nameStr = nameStr.replaceAll('公司', ''); | 1076 | nameStr = nameStr.replaceAll('公司', ''); |
| 1077 | + }if (nameStr.endsWith('贵宾')) { | ||
| 1078 | + nameStr = nameStr.replaceAll('贵宾', ''); | ||
| 1077 | } | 1079 | } |
| 1078 | } else { | 1080 | } else { |
| 1079 | nameStr = _baseIndoProvider.userHistorys[index].rname; | 1081 | nameStr = _baseIndoProvider.userHistorys[index].rname; |
| @@ -3449,6 +3451,8 @@ class TableManagerPageState extends State<TableManagerPage> { | @@ -3449,6 +3451,8 @@ class TableManagerPageState extends State<TableManagerPage> { | ||
| 3449 | sex = '2'; | 3451 | sex = '2'; |
| 3450 | } else if (sexStr == '公司') { | 3452 | } else if (sexStr == '公司') { |
| 3451 | sex = '3'; | 3453 | sex = '3'; |
| 3454 | + }else if (sexStr == '贵宾') { | ||
| 3455 | + sex = '4'; | ||
| 3452 | } | 3456 | } |
| 3453 | guest.rname = nameStr; //预订人姓名 | 3457 | guest.rname = nameStr; //预订人姓名 |
| 3454 | guest.sex = sex; //预订人性别:1:男 2:女 | 3458 | guest.sex = sex; //预订人性别:1:男 2:女 |
| @@ -3885,7 +3889,7 @@ class TableManagerPageState extends State<TableManagerPage> { | @@ -3885,7 +3889,7 @@ class TableManagerPageState extends State<TableManagerPage> { | ||
| 3885 | // vertical: ScreenUtil().setWidth(20) | 3889 | // vertical: ScreenUtil().setWidth(20) |
| 3886 | ), | 3890 | ), |
| 3887 | decoration: BoxDecoration( | 3891 | decoration: BoxDecoration( |
| 3888 | - color: MyColours.color_199095, | 3892 | + color: MyColours.color_438E93, |
| 3889 | borderRadius: BorderRadius.only( | 3893 | borderRadius: BorderRadius.only( |
| 3890 | topLeft: Radius.circular(r(10)), | 3894 | topLeft: Radius.circular(r(10)), |
| 3891 | topRight: Radius.circular(r(10)), | 3895 | topRight: Radius.circular(r(10)), |
| @@ -414,7 +414,8 @@ class _EditReserverPageSimState extends State<EditReserverPageSim> { | @@ -414,7 +414,8 @@ class _EditReserverPageSimState extends State<EditReserverPageSim> { | ||
| 414 | print('ggg'); | 414 | print('ggg'); |
| 415 | if (value.endsWith('先生') || | 415 | if (value.endsWith('先生') || |
| 416 | value.endsWith('女士') || | 416 | value.endsWith('女士') || |
| 417 | - value.endsWith('公司')) { | 417 | + value.endsWith('公司')|| |
| 418 | + value.endsWith('贵宾')) { | ||
| 418 | nameStr = value.substring( | 419 | nameStr = value.substring( |
| 419 | 0, value.length - 2); | 420 | 0, value.length - 2); |
| 420 | } else { | 421 | } else { |
| @@ -1206,6 +1206,8 @@ class _NoteBookChangeFPageSimState extends State<NoteBookChangeFPageSim> { | @@ -1206,6 +1206,8 @@ class _NoteBookChangeFPageSimState extends State<NoteBookChangeFPageSim> { | ||
| 1206 | } | 1206 | } |
| 1207 | if (nameStr.endsWith('公司')) { | 1207 | if (nameStr.endsWith('公司')) { |
| 1208 | nameStr = nameStr.replaceAll('公司', ''); | 1208 | nameStr = nameStr.replaceAll('公司', ''); |
| 1209 | + }if (nameStr.endsWith('贵宾')) { | ||
| 1210 | + nameStr = nameStr.replaceAll('贵宾', ''); | ||
| 1209 | } | 1211 | } |
| 1210 | } else { | 1212 | } else { |
| 1211 | nameStr = userHistoryEntity.rname; | 1213 | nameStr = userHistoryEntity.rname; |
| @@ -1741,7 +1743,8 @@ class _NoteBookChangeFPageSimState extends State<NoteBookChangeFPageSim> { | @@ -1741,7 +1743,8 @@ class _NoteBookChangeFPageSimState extends State<NoteBookChangeFPageSim> { | ||
| 1741 | 1743 | ||
| 1742 | if (value.endsWith('先生') || | 1744 | if (value.endsWith('先生') || |
| 1743 | value.endsWith('女士') || | 1745 | value.endsWith('女士') || |
| 1744 | - value.endsWith('公司')) { | 1746 | + value.endsWith('公司')|| |
| 1747 | + value.endsWith('贵宾')) { | ||
| 1745 | nameStr = value.substring( | 1748 | nameStr = value.substring( |
| 1746 | 0, value.length - 2); | 1749 | 0, value.length - 2); |
| 1747 | } else { | 1750 | } else { |
| @@ -3098,7 +3098,9 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> { | @@ -3098,7 +3098,9 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> { | ||
| 3098 | value.endsWith( | 3098 | value.endsWith( |
| 3099 | '女士') || | 3099 | '女士') || |
| 3100 | value.endsWith( | 3100 | value.endsWith( |
| 3101 | - '公司')) { | 3101 | + '公司') || |
| 3102 | + value.endsWith( | ||
| 3103 | + '贵宾')) { | ||
| 3102 | nameStr = value.substring( | 3104 | nameStr = value.substring( |
| 3103 | 0, | 3105 | 0, |
| 3104 | value.length - | 3106 | value.length - |
| @@ -196,7 +196,7 @@ class InvicationPageSimState extends State<InvicationPageSim> | @@ -196,7 +196,7 @@ class InvicationPageSimState extends State<InvicationPageSim> | ||
| 196 | enterMore = App.sp.getBool("enterMore") ?? false; | 196 | enterMore = App.sp.getBool("enterMore") ?? false; |
| 197 | 197 | ||
| 198 | personNumList = Utils.getPersonNumList(); | 198 | personNumList = Utils.getPersonNumList(); |
| 199 | - sexList = ['先生', '女士', '公司']; | 199 | + sexList = ['先生', '女士', '公司','贵宾']; |
| 200 | memberList = ['会员', '非会员']; | 200 | memberList = ['会员', '非会员']; |
| 201 | styleList = ['生日宴', '普通聚餐']; | 201 | styleList = ['生日宴', '普通聚餐']; |
| 202 | _nameNode.addListener(() { | 202 | _nameNode.addListener(() { |
| @@ -1235,6 +1235,8 @@ class InvicationPageSimState extends State<InvicationPageSim> | @@ -1235,6 +1235,8 @@ class InvicationPageSimState extends State<InvicationPageSim> | ||
| 1235 | sexStr = '女士'; | 1235 | sexStr = '女士'; |
| 1236 | } else if (sex == '3') { | 1236 | } else if (sex == '3') { |
| 1237 | sexStr = '公司'; | 1237 | sexStr = '公司'; |
| 1238 | + }else if (sex == '4') { | ||
| 1239 | + sexStr = '贵宾'; | ||
| 1238 | } | 1240 | } |
| 1239 | sexSelectIndex = sexList.indexOf(sexStr); | 1241 | sexSelectIndex = sexList.indexOf(sexStr); |
| 1240 | _addNameSuffix(nameStr, sexStr); | 1242 | _addNameSuffix(nameStr, sexStr); |
| @@ -204,6 +204,12 @@ class _MyCustomerDetailEditPageSimState extends State<MyCustomerDetailEditPageSi | @@ -204,6 +204,12 @@ class _MyCustomerDetailEditPageSimState extends State<MyCustomerDetailEditPageSi | ||
| 204 | 'select': sexStr == '3' ? true : false, | 204 | 'select': sexStr == '3' ? true : false, |
| 205 | 'code': '3', | 205 | 'code': '3', |
| 206 | 'hasLeftBorder': false | 206 | 'hasLeftBorder': false |
| 207 | + }, | ||
| 208 | + { | ||
| 209 | + 'title': '贵宾', | ||
| 210 | + 'select': sexStr == '4' ? true : false, | ||
| 211 | + 'code': '4', | ||
| 212 | + 'hasLeftBorder': false | ||
| 207 | } | 213 | } |
| 208 | ]; | 214 | ]; |
| 209 | } | 215 | } |
| @@ -484,7 +490,8 @@ class _MyCustomerDetailEditPageSimState extends State<MyCustomerDetailEditPageSi | @@ -484,7 +490,8 @@ class _MyCustomerDetailEditPageSimState extends State<MyCustomerDetailEditPageSi | ||
| 484 | 490 | ||
| 485 | if (value.endsWith('先生') || | 491 | if (value.endsWith('先生') || |
| 486 | value.endsWith('女士') || | 492 | value.endsWith('女士') || |
| 487 | - value.endsWith('公司')) { | 493 | + value.endsWith('公司') || |
| 494 | + value.endsWith('贵宾')) { | ||
| 488 | nameStr = | 495 | nameStr = |
| 489 | value.substring(0, value.length - 2); | 496 | value.substring(0, value.length - 2); |
| 490 | } else { | 497 | } else { |
| @@ -221,6 +221,12 @@ class _CustomerDetailEditPageSimState extends State<CustomerDetailEditPageSim> { | @@ -221,6 +221,12 @@ class _CustomerDetailEditPageSimState extends State<CustomerDetailEditPageSim> { | ||
| 221 | 'select': sexStr == '3' ? true : false, | 221 | 'select': sexStr == '3' ? true : false, |
| 222 | 'code': '3', | 222 | 'code': '3', |
| 223 | 'hasLeftBorder': false | 223 | 'hasLeftBorder': false |
| 224 | + }, | ||
| 225 | + { | ||
| 226 | + 'title': '贵宾', | ||
| 227 | + 'select': sexStr == '4' ? true : false, | ||
| 228 | + 'code': '4', | ||
| 229 | + 'hasLeftBorder': false | ||
| 224 | } | 230 | } |
| 225 | ]; | 231 | ]; |
| 226 | } | 232 | } |
| @@ -500,7 +506,8 @@ class _CustomerDetailEditPageSimState extends State<CustomerDetailEditPageSim> { | @@ -500,7 +506,8 @@ class _CustomerDetailEditPageSimState extends State<CustomerDetailEditPageSim> { | ||
| 500 | 506 | ||
| 501 | if (value.endsWith('先生') || | 507 | if (value.endsWith('先生') || |
| 502 | value.endsWith('女士') || | 508 | value.endsWith('女士') || |
| 503 | - value.endsWith('公司')) { | 509 | + value.endsWith('公司')|| |
| 510 | + value.endsWith('贵宾')) { | ||
| 504 | nameStr = | 511 | nameStr = |
| 505 | value.substring(0, value.length - 2); | 512 | value.substring(0, value.length - 2); |
| 506 | } else { | 513 | } else { |
| @@ -831,6 +831,8 @@ class TableManagerPageSimState extends State<TableManagerPageSim> { | @@ -831,6 +831,8 @@ class TableManagerPageSimState extends State<TableManagerPageSim> { | ||
| 831 | } | 831 | } |
| 832 | if (nameStr.endsWith('公司')) { | 832 | if (nameStr.endsWith('公司')) { |
| 833 | nameStr = nameStr.replaceAll('公司', ''); | 833 | nameStr = nameStr.replaceAll('公司', ''); |
| 834 | + }if (nameStr.endsWith('贵宾')) { | ||
| 835 | + nameStr = nameStr.replaceAll('贵宾', ''); | ||
| 834 | } | 836 | } |
| 835 | } else { | 837 | } else { |
| 836 | nameStr = _baseIndoProvider.userHistorys[index].rname; | 838 | nameStr = _baseIndoProvider.userHistorys[index].rname; |
| @@ -3174,6 +3176,8 @@ class TableManagerPageSimState extends State<TableManagerPageSim> { | @@ -3174,6 +3176,8 @@ class TableManagerPageSimState extends State<TableManagerPageSim> { | ||
| 3174 | sex = '2'; | 3176 | sex = '2'; |
| 3175 | } else if (sexStr == '公司') { | 3177 | } else if (sexStr == '公司') { |
| 3176 | sex = '3'; | 3178 | sex = '3'; |
| 3179 | + }else if (sexStr == '贵宾') { | ||
| 3180 | + sex = '4'; | ||
| 3177 | } | 3181 | } |
| 3178 | guest.rname = nameStr; //预订人姓名 | 3182 | guest.rname = nameStr; //预订人姓名 |
| 3179 | guest.sex = sex; //预订人性别:1:男 2:女 | 3183 | guest.sex = sex; //预订人性别:1:男 2:女 |
| @@ -55,6 +55,12 @@ class BaseIndoProvider with ChangeNotifier { | @@ -55,6 +55,12 @@ class BaseIndoProvider with ChangeNotifier { | ||
| 55 | 'select': sexStr == '3' ? true : false, | 55 | 'select': sexStr == '3' ? true : false, |
| 56 | 'code': '3', | 56 | 'code': '3', |
| 57 | 'hasLeftBorder': false | 57 | 'hasLeftBorder': false |
| 58 | + }, | ||
| 59 | + { | ||
| 60 | + 'title': '贵宾', | ||
| 61 | + 'select': sexStr == '4' ? true : false, | ||
| 62 | + 'code': '4', | ||
| 63 | + 'hasLeftBorder': false | ||
| 58 | } | 64 | } |
| 59 | ]; | 65 | ]; |
| 60 | } | 66 | } |
| @@ -286,6 +286,12 @@ class EnterModel with ChangeNotifier { | @@ -286,6 +286,12 @@ class EnterModel with ChangeNotifier { | ||
| 286 | 'select': sexStr == '3' ? true : false, | 286 | 'select': sexStr == '3' ? true : false, |
| 287 | 'code': '3', | 287 | 'code': '3', |
| 288 | 'hasLeftBorder': false | 288 | 'hasLeftBorder': false |
| 289 | + }, | ||
| 290 | + { | ||
| 291 | + 'title': '贵宾', | ||
| 292 | + 'select': sexStr == '4' ? true : false, | ||
| 293 | + 'code': '4', | ||
| 294 | + 'hasLeftBorder': false | ||
| 289 | } | 295 | } |
| 290 | ]; | 296 | ]; |
| 291 | } | 297 | } |
| @@ -412,6 +412,8 @@ class FeastModel extends ChangeNotifier { | @@ -412,6 +412,8 @@ class FeastModel extends ChangeNotifier { | ||
| 412 | reserve += '女士'; | 412 | reserve += '女士'; |
| 413 | } else if (sex.toString() == '3') { | 413 | } else if (sex.toString() == '3') { |
| 414 | reserve += '公司'; | 414 | reserve += '公司'; |
| 415 | + }else if (sex.toString() == '4') { | ||
| 416 | + reserve += '贵宾'; | ||
| 415 | } | 417 | } |
| 416 | 418 | ||
| 417 | classifyData.forEach((element) { | 419 | classifyData.forEach((element) { |
| @@ -430,6 +432,8 @@ class FeastModel extends ChangeNotifier { | @@ -430,6 +432,8 @@ class FeastModel extends ChangeNotifier { | ||
| 430 | reserve += '女士'; | 432 | reserve += '女士'; |
| 431 | } else if (sex.toString() == '3') { | 433 | } else if (sex.toString() == '3') { |
| 432 | reserve += '公司'; | 434 | reserve += '公司'; |
| 435 | + } else if (sex.toString() == '4') { | ||
| 436 | + reserve += '贵宾'; | ||
| 433 | } | 437 | } |
| 434 | 438 | ||
| 435 | classifyData.forEach((element) { | 439 | classifyData.forEach((element) { |
| @@ -160,6 +160,12 @@ class HomeEnterModel with ChangeNotifier { | @@ -160,6 +160,12 @@ class HomeEnterModel with ChangeNotifier { | ||
| 160 | 'select': sexStr == '3' ? true : false, | 160 | 'select': sexStr == '3' ? true : false, |
| 161 | 'code': '3', | 161 | 'code': '3', |
| 162 | 'hasLeftBorder': false | 162 | 'hasLeftBorder': false |
| 163 | + }, | ||
| 164 | + { | ||
| 165 | + 'title': '贵宾', | ||
| 166 | + 'select': sexStr == '4' ? true : false, | ||
| 167 | + 'code': '4', | ||
| 168 | + 'hasLeftBorder': false | ||
| 163 | } | 169 | } |
| 164 | ]; | 170 | ]; |
| 165 | } | 171 | } |
| @@ -193,6 +193,12 @@ class NotebookDetailChangeModel with ChangeNotifier { | @@ -193,6 +193,12 @@ class NotebookDetailChangeModel with ChangeNotifier { | ||
| 193 | 'select': sexStr == '3' ? true : false, | 193 | 'select': sexStr == '3' ? true : false, |
| 194 | 'code': '3', | 194 | 'code': '3', |
| 195 | 'hasLeftBorder': false | 195 | 'hasLeftBorder': false |
| 196 | + }, | ||
| 197 | + { | ||
| 198 | + 'title': '贵宾', | ||
| 199 | + 'select': sexStr == '4' ? true : false, | ||
| 200 | + 'code': '4', | ||
| 201 | + 'hasLeftBorder': false | ||
| 196 | } | 202 | } |
| 197 | ]; | 203 | ]; |
| 198 | } | 204 | } |
| @@ -122,6 +122,12 @@ class NotebookDetailChangeModelOnly with ChangeNotifier { | @@ -122,6 +122,12 @@ class NotebookDetailChangeModelOnly with ChangeNotifier { | ||
| 122 | 'select': sexStr == '3' ? true : false, | 122 | 'select': sexStr == '3' ? true : false, |
| 123 | 'code': '3', | 123 | 'code': '3', |
| 124 | 'hasLeftBorder': false | 124 | 'hasLeftBorder': false |
| 125 | + }, | ||
| 126 | + { | ||
| 127 | + 'title': '贵宾', | ||
| 128 | + 'select': sexStr == '4' ? true : false, | ||
| 129 | + 'code': '4', | ||
| 130 | + 'hasLeftBorder': false | ||
| 125 | } | 131 | } |
| 126 | ]; | 132 | ]; |
| 127 | } | 133 | } |
| @@ -94,7 +94,7 @@ class NotebookDetailModel extends ChangeNotifier { | @@ -94,7 +94,7 @@ class NotebookDetailModel extends ChangeNotifier { | ||
| 94 | String reserveImgText; | 94 | String reserveImgText; |
| 95 | String smsContent = ''; | 95 | String smsContent = ''; |
| 96 | String isShowNoticeDeposit; | 96 | String isShowNoticeDeposit; |
| 97 | - String liteStyle = '2'; | 97 | + String liteStyle = '3'; |
| 98 | bool isNotice = false; | 98 | bool isNotice = false; |
| 99 | 99 | ||
| 100 | NotebookDetailModel() { | 100 | NotebookDetailModel() { |
| @@ -122,6 +122,12 @@ class NotebookDetailModel extends ChangeNotifier { | @@ -122,6 +122,12 @@ class NotebookDetailModel extends ChangeNotifier { | ||
| 122 | 'select': sexStr == '3' ? true : false, | 122 | 'select': sexStr == '3' ? true : false, |
| 123 | 'code': '3', | 123 | 'code': '3', |
| 124 | 'hasLeftBorder': false | 124 | 'hasLeftBorder': false |
| 125 | + }, | ||
| 126 | + { | ||
| 127 | + 'title': '贵宾', | ||
| 128 | + 'select': sexStr == '4' ? true : false, | ||
| 129 | + 'code': '4', | ||
| 130 | + 'hasLeftBorder': false | ||
| 125 | } | 131 | } |
| 126 | ]; | 132 | ]; |
| 127 | } | 133 | } |
-
Please register or login to post a comment