Commit c7da061f5e5e53d540983d622e9fe7df33172cf8
1 parent
ee1e1218
修改push 动画为false
Showing
5 changed files
with
12 additions
and
10 deletions
metaCode/Classes/Main/HomePage/Controller/CNLiveShopConsoleController.swift
| @@ -91,7 +91,7 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel | @@ -91,7 +91,7 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel | ||
| 91 | 91 | ||
| 92 | }else if itemModel.type == CNLiveShopConsoleType.SPGL.rawValue{ | 92 | }else if itemModel.type == CNLiveShopConsoleType.SPGL.rawValue{ |
| 93 | //商城商品管理 | 93 | //商城商品管理 |
| 94 | - currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: true) | 94 | + currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: false) |
| 95 | }else if itemModel.type == CNLiveShopConsoleType.XZYHQ.rawValue{ | 95 | }else if itemModel.type == CNLiveShopConsoleType.XZYHQ.rawValue{ |
| 96 | //新增优惠券 | 96 | //新增优惠券 |
| 97 | 97 | ||
| @@ -112,7 +112,7 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel | @@ -112,7 +112,7 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel | ||
| 112 | 112 | ||
| 113 | }else if itemModel.type == CNLiveShopConsoleType.DDGL.rawValue{ | 113 | }else if itemModel.type == CNLiveShopConsoleType.DDGL.rawValue{ |
| 114 | //订单管理 | 114 | //订单管理 |
| 115 | - currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true) | 115 | + currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: false) |
| 116 | } | 116 | } |
| 117 | // else if itemModel.type == CNLiveShopConsoleType.SH.rawValue{ | 117 | // else if itemModel.type == CNLiveShopConsoleType.SH.rawValue{ |
| 118 | // //退款/售后 | 118 | // //退款/售后 |
| @@ -125,7 +125,7 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel | @@ -125,7 +125,7 @@ class CNLiveShopConsoleController: CNLiveBaseViewController, UICollectionViewDel | ||
| 125 | //直播管理 | 125 | //直播管理 |
| 126 | let webVC = CNWebViewController() | 126 | let webVC = CNWebViewController() |
| 127 | webVC.url = URL(string: "http://wjjh5.cnlive.com/apkdownloadShop.php") | 127 | webVC.url = URL(string: "http://wjjh5.cnlive.com/apkdownloadShop.php") |
| 128 | - currentViewController()?.navigationController?.pushViewController(webVC, animated: true) | 128 | + currentViewController()?.navigationController?.pushViewController(webVC, animated: false) |
| 129 | } | 129 | } |
| 130 | } | 130 | } |
| 131 | 131 |
metaCode/Classes/Main/HomePage/View/CNLiveShopDetailBtnsCell.swift
| @@ -74,10 +74,10 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell { | @@ -74,10 +74,10 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell { | ||
| 74 | ///push VC | 74 | ///push VC |
| 75 | if tag == 100 { | 75 | if tag == 100 { |
| 76 | //商品管理 | 76 | //商品管理 |
| 77 | - currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: true) | 77 | + currentViewController()?.navigationController?.pushViewController(CNLiveShopProductManagerController.init(), animated: false) |
| 78 | }else if tag == 101 { | 78 | }else if tag == 101 { |
| 79 | //订单管理 | 79 | //订单管理 |
| 80 | - currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true) | 80 | + currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: false) |
| 81 | } | 81 | } |
| 82 | // if tag == 100 { | 82 | // if tag == 100 { |
| 83 | // //发布动态 | 83 | // //发布动态 |
| @@ -85,7 +85,7 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell { | @@ -85,7 +85,7 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell { | ||
| 85 | // //商品管理 | 85 | // //商品管理 |
| 86 | // let webVC = CNWebViewController() | 86 | // let webVC = CNWebViewController() |
| 87 | // webVC.url = URL(string:"https://www.baidu.com") | 87 | // webVC.url = URL(string:"https://www.baidu.com") |
| 88 | -// currentViewController()?.navigationController?.pushViewController(webVC, animated: true) | 88 | +// currentViewController()?.navigationController?.pushViewController(webVC, animated: false) |
| 89 | // | 89 | // |
| 90 | // }else if tag == 102 { | 90 | // }else if tag == 102 { |
| 91 | // //订单管理 | 91 | // //订单管理 |
metaCode/Classes/Main/HomePage/View/CNLiveShopDetailOrderAssetCell.swift
| @@ -125,7 +125,7 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{ | @@ -125,7 +125,7 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{ | ||
| 125 | @objc func navsubBtnAction(_ sender: UIButton){ | 125 | @objc func navsubBtnAction(_ sender: UIButton){ |
| 126 | if self.displayType == .CNLiveShopDetailDisplayTypeOrder{ | 126 | if self.displayType == .CNLiveShopDetailDisplayTypeOrder{ |
| 127 | //push订单VC | 127 | //push订单VC |
| 128 | - currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true) | 128 | + currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: false) |
| 129 | }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{ | 129 | }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{ |
| 130 | //push余额VC | 130 | //push余额VC |
| 131 | } | 131 | } |
metaCode/Classes/Main/HomePage/View/CNLliveShopDetailBannerCell.swift
| @@ -99,6 +99,6 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP | @@ -99,6 +99,6 @@ class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSP | ||
| 99 | let bannerMdl = self.shopDetailModel?.banner[index] | 99 | let bannerMdl = self.shopDetailModel?.banner[index] |
| 100 | let webVC = CNWebViewController() | 100 | let webVC = CNWebViewController() |
| 101 | webVC.url = URL(string: bannerMdl?.url ?? "") | 101 | webVC.url = URL(string: bannerMdl?.url ?? "") |
| 102 | - currentViewController()?.navigationController?.pushViewController(webVC, animated: true) | 102 | + currentViewController()?.navigationController?.pushViewController(webVC, animated: false) |
| 103 | } | 103 | } |
| 104 | } | 104 | } |
metaCode/Classes/Main/HomePage/View/CNMainView.swift
| @@ -204,11 +204,13 @@ class CNFrontMainView : UIView{ | @@ -204,11 +204,13 @@ class CNFrontMainView : UIView{ | ||
| 204 | CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in | 204 | CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in |
| 205 | 205 | ||
| 206 | if respStatue == .success { | 206 | if respStatue == .success { |
| 207 | - currentViewController()?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: true) | 207 | + currentViewController()?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: false) |
| 208 | } | 208 | } |
| 209 | } | 209 | } |
| 210 | + }else{ | ||
| 211 | + currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: false) | ||
| 210 | } | 212 | } |
| 211 | -// currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: false) | 213 | + |
| 212 | // } | 214 | // } |
| 213 | 215 | ||
| 214 | } | 216 | } |