[baozhangchao] il y a 3 ans
Parent
révision
db5bd13aa2

lib/pages/home/index.dart → lib/pages/TabBar/index.dart Voir le fichier

@@ -1,10 +1,11 @@
1 1
 
2
-import 'package:farmer_client/pages/home/widgets/Information/index.dart';
3
-import 'package:farmer_client/pages/home/widgets/order/index.dart';
4 2
 import 'package:flutter/material.dart';
5 3
 import 'package:flutter_screenutil/flutter_screenutil.dart';
6
-import 'package:farmer_client/pages/home/widgets/main/index.dart';
7
-// import 'package:farmer_client/pages/home/widgets/orderInfo/index.dart';
4
+
5
+import '../TabBar/widgets/Information/index.dart';
6
+import '../TabBar/widgets/main/index.dart';
7
+import '../TabBar/widgets/order/index.dart';
8
+// import 'package:farmer_client/pages/TabBar/widgets/orderInfo/index.dart';
8 9
 class Home extends StatefulWidget {
9 10
   const Home({Key? key}) : super(key: key);
10 11
 

lib/pages/home/widgets/Information/index.dart → lib/pages/TabBar/widgets/Information/index.dart Voir le fichier


lib/pages/home/widgets/main/index.dart → lib/pages/TabBar/widgets/main/index.dart Voir le fichier


lib/pages/home/widgets/main/widgets/OtherColumn.dart → lib/pages/TabBar/widgets/main/widgets/OtherColumn.dart Voir le fichier


lib/pages/home/widgets/main/widgets/UserAddress.dart → lib/pages/TabBar/widgets/main/widgets/UserAddress.dart Voir le fichier


lib/pages/home/widgets/main/widgets/UserInfo.dart → lib/pages/TabBar/widgets/main/widgets/UserInfo.dart Voir le fichier


lib/pages/home/widgets/order/index.dart → lib/pages/TabBar/widgets/order/index.dart Voir le fichier


+ 1
- 1
lib/pages/index.dart Voir le fichier

@@ -1,4 +1,4 @@
1 1
 
2
-export 'home/index.dart';
2
+export 'TabBar/index.dart';
3 3
 export 'splash/splash.dart';
4 4
 export 'login/login.dart';

+ 1
- 2
lib/pages/login/login.dart Voir le fichier

@@ -10,11 +10,10 @@ import 'package:get/get.dart';
10 10
 import '../../models/entities/person.dart';
11 11
 import '../../services/user.dart';
12 12
 import '../../widgets/Cell.dart';
13
-import '../home/index.dart';
13
+import '../TabBar/index.dart';
14 14
 
15 15
 
16 16
 class MyRouteLogin extends StatefulWidget {
17
-
18 17
   @override
19 18
   State<MyRouteLogin> createState() => _RouteLogin();
20 19
 }

+ 2
- 1
lib/pages/splash/splash.dart Voir le fichier

@@ -3,7 +3,8 @@ import 'package:farmer_client/pages/splash/widgets/countdown.dart';
3 3
 import 'package:get/get.dart';
4 4
 import 'package:flutter_screenutil/flutter_screenutil.dart';
5 5
 import 'package:flutter/material.dart';
6
-import '../home/index.dart';
6
+
7
+import '../TabBar/index.dart';
7 8
 
8 9
 class SplashScreen extends StatefulWidget {
9 10
   const SplashScreen({Key? key}) : super(key: key);

+ 67
- 67
pubspec.lock Voir le fichier

@@ -5,140 +5,140 @@ packages:
5 5
     dependency: transitive
6 6
     description:
7 7
       name: _fe_analyzer_shared
8
-      url: "https://pub.flutter-io.cn"
8
+      url: "https://pub.dartlang.org"
9 9
     source: hosted
10 10
     version: "39.0.0"
11 11
   analyzer:
12 12
     dependency: transitive
13 13
     description:
14 14
       name: analyzer
15
-      url: "https://pub.flutter-io.cn"
15
+      url: "https://pub.dartlang.org"
16 16
     source: hosted
17 17
     version: "4.0.0"
18 18
   args:
19 19
     dependency: transitive
20 20
     description:
21 21
       name: args
22
-      url: "https://pub.flutter-io.cn"
22
+      url: "https://pub.dartlang.org"
23 23
     source: hosted
24 24
     version: "2.3.0"
25 25
   async:
26 26
     dependency: transitive
27 27
     description:
28 28
       name: async
29
-      url: "https://pub.flutter-io.cn"
29
+      url: "https://pub.dartlang.org"
30 30
     source: hosted
31 31
     version: "2.8.2"
32 32
   boolean_selector:
33 33
     dependency: transitive
34 34
     description:
35 35
       name: boolean_selector
36
-      url: "https://pub.flutter-io.cn"
36
+      url: "https://pub.dartlang.org"
37 37
     source: hosted
38 38
     version: "2.1.0"
39 39
   build:
40 40
     dependency: transitive
41 41
     description:
42 42
       name: build
43
-      url: "https://pub.flutter-io.cn"
43
+      url: "https://pub.dartlang.org"
44 44
     source: hosted
45 45
     version: "2.3.0"
46 46
   build_config:
47 47
     dependency: transitive
48 48
     description:
49 49
       name: build_config
50
-      url: "https://pub.flutter-io.cn"
50
+      url: "https://pub.dartlang.org"
51 51
     source: hosted
52 52
     version: "1.0.0"
53 53
   characters:
54 54
     dependency: transitive
55 55
     description:
56 56
       name: characters
57
-      url: "https://pub.flutter-io.cn"
57
+      url: "https://pub.dartlang.org"
58 58
     source: hosted
59 59
     version: "1.2.0"
60 60
   charcode:
61 61
     dependency: transitive
62 62
     description:
63 63
       name: charcode
64
-      url: "https://pub.flutter-io.cn"
64
+      url: "https://pub.dartlang.org"
65 65
     source: hosted
66 66
     version: "1.3.1"
67 67
   checked_yaml:
68 68
     dependency: transitive
69 69
     description:
70 70
       name: checked_yaml
71
-      url: "https://pub.flutter-io.cn"
71
+      url: "https://pub.dartlang.org"
72 72
     source: hosted
73 73
     version: "2.0.1"
74 74
   clock:
75 75
     dependency: transitive
76 76
     description:
77 77
       name: clock
78
-      url: "https://pub.flutter-io.cn"
78
+      url: "https://pub.dartlang.org"
79 79
     source: hosted
80 80
     version: "1.1.0"
81 81
   collection:
82 82
     dependency: transitive
83 83
     description:
84 84
       name: collection
85
-      url: "https://pub.flutter-io.cn"
85
+      url: "https://pub.dartlang.org"
86 86
     source: hosted
87 87
     version: "1.15.0"
88 88
   convert:
89 89
     dependency: transitive
90 90
     description:
91 91
       name: convert
92
-      url: "https://pub.flutter-io.cn"
92
+      url: "https://pub.dartlang.org"
93 93
     source: hosted
94 94
     version: "3.0.1"
95 95
   crypto:
96 96
     dependency: transitive
97 97
     description:
98 98
       name: crypto
99
-      url: "https://pub.flutter-io.cn"
99
+      url: "https://pub.dartlang.org"
100 100
     source: hosted
101 101
     version: "3.0.1"
102 102
   cupertino_icons:
103 103
     dependency: "direct main"
104 104
     description:
105 105
       name: cupertino_icons
106
-      url: "https://pub.flutter-io.cn"
106
+      url: "https://pub.dartlang.org"
107 107
     source: hosted
108 108
     version: "1.0.4"
109 109
   dart_style:
110 110
     dependency: transitive
111 111
     description:
112 112
       name: dart_style
113
-      url: "https://pub.flutter-io.cn"
113
+      url: "https://pub.dartlang.org"
114 114
     source: hosted
115 115
     version: "2.2.3"
116 116
   dio:
117 117
     dependency: "direct main"
118 118
     description:
119 119
       name: dio
120
-      url: "https://pub.flutter-io.cn"
120
+      url: "https://pub.dartlang.org"
121 121
     source: hosted
122 122
     version: "4.0.6"
123 123
   fake_async:
124 124
     dependency: transitive
125 125
     description:
126 126
       name: fake_async
127
-      url: "https://pub.flutter-io.cn"
127
+      url: "https://pub.dartlang.org"
128 128
     source: hosted
129 129
     version: "1.2.0"
130 130
   ffi:
131 131
     dependency: transitive
132 132
     description:
133 133
       name: ffi
134
-      url: "https://pub.flutter-io.cn"
134
+      url: "https://pub.dartlang.org"
135 135
     source: hosted
136 136
     version: "1.1.2"
137 137
   file:
138 138
     dependency: transitive
139 139
     description:
140 140
       name: file
141
-      url: "https://pub.flutter-io.cn"
141
+      url: "https://pub.dartlang.org"
142 142
     source: hosted
143 143
     version: "6.1.2"
144 144
   flutter:
@@ -150,7 +150,7 @@ packages:
150 150
     dependency: "direct dev"
151 151
     description:
152 152
       name: flutter_lints
153
-      url: "https://pub.flutter-io.cn"
153
+      url: "https://pub.dartlang.org"
154 154
     source: hosted
155 155
     version: "1.0.4"
156 156
   flutter_localizations:
@@ -162,7 +162,7 @@ packages:
162 162
     dependency: "direct main"
163 163
     description:
164 164
       name: flutter_screenutil
165
-      url: "https://pub.flutter-io.cn"
165
+      url: "https://pub.dartlang.org"
166 166
     source: hosted
167 167
     version: "5.4.0+1"
168 168
   flutter_test:
@@ -179,217 +179,217 @@ packages:
179 179
     dependency: "direct main"
180 180
     description:
181 181
       name: fluttertoast
182
-      url: "https://pub.flutter-io.cn"
182
+      url: "https://pub.dartlang.org"
183 183
     source: hosted
184 184
     version: "8.0.9"
185 185
   get:
186 186
     dependency: "direct main"
187 187
     description:
188 188
       name: get
189
-      url: "https://pub.flutter-io.cn"
189
+      url: "https://pub.dartlang.org"
190 190
     source: hosted
191 191
     version: "4.6.1"
192 192
   get_storage:
193 193
     dependency: "direct main"
194 194
     description:
195 195
       name: get_storage
196
-      url: "https://pub.flutter-io.cn"
196
+      url: "https://pub.dartlang.org"
197 197
     source: hosted
198 198
     version: "2.0.3"
199 199
   glob:
200 200
     dependency: transitive
201 201
     description:
202 202
       name: glob
203
-      url: "https://pub.flutter-io.cn"
203
+      url: "https://pub.dartlang.org"
204 204
     source: hosted
205 205
     version: "2.0.2"
206 206
   http_parser:
207 207
     dependency: transitive
208 208
     description:
209 209
       name: http_parser
210
-      url: "https://pub.flutter-io.cn"
210
+      url: "https://pub.dartlang.org"
211 211
     source: hosted
212 212
     version: "4.0.0"
213 213
   intl:
214 214
     dependency: transitive
215 215
     description:
216 216
       name: intl
217
-      url: "https://pub.flutter-io.cn"
217
+      url: "https://pub.dartlang.org"
218 218
     source: hosted
219 219
     version: "0.17.0"
220 220
   js:
221 221
     dependency: transitive
222 222
     description:
223 223
       name: js
224
-      url: "https://pub.flutter-io.cn"
224
+      url: "https://pub.dartlang.org"
225 225
     source: hosted
226 226
     version: "0.6.3"
227 227
   json_annotation:
228 228
     dependency: transitive
229 229
     description:
230 230
       name: json_annotation
231
-      url: "https://pub.flutter-io.cn"
231
+      url: "https://pub.dartlang.org"
232 232
     source: hosted
233 233
     version: "4.4.0"
234 234
   json_serializable:
235 235
     dependency: "direct main"
236 236
     description:
237 237
       name: json_serializable
238
-      url: "https://pub.flutter-io.cn"
238
+      url: "https://pub.dartlang.org"
239 239
     source: hosted
240 240
     version: "6.1.6"
241 241
   lints:
242 242
     dependency: transitive
243 243
     description:
244 244
       name: lints
245
-      url: "https://pub.flutter-io.cn"
245
+      url: "https://pub.dartlang.org"
246 246
     source: hosted
247 247
     version: "1.0.1"
248 248
   location:
249 249
     dependency: "direct main"
250 250
     description:
251 251
       name: location
252
-      url: "https://pub.flutter-io.cn"
252
+      url: "https://pub.dartlang.org"
253 253
     source: hosted
254 254
     version: "4.3.0"
255 255
   location_platform_interface:
256 256
     dependency: transitive
257 257
     description:
258 258
       name: location_platform_interface
259
-      url: "https://pub.flutter-io.cn"
259
+      url: "https://pub.dartlang.org"
260 260
     source: hosted
261 261
     version: "2.3.0"
262 262
   location_web:
263 263
     dependency: transitive
264 264
     description:
265 265
       name: location_web
266
-      url: "https://pub.flutter-io.cn"
266
+      url: "https://pub.dartlang.org"
267 267
     source: hosted
268 268
     version: "3.1.1"
269 269
   logging:
270 270
     dependency: transitive
271 271
     description:
272 272
       name: logging
273
-      url: "https://pub.flutter-io.cn"
273
+      url: "https://pub.dartlang.org"
274 274
     source: hosted
275 275
     version: "1.0.2"
276 276
   matcher:
277 277
     dependency: transitive
278 278
     description:
279 279
       name: matcher
280
-      url: "https://pub.flutter-io.cn"
280
+      url: "https://pub.dartlang.org"
281 281
     source: hosted
282 282
     version: "0.12.11"
283 283
   material_color_utilities:
284 284
     dependency: transitive
285 285
     description:
286 286
       name: material_color_utilities
287
-      url: "https://pub.flutter-io.cn"
287
+      url: "https://pub.dartlang.org"
288 288
     source: hosted
289 289
     version: "0.1.3"
290 290
   meta:
291 291
     dependency: transitive
292 292
     description:
293 293
       name: meta
294
-      url: "https://pub.flutter-io.cn"
294
+      url: "https://pub.dartlang.org"
295 295
     source: hosted
296 296
     version: "1.7.0"
297 297
   package_config:
298 298
     dependency: transitive
299 299
     description:
300 300
       name: package_config
301
-      url: "https://pub.flutter-io.cn"
301
+      url: "https://pub.dartlang.org"
302 302
     source: hosted
303 303
     version: "2.0.2"
304 304
   path:
305 305
     dependency: transitive
306 306
     description:
307 307
       name: path
308
-      url: "https://pub.flutter-io.cn"
308
+      url: "https://pub.dartlang.org"
309 309
     source: hosted
310 310
     version: "1.8.0"
311 311
   path_provider:
312 312
     dependency: transitive
313 313
     description:
314 314
       name: path_provider
315
-      url: "https://pub.flutter-io.cn"
315
+      url: "https://pub.dartlang.org"
316 316
     source: hosted
317 317
     version: "2.0.9"
318 318
   path_provider_android:
319 319
     dependency: transitive
320 320
     description:
321 321
       name: path_provider_android
322
-      url: "https://pub.flutter-io.cn"
322
+      url: "https://pub.dartlang.org"
323 323
     source: hosted
324 324
     version: "2.0.12"
325 325
   path_provider_ios:
326 326
     dependency: transitive
327 327
     description:
328 328
       name: path_provider_ios
329
-      url: "https://pub.flutter-io.cn"
329
+      url: "https://pub.dartlang.org"
330 330
     source: hosted
331 331
     version: "2.0.8"
332 332
   path_provider_linux:
333 333
     dependency: transitive
334 334
     description:
335 335
       name: path_provider_linux
336
-      url: "https://pub.flutter-io.cn"
336
+      url: "https://pub.dartlang.org"
337 337
     source: hosted
338 338
     version: "2.1.5"
339 339
   path_provider_macos:
340 340
     dependency: transitive
341 341
     description:
342 342
       name: path_provider_macos
343
-      url: "https://pub.flutter-io.cn"
343
+      url: "https://pub.dartlang.org"
344 344
     source: hosted
345 345
     version: "2.0.5"
346 346
   path_provider_platform_interface:
347 347
     dependency: transitive
348 348
     description:
349 349
       name: path_provider_platform_interface
350
-      url: "https://pub.flutter-io.cn"
350
+      url: "https://pub.dartlang.org"
351 351
     source: hosted
352 352
     version: "2.0.3"
353 353
   path_provider_windows:
354 354
     dependency: transitive
355 355
     description:
356 356
       name: path_provider_windows
357
-      url: "https://pub.flutter-io.cn"
357
+      url: "https://pub.dartlang.org"
358 358
     source: hosted
359 359
     version: "2.0.5"
360 360
   platform:
361 361
     dependency: transitive
362 362
     description:
363 363
       name: platform
364
-      url: "https://pub.flutter-io.cn"
364
+      url: "https://pub.dartlang.org"
365 365
     source: hosted
366 366
     version: "3.1.0"
367 367
   plugin_platform_interface:
368 368
     dependency: transitive
369 369
     description:
370 370
       name: plugin_platform_interface
371
-      url: "https://pub.flutter-io.cn"
371
+      url: "https://pub.dartlang.org"
372 372
     source: hosted
373 373
     version: "2.1.2"
374 374
   process:
375 375
     dependency: transitive
376 376
     description:
377 377
       name: process
378
-      url: "https://pub.flutter-io.cn"
378
+      url: "https://pub.dartlang.org"
379 379
     source: hosted
380 380
     version: "4.2.4"
381 381
   pub_semver:
382 382
     dependency: transitive
383 383
     description:
384 384
       name: pub_semver
385
-      url: "https://pub.flutter-io.cn"
385
+      url: "https://pub.dartlang.org"
386 386
     source: hosted
387 387
     version: "2.1.1"
388 388
   pubspec_parse:
389 389
     dependency: transitive
390 390
     description:
391 391
       name: pubspec_parse
392
-      url: "https://pub.flutter-io.cn"
392
+      url: "https://pub.dartlang.org"
393 393
     source: hosted
394 394
     version: "1.2.0"
395 395
   sky_engine:
@@ -401,98 +401,98 @@ packages:
401 401
     dependency: transitive
402 402
     description:
403 403
       name: source_gen
404
-      url: "https://pub.flutter-io.cn"
404
+      url: "https://pub.dartlang.org"
405 405
     source: hosted
406 406
     version: "1.2.2"
407 407
   source_helper:
408 408
     dependency: transitive
409 409
     description:
410 410
       name: source_helper
411
-      url: "https://pub.flutter-io.cn"
411
+      url: "https://pub.dartlang.org"
412 412
     source: hosted
413 413
     version: "1.3.2"
414 414
   source_span:
415 415
     dependency: transitive
416 416
     description:
417 417
       name: source_span
418
-      url: "https://pub.flutter-io.cn"
418
+      url: "https://pub.dartlang.org"
419 419
     source: hosted
420 420
     version: "1.8.1"
421 421
   stack_trace:
422 422
     dependency: transitive
423 423
     description:
424 424
       name: stack_trace
425
-      url: "https://pub.flutter-io.cn"
425
+      url: "https://pub.dartlang.org"
426 426
     source: hosted
427 427
     version: "1.10.0"
428 428
   stream_channel:
429 429
     dependency: transitive
430 430
     description:
431 431
       name: stream_channel
432
-      url: "https://pub.flutter-io.cn"
432
+      url: "https://pub.dartlang.org"
433 433
     source: hosted
434 434
     version: "2.1.0"
435 435
   string_scanner:
436 436
     dependency: transitive
437 437
     description:
438 438
       name: string_scanner
439
-      url: "https://pub.flutter-io.cn"
439
+      url: "https://pub.dartlang.org"
440 440
     source: hosted
441 441
     version: "1.1.0"
442 442
   term_glyph:
443 443
     dependency: transitive
444 444
     description:
445 445
       name: term_glyph
446
-      url: "https://pub.flutter-io.cn"
446
+      url: "https://pub.dartlang.org"
447 447
     source: hosted
448 448
     version: "1.2.0"
449 449
   test_api:
450 450
     dependency: transitive
451 451
     description:
452 452
       name: test_api
453
-      url: "https://pub.flutter-io.cn"
453
+      url: "https://pub.dartlang.org"
454 454
     source: hosted
455 455
     version: "0.4.8"
456 456
   typed_data:
457 457
     dependency: transitive
458 458
     description:
459 459
       name: typed_data
460
-      url: "https://pub.flutter-io.cn"
460
+      url: "https://pub.dartlang.org"
461 461
     source: hosted
462 462
     version: "1.3.0"
463 463
   vector_math:
464 464
     dependency: transitive
465 465
     description:
466 466
       name: vector_math
467
-      url: "https://pub.flutter-io.cn"
467
+      url: "https://pub.dartlang.org"
468 468
     source: hosted
469 469
     version: "2.1.1"
470 470
   watcher:
471 471
     dependency: transitive
472 472
     description:
473 473
       name: watcher
474
-      url: "https://pub.flutter-io.cn"
474
+      url: "https://pub.dartlang.org"
475 475
     source: hosted
476 476
     version: "1.0.1"
477 477
   win32:
478 478
     dependency: transitive
479 479
     description:
480 480
       name: win32
481
-      url: "https://pub.flutter-io.cn"
481
+      url: "https://pub.dartlang.org"
482 482
     source: hosted
483 483
     version: "2.5.1"
484 484
   xdg_directories:
485 485
     dependency: transitive
486 486
     description:
487 487
       name: xdg_directories
488
-      url: "https://pub.flutter-io.cn"
488
+      url: "https://pub.dartlang.org"
489 489
     source: hosted
490 490
     version: "0.2.0+1"
491 491
   yaml:
492 492
     dependency: transitive
493 493
     description:
494 494
       name: yaml
495
-      url: "https://pub.flutter-io.cn"
495
+      url: "https://pub.dartlang.org"
496 496
     source: hosted
497 497
     version: "3.1.0"
498 498
 sdks: