Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

liushiyu
2 parents 08c5192b 6d88c569
Showing 12 changed files with 478 additions and 95 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNHomePageBackgroupView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/UpSlide/CNUpSlideView.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumImageCell.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -67,11 +67,28 @@ target &#39;metaCode&#39; do
 #  pod 'QMUIKit'
    pod 'YYWebImage', :git => 'https://gitee.com/mirrors/YYWebImage.git'
+   pod 'WebViewJavascriptBridge'
+   
    #依赖三方私有库,如果里面有.a的时候加上这个
    pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
    end
+   #依赖三方私有库,如果里面有.a的时候加上这个
+   pre_install do |installer| Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+   ############################################  #删除WebViewJavascriptBridge中的WebViewJavascriptBridge.h和WebViewJavascriptBridge.m文件
+            dir_web = File.join(installer.sandbox.pod_dir('WebViewJavascriptBridge'), 'WebViewJavascriptBridge')
+            Dir.foreach(dir_web) {|x|
+              real_path = File.join(dir_web, x)
+              if (!File.directory?(real_path) && File.exists?(real_path))
+                if(x == 'WebViewJavascriptBridge.h' || x == 'WebViewJavascriptBridge.m')
+                  File.delete(real_path)
+                end
+              end
+            }
+            #删除WebViewJavascriptBridge中的WebViewJavascriptBridge.h和WebViewJavascriptBridge.m文件
+        #################################################
+   end
@@ -2070,7 +2070,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.4.24.01.22.17;
+				CURRENT_PROJECT_VERSION = 1.0.4.24.01.26.17;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2324,7 +2324,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.4.24.01.22.17;
+				CURRENT_PROJECT_VERSION = 1.0.4.24.01.26.17;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -56,6 +56,9 @@ enum VNumPage {
 class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate,UIGestureRecognizerDelegate,WKNavigationDelegate{
+    //获取身份信息接口总次数,为0时刷新左右轮播
+    var reloadNum:Int = 0
+    var reloadShopNum:Int = 1
     ///NewPagedFlowView 开始滑动时的偏移量
     private var beginOffset = 0.0
@@ -396,9 +399,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         bannerView?.idModel = identityModel
         if (identityModel.auth == true){
             bannerView?.baseScrollView.isScrollEnabled = true
-            if identityModel.id == 9{
-                self.getApplyShopInfo()
-            }
         }else{
             //未认证
             if (identityModel.downType == 3 || identityModel.downType == 4 || identityModel.upType == 3 || identityModel.upType == 4)
@@ -409,7 +409,8 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             }
             //未认证&要显示的是电商
-            if identityModel.id == 9{
+            if identityModel.id == 9 && reloadShopNum == 1{
+                reloadShopNum = reloadShopNum - 1
                 self.getApplyShopInfo()
             }
         }
@@ -626,7 +627,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     {
 //        showLoading(message: "")
         CNLiveMineViewModel.requestAuthStandList(page: 1)
-        { result, respStatue in
+        { [self] result, respStatue in
             hiddenLoading()
             if respStatue == .success{
@@ -636,10 +637,9 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                     self.dataArray = NSMutableArray.init()
                     self.dataArray.addObjects(from: listArray as! [Any])
-                    self.addPageView()
-                    
-                    self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
+                    //全部已认证
+                    var isAllAuthed = true
                     //请求身份详情,判断是企业认证还是个人认证
                     listArray.forEach { standListModel in
                         let listModel = standListModel as! StandListModel
@@ -648,9 +648,16 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                             listModel.isPersonOrEnterprise = 3
                         }else{
                             //未认证
+                            isAllAuthed = false
                             self.getStandInfo(identityId: "\(listModel.id)")
+                            reloadNum = reloadNum + 1
                         }
                     }
+                    if isAllAuthed{
+                        self.addPageView()
+                        
+                        self.backgroupView.updateData(idArray: listArray as! Array<StandListModel>)
+                    }
                 }else{
                     self.NetApiStatus = .apiError
@@ -665,58 +672,69 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         }
     }
-    // MARK: - 获取身份信息是个人认证还是企业认证
+    // MARK: - 获取身份信息是个人认证还是企业认证,机构认证
     func getStandInfo(identityId:String){
-        CNLiveMineViewModel.requestsStandInfo(identityId: identityId, type: .effect, authType: .person) { result, respStatue in
+        CNLiveMineViewModel.requestsStandInfo(identityId: identityId, type: .effect, authType: .person) { [self] result, respStatue in
             hiddenLoading()
             if respStatue == .success{
                 let standInfoBaseModel = result as! MineStandInfoBaseModel
-                if standInfoBaseModel.authInfos.count > 0{
-                    //个人认证有值
-                    if standInfoBaseModel.enterpriseAuthInfos.count > 0{
-                        //企业认证有值
-                        self.dataArray.forEach { standListModel in
-                            let listModel = standListModel as! StandListModel
-                            if listModel.id == standInfoBaseModel.identityId{
-                                //目标model,企业+个人
+                self.dataArray.forEach { standListModel in
+                    let listModel = standListModel as! StandListModel
+                    if listModel.id == standInfoBaseModel.identityId{
+                        listModel.standInfoBaseModel = standInfoBaseModel
+                        if standInfoBaseModel.authInfos.count > 0{
+                            //个人认证有值
+                            if standInfoBaseModel.enterpriseAuthInfos.count > 0{
+                                //个人有值,企业认证有值
+                                if standInfoBaseModel.agencyAuthInfos.count > 0{
+                                    //个人有值,企业有值,机构认证有值
+                                    listModel.isPersonOrEnterprise = 4
+                                }else{
+                                    //个人有值,企业有值,机构认证没值
+                                    listModel.isPersonOrEnterprise = 0
+                                }
+                                
+                            }else{
+                                //个人有值,企业认证没值
+                                if standInfoBaseModel.agencyAuthInfos.count > 0{
+                                    //个人有值,企业没值,机构有值
+                                    listModel.isPersonOrEnterprise = 0
+                                }else{
+                                    //个人有值,企业没值,机构没值
+                                    listModel.isPersonOrEnterprise = 1
+                                }
+                            }
+                            
+                        }else if standInfoBaseModel.enterpriseAuthInfos.count > 0{
+                            //企业认证有值,个人没值
+                            if standInfoBaseModel.agencyAuthInfos.count > 0{
+                                ///企业有值,个人没值,机构有值
                                 listModel.isPersonOrEnterprise = 0
+                            }else{
+                                ///企业有值,个人没值,机构没值
+                                listModel.isPersonOrEnterprise = 2
                             }
-                        }
-                        
-                    }else{
-                        //企业认证没值
-                        //只显示个人
-                        self.dataArray.forEach { standListModel in
-                            let listModel = standListModel as! StandListModel
-                            if listModel.id == standInfoBaseModel.identityId{
-                                //目标model ,个人
-                                listModel.isPersonOrEnterprise = 1
+                            
+                            
+                        }else{
+                            //企业个人都没值
+                            if standInfoBaseModel.agencyAuthInfos.count > 0{
+                                //企业没值,个人没值,机构有值
+                                listModel.isPersonOrEnterprise = 5
+                            }else{
+                                //企业没值,个人没值,机构没值
+                                listModel.isPersonOrEnterprise = 3
                             }
                         }
                     }
-                    
-                }else if standInfoBaseModel.enterpriseAuthInfos.count > 0{
-                    //企业认证有值,个人没值
-                    //只显示企业
-                    self.dataArray.forEach { standListModel in
-                        let listModel = standListModel as! StandListModel
-                        if listModel.id == standInfoBaseModel.identityId{
-                            //目标model ,企业
-                            listModel.isPersonOrEnterprise = 2
-                        }
-                    }
-                    
-                }else{
-                    //企业个人都没值
-                    self.dataArray.forEach { standListModel in
-                        let listModel = standListModel as! StandListModel
-                        if listModel.id == standInfoBaseModel.identityId{
-                            //目标model ,已认证/无企业和个人
-                            listModel.isPersonOrEnterprise = 3
-                        }
-                    }
                 }
-                self.pageFlowView.reloadData()
+                //已请求全部身份详情,开始刷新
+                reloadNum = reloadNum - 1
+                if reloadNum == 0{
+                    self.addPageView()
+                    let arr = Array(self.dataArray)
+                    self.backgroupView.updateData(idArray: arr as! Array<StandListModel>)
+                }
             }else{
                 //网络请求失败
             }
@@ -733,8 +751,10 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
                 for (index, item) in self!.dataArray.enumerated() {
                     let model = item as! StandListModel
                     model.shopInfoModel = shopModel
-                    let bannerView =  self?.pageFlowView.cells[index] as? CNCustomIndexView
-                    bannerView?.idModel = model
+                    if model.id == 9{
+                        let bannerView =  self?.pageFlowView.cells[index] as? CNCustomIndexView
+                        bannerView?.idModel = model
+                    }
                 }
             }
         }
@@ -269,7 +269,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                     return 75
                 }else if self.slideModel?.type == SlideModelTypeOneCourse75{
                     //大图课程
-                    return KSreenWidth
+                    return KSreenWidth*(KSreenWidth/DownSlideSingleCourseW)
                 }
             }
         }else{
@@ -131,7 +131,6 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideSingleCourseCellIdentifier) as? CNDownSlideSingleCourseCell
             else {
                 let cell = CNDownSlideSingleCourseCell()
-                cell.slideModel = slideModel
                 return cell
             }
             cell.slideModel = slideModel
@@ -149,14 +149,14 @@ class CNDownSlideView:UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
-//        let tap = UITapGestureRecognizer.init(target: self, action: #selector(slideViewTap))
-//        tap.cancelsTouchesInView = false
-//        self.addGestureRecognizer(tap)
+        let tap = UITapGestureRecognizer.init(target: self, action: #selector(slideViewTap))
+        tap.cancelsTouchesInView = false
+        self.addGestureRecognizer(tap)
         self.initUI()
     }
-//    @objc func slideViewTap() {
-//        print("slideViewTap")
-//    }
+    @objc func slideViewTap() {
+        print("slideViewTap")
+    }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -77,9 +77,9 @@ class CNHomePageBackgroupView: UIView{
     ///当前在屏幕显示的view
     var currentApearView: CNHomePageBackgroupSubView?
     ///数据源
-    lazy var dataArray:Array<CNHomePageBackgroupSubView> = {
-        let dataArray = Array<CNHomePageBackgroupSubView>()
-        return dataArray
+    lazy var groupSubViewDataArray:Array<CNHomePageBackgroupSubView> = {
+        let groupSubViewDataArray = Array<CNHomePageBackgroupSubView>()
+        return groupSubViewDataArray
     }()
     // MARK: - 初始化
@@ -103,7 +103,7 @@ class CNHomePageBackgroupView: UIView{
             let obj:UIView = array[i]
             obj.removeFromSuperview()
         }
-        self.dataArray = Array<CNHomePageBackgroupSubView>()
+        self.groupSubViewDataArray = Array<CNHomePageBackgroupSubView>()
         for i in (0..<idArray.count){
@@ -117,11 +117,11 @@ class CNHomePageBackgroupView: UIView{
             subView.imageView.kf.setImage(with: URL(string: idModel.backgroundImg),placeholder: UIImage(named: "homePage_backgroup_blue"))
             //更新双向链表
-            let lastSubView: CNHomePageBackgroupSubView? = self.dataArray.last
+            let lastSubView: CNHomePageBackgroupSubView? = self.groupSubViewDataArray.last
             lastSubView?.nextSubView = subView
             subView.preSubView = lastSubView
-            self.dataArray.append(subView)
+            self.groupSubViewDataArray.append(subView)
             if i==0 {
                 self.currentApearView = subView
@@ -130,7 +130,7 @@ class CNHomePageBackgroupView: UIView{
         }
         //倒序添加子view
-        for i in self.dataArray.enumerated().reversed() {
+        for i in self.groupSubViewDataArray.enumerated().reversed() {
             let subview: CNHomePageBackgroupSubView = i.element
             self.addSubview(subview)
@@ -148,14 +148,14 @@ class CNHomePageBackgroupView: UIView{
         if(currentApearViewIndex == 0){
             return nil
         }
-        return dataArray[currentApearViewIndex - 1]
+        return groupSubViewDataArray[currentApearViewIndex - 1]
     }
     ///获取当前视图右边的子视图
     func getRightView()->CNHomePageBackgroupSubView?{
-        if(currentApearViewIndex >= self.dataArray.count - 1){
+        if(currentApearViewIndex >= self.groupSubViewDataArray.count - 1){
             return nil
         }
-        return dataArray[currentApearViewIndex + 1]
+        return groupSubViewDataArray[currentApearViewIndex + 1]
     }
     /// 替换当前显示的子view
@@ -16,12 +16,14 @@ let KTransformAnimationTime:CGFloat  = 0.75;
 class CNFrontMainView : UIView{
     ///点击反转事件
     var tapTransformAciton:closureBlock?
-
+    let delegate = UIApplication.shared.delegate as! AppDelegate
+    var standInfoSubTitleModel:MineStandInfoSubTitleModel?//17时弹窗的跳转model
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.initUI()
-//        let tap:UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapAction))
-//        self.addGestureRecognizer(tap)
+        let tap:UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapAction))
+        self.addGestureRecognizer(tap)
     }
     required init?(coder: NSCoder) {
@@ -75,7 +77,15 @@ class CNFrontMainView : UIView{
             make.width.equalTo(120)
             make.height.equalTo(36)
         }
-               
+            
+        frontDescContentView.addSubview(self.unStandBtnBgView)
+        unStandBtnBgView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(30)
+            make.bottom.equalToSuperview().offset(-45)
+            make.width.equalTo(self.width-60)
+            make.height.equalTo(36)
+        }
+        
         frontDescContentView.addSubview(self.textView)
         textView.snp.makeConstraints { make in
@@ -105,7 +115,7 @@ class CNFrontMainView : UIView{
         return textView
     }()
-    ///未认证-店铺认证 按钮
+    ///未认证-店铺认证 按钮(一个按钮时)
     lazy var addStandBtn: UIButton = {
         let addStandBtn = UIButton(type: .custom)
         addStandBtn.clipsToBounds = true
@@ -118,7 +128,7 @@ class CNFrontMainView : UIView{
         return addStandBtn
     }()
-    ///未认证-个人认证 按钮
+    ///未认证-个人认证 按钮(两个按钮时第一个)
     lazy var personalStandBtn: UIButton = {
         let personalStandBtn = UIButton(type: .custom)
         personalStandBtn.layer.cornerRadius = 19.5
@@ -127,9 +137,10 @@ class CNFrontMainView : UIView{
         personalStandBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
         personalStandBtn.titleLabel?.font = UIFont.init(name: "PingFangSC-Medium", size: 14)
         personalStandBtn.addTarget(self, action: #selector(personalStandBtnAction), for: .touchUpInside)
+        personalStandBtn.isHidden = true
         return personalStandBtn
     }()
-    ///未认证-企业认证 按钮
+    ///未认证-企业认证 按钮(两个按钮时第二个)
     lazy var enterpriseStandBtn: UIButton = {
         let enterpriseStandBtn = UIButton(type: .custom)
         enterpriseStandBtn.layer.cornerRadius = 19.5
@@ -138,9 +149,120 @@ class CNFrontMainView : UIView{
         enterpriseStandBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
         enterpriseStandBtn.titleLabel?.font = UIFont.init(name: "PingFangSC-Medium", size: 14)
         enterpriseStandBtn.addTarget(self, action: #selector(enterpriseStandBtnAction), for: .touchUpInside)
+        enterpriseStandBtn.isHidden = true
         return enterpriseStandBtn
     }()
+    ///未认证-3个认证按钮的 第1个
+    lazy var StandBtn1: UIButton = {
+        //第1个按钮
+        let StandBtn1 = UIButton(type: .custom)
+        StandBtn1.setTitle("个人认证", for: .normal)
+        StandBtn1.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        StandBtn1.titleLabel?.font = UIFont.init(name: "PingFangSC-Medium", size: 14)
+        StandBtn1.addTarget(self, action: #selector(StandBtn1Action), for: .touchUpInside)
+        return StandBtn1
+    }()
+    ///未认证-3个认证按钮的 第2个
+    lazy var StandBtn2: UIButton = {
+        //第2个按钮
+        let StandBtn2 = UIButton(type: .custom)
+        StandBtn2.setTitle("企业认证", for: .normal)
+        StandBtn2.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        StandBtn2.titleLabel?.font = UIFont.init(name: "PingFangSC-Medium", size: 14)
+        StandBtn2.addTarget(self, action: #selector(StandBtn2Action), for: .touchUpInside)
+        return StandBtn2
+    }()
+    ///未认证-3个认证按钮的 第3个
+    lazy var StandBtn3: UIButton = {
+        //第3个按钮
+        let StandBtn3 = UIButton(type: .custom)
+        StandBtn3.setTitle("机构认证", for: .normal)
+        StandBtn3.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        StandBtn3.titleLabel?.font = UIFont.init(name: "PingFangSC-Medium", size: 14)
+        StandBtn3.addTarget(self, action: #selector(StandBtn3Action), for: .touchUpInside)
+        return StandBtn3
+    }()
+    lazy var line1View :UIView = {
+        let line1View = UIView(frame: CGRect(x: 0, y: 0, width: 0.5, height: 10))
+        line1View.backgroundColor = HexColor("#FEFFFF")
+        return line1View
+    }()
+    lazy var line2View :UIView = {
+        let line2View = UIView(frame: CGRect(x: 0, y: 0, width: 0.5, height: 10))
+        line2View.backgroundColor = HexColor("#FEFFFF")
+        return line2View
+    }()
+
+    //未认证-3个认证按钮背景图
+    lazy var unStandBtnBgView :UIView = {
+        let unStandBtnBgView = UIView(frame: CGRect(x: 0, y: 0, width: 0, height: 0))
+        unStandBtnBgView.layer.cornerRadius = 18
+        unStandBtnBgView.clipsToBounds = true
+        
+        unStandBtnBgView.addSubview(self.StandBtn1)
+        StandBtn1.snp.makeConstraints { make in
+            make.left.equalToSuperview()
+            make.top.equalToSuperview()
+            make.width.equalTo((self.width-60)/3)
+            make.height.equalTo(36)
+        }
+        unStandBtnBgView.addSubview(self.StandBtn2)
+        StandBtn2.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalToSuperview()
+            make.width.equalTo(self.StandBtn1.snp.width)
+            make.height.equalTo(36)
+        }
+        unStandBtnBgView.addSubview(self.StandBtn3)
+        StandBtn3.snp.makeConstraints { make in
+            make.right.equalToSuperview()
+            make.top.equalToSuperview()
+            make.width.equalTo(self.StandBtn1.snp.width)
+            make.height.equalTo(36)
+        }
+        
+        unStandBtnBgView.addSubview(self.line1View)
+        line1View.snp.makeConstraints { make in
+            make.centerX.equalTo(self.StandBtn1.snp.right)
+            make.centerY.equalToSuperview()
+            make.width.equalTo(0.5)
+            make.height.equalTo(10)
+        }
+        unStandBtnBgView.addSubview(self.line2View)
+        line2View.snp.makeConstraints { make in
+            make.centerX.equalTo(self.StandBtn2.snp.right)
+            make.centerY.equalToSuperview()
+            make.width.equalTo(0.5)
+            make.height.equalTo(10)
+        }
+                
+        return unStandBtnBgView
+    }()
+    /// 未认证-inputType17时弹窗背景图
+    lazy var alertBgImgView:UIImageView = {
+        let alertBgImgView:UIImageView = UIImageView()
+        alertBgImgView.tag = 20001
+        alertBgImgView.isUserInteractionEnabled = true
+        let ges = UITapGestureRecognizer(target: self, action: #selector(alertBgImgViewClickAction))
+        alertBgImgView.addGestureRecognizer(ges)
+
+        return alertBgImgView
+    }()
+    /// 未认证-inputType17时弹窗背景图蒙版
+    lazy var alertBgView:UIView = {
+        let alertBgView:UIView = UIView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight))
+        alertBgView.backgroundColor = HexColor("#000000")
+        alertBgView.alpha = 0.6
+        alertBgView.isUserInteractionEnabled = true
+        alertBgView.tag = 20000
+        
+        let ges = UITapGestureRecognizer(target: self, action: #selector(alertBgViewClickAction))
+        alertBgView.addGestureRecognizer(ges)
+
+        return alertBgView
+    }()
+    
     //上滑更多Gif
     lazy var upMoreGIF: UIImageView = {
         let  upMoreGIF = UIImageView()
@@ -154,6 +276,7 @@ class CNFrontMainView : UIView{
         return downMoreGIF
     }()
+    // MARK: - 已认证
     ///已认证-前置视图卡片容器
     lazy var frontCardContentView : UIView = {
@@ -220,10 +343,9 @@ class CNFrontMainView : UIView{
                 self.addStandBtn.isHidden = true
                 self.iDCardView.idModel = newValue!
                 cardViewBgImgView.kf.setImage(with: URL(string: _idModel!.cardBackgroundImg), placeholder: UIImage(named: "homepage_cardBGImg"))
-                
-                
                 //隐藏textview
                 textView.isHidden = true
+                unStandBtnBgView.isHidden = true
                 if frontCardContentView.contains(self.upMoreGIF){
                     self.upMoreGIF.removeFromSuperview()
@@ -269,6 +391,7 @@ class CNFrontMainView : UIView{
                     self.addStandBtn.isHidden = false
                     self.personalStandBtn.isHidden = true
                     self.enterpriseStandBtn.isHidden = true
+                    self.unStandBtnBgView.isHidden = true
                     self.addStandBtn.isUserInteractionEnabled = true
                     if idModel?.shopInfoModel?.state == "0" || idModel?.shopInfoModel?.state == "4"{
                         //0未申请 //4闭店
@@ -293,30 +416,63 @@ class CNFrontMainView : UIView{
                     upMoreGIF.isHidden = false
                     downMoreGIF.isHidden = false
-                    if idModel?.isPersonOrEnterprise == 0{//企业+个人
+                    if idModel?.isPersonOrEnterprise == 0{//企业+个人等 2个按钮
                         self.addStandBtn.isHidden = true
                         self.personalStandBtn.isHidden = false
                         self.enterpriseStandBtn.isHidden = false
+                        unStandBtnBgView.isHidden = true
+                        let presonInfoCount = self.idModel?.standInfoBaseModel?.authInfos.count ?? 0
+                        let enterInfoCount = self.idModel?.standInfoBaseModel?.enterpriseAuthInfos.count ?? 0
+                        let agencyInfoCount = self.idModel?.standInfoBaseModel?.agencyAuthInfos.count ?? 0
+                        if presonInfoCount > 0 && enterInfoCount > 0{
+                            //个人+企业
+                            self.personalStandBtn.setTitle("个人认证", for: .normal)
+                            self.enterpriseStandBtn.setTitle("企业认证", for: .normal)
+                        }else if presonInfoCount > 0 && agencyInfoCount > 0{
+                            //个人+机构
+                            self.personalStandBtn.setTitle("个人认证", for: .normal)
+                            self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
+                        }else if enterInfoCount > 0 && agencyInfoCount > 0{
+                            //企业+机构
+                            self.personalStandBtn.setTitle("企业认证", for: .normal)
+                            self.enterpriseStandBtn.setTitle("机构认证", for: .normal)
+                        }
                     }else if idModel?.isPersonOrEnterprise == 1{//个人
                         self.addStandBtn.isHidden = false
                         self.addStandBtn.setTitle("个人认证", for: .normal)
                         self.personalStandBtn.isHidden = true
                         self.enterpriseStandBtn.isHidden = true
+                        self.unStandBtnBgView.isHidden = true
                     }else if idModel?.isPersonOrEnterprise == 2{//企业
                         self.addStandBtn.isHidden = false
                         self.addStandBtn.setTitle("企业认证", for: .normal)
                         self.personalStandBtn.isHidden = true
                         self.enterpriseStandBtn.isHidden = true
+                        self.unStandBtnBgView.isHidden = true
                     }else if idModel?.isPersonOrEnterprise == 3{//已认证/无企业和个人
                         //不显示认证按钮
                         self.addStandBtn.isHidden = true
                         self.personalStandBtn.isHidden = true
                         self.enterpriseStandBtn.isHidden = true
+                        self.unStandBtnBgView.isHidden = true
+                    }else if idModel?.isPersonOrEnterprise == 4{//个人+企业+机构
+                        self.addStandBtn.isHidden = true
+                        self.personalStandBtn.isHidden = true
+                        self.enterpriseStandBtn.isHidden = true
+                        self.unStandBtnBgView.isHidden = false
+                        self.setUnStandBtnBgViewLayer(startHex: newValue!.atPersonageColour, endHex: newValue!.backgroundColor)
+                    }else if idModel?.isPersonOrEnterprise == 5{//机构
+                        self.addStandBtn.isHidden = false
+                        self.addStandBtn.setTitle("机构认证", for: .normal)
+                        self.personalStandBtn.isHidden = true
+                        self.enterpriseStandBtn.isHidden = true
+                        self.unStandBtnBgView.isHidden = true
                     }else{
                         //不显示认证按钮
                         self.addStandBtn.isHidden = true
                         self.personalStandBtn.isHidden = false
                         self.enterpriseStandBtn.isHidden = false
+                        self.unStandBtnBgView.isHidden = true
                     }
                 }
@@ -357,6 +513,35 @@ class CNFrontMainView : UIView{
         } 
     }
+    let unStandBtnBgViewLayer = "unStandBtnBgViewLayer"
+    func setUnStandBtnBgViewLayer(startHex:String,endHex:String){
+        let payLayer = self.subLayer(name: unStandBtnBgViewLayer, viewLayer: self.unStandBtnBgView.layer)
+
+        if (payLayer != nil){
+            //已添加layer
+            payLayer?.removeFromSuperlayer()
+        }
+        //添加新layer
+        let gradient = CAGradientLayer()
+        gradient.frame = self.bounds
+        gradient.colors = [HexColor(startHex)!.cgColor, HexColor(endHex)!.cgColor]
+        gradient.locations = [0, 1]
+        gradient.startPoint = CGPoint(x: 0, y: 0.43)
+        gradient.endPoint = CGPoint(x: 0.43, y: 0.43)
+        gradient.name = unStandBtnBgViewLayer
+        self.unStandBtnBgView.layer.insertSublayer(gradient, at: 0)
+        self.unStandBtnBgView.backgroundColor = .clear
+    }
+    func subLayer(name:String,viewLayer:CALayer) -> CALayer?{
+        if let subLayer = viewLayer.sublayers?.first(where: { $0.name == name }) {
+            // 这里可以对获取到的子图层进行操作或者访问其属性等
+            return subLayer
+        } else {
+//            print("未找到指定名称的图层")
+            return nil
+        }
+    }
+    
     func initUI()
     {
         self.addSubview(self.frontTotolContentView)
@@ -371,11 +556,12 @@ class CNFrontMainView : UIView{
     // MARK: -按钮点击事件
     @objc func tapAction(){
-        tapTransformAciton!()
+        //翻转到反面
+//        tapTransformAciton!()
     }
     @objc func addStandBtnAction() {
-        //跳转到 电商认证 / 个人 / 企业
+        //跳转到 电商认证 / 个人 / 企业 / 机构
         self.pushStandVC(isPersonOrEnterprise: 3)
     }
     @objc func personalStandBtnAction() {
@@ -387,6 +573,71 @@ class CNFrontMainView : UIView{
         self.pushStandVC(isPersonOrEnterprise: 2)
     }
+    @objc func StandBtn1Action() {
+        //跳转到 个人认证页面
+        self.pushStandVC(isPersonOrEnterprise: 1)
+    }
+    @objc func StandBtn2Action() {
+        //跳转到 企业认证页面
+        self.pushStandVC(isPersonOrEnterprise: 2)
+    }
+    @objc func StandBtn3Action() {
+        //跳转到 机构认证页面
+        self.pushStandVC(isPersonOrEnterprise: 3)
+    }
+    
+    // MARK: - 点击弹窗,按类型跳转
+    @objc func alertBgImgViewClickAction() {
+        //点击弹窗,按类型跳转
+        if self.standInfoSubTitleModel?.jumpType == UpDownTypeH5{
+            let webVC = CNWebViewController()
+            webVC.url = URL(string: self.standInfoSubTitleModel?.jumpPath ?? "")
+            navigationViewController().pushViewController(webVC, animated: pushAnimated)
+        }else if self.standInfoSubTitleModel?.jumpType == UpDownTypePage{
+            let upSlideVC = CNUpSlideViewController()
+            upSlideVC.downPath = self.standInfoSubTitleModel?.jumpPath ?? ""
+            navigationViewController().pushViewController(upSlideVC, animated: pushAnimated)
+        }else if self.standInfoSubTitleModel?.jumpType == UpDownTypeShopDetail{
+            
+        }else if self.standInfoSubTitleModel?.jumpType == UpDownTypeShopControlConsole{
+            let shopConsoleVC = CNLiveShopConsoleController()
+            navigationViewController().pushViewController(shopConsoleVC, animated: pushAnimated)
+        }else if self.standInfoSubTitleModel?.jumpType == UpDownTypeAuthAlertUp{
+            
+            let customIndexView = ((self.superview as! CNMainView).superview as! UIScrollView).superview as! CNCustomIndexView
+            let baseScrollView = customIndexView.baseScrollView
+            baseScrollView.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
+            currentViewController()?.tabBarController?.tabBar.isHidden = false
+            customIndexView.superScrollView?.isScrollEnabled = true
+            
+            let time = DispatchTime.now() + 0.5
+            DispatchQueue.main.asyncAfter(deadline:time, execute: DispatchWorkItem(block: {
+                //下滑提醒View回到初始位置
+                customIndexView.downSlideViewRemindView.top = -((customIndexView.downSlideViewRemindView.height) + 50)
+            }))
+
+        }else if self.standInfoSubTitleModel?.jumpType == UpDownTypeAuthAlertDown{
+            let customIndexView = ((self.superview as! CNMainView).superview as! UIScrollView).superview as! CNCustomIndexView
+            let baseScrollView = customIndexView.baseScrollView
+            baseScrollView.setContentOffset(CGPoint(x: 0, y: (baseScrollView.height*2+KNavigationHeight)), animated: true)
+            currentViewController()?.tabBarController?.tabBar.isHidden = false
+            customIndexView.superScrollView?.isScrollEnabled = true
+            
+            let time = DispatchTime.now() + 0.5
+            DispatchQueue.main.asyncAfter(deadline:time, execute: DispatchWorkItem(block: {
+                //下滑提醒View回到初始位置
+                customIndexView.downSlideViewRemindView.top = -((customIndexView.downSlideViewRemindView.height) + 50)
+            }))
+        }
+        
+        self.hiden17Alert()
+    }
+    @objc func alertBgViewClickAction() {
+        //点击蒙版隐藏view
+        self.hiden17Alert()
+    }
+    
+    // MARK: - 通用跳转认证页面 isPersonOrEnterprise 1个人 2企业 3机构
     func pushStandVC(isPersonOrEnterprise:Int){
         //跳转到 个人认证&企业认证 页面
         if _idModel!.id == 9 {
@@ -405,18 +656,98 @@ class CNFrontMainView : UIView{
                 //企业
                 navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .enterprise), animated: pushAnimated)
-            }else{
+            }else if self._idModel!.isPersonOrEnterprise == 5{
+                //机构
+                navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .agency), animated: pushAnimated)
+
+            }else if self._idModel!.isPersonOrEnterprise == 0{
+                //2个按钮
                 if isPersonOrEnterprise == 1{
-                    navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
+                    //第1个按钮
+                    var authType:CNLiveMineInputAuthType = .person
+                    if self._idModel?.standInfoBaseModel?.authInfos.count ?? 0 > 0{
+                        //点击个人
+                        authType = .person
+                    }else if self._idModel?.standInfoBaseModel?.enterpriseAuthInfos.count ?? 0 > 0{
+                        //点击企业
+                        authType = .enterprise
+                    }else{
+                        
+                    }
+                    navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: authType), animated: pushAnimated)
                 }else if isPersonOrEnterprise == 2{
-                    navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .enterprise), animated: pushAnimated)
+                    //第二个按钮
+                    var authType:CNLiveMineInputAuthType = .enterprise
+                    if self._idModel?.standInfoBaseModel?.enterpriseAuthInfos.count ?? 0 > 0{
+                        //点击企业
+                        authType = .enterprise
+                    }else if self._idModel?.standInfoBaseModel?.agencyAuthInfos.count ?? 0 > 0{
+                        //点击机构
+                        authType = .agency
+                    }else{
+                        
+                    }
+                    navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: authType), animated: pushAnimated)
                 }else{
                     navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
                 }
+            }else if self._idModel!.isPersonOrEnterprise == 4{
+                //个人+企业+机构
+                if (self._idModel?.standInfoBaseModel?.authInfos.first?.inputType == 17 && isPersonOrEnterprise == 1) || (self._idModel?.standInfoBaseModel?.enterpriseAuthInfos.first?.inputType == 17 && isPersonOrEnterprise == 2) || (self._idModel?.standInfoBaseModel?.agencyAuthInfos.first?.inputType == 17 && isPersonOrEnterprise == 3){
+                    //弹窗
+                    self.show17Alert(index: isPersonOrEnterprise)
+                    return
+                }
+                var authType:CNLiveMineInputAuthType = .person
+                if isPersonOrEnterprise == 1{
+                    authType = .person
+                }else if isPersonOrEnterprise == 2{
+                    authType = .enterprise
+                }else if isPersonOrEnterprise == 3{
+                    authType = .agency
+                }
+                navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: authType), animated: pushAnimated)
             }
         }
     }
+    
+    //弹出弹窗
+    func show17Alert(index:Int){
+        delegate.window?.addSubview(self.alertBgView)
+        delegate.window?.addSubview(self.alertBgImgView)
+        alertBgImgView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.centerY.equalToSuperview()
+            make.width.equalTo(KSreenWidth-80)
+            make.height.equalTo((KSreenWidth-80)*170.5/295)
+        }
+        
+        var alertBgImgStr = ""
+        var subTitleModel:MineStandInfoSubTitleModel = MineStandInfoSubTitleModel()
+        if index == 1{
+            let subTitle = self.idModel?.standInfoBaseModel?.authInfos.first?.subTitle
+            subTitleModel = jsonToModel(subTitle ?? "", MineStandInfoSubTitleModel.self) as! MineStandInfoSubTitleModel
+            alertBgImgStr = subTitleModel.image ?? ""
+        }else if index == 2{
+            let subTitle = self.idModel?.standInfoBaseModel?.enterpriseAuthInfos.first?.subTitle
+            subTitleModel = jsonToModel(subTitle ?? "", MineStandInfoSubTitleModel.self) as! MineStandInfoSubTitleModel
+            alertBgImgStr = subTitleModel.image ?? ""
+        }else if index == 3{
+            let subTitle = self.idModel?.standInfoBaseModel?.agencyAuthInfos.first?.subTitle
+            subTitleModel = jsonToModel(subTitle ?? "", MineStandInfoSubTitleModel.self) as! MineStandInfoSubTitleModel
+            alertBgImgStr = subTitleModel.image ?? ""
+        }
+        self.alertBgImgView.kf.setImage(with: URL(string: alertBgImgStr))
+        self.standInfoSubTitleModel = subTitleModel
+    }
+    func hiden17Alert(){
+        delegate.window?.subviews.forEach({ view in
+            if view.tag >= 20000{
+                view.removeFromSuperview()
+            }
+        })
+    }
 }
 ///反面View
@@ -12,6 +12,8 @@ let UpDownTypeH5 = 1///h5
 let UpDownTypePage = 2///原生page页面
 let UpDownTypeShopDetail = 3///店铺详情
 let UpDownTypeShopControlConsole = 4///店铺控制台
+let UpDownTypeAuthAlertUp = 5///上滑地址 认证-弹窗
+let UpDownTypeAuthAlertDown = 6///下滑地址 认证-弹窗
 ///上滑显示的VIew
 class CNUpSlideView:UIView{
@@ -44,6 +46,9 @@ class CNUpSlideView:UIView{
         }
         set{
             _downPath = newValue!
+            self.subviews.forEach { view in
+                view.removeFromSuperview()
+            }
             if(type == UpDownTypeH5){
                 self.addSubview(self.webView)
                 if (_downPath != ""){
@@ -11,7 +11,9 @@ class CNLiveAlbumImageCell:UITableViewCell{
     //MARK: - 懒加载
     lazy var iconImgView :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenWidth))
+        let iconImgView = UIImageView(frame: CGRect(x: (KSreenWidth - KSreenWidth*(KSreenWidth/DownSlideSingleCourseW))/2, y: 0, width: KSreenWidth*(KSreenWidth/DownSlideSingleCourseW), height: KSreenWidth*(KSreenWidth/DownSlideSingleCourseW)))
+        iconImgView.contentMode = .scaleAspectFill
+        iconImgView.clipsToBounds = true
         return iconImgView
     }()
@@ -28,6 +30,7 @@ class CNLiveAlbumImageCell:UITableViewCell{
     private func setupUI() {
         contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
         self.contentView.addSubview(self.iconImgView)
+        
     }
@@ -160,11 +160,14 @@ final class StandListModel: BaseModel {//, TableCodable {
     var createTimeString: String = ""//-
     var timeString: String = ""
+    ////自定义属性
     //电商身份专用
     var shopInfoModel: MineApplyShopInfoModel?
-    ///自定义 判断是 0个人+企业 , 1个人, 2企业 3已认证/无企业和个人
+    ///自定义 判断是 0个人+企业(两个组合) , 1个人, 2企业 3已认证/无企业和个人 , 4个人+企业+机构 5机构
     var isPersonOrEnterprise: Int = 0
+    //身份详情model
+    var standInfoBaseModel:MineStandInfoBaseModel?
     override func mapping(mapper: HelpingMapper) {
         mapper <<<
@@ -222,9 +225,9 @@ final class StandListModel: BaseModel {//, TableCodable {
 // !!!: /api/identityApi/getIdentity 接口标记
 class MineStandInfoBaseModel: BaseModel {
-    var authInfos = [MineStandInfoModel]()
-    var enterpriseAuthInfos = [MineStandInfoModel]()
-    var agencyAuthInfos = [MineStandInfoModel]()
+    var authInfos = [MineStandInfoModel]()//个人认证
+    var enterpriseAuthInfos = [MineStandInfoModel]()//企业认证
+    var agencyAuthInfos = [MineStandInfoModel]()//机构认证
     var icon: String?
     var name: String?
     var identityId: Int = 0
@@ -241,7 +244,8 @@ class MineStandInfoModel: BaseModel {
     var sort: Int = 0
     var name: String?//卡片标签
     var sub_title: String?//报名项说明
-    var inputType: Int = 0//1文本输入 2数字输入 3下拉选择 4认证时间 5认证编码 6正图 7小竖图 8大横图 9单选 10多选 11选项 12时间选择器 13主标题 16大文本框 17弹窗
+    var inputType: Int = 0//1 文本输入 2数字输入 3下拉选择 4认证时间 5认证编码 6正图 7小竖图 8大横图 9单选 10多选 11选项 12时间选择器 13主标题 16大文本框 17弹窗
+    var subTitle: String?//17时弹窗 inputType =17  弹窗;  subTitle 返回json   image、jumpType 、jumpPath ;jumpType 沿用身份里的类型 ‘1 外链 2原生页面 3店铺详情 4 店铺控制台’ 并新增 ‘5上滑地址 6下滑地址’ 
     var nonEmpty: Bool = false
     var length: Int = 10
     var children = [MineStandInfoModel]()
@@ -249,9 +253,13 @@ class MineStandInfoModel: BaseModel {
     var input: Bool = false
     var show: Bool = false
     var value: String? = ""//自己定义的值
-    var subTitle: String? = ""
 }
+class MineStandInfoSubTitleModel: BaseModel {
+    var image: String? = ""//弹窗图片
+    var jumpType: Int = 0//弹窗点击跳转类型
+    var jumpPath: String? = ""//弹窗点击跳转地址
+}
 // !!!: api/identityApi/myList  数据返回
 class MineAuthListBaseModel: BaseModel {
@@ -284,7 +284,7 @@ class CNLiveMineViewModel: NSObject {
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/allList", param: param as! [String : String], cacheType: .cacheNetwork) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/allList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary