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

# Conflicts: # metaCode/Classes/Environment/CNLiveEnvironment.swift

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # metaCode/Classes/Environment/CNLiveEnvironment.swift
张旭
2 parents 68900fe3 7e195196
Showing 33 changed files with 1339 additions and 91 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Extensions/NSString+CNLiveExtensions.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInfoShowViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInputFeedBackViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthResultViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInputViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineShopViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInputMessageView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Classes/Other/AppDelegate.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_icon_flow.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_icon_flow.imageset/mine_header_icon_flow@2x.png
@@ -64,7 +64,7 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
     end
   end
 end
@@ -58,6 +58,8 @@
 		7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */; };
 		79656E382AAEBA8E00119A61 /* CNLiveMineInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79656E372AAEBA8E00119A61 /* CNLiveMineInputViewController.swift */; };
 		7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7978A8422A396632007C86B8 /* CNLiveMineViewModel.swift */; };
+		79803E272AD68D3100F05F68 /* CNLiveMineShopViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79803E262AD68D3100F05F68 /* CNLiveMineShopViewController.swift */; };
+		79803E292AD6991200F05F68 /* CNLiveMineInputMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79803E282AD6991200F05F68 /* CNLiveMineInputMessageView.swift */; };
 		7987BF3D2A497644000A1ABC /* CNLiveMineQuestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7987BF3C2A497644000A1ABC /* CNLiveMineQuestViewController.swift */; };
 		7989B5C52A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7989B5C42A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift */; };
 		7989B5C72A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7989B5C62A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift */; };
@@ -188,6 +190,8 @@
 		7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveBaseViewController.swift; sourceTree = "<group>"; };
 		79656E372AAEBA8E00119A61 /* CNLiveMineInputViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInputViewController.swift; sourceTree = "<group>"; };
 		7978A8422A396632007C86B8 /* CNLiveMineViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineViewModel.swift; sourceTree = "<group>"; };
+		79803E262AD68D3100F05F68 /* CNLiveMineShopViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineShopViewController.swift; sourceTree = "<group>"; };
+		79803E282AD6991200F05F68 /* CNLiveMineInputMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInputMessageView.swift; sourceTree = "<group>"; };
 		7987BF3C2A497644000A1ABC /* CNLiveMineQuestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineQuestViewController.swift; sourceTree = "<group>"; };
 		7989B5C42A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineEarnViewController.swift; sourceTree = "<group>"; };
 		7989B5C62A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineEarnListViewController.swift; sourceTree = "<group>"; };
@@ -405,6 +409,7 @@
 				793CAF512A58FCA200882EF4 /* CNLiveMineExchangeViewController.swift */,
 				79656E372AAEBA8E00119A61 /* CNLiveMineInputViewController.swift */,
 				7905BB482AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift */,
+				79803E262AD68D3100F05F68 /* CNLiveMineShopViewController.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -538,6 +543,7 @@
 				798A44E92A30135D00815935 /* CNLiveMineBodyListView.swift */,
 				798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */,
 				79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */,
+				79803E282AD6991200F05F68 /* CNLiveMineInputMessageView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1047,7 +1053,9 @@
 				798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */,
 				7C49312D2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift in Sources */,
 				790D019A2A2DCAE400C5978D /* CNLiveViewController.swift in Sources */,
+				79803E272AD68D3100F05F68 /* CNLiveMineShopViewController.swift in Sources */,
 				79A68C4C2A26EA6000DC3B43 /* (null) in Sources */,
+				79803E292AD6991200F05F68 /* CNLiveMineInputMessageView.swift in Sources */,
 				79282A462A2F457D00B5F8CF /* CNLiveMineViewController.swift in Sources */,
 				798A44F02A305BC200815935 /* UIButton+CNLiveExtensions.swift in Sources */,
 			);
@@ -38,6 +38,9 @@ class CNLiveBaseTabBarViewController: UITabBarController
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        
+        self.selectedIndex = 1
+        
     }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
@@ -57,6 +57,7 @@ class UploadManager: NSObject {
         CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupSignRequestKey(APPKey_wjj)
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.img_token_url)/vod_epg/getUploadAuthForApp", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -109,7 +110,7 @@ class UploadManager: NSObject {
     /// 设置图片名称
     /// - Returns: 图片名
     static private func createImageFileName() -> String {
-        let imageName = "802/mateCode/img/\(NSDate().string(withFormat: "yyyy/MM/dd") ?? "0000")/\(arc4random()).jpg"
+        let imageName = "802/mateCode/img/\(NSDate().string(withFormat: "yyyy/MM/dd") )/\(arc4random()).jpg"
         return imageName
     }
 }
@@ -15,6 +15,10 @@ let APPKey: String = CNLiveEnvironmentManager.shared.appKey
 let APPId_wjj: String  = CNLiveEnvironmentManager.shared.appId_wjj
 ///网家家应用的APPKey
 let APPKey_wjj: String = CNLiveEnvironmentManager.shared.appKey_wjj
+///网家家B端应用的APPID
+let APPId_wjj_b: String  = CNLiveEnvironmentManager.shared.appId_wjj_b
+///网家家B端应用的APPKey
+let APPKey_wjj_b: String = CNLiveEnvironmentManager.shared.appKey_wjj_b
 ///当前应用的登录请求域名
 let APPLoginHost: String! = CNLiveEnvironmentManager.shared.loginHost
 ///当前应用的Secret
@@ -23,6 +27,8 @@ let APPSecret: String = CNLiveEnvironmentManager.shared.appSecret
 let APPBaseMCUrl: String = CNLiveEnvironmentManager.shared.base_mc_url
 /// 网家家内接口
 let APPBaseWjjUrl: String = CNLiveEnvironmentManager.shared.base_wjj_url
+/// 网家家B端内接口
+let APPBaseWjjBUrl: String = CNLiveEnvironmentManager.shared.base_wjj_b_url
 /// 网家家内电商接口
 let APPBaseWjjShopUrl: String = CNLiveEnvironmentManager.shared.base_mjj_shop_url
 /// 商家版电商接口
@@ -60,12 +66,16 @@ class CNLiveEnvironmentManager: NSObject{
     var appId_wjj: String
     var appKey_wjj: String
     var appSecret: String
+    var appId_wjj_b: String
+    var appKey_wjj_b: String
     ///登录接口域名
     var loginHost: String
     /// 码云项目的主域名
     var base_mc_url: String
     /// 网家家域名请求
     var base_wjj_url: String
+    /// 网家家B端接口
+    var base_wjj_b_url: String
     /// 获取IM token 请求域名
     var img_token_url: String
     /// 网家家电商域名请求
@@ -88,9 +98,12 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey_wjj = ""
         self.loginHost = ""
         self.appSecret = ""
+        self.appId_wjj_b = ""
+        self.appKey_wjj_b = ""
         self.base_mc_url = ""
         self.img_token_url = ""
         self.base_wjj_url = ""
+        self.base_wjj_b_url = ""
         self.base_mjj_shop_url = ""
         self.base_shop_url = ""
         self.base_cms_url = ""
@@ -126,10 +139,13 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
         self.appId_wjj = "769_jetj7bq525"
         self.appKey_wjj = "0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"
+        self.appId_wjj_b = "769_jnjxdh3w53"
+        self.appKey_wjj_b = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCpeLgK0vk5POU5PQ"
         self.appSecret = "3cc9f12db322a3d3656012ef929604cf6d6847471535f9"
         self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
+        self.base_wjj_b_url = "https://managemall.cnlive.com:8080"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
         self.base_mjj_shop_url = "https://manageshop.cnlive.com"
         self.base_shop_url = "https://managemall.cnlive.com:8080"
@@ -141,10 +157,13 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = "ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac"
         self.appId_wjj = "769_jetj7bq525"
         self.appKey_wjj = "0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"
+        self.appId_wjj_b = "769_jnjxdh3w53"
+        self.appKey_wjj_b = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCpeLgK0vk5POU5PQ"
         self.appSecret = "3cc9f12db322a3d3656012ef929604cf6d6847471535f9"
         self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
+        self.base_wjj_b_url = "https://managemall.cnlive.com:8080"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
         self.base_mjj_shop_url = "https://manageshop.cnlive.com"
         self.base_shop_url = "https://managemall.cnlive.com:8080"
@@ -156,10 +175,13 @@ class CNLiveEnvironmentManager: NSObject{
         self.appKey = "064f392f84dfe7bbe9f1eabeda53ea02044213019b0406"
         self.appId_wjj = "769_jetj7bq525"
         self.appKey_wjj = "0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"
+        self.appId_wjj_b = "769_jnjxdh3w53"
+        self.appKey_wjj_b = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCpeLgK0vk5POU5PQ"
         self.appSecret = "68b5cc42fbdb466d56c2e22b00b1494feec8149f9dd32e"
         self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
+        self.base_wjj_b_url = "https://managemall.cnlive.com:8080"
         self.base_wjj_url = "https://apiwjj.cnlive.com"
         self.base_mjj_shop_url = "https://manageshop.cnlive.com"
         self.base_shop_url = "https://managemall.cnlive.com:8080"
@@ -35,4 +35,25 @@ extension NSString {
         }
         return false;
     }
+    
+    /// 时间戳转字符串
+    /// - Parameter dateFormat: 时间格式
+    /// - Returns: 返回
+    func timeStrChangeTotimeInterval(dateFormat:String?) -> String {
+        if !self.isNotBlank() {
+            return ""
+        }
+        let format = DateFormatter.init()
+        format.dateStyle = .medium
+        format.timeStyle = .short
+        format.locale = Locale(identifier: "zh_CN")
+        format.timeZone = TimeZone(abbreviation: "UTC+8:00")
+        if dateFormat == nil {
+            format.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        }else{
+            format.dateFormat = dateFormat
+        }
+        let date = format.date(from: self as String)
+        return "\(Int(date!.timeIntervalSince1970))"
+    }
 }
@@ -12,6 +12,7 @@ enum ListShowInfoType {
     case service
     case privacy
     case yinsi
+    case safety
 }
 class CNLiveInfoShowViewController: CNLiveBaseViewController, WKNavigationDelegate, WKUIDelegate {
@@ -64,6 +65,9 @@ class CNLiveInfoShowViewController: CNLiveBaseViewController, WKNavigationDelega
             case .yinsi:
                 titleName = "隐私协议"
                 attrString = "https://wjjh5.cnlive.com/yuanmaYszc.html"
+            case .safety:
+                titleName = "内容安全协议"
+                attrString = "https://wjj.ys1.cnliveimg.com/term/cnBNraqxy.html "
             case .none:
                 break
             }
@@ -215,9 +215,9 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
     @objc func sendInfoActionMothod() {
         sendButton.startAnimating()
         CNLiveMineViewModel.requestFeedBack(text: p_textView.text ?? "", contactWay: UserInfoManager.shared.userInfo.mobile, images: imageUrlArray) { [self] type, result in
+            sendButton.stopAnimating()
             if result {
                 showMessage(message: "内容提交成功")
-                sendButton.stopAnimating()
                 self.navigationController?.popViewController(animated: true)
             }
         }
@@ -68,23 +68,14 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         return copyButton
     }()
-    var is_sort: Bool!
     var pageNum: NSInteger
     var network_type: CNLiveMineResponseType!
     var _show_type:CNLiveMineInfoShowType!
     init(show_type:CNLiveMineInfoShowType) {
-        self.is_sort = false
         self.pageNum = 1
        super.init(nibName:nil, bundle:nil)
         _show_type = show_type
     }
-    
-    override func viewWillDisappear(_ animated: Bool) {
-        super.viewWillDisappear(animated)
-        if self.is_sort {
-            NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
-        }
-    }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -214,7 +205,7 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         for item in self.dataArray {
             let authModel = item as! StandListModel
             if authModel.auth {
-                is_sort = true
+                NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
                 break
             }
         }
@@ -332,7 +323,11 @@ extension CNLiveMineAddInfoViewController {
                 showMessage(message: "您已添加此身份,请直接使用")
                 return
             }
-            self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: listModel), animated: true)
+            if listModel.id == 9 {
+                self.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: listModel, tempArray: []), animated: true)
+            } else {
+                self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: listModel), animated: true)
+            }
         }
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@@ -359,14 +354,16 @@ extension CNLiveMineAddInfoViewController {
     func tableView(_ tableView: UITableView, moveRowAt sourceIndexPath: IndexPath,
                    to destinationIndexPath: IndexPath) {
         objc_sync_enter(self)
-        is_sort = true
-        swap(&dataArray[sourceIndexPath.row], &dataArray[destinationIndexPath.row])
-        let tempArray = NSMutableArray()
-        for model in dataArray {
-            let m = model as! MineAuthListModel
-            tempArray.add(m.identityId)
+        if dataArray.count > 1 {
+            NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
+            swap(&dataArray[sourceIndexPath.row], &dataArray[destinationIndexPath.row])
+            let tempArray = NSMutableArray()
+            for model in dataArray {
+                let m = model as! MineAuthListModel
+                tempArray.add(m.identityId)
+            }
+            StandSortManager.insertSortData(indexs: tempArray)
         }
-        StandSortManager.insertSortData(indexs: tempArray)
         objc_sync_exit(self)
     }
 }
@@ -6,9 +6,11 @@
 //
 import Foundation
+import SnapKit
 enum CNLiveMineAuthResultShowType {
     case detail//认证身份详情界面
+    case detail_shop//店铺信息提交完成
     case result_success//身份信息结果页成功
     case result_failer//身份信息结果页失败
 }
@@ -17,16 +19,24 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
     lazy var mainView: UIImageView = {
         let mainView = UIImageView()
-        mainView.backgroundColor = .white
         mainView.contentMode = .scaleToFill
-        mainView.isHidden = !(_show_type == .result_success || _show_type == .result_failer)
-        mainView.image = UIImage(named: (_show_type == .result_success ? "mine_auth_result_header_success" : "mine_auth_result_header_failer"))
+        mainView.backgroundColor = .clear
+        if _show_type == .detail_shop {
+            mainView.image = UIImage(named: "mine_header_upload_result_info")
+        } else {
+            mainView.isHidden = !(_show_type == .result_success || _show_type == .result_failer)
+            mainView.image = UIImage(named: (_show_type == .result_success ? "mine_auth_result_header_success" : "mine_auth_result_header_failer"))
+        }
         return mainView
     }()
     lazy var tipName: UILabel = {
         let tipName = UILabel.init()
-        tipName.text = "资料审核中"
+        if _show_type == .detail_shop {
+            tipName.text = "恭喜您，提交成功"
+        } else {
+            tipName.text = "资料审核中"
+        }
         tipName.font = BoldFont_18_Fit
         tipName.textAlignment = .center
         tipName.textColor = .black
@@ -35,7 +45,11 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
     lazy var tipDesc:  UILabel = {
         let tipDesc = UILabel.init()
-        tipDesc.text = "请耐心等待，预计一分钟之内完成审核"
+        if _show_type == .detail_shop {
+            tipDesc.text = "请等待3个工作日，审核通过即可入驻平台!"
+        } else {
+            tipDesc.text = "请耐心等待，预计一分钟之内完成审核"
+        }
         tipDesc.textColor = HexColor("#A9A9A9")
         tipDesc.textAlignment = .center
         tipDesc.font = Font_13
@@ -44,10 +58,20 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
     lazy var sendButton: UIButton = {
         let sendButton = UIButton(type: .custom)
-        sendButton.setTitle("确  定", for: .normal)
-        sendButton.setTitleColor(.white, for: .normal)
-        sendButton.titleLabel?.font = BoldFont_16_Fit
-        sendButton.layer.cornerRadius = 20
+        if _show_type == .detail_shop {
+            sendButton.backgroundColor = .clear
+            sendButton.setTitle(" 我知道了 ", for: .normal)
+            sendButton.setTitleColor(HexColor("#609BFF"), for: .normal)
+            sendButton.titleLabel?.font = BoldFont_16_Fit
+            sendButton.layer.borderColor = HexColor("#609BFF")?.cgColor
+            sendButton.layer.borderWidth = 0.5
+            sendButton.layer.cornerRadius = 15
+        } else {
+            sendButton.layer.cornerRadius = 20
+            sendButton.setTitle("确  定", for: .normal)
+            sendButton.setTitleColor(.white, for: .normal)
+            sendButton.titleLabel?.font = BoldFont_16_Fit
+        }
         sendButton.layer.masksToBounds = true
         sendButton.addTarget(self, action: #selector(sendInfoActionMothod), for: .touchUpInside)
         return sendButton
@@ -63,7 +87,7 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
     var _status: UIStatusBarStyle! = .lightContent
     var _listModel:StandListModel!
     var _show_type:CNLiveMineAuthResultShowType!
-    init(listModel:StandListModel,show_type:CNLiveMineAuthResultShowType) {
+    init(_ listModel:StandListModel,show_type:CNLiveMineAuthResultShowType) {
         super.init(nibName:nil, bundle:nil)
         _listModel = listModel
         _show_type = show_type
@@ -75,16 +99,28 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        if _show_type == .result_failer || _show_type == .result_success {
+        if _show_type == .detail_shop {
             let tempArray = NSMutableArray.init()
             self.navigationController?.viewControllers.forEach({ item in
-                if (item.isKind(of: CNLiveMineInputViewController.self)) {
+                if (item.isKind(of: CNLiveMineShopViewController.self)) {
                     tempArray.remove(item)
                 }else{
                     tempArray.add(item)
                 }
             })
             self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
+        } else {
+            if _show_type == .result_failer || _show_type == .result_success {
+                let tempArray = NSMutableArray.init()
+                self.navigationController?.viewControllers.forEach({ item in
+                    if (item.isKind(of: CNLiveMineInputViewController.self)) {
+                        tempArray.remove(item)
+                    }else{
+                        tempArray.add(item)
+                    }
+                })
+                self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
+            }
         }
     }
@@ -92,19 +128,33 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
         super.viewDidLoad()
         navigationBarHidden = false
-        view.backgroundColor = .white
-        topNavView.backgroundColor = .clear
-        titleName = "添加\(_listModel.name!)"
-        titleLabel.textColor = .white
-        leftBtnWhite = true
-        _status = .lightContent
-        setNeedsStatusBarAppearanceUpdate()
-        
-        
+        if _show_type == .detail_shop {
+            view.backgroundColor = HexColor("#F7F8FA")
+            topNavView.backgroundColor = .clear
+            titleName = "提交成功"
+            titleLabel.textColor = .black
+            _status = .default
+            setNeedsStatusBarAppearanceUpdate()
+        } else {
+            view.backgroundColor = .white
+            topNavView.backgroundColor = .clear
+            titleName = "添加\(_listModel.name!)"
+            titleLabel.textColor = .white
+            leftBtnWhite = true
+            _status = .lightContent
+            setNeedsStatusBarAppearanceUpdate()
+        }
+
         view.insertSubview(mainView, belowSubview: topNavView)
         mainView.snp.makeConstraints { make in
-            make.left.top.right.equalToSuperview()
-            make.height.equalTo(346)
+            if _show_type == .detail_shop {
+                make.centerX.equalToSuperview()
+                make.centerY.equalToSuperview().offset(-100)
+                make.size.equalTo(150)
+            } else {
+                make.left.top.right.equalToSuperview()
+                make.height.equalTo(346)
+            }
         }
         view.addSubview(tipName)
         tipName.snp.makeConstraints { make in
@@ -121,37 +171,48 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
         view.addSubview(sendButton)
         sendButton.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.top.equalTo(tipDesc.snp.bottom).offset(50)
-            make.height.equalTo(40)
-            make.width.equalTo(150)
-        }
-        view.addSubview(iDCardView)
-        iDCardView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.top.equalToSuperview().offset(get_system_nav_height()+30)
-            make.height.equalTo((KSreenWidth-40) * 0.64)
-            make.width.equalTo(KSreenWidth-40)
+            if _show_type == .detail_shop {
+                make.top.equalTo(tipDesc.snp.bottom).offset(20)
+                make.height.equalTo(30)
+                make.width.equalTo(100)
+            } else {
+                make.top.equalTo(tipDesc.snp.bottom).offset(50)
+                make.height.equalTo(40)
+                make.width.equalTo(150)
+            }
         }
-        sendButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
-        CNLiveMineViewModel.startKeepTimeWithStand(id: "\(_listModel.id)") { [weak self] result, respStatue in
-            if respStatue == .success {
-                let listBaseModel = result as! MineStandInfoBaseModel
-                self?.titleLabel.textColor = .black
-                self?.leftBtnWhite = false
-                self?.mainView.isHidden = true
-                self?.iDCardView.isHidden = false
-                self?.iDCardView.idModel = self?._listModel
-                self?.tipName.text = "恭喜您通过认证"
-                self?.tipDesc.text = listBaseModel.name!.count > 0 ? "您已是\(listBaseModel.name ?? "")!" : "恭喜您通过认证"
-                self?._status = .default
-                self?.setNeedsStatusBarAppearanceUpdate()
-                NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
-            }else{
-                self?.iDCardView.isHidden = true
-                self?.mainView.image = UIImage(named: "mine_auth_result_header_failer")
-                self?.tipName.text = "审核失败"
-                self?.tipDesc.text = "请您修改后重新提交"
+        if _show_type == .detail_shop {
+            
+        } else {
+            view.addSubview(iDCardView)
+            iDCardView.snp.makeConstraints { make in
+                make.centerX.equalToSuperview()
+                make.top.equalToSuperview().offset(get_system_nav_height()+30)
+                make.height.equalTo((KSreenWidth-40) * 0.64)
+                make.width.equalTo(KSreenWidth-40)
+            }
+            sendButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+            
+            CNLiveMineViewModel.startKeepTimeWithStand(id: "\(_listModel.id)") { [weak self] result, respStatue in
+                if respStatue == .success {
+                    let listBaseModel = result as! MineStandInfoBaseModel
+                    self?.titleLabel.textColor = .black
+                    self?.leftBtnWhite = false
+                    self?.mainView.isHidden = true
+                    self?.iDCardView.isHidden = false
+                    self?.iDCardView.idModel = self?._listModel
+                    self?.tipName.text = "恭喜您通过认证"
+                    self?.tipDesc.text = listBaseModel.name!.count > 0 ? "您已是\(listBaseModel.name ?? "")!" : "恭喜您通过认证"
+                    self?._status = .default
+                    self?.setNeedsStatusBarAppearanceUpdate()
+                    NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
+                }else{
+                    self?.iDCardView.isHidden = true
+                    self?.mainView.image = UIImage(named: "mine_auth_result_header_failer")
+                    self?.tipName.text = "审核失败"
+                    self?.tipDesc.text = "请您修改后重新提交"
+                }
             }
         }
     }
@@ -140,7 +140,7 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
                     showMessage(message: "上传成功")
                     sendButton.stopAnimating()
                     DispatchQueue.main.asyncAfter(deadline: .now()+1) { [self] in
-                        self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(listModel: _listModel,show_type: .result_success), animated: true)
+                        self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(_listModel,show_type: .result_success), animated: true)
                     }
                 }
             }
@@ -228,7 +228,7 @@ extension CNLiveMineInputViewController {
             self.view.endEditing(true)
             DispatchQueue.main.asyncAfter(deadline: .now()+0.5) {
                 MineStandListAlertView.showStandListView(infos: infoModel.children as NSArray,name: "选择\(infoModel.name ?? "")", show_type: show_type) {[weak self] text in
-                    infoModel.value = text
+                    infoModel.value = text as? String
                     self?.tableView.reloadData()
                     let is_result = self?.inspectResult()
                     self?.setupWithSendBtnStatue(statue: is_result ?? true)
+//
+//  CNLiveMineShopViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/10/11.
+//
+
+import UIKit
+import Foundation
+import SnapKit
+import APButton
+
+enum CNLiveMineShopResultShowType {
+    case one   //营业执照
+    case two   //法人身份证
+    case three //经营信息
+}
+class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegate {
+    
+    lazy var mainScrollView: UIScrollView = {
+        let mainScrollView = UIScrollView.init(frame: CGRectMake(0, get_system_nav_height(), KSreenWidth, KSreenHeight - get_system_nav_height() - get_system_tabbar_ui_offsetHeight() - 70))
+        mainScrollView.backgroundColor = HexColor("#F7F8FA")
+        mainScrollView.showsHorizontalScrollIndicator = true
+        mainScrollView.isScrollEnabled = true
+        return mainScrollView
+    }()
+    
+    lazy var oneView: MineInputShopHeaderView = {
+        let oneView = MineInputShopHeaderView.init(frame: CGRectMake(10, 0, KSreenWidth - 20, 0), array: oneArray as! Array<Any>, showType: .one)
+        oneView.backgroundColor = HexColor("#F7F8FA")
+        return oneView
+    }()
+    
+    lazy var twoView: MineInputShopHeaderView = {
+        let twoView = MineInputShopHeaderView.init(frame: CGRectMake(10, 0, KSreenWidth - 20, 0), array: twoArray as! Array<Any>, showType: .two)
+        twoView.backgroundColor = HexColor("#F7F8FA")
+        return twoView
+    }()
+    
+    lazy var threeView: MineInputShopHeaderView = {
+        let threeView = MineInputShopHeaderView.init(frame: CGRectMake(10, 0, KSreenWidth - 20, 0), array: threeArray as! Array<Any>, showType: .three)
+        threeView.backgroundColor = HexColor("#F7F8FA")
+        return threeView
+    }()
+    
+    lazy var textView: UITextView = {
+        let attributedString = NSMutableAttributedString(string: "我同意并已阅读《中国网+内容安全协议》",
+                                                         attributes: [.foregroundColor: HexColor("#999999") as Any, .font: Font_10])
+        let p_Range = NSRange(attributedString.string.range(of: "《中国网+内容安全协议》")!, in: attributedString.string)
+        attributedString.addAttribute(.link, value: "delegate://", range: p_Range)
+        let textView: UITextView = UITextView.init()
+        textView.backgroundColor = .clear
+        textView.isEditable = false
+        textView.isScrollEnabled = false
+        textView.delegate = self
+        textView.attributedText = attributedString
+        return textView
+    }()
+    
+    lazy var selectButton: HotButton = {
+        let selectButton = HotButton(type: .custom)
+        selectButton.backgroundColor = .clear
+        selectButton.setImage(UIImage(named: "Login_body_choose_btn_nomal"), for: .normal)
+        selectButton.setImage(UIImage(named: "Login_body_choose_btn_nomal"), for: .highlighted)
+        selectButton.setImage(UIImage(named: "Login_body_choose_btn_select"), for: .selected)
+        selectButton.contentMode = .scaleAspectFill
+        selectButton.addTarget(self, action: #selector(changeSelectBtnMothod), for: .touchUpInside)
+        return selectButton
+    }()
+    
+    lazy var nextButton: APButton = {
+        let nextButton = APButton()
+        nextButton.setTitleColor(.white, for: .normal)
+        nextButton.titleLabel?.font = BoldFont_16_Fit
+        nextButton.layer.cornerRadius = 20
+        nextButton.layer.masksToBounds = true
+        nextButton.activityIndicator.color = .white
+        nextButton.addTarget(self, action: #selector(sendInfoActionMothod), for: .touchUpInside)
+        return nextButton
+    }()
+    
+    var _listModel:StandListModel!
+    var _tempArray:NSMutableArray!
+    var _showType:CNLiveMineShopResultShowType!
+    init(showType: CNLiveMineShopResultShowType,listModel:StandListModel,tempArray:NSMutableArray) {
+       super.init(nibName:nil, bundle:nil)
+        _showType = showType
+        _listModel = listModel
+        _tempArray = tempArray
+    }
+    
+    /**
+     1 大输入框
+     2 小输入框
+     3 下弹框时间选择
+     4 开关按钮
+     5 竖图带提示图片选择
+     */
+    lazy var oneArray: NSMutableArray = {
+        let dataArray = NSMutableArray()
+        let array : [NSMutableDictionary] = [["title":"*商户名称","placeholder":"请填写","subTitle":"若营业执照上的名称为空或为“无字号”，请填写“个体户+经营者姓名如:个体户张三","show_type":"1","content":"","key":"commercial_name"],
+            ["title":"*统一社会信用代码","placeholder":"请填写","subTitle":"","show_type":"2","content":"","key":"credit_code"],
+            ["title":"*注册地址","placeholder":"请填写","subTitle":"","show_type":"2","content":"","key":"registered_address"],
+            ["title":"*经营期限(开始)","placeholder":"请选择","subTitle":"","show_type":"3","content":"","key":"management_start_time"],
+            ["title":"*经营期限(结束)","placeholder":"请选择","subTitle":"","show_type":"3","content":"","key":"management_stop_time"],
+            ["title":"*长期经营","placeholder":"","subTitle":"","show_type":"4","content":"","key":""],
+            ["title":"*营业执照","placeholder":"","subTitle":"请上传营业执照图片，格式为JPG、PNG (图片大小不超过5M)","show_type":"5","content":"","key":"business_licence_img"],
+        ]
+        dataArray.addObjects(from: array)
+        return dataArray
+    }()
+    
+    /**
+     6 单选
+     7 身份证类型
+     */
+    lazy var twoArray: NSMutableArray = {
+        let dataArray = NSMutableArray()
+        let array : [NSMutableDictionary] = [["title":"*证件类型","placeholder":"身份证","subTitle":"","show_type":"6","content":"","key":""],
+            ["title":"*身份证正面","placeholder":"","subTitle":"(请拍摄本人身份证正面注意避免证件反光)","show_type":"7","content":"","key":"identification_card1_img"],
+            ["title":"*身份证反面","placeholder":"","subTitle":"(请拍摄本人身份证反面注意避免证件反光)","show_type":"7","content":"","key":"identification_card2_img"],
+            ["title":"*证件号码","placeholder":"请填写","subTitle":"","show_type":"2","content":"","key":"certificates_code"],
+            ["title":"*证件持有人姓名","placeholder":"请填写","subTitle":"","show_type":"2","content":"","key":"certificates_name"],
+            ["title":"*证件有效期(开始)","placeholder":"请选择","subTitle":"","show_type":"3","content":"","key":"identity_start_time"],
+            ["title":"*证件有效期(结束)","placeholder":"请选择","subTitle":"","show_type":"3","content":"","key":"identity_stop_time"],
+        ]
+        dataArray.addObjects(from: array)
+        return dataArray
+    }()
+    
+    /**
+     8 正方图带提示图片选择
+     9 下弹框类型选择
+     */
+    lazy var threeArray: NSMutableArray = {
+        let dataArray = NSMutableArray()
+        let array : [NSMutableDictionary] = [["title":"*店铺名称","placeholder":"请填写","subTitle":"","show_type":"2","content":"","key":"store_name"],
+            ["title":"*店铺电话","placeholder":"请填写","subTitle":"","show_type":"2","content":"","key":"service_phone"],
+            ["title":"*经营类目","placeholder":"请选择","subTitle":"","show_type":"9","content":"","key":"category_pid","category":"","dataArray":categoryArray as NSArray],
+            ["title":"*店铺LOGO","placeholder":"","subTitle":"请上传LOGO图片 (尺寸100*100，图片大小5M以内)","show_type":"5","content":"","key":"store_logo"],
+            ["title":"特殊资质","placeholder":"","subTitle":"","show_type":"5","content":"","key":"aptitude_images"],
+        ]
+        dataArray.addObjects(from: array)
+        return dataArray
+    }()
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var is_agree : Bool = false //是否同意协议
+    var categoryArray: Array<NSDictionary>!
+    var temp_array: NSMutableArray = NSMutableArray.init()
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        navigationBarHidden = false
+        view.backgroundColor = HexColor("#F7F8FA")
+        
+        setupUI()
+        
+    }
+    
+    func setupUI() {
+        view.addSubview(mainScrollView)
+        
+        view.addSubview(nextButton)
+        nextButton.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-(get_system_tabbar_ui_offsetHeight()+10))
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(40)
+        }
+        
+        if _showType == .one {
+            titleName = "营业执照"
+            mainScrollView.addSubview(oneView)
+            nextButton.setTitle("下一步", for: .normal)
+            oneView.frame = CGRectMake(10, 10, KSreenWidth-20, CGFloat(oneView.temp_h+160))
+            mainScrollView.contentSize = CGSizeMake(KSreenWidth, CGFloat(oneView.temp_h+170))
+            nextButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        }
+        if _showType == .two {
+            titleName = "法人身份证"
+            temp_array.addObjects(from: _tempArray as! [Any])
+            mainScrollView.addSubview(twoView)
+            nextButton.setTitle("下一步", for: .normal)
+            twoView.frame = CGRectMake(10, 10, KSreenWidth-20, CGFloat(twoView.temp_h+160))
+            mainScrollView.contentSize = CGSizeMake(KSreenWidth, CGFloat(twoView.temp_h+10))
+            twoView.headerView.isHidden = true
+            twoView.titleLabel.isHidden = true
+            nextButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        }
+        if _showType == .three {
+            titleName = "经营信息"
+            temp_array.addObjects(from: _tempArray as! [Any])
+            showLoading(message: "")
+            CNLiveMineViewModel.requestApplyGroupInAction(resultBlock: { [self] result, respStatue in
+                if respStatue == .success {
+                    categoryArray = result as? Array<NSDictionary>
+                    mainScrollView.addSubview(threeView)
+                    nextButton.setTitle("提 交", for: .normal)
+                    threeView.frame = CGRectMake(10, 10, KSreenWidth-20, CGFloat(threeView.temp_h+160))
+                    mainScrollView.frame = CGRectMake(0, get_system_nav_height(), KSreenWidth, KSreenHeight - get_system_nav_height() - get_system_tabbar_ui_offsetHeight() - 80)
+                    mainScrollView.contentSize = CGSizeMake(KSreenWidth, CGFloat(threeView.temp_h+10))
+                    threeView.headerView.isHidden = true
+                    threeView.titleLabel.isHidden = true
+                    view.addSubview(textView)
+                    textView.snp.makeConstraints { make in
+                        make.centerX.equalToSuperview()
+                        make.bottom.equalTo(nextButton.snp.top).offset(-5)
+                    }
+                    view.addSubview(selectButton)
+                    selectButton.snp.makeConstraints { make in
+                        make.centerY.equalTo(textView)
+                        make.right.equalTo(textView.snp.left)
+                        make.size.equalTo(15)
+                    }
+                    setupWithSendBtnStatue(statue: false)
+                } else {
+                    
+                }
+            })
+        }
+    }
+    
+    @objc func sendInfoActionMothod() {
+        if _showType == .one {
+            var image: UIImage!
+            var is_have_image: Bool! = false
+            var temp_dict: NSMutableDictionary!
+            for dict in oneArray {
+                let content = (dict as! Dictionary<String, Any>)["content"]
+                let title = (dict as! Dictionary<String, Any>)["title"]
+                let show_type = (dict as! Dictionary<String, Any>)["show_type"]
+                let index =  (title! as! String).index((title! as! String).startIndex, offsetBy: 1)
+                if show_type as! String == "4" {
+                    continue
+                }
+                if content is NSString {
+                    if content as! String == "" {
+                        showMessage(message: "\((title! as! String)[index...])不能为空")
+                        return
+                    }
+                }
+                if content is UIImage  && content != nil{
+                    image = content as? UIImage
+                    temp_dict = dict as? NSMutableDictionary
+                }
+                
+                if title as! String == "*营业执照" && (content is NSString) && (content as! NSString).isNotBlank() {
+                    is_have_image = true
+                }
+            }
+            if is_have_image {
+                temp_array.addObjects(from: oneArray as! [Any])
+                self.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .two, listModel: _listModel, tempArray: temp_array), animated: true)
+                return
+            }
+            UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+                print("获取进度==>\(progress)")
+            }, successBlock: { [self] key,url in
+                hiddenLoading()
+                temp_dict.removeObject(forKey: "content")
+                temp_dict.setObject(url, forKey: "content" as NSCopying)
+                temp_array.addObjects(from: oneArray as! [Any])
+                self.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .two, listModel: _listModel, tempArray: temp_array), animated: true)
+            })
+        }
+        if _showType == .two {
+            var image_one: UIImage!
+            var image_two: UIImage!
+            var is_have_image_one: Bool! = false
+            var is_have_image_two: Bool! = false
+            var temp_dict_one: NSMutableDictionary!
+            var temp_dict_two: NSMutableDictionary!
+            for dict in twoArray {
+                let content = (dict as! Dictionary<String, Any>)["content"]
+                let title = (dict as! Dictionary<String, Any>)["title"]
+                let show_type = (dict as! Dictionary<String, Any>)["show_type"]
+                let index =  (title! as! String).index((title! as! String).startIndex, offsetBy: 1)
+                if show_type as! String == "6" {
+                    continue
+                }
+                if content is NSString {
+                    if content as! String == "" {
+                        showMessage(message: "\((title! as! String)[index...])不能为空")
+                        return
+                    }
+                }
+                if content is UIImage  && content != nil && title as! String == "*身份证正面" {
+                    image_one = content as? UIImage
+                    temp_dict_one = dict as? NSMutableDictionary
+                }
+                if content is UIImage  && content != nil && title as! String == "*身份证反面" {
+                    image_two = content as? UIImage
+                    temp_dict_two = dict as? NSMutableDictionary
+                }
+                if title as! String == "*身份证正面" && content is NSString && (content as! NSString).isNotBlank() {
+                    is_have_image_one = true
+                }
+                if title as! String == "*身份证反面" && content is NSString && (content as! NSString).isNotBlank() {
+                    is_have_image_two = true
+                }
+            }
+            if is_have_image_one || is_have_image_two {
+                temp_array.addObjects(from: twoArray as! [Any])
+                self.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .three, listModel: _listModel, tempArray: temp_array), animated: true)
+                return
+            }
+            UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+                temp_dict_one.removeObject(forKey: "content")
+                temp_dict_one.setObject(url, forKey: "content" as NSCopying)
+                UploadManager.uploadImage(imageData: image_two.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+                    hiddenLoading()
+                    temp_dict_two.removeObject(forKey: "content")
+                    temp_dict_two.setObject(url, forKey: "content" as NSCopying)
+                    temp_array.addObjects(from: twoArray as! [Any])
+                    self.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .three, listModel: _listModel, tempArray: temp_array), animated: true)
+                })
+            })
+        }
+        if _showType == .three {
+            if !is_agree {
+                showMessage(message: "请先同意《中国网+内容安全协议》")
+                return
+            }
+            var image_one: UIImage!
+            var image_two: UIImage!
+            var temp_dict_one: NSMutableDictionary!
+            var temp_dict_two: NSMutableDictionary!
+            for dict in threeArray {
+                let content = (dict as! Dictionary<String, Any>)["content"]
+                let title = (dict as! Dictionary<String, Any>)["title"]
+                let index =  (title! as! String).index((title! as! String).startIndex, offsetBy: 1)
+                if content is NSString {
+                    if title as! String == "特殊资质" && content is NSString {} else {
+                        if content as! String == "" {
+                            showMessage(message: "\((title! as! String)[index...])不能为空")
+                            return
+                        }
+                    }
+                }
+                if content is UIImage  && content != nil && title as! String == "*店铺LOGO" {
+                    image_one = content as? UIImage
+                    temp_dict_one = dict as? NSMutableDictionary
+                }
+                if content is UIImage  && content != nil && title as! String == "特殊资质" {
+                    image_two = content as? UIImage
+                    temp_dict_two = dict as? NSMutableDictionary
+                }
+            }
+            UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+                temp_dict_one.removeObject(forKey: "content")
+                temp_dict_one.setObject(url, forKey: "content" as NSCopying)
+                if image_two == nil {
+                    hiddenLoading()
+                    temp_array.addObjects(from: threeArray as! [Any])
+                    uploadWithMessage()
+                }else{
+                    UploadManager.uploadImage(imageData: image_two.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+                        hiddenLoading()
+                        temp_dict_two.removeObject(forKey: "content")
+                        temp_dict_two.setObject(url, forKey: "content" as NSCopying)
+                        temp_array.addObjects(from: threeArray as! [Any])
+                        uploadWithMessage()
+                    })
+                }
+            })
+        }
+    }
+    
+    @objc func uploadWithMessage() {
+        let paramDict = NSMutableDictionary.init()
+        for dict in temp_array {
+            let content = (dict as! Dictionary<String, Any>)["content"]
+            let key = (dict as! Dictionary<String, Any>)["key"]
+            if (dict as! Dictionary<String, Any>)["category"] != nil {
+                let category = (dict as! Dictionary<String, Any>)["category"]
+                paramDict.addEntries(from: ["category":category as Any])
+            }
+            if key as! String != ""{
+                paramDict.addEntries(from: ["\(key ?? "")":content as Any])
+            }
+        }
+        paramDict.addEntries(from: ["uid":UserInfoManager.shared.userInfo.uid])
+        showLoading(message: "")
+        nextButton.startAnimating()
+        CNLiveMineViewModel.requestApplyShopUserInAction(paramDict: paramDict, resultBlock: { [self] result, respStatue in
+            nextButton.stopAnimating()
+            if respStatue == .success {
+                showMessage(message: "上传成功")
+                DispatchQueue.main.asyncAfter(deadline: .now()+1) { [self] in
+                    self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(StandListModel.init(), show_type: .detail_shop), animated: true)
+                }
+            }
+        })
+    }
+    
+    @objc func changeSelectBtnMothod(sender : UIButton) {
+        sender.isSelected = !sender.isSelected
+        is_agree = sender.isSelected
+        if is_agree {
+            nextButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        } else {
+            nextButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 0.3),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 0.3)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        }
+    }
+    
+    private func setupWithSendBtnStatue(statue: Bool) {
+        var alpha = 0.3
+        if statue {
+            alpha = 1
+        }
+        nextButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: alpha),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: alpha)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+    }
+}
+extension CNLiveMineShopViewController {
+    func textView(_ textView: UITextView, shouldInteractWith textAttachment: NSTextAttachment, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
+        return false
+    }
+    func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
+        if URL.absoluteString == "delegate://" {
+            self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .safety, is_login: true), animated: true)
+            return false
+        }
+        return true
+    }
+}
@@ -835,7 +835,7 @@ class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
         if (infoModel.value ?? "").count  > 0 {
             contentField.text = infoModel.value
         }
-        contentField.placeholder = "请输入\(infoModel.name ?? "")"
+        contentField.placeholder = "请输入\(infoModel.name ?? "")"//infoModel.sub_title?.count == 0 ? "请输入\(infoModel.name ?? "")" : infoModel.sub_title
         line_label.isHidden = is_last
         if infoModel.inputType == 2 {
             contentField.keyboardType = .numberPad
@@ -9,7 +9,7 @@ import Foundation
-typealias CloseGenderResultBlock = (_ text: String) ->Void
+typealias CloseGenderResultBlock = (_ text: Any) ->Void
 class MineInfoAlertView: UIView {
     lazy var tapGesture = UITapGestureRecognizer()
@@ -544,6 +544,7 @@ class UpdataAlertView: UIView {
 enum CNLiveStandListAlertShowType {
     case custom
+    case text
     case date
 }
 class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
@@ -569,7 +570,11 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
         pickerView.backgroundColor = .white
         pickerView.delegate = self
         pickerView.dataSource = self
-        pickerView.isHidden = !(_show_type == .custom)
+        pickerView.isHidden = true
+        if !(_show_type == .custom) || !(_show_type == .text) {
+            pickerView.isHidden = false
+        }
+        
         return pickerView
     }()
@@ -630,7 +635,7 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
         return closeButton
     }()
-    var text: String?
+    var text: Any?
     var _infos: NSArray?
     var _show_type: CNLiveStandListAlertShowType?
     var result: CloseGenderResultBlock?
@@ -641,6 +646,8 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
         _show_type = show_type//56842.5+7840.34
         if _show_type == .custom {
             text = (infos.firstObject as! MineStandInfoModel).name
+        } else if _show_type == .text {
+            text = infos.firstObject as? Dictionary<String, String>
         }else{
             let formatter = DateFormatter()
             formatter.dateFormat = "yyyy-MM-dd"
@@ -733,8 +740,15 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
     }
     func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
-        let infoModel = _infos![row] as! MineStandInfoModel
-        return infoModel.name
+        if _show_type == .custom {
+            let infoModel = _infos![row] as! MineStandInfoModel
+            return infoModel.name
+        }
+        if _show_type == .text {
+            let dict = _infos![row] as? Dictionary<String, String>
+            return dict?["title"] ?? ""
+        }
+        return ""
     }
     func pickerView(_ pickerView: UIPickerView, rowHeightForComponent component: Int) -> CGFloat {
@@ -742,8 +756,13 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
     }
     func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
-        let infoModel = _infos![row] as! MineStandInfoModel
-        text = infoModel.name ?? ""
+        if _show_type == .custom {
+            let infoModel = _infos![row] as! MineStandInfoModel
+            text = infoModel.name ?? ""
+        }
+        if _show_type == .text {
+            text = _infos![row] as? Dictionary<String, String>
+        }
     }
     required init?(coder: NSCoder) {
+//
+//  CNLiveMineInputMessageView.swift
+//  metaCode
+//
+//  Created by open on 2023/10/11.
+//
+
+import Foundation
+import SnapKit
+import HXPHPicker
+
+typealias changeEndTimeResultBlock = (_ isOn: Bool) ->Void
+/// 里面显示样式
+class MineInputTextShopCustomView: UIView, UITextViewDelegate, UITextFieldDelegate, PhotoPickerControllerDelegate {
+    
+    lazy var nameLabel: UILabel = {
+        let nameLabel = UILabel.init()
+        nameLabel.backgroundColor = .white
+        nameLabel.textColor = .black
+        nameLabel.font = BoldFont_18_Fit
+        if _dict["title"] as! String != "特殊资质" {
+            let attribute = NSMutableAttributedString.init(string: _dict["title"] as! String)
+            attribute.addAttributes([NSAttributedString.Key.foregroundColor: HexColor("#FF725C")!], range: NSRange.init(location: 0, length: 1))
+            nameLabel.attributedText = attribute
+        } else {
+            nameLabel.text = _dict["title"] as? String
+        }
+
+        return nameLabel
+    }()
+    
+    lazy var contentTextField: UITextField = {
+        let contentTextField = UITextField.init()
+        contentTextField.backgroundColor = .white
+        contentTextField.font = BoldFont_16_Fit
+        contentTextField.textAlignment = .right
+        contentTextField.delegate = self
+        contentTextField.isHidden = _dict["show_type"] as! String != "2"
+        contentTextField.keyboardType = .default
+        contentTextField.clearButtonMode = .whileEditing
+        contentTextField.placeholder = _dict["placeholder"] as? String
+        return contentTextField
+    }()
+    
+    lazy var contentTextView: UITextView = {
+        let contentTextView = UITextView.init()
+        contentTextView.backgroundColor = HexColor("#F7F8FA")
+        contentTextView.font = BoldFont_16_Fit
+        contentTextView.keyboardType = .default
+        contentTextView.text = _dict["subTitle"] as? String
+        contentTextView.textColor = UIColor.lightGray
+        contentTextView.delegate = self
+        contentTextView.isHidden = _dict["show_type"] as! String != "1"
+        return contentTextView
+    }()
+    
+    lazy var moreBtn: UIButton = {
+        let moreBtn = UIButton(type: .custom)
+        moreBtn.frame = CGRect(x: 0, y: 0, width: 70, height: 30)
+        moreBtn.setTitleColor(HexColor("#B4B4B4"), for: .normal)
+        moreBtn.titleLabel?.font = BoldFont_16_Fit
+        moreBtn.isHidden = true
+        moreBtn.setTitle(_dict["placeholder"] as? String, for: .normal)
+        if _dict["show_type"] as! String == "3" {
+            moreBtn.isHidden = false
+        }
+        if _dict["show_type"] as! String == "9" {
+            moreBtn.isHidden = false
+        }
+        moreBtn.setImage(UIImage(named: "mine_header_message_gray_more"), for: .normal)
+        moreBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
+        moreBtn.addTarget(self, action: #selector(checkInAction), for: .touchUpInside)
+        return moreBtn
+    }()
+    
+    lazy var switchView: UISwitch = {
+        let switchView = UISwitch.init()
+        switchView.isOn = false
+        switchView.onTintColor = HexColor("#609AFF")
+        switchView.isHidden = _dict["show_type"] as! String != "4"
+        switchView.addTarget(self, action: #selector(switchInAction), for: .valueChanged)
+        return switchView
+    }()
+    
+    lazy var bigImageBtn: UIButton = {
+        let bigImageBtn = UIButton(type: .custom)
+        bigImageBtn.isHidden = true
+        if _dict["show_type"] as! String == "7" {
+            bigImageBtn.isHidden = false
+            if _dict["title"] as! String == "*身份证正面" {
+                bigImageBtn.setImage(UIImage(named: "mine_header_icon_idcard_zhen"), for: .normal)
+            }
+            if _dict["title"] as! String == "*身份证反面" {
+                bigImageBtn.setImage(UIImage(named: "mine_header_icon_idcard_fan"), for: .normal)
+            }
+        }
+        if _dict["show_type"] as! String == "5" || _dict["show_type"] as! String == "8" {
+            bigImageBtn.isHidden = false
+            bigImageBtn.setImage(UIImage(named: "mine_header_icon_sellect"), for: .normal)
+        }
+        bigImageBtn.contentMode = .scaleAspectFit
+        bigImageBtn.backgroundColor = .white
+        bigImageBtn.layer.cornerRadius = 5
+        bigImageBtn.layer.masksToBounds = true
+        bigImageBtn.addTarget(self, action: #selector(selectInAction), for: .touchUpInside)
+        return bigImageBtn
+    }()
+    
+    lazy var changeBtn: UIButton = {
+        let changeBtn = UIButton(type: .custom)
+        changeBtn.backgroundColor = UIColor.init(white: 0, alpha: 0.5)
+        changeBtn.setTitle("更换", for: .normal)
+        changeBtn.setTitleColor(.white, for: .normal)
+        changeBtn.titleLabel?.font = Font_14_Fit
+        changeBtn.isHidden = true
+        changeBtn.addTarget(self, action: #selector(selectInAction), for: .touchUpInside)
+        return changeBtn
+    }()
+    
+    lazy var descLabel: UILabel = {
+        let descLabel = UILabel.init()
+        descLabel.textColor = HexColor("#B4B4B4")
+        descLabel.font = Font_14_Fit
+        descLabel.textAlignment = .left
+        descLabel.isHidden = true
+        if _dict["show_type"] as! String == "7" {
+            descLabel.isHidden = false
+            let attribute = NSMutableAttributedString.init(string: _dict["subTitle"] as! String)
+            attribute.addAttributes([NSAttributedString.Key.foregroundColor: HexColor("#FF725C")!], range: NSRange.init(location: 9, length: 2))
+            attribute.addAttributes([NSAttributedString.Key.font: BoldFont_16_Fit], range: NSRange.init(location: 9, length: 2))
+            descLabel.attributedText = attribute
+        }
+        if _dict["show_type"] as! String == "5" || _dict["show_type"] as! String == "8" {
+            descLabel.isHidden = false
+            descLabel.text = _dict["subTitle"] as? String
+        }
+        descLabel.numberOfLines = 0
+        descLabel.lineBreakMode = .byWordWrapping
+        return descLabel
+    }()
+    
+    lazy var selectView: UIView = {
+        let selectView = UIView.init()
+        selectView.backgroundColor = .white
+        selectView.isHidden = _dict["show_type"] as! String != "6"
+        selectView.layer.cornerRadius = 8
+        selectView.layer.masksToBounds = true
+        selectView.layer.borderColor = HexColor("#666666")?.cgColor
+        selectView.layer.borderWidth = 0.5
+        return selectView
+    }()
+    
+    lazy var selectButton : UIButton = {
+        let selectButton = UIButton(type: .custom)
+        selectButton.backgroundColor = HexColor("#F5A623")
+        selectButton.isHidden = _dict["show_type"] as! String != "6"
+        selectButton.layer.cornerRadius = 5
+        selectButton.layer.masksToBounds = true
+        selectButton.setImage(UIImage.imageWithColor(color: HexColor("#F5A623")!, size: CGSizeMake(5, 5)), for: .normal)
+        return selectButton
+    }()
+    
+    lazy var selectLabel : UILabel = {
+        let selectLabel = UILabel.init()
+        selectLabel.text = "身份证"
+        selectLabel.isHidden = _dict["show_type"] as! String != "6"
+        selectLabel.textColor = HexColor("#333333")
+        selectLabel.font = Font_16_Fit
+        selectLabel.textAlignment = .right
+        return selectLabel
+    }()
+    
+    lazy var bottem_line: UILabel = {
+        let bottem_line = UILabel.init()
+        bottem_line.backgroundColor = HexColor("#E6E6E6")
+        return bottem_line
+    }()
+    
+    var _dict: NSMutableDictionary!
+    var _resultBlock: changeEndTimeResultBlock!
+    init(frame: CGRect, dict: NSMutableDictionary, resultBlock: @escaping changeEndTimeResultBlock) {
+        super.init(frame: frame)
+        _dict = dict
+        _resultBlock = resultBlock
+        
+        addSubview(nameLabel)
+        nameLabel.snp.makeConstraints { make in
+            if _dict["show_type"] as! String == "1" ||
+                _dict["show_type"] as! String == "5" ||
+                _dict["show_type"] as! String == "7" ||
+                _dict["show_type"] as! String == "8" {
+                make.top.equalToSuperview().offset(10)
+                make.height.equalTo(25)
+            } else {
+                make.centerY.equalToSuperview()
+            }
+            make.left.equalToSuperview().offset(10)
+        }
+        addSubview(contentTextField)
+        contentTextField.snp.makeConstraints { make in
+            if _dict["show_type"] as! String == "1" {
+                make.top.equalToSuperview().offset(10)
+                make.height.equalTo(20)
+            } else {
+                make.centerY.equalToSuperview()
+                make.height.equalTo(40)
+            }
+            make.right.equalToSuperview().offset(-10)
+            make.left.equalTo(nameLabel.snp.right).offset(10)
+ 
+        }
+        addSubview(bottem_line)
+        bottem_line.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(0.5)
+            make.bottom.equalToSuperview().offset(-0.5)
+        }
+        
+        addSubview(contentTextView)
+        contentTextView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.top.equalTo(nameLabel.snp.bottom).offset(10)
+            make.bottom.equalTo(bottem_line.snp.top).offset(10)
+        }
+    
+        addSubview(moreBtn)
+        moreBtn.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-10)
+            make.left.equalTo(nameLabel.snp.right).offset(10)
+        }
+        
+        addSubview(switchView)
+        switchView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-10)
+        }
+        
+        addSubview(bigImageBtn)
+        bigImageBtn.snp.makeConstraints { make in
+            if _dict["show_type"] as! String == "7" {
+                make.top.equalTo(nameLabel.snp.bottom).offset(10)
+                make.left.equalToSuperview().offset(10)
+                make.right.bottom.equalToSuperview().offset(-10)
+            } else {
+                make.top.equalTo(nameLabel.snp.bottom).offset(10)
+                make.left.equalToSuperview().offset(10)
+                if _dict["show_type"] as! String == "5" {
+                    make.bottom.equalToSuperview().offset(-10)
+                    make.width.equalTo(100)
+                }
+                if _dict["show_type"] as! String == "8" {
+                    make.size.equalTo(200)
+                }
+            }
+        }
+        
+        bigImageBtn.addSubview(changeBtn)
+        changeBtn.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(30)
+        }
+        
+        addSubview(descLabel)
+        descLabel.snp.makeConstraints { make in
+            if _dict["show_type"] as! String == "7" {
+                make.centerY.equalTo(nameLabel)
+                make.left.equalTo(nameLabel.snp.right).offset(10)
+                make.right.equalToSuperview().offset(-10)
+            } else {
+                make.bottom.equalToSuperview().offset(-10)
+                make.left.equalTo(bigImageBtn.snp.right).offset(10)
+                make.right.equalToSuperview().offset(-10)
+            }
+        }
+        
+        addSubview(selectLabel)
+        selectLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-10)
+        }
+        
+        addSubview(selectView)
+        selectView.snp.makeConstraints { make in
+            make.centerY.equalTo(nameLabel)
+            make.right.equalTo(selectLabel.snp.left).offset(-5)
+            make.size.equalTo(16)
+        }
+        
+        selectView.addSubview(selectButton)
+        selectButton.snp.makeConstraints { make in
+            make.top.left.equalToSuperview().offset(3)
+            make.size.equalTo(10)
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func textViewDidBeginEditing(_ textView: UITextView) {
+        if textView.textColor == UIColor.lightGray {
+            textView.text = nil
+            textView.textColor = UIColor.black
+        }
+    }
+    
+    func textViewShouldEndEditing(_ textView: UITextView) -> Bool {
+        if textView.text.isEmpty {
+            textView.text = _dict["subTitle"] as? String
+            textView.textColor = UIColor.lightGray
+        } else {
+            _dict.setObject(textView.text ?? "", forKey: "content" as NSCopying)
+        }
+        return true
+    }
+    
+    func textFieldShouldEndEditing(_ textField: UITextField) -> Bool {
+        if !textField.text!.isEmpty {
+            _dict.setObject(textField.text ?? "", forKey: "content" as NSCopying)
+        }
+        return true
+    }
+    
+    
+    
+    @objc func checkInAction() {
+        
+        let title = (_dict["title"] as! String)
+        let index =  title.index(title.startIndex, offsetBy: 1)
+        let dataArray = NSMutableArray.init()
+        if title == "*经营类目" {
+            dataArray.addObjects(from: _dict["dataArray"] as! [NSDictionary])
+        }
+        contentTextField.resignFirstResponder()
+        contentTextView.resignFirstResponder()
+        MineStandListAlertView.showStandListView(infos: dataArray, name:String(title[index...]), show_type:dataArray.count == 0 ? .date : .text, result: { [self] text in
+            if dataArray.count == 0 {
+                _dict.setObject((text as! NSString).timeStrChangeTotimeInterval(dateFormat: "yyyy-MM-dd"), forKey: "content" as NSCopying)
+                moreBtn.setTitle(text as? String, for: .normal)
+            } else {
+                let dict = text as! NSDictionary
+                _dict.setObject(dict["id"] as! String, forKey: "content" as NSCopying)
+                _dict.setObject(dict["title"] as! String, forKey: "category" as NSCopying)
+                moreBtn.setTitle(dict["title"] as? String, for: .normal)
+            }
+            moreBtn.setImage(UIImage(named: "mine_header_message_gray_more"), for: .normal)
+            moreBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
+            moreBtn.setTitleColor(UIColor.black, for: .normal)
+        })
+    }
+    
+    @objc func switchInAction(sender: UISwitch) {
+        _resultBlock(sender.isOn)
+    }
+    
+    @objc func selectInAction() {
+        contentTextField.resignFirstResponder()
+        contentTextView.resignFirstResponder()
+        var crop = PhotoCroppingConfiguration.init()
+        crop.isRoundCrop = true
+        let configuration = PhotoEditorConfiguration()
+        configuration.state = .cropping
+        configuration.cropping = crop
+        configuration.fixedCropState = true
+        let config = PhotoTools.getWXPickerConfig()
+        config.selectMode = .single
+        config.selectOptions = .photo
+        config.photoEditor = configuration
+        config.maximumSelectedPhotoCount = 1
+        let pickerController = PhotoPickerController(picker: config)
+        pickerController.pickerDelegate = self
+        pickerController.isOriginal = false
+        currentViewController()?.navigationController?.present(pickerController, animated: true, completion: nil)
+    }
+    
+    
+    
+    func pickerController(_ pickerController: PhotoPickerController,
+                            didFinishSelection result: PickerResult) {
+        result.getImage { [self] (image, photoAsset, index) in
+            if let image = image {
+                _dict.setObject(image , forKey: "content" as NSCopying)
+            }else {
+                print("failed")
+            }
+        } completionHandler: { [self] (images) in
+            self.bigImageBtn.setImage(images.first, for: .normal)
+            if _dict["show_type"] as! String == "7"  || _dict["show_type"] as! String == "5" || _dict["show_type"] as! String == "8" {
+                self.changeBtn.isHidden = false
+            }
+        }
+    }
+}
+
+/// 顶部流程图显示
+class MineInputShopHeaderView : UIView {
+    
+    lazy var headerView : UIImageView = {
+        let headerView = UIImageView.init()
+        headerView.backgroundColor = .white
+        headerView.image = UIImage(named: "mine_header_icon_flow")
+        headerView.contentMode = .scaleAspectFit
+        headerView.layer.masksToBounds = true
+        return headerView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.text = "营业执照"
+        titleLabel.textColor = HexColor("#9D9D9D")
+        titleLabel.font = BoldFont_17_Fit
+        return titleLabel
+    }()
+    
+    var temp_h: Int! = 10
+    var temp_dict:NSMutableDictionary!
+    var _showType:CNLiveMineShopResultShowType!
+    var temp_contentView : MineInputTextShopCustomView!
+    init(frame: CGRect, array: Array<Any>, showType: CNLiveMineShopResultShowType) {
+        _showType = showType
+        
+        super.init(frame: frame)
+
+        addSubview(headerView)
+        headerView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(10)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(100)
+        }
+        
+        addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(headerView.snp.bottom).offset(20)
+            make.left.equalToSuperview().offset(10)
+            make.height.equalTo(20)
+        }
+        
+        for dic in array {
+            loadContentView(dic: dic as! NSMutableDictionary)
+        }
+    }
+    
+    func loadContentView(dic: NSMutableDictionary) {
+        var item_h = 60
+        if dic["show_type"]! as! String == "1" {
+            item_h = 150
+        } else if (dic["show_type"]! as! String == "5" || dic["show_type"]! as! String == "8") {
+            item_h = 200
+        } else if (dic["show_type"]! as! String == "7") {
+            item_h = 250
+        }
+        let contentView = MineInputTextShopCustomView.init(frame: CGRectZero, dict: dic, resultBlock: { [self] isOn in
+            if isOn {
+                temp_dict.setObject("-1", forKey: "content" as NSCopying)
+                temp_contentView.moreBtn.setTitle("长期", for: .normal)
+                temp_contentView.moreBtn.setImage(UIImage(named: "mine_header_message_gray_more"), for: .normal)
+                temp_contentView.moreBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
+                temp_contentView.moreBtn.setTitleColor(UIColor.black, for: .normal)
+            } else {
+                temp_dict.setObject("", forKey: "content" as NSCopying)
+                temp_contentView.moreBtn.setTitle("请选择", for: .normal)
+                temp_contentView.moreBtn.setImage(UIImage(named: "mine_header_message_gray_more"), for: .normal)
+                temp_contentView.moreBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
+                temp_contentView.moreBtn.setTitleColor(HexColor("#B4B4B4"), for: .normal)
+            }
+        })
+        contentView.backgroundColor = .white
+        addSubview(contentView)
+        contentView.snp.makeConstraints { make in
+            if _showType == .one {
+                make.top.equalTo(titleLabel.snp.bottom).offset(temp_h)
+            }
+            if _showType == .two ||  _showType == .three{
+                make.top.equalToSuperview().offset(temp_h)
+            }
+            make.left.right.equalToSuperview()
+            make.height.equalTo(item_h)
+        }
+        if dic["title"]! as! String == "*经营期限(结束)" {
+            temp_contentView = contentView
+            temp_dict = dic
+        }
+        temp_h += item_h
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
@@ -225,7 +225,8 @@ class MineStandInfoModel: BaseModel {
     var authInfoId: Int = 0
     var sort: Int = 0
     var name: String?//卡片标签
-    var inputType: Int = 0//1文本输入 2数字输入 3下拉选择 4后台生成时间 5后台生成编码 6头像类型
+    var sub_title: String?//报名项说明
+    var inputType: Int = 0//1 文本输入 2数字输入 3下拉选择 4认证时间 5认证编码 6正图 7小竖图 8大横图 9单选 10多选 11选项 12时间选择器 13主标题
     var nonEmpty: Bool = false
     var length: Int = 10
     var children = [MineStandInfoModel]()
@@ -175,6 +175,7 @@ class CNLiveMineViewModel: NSObject {
     static func requestFeedBack(text: String,contactWay: String,images: NSMutableArray,resultBlock: @escaping resultBlock) {
         if (text.count == 0) {
             showMessage(message: "反馈内容不能为空")
+            resultBlock(.other,false)
             return
         }
         images.remove("")
@@ -446,6 +447,17 @@ class CNLiveMineViewModel: NSObject {
                     if resp["data"] is NSNull {
                         resultBlock(NSNull(),.failed)
                     } else {
+                        
+//                        do {
+//                            let jsonData = try JSONSerialization.data(withJSONObject: resp, options: .prettyPrinted)
+//                            if let jsonString = String(data: jsonData, encoding: .utf8) {
+//                                print("===>"+jsonString)
+//                            }
+//                        } catch {
+//                            print("error \(error)")
+//                        }
+                        
+                        
                         let newsModel = dictionaryToModel(resp as! [String : Any], MineStandInfoBaseModel.self,"data") as! MineStandInfoBaseModel
                         if type == .nodate {
                             let tempArray = NSMutableArray()
@@ -798,6 +810,78 @@ class CNLiveMineViewModel: NSObject {
         }
     }
+    /// 获取一级分类类别
+    /// - Parameter resultBlock: 返回
+    static func requestApplyGroupInAction(resultBlock: @escaping resultNewsBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/getApplyGroup", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["code"] ?? "0")"
+                if (errorCode == "200") {
+                    let data_dict = resp["data"] as! NSDictionary
+                    resultBlock(data_dict["list"] as! Array<Dictionary<String, String>>,.success)
+                } else {
+                    showMessage(message: resp["message"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "获取失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    /// 商家申请提交
+    /// - Parameters:
+    ///   - paramDict: 店铺信息
+    ///   - resultBlock: 返回
+    static func requestApplyShopUserInAction(paramDict: NSDictionary,resultBlock: @escaping resultNewsBlock) {
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/applyShopUser", param: paramDict as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["code"] ?? "0")"
+                if (errorCode == "200") {
+                    resultBlock(resp,.success)
+                } else {
+                    showMessage(message: resp["message"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "获取失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    
     /// 获取十位时间戳
     static var timeStamp: Int {
         let timeInterval: TimeInterval = NSDate().timeIntervalSince1970
@@ -77,13 +77,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setResponseSerializerType(.JSON)
         CNLiveNetworking.setupBaseURL(APPLoginHost)
-        
-
-        
     }
-    
-    
-
-
 }
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_header_icon_flow@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_header_icon_flow@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_header_icon_idcard_fan@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_header_icon_idcard_fan@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_header_icon_idcard_zhen@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_header_icon_idcard_zhen@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_header_icon_sellect@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_header_icon_sellect@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_header_upload_result_info@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_header_upload_result_info@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}