skkfd

lib/models/entities/Address.dart

@@ -0,0 +1,14 @@
+class Address {
+  String? address;
+  bool? isDefault;
+  Address();
+
+  Address.fromJson(Map<String, dynamic> json)
+      : address = json["address"],
+        isDefault = json["isDefault"];
+
+  Map<String, dynamic> toJson() => {
+        'address': address,
+        'isDefault': isDefault,
+      };
+}

lib/pages/addAddress/index.dart

@@ -0,0 +1 @@
+import 'package:flutter/material.dart';

lib/pages/addressList/index.dart

@@ -1,5 +1,9 @@
+import 'package:farmer_client/models/entities/Address.dart';
+import 'package:farmer_client/pages/addressList/widget/AddressCard.dart';
+import 'package:farmer_client/widgets/DefaultButton.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 
 class AddressList extends StatefulWidget {
   const AddressList({Key? key}) : super(key: key);
@@ -9,6 +13,51 @@ class AddressList extends StatefulWidget {
 }
 
 class _AddressList extends State<AddressList> {
+
+  List<Address> addressList = [
+    Address.fromJson({'address': '777', 'isDefault': false}),
+    Address.fromJson({'address': '999', 'isDefault': false}),
+    Address.fromJson({'address': '这是一个正经的地址', 'isDefault': false}),
+  ];
+  void onChange(index) {
+    setState(() {
+      addressList.forEach((element) {
+        if (element.isDefault == true) {
+          element.isDefault = false;
+        }
+      });
+      addressList[index].isDefault = true;
+    });
+  }
+  void onDelete(index){
+    showDialog(
+        context: context,
+        builder: (context) {
+          return AlertDialog(
+              title: Text("提示信息"),
+              content: Text("您确定要删除此地址吗?"),
+              actions: <Widget>[
+                TextButton(
+                  child: Text("取消"),
+                  onPressed: () {
+                    print("取消");
+                    Navigator.pop(context, 'Cancle');
+                  },
+                ),
+                TextButton(
+                    child: Text("确定"),
+                    onPressed: () {
+                      // setState(() {
+                      //   addressList.remove(addressList[e]);
+                      // });
+                      Navigator.pop(context, "Ok");
+                      Fluttertoast.showToast(
+                          msg: '删除成功！');
+                    })
+              ]);
+        });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -25,32 +74,47 @@ class _AddressList extends State<AddressList> {
               fontWeight: FontWeight.bold),
         ),
       ),
-      body: Container(
-        padding: EdgeInsets.all(15.w),
-        child: Column(
-          children: [
-            Text('地址'),
-            GestureDetector(
-              onTap: () {},
-              child: Container(
-                width: 345.w,
-                height: 49.h,
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.all(Radius.circular(10.w)),
-                  color:Color(0xFFFF703B),
-                ),
-                child: Text(
-                  '+新增收货地址',
-                  style: TextStyle(
-                    color: Colors.white,
-                    fontWeight: FontWeight.bold,
-                    fontSize: 20.sp
-                  ),
+      body: ListView(
+        children: [
+          Container(
+            padding: EdgeInsets.all(15.w),
+            child: Column(
+              //左对齐
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Column(
+                    children: addressList
+                        .asMap()
+                        .keys
+                        .map(
+                          (e) => AddressCard(
+                            No: e + 1,
+                            item: addressList[e],
+                            onChange: () {
+                              onChange(e);
+                            },
+                            onEdit: () {},
+                            onDelete: () {
+                              onDelete(e);
+                            },
+                          ),
+                        )
+                        .toList()),
+                DefaultButton(
+                  color: const Color(0xffffffff),
+                  backColor: const Color(0xFFFF703B),
+                  width: 345.w,
+                  height: 49.h,
+                  text: '+新增收货地址',
+                  onPressed: () {},
+                  margin: const EdgeInsets.all(0),
+                  fontSize: 20.sp,
+                  radius: 24.5.w,
                 ),
-              ),
+              ],
             ),
-          ],
-        ),
+          ),
+        ],
       ),
     );
   }

lib/pages/addressList/widget/AddressCard.dart

@@ -0,0 +1,153 @@
+import 'package:farmer_client/models/entities/Address.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.dart';
+
+class AddressCard extends StatefulWidget {
+  final Address item;
+  final int No;
+  final GestureTapCallback onChange;
+  final GestureTapCallback onDelete;
+  final GestureTapCallback onEdit;
+  AddressCard(
+      {Key? key,
+      required this.item,
+      required this.No,
+      required this.onChange,
+      required this.onDelete,
+      required this.onEdit})
+      : super(key: key);
+
+  @override
+  _AddressCard createState() =>
+      _AddressCard(item, No, onChange, onDelete, onEdit);
+}
+
+class _AddressCard extends State<AddressCard> {
+  final Address item;
+  final int No;
+  final GestureTapCallback onChange;
+  final GestureTapCallback onDelete;
+  final GestureTapCallback onEdit;
+  _AddressCard(this.item, this.No, this.onChange, this.onDelete, this.onEdit);
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 345.w,
+      padding: EdgeInsets.all(15.w),
+      margin: EdgeInsets.fromLTRB(0, 0, 0, 15.w),
+      decoration: BoxDecoration(
+        color: const Color(0xFFFFFFFF),
+        borderRadius: BorderRadius.all(Radius.circular(10.w)),
+        boxShadow: [
+          BoxShadow(
+              color: const Color(0x19000000),
+              offset: Offset(0, 5.w),
+              blurRadius: 12.w),
+        ],
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            children: [
+              if (item.isDefault == true)
+                Container(
+                  margin: EdgeInsets.fromLTRB(0, 0, 5.w, 0),
+                  padding: EdgeInsets.symmetric(vertical: 1.w, horizontal: 5.w),
+                  decoration: BoxDecoration(
+                    color: const Color(0xffff0000),
+                    borderRadius: BorderRadius.all(Radius.circular(5.w)),
+                  ),
+                  child: Text(
+                    '默认地址',
+                    style: TextStyle(
+                      fontSize: 15.sp,
+                      fontWeight: FontWeight.bold,
+                      color: const Color(0xffffffff),
+                    ),
+                  ),
+                ),
+              Text(
+                '我的地址' + No.toString(),
+                style: TextStyle(fontSize: 15.sp, fontWeight: FontWeight.w700),
+              ),
+            ],
+          ),
+          GestureDetector(
+            onTap: onEdit,
+            child: Container(
+              padding: EdgeInsets.symmetric(vertical: 5.h, horizontal: 0),
+              decoration: BoxDecoration(
+                border: Border(
+                  bottom: BorderSide(
+                      width: 0.5.h,
+                      color: const Color(0xcc000000),
+                      style: BorderStyle.solid),
+                ),
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Container(
+                    padding: EdgeInsets.symmetric(vertical: 5.w, horizontal: 0),
+                    width: 282.w,
+                    child: Text(
+                      item.address.toString(),
+                      //最多显示两行
+                      maxLines: 2,
+                      //多余文本用点点点表示
+                      overflow: TextOverflow.ellipsis,
+                      style: TextStyle(
+                        fontSize: 15.sp,
+                        color: const Color(0xff666666),
+                      ),
+                    ),
+                  ),
+                  Image.asset(
+                    'images/icons/edit.png',
+                    width: 33.w,
+                    height: 33.w,
+                  ),
+                ],
+              ),
+            ),
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              GestureDetector(
+                onTap: onChange,
+                child: Row(
+                  children: [
+                    const Text('设为默认地址'),
+                    Radio<bool>(
+                        value: true,
+                        activeColor: const Color(0xFFFF703B),
+                        groupValue: item.isDefault,
+                        onChanged: (value){
+                          onChange();
+                        }),
+                  ],
+                ),
+              ),
+              GestureDetector(
+                onTap: onDelete,
+                child: Row(
+                  children: [
+                    const Text('删除'),
+                    Image.asset(
+                      'images/icons/delete.png',
+                      width: 25.w,
+                      height: 25.w,
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/login/login.dart

@@ -14,6 +14,7 @@ import '../home/index.dart';
 
 
 class MyRouteLogin extends StatefulWidget {
+
   @override
   State<MyRouteLogin> createState() => _RouteLogin();
 }

lib/pages/splash/splash.dart

@@ -14,8 +14,10 @@ class SplashScreen extends StatefulWidget {
 
 class _SplashScreen extends State<SplashScreen> {
   handleOnFinish() {
-    Get.off(Home());
-    // Get.toNamed("/addressList");
+    print(99999);
+
+    // Get.off(Home());
+    Get.toNamed("/addressList");
   }
 
   @override

lib/pages/splash/widgets/countdown.dart

@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:farmer_client/utils/timer.dart';
@@ -20,26 +19,19 @@ Widget countdown(int sec, void Function() onFinish) {
   }, 1000);
 
   return Obx(
-        () => GestureDetector(
-      onTap: () {
-        _timer.cancel();
-        // return;
-        // onFinish();
-      },
-      child: Container(
-        width: 50.w,
-        height: 30.h,
-        alignment: const Alignment(0, 0),
-        decoration: const BoxDecoration(
-            borderRadius: BorderRadius.all(Radius.circular(20)),
-            color: Color(0x77222222)),
-        child: Text(
-          _countdown.value.toString() + '跳过',
-          style: TextStyle(
-            fontSize: 13.sp,
-            letterSpacing: 2,
-            color: const Color(0xFFFFFFFF),
-          ),
+    () => Container(
+      width: 20.h,
+      height: 20.h,
+      alignment: const Alignment(0, 0),
+      decoration: const BoxDecoration(
+          borderRadius: BorderRadius.all(Radius.circular(20)),
+          color: Color(0x77222222)),
+      child: Text(
+        _countdown.value.toString(),
+        style: TextStyle(
+          fontSize: 13.sp,
+          letterSpacing: 2,
+          color: const Color(0xFFFFFFFF),
         ),
       ),
     ),

lib/widgets/DefaultButton.dart

@@ -12,6 +12,7 @@ class DefaultButton extends StatefulWidget {
   final double? fontSize;
   final Color backColor;
   final Color color;
+  final double? radius;
 
   EdgeInsetsGeometry marginDefault =
   const EdgeInsets.fromLTRB(0, 90.0, 0, 30); //按钮默认的margin值
@@ -24,6 +25,7 @@ class DefaultButton extends StatefulWidget {
     required this.width,
     required this.height,
     this.fontSize,
+    this.radius,
     required this.backColor,
     required this.color,
   }) : super(key: key);
@@ -31,9 +33,9 @@ class DefaultButton extends StatefulWidget {
   @override
   State createState() {
     if (margin == null) {
-      return _DefaultButtonState(onPressed, text, marginDefault,width,height,fontSize,backColor,color);
+      return _DefaultButtonState(onPressed, text, marginDefault,width,height,fontSize,backColor,color,radius);
     }
-    return _DefaultButtonState(onPressed, text, margin,width,height,fontSize,backColor,color);
+    return _DefaultButtonState(onPressed, text, margin,width,height,fontSize,backColor,color,radius);
   }
 }
 
@@ -47,6 +49,7 @@ class _DefaultButtonState extends State<DefaultButton> {
   final double? fontSize;
   final Color backColor;
   final Color color;
+  final double? radius;
   _DefaultButtonState(
       this.onPressed,
       this.text,
@@ -55,7 +58,8 @@ class _DefaultButtonState extends State<DefaultButton> {
       this.height,
       this.fontSize,
       this.backColor,
-      this.color
+      this.color,
+      this.radius
       );
 
   @override
@@ -71,9 +75,10 @@ class _DefaultButtonState extends State<DefaultButton> {
           disabledTextColor: const Color(0xF5F6F7ff),
           colorBrightness: Brightness.dark,
           shape:
-          RoundedRectangleBorder(borderRadius: BorderRadius.circular(5.0)),
+          RoundedRectangleBorder(borderRadius: BorderRadius.circular(radius??5)),
           child: Text(text,style:  TextStyle(
               fontSize: fontSize,
+              fontWeight: FontWeight.bold,
               color: color,
           ),),
           textColor: Colors.white,

pubspec.lock

@@ -5,140 +5,140 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "39.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.0"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.15.0"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.2.3"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.6"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.2"
   flutter:
@@ -150,7 +150,7 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   flutter_localizations:
@@ -162,7 +162,7 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_screenutil
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.4.0+1"
   flutter_test:
@@ -179,35 +179,35 @@ packages:
     dependency: "direct main"
     description:
       name: fluttertoast
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "8.0.9"
   get:
     dependency: "direct main"
     description:
       name: get
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.6.1"
   get_storage:
     dependency: "direct main"
     description:
       name: get_storage
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.3"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.2"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
   intl:
@@ -221,175 +221,175 @@ packages:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.6.3"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.4.0"
   json_serializable:
     dependency: "direct main"
     description:
       name: json_serializable
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.6"
   lints:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   location:
     dependency: "direct main"
     description:
       name: location
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.3.0"
   location_platform_interface:
     dependency: transitive
     description:
       name: location_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.0"
   location_web:
     dependency: transitive
     description:
       name: location_web
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.11"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.7.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.2"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.9"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.12"
   path_provider_ios:
     dependency: transitive
     description:
       name: path_provider_ios
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.8"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.5"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.3"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.2"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.2.4"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   sky_engine:
@@ -401,98 +401,98 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.2"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.2"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.5.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.0+1"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.0"
 sdks:

pubspec.yaml

@@ -73,8 +73,36 @@ flutter:
   uses-material-design: true
   # To add images to your application, add an images section, like this:
   assets:
+<<<<<<< HEAD
     - images/icons/
     - images/
+=======
+    - images/icon_login.png
+    - images/phoneCode.png
+    - images/index/HomesNOImgaes.png
+    - images/index/HomesOFFImgaes.png
+    - images/index/MineNOImgaes.png
+    - images/index/MineOFFImgaes.png
+    - images/index/newsOFFImages.png
+    - images/index/newsONImages.png
+    - images/index/OrdersNOImgaes.png
+    - images/index/OrdersOFFImgaes.png
+    - images/cars.png
+    - images/gpsImgae.png
+    - images/ordersLeft.png
+    - images/mineBack.png
+    - images/userMoren.png
+    - images/aboutUs.png
+    - images/feedbacks.png
+    - images/userRight.png
+    - images/versionUpdate.png
+    - images/logo.png
+    - images/splash.png
+    - images/icons/decorate.png
+    - images/icons/edit.png
+    - images/icons/delete.png
+    - images/ordersListImga.png
+>>>>>>> af576cb1ac2ecd65eb8a520ec14247dbabae4128
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.