Quellcode durchsuchen

修改权限,个人中心页面。 up

openlockPPP vor 1 Jahr
Ursprung
Commit
43b436a88a
24 geänderte Dateien mit 293 neuen und 24 gelöschten Zeilen
  1. 23 0
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_hide_right.imageset/Contents.json
  2. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_hide_right.imageset/收起.png
  3. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_hide_right.imageset/收起@2x.png
  4. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_hide_right.imageset/收起@3x.png
  5. 23 0
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_long.imageset/Contents.json
  6. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_long.imageset/登录密码背景.png
  7. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_long.imageset/登录密码背景@2x.png
  8. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_long.imageset/登录密码背景@3x.png
  9. 23 0
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_short.imageset/Contents.json
  10. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_short.imageset/登录密码背景.png
  11. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_short.imageset/登录密码背景@2x.png
  12. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_short.imageset/登录密码背景@3x.png
  13. 23 0
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_show_left.imageset/Contents.json
  14. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_show_left.imageset/展示.png
  15. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_show_left.imageset/展示@2x.png
  16. BIN
      JiaPeiManage/Assets.xcassets/Modules/Stu/stu_show_left.imageset/展示@3x.png
  17. 2 0
      JiaPeiManage/Sources/Models/TraineeInfoModel.swift
  18. 5 3
      JiaPeiManage/Sources/Models/UserInfoModel.swift
  19. 9 5
      JiaPeiManage/Sources/Modulars/Home/Controllers/HomeViewController.swift
  20. 21 0
      JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.swift
  21. 40 9
      JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.xib
  22. 5 5
      JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeDetails/MeTraineeDetails01Controller.swift
  23. 26 2
      JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeDetailsPageViewController.swift
  24. 93 0
      JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeDetailsPageViewController.xib

+ 23 - 0
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_hide_right.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
+  }
+}

BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_hide_right.imageset/收起.png


BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_hide_right.imageset/收起@2x.png


BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_hide_right.imageset/收起@3x.png


+ 23 - 0
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_long.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
+  }
+}

BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_long.imageset/登录密码背景.png


BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_long.imageset/登录密码背景@2x.png


BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_long.imageset/登录密码背景@3x.png


+ 23 - 0
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_short.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
+  }
+}

BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_short.imageset/登录密码背景.png


BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_short.imageset/登录密码背景@2x.png


BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_pwd_short.imageset/登录密码背景@3x.png


+ 23 - 0
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_show_left.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
+  }
+}

BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_show_left.imageset/展示.png


BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_show_left.imageset/展示@2x.png


BIN
JiaPeiManage/Assets.xcassets/Modules/Stu/stu_show_left.imageset/展示@3x.png


+ 2 - 0
JiaPeiManage/Sources/Models/TraineeInfoModel.swift

@@ -27,6 +27,7 @@ struct TraineeInfoModel : ImmutableMappable{
     var name : String!
     var nationality : String!
     var phone : String!
+    var password : String!
     var photoPath : String!
     var qxbh : String!
     var qxmc : String!
@@ -73,6 +74,7 @@ struct TraineeInfoModel : ImmutableMappable{
         name = try map.value("name") ?? ""
         nationality = try map.value("nationality") ?? ""
         phone = try map.value("phone") ?? ""
+        password = try map.value("password") ?? ""
         photoPath = try map.value("photoPath") ?? ""
         qxbh = try map.value("qxbh") ?? ""
         qxmc = try map.value("qxmc") ?? ""

+ 5 - 3
JiaPeiManage/Sources/Models/UserInfoModel.swift

@@ -188,8 +188,9 @@ struct UserInfo :ImmutableMappable{
     var origo:String  = ""
     var educationLevel:String  = ""
     var isAgree:Int  = 0
-    
-    
+    var classType:Int  = 0
+    var dqbh:String  = ""
+
     var isLogin: Bool {
         set {
            Defaults.isLogin = newValue
@@ -309,7 +310,8 @@ struct UserInfo :ImmutableMappable{
         origo = try map.value("origo") ?? ""
         educationLevel = try map.value("educationLevel") ?? ""
         isAgree = try map.value("isAgree") ?? 0
-        
+        classType = try map.value("classType") ?? 0
+        dqbh = try map.value("dqbh") ?? ""
     }
 }
 

+ 9 - 5
JiaPeiManage/Sources/Modulars/Home/Controllers/HomeViewController.swift

@@ -78,12 +78,16 @@ final class HomeViewController: BaseViewController {
         //统计-action
         self.statisticsAction_button.rx.tap.subscribe ({ [unowned self] (_)  in
             if !LocalManager.isOpenLogin() { return}
-            print("统计-action")
-            if LocalManager.userInfo.cityPower == "1"{
-                NYSwRouter.push(NYSwPushType.trainee_statistics_official.path)
-                return
+            if LocalManager.userInfo.classType == 1 || LocalManager.userInfo.classType == 3{
+                print("统计-action")
+                if LocalManager.userInfo.cityPower == "1"{
+                    NYSwRouter.push(NYSwPushType.trainee_statistics_official.path)
+                    return
+                }
+                NYSwRouter.push(NYSwPushType.trainee_statistics.path)
+            }else {
+                NYTips.showMsg(txt: "您的权限不足,无法查看报名统计")
             }
-            NYSwRouter.push(NYSwPushType.trainee_statistics.path)
         }).disposed(by: disposeBag)
         //个人中心-action
         self.mineAction_button.rx.tap.subscribe ({ [unowned self] (_)  in

+ 21 - 0
JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.swift

@@ -35,6 +35,8 @@ final class MineViewController: BaseViewController {
     @IBOutlet weak var school_address_label: UILabel!
     //退出登录
     @IBOutlet weak var quit_button: UIButton!
+    //教练身份
+    @IBOutlet weak var classType_button: UIButton!
     
     
     override func viewDidLoad() {
@@ -81,6 +83,25 @@ final class MineViewController: BaseViewController {
         self.schoolname_label.text = LocalManager.userInfo.schoolName
         //驾校地址
         self.school_address_label.text = LocalManager.userInfo.address
+        //教练类型
+        var className = "普通教练"
+        switch LocalManager.userInfo.classType {
+        case 0:
+            className = "普通教练"
+            break
+        case 1:
+            className = "教练管理"
+            break
+        case 2:
+            className = "查询人员"
+            break
+        case 3:
+            className = "查询管理"
+            break
+        default:
+            className = "普通教练"
+        }
+        self.classType_button.setTitle(className, for: .normal)
 
     }
     

+ 40 - 9
JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.xib

@@ -11,6 +11,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MineViewController" customModule="JiaPeiManage" customModuleProvider="target">
             <connections>
+                <outlet property="classType_button" destination="yyB-jf-xyI" id="28U-46-loD"/>
                 <outlet property="idcarid_label" destination="3jH-Zi-tbR" id="xIQ-BW-unT"/>
                 <outlet property="nav_top_layout" destination="P4U-4w-cMK" id="6EV-bT-hDK"/>
                 <outlet property="phone_label" destination="Rgf-bc-AwE" id="l0s-Ze-PAc"/>
@@ -95,14 +96,21 @@
                                 <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>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hHJ-eR-539" userLabel="View-bottom">
+                                            <rect key="frame" x="0.0" y="144" width="375" height="60"/>
+                                            <color key="backgroundColor" red="0.043137254901960784" green="0.12156862745098039" blue="0.23529411764705882" alpha="1" colorSpace="calibratedRGB"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="60" id="ULN-tt-Rqz"/>
+                                            </constraints>
+                                        </view>
                                         <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"/>
+                                            <rect key="frame" x="0.0" y="37" 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"/>
+                                            <rect key="frame" x="276" y="5" 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"/>
@@ -118,14 +126,14 @@
                                             </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"/>
+                                            <rect key="frame" x="355" y="15" 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="center" 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"/>
+                                            <rect key="frame" x="154.66666666666666" y="46" width="66" height="66"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="66" id="HME-Kn-uNq"/>
                                                 <constraint firstAttribute="height" constant="66" id="NaP-bL-6uw"/>
@@ -142,8 +150,8 @@
                                                 </userDefinedRuntimeAttribute>
                                             </userDefinedRuntimeAttributes>
                                         </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"/>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="庄后旺" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="km9-Iu-GaJ">
+                                            <rect key="frame" x="158" y="127" 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"/>
@@ -153,22 +161,45 @@
                                             <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"/>
+                                            <rect key="frame" x="232" y="129.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>
+                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yyB-jf-xyI">
+                                            <rect key="frame" x="153.66666666666666" y="158" width="68" height="26"/>
+                                            <color key="backgroundColor" red="0.070588235294117646" green="0.2627450980392157" blue="0.31764705882352939" alpha="1" colorSpace="calibratedRGB"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="26" id="bDJ-yq-5VO"/>
+                                                <constraint firstAttribute="width" constant="68" id="p98-nC-2H9"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                            <state key="normal" title="普通教练">
+                                                <color key="titleColor" red="0.20784313725490194" green="0.74901960784313726" blue="0.36862745098039218" alpha="1" colorSpace="calibratedRGB"/>
+                                            </state>
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                    <real key="value" value="5"/>
+                                                </userDefinedRuntimeAttribute>
+                                            </userDefinedRuntimeAttributes>
+                                        </button>
                                     </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 firstAttribute="bottom" secondItem="hHJ-eR-539" secondAttribute="bottom" id="7Db-cq-iNo"/>
                                         <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="hHJ-eR-539" firstAttribute="leading" secondItem="r8b-Dg-5b7" secondAttribute="leading" id="EsH-tx-CqQ"/>
+                                        <constraint firstItem="yyB-jf-xyI" firstAttribute="top" secondItem="km9-Iu-GaJ" secondAttribute="bottom" constant="8" id="GX3-Wd-0Ob"/>
                                         <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="yyB-jf-xyI" firstAttribute="centerX" secondItem="r8b-Dg-5b7" secondAttribute="centerX" id="LE2-5Y-7uQ"/>
+                                        <constraint firstItem="3wG-uo-AO3" firstAttribute="top" secondItem="r8b-Dg-5b7" secondAttribute="top" constant="46" id="OES-He-aCg"/>
+                                        <constraint firstAttribute="trailing" secondItem="hHJ-eR-539" secondAttribute="trailing" id="P5g-yg-8rN"/>
+                                        <constraint firstAttribute="bottom" secondItem="yvy-Cs-c2n" secondAttribute="bottom" constant="30" 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"/>

+ 5 - 5
JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeDetails/MeTraineeDetails01Controller.swift

@@ -49,7 +49,7 @@ final class MeTraineeDetails01Controller: BaseTableViewController {
         self.traineeInfoModel = info
         groupList["个人信息"] = ["证件类型":"身份证",
                               "证件号码":info.idcard,
-                              "推荐人":info.source,
+                              "推荐人":info.source ?? "",
                               "国籍":info.nationality,
                               "地区":info.dqmc,
                               "县区":info.qxmc,
@@ -58,10 +58,10 @@ final class MeTraineeDetails01Controller: BaseTableViewController {
                               "是否激活":(info.active=="1" ? "是":"否"),
                               "备案时间":info.recordDate,
                               "所属机构":info.schoolName,]
-        let onetime:String = info.trainOneExamStatus=="1" ? "运管已签章"+info.trainOneExamTime.prefix(10):info.trainOneExamTime.prefix(10)+""
-        let twotime:String = info.trainTwoExamStatus=="1" ? "运管已签章"+info.trainTwoExamTime.prefix(10):info.trainTwoExamTime.prefix(10)+""
-        let threetime:String = info.trainThreeExamStatus=="1" ? "运管已签章"+info.trainThreeExamTime.prefix(10):info.trainThreeExamTime.prefix(10)+""
-        let fourtime:String = info.trainFourExamStatus=="1" ? "运管已签章"+info.trainFourExamTime.prefix(10):info.trainFourExamTime.prefix(10)+""
+        let onetime:String = info.trainOneExamStatus=="1" ? "运管已签章"+info.trainOneExamTime.prefix(10):""
+        let twotime:String = info.trainTwoExamStatus=="1" ? "运管已签章"+info.trainTwoExamTime.prefix(10):""
+        let threetime:String = info.trainThreeExamStatus=="1" ? "运管已签章"+info.trainThreeExamTime.prefix(10):""
+        let fourtime:String = info.trainFourExamStatus=="1" ? "运管已签章"+info.trainFourExamTime.prefix(10):""
 
         if (info.trainOneExamStatus=="1"){
             groupColorList["阶段一学时"] = "#35BF5E"

+ 26 - 2
JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeDetailsPageViewController.swift

@@ -35,6 +35,14 @@ final class MeTraineeDetailsPageViewController: BaseViewController {
     @IBOutlet weak var username_label: UILabel!
     //电话
     @IBOutlet weak var userphone_label: UILabel!
+    //学员密码-show
+    @IBOutlet weak var stupwd_showView: UIView!
+    @IBOutlet weak var stupwd_showbutton: UIButton!
+    //学员密码
+    @IBOutlet weak var stupwd_label: UILabel!
+    //学员密码-hide
+    @IBOutlet weak var stupwd_hideView: UIView!
+    @IBOutlet weak var stupwd_hidebutton: UIButton!
     
     let pageController = VTMagicController().then {
         $0.view.translatesAutoresizingMaskIntoConstraints = false
@@ -88,11 +96,25 @@ final class MeTraineeDetailsPageViewController: BaseViewController {
     // MARK: 私有方法
     func setupUI(){
         self.view.backgroundColor = .db_theme
-      
+        if LocalManager.userInfo.classType == 1 || LocalManager.userInfo.classType == 3{
+            self.stupwd_showView.isHidden = true
+            self.stupwd_hideView.isHidden = false
+        }
+        //密码展示
+        self.stupwd_showbutton.rx.tap.subscribe ({ [unowned self] (_)  in
+            self.stupwd_showView.isHidden = true
+            self.stupwd_hideView.isHidden = false
+        }).disposed(by: disposeBag)
+        
+        //密码隐藏
+        self.stupwd_hidebutton.rx.tap.subscribe ({ [unowned self] (_)  in
+            self.stupwd_showView.isHidden = false
+            self.stupwd_hideView.isHidden = true
+        }).disposed(by: disposeBag)
     }
     
     func biandView(){
-        
+        //title
         self.title_label.text = (traineeInfoModel?.name)! + "个人信息"
         //头像
         self.user_icon_imageview.sd_setImage(with: traineeInfoModel?.photoPath?.urlValue, placeholderImage: traineeInfoModel?.sex == "1" ? NYImage.Home.usermale:NYImage.Home.userfemale)
@@ -101,6 +123,8 @@ final class MeTraineeDetailsPageViewController: BaseViewController {
         //电话
         self.userphone_label.text = traineeInfoModel?.phone
         self.sex_imageview.image = traineeInfoModel?.sex == "1" ? NYImage.Home.sexmale:NYImage.Home.sexfemale
+        //密码
+        self.stupwd_label.text = traineeInfoModel?.password
     }
     
     func configureMagicController(){

+ 93 - 0
JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeDetailsPageViewController.xib

@@ -12,6 +12,11 @@
             <connections>
                 <outlet property="header_view" destination="2ye-z8-GF5" id="2gD-Zu-WJu"/>
                 <outlet property="sex_imageview" destination="Zqx-If-LXv" id="GMf-yY-bnK"/>
+                <outlet property="stupwd_hideView" destination="cb5-hL-bGP" id="cDX-vq-iOs"/>
+                <outlet property="stupwd_hidebutton" destination="rKO-7J-CVq" id="Tqk-o1-bOc"/>
+                <outlet property="stupwd_label" destination="hPd-Ya-bDM" id="Qyg-4I-huw"/>
+                <outlet property="stupwd_showView" destination="IVZ-yP-3ZZ" id="q9w-jr-zA9"/>
+                <outlet property="stupwd_showbutton" destination="vGd-Ag-n2p" id="4dX-RN-iqK"/>
                 <outlet property="title_label" destination="Jed-Yi-0Ts" id="UKy-3o-mXI"/>
                 <outlet property="user_icon_imageview" destination="PJS-q0-kId" id="USP-z8-JAx"/>
                 <outlet property="username_label" destination="KSW-mg-lqU" id="Uce-t2-v13"/>
@@ -113,6 +118,86 @@
                             <color key="textColor" red="0.71372549019607845" green="0.75686274509803919" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
+                        <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IVZ-yP-3ZZ" userLabel="View-pwd-show">
+                            <rect key="frame" x="258" y="35" width="117" height="53"/>
+                            <subviews>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="stu_pwd_long" translatesAutoresizingMaskIntoConstraints="NO" id="zYZ-qL-2Fk">
+                                    <rect key="frame" x="0.0" y="0.0" width="117" height="53"/>
+                                </imageView>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vGd-Ag-n2p">
+                                    <rect key="frame" x="87" y="15.666666666666671" width="22" height="22"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="22" id="YAv-YD-dVH"/>
+                                        <constraint firstAttribute="height" constant="22" id="q6j-3X-PIK"/>
+                                    </constraints>
+                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                    <state key="normal" image="stu_hide_right"/>
+                                </button>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="登录密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KNx-Qs-Onl">
+                                    <rect key="frame" x="20" y="8" width="54" height="17"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="17" id="QRz-gF-PNF"/>
+                                        <constraint firstAttribute="width" constant="54" id="Zfp-WX-E0K"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                    <color key="textColor" red="0.20784313725490194" green="0.74901960784313726" blue="0.36862745098039218" alpha="1" colorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="111000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hPd-Ya-bDM">
+                                    <rect key="frame" x="20" y="27" width="47" height="17"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="47" id="Skl-cm-Y3c"/>
+                                        <constraint firstAttribute="height" constant="17" id="n3z-iy-JyA"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                    <color key="textColor" red="0.20784313730000001" green="0.74901960779999999" blue="0.36862745099999999" alpha="1" colorSpace="calibratedRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstItem="KNx-Qs-Onl" firstAttribute="top" secondItem="IVZ-yP-3ZZ" secondAttribute="top" constant="8" id="4bS-f9-XpZ"/>
+                                <constraint firstAttribute="trailing" secondItem="vGd-Ag-n2p" secondAttribute="trailing" constant="8" id="CqR-sL-Uvz"/>
+                                <constraint firstItem="hPd-Ya-bDM" firstAttribute="top" secondItem="KNx-Qs-Onl" secondAttribute="bottom" constant="2" id="D7f-Ve-IuJ"/>
+                                <constraint firstItem="zYZ-qL-2Fk" firstAttribute="leading" secondItem="IVZ-yP-3ZZ" secondAttribute="leading" id="FHj-u3-AVs"/>
+                                <constraint firstAttribute="width" constant="117" id="NcG-Xa-0B2"/>
+                                <constraint firstItem="KNx-Qs-Onl" firstAttribute="leading" secondItem="IVZ-yP-3ZZ" secondAttribute="leading" constant="20" id="OGy-Ir-MwE"/>
+                                <constraint firstAttribute="trailing" secondItem="zYZ-qL-2Fk" secondAttribute="trailing" id="SeM-sa-MWD"/>
+                                <constraint firstItem="zYZ-qL-2Fk" firstAttribute="top" secondItem="IVZ-yP-3ZZ" secondAttribute="top" id="Sjs-a0-Kso"/>
+                                <constraint firstAttribute="bottom" secondItem="zYZ-qL-2Fk" secondAttribute="bottom" id="Wle-zD-NJa"/>
+                                <constraint firstItem="vGd-Ag-n2p" firstAttribute="centerY" secondItem="IVZ-yP-3ZZ" secondAttribute="centerY" id="aOi-AK-uLm"/>
+                                <constraint firstItem="hPd-Ya-bDM" firstAttribute="leading" secondItem="IVZ-yP-3ZZ" secondAttribute="leading" constant="20" id="s6J-7c-n9e"/>
+                                <constraint firstAttribute="height" constant="53" id="veb-fa-Qav"/>
+                            </constraints>
+                        </view>
+                        <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cb5-hL-bGP" userLabel="View-pwd-hide">
+                            <rect key="frame" x="343" y="35" width="32" height="53"/>
+                            <subviews>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="stu_pwd_short" translatesAutoresizingMaskIntoConstraints="NO" id="u25-fg-1iw">
+                                    <rect key="frame" x="0.0" y="0.0" width="32" height="53"/>
+                                </imageView>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rKO-7J-CVq">
+                                    <rect key="frame" x="10" y="15.666666666666671" width="22" height="22"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="22" id="AHC-eA-MkA"/>
+                                        <constraint firstAttribute="height" constant="22" id="xxf-5V-dvP"/>
+                                    </constraints>
+                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                    <state key="normal" image="stu_show_left"/>
+                                </button>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="53" id="4bl-vE-0Tm"/>
+                                <constraint firstAttribute="bottom" secondItem="u25-fg-1iw" secondAttribute="bottom" id="E60-od-ib0"/>
+                                <constraint firstAttribute="trailing" secondItem="u25-fg-1iw" secondAttribute="trailing" id="Q2M-G6-GGG"/>
+                                <constraint firstItem="u25-fg-1iw" firstAttribute="top" secondItem="cb5-hL-bGP" secondAttribute="top" id="dvt-i4-l9V"/>
+                                <constraint firstItem="u25-fg-1iw" firstAttribute="leading" secondItem="cb5-hL-bGP" secondAttribute="leading" id="iKo-6h-fhW"/>
+                                <constraint firstAttribute="width" constant="32" id="ijE-bZ-JJ6"/>
+                                <constraint firstAttribute="trailing" secondItem="rKO-7J-CVq" secondAttribute="trailing" id="mZi-Fj-0dS"/>
+                                <constraint firstItem="rKO-7J-CVq" firstAttribute="centerY" secondItem="cb5-hL-bGP" secondAttribute="centerY" id="vsD-92-6Mf"/>
+                            </constraints>
+                        </view>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <color key="tintColor" red="0.023529411760000001" green="0.12549019610000001" blue="0.2274509804" alpha="1" colorSpace="calibratedRGB"/>
@@ -122,7 +207,10 @@
                         <constraint firstItem="2cm-Rv-xIl" firstAttribute="leading" secondItem="PJS-q0-kId" secondAttribute="trailing" constant="22" id="CA2-eO-ocY"/>
                         <constraint firstItem="2cm-Rv-xIl" firstAttribute="top" secondItem="KSW-mg-lqU" secondAttribute="bottom" constant="16" id="DSd-Jr-6HR"/>
                         <constraint firstItem="KSW-mg-lqU" firstAttribute="top" secondItem="2ye-z8-GF5" secondAttribute="top" constant="35" id="P1P-Lg-kTN"/>
+                        <constraint firstAttribute="trailing" secondItem="cb5-hL-bGP" secondAttribute="trailing" id="UwJ-kC-ydP"/>
+                        <constraint firstItem="IVZ-yP-3ZZ" firstAttribute="top" secondItem="2ye-z8-GF5" secondAttribute="top" constant="35" id="aFi-PE-TGg"/>
                         <constraint firstItem="uhg-H7-9Lj" firstAttribute="top" secondItem="KSW-mg-lqU" secondAttribute="bottom" constant="13" id="bBB-U8-hpe"/>
+                        <constraint firstAttribute="trailing" secondItem="IVZ-yP-3ZZ" secondAttribute="trailing" id="clN-Wd-X22"/>
                         <constraint firstItem="Q1B-Pi-q27" firstAttribute="top" secondItem="PJS-q0-kId" secondAttribute="bottom" constant="11" id="dfF-Or-WzV"/>
                         <constraint firstItem="KSW-mg-lqU" firstAttribute="leading" secondItem="PJS-q0-kId" secondAttribute="trailing" constant="22" id="eu2-X2-P1b"/>
                         <constraint firstAttribute="height" constant="150" id="gpM-rF-0c1"/>
@@ -130,6 +218,7 @@
                         <constraint firstItem="PJS-q0-kId" firstAttribute="top" secondItem="2ye-z8-GF5" secondAttribute="top" constant="35" id="o9I-pZ-xSu"/>
                         <constraint firstItem="Zqx-If-LXv" firstAttribute="top" secondItem="2ye-z8-GF5" secondAttribute="top" constant="37" id="wgp-gS-VF0"/>
                         <constraint firstItem="uhg-H7-9Lj" firstAttribute="leading" secondItem="2cm-Rv-xIl" secondAttribute="trailing" constant="8" symbolic="YES" id="yFy-iD-bji"/>
+                        <constraint firstItem="cb5-hL-bGP" firstAttribute="top" secondItem="2ye-z8-GF5" secondAttribute="top" constant="35" id="z9Y-XX-QnZ"/>
                     </constraints>
                 </view>
             </subviews>
@@ -149,7 +238,11 @@
     <resources>
         <image name="back-white" width="9.3333330154418945" height="17"/>
         <image name="default-user-male" width="74" height="102"/>
+        <image name="stu_hide_right" width="16" height="11.666666984558105"/>
         <image name="stu_phone" width="9" height="14"/>
+        <image name="stu_pwd_long" width="117" height="53"/>
+        <image name="stu_pwd_short" width="32" height="53"/>
+        <image name="stu_show_left" width="16" height="11.666666984558105"/>
         <image name="user-male" width="18" height="18"/>
     </resources>
 </document>