个人中心UI 基本完成

JiaPeiManage.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		9076C5DA2A386B2300E5E33F /* MineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9076C5D92A386B2300E5E33F /* MineViewController.swift */; };
 		9076C5DC2A386B2F00E5E33F /* MineViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9076C5DB2A386B2F00E5E33F /* MineViewController.xib */; };
+		9076C5DF2A387CBC00E5E33F /* MeTraineeListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9076C5DE2A387CBC00E5E33F /* MeTraineeListViewController.swift */; };
 		90CE52192A36C0710033BD06 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE52182A36C0710033BD06 /* AppDelegate.swift */; };
 		90CE521D2A36C0710033BD06 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE521C2A36C0710033BD06 /* ViewController.swift */; };
 		90CE52202A36C0710033BD06 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 90CE521E2A36C0710033BD06 /* Main.storyboard */; };
@@ -67,7 +68,7 @@
 		90CE52AC2A36E59A0033BD06 /* Array+SectionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE529A2A36E5990033BD06 /* Array+SectionModel.swift */; };
 		90CE52AD2A36E59A0033BD06 /* UIView+CornerRadius.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE529B2A36E5990033BD06 /* UIView+CornerRadius.swift */; };
 		90CE52AE2A36E59A0033BD06 /* UIScrollView+ScrollToBottom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE529C2A36E5990033BD06 /* UIScrollView+ScrollToBottom.swift */; };
-		90CE52AF2A36E59A0033BD06 /* UIColor+Bilibili.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE529D2A36E5990033BD06 /* UIColor+Bilibili.swift */; };
+		90CE52AF2A36E59A0033BD06 /* UIColor+NY.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE529D2A36E5990033BD06 /* UIColor+NY.swift */; };
 		90CE52B02A36E59A0033BD06 /* NSAttributedString+BoundingRect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE529E2A36E5990033BD06 /* NSAttributedString+BoundingRect.swift */; };
 		90CE52B12A36E59A0033BD06 /* VTContentView+Gesture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE529F2A36E5990033BD06 /* VTContentView+Gesture.swift */; };
 		90CE52B42A36E5A40033BD06 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE52B32A36E5A40033BD06 /* Logger.swift */; };
@@ -111,6 +112,7 @@
 		1FC2879EF62A9D4DF6777C62 /* Pods_JiaPeiManage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_JiaPeiManage.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9076C5D92A386B2300E5E33F /* MineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineViewController.swift; sourceTree = "<group>"; };
 		9076C5DB2A386B2F00E5E33F /* MineViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineViewController.xib; sourceTree = "<group>"; };
+		9076C5DE2A387CBC00E5E33F /* MeTraineeListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeTraineeListViewController.swift; sourceTree = "<group>"; };
 		90CE52152A36C0700033BD06 /* JiaPeiManage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JiaPeiManage.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		90CE52182A36C0710033BD06 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		90CE521C2A36C0710033BD06 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -171,7 +173,7 @@
 		90CE529A2A36E5990033BD06 /* Array+SectionModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Array+SectionModel.swift"; sourceTree = "<group>"; };
 		90CE529B2A36E5990033BD06 /* UIView+CornerRadius.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+CornerRadius.swift"; sourceTree = "<group>"; };
 		90CE529C2A36E5990033BD06 /* UIScrollView+ScrollToBottom.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIScrollView+ScrollToBottom.swift"; sourceTree = "<group>"; };
-		90CE529D2A36E5990033BD06 /* UIColor+Bilibili.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Bilibili.swift"; sourceTree = "<group>"; };
+		90CE529D2A36E5990033BD06 /* UIColor+NY.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+NY.swift"; sourceTree = "<group>"; };
 		90CE529E2A36E5990033BD06 /* NSAttributedString+BoundingRect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+BoundingRect.swift"; sourceTree = "<group>"; };
 		90CE529F2A36E5990033BD06 /* VTContentView+Gesture.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "VTContentView+Gesture.swift"; sourceTree = "<group>"; };
 		90CE52B32A36E5A40033BD06 /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
@@ -255,6 +257,7 @@
 		9076C5D72A386B0300E5E33F /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
+				9076C5DE2A387CBC00E5E33F /* MeTraineeListViewController.swift */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -548,7 +551,7 @@
 				90CE529A2A36E5990033BD06 /* Array+SectionModel.swift */,
 				90CE529B2A36E5990033BD06 /* UIView+CornerRadius.swift */,
 				90CE529C2A36E5990033BD06 /* UIScrollView+ScrollToBottom.swift */,
-				90CE529D2A36E5990033BD06 /* UIColor+Bilibili.swift */,
+				90CE529D2A36E5990033BD06 /* UIColor+NY.swift */,
 				90CE529E2A36E5990033BD06 /* NSAttributedString+BoundingRect.swift */,
 				90CE529F2A36E5990033BD06 /* VTContentView+Gesture.swift */,
 			);
@@ -852,7 +855,7 @@
 				90CE52FA2A36F2570033BD06 /* LoginService.swift in Sources */,
 				90CE52812A36E5460033BD06 /* BilibiliCollectionViewLayout.swift in Sources */,
 				90CE52AE2A36E59A0033BD06 /* UIScrollView+ScrollToBottom.swift in Sources */,
-				90CE52AF2A36E59A0033BD06 /* UIColor+Bilibili.swift in Sources */,
+				90CE52AF2A36E59A0033BD06 /* UIColor+NY.swift in Sources */,
 				90CE52B12A36E59A0033BD06 /* VTContentView+Gesture.swift in Sources */,
 				90CE52722A36E5460033BD06 /* LWPlayer.swift in Sources */,
 				90CE521D2A36C0710033BD06 /* ViewController.swift in Sources */,
@@ -883,6 +886,7 @@
 				90CE52792A36E5460033BD06 /* LWPlayerUtils.swift in Sources */,
 				90CE527B2A36E5460033BD06 /* LWPlayerEnum.swift in Sources */,
 				90CE52D92A36E6000033BD06 /* LocalManager.swift in Sources */,
+				9076C5DF2A387CBC00E5E33F /* MeTraineeListViewController.swift in Sources */,
 				90CE52822A36E5460033BD06 /* GesConflictCollectionView.swift in Sources */,
 				90CE523A2A36E4720033BD06 /* MainTabBarViewReactor.swift in Sources */,
 				90CE52BD2A36E5B70033BD06 /* NetEnvironment.swift in Sources */,

JiaPeiManage/Assets.xcassets/Modules/Common/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

JiaPeiManage/Assets.xcassets/Modules/Common/back-white.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "back-white.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "back-white@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "back-white@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

JiaPeiManage/Assets.xcassets/Modules/Common/right-white.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "right-white.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "right-white@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "right-white@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

JiaPeiManage/Assets.xcassets/Modules/Mine/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

JiaPeiManage/Assets.xcassets/Modules/Mine/mine_bg.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "mine_bg.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_bg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

JiaPeiManage/Assets.xcassets/Modules/Mine/user-icon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "user-icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "user-icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "user-icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

JiaPeiManage/Assets.xcassets/Modules/Mine/user_header_bg.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "user_header_bg.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "user_header_bg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "user_header_bg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

JiaPeiManage/Assets.xcassets/Modules/Mine/女.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "女.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "女@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "女@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

JiaPeiManage/Assets.xcassets/Modules/Mine/男.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "男.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "男@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "男@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

JiaPeiManage/Sources/Custom/View/ImageViewAnimation/NetAnimationView.swift

@@ -50,7 +50,7 @@ final class NetAnimationView: UIView {
         if type == .loading {
            textLabel.text = "正在努力加载数据中..."
            imageView.image = UIImage(named: "animation_loading_loading_1")
-           imageView.animationImages = [UIImage(named: "animation_loading_loading_1")!,UIImage(named: "animation_loading_loading_2")!]
+//           imageView.animationImages = [UIImage(named: "animation_loading_loading_1")!,UIImage(named: "animation_loading_loading_2")!]
            imageView.animationDuration = 0.5
            imageView.animationRepeatCount = 0
         }

JiaPeiManage/Sources/Extensions/UIColor+Bilibili.swift → JiaPeiManage/Sources/Extensions/UIColor+NY.swift

@@ -20,6 +20,8 @@ extension UIColor {
     class var db_orange: UIColor { return UIColor(231,157,105) }
     
     //新增
+    class var db_theme: UIColor { return UIColor("#06203A")! }
+    class var db_place: UIColor { return UIColor("#657380")! }
     class var db_fontGray: UIColor { return UIColor(92, 96, 102) }
     class var db_fontBlack: UIColor { return UIColor(10, 26, 51) }
     class var db_sliderColor: UIColor { return UIColor(73, 142, 245) }

JiaPeiManage/Sources/Main/Base/BaseTableViewController.swift

@@ -15,7 +15,7 @@ class BaseTableViewController: BaseViewController,Refreshable {
     var isEmptyDisplay: Bool = true
     
     let tableView: UITableView = UITableView().then{
-        $0.backgroundColor = .db_gray
+        $0.backgroundColor = .db_theme
         $0.showsVerticalScrollIndicator = false
         $0.tableFooterView = UIView()
     }

JiaPeiManage/Sources/Main/Base/BaseViewController.swift

@@ -19,6 +19,9 @@ class BaseViewController: UIViewController, NetAnimationLoadable {
         return type(of: self).description().components(separatedBy: ".").last ?? ""
     }()
     
+    @IBAction func actionBackdo(_ sender: Any) {
+        self.navigationController?.popViewController(animated: true)
+    }
     /// There is a bug when trying to go back to previous view controller in a navigation controller
     /// on iOS 11, a scroll view in the previous screen scrolls weirdly. In order to get this fixed,
     /// we have to set the scrollView's `contentInsetAdjustmentBehavior` property to `.never` on
@@ -102,4 +105,5 @@ class BaseViewController: UIViewController, NetAnimationLoadable {
         // Override point
     }
     
+
 }

JiaPeiManage/Sources/Modulars/Home/Controllers/HomeViewController.swift

@@ -29,10 +29,10 @@ final class HomeViewController: BaseViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-//        //判断用户登录
-//        if !LocalManager.userInfo.isLogin {
-//            NYSwRouter.open(NYSwOpenType.login.rawValue)
-//        }
+        //判断用户登录
+        if !LocalManager.userInfo.isLogin {
+            NYSwRouter.open(NYSwOpenType.login.rawValue)
+        }
         //UI
         setupUI()
         //biand绑定
@@ -41,7 +41,7 @@ final class HomeViewController: BaseViewController {
     
     // MARK: 私有方法
     func setupUI(){
-        self.view.backgroundColor = UIColor("#06203A")
+        self.view.backgroundColor = .db_theme
         self.meStu_button.imagePosition = .right
         self.meStu_button.spacingBetweenImageAndTitle = 5
         self.meMine_button.imagePosition = .right
@@ -51,8 +51,8 @@ final class HomeViewController: BaseViewController {
     func biandView(){
         //我的学员-action-btn
         self.meStuAction_button.rx.tap.subscribe ({ [unowned self] (_)  in
-           
             
+            NYSwRouter.push(NYSwPushType.trainee_list.path)
         }).disposed(by: disposeBag)
         //在校学员-action
         self.onSchoolAction_button.rx.tap.subscribe ({ [unowned self] (_)  in
@@ -71,10 +71,8 @@ final class HomeViewController: BaseViewController {
         }).disposed(by: disposeBag)
         //个人中心-action
         self.mineAction_button.rx.tap.subscribe ({ [unowned self] (_)  in
-           
-            let mineViewController = MineViewController(nibName: "MineViewController")
-            self.navigationController?.pushViewController(mineViewController, animated: true)
             
+            NYSwRouter.push(NYSwPushType.mine_center.path)
         }).disposed(by: disposeBag)
         
     }

JiaPeiManage/Sources/Modulars/Login/Controllers/LoginViewController.swift

@@ -29,9 +29,8 @@ final class LoginViewController: BaseViewController {
     @IBOutlet weak var location_button: QMUIButton!
     //区域
     @IBOutlet weak var userlocation_textField: QMUITextField!
-        
+    //登录按钮
     @IBOutlet weak var login_button: UIButton!
-    
     //已同意
     @IBOutlet weak var agree_button: QMUIButton!
     //用户协议
@@ -39,15 +38,24 @@ final class LoginViewController: BaseViewController {
     //隐私政策
     @IBOutlet weak var userprivacy_button: UIButton!
     
+    let city = "3501"
+    
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        self.view.backgroundColor = UIColor("#06203A")
-        NSLog("LoginViewController")
+        setupUI()
         //biand绑定
         biandView()
     }
     // MARK: 私有方法
+    func setupUI(){
+        self.view.backgroundColor = .db_theme
+        self.username_textField.text = "350102199001182416"
+        self.userpassword_textField.text = "123456"
+        self.username_textField.placeholderColor = .db_place
+        self.userpassword_textField.placeholderColor = .db_place
+        self.userlocation_textField.placeholderColor = .db_place
+    }
     func biandView(){
         //判断账号的输入是否可用
         let accountValid = username_textField.rx.text.orEmpty.map{ value in
@@ -143,7 +151,7 @@ final class LoginViewController: BaseViewController {
                         LocalManager.userInfo.password = password
                         self.login_button.isEnabled = true
                         //登录api RX 订阅 观察 销毁 三部曲
-                        self.loginService.loginRequest(user_name: account, user_password: password,city: "3501")
+                        self.loginService.loginRequest(user_name: account, user_password: password,city: city)
                             .subscribe(onSuccess: { userinfo in
                                 print("登录成功：%@", userinfo)
                                 self.navigationController?.popViewController(animated: true)

JiaPeiManage/Sources/Modulars/Login/Controllers/LoginViewController.xib

@@ -96,7 +96,7 @@
                                     </constraints>
                                 </imageView>
                                 <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FhP-eV-VnP" customClass="QMUITextField">
-                                    <rect key="frame" x="57" y="0.0" width="180" height="45"/>
+                                    <rect key="frame" x="61" y="0.0" width="176" height="45"/>
                                     <color key="textColor" red="0.83137254900000002" green="0.86666666670000003" blue="0.90196078430000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
@@ -122,7 +122,7 @@
                                 <constraint firstItem="FhP-eV-VnP" firstAttribute="top" secondItem="U4y-em-jeM" secondAttribute="top" id="I6H-II-ORh"/>
                                 <constraint firstItem="mTC-xX-7eg" firstAttribute="leading" secondItem="U4y-em-jeM" secondAttribute="leading" constant="25" id="Lti-1O-KgQ"/>
                                 <constraint firstAttribute="height" constant="45" id="N6j-Ni-44c"/>
-                                <constraint firstItem="FhP-eV-VnP" firstAttribute="leading" secondItem="mTC-xX-7eg" secondAttribute="trailing" constant="10" id="zHY-lt-3dd"/>
+                                <constraint firstItem="FhP-eV-VnP" firstAttribute="leading" secondItem="mTC-xX-7eg" secondAttribute="trailing" constant="14" id="zHY-lt-3dd"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -140,9 +140,12 @@
                                         <constraint firstAttribute="height" constant="26" id="wa4-zS-Ziu"/>
                                     </constraints>
                                 </imageView>
-                                <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请选择地区" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Srz-3V-PhW" customClass="QMUITextField">
-                                    <rect key="frame" x="64" y="5" width="137" height="34"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请选择地区" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Srz-3V-PhW" customClass="QMUITextField">
+                                    <rect key="frame" x="64" y="5.6666666666666856" width="137" height="34"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="34" id="Vlv-ZD-I9w"/>
+                                        <constraint firstAttribute="width" constant="137" id="Zhh-IX-iQl"/>
+                                    </constraints>
                                     <color key="textColor" red="0.83137254900000002" green="0.86666666670000003" blue="0.90196078430000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
@@ -160,11 +163,13 @@
                             </subviews>
                             <color key="backgroundColor" red="0.14901960780000001" green="0.28235294119999998" blue="0.41960784309999999" alpha="1" colorSpace="calibratedRGB"/>
                             <constraints>
+                                <constraint firstItem="Srz-3V-PhW" firstAttribute="leading" secondItem="AVr-H3-2zM" secondAttribute="trailing" constant="18" id="AUn-S9-0Cq"/>
                                 <constraint firstAttribute="trailing" secondItem="rMA-Qb-CEp" secondAttribute="trailing" constant="29" id="CMD-VI-Qbt"/>
                                 <constraint firstAttribute="height" constant="45" id="Jqv-Vx-K4D"/>
                                 <constraint firstItem="rMA-Qb-CEp" firstAttribute="centerY" secondItem="V1H-73-kgk" secondAttribute="centerY" id="QCi-Nw-Vxi"/>
                                 <constraint firstItem="AVr-H3-2zM" firstAttribute="leading" secondItem="V1H-73-kgk" secondAttribute="leading" constant="25" id="UXc-mw-nRd"/>
                                 <constraint firstItem="AVr-H3-2zM" firstAttribute="centerY" secondItem="V1H-73-kgk" secondAttribute="centerY" id="sed-vG-4R8"/>
+                                <constraint firstItem="Srz-3V-PhW" firstAttribute="centerY" secondItem="V1H-73-kgk" secondAttribute="centerY" id="yL5-Fs-7Ue"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">

JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.swift

@@ -20,7 +20,8 @@ final class MineViewController: BaseViewController {
     
     // MARK: 私有方法
     func setupUI(){
-        self.view.backgroundColor = UIColor("#06203A")
+        self.view.backgroundColor = .db_theme
     }
     
+    
 }

JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.xib

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
@@ -16,14 +16,318 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_bg" translatesAutoresizingMaskIntoConstraints="NO" id="nI3-n6-ofZ">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="340"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="340" id="yJU-yb-CQG"/>
+                    </constraints>
+                </imageView>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FUS-Xv-0I3" userLabel="View-nav">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人中心" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dwG-Fr-agR">
+                            <rect key="frame" x="137.66666666666666" y="20" width="100" height="44"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="100" id="1OA-Zd-GHp"/>
+                                <constraint firstAttribute="height" constant="44" id="RYt-3z-0u1"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
+                            <color key="textColor" red="0.83137254900000002" green="0.86666666670000003" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="led-Yv-YFn">
+                            <rect key="frame" x="0.0" y="20" width="44" height="44"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="44" id="9gi-Wz-fHt"/>
+                                <constraint firstAttribute="height" constant="44" id="LdC-UX-7gy"/>
+                            </constraints>
+                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                            <state key="normal" image="back-white"/>
+                            <connections>
+                                <action selector="actionBackdo:" destination="-1" eventType="touchUpInside" id="PaG-Va-iaO"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="led-Yv-YFn" firstAttribute="leading" secondItem="FUS-Xv-0I3" secondAttribute="leading" id="B8J-bH-8kI"/>
+                        <constraint firstAttribute="bottom" secondItem="dwG-Fr-agR" secondAttribute="bottom" id="cNX-K0-RWb"/>
+                        <constraint firstItem="dwG-Fr-agR" firstAttribute="centerX" secondItem="FUS-Xv-0I3" secondAttribute="centerX" id="puU-7M-0zn"/>
+                        <constraint firstAttribute="height" constant="64" id="qY8-mt-rgL"/>
+                        <constraint firstAttribute="bottom" secondItem="led-Yv-YFn" secondAttribute="bottom" id="rR3-gf-WZR"/>
+                    </constraints>
+                </view>
+                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gEZ-lU-V9e">
+                    <rect key="frame" x="0.0" y="64" width="375" height="714"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qwc-OV-SUa" userLabel="View-content">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="450"/>
+                            <subviews>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r8b-Dg-5b7" userLabel="View-header">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="204"/>
+                                    <subviews>
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_header_bg" translatesAutoresizingMaskIntoConstraints="NO" id="yvy-Cs-c2n">
+                                            <rect key="frame" x="0.0" y="67" width="375" height="137"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="137" id="e3Q-xQ-r8S"/>
+                                            </constraints>
+                                        </imageView>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BM3-xf-AcJ" customClass="QMUIButton">
+                                            <rect key="frame" x="276" y="35" width="115" height="32"/>
+                                            <color key="backgroundColor" red="0.20784313725490194" green="0.74901960784313726" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="115" id="Dbr-wz-Ovq"/>
+                                                <constraint firstAttribute="height" constant="32" id="Mtc-0T-Bla"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <inset key="contentEdgeInsets" minX="-25" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                            <state key="normal" title="修改密码"/>
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                    <real key="value" value="16"/>
+                                                </userDefinedRuntimeAttribute>
+                                            </userDefinedRuntimeAttributes>
+                                        </button>
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="right-white" translatesAutoresizingMaskIntoConstraints="NO" id="SJe-10-4Xc">
+                                            <rect key="frame" x="355" y="45" width="6" height="12"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="12" id="Pf8-7y-nkz"/>
+                                                <constraint firstAttribute="width" constant="6" id="QMi-hC-0wA"/>
+                                            </constraints>
+                                        </imageView>
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user-icon" translatesAutoresizingMaskIntoConstraints="NO" id="3wG-uo-AO3">
+                                            <rect key="frame" x="154.66666666666666" y="76" width="66" height="66"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="66" id="HME-Kn-uNq"/>
+                                                <constraint firstAttribute="height" constant="66" id="NaP-bL-6uw"/>
+                                            </constraints>
+                                        </imageView>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="庄后旺" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="km9-Iu-GaJ">
+                                            <rect key="frame" x="158" y="157" width="59" height="23"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="59" id="D5i-ev-ozU"/>
+                                                <constraint firstAttribute="height" constant="23" id="u13-dA-8zY"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="19"/>
+                                            <color key="textColor" red="0.83137254901960778" green="0.8666666666666667" blue="0.90196078431372551" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="女" translatesAutoresizingMaskIntoConstraints="NO" id="9Kk-gv-HeL">
+                                            <rect key="frame" x="232" y="159.66666666666666" width="18" height="18"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="18" id="4sz-fU-Ywv"/>
+                                                <constraint firstAttribute="width" constant="18" id="i8B-OP-0fS"/>
+                                            </constraints>
+                                        </imageView>
+                                    </subviews>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <constraints>
+                                        <constraint firstAttribute="trailing" secondItem="BM3-xf-AcJ" secondAttribute="trailing" constant="-16" id="1DI-3k-AlJ"/>
+                                        <constraint firstItem="9Kk-gv-HeL" firstAttribute="centerY" secondItem="km9-Iu-GaJ" secondAttribute="centerY" id="5Tf-qT-fbo"/>
+                                        <constraint firstItem="yvy-Cs-c2n" firstAttribute="top" secondItem="BM3-xf-AcJ" secondAttribute="bottom" id="Aaj-cC-yX1"/>
+                                        <constraint firstAttribute="height" constant="204" id="Ehx-NT-r98"/>
+                                        <constraint firstItem="km9-Iu-GaJ" firstAttribute="centerX" secondItem="r8b-Dg-5b7" secondAttribute="centerX" id="Jrg-Ue-459"/>
+                                        <constraint firstItem="3wG-uo-AO3" firstAttribute="top" secondItem="r8b-Dg-5b7" secondAttribute="top" constant="76" id="OES-He-aCg"/>
+                                        <constraint firstAttribute="bottom" secondItem="yvy-Cs-c2n" secondAttribute="bottom" id="SUv-8P-GNE"/>
+                                        <constraint firstItem="SJe-10-4Xc" firstAttribute="trailing" secondItem="BM3-xf-AcJ" secondAttribute="trailing" constant="-30" id="U4c-uA-sHd"/>
+                                        <constraint firstItem="3wG-uo-AO3" firstAttribute="centerX" secondItem="r8b-Dg-5b7" secondAttribute="centerX" id="VZN-Pc-o04"/>
+                                        <constraint firstItem="SJe-10-4Xc" firstAttribute="centerY" secondItem="BM3-xf-AcJ" secondAttribute="centerY" id="eht-5b-5n2"/>
+                                        <constraint firstItem="km9-Iu-GaJ" firstAttribute="top" secondItem="3wG-uo-AO3" secondAttribute="bottom" constant="15" id="hmj-Pp-NL1"/>
+                                        <constraint firstAttribute="trailing" secondItem="yvy-Cs-c2n" secondAttribute="trailing" id="rtq-ee-ox9"/>
+                                        <constraint firstItem="yvy-Cs-c2n" firstAttribute="leading" secondItem="r8b-Dg-5b7" secondAttribute="leading" id="tPb-7C-JnJ"/>
+                                        <constraint firstItem="9Kk-gv-HeL" firstAttribute="leading" secondItem="km9-Iu-GaJ" secondAttribute="trailing" constant="15" id="ynS-Mp-H9Y"/>
+                                    </constraints>
+                                </view>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xO6-Xp-G2S" userLabel="View-cell">
+                                    <rect key="frame" x="0.0" y="199" width="375" height="40"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u7m-e4-IJ3">
+                                            <rect key="frame" x="15" y="10" width="60" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="60" id="bK2-p8-IvA"/>
+                                                <constraint firstAttribute="height" constant="20" id="xYp-GF-XKd"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.83137254901960778" green="0.8666666666666667" blue="0.90196078431372551" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="15280020292" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rgf-bc-AwE">
+                                            <rect key="frame" x="240" y="10" width="120" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="20" id="OlI-NI-g8a"/>
+                                                <constraint firstAttribute="width" constant="120" id="swB-76-gfV"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.83137254901960778" green="0.8666666666666667" blue="0.90196078431372551" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <color key="backgroundColor" red="0.066666666666666666" green="0.20000000000000001" blue="0.3411764705882353" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="40" id="A1J-BV-44f"/>
+                                        <constraint firstItem="Rgf-bc-AwE" firstAttribute="centerY" secondItem="xO6-Xp-G2S" secondAttribute="centerY" id="Wjw-Cv-l79"/>
+                                        <constraint firstItem="u7m-e4-IJ3" firstAttribute="centerY" secondItem="xO6-Xp-G2S" secondAttribute="centerY" id="aVr-j4-TZs"/>
+                                        <constraint firstItem="u7m-e4-IJ3" firstAttribute="leading" secondItem="xO6-Xp-G2S" secondAttribute="leading" constant="15" id="i8J-ed-TpN"/>
+                                        <constraint firstAttribute="trailing" secondItem="Rgf-bc-AwE" secondAttribute="trailing" constant="15" id="tD6-0a-KF8"/>
+                                    </constraints>
+                                </view>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pSR-n7-hdU" userLabel="View-cell">
+                                    <rect key="frame" x="0.0" y="239" width="375" height="40"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="35012219930903441" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3jH-Zi-tbR">
+                                            <rect key="frame" x="210" y="10" width="150" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="20" id="jBM-da-eME"/>
+                                                <constraint firstAttribute="width" constant="150" id="sQe-pt-hrD"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.83137254900000002" green="0.86666666670000003" blue="0.90196078430000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="身份证号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AT0-fR-gSq">
+                                            <rect key="frame" x="15" y="10" width="80" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="20" id="FDZ-HJ-iXp"/>
+                                                <constraint firstAttribute="width" constant="80" id="QcM-uk-7to"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.83137254900000002" green="0.86666666670000003" blue="0.90196078430000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <color key="backgroundColor" red="0.043137254901960784" green="0.16862745098039217" blue="0.30196078431372547" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstItem="AT0-fR-gSq" firstAttribute="centerY" secondItem="pSR-n7-hdU" secondAttribute="centerY" id="Dbl-Ct-RwA"/>
+                                        <constraint firstItem="AT0-fR-gSq" firstAttribute="leading" secondItem="pSR-n7-hdU" secondAttribute="leading" constant="15" id="Qsg-Jq-xsY"/>
+                                        <constraint firstAttribute="trailing" secondItem="3jH-Zi-tbR" secondAttribute="trailing" constant="15" id="S1X-ZT-Sfi"/>
+                                        <constraint firstAttribute="height" constant="40" id="aSP-87-pR6"/>
+                                        <constraint firstItem="3jH-Zi-tbR" firstAttribute="centerY" secondItem="pSR-n7-hdU" secondAttribute="centerY" id="bSf-w0-GRI"/>
+                                    </constraints>
+                                </view>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XYn-ij-vdD" userLabel="View-cell">
+                                    <rect key="frame" x="0.0" y="279" width="375" height="40"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="福清市吓弟机动车驾驶培训有限公司" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h6R-dN-eLm">
+                                            <rect key="frame" x="131" y="10" width="229" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="229" id="NmG-Yk-pNX"/>
+                                                <constraint firstAttribute="height" constant="20" id="YGp-AW-lfY"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.83137254900000002" green="0.86666666670000003" blue="0.90196078430000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="驾校名称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="azq-gy-wGs">
+                                            <rect key="frame" x="15" y="10" width="70" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="70" id="UEk-tS-TUb"/>
+                                                <constraint firstAttribute="height" constant="20" id="wGs-Yj-62K"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.83137254900000002" green="0.86666666670000003" blue="0.90196078430000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <color key="backgroundColor" red="0.066666666669999999" green="0.20000000000000001" blue="0.3411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstItem="h6R-dN-eLm" firstAttribute="centerY" secondItem="XYn-ij-vdD" secondAttribute="centerY" id="2No-c5-JNt"/>
+                                        <constraint firstItem="azq-gy-wGs" firstAttribute="centerY" secondItem="XYn-ij-vdD" secondAttribute="centerY" id="NXM-SB-2YE"/>
+                                        <constraint firstAttribute="height" constant="40" id="VB1-aZ-bIa"/>
+                                        <constraint firstItem="azq-gy-wGs" firstAttribute="leading" secondItem="XYn-ij-vdD" secondAttribute="leading" constant="15" id="ttN-Fj-y4a"/>
+                                        <constraint firstAttribute="trailing" secondItem="h6R-dN-eLm" secondAttribute="trailing" constant="15" id="ttz-0E-nEm"/>
+                                    </constraints>
+                                </view>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vUj-bc-Qkc" userLabel="View-cell">
+                                    <rect key="frame" x="0.0" y="319" width="375" height="40"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="福建省连江县长龙镇丘祠村邱储77号1单元" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fJC-Qf-3Nv">
+                                            <rect key="frame" x="94" y="10" width="266" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="266" id="vFh-Rq-OQI"/>
+                                                <constraint firstAttribute="height" constant="20" id="xgp-uz-MCG"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.83137254900000002" green="0.86666666670000003" blue="0.90196078430000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系地址" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BNF-9j-eLW">
+                                            <rect key="frame" x="15" y="10" width="70" height="20"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="70" id="N5v-g8-kao"/>
+                                                <constraint firstAttribute="height" constant="20" id="Rxe-Xz-lr2"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                            <color key="textColor" red="0.83137254900000002" green="0.86666666670000003" blue="0.90196078430000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <color key="backgroundColor" red="0.043137254901960784" green="0.16862745098039217" blue="0.30196078431372547" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <constraints>
+                                        <constraint firstItem="BNF-9j-eLW" firstAttribute="leading" secondItem="vUj-bc-Qkc" secondAttribute="leading" constant="15" id="4OE-nd-e5n"/>
+                                        <constraint firstItem="BNF-9j-eLW" firstAttribute="top" secondItem="vUj-bc-Qkc" secondAttribute="top" constant="10" id="6JO-em-vb2"/>
+                                        <constraint firstAttribute="height" constant="40" id="aQg-hC-jua"/>
+                                        <constraint firstItem="fJC-Qf-3Nv" firstAttribute="top" secondItem="vUj-bc-Qkc" secondAttribute="top" constant="10" id="fHE-fJ-IdK"/>
+                                        <constraint firstAttribute="trailing" secondItem="fJC-Qf-3Nv" secondAttribute="trailing" constant="15" id="k6R-Se-Qw2"/>
+                                    </constraints>
+                                </view>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstItem="r8b-Dg-5b7" firstAttribute="leading" secondItem="qwc-OV-SUa" secondAttribute="leading" id="8rb-T1-PkG"/>
+                                <constraint firstAttribute="trailing" secondItem="vUj-bc-Qkc" secondAttribute="trailing" id="9Ci-5K-9qf"/>
+                                <constraint firstItem="vUj-bc-Qkc" firstAttribute="top" secondItem="XYn-ij-vdD" secondAttribute="bottom" id="ISW-lz-c6f"/>
+                                <constraint firstItem="vUj-bc-Qkc" firstAttribute="leading" secondItem="qwc-OV-SUa" secondAttribute="leading" id="NgT-5i-brs"/>
+                                <constraint firstItem="pSR-n7-hdU" firstAttribute="top" secondItem="xO6-Xp-G2S" secondAttribute="bottom" id="Nwu-r9-YyB"/>
+                                <constraint firstAttribute="trailing" secondItem="XYn-ij-vdD" secondAttribute="trailing" id="QZw-lc-twQ"/>
+                                <constraint firstAttribute="trailing" secondItem="xO6-Xp-G2S" secondAttribute="trailing" id="RxM-Jw-XGd"/>
+                                <constraint firstItem="r8b-Dg-5b7" firstAttribute="top" secondItem="qwc-OV-SUa" secondAttribute="top" id="Skm-NX-egX"/>
+                                <constraint firstAttribute="trailing" secondItem="r8b-Dg-5b7" secondAttribute="trailing" id="V2V-cj-fZ4"/>
+                                <constraint firstItem="pSR-n7-hdU" firstAttribute="leading" secondItem="qwc-OV-SUa" secondAttribute="leading" id="Y22-eb-Jrx"/>
+                                <constraint firstAttribute="height" constant="450" id="a2p-nD-RN8"/>
+                                <constraint firstAttribute="trailing" secondItem="pSR-n7-hdU" secondAttribute="trailing" id="eFH-0v-Ar8"/>
+                                <constraint firstItem="XYn-ij-vdD" firstAttribute="top" secondItem="pSR-n7-hdU" secondAttribute="bottom" id="kQT-cU-z3z"/>
+                                <constraint firstItem="xO6-Xp-G2S" firstAttribute="top" secondItem="r8b-Dg-5b7" secondAttribute="bottom" constant="-5" id="zWp-aw-iYB"/>
+                                <constraint firstItem="XYn-ij-vdD" firstAttribute="leading" secondItem="qwc-OV-SUa" secondAttribute="leading" id="zle-9z-qX0"/>
+                                <constraint firstItem="xO6-Xp-G2S" firstAttribute="leading" secondItem="qwc-OV-SUa" secondAttribute="leading" id="zwc-OD-lDY"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="qwc-OV-SUa" secondAttribute="trailing" id="PSJ-Bj-A3a"/>
+                        <constraint firstItem="qwc-OV-SUa" firstAttribute="top" secondItem="gEZ-lU-V9e" secondAttribute="top" id="fES-HA-8fb"/>
+                        <constraint firstItem="qwc-OV-SUa" firstAttribute="centerX" secondItem="gEZ-lU-V9e" secondAttribute="centerX" id="fmr-Uj-vFp"/>
+                        <constraint firstItem="qwc-OV-SUa" firstAttribute="leading" secondItem="gEZ-lU-V9e" secondAttribute="leading" id="lz4-BB-cKG"/>
+                        <constraint firstAttribute="bottom" secondItem="qwc-OV-SUa" secondAttribute="bottom" id="mF8-n2-Dbw"/>
+                    </constraints>
+                </scrollView>
+            </subviews>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-            <point key="canvasLocation" x="53" y="-11"/>
+            <constraints>
+                <constraint firstItem="nI3-n6-ofZ" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="3Jl-BO-RIN"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="gEZ-lU-V9e" secondAttribute="bottom" id="BMK-nB-NAN"/>
+                <constraint firstItem="gEZ-lU-V9e" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="DD9-OK-RfB"/>
+                <constraint firstItem="nI3-n6-ofZ" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="E3I-Wt-WSt"/>
+                <constraint firstItem="FUS-Xv-0I3" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="HeI-C2-VoF"/>
+                <constraint firstItem="FUS-Xv-0I3" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="P4U-4w-cMK"/>
+                <constraint firstItem="FUS-Xv-0I3" firstAttribute="trailing" secondItem="vUN-kp-3ea" secondAttribute="trailing" id="ZX4-mg-ezU"/>
+                <constraint firstItem="gEZ-lU-V9e" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="mT4-cD-lq0"/>
+                <constraint firstItem="nI3-n6-ofZ" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="nZH-Ba-vny"/>
+                <constraint firstItem="gEZ-lU-V9e" firstAttribute="top" secondItem="FUS-Xv-0I3" secondAttribute="bottom" id="pjv-dn-qMG"/>
+            </constraints>
+            <point key="canvasLocation" x="52" y="-11.083743842364532"/>
         </view>
     </objects>
     <resources>
+        <image name="back-white" width="9.3333330154418945" height="17"/>
+        <image name="mine_bg" width="375" height="340"/>
+        <image name="right-white" width="7.6666665077209473" height="14"/>
+        <image name="user-icon" width="66" height="66"/>
+        <image name="user_header_bg" width="375" height="137"/>
+        <image name="女" width="18" height="18"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeListViewController.swift

@@ -0,0 +1,26 @@
+//
+//  MeTraineeListViewController.swift
+//  JiaPeiManage
+//
+//  Created by Ning.ge on 2023/6/13.
+//
+
+import UIKit
+import RxSwift
+import RxCocoa
+
+
+final class MeTraineeListViewController: BaseViewController {
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+    }
+    
+    // MARK: 私有方法
+    func setupUI(){
+        self.view.backgroundColor = UIColor("#06203A")
+    }
+    
+}

JiaPeiManage/Sources/Networking/Plugins/LoadingPlugin.swift

@@ -12,23 +12,25 @@ import Moya
 class LoadingPlugin : PluginType {
     
     func willSend(_ request: RequestType, target: TargetType) {
-//        if target is HomeAPI {
-//            let api = target as! HomeAPI
-//            if api.isShowLoading {
-//                guard let curController = UIViewController.topMost else { return }
+        if target is LoginAPI {
+            let api = target as! LoginAPI
+            if api.isShowLoading {
+                guard let curController = UIViewController.topMost else { return }
 //                curController.showLoadingAnimation(superView: curController.view)
-//            }
-//        }
+                QMUITips.showLoading(in: curController.view)
+            }
+        }
     }
     
     func didReceive(_ result: Result<Response, MoyaError>, target: TargetType) {
-//        if target is HomeAPI {
-//            let api = target as! HomeAPI
-//            if api.isShowLoading {
-//                guard let curController = UIViewController.topMost else { return }
+        if target is LoginAPI {
+            let api = target as! LoginAPI
+            if api.isShowLoading {
+                guard let curController = UIViewController.topMost else { return }
 //                curController.hideLoadingAnimation(superView: curController.view)
-//            }
-//        }
+                QMUITips.hideAllTips()
+            }
+        }
     }
 
 }

JiaPeiManage/Sources/Services/LoginAPI.swift

@@ -20,6 +20,7 @@ enum LoginAPI {
 
 extension LoginAPI: TargetType {
     
+    var isShowLoading:Bool { return true }
     var baseURL: URL {
         switch self {
         case .loginUser,.updateUser,.dictUser:

JiaPeiManage/Sources/Utils/NYSwRouter.swift

@@ -14,8 +14,8 @@ enum NYSwPushType {
     case recommend_rank
     case recommend_player
     case live_room
-    case live_all
-    case drama_recommend
+    case trainee_list
+    case mine_center
 }
 
 
@@ -34,12 +34,12 @@ extension NYSwPushType {
             return "JiaPeiManage://recommend/rank"
         case .recommend_player:
             return "JiaPeiManage://recommend/player"
-        case .live_all:
-            return "JiaPeiManage://live/recommend"
+        case .trainee_list:
+            return "JiaPeiManage://me/trainee/list"
         case .live_room:
             return "JiaPeiManage://live/room"
-        case .drama_recommend:
-            return "JiaPeiManage://drama/recommend"
+        case .mine_center:
+            return "JiaPeiManage://mine/center"
 
         }
     }

JiaPeiManage/Sources/Utils/URLNavigationMap.swift

@@ -33,11 +33,10 @@ final class URLNavigationMap {
             return roomViewController
         }
         
-        navigator.register(NYSwPushType.live_all.path) { (url, values, context) -> UIViewController? in
-            let rcmdParentVc = UIViewController()
-            
+        navigator.register(NYSwPushType.trainee_list.path) { (url, values, context) -> UIViewController? in
             //LiveAllParentViewController(service:HomeService(networking: HomeNetworking()))
-            return rcmdParentVc
+            let meTraineeListViewController = MeTraineeListViewController()
+            return meTraineeListViewController
         }
         
         navigator.register(NYSwPushType.recommend_player.path) { (url, values, context) -> UIViewController? in
@@ -46,16 +45,11 @@ final class URLNavigationMap {
             return testVc
         }
         
-        navigator.register(NYSwPushType.drama_recommend.path) { (url, values, context) -> UIViewController? in
-            
-            guard let context = context as? [String:Bool],
-                  let isRcmd = context["isRcmd"]
-            else { return nil }
+        navigator.register(NYSwPushType.mine_center.path) { (url, values, context) -> UIViewController? in
 
-            let rcmdVc = UIViewController()
-//            DramaRcmdViewController(isRcmd: isRcmd)
+            let mineViewController = MineViewController(nibName: "MineViewController")
             
-            return rcmdVc
+            return mineViewController
         }
         
         navigator.register("http://<path:_>",self.webViewControllerFactory)