xt / Flutter-ReserveApp · Commits

Go to a project

Commit dd714d847907d08e84972609655a2597b5d9e53a

Authored by wdn127929
1 parent b28663c3
build: skipped

提交

Inline Side-by-side
Showing 17 changed files with 570 additions and 506 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "250" 14 +def flutterVersionCode = "252"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '250' 16 + flutterVersionCode = '252'
17 } 17 }
18 18
19 -def flutterVersionName = "2.5.0" 19 +def flutterVersionName = "2.5.2"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '2.5.0' 21 + flutterVersionName = '2.5.2'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -452,7 +452,7 @@ @@ -452,7 +452,7 @@
452 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 452 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
453 GCC_WARN_UNUSED_FUNCTION = YES; 453 GCC_WARN_UNUSED_FUNCTION = YES;
454 GCC_WARN_UNUSED_VARIABLE = YES; 454 GCC_WARN_UNUSED_VARIABLE = YES;
455 - IPHONEOS_DEPLOYMENT_TARGET = 12.1; 455 + IPHONEOS_DEPLOYMENT_TARGET = 9.0;
456 MTL_ENABLE_DEBUG_INFO = NO; 456 MTL_ENABLE_DEBUG_INFO = NO;
457 PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile"; 457 PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
458 SDKROOT = iphoneos; 458 SDKROOT = iphoneos;
@@ -472,7 +472,7 @@ @@ -472,7 +472,7 @@
472 CODE_SIGN_IDENTITY = "iPhone Developer"; 472 CODE_SIGN_IDENTITY = "iPhone Developer";
473 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 473 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
474 CODE_SIGN_STYLE = Automatic; 474 CODE_SIGN_STYLE = Automatic;
475 - CURRENT_PROJECT_VERSION = 230; 475 + CURRENT_PROJECT_VERSION = 250;
476 DEVELOPMENT_TEAM = 8J59HM8B82; 476 DEVELOPMENT_TEAM = 8J59HM8B82;
477 ENABLE_BITCODE = NO; 477 ENABLE_BITCODE = NO;
478 FLUTTER_BUILD_MODE = release; 478 FLUTTER_BUILD_MODE = release;
@@ -487,7 +487,7 @@ @@ -487,7 +487,7 @@
487 "$(inherited)", 487 "$(inherited)",
488 "$(PROJECT_DIR)/Flutter", 488 "$(PROJECT_DIR)/Flutter",
489 ); 489 );
490 - MARKETING_VERSION = 2.5.0; 490 + MARKETING_VERSION = 2.5.1;
491 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 491 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
492 PRODUCT_NAME = Runner; 492 PRODUCT_NAME = Runner;
493 PROVISIONING_PROFILE_SPECIFIER = ""; 493 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -545,7 +545,7 @@ @@ -545,7 +545,7 @@
545 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 545 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
546 GCC_WARN_UNUSED_FUNCTION = YES; 546 GCC_WARN_UNUSED_FUNCTION = YES;
547 GCC_WARN_UNUSED_VARIABLE = YES; 547 GCC_WARN_UNUSED_VARIABLE = YES;
548 - IPHONEOS_DEPLOYMENT_TARGET = 12.1; 548 + IPHONEOS_DEPLOYMENT_TARGET = 9.0;
549 MTL_ENABLE_DEBUG_INFO = YES; 549 MTL_ENABLE_DEBUG_INFO = YES;
550 ONLY_ACTIVE_ARCH = YES; 550 ONLY_ACTIVE_ARCH = YES;
551 PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile"; 551 PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
@@ -596,7 +596,7 @@ @@ -596,7 +596,7 @@
596 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 596 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
597 GCC_WARN_UNUSED_FUNCTION = YES; 597 GCC_WARN_UNUSED_FUNCTION = YES;
598 GCC_WARN_UNUSED_VARIABLE = YES; 598 GCC_WARN_UNUSED_VARIABLE = YES;
599 - IPHONEOS_DEPLOYMENT_TARGET = 12.1; 599 + IPHONEOS_DEPLOYMENT_TARGET = 9.0;
600 MTL_ENABLE_DEBUG_INFO = NO; 600 MTL_ENABLE_DEBUG_INFO = NO;
601 PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile"; 601 PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
602 SDKROOT = iphoneos; 602 SDKROOT = iphoneos;
@@ -616,7 +616,7 @@ @@ -616,7 +616,7 @@
616 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 616 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
617 CODE_SIGN_IDENTITY = "iPhone Developer"; 617 CODE_SIGN_IDENTITY = "iPhone Developer";
618 CODE_SIGN_STYLE = Automatic; 618 CODE_SIGN_STYLE = Automatic;
619 - CURRENT_PROJECT_VERSION = 230; 619 + CURRENT_PROJECT_VERSION = 250;
620 DEVELOPMENT_TEAM = 8J59HM8B82; 620 DEVELOPMENT_TEAM = 8J59HM8B82;
621 ENABLE_BITCODE = NO; 621 ENABLE_BITCODE = NO;
622 FLUTTER_BUILD_MODE = release; 622 FLUTTER_BUILD_MODE = release;
@@ -631,7 +631,7 @@ @@ -631,7 +631,7 @@
631 "$(inherited)", 631 "$(inherited)",
632 "$(PROJECT_DIR)/Flutter", 632 "$(PROJECT_DIR)/Flutter",
633 ); 633 );
634 - MARKETING_VERSION = 2.5.0; 634 + MARKETING_VERSION = 2.5.1;
635 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 635 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
636 PRODUCT_NAME = Runner; 636 PRODUCT_NAME = Runner;
637 PROVISIONING_PROFILE_SPECIFIER = ""; 637 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -651,7 +651,7 @@ @@ -651,7 +651,7 @@
651 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 651 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
652 CODE_SIGN_IDENTITY = "iPhone Developer"; 652 CODE_SIGN_IDENTITY = "iPhone Developer";
653 CODE_SIGN_STYLE = Automatic; 653 CODE_SIGN_STYLE = Automatic;
654 - CURRENT_PROJECT_VERSION = 230; 654 + CURRENT_PROJECT_VERSION = 250;
655 DEVELOPMENT_TEAM = 8J59HM8B82; 655 DEVELOPMENT_TEAM = 8J59HM8B82;
656 ENABLE_BITCODE = NO; 656 ENABLE_BITCODE = NO;
657 FLUTTER_BUILD_MODE = release; 657 FLUTTER_BUILD_MODE = release;
@@ -666,7 +666,7 @@ @@ -666,7 +666,7 @@
666 "$(inherited)", 666 "$(inherited)",
667 "$(PROJECT_DIR)/Flutter", 667 "$(PROJECT_DIR)/Flutter",
668 ); 668 );
669 - MARKETING_VERSION = 2.5.0; 669 + MARKETING_VERSION = 2.5.1;
670 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 670 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
671 PRODUCT_NAME = Runner; 671 PRODUCT_NAME = Runner;
672 PROVISIONING_PROFILE_SPECIFIER = ""; 672 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3,37 +3,46 @@ part 'user.g.dart'; @@ -3,37 +3,46 @@ part 'user.g.dart';
3 3
4 //User实体类 4 //User实体类
5 @JsonSerializable() 5 @JsonSerializable()
6 -class User{  
7 -  
8 - String openid;//商户openid  
9 - String account;//账号  
10 - String role_name;//角色名称  
11 - String sellerid;//商户id  
12 - String sellercode;//商户编号  
13 - String sellername;//商户名称  
14 - String sellerphone;//商户电话  
15 - String sellerAddr;//商户地址  
16 - int scatter;//是否有散座 0无 1有  
17 - int room;//是否有包间 0无 1有  
18 - int cassette;//是否有卡座 0无 1有  
19 - String morning;//早市时间段  
20 - String noon;//午市时间段  
21 - String night;//晚市时间段  
22 -  
23 -  
24 - User(this.openid, this.account, this.role_name, this.sellerid,  
25 - this.sellercode, this.sellername, this.sellerphone, this.sellerAddr,  
26 - this.scatter, this.room, this.cassette, this.morning, this.noon,  
27 - this.night);  
28 -  
29 - factory User.fromJson(Map<String,dynamic> json) => _$UserFromJson(json);  
30 -  
31 - Map<String,dynamic> toJson() => _$UserToJson(this); 6 +class User {
  7 + String openid; //商户openid
  8 + String account; //账号
  9 + String role_name; //角色名称
  10 + String sellerid; //商户id
  11 + String sellercode; //商户编号
  12 + String sellername; //商户名称
  13 + String sellerphone; //商户电话
  14 + String sellerAddr; //商户地址
  15 + int scatter; //是否有散座 0无 1有
  16 + int room; //是否有包间 0无 1有
  17 + int cassette; //是否有卡座 0无 1有
  18 + String morning; //早市时间段
  19 + String noon; //午市时间段
  20 + String night; //晚市时间段
  21 + String userphone; //角色电话
  22 +
  23 + User(
  24 + this.openid,
  25 + this.account,
  26 + this.role_name,
  27 + this.sellerid,
  28 + this.sellercode,
  29 + this.sellername,
  30 + this.sellerphone,
  31 + this.sellerAddr,
  32 + this.scatter,
  33 + this.room,
  34 + this.cassette,
  35 + this.morning,
  36 + this.noon,
  37 + this.night,
  38 + this.userphone);
  39 +
  40 + factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
  41 +
  42 + Map<String, dynamic> toJson() => _$UserToJson(this);
32 43
33 @override 44 @override
34 String toString() { 45 String toString() {
35 - return 'User{openid: $openid, account: $account, role_name: $role_name, sellerid: $sellerid, sellercode: $sellercode, sellername: $sellername, sellerphone: $sellerphone, sellerAddr: $sellerAddr, scatter: $scatter, room: $room, cassette: $cassette, morning: $morning, noon: $noon, night: $night}'; 46 + return 'User{openid: $openid, account: $account, role_name: $role_name, sellerid: $sellerid, sellercode: $sellercode, sellername: $sellername, sellerphone: $sellerphone, sellerAddr: $sellerAddr, scatter: $scatter, room: $room, cassette: $cassette, morning: $morning, noon: $noon, night: $night ,userphone:$userphone}';
36 } 47 }
37 -  
38 -  
39 -}  
  48 +}
@@ -21,7 +21,8 @@ User _$UserFromJson(Map<String, dynamic> json) { @@ -21,7 +21,8 @@ User _$UserFromJson(Map<String, dynamic> json) {
21 json['cassette'] as int, 21 json['cassette'] as int,
22 json['morning'] as String, 22 json['morning'] as String,
23 json['noon'] as String, 23 json['noon'] as String,
24 - json['night'] as String); 24 + json['night'] as String,
  25 + json['userphone'] as String);
25 } 26 }
26 27
27 Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{ 28 Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{
@@ -38,5 +39,6 @@ Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{ @@ -38,5 +39,6 @@ Map<String, dynamic> _$UserToJson(User instance) => <String, dynamic>{
38 'cassette': instance.cassette, 39 'cassette': instance.cassette,
39 'morning': instance.morning, 40 'morning': instance.morning,
40 'noon': instance.noon, 41 'noon': instance.noon,
41 - 'night': instance.night 42 + 'night': instance.night,
  43 + 'userphone': instance.userphone
42 }; 44 };
@@ -1177,6 +1177,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -1177,6 +1177,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
1177 _model.row.ddate, 1177 _model.row.ddate,
1178 ddate_solt, 1178 ddate_solt,
1179 _model.row.phone, 1179 _model.row.phone,
  1180 + _model.row.ddateSolt,
1180 replace: true); 1181 replace: true);
1181 EventBus().emit("refresh_tablemanager"); //刷新桌位 1182 EventBus().emit("refresh_tablemanager"); //刷新桌位
1182 } else { 1183 } else {
@@ -942,7 +942,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -942,7 +942,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
942 detailEntity.tableinfoStr, 942 detailEntity.tableinfoStr,
943 detailEntity.ddate, 943 detailEntity.ddate,
944 detailEntity.ddateStr, 944 detailEntity.ddateStr,
945 - detailEntity.phone); 945 + detailEntity.phone,
  946 + detailEntity.ddate_solt);
946 break; 947 break;
947 case 2: //短信 948 case 2: //短信
948 if (detailEntity.phone == null || 949 if (detailEntity.phone == null ||
@@ -29,8 +29,7 @@ class EnterPage extends StatefulWidget { @@ -29,8 +29,7 @@ class EnterPage extends StatefulWidget {
29 final NotebookDetail detailEntity; 29 final NotebookDetail detailEntity;
30 final String rid; 30 final String rid;
31 31
32 - const EnterPage({Key key, this.detailEntity, this.rid})  
33 - : super(key: key); 32 + const EnterPage({Key key, this.detailEntity, this.rid}) : super(key: key);
34 33
35 @override 34 @override
36 _EnterPageState createState() => _EnterPageState(); 35 _EnterPageState createState() => _EnterPageState();
@@ -48,17 +47,12 @@ class _EnterPageState extends State<EnterPage> { @@ -48,17 +47,12 @@ class _EnterPageState extends State<EnterPage> {
48 super.initState(); 47 super.initState();
49 LogUtil.v(widget.detailEntity.toString()); 48 LogUtil.v(widget.detailEntity.toString());
50 dateTime = DateTime.now(); 49 dateTime = DateTime.now();
51 - _enterModel =  
52 - Provider.of<EnterModel>(context, listen: true); 50 + _enterModel = Provider.of<EnterModel>(context, listen: true);
53 _enterModel.initData(widget.detailEntity); 51 _enterModel.initData(widget.detailEntity);
54 _enterModel.initDateHourMinuteList(context); 52 _enterModel.initDateHourMinuteList(context);
55 String ddate = widget.detailEntity.ddate.toString() + '000'; 53 String ddate = widget.detailEntity.ddate.toString() + '000';
56 - _enterModel.getNewTableList(  
57 - context,  
58 - ddate,  
59 - widget.detailEntity.ddate_solt,  
60 - widget.detailEntity.pnum,  
61 - widget.detailEntity.tables); 54 + _enterModel.getNewTableList(context, ddate, widget.detailEntity.ddate_solt,
  55 + widget.detailEntity.pnum, widget.detailEntity.tables);
62 _initData(); 56 _initData();
63 } 57 }
64 58
@@ -91,47 +85,37 @@ class _EnterPageState extends State<EnterPage> { @@ -91,47 +85,37 @@ class _EnterPageState extends State<EnterPage> {
91 if (value['title'] == '其他') { 85 if (value['title'] == '其他') {
92 _calendWidget(DateTime.now()); 86 _calendWidget(DateTime.now());
93 } else { 87 } else {
94 - for (int j = 0;  
95 - j < _enterModel.dateList.length;  
96 - j++) {  
97 - _enterModel.dateList[j]['select'] =  
98 - false; 88 + for (int j = 0; j < _enterModel.dateList.length; j++) {
  89 + _enterModel.dateList[j]['select'] = false;
99 90
100 if (_enterModel.dateList[j]['title'] == 91 if (_enterModel.dateList[j]['title'] ==
101 value['title']) { 92 value['title']) {
102 - _enterModel.dateList[j]['select'] =  
103 - true; 93 + _enterModel.dateList[j]['select'] = true;
104 94
105 if (j == 0 || j == 1) { 95 if (j == 0 || j == 1) {
106 - _enterModel.dateList[2]['title'] =  
107 - '其他'; 96 + _enterModel.dateList[2]['title'] = '其他';
108 } 97 }
109 - if (j ==  
110 - _enterModel.dateList.length - 1) {  
111 - String selectStr =  
112 - _enterModel.dateList[2]['title']; 98 + if (j == _enterModel.dateList.length - 1) {
  99 + String selectStr = _enterModel.dateList[2]['title'];
113 String timeNow = DateUtil.formatDate( 100 String timeNow = DateUtil.formatDate(
114 DateTime.now(), 101 DateTime.now(),
115 ); 102 );
116 String selectDate = 103 String selectDate =
117 - timeNow.replaceRange(5, 10, selectStr); 104 + timeNow.replaceRange(5, 10, selectStr);
118 _calendWidget(DateUtil.getDateTime(selectDate)); 105 _calendWidget(DateUtil.getDateTime(selectDate));
119 } 106 }
120 } 107 }
121 } 108 }
122 //选完今天明天刷新页面 109 //选完今天明天刷新页面
123 int ddate = Utils.getDdate(_enterModel.dateList); 110 int ddate = Utils.getDdate(_enterModel.dateList);
124 - _enterModel.updateSunDateList(DateTime.fromMillisecondsSinceEpoch(ddate), context); 111 + _enterModel.updateSunDateList(
  112 + DateTime.fromMillisecondsSinceEpoch(ddate), context);
125 String ddateSolt = 113 String ddateSolt =
126 - Utils.getDdateSolt(_enterModel.sunDateList); 114 + Utils.getDdateSolt(_enterModel.sunDateList);
127 String pnum = Utils.getPnum(_enterModel.personNumList); 115 String pnum = Utils.getPnum(_enterModel.personNumList);
128 List<t.TableList> list = 116 List<t.TableList> list =
129 - await _enterModel.getNewTableList(  
130 - context,  
131 - '${ddate}',  
132 - ddateSolt,  
133 - pnum,  
134 - _enterModel.tableList); 117 + await _enterModel.getNewTableList(context, '${ddate}',
  118 + ddateSolt, pnum, _enterModel.tableList);
135 if (list.length == 0) { 119 if (list.length == 0) {
136 _enterModel.isRecommend = true; 120 _enterModel.isRecommend = true;
137 } 121 }
@@ -144,62 +128,57 @@ class _EnterPageState extends State<EnterPage> { @@ -144,62 +128,57 @@ class _EnterPageState extends State<EnterPage> {
144 VEmptyView(60), 128 VEmptyView(60),
145 //早市、午市、晚市 129 //早市、午市、晚市
146 Row( 130 Row(
147 - // mainAxisAlignment: MainAxisAlignment.spaceBetween, 131 + // mainAxisAlignment: MainAxisAlignment.spaceBetween,
148 children: _enterModel.sunDateList.map((value) { 132 children: _enterModel.sunDateList.map((value) {
149 - return Container(  
150 - margin: _enterModel.sunDateList.length == 3 &&  
151 - value['ddateSolt'] == 3 133 + return Container(
  134 + margin:
  135 + _enterModel.sunDateList.length == 3 && value['ddateSolt'] == 3
152 ? EdgeInsets.only(right: 0) 136 ? EdgeInsets.only(right: 0)
153 : EdgeInsets.only(right: ScreenUtil().setWidth(20)), 137 : EdgeInsets.only(right: ScreenUtil().setWidth(20)),
154 - child: CustomButton(  
155 - onTap: () {  
156 - FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘  
157 - if(!value['isEnable'])return;  
158 - for (var item in _enterModel.sunDateList) {  
159 - item['isSelect'] = false;  
160 - if (item['dateText'] == value['dateText']) {  
161 - item['isSelect'] = true;  
162 - String key = '';  
163 -  
164 - if (item['ddateSolt'] == 1) {  
165 - //早市  
166 - key = 'morning';  
167 - } else if (item['ddateSolt'] == 2) {  
168 - //午市  
169 - key = 'noon';  
170 - } else if (item['ddateSolt'] == 3) {  
171 - //晚市  
172 - key = 'night';  
173 - }  
174 - if (key != '') {  
175 - for (var sunitem  
176 - in _enterModel.dailyMap[key]) {  
177 - if (sunitem['select'] == true) {  
178 - _enterModel.ddateStr =  
179 - sunitem['title'];  
180 - }  
181 - } 138 + child: CustomButton(
  139 + onTap: () {
  140 + FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
  141 + if (!value['isEnable']) return;
  142 + for (var item in _enterModel.sunDateList) {
  143 + item['isSelect'] = false;
  144 + if (item['dateText'] == value['dateText']) {
  145 + item['isSelect'] = true;
  146 + String key = '';
  147 +
  148 + if (item['ddateSolt'] == 1) {
  149 + //早市
  150 + key = 'morning';
  151 + } else if (item['ddateSolt'] == 2) {
  152 + //午市
  153 + key = 'noon';
  154 + } else if (item['ddateSolt'] == 3) {
  155 + //晚市
  156 + key = 'night';
  157 + }
  158 + if (key != '') {
  159 + for (var sunitem in _enterModel.dailyMap[key]) {
  160 + if (sunitem['select'] == true) {
  161 + _enterModel.ddateStr = sunitem['title'];
182 } 162 }
183 - _enterModel.notifyListeners();  
184 } 163 }
185 } 164 }
186 - int ddate = Utils.getDdate(_enterModel.dateList);  
187 - String pnum = Utils.getPnum(_enterModel.personNumList);  
188 - String ddateSolt = Utils.getDdateSolt(_enterModel.sunDateList);  
189 - _enterModel.getNewTableList(  
190 - context,  
191 - '${ddate}',  
192 - '${ddateSolt}',  
193 - pnum,  
194 - _enterModel.tableList);  
195 - },  
196 - dateText: value['dateText'],  
197 - dayText: '',  
198 - isEnable: value['isEnable'],  
199 - isSelect: value['isSelect'],  
200 - ),  
201 - );  
202 - }).toList()), 165 + _enterModel.notifyListeners();
  166 + }
  167 + }
  168 + int ddate = Utils.getDdate(_enterModel.dateList);
  169 + String pnum = Utils.getPnum(_enterModel.personNumList);
  170 + String ddateSolt =
  171 + Utils.getDdateSolt(_enterModel.sunDateList);
  172 + _enterModel.getNewTableList(context, '${ddate}',
  173 + '${ddateSolt}', pnum, _enterModel.tableList);
  174 + },
  175 + dateText: value['dateText'],
  176 + dayText: '',
  177 + isEnable: value['isEnable'],
  178 + isSelect: value['isSelect'],
  179 + ),
  180 + );
  181 + }).toList()),
203 VEmptyView(60), 182 VEmptyView(60),
204 183
205 ///人数选择 184 ///人数选择
@@ -208,21 +187,15 @@ class _EnterPageState extends State<EnterPage> { @@ -208,21 +187,15 @@ class _EnterPageState extends State<EnterPage> {
208 children: _enterModel.personNumList.map((value) { 187 children: _enterModel.personNumList.map((value) {
209 return CustomButton( 188 return CustomButton(
210 onTap: () { 189 onTap: () {
211 - for (int j = 0;  
212 - j < _enterModel.personNumList.length;  
213 - j++) {  
214 - _enterModel.personNumList[j]['isSelect'] =  
215 - false;  
216 -  
217 - if (_enterModel.personNumList[j]  
218 - ['dateText'] == 190 + for (int j = 0; j < _enterModel.personNumList.length; j++) {
  191 + _enterModel.personNumList[j]['isSelect'] = false;
  192 +
  193 + if (_enterModel.personNumList[j]['dateText'] ==
219 value['dateText']) { 194 value['dateText']) {
220 - _enterModel.personNumList[j]['isSelect'] =  
221 - true; 195 + _enterModel.personNumList[j]['isSelect'] = true;
222 196
223 if (j < 5) { 197 if (j < 5) {
224 - _enterModel.numController.text =  
225 - value['dateText']; 198 + _enterModel.numController.text = value['dateText'];
226 FocusScope.of(context) 199 FocusScope.of(context)
227 .requestFocus(FocusNode()); //点击空白处隐藏键盘 200 .requestFocus(FocusNode()); //点击空白处隐藏键盘
228 201
@@ -238,14 +211,11 @@ class _EnterPageState extends State<EnterPage> { @@ -238,14 +211,11 @@ class _EnterPageState extends State<EnterPage> {
238 //人数选择页面刷新 211 //人数选择页面刷新
239 String pnum = Utils.getPnum(_enterModel.personNumList); 212 String pnum = Utils.getPnum(_enterModel.personNumList);
240 int ddate = Utils.getDdate(_enterModel.dateList); 213 int ddate = Utils.getDdate(_enterModel.dateList);
241 - String ddateSolt = Utils.getDdateSolt(_enterModel.sunDateList);  
242 -  
243 - _enterModel.getNewTableList(  
244 - context,  
245 - '${ddate}',  
246 - ddateSolt,  
247 - pnum,  
248 - _enterModel.tableList); 214 + String ddateSolt =
  215 + Utils.getDdateSolt(_enterModel.sunDateList);
  216 +
  217 + _enterModel.getNewTableList(context, '${ddate}', ddateSolt,
  218 + pnum, _enterModel.tableList);
249 }, 219 },
250 dateText: value['dateText'], 220 dateText: value['dateText'],
251 fontSize: value['fontSize'], 221 fontSize: value['fontSize'],
@@ -290,11 +260,7 @@ class _EnterPageState extends State<EnterPage> { @@ -290,11 +260,7 @@ class _EnterPageState extends State<EnterPage> {
290 String ddateSolt = Utils.getDdateSolt(_enterModel.sunDateList); 260 String ddateSolt = Utils.getDdateSolt(_enterModel.sunDateList);
291 String pnum = Utils.getPnum(_enterModel.personNumList); 261 String pnum = Utils.getPnum(_enterModel.personNumList);
292 _enterModel.getNewTableList( 262 _enterModel.getNewTableList(
293 - context,  
294 - '${dateTimeMill}',  
295 - ddateSolt,  
296 - pnum,  
297 - _enterModel.tableList); 263 + context, '${dateTimeMill}', ddateSolt, pnum, _enterModel.tableList);
298 } 264 }
299 _enterModel.notifyListeners(); 265 _enterModel.notifyListeners();
300 }); 266 });
@@ -325,7 +291,7 @@ class _EnterPageState extends State<EnterPage> { @@ -325,7 +291,7 @@ class _EnterPageState extends State<EnterPage> {
325 } 291 }
326 } 292 }
327 String timeNowYear = 293 String timeNowYear =
328 - DateUtil.formatDate(DateTime.now(), format: 'yyyy'); 294 + DateUtil.formatDate(DateTime.now(), format: 'yyyy');
329 String ymyStr = timeNowYear + '-' + mdStr; //年月日 295 String ymyStr = timeNowYear + '-' + mdStr; //年月日
330 String timeStr = ymyStr + ' ' + "00:00:00"; 296 String timeStr = ymyStr + ' ' + "00:00:00";
331 int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳 297 int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
@@ -340,8 +306,7 @@ class _EnterPageState extends State<EnterPage> { @@ -340,8 +306,7 @@ class _EnterPageState extends State<EnterPage> {
340 // int ddate = DateUtil.getDateMsByTimeStr(timeStr); 306 // int ddate = DateUtil.getDateMsByTimeStr(timeStr);
341 Map temp = await NavigatorUtil.goSelectTablePage( 307 Map temp = await NavigatorUtil.goSelectTablePage(
342 context, widget.rid, ddate, ddateSolt, 308 context, widget.rid, ddate, ddateSolt,
343 - canChoose: true,  
344 - object: {'object': _enterModel.tableList}); 309 + canChoose: true, object: {'object': _enterModel.tableList});
345 // if (temp['tid'] != null) { 310 // if (temp['tid'] != null) {
346 // setReserveStatus("5", tid: temp['tid']); 311 // setReserveStatus("5", tid: temp['tid']);
347 // } 312 // }
@@ -349,8 +314,7 @@ class _EnterPageState extends State<EnterPage> { @@ -349,8 +314,7 @@ class _EnterPageState extends State<EnterPage> {
349 if (_enterModel.tableList.length == 0) { 314 if (_enterModel.tableList.length == 0) {
350 _enterModel.isRecommend = true; 315 _enterModel.isRecommend = true;
351 _enterModel.tableList = []; 316 _enterModel.tableList = [];
352 - for (t.TableList item  
353 - in _enterModel.recommendList) { 317 + for (t.TableList item in _enterModel.recommendList) {
354 item.selected = false; 318 item.selected = false;
355 } 319 }
356 setState(() {}); 320 setState(() {});
@@ -361,8 +325,7 @@ class _EnterPageState extends State<EnterPage> { @@ -361,8 +325,7 @@ class _EnterPageState extends State<EnterPage> {
361 // if (_enterModel.tableList.length == 0) { 325 // if (_enterModel.tableList.length == 0) {
362 // isRecommend = true; 326 // isRecommend = true;
363 // } 327 // }
364 - for (t.TableList item  
365 - in _enterModel.tableList) { 328 + for (t.TableList item in _enterModel.tableList) {
366 item.selected = true; 329 item.selected = true;
367 } 330 }
368 setState(() {}); 331 setState(() {});
@@ -530,20 +493,20 @@ class _EnterPageState extends State<EnterPage> { @@ -530,20 +493,20 @@ class _EnterPageState extends State<EnterPage> {
530 HEmptyView(40), 493 HEmptyView(40),
531 Row( 494 Row(
532 children: _enterModel.sexList.map((value) { 495 children: _enterModel.sexList.map((value) {
533 - return _callButton(  
534 - onPress: () {  
535 - for (var item in _enterModel.sexList) {  
536 - item['select'] = false;  
537 - if (item['title'] == value['title']) {  
538 - item['select'] = true;  
539 - }  
540 - }  
541 - _enterModel.notifyListeners();  
542 - },  
543 - content: value['title'],  
544 - hasLeftBorder: value['hasLeftBorder'],  
545 - isSelect: value['select']);  
546 - }).toList()), 496 + return _callButton(
  497 + onPress: () {
  498 + for (var item in _enterModel.sexList) {
  499 + item['select'] = false;
  500 + if (item['title'] == value['title']) {
  501 + item['select'] = true;
  502 + }
  503 + }
  504 + _enterModel.notifyListeners();
  505 + },
  506 + content: value['title'],
  507 + hasLeftBorder: value['hasLeftBorder'],
  508 + isSelect: value['select']);
  509 + }).toList()),
547 ], 510 ],
548 ), 511 ),
549 VEmptyView(40), 512 VEmptyView(40),
@@ -617,97 +580,96 @@ class _EnterPageState extends State<EnterPage> { @@ -617,97 +580,96 @@ class _EnterPageState extends State<EnterPage> {
617 return StatefulBuilder(builder: (context, state) { 580 return StatefulBuilder(builder: (context, state) {
618 return SafeArea( 581 return SafeArea(
619 child: Container( 582 child: Container(
620 - decoration: BoxDecoration(  
621 - borderRadius: 583 + decoration: BoxDecoration(
  584 + borderRadius:
622 BorderRadius.circular(ScreenUtil().setWidth(10))), 585 BorderRadius.circular(ScreenUtil().setWidth(10))),
623 - height: ScreenUtil().setWidth(height * 2),  
624 - child: Column(  
625 - children: [  
626 - InkWell(  
627 - onTap: () {  
628 - Navigator.pop(context);  
629 - },  
630 - child: Align(  
631 - alignment: Alignment.centerRight,  
632 - child: Container(  
633 - padding: EdgeInsets.fromLTRB(  
634 - ScreenUtil().setWidth(40),  
635 - ScreenUtil().setWidth(40),  
636 - ScreenUtil().setWidth(40),  
637 - ScreenUtil().setWidth(10)),  
638 - child: Image.asset(  
639 - 'assets/close.png',  
640 - width: ScreenUtil().setWidth(32),  
641 - height: ScreenUtil().setWidth(32),  
642 - ),  
643 - ), 586 + height: ScreenUtil().setWidth(height * 2),
  587 + child: Column(
  588 + children: [
  589 + InkWell(
  590 + onTap: () {
  591 + Navigator.pop(context);
  592 + },
  593 + child: Align(
  594 + alignment: Alignment.centerRight,
  595 + child: Container(
  596 + padding: EdgeInsets.fromLTRB(
  597 + ScreenUtil().setWidth(40),
  598 + ScreenUtil().setWidth(40),
  599 + ScreenUtil().setWidth(40),
  600 + ScreenUtil().setWidth(10)),
  601 + child: Image.asset(
  602 + 'assets/close.png',
  603 + width: ScreenUtil().setWidth(32),
  604 + height: ScreenUtil().setWidth(32),
644 ), 605 ),
645 ), 606 ),
646 - Center(  
647 - child: Text(title,  
648 - style: TextStyle(  
649 - fontSize: ScreenUtil().setSp(34),  
650 - fontWeight: FontWeight.bold,  
651 - color: MyColours.color_353535)),  
652 - ),  
653 - VEmptyView(40),  
654 - Padding(  
655 - padding: EdgeInsets.symmetric(  
656 - horizontal: ScreenUtil().setWidth(60)),  
657 - child: GridView.builder(  
658 - padding: 607 + ),
  608 + ),
  609 + Center(
  610 + child: Text(title,
  611 + style: TextStyle(
  612 + fontSize: ScreenUtil().setSp(34),
  613 + fontWeight: FontWeight.bold,
  614 + color: MyColours.color_353535)),
  615 + ),
  616 + VEmptyView(40),
  617 + Padding(
  618 + padding: EdgeInsets.symmetric(
  619 + horizontal: ScreenUtil().setWidth(60)),
  620 + child: GridView.builder(
  621 + padding:
659 EdgeInsets.only(top: ScreenUtil().setWidth(20)), 622 EdgeInsets.only(top: ScreenUtil().setWidth(20)),
660 - shrinkWrap: true,  
661 - cacheExtent: ScreenUtil().setWidth(0),  
662 - itemCount: tempMndList.length,  
663 - gridDelegate: 623 + shrinkWrap: true,
  624 + cacheExtent: ScreenUtil().setWidth(0),
  625 + itemCount: tempMndList.length,
  626 + gridDelegate:
664 SliverGridDelegateWithFixedCrossAxisCount( 627 SliverGridDelegateWithFixedCrossAxisCount(
665 crossAxisCount: 3, 628 crossAxisCount: 3,
666 childAspectRatio: 80 / 36, 629 childAspectRatio: 80 / 36,
667 mainAxisSpacing: 630 mainAxisSpacing:
668 - ScreenUtil().setWidth(15 * 2), 631 + ScreenUtil().setWidth(15 * 2),
669 crossAxisSpacing: 632 crossAxisSpacing:
670 - ScreenUtil().setWidth(38 * 2)),  
671 - itemBuilder: (BuildContext context, int index) {  
672 - // locationState = state;  
673 - return CustomButton(  
674 - onTap: () {  
675 - // state(() {  
676 - for (var item in tempMndList) {  
677 - item['select'] = false;  
678 - if (item['title'] ==  
679 - tempMndList[index]['title']) {  
680 - item['select'] = true;  
681 - widget.detailEntity.is_set_ddate = '1';  
682 - _enterModel.isSetDate = "1";  
683 - _enterModel.ddateStr =  
684 - item['title'];  
685 - }  
686 - }  
687 - // });  
688 -  
689 - _enterModel.notifyListeners();  
690 - Navigator.pop(context);  
691 - },  
692 - width: 80,  
693 - height: 36,  
694 - dateText: tempMndList[index]['title'].toString(),  
695 - dayText: '',  
696 - isSelect: tempMndList[index]['select'],  
697 - );  
698 - }))  
699 - ],  
700 - ),  
701 - )); 633 + ScreenUtil().setWidth(38 * 2)),
  634 + itemBuilder: (BuildContext context, int index) {
  635 + // locationState = state;
  636 + return CustomButton(
  637 + onTap: () {
  638 + // state(() {
  639 + for (var item in tempMndList) {
  640 + item['select'] = false;
  641 + if (item['title'] ==
  642 + tempMndList[index]['title']) {
  643 + item['select'] = true;
  644 + widget.detailEntity.is_set_ddate = '1';
  645 + _enterModel.isSetDate = "1";
  646 + _enterModel.ddateStr = item['title'];
  647 + }
  648 + }
  649 + // });
  650 +
  651 + _enterModel.notifyListeners();
  652 + Navigator.pop(context);
  653 + },
  654 + width: 80,
  655 + height: 36,
  656 + dateText: tempMndList[index]['title'].toString(),
  657 + dayText: '',
  658 + isSelect: tempMndList[index]['select'],
  659 + );
  660 + }))
  661 + ],
  662 + ),
  663 + ));
702 }); 664 });
703 }); 665 });
704 } 666 }
705 667
706 Widget _callButton( 668 Widget _callButton(
707 {GestureTapCallback onPress, 669 {GestureTapCallback onPress,
708 - content,  
709 - hasLeftBorder = true,  
710 - isSelect = false}) { 670 + content,
  671 + hasLeftBorder = true,
  672 + isSelect = false}) {
711 return InkWell( 673 return InkWell(
712 onTap: onPress, 674 onTap: onPress,
713 child: Container( 675 child: Container(
@@ -724,8 +686,8 @@ class _EnterPageState extends State<EnterPage> { @@ -724,8 +686,8 @@ class _EnterPageState extends State<EnterPage> {
724 width: ScreenUtil().setWidth(2)), 686 width: ScreenUtil().setWidth(2)),
725 left: hasLeftBorder 687 left: hasLeftBorder
726 ? BorderSide( 688 ? BorderSide(
727 - color: MyColours.color_6AB6B9,  
728 - width: ScreenUtil().setWidth(2)) 689 + color: MyColours.color_6AB6B9,
  690 + width: ScreenUtil().setWidth(2))
729 : BorderSide.none, 691 : BorderSide.none,
730 right: BorderSide( 692 right: BorderSide(
731 color: MyColours.color_6AB6B9, 693 color: MyColours.color_6AB6B9,
@@ -761,8 +723,8 @@ class _EnterPageState extends State<EnterPage> { @@ -761,8 +723,8 @@ class _EnterPageState extends State<EnterPage> {
761 Expanded( 723 Expanded(
762 child: SingleChildScrollView( 724 child: SingleChildScrollView(
763 child: Column( 725 child: Column(
764 - children: [_topWidget(), _middleWidget(), _bottomWidget()],  
765 - ))), 726 + children: [_topWidget(), _middleWidget(), _bottomWidget()],
  727 + ))),
766 Container( 728 Container(
767 padding: EdgeInsets.symmetric( 729 padding: EdgeInsets.symmetric(
768 horizontal: ScreenUtil().setWidth(40), 730 horizontal: ScreenUtil().setWidth(40),
@@ -775,8 +737,7 @@ class _EnterPageState extends State<EnterPage> { @@ -775,8 +737,7 @@ class _EnterPageState extends State<EnterPage> {
775 content: "录入预订", 737 content: "录入预订",
776 state: 2, 738 state: 2,
777 onPress: () async { 739 onPress: () async {
778 - String name =  
779 - _enterModel.nameController.text.trim(); 740 + String name = _enterModel.nameController.text.trim();
780 if (ObjectUtil.isEmpty(name)) { 741 if (ObjectUtil.isEmpty(name)) {
781 Utils.showToast("请填写客户姓名"); 742 Utils.showToast("请填写客户姓名");
782 return; 743 return;
@@ -786,8 +747,7 @@ class _EnterPageState extends State<EnterPage> { @@ -786,8 +747,7 @@ class _EnterPageState extends State<EnterPage> {
786 return; 747 return;
787 } 748 }
788 SunReserveInfoModel _model = 749 SunReserveInfoModel _model =
789 - await _enterModel  
790 - .setReserveInfo(context); 750 + await _enterModel.setReserveInfo(context);
791 if (ObjectUtil.isNotEmpty(_model.row) || 751 if (ObjectUtil.isNotEmpty(_model.row) ||
792 ObjectUtil.isNotEmpty(_model.row.id)) { 752 ObjectUtil.isNotEmpty(_model.row.id)) {
793 print('录入成功'); 753 print('录入成功');
@@ -795,10 +755,11 @@ class _EnterPageState extends State<EnterPage> { @@ -795,10 +755,11 @@ class _EnterPageState extends State<EnterPage> {
795 bus.emit("refresh_detail"); 755 bus.emit("refresh_detail");
796 String ddate_solt = ''; 756 String ddate_solt = '';
797 if (_model.row.isSetDdate == '1') { 757 if (_model.row.isSetDdate == '1') {
798 - String createtime = _model.row.ddate.toString() + '000'; 758 + String createtime =
  759 + _model.row.ddate.toString() + '000';
799 DateTime createTime = 760 DateTime createTime =
800 - DateTime.fromMillisecondsSinceEpoch(  
801 - int.parse(createtime)); 761 + DateTime.fromMillisecondsSinceEpoch(
  762 + int.parse(createtime));
802 ddate_solt = DateUtil.formatDate(createTime, 763 ddate_solt = DateUtil.formatDate(createTime,
803 format: DateFormats.h_m); 764 format: DateFormats.h_m);
804 } else { 765 } else {
@@ -811,14 +772,20 @@ class _EnterPageState extends State<EnterPage> { @@ -811,14 +772,20 @@ class _EnterPageState extends State<EnterPage> {
811 } 772 }
812 } 773 }
813 List<dynamic> tableinfo = 774 List<dynamic> tableinfo =
814 - convert.jsonDecode(_model.row.tableinfo); 775 + convert.jsonDecode(_model.row.tableinfo);
815 print(tableinfo); 776 print(tableinfo);
816 String _nameStr = _model.row.name; 777 String _nameStr = _model.row.name;
817 if (tableinfo.length > 1) { 778 if (tableinfo.length > 1) {
818 _nameStr = _model.row.name + '等${tableinfo.length}桌'; 779 _nameStr = _model.row.name + '等${tableinfo.length}桌';
819 } 780 }
820 - NavigatorUtil.goInvicationPage(context, _model.row.id,  
821 - _nameStr, _model.row.ddate, ddate_solt,_model.row.phone, 781 + NavigatorUtil.goInvicationPage(
  782 + context,
  783 + _model.row.id,
  784 + _nameStr,
  785 + _model.row.ddate,
  786 + ddate_solt,
  787 + _model.row.phone,
  788 + _model.row.ddateSolt,
822 replace: true); 789 replace: true);
823 } else { 790 } else {
824 Utils.showToast("录入预订订单失败，请重试！"); 791 Utils.showToast("录入预订订单失败，请重试！");
@@ -848,7 +815,7 @@ class CustomButton extends StatefulWidget { @@ -848,7 +815,7 @@ class CustomButton extends StatefulWidget {
848 Key key, 815 Key key,
849 this.dateText, 816 this.dateText,
850 this.dayText, 817 this.dayText,
851 - this.isEnable=true, 818 + this.isEnable = true,
852 this.isSelect, 819 this.isSelect,
853 this.fontSize = 34, 820 this.fontSize = 34,
854 this.isImage = false, 821 this.isImage = false,
@@ -878,112 +845,121 @@ class _ButtonState extends State<CustomButton> { @@ -878,112 +845,121 @@ class _ButtonState extends State<CustomButton> {
878 width: ScreenUtil().setWidth(widget.width * 2), 845 width: ScreenUtil().setWidth(widget.width * 2),
879 height: ScreenUtil().setWidth(widget.height * 2), 846 height: ScreenUtil().setWidth(widget.height * 2),
880 decoration: BoxDecoration( 847 decoration: BoxDecoration(
881 - color: !widget.isEnable?MyColours.color_999999:widget.isSelect ? MyColours.color_199095 : Colors.white, 848 + color: !widget.isEnable
  849 + ? MyColours.color_999999
  850 + : widget.isSelect
  851 + ? MyColours.color_199095
  852 + : Colors.white,
882 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)), 853 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
883 border: Border.all( 854 border: Border.all(
884 - color: !widget.isEnable?MyColours.color_999999:MyColours.color_199095, 855 + color: !widget.isEnable
  856 + ? MyColours.color_999999
  857 + : MyColours.color_199095,
885 width: ScreenUtil().setWidth(2))), 858 width: ScreenUtil().setWidth(2))),
886 child: Row( 859 child: Row(
887 mainAxisAlignment: MainAxisAlignment.center, 860 mainAxisAlignment: MainAxisAlignment.center,
888 children: [ 861 children: [
889 widget.isTextFiled 862 widget.isTextFiled
890 ? Container( 863 ? Container(
891 - alignment: Alignment.center,  
892 - // color: Colors.red,  
893 - width: ScreenUtil().setWidth(114),  
894 - height: ScreenUtil().setWidth(50),  
895 - // padding: EdgeInsets.zero,  
896 - child: TextField(  
897 - controller: widget.model.numController,  
898 - maxLines: 1,  
899 -  
900 - inputFormatters: [  
901 - LengthLimitingTextInputFormatter(3),  
902 - WhitelistingTextInputFormatter.digitsOnly  
903 - ],  
904 - //光标颜色  
905 - cursorColor: widget.isSelect  
906 - ? Colors.white  
907 - : MyColours.color_199095,  
908 - //输入文本的样式  
909 - style: TextStyle(  
910 - fontSize: ScreenUtil().setSp(30),  
911 - color: widget.isSelect  
912 - ? Colors.white  
913 - : MyColours.color_199095),  
914 - // controller: _cancelController,  
915 - focusNode: _cancelNode,  
916 - textAlignVertical: TextAlignVertical.bottom,  
917 - decoration: InputDecoration(  
918 - // fillColor: Colors.lightGreenAccent,  
919 - // filled: true,  
920 - border: OutlineInputBorder(borderSide: BorderSide.none),  
921 - hintText: "更多",  
922 - hintStyle: TextStyle(  
923 - color: widget.isSelect  
924 - ? Colors.white  
925 - : MyColours.color_199095,  
926 - fontSize: ScreenUtil().setSp(30),  
927 - ),  
928 - // contentPadding: EdgeInsets.only(  
929 - // bottom: ScreenUtil().setWidth(30)), //ios 17  
930 - // border: InputBorder.none,  
931 - ),  
932 - onChanged: (value) {  
933 - bool isThird = true;  
934 - for (int i = 0;  
935 - i < widget.model.personNumList.length;  
936 - i++) {  
937 - widget.model.personNumList[i]['isSelect'] = false;  
938 -  
939 - if (widget.model.personNumList[i]['dateText'] ==  
940 - value) {  
941 - widget.model.personNumList[i]['isSelect'] = true;  
942 - isThird = false;  
943 - }  
944 - }  
945 - if (isThird) {  
946 - widget.model.personNumList[5]['isSelect'] = true;  
947 - widget.model.personNumList[5]['dateText'] = value;  
948 - } else {  
949 - widget.model.personNumList[5]['dateText'] = '更多';  
950 - }  
951 - widget.model.notifyListeners();  
952 - },  
953 - onEditingComplete: () {  
954 - _cancelNode.unfocus();  
955 - int ddate = Utils.getDdate(widget.model.dateList);  
956 - String ddateSolt = Utils.getDdateSolt(widget.model.sunDateList);  
957 - String pnum = Utils.getPnum(widget.model.personNumList);  
958 -  
959 - widget.model.getNewTableList(context, '${ddate}',  
960 - ddateSolt, pnum, widget.model.tableList);  
961 - },  
962 - keyboardType: TextInputType.number,  
963 - ),  
964 - ) 864 + alignment: Alignment.center,
  865 + // color: Colors.red,
  866 + width: ScreenUtil().setWidth(114),
  867 + height: ScreenUtil().setWidth(50),
  868 + // padding: EdgeInsets.zero,
  869 + child: TextField(
  870 + controller: widget.model.numController,
  871 + maxLines: 1,
  872 +
  873 + inputFormatters: [
  874 + LengthLimitingTextInputFormatter(3),
  875 + WhitelistingTextInputFormatter.digitsOnly
  876 + ],
  877 + //光标颜色
  878 + cursorColor: widget.isSelect
  879 + ? Colors.white
  880 + : MyColours.color_199095,
  881 + //输入文本的样式
  882 + style: TextStyle(
  883 + fontSize: ScreenUtil().setSp(30),
  884 + color: widget.isSelect
  885 + ? Colors.white
  886 + : MyColours.color_199095),
  887 + // controller: _cancelController,
  888 + focusNode: _cancelNode,
  889 + textAlignVertical: TextAlignVertical.bottom,
  890 + decoration: InputDecoration(
  891 + // fillColor: Colors.lightGreenAccent,
  892 + // filled: true,
  893 + border: OutlineInputBorder(borderSide: BorderSide.none),
  894 + hintText: "更多",
  895 + hintStyle: TextStyle(
  896 + color: widget.isSelect
  897 + ? Colors.white
  898 + : MyColours.color_199095,
  899 + fontSize: ScreenUtil().setSp(30),
  900 + ),
  901 + // contentPadding: EdgeInsets.only(
  902 + // bottom: ScreenUtil().setWidth(30)), //ios 17
  903 + // border: InputBorder.none,
  904 + ),
  905 + onChanged: (value) {
  906 + bool isThird = true;
  907 + for (int i = 0;
  908 + i < widget.model.personNumList.length;
  909 + i++) {
  910 + widget.model.personNumList[i]['isSelect'] = false;
  911 +
  912 + if (widget.model.personNumList[i]['dateText'] ==
  913 + value) {
  914 + widget.model.personNumList[i]['isSelect'] = true;
  915 + isThird = false;
  916 + }
  917 + }
  918 + if (isThird) {
  919 + widget.model.personNumList[5]['isSelect'] = true;
  920 + widget.model.personNumList[5]['dateText'] = value;
  921 + } else {
  922 + widget.model.personNumList[5]['dateText'] = '更多';
  923 + }
  924 + widget.model.notifyListeners();
  925 + },
  926 + onEditingComplete: () {
  927 + _cancelNode.unfocus();
  928 + int ddate = Utils.getDdate(widget.model.dateList);
  929 + String ddateSolt =
  930 + Utils.getDdateSolt(widget.model.sunDateList);
  931 + String pnum = Utils.getPnum(widget.model.personNumList);
  932 +
  933 + widget.model.getNewTableList(context, '${ddate}',
  934 + ddateSolt, pnum, widget.model.tableList);
  935 + },
  936 + keyboardType: TextInputType.number,
  937 + ),
  938 + )
965 : Text(widget.dateText, 939 : Text(widget.dateText,
966 - style: TextStyle(  
967 - fontWeight: widget.isImage && widget.dateText == "其他"  
968 - ? FontWeight.normal  
969 - : FontWeight.bold,  
970 - color: !widget.isEnable?MyColours.color_666666:widget.isSelect  
971 - ? MyColours.color_fefefe  
972 - : MyColours.color_199095,  
973 - fontSize: ScreenUtil().setSp(widget.fontSize))), 940 + style: TextStyle(
  941 + fontWeight: widget.isImage && widget.dateText == "其他"
  942 + ? FontWeight.normal
  943 + : FontWeight.bold,
  944 + color: !widget.isEnable
  945 + ? MyColours.color_666666
  946 + : widget.isSelect
  947 + ? MyColours.color_fefefe
  948 + : MyColours.color_199095,
  949 + fontSize: ScreenUtil().setSp(widget.fontSize))),
974 widget.isImage && !widget.isTextFiled 950 widget.isImage && !widget.isTextFiled
975 ? HEmptyView(20) 951 ? HEmptyView(20)
976 : Container(), 952 : Container(),
977 widget.isImage 953 widget.isImage
978 ? Image.asset(widget.isSelect ? imgStrSelect : imgStrNormal, 954 ? Image.asset(widget.isSelect ? imgStrSelect : imgStrNormal,
979 - width: ScreenUtil().setWidth(36)) 955 + width: ScreenUtil().setWidth(36))
980 : Text(widget.dayText, 956 : Text(widget.dayText,
981 - style: TextStyle(  
982 - fontWeight: FontWeight.bold,  
983 - color: widget.isSelect  
984 - ? MyColours.color_fefefe  
985 - : MyColours.color_199095,  
986 - fontSize: ScreenUtil().setSp(30))) 957 + style: TextStyle(
  958 + fontWeight: FontWeight.bold,
  959 + color: widget.isSelect
  960 + ? MyColours.color_fefefe
  961 + : MyColours.color_199095,
  962 + fontSize: ScreenUtil().setSp(30)))
987 ], 963 ],
988 ), 964 ),
989 ), 965 ),
@@ -1370,6 +1370,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -1370,6 +1370,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
1370 _model.row.ddate, 1370 _model.row.ddate,
1371 ddate_solt, 1371 ddate_solt,
1372 _model.row.phone, 1372 _model.row.phone,
  1373 + _model.row.ddateSolt,
1373 replace: false); 1374 replace: false);
1374 //今天 明天 其他天 1375 //今天 明天 其他天
1375 String tempTime = _homeEnterModel.ddateStr; 1376 String tempTime = _homeEnterModel.ddateStr;
@@ -31,9 +31,10 @@ class InvicationPage extends StatefulWidget { @@ -31,9 +31,10 @@ class InvicationPage extends StatefulWidget {
31 final String ddate; 31 final String ddate;
32 final String ddateStr; 32 final String ddateStr;
33 final String phone; 33 final String phone;
  34 + final String dateSolt;
34 35
35 - InvicationPage(  
36 - this.rid, this.tableInfo, this.ddate, this.ddateStr, this.phone); 36 + InvicationPage(this.rid, this.tableInfo, this.ddate, this.ddateStr,
  37 + this.phone, this.dateSolt);
37 38
38 @override 39 @override
39 State<StatefulWidget> createState() { 40 State<StatefulWidget> createState() {
@@ -50,9 +51,9 @@ class InvicationPageState extends State<InvicationPage> { @@ -50,9 +51,9 @@ class InvicationPageState extends State<InvicationPage> {
50 double couponHeight = 140.0; 51 double couponHeight = 140.0;
51 CouponProvider couponProvider; 52 CouponProvider couponProvider;
52 BaseIndoProvider _baseIndoProvider; 53 BaseIndoProvider _baseIndoProvider;
53 - String name = '填写姓名';  
54 - String position = '填写职位';  
55 - String phone = '填写电话'; 54 + String name = '';
  55 + String position = '经理';
  56 + String phone = '';
56 String qiniuUrl = ''; 57 String qiniuUrl = '';
57 final GlobalKey key = new GlobalKey(); 58 final GlobalKey key = new GlobalKey();
58 final GlobalKey globalKey = GlobalKey(); 59 final GlobalKey globalKey = GlobalKey();
@@ -71,6 +72,7 @@ class InvicationPageState extends State<InvicationPage> { @@ -71,6 +72,7 @@ class InvicationPageState extends State<InvicationPage> {
71 dateTime = 72 dateTime =
72 DateTime.fromMillisecondsSinceEpoch(int.parse(widget.ddate) * 1000); 73 DateTime.fromMillisecondsSinceEpoch(int.parse(widget.ddate) * 1000);
73 user = Provider.of<UserModel>(context, listen: false).user; 74 user = Provider.of<UserModel>(context, listen: false).user;
  75 +
74 dateTimeStr = 76 dateTimeStr =
75 "${dateTime.year}/${Utils.addZeroNumber(dateTime.month)}/${Utils.addZeroNumber(dateTime.day)} 星期${Utils.formatWeekDayNum(dateTime.weekday)} ${widget.ddateStr}"; 77 "${dateTime.year}/${Utils.addZeroNumber(dateTime.month)}/${Utils.addZeroNumber(dateTime.day)} 星期${Utils.formatWeekDayNum(dateTime.weekday)} ${widget.ddateStr}";
76 } 78 }
@@ -83,6 +85,34 @@ class InvicationPageState extends State<InvicationPage> { @@ -83,6 +85,34 @@ class InvicationPageState extends State<InvicationPage> {
83 bool success = await _baseIndoProvider.getSellerPhotoById(context, params); 85 bool success = await _baseIndoProvider.getSellerPhotoById(context, params);
84 } 86 }
85 87
  88 + //客户经理添加/修改基本信息
  89 + _setCustomerActivityBaseinfo() async {
  90 + Map<String, String> params = {
  91 + 'sellerid': Provider.of<UserModel>(context, listen: false).user.sellerid,
  92 + "uid": Provider.of<UserModel>(context, listen: false).user.openid,
  93 + "name": user.sellername,
  94 + "photo": 'http://nosqn.colorcun.com/yd_person.png',
  95 + "position": '经理',
  96 + };
  97 + if (user.userphone != null) {
  98 + params['phone'] = user.userphone;
  99 + }
  100 +
  101 + bool isSuccess =
  102 + await _baseIndoProvider.setCustomerActivityBaseinfo(context, params);
  103 + // _baseIndoProvider.baseInfoSunModel = null;
  104 + if (isSuccess) {
  105 + name = user.sellername;
  106 + qiniuUrl = 'http://nosqn.colorcun.com/yd_person.png';
  107 + // _uploadImageProvider.erweima.qiniuUrl =
  108 + // _baseIndoProvider.baseInfoSunModel.qrcode;
  109 + phone = user.userphone != null ? user.userphone : '填写电话';
  110 + position = '经理';
  111 + qiniuUrl = 'http://nosqn.colorcun.com/yd_person.png';
  112 + setState(() {});
  113 + }
  114 + }
  115 +
86 _getCustomerActivityBaseinfo() async { 116 _getCustomerActivityBaseinfo() async {
87 Map<String, String> params = { 117 Map<String, String> params = {
88 'sellerid': Provider.of<UserModel>(context, listen: false).user.sellerid, 118 'sellerid': Provider.of<UserModel>(context, listen: false).user.sellerid,
@@ -95,7 +125,11 @@ class InvicationPageState extends State<InvicationPage> { @@ -95,7 +125,11 @@ class InvicationPageState extends State<InvicationPage> {
95 qiniuUrl = _baseIndoProvider.baseInfoSunModel.photo; 125 qiniuUrl = _baseIndoProvider.baseInfoSunModel.photo;
96 // _uploadImageProvider.erweima.qiniuUrl = 126 // _uploadImageProvider.erweima.qiniuUrl =
97 // _baseIndoProvider.baseInfoSunModel.qrcode; 127 // _baseIndoProvider.baseInfoSunModel.qrcode;
98 - phone = _baseIndoProvider.baseInfoSunModel.phone; 128 +
  129 + phone = _baseIndoProvider.baseInfoSunModel.phone != null
  130 + ? _baseIndoProvider.baseInfoSunModel.phone
  131 + : '填写电话';
  132 +
99 position = _baseIndoProvider.baseInfoSunModel.position; 133 position = _baseIndoProvider.baseInfoSunModel.position;
100 setState(() {}); 134 setState(() {});
101 } else { 135 } else {
@@ -103,6 +137,7 @@ class InvicationPageState extends State<InvicationPage> { @@ -103,6 +137,7 @@ class InvicationPageState extends State<InvicationPage> {
103 // position = '请填写职位'; 137 // position = '请填写职位';
104 // phone = '请填写电话'; 138 // phone = '请填写电话';
105 // qiniuUrl = ''; 139 // qiniuUrl = '';
  140 + _setCustomerActivityBaseinfo();
106 } 141 }
107 } 142 }
108 143
@@ -342,19 +377,14 @@ class InvicationPageState extends State<InvicationPage> { @@ -342,19 +377,14 @@ class InvicationPageState extends State<InvicationPage> {
342 padding: EdgeInsets.only( 377 padding: EdgeInsets.only(
343 left: ScreenUtil() 378 left: ScreenUtil()
344 .setWidth(70)), 379 .setWidth(70)),
345 - child: qiniuUrl == ''  
346 - ? Image.asset(  
347 - Utils.getImgPath(  
348 - 'yd_person'),  
349 - width: ScreenUtil()  
350 - .setWidth(143 * 2),  
351 - height: ScreenUtil()  
352 - .setWidth(190 * 2))  
353 - : Image.network(qiniuUrl,  
354 - width: ScreenUtil()  
355 - .setWidth(143 * 2),  
356 - height: ScreenUtil()  
357 - .setWidth(190 * 2)), 380 + child: Image.network(
  381 + qiniuUrl == ''
  382 + ? 'http://nosqn.colorcun.com/yd_person.png'
  383 + : qiniuUrl,
  384 + width: ScreenUtil()
  385 + .setWidth(143 * 2),
  386 + height: ScreenUtil()
  387 + .setWidth(190 * 2)),
358 ), 388 ),
359 HEmptyView(10), 389 HEmptyView(10),
360 Spacer(), 390 Spacer(),
@@ -389,12 +419,8 @@ class InvicationPageState extends State<InvicationPage> { @@ -389,12 +419,8 @@ class InvicationPageState extends State<InvicationPage> {
389 textAlign: 419 textAlign:
390 TextAlign.right, 420 TextAlign.right,
391 style: TextStyle( 421 style: TextStyle(
392 - color: name ==  
393 - '填写姓名'  
394 - ? MyColours  
395 - .color_999999  
396 - : MyColours  
397 - .color_333333, 422 + color: MyColours
  423 + .color_333333,
398 fontSize: 424 fontSize:
399 ScreenUtil() 425 ScreenUtil()
400 .setSp( 426 .setSp(
@@ -452,11 +478,8 @@ class InvicationPageState extends State<InvicationPage> { @@ -452,11 +478,8 @@ class InvicationPageState extends State<InvicationPage> {
452 textAlign: 478 textAlign:
453 TextAlign.right, 479 TextAlign.right,
454 style: TextStyle( 480 style: TextStyle(
455 - color: position == '填写职位'  
456 - ? MyColours  
457 - .color_999999  
458 - : MyColours  
459 - .color_333333, 481 + color: MyColours
  482 + .color_333333,
460 fontSize: 483 fontSize:
461 ScreenUtil() 484 ScreenUtil()
462 .setSp( 485 .setSp(
@@ -727,37 +750,42 @@ class InvicationPageState extends State<InvicationPage> { @@ -727,37 +750,42 @@ class InvicationPageState extends State<InvicationPage> {
727 isBold: false, 750 isBold: false,
728 onPressed: () async { 751 onPressed: () async {
729 // Uint8List image = await _getImage(); 752 // Uint8List image = await _getImage();
730 -  
731 - if (ObjectUtil.isEmpty(  
732 - _baseIndoProvider.baseInfoSunModel)) {  
733 - Utils.showToast('请输入个人资料');  
734 - return;  
735 - } 753 + print(widget.rid);
  754 + print(Provider.of<UserModel>(context, listen: false)
  755 + .user
  756 + .openid);
  757 + // if (ObjectUtil.isEmpty(
  758 + // _baseIndoProvider.baseInfoSunModel)) {
  759 + // Utils.showToast('请输入个人资料');
  760 + // return;
  761 + // }
  762 + // if (ObjectUtil.isEmpty(
  763 + // _baseIndoProvider.baseInfoSunModel.name)) {
  764 + // Utils.showToast('请填写您的姓名');
  765 + // return;
  766 + // }
736 if (ObjectUtil.isEmpty( 767 if (ObjectUtil.isEmpty(
737 - _baseIndoProvider.baseInfoSunModel.name)) {  
738 - Utils.showToast('请填写您的姓名');  
739 - return;  
740 - }  
741 - if (ObjectUtil.isEmpty(  
742 - _baseIndoProvider.baseInfoSunModel.phone)) { 768 + _baseIndoProvider.baseInfoSunModel) ||
  769 + ObjectUtil.isEmpty(
  770 + _baseIndoProvider.baseInfoSunModel.phone)) {
743 Utils.showToast('请填写您的联系电话'); 771 Utils.showToast('请填写您的联系电话');
744 return; 772 return;
745 } 773 }
746 - if (ObjectUtil.isEmpty(  
747 - _baseIndoProvider.baseInfoSunModel.position)) {  
748 - Utils.showToast('请填写您在餐厅中的职位');  
749 - return;  
750 - }  
751 - if (ObjectUtil.isEmpty(  
752 - _baseIndoProvider.baseInfoSunModel.phone)) {  
753 - Utils.showToast('请上传您的头像');  
754 - return;  
755 - }  
756 - if (ObjectUtil.isEmpty(  
757 - _baseIndoProvider.baseInfoSunModel.qrcode)) {  
758 - Utils.showToast('请上传您的微信二维码');  
759 - return;  
760 - } 774 + // if (ObjectUtil.isEmpty(
  775 + // _baseIndoProvider.baseInfoSunModel.position)) {
  776 + // Utils.showToast('请填写您在餐厅中的职位');
  777 + // return;
  778 + // }
  779 + // if (ObjectUtil.isEmpty(
  780 + // _baseIndoProvider.baseInfoSunModel.phone)) {
  781 + // Utils.showToast('请上传您的头像');
  782 + // return;
  783 + // }
  784 + // if (ObjectUtil.isEmpty(
  785 + // _baseIndoProvider.baseInfoSunModel.qrcode)) {
  786 + // Utils.showToast('请上传您的微信二维码');
  787 + // return;
  788 + // }
761 if (!couponProvider.hasModify && 789 if (!couponProvider.hasModify &&
762 couponProvider.coupons.length > 0) { 790 couponProvider.coupons.length > 0) {
763 Map<String, String> params = { 791 Map<String, String> params = {
@@ -814,6 +842,19 @@ class InvicationPageState extends State<InvicationPage> { @@ -814,6 +842,19 @@ class InvicationPageState extends State<InvicationPage> {
814 return; 842 return;
815 } 843 }
816 if (!couponProvider.sendSMS) { 844 if (!couponProvider.sendSMS) {
  845 + String dateSoltStr = '';
  846 + if (widget.dateSolt == '1') {
  847 + dateSoltStr = '早餐';
  848 + } else if (widget.dateSolt == '2') {
  849 + dateSoltStr = '午餐';
  850 + } else if (widget.dateSolt == '3') {
  851 + dateSoltStr = '晚餐';
  852 + }
  853 + DateTime dateTimeTemp =
  854 + DateTime.fromMillisecondsSinceEpoch(
  855 + int.parse(widget.ddate) * 1000);
  856 + String dateTimeStrTemp =
  857 + "${Utils.addZeroNumber(dateTimeTemp.month)}月${Utils.addZeroNumber(dateTimeTemp.day)}日";
817 Map<String, String> params = { 858 Map<String, String> params = {
818 "id": widget.rid, 859 "id": widget.rid,
819 "uid": Provider.of<UserModel>(context, 860 "uid": Provider.of<UserModel>(context,
@@ -821,9 +862,25 @@ class InvicationPageState extends State<InvicationPage> { @@ -821,9 +862,25 @@ class InvicationPageState extends State<InvicationPage> {
821 .user 862 .user
822 .openid, 863 .openid,
823 "phone": widget.phone, 864 "phone": widget.phone,
824 - "Strtext": user.sellername +  
825 - _baseIndoProvider.baseInfoSunModel.name 865 +
  866 + // "Strtext": user.sellername +
  867 + // dateTimeStrTemp +
  868 + // dateSoltStr +
  869 + // '，' +
  870 + // '餐厅经理' +
  871 + // _baseIndoProvider.baseInfoSunModel.name +
  872 + // '已为您安排在' +
  873 + // widget.tableInfo.replaceAll("\n", "")
826 }; 874 };
  875 + if (ObjectUtil.isNotEmpty(
  876 + _baseIndoProvider.baseInfoSunModel) &&
  877 + ObjectUtil.isNotEmpty(_baseIndoProvider
  878 + .baseInfoSunModel.name)) {
  879 + params['Strtext'] = user.sellername +
  880 + _baseIndoProvider.baseInfoSunModel.name;
  881 + } else {
  882 + params['Strtext'] = user.sellername;
  883 + }
827 bool success = await couponProvider 884 bool success = await couponProvider
828 .sendSMSWxSendSms(context, params); 885 .sendSMSWxSendSms(context, params);
829 print(success); 886 print(success);
@@ -4,6 +4,7 @@ import 'package:cached_network_image/cached_network_image.dart'; @@ -4,6 +4,7 @@ import 'package:cached_network_image/cached_network_image.dart';
4 import 'package:flutter/material.dart'; 4 import 'package:flutter/material.dart';
5 import 'package:flutter_screenutil/screenutil.dart'; 5 import 'package:flutter_screenutil/screenutil.dart';
6 import 'package:one_key/models/upload_img_model.dart'; 6 import 'package:one_key/models/upload_img_model.dart';
  7 +import 'package:one_key/models/user.dart';
7 import 'package:one_key/pages/online_check/photo_view_wiget.dart'; 8 import 'package:one_key/pages/online_check/photo_view_wiget.dart';
8 import 'package:one_key/pages/online_check/progress.dart'; 9 import 'package:one_key/pages/online_check/progress.dart';
9 import 'package:one_key/provider/base_info_provider.dart'; 10 import 'package:one_key/provider/base_info_provider.dart';
@@ -89,15 +90,32 @@ class _BaseInfoPageState extends State<BaseInfoPage> { @@ -89,15 +90,32 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
89 //客户经理添加/修改基本信息 90 //客户经理添加/修改基本信息
90 _setCustomerActivityBaseinfo() async { 91 _setCustomerActivityBaseinfo() async {
91 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 92 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
  93 +
  94 + User user = Provider.of<UserModel>(context, listen: false).user;
92 Map<String, String> params = { 95 Map<String, String> params = {
93 - 'sellerid': Provider.of<UserModel>(context, listen: false).user.sellerid,  
94 - "uid": Provider.of<UserModel>(context, listen: false).user.openid,  
95 - "name": _nameController.text.trim(),  
96 - "photo": _uploadImageProvider.touxiang.qiniuUrl,  
97 - "phone": _phoneController.text.trim(),  
98 - "position": _positionController.text,  
99 - "qrcode": _uploadImageProvider.erweima.qiniuUrl, 96 + 'sellerid': user.sellerid,
  97 + "uid": user.openid,
  98 + "name": _nameController.text.trim().length == 0
  99 + ? user.sellername
  100 + : _nameController.text.trim(),
  101 + "photo": _uploadImageProvider.touxiang.qiniuUrl.trim().length == 0
  102 + ? 'http://nosqn.colorcun.com/yd_person.png'
  103 + : _uploadImageProvider.touxiang.qiniuUrl,
  104 + "position": _positionController.text.trim().length == 0
  105 + ? '经理'
  106 + : _positionController.text,
100 }; 107 };
  108 + if (_phoneController.text.trim().length == 0) {
  109 + if (user.userphone != null) {
  110 + params['phone'] = user.userphone;
  111 + }
  112 + } else {
  113 + params['phone'] = _phoneController.text.trim();
  114 + }
  115 + if (_uploadImageProvider.erweima.qiniuUrl != null &&
  116 + _uploadImageProvider.erweima.qiniuUrl != '') {
  117 + params['qrcode'] = _uploadImageProvider.erweima.qiniuUrl;
  118 + }
101 if (_baseIndoProvider.baseInfoSunModel != null) { 119 if (_baseIndoProvider.baseInfoSunModel != null) {
102 params['id'] = _baseIndoProvider.baseInfoSunModel.id; 120 params['id'] = _baseIndoProvider.baseInfoSunModel.id;
103 } 121 }
@@ -414,31 +432,6 @@ class _BaseInfoPageState extends State<BaseInfoPage> { @@ -414,31 +432,6 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
414 ScreenUtil().setWidth(40), ScreenUtil().setWidth(40)), 432 ScreenUtil().setWidth(40), ScreenUtil().setWidth(40)),
415 child: RoundButton( 433 child: RoundButton(
416 onPressed: () { 434 onPressed: () {
417 - if (_uploadImageProvider.touxiang.qiniuUrl  
418 - .trim()  
419 - .length ==  
420 - 0) {  
421 - Utils.showToast('请上传头像');  
422 - return;  
423 - }  
424 - if (_nameController.text.trim().length == 0) {  
425 - Utils.showToast('请填写您的姓名');  
426 - return;  
427 - }  
428 - if (_phoneController.text.trim().length == 0) {  
429 - Utils.showToast('请填写您的联系电话');  
430 - return;  
431 - }  
432 - if (_positionController.text.trim().length == 0) {  
433 - Utils.showToast('请填写您在餐厅中担任的职位');  
434 - return;  
435 - }  
436 - if (_uploadImageProvider.erweima.qiniuUrl.trim().length ==  
437 - 0) {  
438 - Utils.showToast('请上传二维码');  
439 - return;  
440 - }  
441 -  
442 //接口 435 //接口
443 _setCustomerActivityBaseinfo(); 436 _setCustomerActivityBaseinfo();
444 }, 437 },
@@ -269,6 +269,19 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -269,6 +269,19 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
269 // ), 269 // ),
270 VEmptyView(40), 270 VEmptyView(40),
271 271
  272 + // MyItem(
  273 + // title: "我的员工",
  274 + // content: "",
  275 + // callback: () {
  276 + // Utils.goMiniProgramZm(context, "roomtype/roomtype");
  277 + // },
  278 + // ),
  279 + // MyDivider(
  280 + // double.infinity,
  281 + // ScreenUtil().setHeight(1),
  282 + // color: MyColours.color_f3f3f3,
  283 + // ),
  284 +
272 MyItem( 285 MyItem(
273 title: "线上券创建", 286 title: "线上券创建",
274 content: '', 287 content: '',
@@ -28,7 +28,8 @@ class NotebookItemState extends State<NoteBookItem> { @@ -28,7 +28,8 @@ class NotebookItemState extends State<NoteBookItem> {
28 widget.notebook.tableinfoStr, 28 widget.notebook.tableinfoStr,
29 widget.notebook.ddate, 29 widget.notebook.ddate,
30 widget.notebook.ddateStr, 30 widget.notebook.ddateStr,
31 - widget.notebook.phone); 31 + widget.notebook.phone,
  32 + widget.notebook.ddate_solt);
32 } 33 }
33 } 34 }
34 35
@@ -70,6 +70,7 @@ class UserModel with ChangeNotifier { @@ -70,6 +70,7 @@ class UserModel with ChangeNotifier {
70 "morning": "", 70 "morning": "",
71 "noon": "", 71 "noon": "",
72 "night": "", 72 "night": "",
  73 + 'userphone':user['phone']
73 }; 74 };
74 await saveUserInfo(User.fromJson(userMap)); 75 await saveUserInfo(User.fromJson(userMap));
75 return getSellerInfo( 76 return getSellerInfo(
@@ -101,6 +102,7 @@ class UserModel with ChangeNotifier { @@ -101,6 +102,7 @@ class UserModel with ChangeNotifier {
101 user['morning'] = daily['morning']; 102 user['morning'] = daily['morning'];
102 user['noon'] = daily['noon']; 103 user['noon'] = daily['noon'];
103 user['night'] = daily['night']; 104 user['night'] = daily['night'];
  105 +
104 await saveUserInfo(User.fromJson(user)); 106 await saveUserInfo(User.fromJson(user));
105 App.sp.setBool("isLogin", true); 107 App.sp.setBool("isLogin", true);
106 App.sp.setString("is_call_tel", seller['is_call_tel'].toString()); 108 App.sp.setString("is_call_tel", seller['is_call_tel'].toString());
@@ -70,11 +70,17 @@ class NavigatorUtil { @@ -70,11 +70,17 @@ class NavigatorUtil {
70 } 70 }
71 71
72 /// 邀请函 72 /// 邀请函
73 - static void goInvicationPage(BuildContext context, String rid,  
74 - String tableInfo, String ddate, String ddateStr, String phone, 73 + static void goInvicationPage(
  74 + BuildContext context,
  75 + String rid,
  76 + String tableInfo,
  77 + String ddate,
  78 + String ddateStr,
  79 + String phone,
  80 + String ddate_solt,
75 {bool replace = false}) { 81 {bool replace = false}) {
76 _navigateTo(context, 82 _navigateTo(context,
77 - "${Routes.invication}?rid=$rid&tableInfo=${FluroConvertUtils.fluroCnParamsEncode(tableInfo)}&ddate=$ddate&ddateStr=${FluroConvertUtils.fluroCnParamsEncode(ddateStr)}&phone=$phone", 83 + "${Routes.invication}?rid=$rid&tableInfo=${FluroConvertUtils.fluroCnParamsEncode(tableInfo)}&ddate=$ddate&ddateStr=${FluroConvertUtils.fluroCnParamsEncode(ddateStr)}&phone=$phone&ddate_solt=$ddate_solt",
78 replace: replace); 84 replace: replace);
79 } 85 }
80 86
@@ -135,9 +135,11 @@ var handleInvicationHandler = new Handler( @@ -135,9 +135,11 @@ var handleInvicationHandler = new Handler(
135 String ddateStr = 135 String ddateStr =
136 FluroConvertUtils.fluroCnParamsDecode(params["ddateStr"].first); 136 FluroConvertUtils.fluroCnParamsDecode(params["ddateStr"].first);
137 String phone = params["phone"].first; 137 String phone = params["phone"].first;
  138 + String ddate_solt = params["ddate_solt"].first;
138 return ChangeNotifierProvider<BaseIndoProvider>( 139 return ChangeNotifierProvider<BaseIndoProvider>(
139 create: (_) => BaseIndoProvider(), 140 create: (_) => BaseIndoProvider(),
140 - child: InvicationPage(rid, tableInfo, ddate, ddateStr, phone)); 141 + child:
  142 + InvicationPage(rid, tableInfo, ddate, ddateStr, phone, ddate_solt));
141 }); 143 });
142 144
143 // 发短信 145 // 发短信
@@ -49,7 +49,7 @@ packages: @@ -49,7 +49,7 @@ packages:
49 name: args 49 name: args
50 url: "https://pub.flutter-io.cn" 50 url: "https://pub.flutter-io.cn"
51 source: hosted 51 source: hosted
52 - version: "1.6.0" 52 + version: "2.1.1"
53 async: 53 async:
54 dependency: transitive 54 dependency: transitive
55 description: 55 description:
@@ -91,7 +91,7 @@ packages: @@ -91,7 +91,7 @@ packages:
91 name: build_daemon 91 name: build_daemon
92 url: "https://pub.flutter-io.cn" 92 url: "https://pub.flutter-io.cn"
93 source: hosted 93 source: hosted
94 - version: "2.1.4" 94 + version: "2.1.10"
95 build_resolvers: 95 build_resolvers:
96 dependency: transitive 96 dependency: transitive
97 description: 97 description:
@@ -119,21 +119,21 @@ packages: @@ -119,21 +119,21 @@ packages:
119 name: built_collection 119 name: built_collection
120 url: "https://pub.flutter-io.cn" 120 url: "https://pub.flutter-io.cn"
121 source: hosted 121 source: hosted
122 - version: "4.3.2" 122 + version: "5.1.0"
123 built_value: 123 built_value:
124 dependency: transitive 124 dependency: transitive
125 description: 125 description:
126 name: built_value 126 name: built_value
127 url: "https://pub.flutter-io.cn" 127 url: "https://pub.flutter-io.cn"
128 source: hosted 128 source: hosted
129 - version: "7.1.0" 129 + version: "8.0.6"
130 cached_network_image: 130 cached_network_image:
131 dependency: "direct main" 131 dependency: "direct main"
132 description: 132 description:
133 name: cached_network_image 133 name: cached_network_image
134 url: "https://pub.flutter-io.cn" 134 url: "https://pub.flutter-io.cn"
135 source: hosted 135 source: hosted
136 - version: "2.3.3" 136 + version: "2.4.1"
137 characters: 137 characters:
138 dependency: transitive 138 dependency: transitive
139 description: 139 description:
@@ -154,7 +154,7 @@ packages: @@ -154,7 +154,7 @@ packages:
154 name: checked_yaml 154 name: checked_yaml
155 url: "https://pub.flutter-io.cn" 155 url: "https://pub.flutter-io.cn"
156 source: hosted 156 source: hosted
157 - version: "1.0.2" 157 + version: "1.0.4"
158 chewie: 158 chewie:
159 dependency: "direct main" 159 dependency: "direct main"
160 description: 160 description:
@@ -168,7 +168,7 @@ packages: @@ -168,7 +168,7 @@ packages:
168 name: cli_util 168 name: cli_util
169 url: "https://pub.flutter-io.cn" 169 url: "https://pub.flutter-io.cn"
170 source: hosted 170 source: hosted
171 - version: "0.2.0" 171 + version: "0.3.0"
172 clock: 172 clock:
173 dependency: transitive 173 dependency: transitive
174 description: 174 description:
@@ -182,7 +182,7 @@ packages: @@ -182,7 +182,7 @@ packages:
182 name: code_builder 182 name: code_builder
183 url: "https://pub.flutter-io.cn" 183 url: "https://pub.flutter-io.cn"
184 source: hosted 184 source: hosted
185 - version: "3.5.0" 185 + version: "3.7.0"
186 collection: 186 collection:
187 dependency: transitive 187 dependency: transitive
188 description: 188 description:
@@ -196,7 +196,7 @@ packages: @@ -196,7 +196,7 @@ packages:
196 name: common_utils 196 name: common_utils
197 url: "https://pub.flutter-io.cn" 197 url: "https://pub.flutter-io.cn"
198 source: hosted 198 source: hosted
199 - version: "1.2.1" 199 + version: "1.2.4"
200 connectivity: 200 connectivity:
201 dependency: "direct main" 201 dependency: "direct main"
202 description: 202 description:
@@ -210,14 +210,14 @@ packages: @@ -210,14 +210,14 @@ packages:
210 name: connectivity_for_web 210 name: connectivity_for_web
211 url: "https://pub.flutter-io.cn" 211 url: "https://pub.flutter-io.cn"
212 source: hosted 212 source: hosted
213 - version: "0.3.1+2" 213 + version: "0.3.1+4"
214 connectivity_macos: 214 connectivity_macos:
215 dependency: transitive 215 dependency: transitive
216 description: 216 description:
217 name: connectivity_macos 217 name: connectivity_macos
218 url: "https://pub.flutter-io.cn" 218 url: "https://pub.flutter-io.cn"
219 source: hosted 219 source: hosted
220 - version: "0.1.0+5" 220 + version: "0.1.0+7"
221 connectivity_platform_interface: 221 connectivity_platform_interface:
222 dependency: transitive 222 dependency: transitive
223 description: 223 description:
@@ -273,14 +273,14 @@ packages: @@ -273,14 +273,14 @@ packages:
273 name: decimal 273 name: decimal
274 url: "https://pub.flutter-io.cn" 274 url: "https://pub.flutter-io.cn"
275 source: hosted 275 source: hosted
276 - version: "0.3.5" 276 + version: "1.2.0"
277 device_info: 277 device_info:
278 dependency: "direct main" 278 dependency: "direct main"
279 description: 279 description:
280 name: device_info 280 name: device_info
281 url: "https://pub.flutter-io.cn" 281 url: "https://pub.flutter-io.cn"
282 source: hosted 282 source: hosted
283 - version: "0.4.2+9" 283 + version: "0.4.2+10"
284 device_info_platform_interface: 284 device_info_platform_interface:
285 dependency: transitive 285 dependency: transitive
286 description: 286 description:
@@ -322,21 +322,21 @@ packages: @@ -322,21 +322,21 @@ packages:
322 name: ffi 322 name: ffi
323 url: "https://pub.flutter-io.cn" 323 url: "https://pub.flutter-io.cn"
324 source: hosted 324 source: hosted
325 - version: "0.1.3" 325 + version: "1.1.2"
326 file: 326 file:
327 dependency: transitive 327 dependency: transitive
328 description: 328 description:
329 name: file 329 name: file
330 url: "https://pub.flutter-io.cn" 330 url: "https://pub.flutter-io.cn"
331 source: hosted 331 source: hosted
332 - version: "6.1.0" 332 + version: "6.1.1"
333 fixnum: 333 fixnum:
334 dependency: transitive 334 dependency: transitive
335 description: 335 description:
336 name: fixnum 336 name: fixnum
337 url: "https://pub.flutter-io.cn" 337 url: "https://pub.flutter-io.cn"
338 source: hosted 338 source: hosted
339 - version: "0.10.11" 339 + version: "1.0.0"
340 fluro: 340 fluro:
341 dependency: "direct main" 341 dependency: "direct main"
342 description: 342 description:
@@ -355,7 +355,7 @@ packages: @@ -355,7 +355,7 @@ packages:
355 name: flutter_app_badger 355 name: flutter_app_badger
356 url: "https://pub.flutter-io.cn" 356 url: "https://pub.flutter-io.cn"
357 source: hosted 357 source: hosted
358 - version: "1.1.2" 358 + version: "1.2.0"
359 flutter_blurhash: 359 flutter_blurhash:
360 dependency: transitive 360 dependency: transitive
361 description: 361 description:
@@ -512,14 +512,14 @@ packages: @@ -512,14 +512,14 @@ packages:
512 name: intl 512 name: intl
513 url: "https://pub.flutter-io.cn" 513 url: "https://pub.flutter-io.cn"
514 source: hosted 514 source: hosted
515 - version: "0.16.1" 515 + version: "0.17.0"
516 io: 516 io:
517 dependency: transitive 517 dependency: transitive
518 description: 518 description:
519 name: io 519 name: io
520 url: "https://pub.flutter-io.cn" 520 url: "https://pub.flutter-io.cn"
521 source: hosted 521 source: hosted
522 - version: "0.3.4" 522 + version: "0.3.5"
523 js: 523 js:
524 dependency: transitive 524 dependency: transitive
525 description: 525 description:
@@ -554,7 +554,7 @@ packages: @@ -554,7 +554,7 @@ packages:
554 name: logging 554 name: logging
555 url: "https://pub.flutter-io.cn" 555 url: "https://pub.flutter-io.cn"
556 source: hosted 556 source: hosted
557 - version: "0.11.4" 557 + version: "1.0.1"
558 matcher: 558 matcher:
559 dependency: transitive 559 dependency: transitive
560 description: 560 description:
@@ -575,14 +575,14 @@ packages: @@ -575,14 +575,14 @@ packages:
575 name: mime 575 name: mime
576 url: "https://pub.flutter-io.cn" 576 url: "https://pub.flutter-io.cn"
577 source: hosted 577 source: hosted
578 - version: "0.9.7" 578 + version: "1.0.0"
579 nested: 579 nested:
580 dependency: transitive 580 dependency: transitive
581 description: 581 description:
582 name: nested 582 name: nested
583 url: "https://pub.flutter-io.cn" 583 url: "https://pub.flutter-io.cn"
584 source: hosted 584 source: hosted
585 - version: "0.0.4" 585 + version: "1.0.0"
586 octo_image: 586 octo_image:
587 dependency: transitive 587 dependency: transitive
588 description: 588 description:
@@ -610,7 +610,7 @@ packages: @@ -610,7 +610,7 @@ packages:
610 name: package_info 610 name: package_info
611 url: "https://pub.flutter-io.cn" 611 url: "https://pub.flutter-io.cn"
612 source: hosted 612 source: hosted
613 - version: "0.4.3" 613 + version: "0.4.3+4"
614 path: 614 path:
615 dependency: transitive 615 dependency: transitive
616 description: 616 description:
@@ -638,7 +638,7 @@ packages: @@ -638,7 +638,7 @@ packages:
638 name: path_provider 638 name: path_provider
639 url: "https://pub.flutter-io.cn" 639 url: "https://pub.flutter-io.cn"
640 source: hosted 640 source: hosted
641 - version: "1.6.22" 641 + version: "1.6.28"
642 path_provider_linux: 642 path_provider_linux:
643 dependency: transitive 643 dependency: transitive
644 description: 644 description:
@@ -652,21 +652,21 @@ packages: @@ -652,21 +652,21 @@ packages:
652 name: path_provider_macos 652 name: path_provider_macos
653 url: "https://pub.flutter-io.cn" 653 url: "https://pub.flutter-io.cn"
654 source: hosted 654 source: hosted
655 - version: "0.0.4+4" 655 + version: "0.0.4+8"
656 path_provider_platform_interface: 656 path_provider_platform_interface:
657 dependency: transitive 657 dependency: transitive
658 description: 658 description:
659 name: path_provider_platform_interface 659 name: path_provider_platform_interface
660 url: "https://pub.flutter-io.cn" 660 url: "https://pub.flutter-io.cn"
661 source: hosted 661 source: hosted
662 - version: "1.0.3" 662 + version: "1.0.4"
663 path_provider_windows: 663 path_provider_windows:
664 dependency: transitive 664 dependency: transitive
665 description: 665 description:
666 name: path_provider_windows 666 name: path_provider_windows
667 url: "https://pub.flutter-io.cn" 667 url: "https://pub.flutter-io.cn"
668 source: hosted 668 source: hosted
669 - version: "0.0.4+1" 669 + version: "0.0.5"
670 pedantic: 670 pedantic:
671 dependency: transitive 671 dependency: transitive
672 description: 672 description:
@@ -729,7 +729,7 @@ packages: @@ -729,7 +729,7 @@ packages:
729 name: pool 729 name: pool
730 url: "https://pub.flutter-io.cn" 730 url: "https://pub.flutter-io.cn"
731 source: hosted 731 source: hosted
732 - version: "1.4.0" 732 + version: "1.5.0"
733 process: 733 process:
734 dependency: transitive 734 dependency: transitive
735 description: 735 description:
@@ -743,21 +743,21 @@ packages: @@ -743,21 +743,21 @@ packages:
743 name: provider 743 name: provider
744 url: "https://pub.flutter-io.cn" 744 url: "https://pub.flutter-io.cn"
745 source: hosted 745 source: hosted
746 - version: "4.3.2+2" 746 + version: "4.3.3"
747 pub_semver: 747 pub_semver:
748 dependency: transitive 748 dependency: transitive
749 description: 749 description:
750 name: pub_semver 750 name: pub_semver
751 url: "https://pub.flutter-io.cn" 751 url: "https://pub.flutter-io.cn"
752 source: hosted 752 source: hosted
753 - version: "1.4.4" 753 + version: "2.0.0"
754 pubspec_parse: 754 pubspec_parse:
755 dependency: transitive 755 dependency: transitive
756 description: 756 description:
757 name: pubspec_parse 757 name: pubspec_parse
758 url: "https://pub.flutter-io.cn" 758 url: "https://pub.flutter-io.cn"
759 source: hosted 759 source: hosted
760 - version: "0.1.5" 760 + version: "0.1.8"
761 qiniu_flutter_sdk: 761 qiniu_flutter_sdk:
762 dependency: "direct main" 762 dependency: "direct main"
763 description: 763 description:
@@ -778,14 +778,14 @@ packages: @@ -778,14 +778,14 @@ packages:
778 name: quiver 778 name: quiver
779 url: "https://pub.flutter-io.cn" 779 url: "https://pub.flutter-io.cn"
780 source: hosted 780 source: hosted
781 - version: "2.1.4+1" 781 + version: "2.1.5"
782 rational: 782 rational:
783 dependency: transitive 783 dependency: transitive
784 description: 784 description:
785 name: rational 785 name: rational
786 url: "https://pub.flutter-io.cn" 786 url: "https://pub.flutter-io.cn"
787 source: hosted 787 source: hosted
788 - version: "0.3.8" 788 + version: "1.2.1"
789 rxdart: 789 rxdart:
790 dependency: transitive 790 dependency: transitive
791 description: 791 description:
@@ -813,21 +813,21 @@ packages: @@ -813,21 +813,21 @@ packages:
813 name: shared_preferences 813 name: shared_preferences
814 url: "https://pub.flutter-io.cn" 814 url: "https://pub.flutter-io.cn"
815 source: hosted 815 source: hosted
816 - version: "0.5.12+2" 816 + version: "0.5.12+4"
817 shared_preferences_linux: 817 shared_preferences_linux:
818 dependency: transitive 818 dependency: transitive
819 description: 819 description:
820 name: shared_preferences_linux 820 name: shared_preferences_linux
821 url: "https://pub.flutter-io.cn" 821 url: "https://pub.flutter-io.cn"
822 source: hosted 822 source: hosted
823 - version: "0.0.2+2" 823 + version: "0.0.2+4"
824 shared_preferences_macos: 824 shared_preferences_macos:
825 dependency: transitive 825 dependency: transitive
826 description: 826 description:
827 name: shared_preferences_macos 827 name: shared_preferences_macos
828 url: "https://pub.flutter-io.cn" 828 url: "https://pub.flutter-io.cn"
829 source: hosted 829 source: hosted
830 - version: "0.0.1+10" 830 + version: "0.0.1+11"
831 shared_preferences_platform_interface: 831 shared_preferences_platform_interface:
832 dependency: transitive 832 dependency: transitive
833 description: 833 description:
@@ -848,7 +848,7 @@ packages: @@ -848,7 +848,7 @@ packages:
848 name: shared_preferences_windows 848 name: shared_preferences_windows
849 url: "https://pub.flutter-io.cn" 849 url: "https://pub.flutter-io.cn"
850 source: hosted 850 source: hosted
851 - version: "0.0.1+1" 851 + version: "0.0.2+3"
852 shelf: 852 shelf:
853 dependency: transitive 853 dependency: transitive
854 description: 854 description:
@@ -862,7 +862,7 @@ packages: @@ -862,7 +862,7 @@ packages:
862 name: shelf_web_socket 862 name: shelf_web_socket
863 url: "https://pub.flutter-io.cn" 863 url: "https://pub.flutter-io.cn"
864 source: hosted 864 source: hosted
865 - version: "0.2.3" 865 + version: "0.2.4+1"
866 sign_in_with_apple: 866 sign_in_with_apple:
867 dependency: "direct main" 867 dependency: "direct main"
868 description: 868 description:
@@ -876,7 +876,7 @@ packages: @@ -876,7 +876,7 @@ packages:
876 name: simple_gesture_detector 876 name: simple_gesture_detector
877 url: "https://pub.flutter-io.cn" 877 url: "https://pub.flutter-io.cn"
878 source: hosted 878 source: hosted
879 - version: "0.1.4" 879 + version: "0.1.6"
880 sky_engine: 880 sky_engine:
881 dependency: transitive 881 dependency: transitive
882 description: flutter 882 description: flutter
@@ -902,14 +902,14 @@ packages: @@ -902,14 +902,14 @@ packages:
902 name: sqflite 902 name: sqflite
903 url: "https://pub.flutter-io.cn" 903 url: "https://pub.flutter-io.cn"
904 source: hosted 904 source: hosted
905 - version: "1.3.1+2" 905 + version: "1.3.2+4"
906 sqflite_common: 906 sqflite_common:
907 dependency: transitive 907 dependency: transitive
908 description: 908 description:
909 name: sqflite_common 909 name: sqflite_common
910 url: "https://pub.flutter-io.cn" 910 url: "https://pub.flutter-io.cn"
911 source: hosted 911 source: hosted
912 - version: "1.0.2+1" 912 + version: "1.0.3+3"
913 stack_trace: 913 stack_trace:
914 dependency: transitive 914 dependency: transitive
915 description: 915 description:
@@ -930,7 +930,7 @@ packages: @@ -930,7 +930,7 @@ packages:
930 name: stream_transform 930 name: stream_transform
931 url: "https://pub.flutter-io.cn" 931 url: "https://pub.flutter-io.cn"
932 source: hosted 932 source: hosted
933 - version: "0.0.20" 933 + version: "2.0.0"
934 string_scanner: 934 string_scanner:
935 dependency: transitive 935 dependency: transitive
936 description: 936 description:
@@ -951,7 +951,7 @@ packages: @@ -951,7 +951,7 @@ packages:
951 name: table_calendar 951 name: table_calendar
952 url: "https://pub.flutter-io.cn" 952 url: "https://pub.flutter-io.cn"
953 source: hosted 953 source: hosted
954 - version: "2.3.0" 954 + version: "2.3.3"
955 term_glyph: 955 term_glyph:
956 dependency: transitive 956 dependency: transitive
957 description: 957 description:
@@ -972,7 +972,7 @@ packages: @@ -972,7 +972,7 @@ packages:
972 name: timing 972 name: timing
973 url: "https://pub.flutter-io.cn" 973 url: "https://pub.flutter-io.cn"
974 source: hosted 974 source: hosted
975 - version: "0.1.1+2" 975 + version: "0.1.1+3"
976 tpns_flutter_plugin: 976 tpns_flutter_plugin:
977 dependency: "direct main" 977 dependency: "direct main"
978 description: 978 description:
@@ -995,42 +995,42 @@ packages: @@ -995,42 +995,42 @@ packages:
995 name: url_launcher 995 name: url_launcher
996 url: "https://pub.flutter-io.cn" 996 url: "https://pub.flutter-io.cn"
997 source: hosted 997 source: hosted
998 - version: "5.7.6" 998 + version: "5.7.10"
999 url_launcher_linux: 999 url_launcher_linux:
1000 dependency: transitive 1000 dependency: transitive
1001 description: 1001 description:
1002 name: url_launcher_linux 1002 name: url_launcher_linux
1003 url: "https://pub.flutter-io.cn" 1003 url: "https://pub.flutter-io.cn"
1004 source: hosted 1004 source: hosted
1005 - version: "0.0.1+3" 1005 + version: "0.0.1+4"
1006 url_launcher_macos: 1006 url_launcher_macos:
1007 dependency: transitive 1007 dependency: transitive
1008 description: 1008 description:
1009 name: url_launcher_macos 1009 name: url_launcher_macos
1010 url: "https://pub.flutter-io.cn" 1010 url: "https://pub.flutter-io.cn"
1011 source: hosted 1011 source: hosted
1012 - version: "0.0.1+8" 1012 + version: "0.0.1+9"
1013 url_launcher_platform_interface: 1013 url_launcher_platform_interface:
1014 dependency: transitive 1014 dependency: transitive
1015 description: 1015 description:
1016 name: url_launcher_platform_interface 1016 name: url_launcher_platform_interface
1017 url: "https://pub.flutter-io.cn" 1017 url: "https://pub.flutter-io.cn"
1018 source: hosted 1018 source: hosted
1019 - version: "1.0.8" 1019 + version: "1.0.9"
1020 url_launcher_web: 1020 url_launcher_web:
1021 dependency: transitive 1021 dependency: transitive
1022 description: 1022 description:
1023 name: url_launcher_web 1023 name: url_launcher_web
1024 url: "https://pub.flutter-io.cn" 1024 url: "https://pub.flutter-io.cn"
1025 source: hosted 1025 source: hosted
1026 - version: "0.1.4+1" 1026 + version: "0.1.5+3"
1027 url_launcher_windows: 1027 url_launcher_windows:
1028 dependency: transitive 1028 dependency: transitive
1029 description: 1029 description:
1030 name: url_launcher_windows 1030 name: url_launcher_windows
1031 url: "https://pub.flutter-io.cn" 1031 url: "https://pub.flutter-io.cn"
1032 source: hosted 1032 source: hosted
1033 - version: "0.0.1+1" 1033 + version: "0.0.1+3"
1034 uuid: 1034 uuid:
1035 dependency: transitive 1035 dependency: transitive
1036 description: 1036 description:
@@ -1086,14 +1086,14 @@ packages: @@ -1086,14 +1086,14 @@ packages:
1086 name: watcher 1086 name: watcher
1087 url: "https://pub.flutter-io.cn" 1087 url: "https://pub.flutter-io.cn"
1088 source: hosted 1088 source: hosted
1089 - version: "0.9.7+15" 1089 + version: "1.0.0"
1090 web_socket_channel: 1090 web_socket_channel:
1091 dependency: "direct main" 1091 dependency: "direct main"
1092 description: 1092 description:
1093 name: web_socket_channel 1093 name: web_socket_channel
1094 url: "https://pub.flutter-io.cn" 1094 url: "https://pub.flutter-io.cn"
1095 source: hosted 1095 source: hosted
1096 - version: "1.1.0" 1096 + version: "1.2.0"
1097 webview_flutter: 1097 webview_flutter:
1098 dependency: "direct main" 1098 dependency: "direct main"
1099 description: 1099 description:
@@ -1107,7 +1107,7 @@ packages: @@ -1107,7 +1107,7 @@ packages:
1107 name: win32 1107 name: win32
1108 url: "https://pub.flutter-io.cn" 1108 url: "https://pub.flutter-io.cn"
1109 source: hosted 1109 source: hosted
1110 - version: "1.7.3" 1110 + version: "2.0.5"
1111 xdg_directories: 1111 xdg_directories:
1112 dependency: transitive 1112 dependency: transitive
1113 description: 1113 description:
@@ -1121,7 +1121,7 @@ packages: @@ -1121,7 +1121,7 @@ packages:
1121 name: yaml 1121 name: yaml
1122 url: "https://pub.flutter-io.cn" 1122 url: "https://pub.flutter-io.cn"
1123 source: hosted 1123 source: hosted
1124 - version: "2.2.1" 1124 + version: "3.1.0"
1125 sdks: 1125 sdks:
1126 dart: ">=2.12.0 <3.0.0" 1126 dart: ">=2.12.0 <3.0.0"
1127 flutter: ">=2.0.0" 1127 flutter: ">=2.0.0"