Commit 08c5192bd57cf822e7e007d623bfeb66e78c71c5
1 parent
fef50fca
提交修改
Showing
13 changed files
with
48 additions
and
4 deletions
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthFormViewController.swift
| @@ -58,14 +58,11 @@ class CNLiveMineAuthFormViewController: CNLiveBaseViewController, UITableViewDel | @@ -58,14 +58,11 @@ class CNLiveMineAuthFormViewController: CNLiveBaseViewController, UITableViewDel | ||
| 58 | return MineAuthFormTableViewCell() | 58 | return MineAuthFormTableViewCell() |
| 59 | } | 59 | } |
| 60 | if indexPath.section == 0 && indexPath.row == 1 { | 60 | if indexPath.section == 0 && indexPath.row == 1 { |
| 61 | - cell.mainView.image = UIImage(named: "mine_persion_auth_btn") | 61 | + cell.mainView.image = UIImage(named: "mine_form_auth_btn_persion") |
| 62 | } | 62 | } |
| 63 | if indexPath.section == 1 { | 63 | if indexPath.section == 1 { |
| 64 | cell.mainView.image = UIImage(named: "mine_form_auth_btn") | 64 | cell.mainView.image = UIImage(named: "mine_form_auth_btn") |
| 65 | } | 65 | } |
| 66 | -// if indexPath.section == 1 && indexPath.row == 1 { | ||
| 67 | -// cell.mainView.image = UIImage(named: "mine_form_auth_btn") | ||
| 68 | -// } | ||
| 69 | return cell | 66 | return cell |
| 70 | } | 67 | } |
| 71 | func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { | 68 | func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { |
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
| @@ -522,6 +522,9 @@ class CNLiveMineViewModel: NSObject { | @@ -522,6 +522,9 @@ class CNLiveMineViewModel: NSObject { | ||
| 522 | } else if newsModel.enterpriseAuthInfos.count > 0 { | 522 | } else if newsModel.enterpriseAuthInfos.count > 0 { |
| 523 | let tempArray = NSMutableArray.init(array: newsModel.enterpriseAuthInfos) | 523 | let tempArray = NSMutableArray.init(array: newsModel.enterpriseAuthInfos) |
| 524 | resultBlock(tempArray,.success) | 524 | resultBlock(tempArray,.success) |
| 525 | + } else if newsModel.agencyAuthInfos.count > 0 { | ||
| 526 | + let tempArray = NSMutableArray.init(array: newsModel.agencyAuthInfos) | ||
| 527 | + resultBlock(tempArray,.success) | ||
| 525 | } else if newsModel.authInfos.count > 0 && newsModel.enterpriseAuthInfos.count > 0 { | 528 | } else if newsModel.authInfos.count > 0 && newsModel.enterpriseAuthInfos.count > 0 { |
| 526 | let tempArray_ent = NSMutableArray.init(array: newsModel.enterpriseAuthInfos) | 529 | let tempArray_ent = NSMutableArray.init(array: newsModel.enterpriseAuthInfos) |
| 527 | let tempArray_persion = NSMutableArray.init(array: newsModel.authInfos) | 530 | let tempArray_persion = NSMutableArray.init(array: newsModel.authInfos) |
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn.imageset/mine_form_auth_btn@2x.png deleted
100644 → 0
200 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn.imageset/mine_form_auth_btn@3x.png deleted
100644 → 0
457 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn.imageset/Contents.json renamed to metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_formal.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_formal.imageset/mine_form_auth_btn@2x.png
0 → 100644
56.8 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_formal.imageset/mine_form_auth_btn@3x.png
0 → 100644
135 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_formal_larg.imageset/Contents.json
0 → 100644
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "idiom" : "universal", | ||
| 5 | + "scale" : "1x" | ||
| 6 | + }, | ||
| 7 | + { | ||
| 8 | + "filename" : "mine_form_auth_btn_larg@2x.png", | ||
| 9 | + "idiom" : "universal", | ||
| 10 | + "scale" : "2x" | ||
| 11 | + }, | ||
| 12 | + { | ||
| 13 | + "filename" : "mine_form_auth_btn_larg@3x.png", | ||
| 14 | + "idiom" : "universal", | ||
| 15 | + "scale" : "3x" | ||
| 16 | + } | ||
| 17 | + ], | ||
| 18 | + "info" : { | ||
| 19 | + "author" : "xcode", | ||
| 20 | + "version" : 1 | ||
| 21 | + } | ||
| 22 | +} |
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_formal_larg.imageset/mine_form_auth_btn_larg@2x.png
0 → 100644
63.3 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_formal_larg.imageset/mine_form_auth_btn_larg@3x.png
0 → 100644
157 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_persion.imageset/Contents.json
0 → 100644
| 1 | +{ | ||
| 2 | + "images" : [ | ||
| 3 | + { | ||
| 4 | + "idiom" : "universal", | ||
| 5 | + "scale" : "1x" | ||
| 6 | + }, | ||
| 7 | + { | ||
| 8 | + "filename" : "mine_form_auth_btn_persion@2x.png", | ||
| 9 | + "idiom" : "universal", | ||
| 10 | + "scale" : "2x" | ||
| 11 | + }, | ||
| 12 | + { | ||
| 13 | + "filename" : "mine_form_auth_btn_persion@3x.png", | ||
| 14 | + "idiom" : "universal", | ||
| 15 | + "scale" : "3x" | ||
| 16 | + } | ||
| 17 | + ], | ||
| 18 | + "info" : { | ||
| 19 | + "author" : "xcode", | ||
| 20 | + "version" : 1 | ||
| 21 | + } | ||
| 22 | +} |
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_persion.imageset/mine_form_auth_btn_persion@2x.png
0 → 100644
54.4 KB
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_btn_persion.imageset/mine_form_auth_btn_persion@3x.png
0 → 100644
131 KB