Merge branch 'master' of https://git.oa00.com/austin_dai/project_telephony

lib/constants/api.dart

@@ -29,26 +29,37 @@ class API {
 
   static _App app = _App();
   static _Pay pay = _Pay();
+  static _Exclude exclude = _Exclude();
 }
+
 class _App {
   ///用户登录
   String get login => '/app/login';
+
   ///退出登录
   String get logout => '/app/login/logout';
+
   ///发送验证码
   String get captcha => '/app/captcha';
+
   ///用户信息
   String get info => '/app/user/info';
+
   ///短信标签
   String get addTag => '/app/user/addTag';
+
   ///自定义短信
   String get content => '/app/user/content';
+
   ///删除自定义短信
   String get delete => '/app/user/content/delete';
+
   ///选择自定义短信
   String get checked => '/app/user/content/checked';
+
   ///查找短信
   String get find => '/app/user/content/find';
+
   ///更新VIP状态（已合并至用户信息）
   String get updateVip => '/app/user/updateVip';
 }
@@ -56,10 +67,27 @@ class _App {
 class _Pay {
   ///微信支付
   String get wxpay => '/app/pay/wxpay';
+
   ///支付宝支付
   String get alipay => '/app/pay/alipay';
+
   ///微信支付回调
   String get wxCallback => '/callback/wxpay/notify';
+
   ///支付宝支付回调
   String get aliCallback => '/callback/alipay/notify';
-}
+}
+
+class _Exclude {
+  ///添加手机号
+  String get add => '/app/exclude/add';
+
+  ///删除手机号
+  String get delete => '/app/exclude/delete';
+
+  ///修改手机号
+  String get update => '/app/exclude/update';
+
+  ///查看手机号列表
+  String get find => '/app/exclude/find';
+}

lib/model/exclude_phone_model.dart

@@ -0,0 +1,22 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'package:equatable/equatable.dart';
+part 'exclude_phone_model.g.dart';
+
+
+@JsonSerializable()
+class ExcludePhoneModel extends Equatable{
+  final int id;
+  final String phone;
+  final String remark;
+    factory ExcludePhoneModel.fromJson(Map<String, dynamic> json) =>_$ExcludePhoneModelFromJson(json);
+    Map<String,dynamic> toJson()=> _$ExcludePhoneModelToJson(this);
+
+  const ExcludePhoneModel({
+    required this.id,
+    required this.phone,
+    required this.remark,
+  });
+
+  @override
+  List<Object?> get props => [id,phone,remark];
+}

lib/model/exclude_phone_model.g.dart

@@ -0,0 +1,19 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'exclude_phone_model.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+ExcludePhoneModel _$ExcludePhoneModelFromJson(Map<String, dynamic> json) => ExcludePhoneModel(
+      id: json['id'] as int,
+      phone: json['phone'] as String,
+      remark: json['remark'] as String,
+    );
+
+Map<String, dynamic> _$ExcludePhoneModelToJson(ExcludePhoneModel instance) => <String, dynamic>{
+      'id': instance.id,
+      'phone': instance.phone,
+      'remark': instance.remark,
+    };

lib/model/login_info_model.dart

@@ -1,41 +1,37 @@
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
-part 'login_info_model.g.dart';
 
+part 'login_info_model.g.dart';
 
 @JsonSerializable()
 class LoginInfo extends Equatable {
-    final String token;
-    final User user;
+  final String token;
+  final User user;
 
-    factory LoginInfo.fromJson(Map<String, dynamic> json) =>
-        _$LoginInfoFromJson(json);
+  factory LoginInfo.fromJson(Map<String, dynamic> json) =>
+      _$LoginInfoFromJson(json);
 
-    const LoginInfo({
-        required this.token,
-        required this.user,
-    });
+  const LoginInfo({
+    required this.token,
+    required this.user,
+  });
 
-    @override
-    List<Object?> get props => [token, user];
+  @override
+  List<Object?> get props => [token, user];
 }
 
 @JsonSerializable()
 class User extends Equatable {
-    final int id;
-    final String name;
-
-    const User({
-        required this.id,
-        required this.name,
-    });
-
-    factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
-
-    @override
-    List<Object?> get props =>
-        [
-            id,
-            name,
-        ];
-}
+  final int id;
+  final String name;
+
+  const User({
+    required this.id,
+    required this.name,
+  });
+
+  factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
+
+  @override
+  List<Object?> get props => [id, name];
+}