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

“张旭”
2 parents 42aab52a aad74940
Showing 2 changed files with 13 additions and 2 deletions
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
@@ -239,7 +239,17 @@ class StandSortManager: NSObject {
     static public func sortAllListData(stands: NSArray) -> NSArray {
         let have_id_auths = StandSortManager.readStandSort()
         if have_id_auths.count == 0 {
-            return stands
+            //1.29 需求 如果第一次的时候没有进行排序,则把已经认证的放在第一位
+            let tempArray = NSMutableArray()
+            for item in stands.reverseObjectEnumerator().allObjects {
+                let listModel = item as! StandListModel
+                if listModel.auth {
+                    tempArray.insert(listModel, at: 0)
+                } else {
+                    tempArray.add(listModel)
+                }
+            }
+            return tempArray
         }
         print("allList接口里面===>\(have_id_auths)")
         let have_auths = NSMutableArray()
@@ -181,7 +181,8 @@ extension CNLiveMineViewController {
  
         if indexPath.section == 4 {
             if indexPath.row == 0 {
-                self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
+//                self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
+                StandSortManager.removeStandSort()
             }
             if indexPath.row == 1 {
                 self.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: true)