소스 검색

add Loading EasyLoading

[baozhangchao] 3 년 전
부모
커밋
9bbac2b24b
2개의 변경된 파일96개의 추가작업 그리고 79개의 파일을 삭제
  1. 13
    0
      lib/pages/feedback/index.dart
  2. 83
    79
      pubspec.lock

+ 13
- 0
lib/pages/feedback/index.dart 파일 보기

@@ -55,16 +55,29 @@ class Feedback extends BasicPage {
55 55
                 top: 5.w,
56 56
                 child: Row(
57 57
                   children: [
58
+<<<<<<< HEAD
58 59
                     Image.asset(
59 60
                       'images/icons/feedbackIcon.png',
60 61
                       width: 15.w,
62
+=======
63
+                    Container(
64
+                      margin: EdgeInsets.only(right: 8.w),
65
+                      child: Image.asset(
66
+                        'images/icons/feedbackIcon.png',
67
+                        width: 15.w,
68
+                      ),
69
+>>>>>>> b052c991e6c96dc1b28c3fa153d55d36d0e0272a
61 70
                     ),
62 71
                     Text(
63 72
                       '请留下您宝贵的意见和建议!',
64 73
                       style: TextStyle(
65 74
                           fontSize: 17.sp,
66 75
                           letterSpacing: 2,
76
+<<<<<<< HEAD
67 77
                           color: Color(0xFFBEBDBD)),
78
+=======
79
+                          color: const Color(0xFFBEBDBD)),
80
+>>>>>>> b052c991e6c96dc1b28c3fa153d55d36d0e0272a
68 81
                     ),
69 82
                   ],
70 83
                 ),

+ 83
- 79
pubspec.lock 파일 보기

@@ -5,175 +5,175 @@ packages:
5 5
     dependency: transitive
6 6
     description:
7 7
       name: _fe_analyzer_shared
8
-      url: "https://pub.dartlang.org"
8
+      url: "https://pub.flutter-io.cn"
9 9
     source: hosted
10 10
     version: "39.0.0"
11 11
   amap_flutter_base:
12 12
     dependency: transitive
13 13
     description:
14 14
       name: amap_flutter_base
15
-      url: "https://pub.dartlang.org"
15
+      url: "https://pub.flutter-io.cn"
16 16
     source: hosted
17 17
     version: "3.0.0"
18 18
   amap_flutter_location:
19 19
     dependency: "direct main"
20 20
     description:
21 21
       name: amap_flutter_location
22
-      url: "https://pub.dartlang.org"
22
+      url: "https://pub.flutter-io.cn"
23 23
     source: hosted
24 24
     version: "3.0.0"
25 25
   amap_flutter_map:
26 26
     dependency: "direct main"
27 27
     description:
28 28
       name: amap_flutter_map
29
-      url: "https://pub.dartlang.org"
29
+      url: "https://pub.flutter-io.cn"
30 30
     source: hosted
31 31
     version: "3.0.0"
32 32
   analyzer:
33 33
     dependency: transitive
34 34
     description:
35 35
       name: analyzer
36
-      url: "https://pub.dartlang.org"
36
+      url: "https://pub.flutter-io.cn"
37 37
     source: hosted
38 38
     version: "4.0.0"
39 39
   args:
40 40
     dependency: transitive
41 41
     description:
42 42
       name: args
43
-      url: "https://pub.dartlang.org"
43
+      url: "https://pub.flutter-io.cn"
44 44
     source: hosted
45 45
     version: "2.3.0"
46 46
   async:
47 47
     dependency: transitive
48 48
     description:
49 49
       name: async
50
-      url: "https://pub.dartlang.org"
50
+      url: "https://pub.flutter-io.cn"
51 51
     source: hosted
52 52
     version: "2.8.2"
53 53
   boolean_selector:
54 54
     dependency: transitive
55 55
     description:
56 56
       name: boolean_selector
57
-      url: "https://pub.dartlang.org"
57
+      url: "https://pub.flutter-io.cn"
58 58
     source: hosted
59 59
     version: "2.1.0"
60 60
   build:
61 61
     dependency: transitive
62 62
     description:
63 63
       name: build
64
-      url: "https://pub.dartlang.org"
64
+      url: "https://pub.flutter-io.cn"
65 65
     source: hosted
66 66
     version: "2.3.0"
67 67
   build_config:
68 68
     dependency: transitive
69 69
     description:
70 70
       name: build_config
71
-      url: "https://pub.dartlang.org"
71
+      url: "https://pub.flutter-io.cn"
72 72
     source: hosted
73 73
     version: "1.0.0"
74 74
   carousel_slider:
75 75
     dependency: "direct main"
76 76
     description:
77 77
       name: carousel_slider
78
-      url: "https://pub.dartlang.org"
78
+      url: "https://pub.flutter-io.cn"
79 79
     source: hosted
80 80
     version: "4.1.1"
81 81
   characters:
82 82
     dependency: transitive
83 83
     description:
84 84
       name: characters
85
-      url: "https://pub.dartlang.org"
85
+      url: "https://pub.flutter-io.cn"
86 86
     source: hosted
87 87
     version: "1.2.0"
88 88
   charcode:
89 89
     dependency: transitive
90 90
     description:
91 91
       name: charcode
92
-      url: "https://pub.dartlang.org"
92
+      url: "https://pub.flutter-io.cn"
93 93
     source: hosted
94 94
     version: "1.3.1"
95 95
   checked_yaml:
96 96
     dependency: transitive
97 97
     description:
98 98
       name: checked_yaml
99
-      url: "https://pub.dartlang.org"
99
+      url: "https://pub.flutter-io.cn"
100 100
     source: hosted
101 101
     version: "2.0.1"
102 102
   clock:
103 103
     dependency: transitive
104 104
     description:
105 105
       name: clock
106
-      url: "https://pub.dartlang.org"
106
+      url: "https://pub.flutter-io.cn"
107 107
     source: hosted
108 108
     version: "1.1.0"
109 109
   collection:
110 110
     dependency: transitive
111 111
     description:
112 112
       name: collection
113
-      url: "https://pub.dartlang.org"
113
+      url: "https://pub.flutter-io.cn"
114 114
     source: hosted
115 115
     version: "1.15.0"
116 116
   convert:
117 117
     dependency: transitive
118 118
     description:
119 119
       name: convert
120
-      url: "https://pub.dartlang.org"
120
+      url: "https://pub.flutter-io.cn"
121 121
     source: hosted
122 122
     version: "3.0.1"
123 123
   crypto:
124 124
     dependency: transitive
125 125
     description:
126 126
       name: crypto
127
-      url: "https://pub.dartlang.org"
127
+      url: "https://pub.flutter-io.cn"
128 128
     source: hosted
129
-    version: "3.0.1"
129
+    version: "3.0.2"
130 130
   cupertino_icons:
131 131
     dependency: "direct main"
132 132
     description:
133 133
       name: cupertino_icons
134
-      url: "https://pub.dartlang.org"
134
+      url: "https://pub.flutter-io.cn"
135 135
     source: hosted
136 136
     version: "1.0.4"
137 137
   dart_style:
138 138
     dependency: transitive
139 139
     description:
140 140
       name: dart_style
141
-      url: "https://pub.dartlang.org"
141
+      url: "https://pub.flutter-io.cn"
142 142
     source: hosted
143 143
     version: "2.2.3"
144 144
   dio:
145 145
     dependency: "direct main"
146 146
     description:
147 147
       name: dio
148
-      url: "https://pub.dartlang.org"
148
+      url: "https://pub.flutter-io.cn"
149 149
     source: hosted
150 150
     version: "4.0.6"
151 151
   fake_async:
152 152
     dependency: transitive
153 153
     description:
154 154
       name: fake_async
155
-      url: "https://pub.dartlang.org"
155
+      url: "https://pub.flutter-io.cn"
156 156
     source: hosted
157 157
     version: "1.2.0"
158 158
   ff_stars:
159 159
     dependency: "direct main"
160 160
     description:
161 161
       name: ff_stars
162
-      url: "https://pub.dartlang.org"
162
+      url: "https://pub.flutter-io.cn"
163 163
     source: hosted
164 164
     version: "1.0.0"
165 165
   ffi:
166 166
     dependency: transitive
167 167
     description:
168 168
       name: ffi
169
-      url: "https://pub.dartlang.org"
169
+      url: "https://pub.flutter-io.cn"
170 170
     source: hosted
171 171
     version: "1.1.2"
172 172
   file:
173 173
     dependency: transitive
174 174
     description:
175 175
       name: file
176
-      url: "https://pub.dartlang.org"
176
+      url: "https://pub.flutter-io.cn"
177 177
     source: hosted
178 178
     version: "6.1.2"
179 179
   flutter:
@@ -192,7 +192,7 @@ packages:
192 192
     dependency: "direct dev"
193 193
     description:
194 194
       name: flutter_lints
195
-      url: "https://pub.dartlang.org"
195
+      url: "https://pub.flutter-io.cn"
196 196
     source: hosted
197 197
     version: "1.0.4"
198 198
   flutter_localizations:
@@ -204,15 +204,16 @@ packages:
204 204
     dependency: transitive
205 205
     description:
206 206
       name: flutter_plugin_android_lifecycle
207
-      url: "https://pub.dartlang.org"
207
+      url: "https://pub.flutter-io.cn"
208 208
     source: hosted
209 209
     version: "2.0.5"
210 210
   flutter_screenutil:
211 211
     dependency: "direct main"
212 212
     description:
213 213
       name: flutter_screenutil
214
-      url: "https://pub.dartlang.org"
214
+      url: "https://pub.flutter-io.cn"
215 215
     source: hosted
216
+<<<<<<< HEAD
216 217
     version: "5.4.0+1"
217 218
   flutter_spinkit:
218 219
     dependency: transitive
@@ -221,6 +222,9 @@ packages:
221 222
       url: "https://pub.dartlang.org"
222 223
     source: hosted
223 224
     version: "5.1.0"
225
+=======
226
+    version: "5.5.2"
227
+>>>>>>> b052c991e6c96dc1b28c3fa153d55d36d0e0272a
224 228
   flutter_test:
225 229
     dependency: "direct dev"
226 230
     description: flutter
@@ -235,231 +239,231 @@ packages:
235 239
     dependency: "direct main"
236 240
     description:
237 241
       name: fluttertoast
238
-      url: "https://pub.dartlang.org"
242
+      url: "https://pub.flutter-io.cn"
239 243
     source: hosted
240 244
     version: "8.0.9"
241 245
   get:
242 246
     dependency: "direct main"
243 247
     description:
244 248
       name: get
245
-      url: "https://pub.dartlang.org"
249
+      url: "https://pub.flutter-io.cn"
246 250
     source: hosted
247 251
     version: "4.6.1"
248 252
   get_storage:
249 253
     dependency: "direct main"
250 254
     description:
251 255
       name: get_storage
252
-      url: "https://pub.dartlang.org"
256
+      url: "https://pub.flutter-io.cn"
253 257
     source: hosted
254 258
     version: "2.0.3"
255 259
   glob:
256 260
     dependency: transitive
257 261
     description:
258 262
       name: glob
259
-      url: "https://pub.dartlang.org"
263
+      url: "https://pub.flutter-io.cn"
260 264
     source: hosted
261 265
     version: "2.0.2"
262 266
   http_parser:
263 267
     dependency: transitive
264 268
     description:
265 269
       name: http_parser
266
-      url: "https://pub.dartlang.org"
270
+      url: "https://pub.flutter-io.cn"
267 271
     source: hosted
268 272
     version: "4.0.0"
269 273
   intl:
270 274
     dependency: transitive
271 275
     description:
272 276
       name: intl
273
-      url: "https://pub.dartlang.org"
277
+      url: "https://pub.flutter-io.cn"
274 278
     source: hosted
275 279
     version: "0.17.0"
276 280
   js:
277 281
     dependency: transitive
278 282
     description:
279 283
       name: js
280
-      url: "https://pub.dartlang.org"
284
+      url: "https://pub.flutter-io.cn"
281 285
     source: hosted
282 286
     version: "0.6.3"
283 287
   json_annotation:
284 288
     dependency: transitive
285 289
     description:
286 290
       name: json_annotation
287
-      url: "https://pub.dartlang.org"
291
+      url: "https://pub.flutter-io.cn"
288 292
     source: hosted
289
-    version: "4.4.0"
293
+    version: "4.5.0"
290 294
   json_serializable:
291 295
     dependency: "direct main"
292 296
     description:
293 297
       name: json_serializable
294
-      url: "https://pub.dartlang.org"
298
+      url: "https://pub.flutter-io.cn"
295 299
     source: hosted
296
-    version: "6.1.6"
300
+    version: "6.2.0"
297 301
   lints:
298 302
     dependency: transitive
299 303
     description:
300 304
       name: lints
301
-      url: "https://pub.dartlang.org"
305
+      url: "https://pub.flutter-io.cn"
302 306
     source: hosted
303 307
     version: "1.0.1"
304 308
   logging:
305 309
     dependency: transitive
306 310
     description:
307 311
       name: logging
308
-      url: "https://pub.dartlang.org"
312
+      url: "https://pub.flutter-io.cn"
309 313
     source: hosted
310 314
     version: "1.0.2"
311 315
   matcher:
312 316
     dependency: transitive
313 317
     description:
314 318
       name: matcher
315
-      url: "https://pub.dartlang.org"
319
+      url: "https://pub.flutter-io.cn"
316 320
     source: hosted
317 321
     version: "0.12.11"
318 322
   material_color_utilities:
319 323
     dependency: transitive
320 324
     description:
321 325
       name: material_color_utilities
322
-      url: "https://pub.dartlang.org"
326
+      url: "https://pub.flutter-io.cn"
323 327
     source: hosted
324 328
     version: "0.1.3"
325 329
   meta:
326 330
     dependency: transitive
327 331
     description:
328 332
       name: meta
329
-      url: "https://pub.dartlang.org"
333
+      url: "https://pub.flutter-io.cn"
330 334
     source: hosted
331 335
     version: "1.7.0"
332 336
   package_config:
333 337
     dependency: transitive
334 338
     description:
335 339
       name: package_config
336
-      url: "https://pub.dartlang.org"
340
+      url: "https://pub.flutter-io.cn"
337 341
     source: hosted
338 342
     version: "2.0.2"
339 343
   path:
340 344
     dependency: transitive
341 345
     description:
342 346
       name: path
343
-      url: "https://pub.dartlang.org"
347
+      url: "https://pub.flutter-io.cn"
344 348
     source: hosted
345 349
     version: "1.8.0"
346 350
   path_provider:
347 351
     dependency: transitive
348 352
     description:
349 353
       name: path_provider
350
-      url: "https://pub.dartlang.org"
354
+      url: "https://pub.flutter-io.cn"
351 355
     source: hosted
352 356
     version: "2.0.9"
353 357
   path_provider_android:
354 358
     dependency: transitive
355 359
     description:
356 360
       name: path_provider_android
357
-      url: "https://pub.dartlang.org"
361
+      url: "https://pub.flutter-io.cn"
358 362
     source: hosted
359 363
     version: "2.0.13"
360 364
   path_provider_ios:
361 365
     dependency: transitive
362 366
     description:
363 367
       name: path_provider_ios
364
-      url: "https://pub.dartlang.org"
368
+      url: "https://pub.flutter-io.cn"
365 369
     source: hosted
366 370
     version: "2.0.8"
367 371
   path_provider_linux:
368 372
     dependency: transitive
369 373
     description:
370 374
       name: path_provider_linux
371
-      url: "https://pub.dartlang.org"
375
+      url: "https://pub.flutter-io.cn"
372 376
     source: hosted
373 377
     version: "2.1.5"
374 378
   path_provider_macos:
375 379
     dependency: transitive
376 380
     description:
377 381
       name: path_provider_macos
378
-      url: "https://pub.dartlang.org"
382
+      url: "https://pub.flutter-io.cn"
379 383
     source: hosted
380 384
     version: "2.0.5"
381 385
   path_provider_platform_interface:
382 386
     dependency: transitive
383 387
     description:
384 388
       name: path_provider_platform_interface
385
-      url: "https://pub.dartlang.org"
389
+      url: "https://pub.flutter-io.cn"
386 390
     source: hosted
387 391
     version: "2.0.3"
388 392
   path_provider_windows:
389 393
     dependency: transitive
390 394
     description:
391 395
       name: path_provider_windows
392
-      url: "https://pub.dartlang.org"
396
+      url: "https://pub.flutter-io.cn"
393 397
     source: hosted
394 398
     version: "2.0.5"
395 399
   permission_handler:
396 400
     dependency: "direct main"
397 401
     description:
398 402
       name: permission_handler
399
-      url: "https://pub.dartlang.org"
403
+      url: "https://pub.flutter-io.cn"
400 404
     source: hosted
401 405
     version: "9.2.0"
402 406
   permission_handler_android:
403 407
     dependency: transitive
404 408
     description:
405 409
       name: permission_handler_android
406
-      url: "https://pub.dartlang.org"
410
+      url: "https://pub.flutter-io.cn"
407 411
     source: hosted
408 412
     version: "9.0.2+1"
409 413
   permission_handler_apple:
410 414
     dependency: transitive
411 415
     description:
412 416
       name: permission_handler_apple
413
-      url: "https://pub.dartlang.org"
417
+      url: "https://pub.flutter-io.cn"
414 418
     source: hosted
415 419
     version: "9.0.4"
416 420
   permission_handler_platform_interface:
417 421
     dependency: transitive
418 422
     description:
419 423
       name: permission_handler_platform_interface
420
-      url: "https://pub.dartlang.org"
424
+      url: "https://pub.flutter-io.cn"
421 425
     source: hosted
422 426
     version: "3.7.0"
423 427
   permission_handler_windows:
424 428
     dependency: transitive
425 429
     description:
426 430
       name: permission_handler_windows
427
-      url: "https://pub.dartlang.org"
431
+      url: "https://pub.flutter-io.cn"
428 432
     source: hosted
429 433
     version: "0.1.0"
430 434
   platform:
431 435
     dependency: transitive
432 436
     description:
433 437
       name: platform
434
-      url: "https://pub.dartlang.org"
438
+      url: "https://pub.flutter-io.cn"
435 439
     source: hosted
436 440
     version: "3.1.0"
437 441
   plugin_platform_interface:
438 442
     dependency: transitive
439 443
     description:
440 444
       name: plugin_platform_interface
441
-      url: "https://pub.dartlang.org"
445
+      url: "https://pub.flutter-io.cn"
442 446
     source: hosted
443 447
     version: "2.1.2"
444 448
   process:
445 449
     dependency: transitive
446 450
     description:
447 451
       name: process
448
-      url: "https://pub.dartlang.org"
452
+      url: "https://pub.flutter-io.cn"
449 453
     source: hosted
450 454
     version: "4.2.4"
451 455
   pub_semver:
452 456
     dependency: transitive
453 457
     description:
454 458
       name: pub_semver
455
-      url: "https://pub.dartlang.org"
459
+      url: "https://pub.flutter-io.cn"
456 460
     source: hosted
457 461
     version: "2.1.1"
458 462
   pubspec_parse:
459 463
     dependency: transitive
460 464
     description:
461 465
       name: pubspec_parse
462
-      url: "https://pub.dartlang.org"
466
+      url: "https://pub.flutter-io.cn"
463 467
     source: hosted
464 468
     version: "1.2.0"
465 469
   sky_engine:
@@ -471,105 +475,105 @@ packages:
471 475
     dependency: transitive
472 476
     description:
473 477
       name: source_gen
474
-      url: "https://pub.dartlang.org"
478
+      url: "https://pub.flutter-io.cn"
475 479
     source: hosted
476 480
     version: "1.2.2"
477 481
   source_helper:
478 482
     dependency: transitive
479 483
     description:
480 484
       name: source_helper
481
-      url: "https://pub.dartlang.org"
485
+      url: "https://pub.flutter-io.cn"
482 486
     source: hosted
483 487
     version: "1.3.2"
484 488
   source_span:
485 489
     dependency: transitive
486 490
     description:
487 491
       name: source_span
488
-      url: "https://pub.dartlang.org"
492
+      url: "https://pub.flutter-io.cn"
489 493
     source: hosted
490 494
     version: "1.8.1"
491 495
   stack_trace:
492 496
     dependency: transitive
493 497
     description:
494 498
       name: stack_trace
495
-      url: "https://pub.dartlang.org"
499
+      url: "https://pub.flutter-io.cn"
496 500
     source: hosted
497 501
     version: "1.10.0"
498 502
   stream_channel:
499 503
     dependency: transitive
500 504
     description:
501 505
       name: stream_channel
502
-      url: "https://pub.dartlang.org"
506
+      url: "https://pub.flutter-io.cn"
503 507
     source: hosted
504 508
     version: "2.1.0"
505 509
   stream_transform:
506 510
     dependency: transitive
507 511
     description:
508 512
       name: stream_transform
509
-      url: "https://pub.dartlang.org"
513
+      url: "https://pub.flutter-io.cn"
510 514
     source: hosted
511 515
     version: "2.0.0"
512 516
   string_scanner:
513 517
     dependency: transitive
514 518
     description:
515 519
       name: string_scanner
516
-      url: "https://pub.dartlang.org"
520
+      url: "https://pub.flutter-io.cn"
517 521
     source: hosted
518 522
     version: "1.1.0"
519 523
   term_glyph:
520 524
     dependency: transitive
521 525
     description:
522 526
       name: term_glyph
523
-      url: "https://pub.dartlang.org"
527
+      url: "https://pub.flutter-io.cn"
524 528
     source: hosted
525 529
     version: "1.2.0"
526 530
   test_api:
527 531
     dependency: transitive
528 532
     description:
529 533
       name: test_api
530
-      url: "https://pub.dartlang.org"
534
+      url: "https://pub.flutter-io.cn"
531 535
     source: hosted
532 536
     version: "0.4.8"
533 537
   typed_data:
534 538
     dependency: transitive
535 539
     description:
536 540
       name: typed_data
537
-      url: "https://pub.dartlang.org"
541
+      url: "https://pub.flutter-io.cn"
538 542
     source: hosted
539 543
     version: "1.3.0"
540 544
   vector_math:
541 545
     dependency: transitive
542 546
     description:
543 547
       name: vector_math
544
-      url: "https://pub.dartlang.org"
548
+      url: "https://pub.flutter-io.cn"
545 549
     source: hosted
546 550
     version: "2.1.1"
547 551
   watcher:
548 552
     dependency: transitive
549 553
     description:
550 554
       name: watcher
551
-      url: "https://pub.dartlang.org"
555
+      url: "https://pub.flutter-io.cn"
552 556
     source: hosted
553 557
     version: "1.0.1"
554 558
   win32:
555 559
     dependency: transitive
556 560
     description:
557 561
       name: win32
558
-      url: "https://pub.dartlang.org"
562
+      url: "https://pub.flutter-io.cn"
559 563
     source: hosted
560 564
     version: "2.5.2"
561 565
   xdg_directories:
562 566
     dependency: transitive
563 567
     description:
564 568
       name: xdg_directories
565
-      url: "https://pub.dartlang.org"
569
+      url: "https://pub.flutter-io.cn"
566 570
     source: hosted
567 571
     version: "0.2.0+1"
568 572
   yaml:
569 573
     dependency: transitive
570 574
     description:
571 575
       name: yaml
572
-      url: "https://pub.dartlang.org"
576
+      url: "https://pub.flutter-io.cn"
573 577
     source: hosted
574 578
     version: "3.1.0"
575 579
 sdks: