Commit d2a651c36470ad46a06159ac0dc0d3dba21ed130
1 parent
753c5c4b
downType , upType
Showing
4 changed files
with
29 additions
and
6 deletions
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
| @@ -118,8 +118,12 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange | @@ -118,8 +118,12 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange | ||
| 118 | set{ | 118 | set{ |
| 119 | self.mainView.idModel = newValue! | 119 | self.mainView.idModel = newValue! |
| 120 | _idModel = newValue | 120 | _idModel = newValue |
| 121 | + self.upSlideView.type = _idModel?.downType | ||
| 121 | self.upSlideView.url = _idModel?.downPath | 122 | self.upSlideView.url = _idModel?.downPath |
| 123 | + | ||
| 124 | + self.downSlideView.type = _idModel?.upType | ||
| 122 | self.downSlideView.url = _idModel?.upPath | 125 | self.downSlideView.url = _idModel?.upPath |
| 126 | + | ||
| 123 | self.topNavView.setTitleString(title:(_idModel?.name)!) | 127 | self.topNavView.setTitleString(title:(_idModel?.name)!) |
| 124 | } | 128 | } |
| 125 | 129 |
metaCode/Classes/Main/HomePage/View/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/CNUpSlideView.swift
| @@ -8,6 +8,11 @@ | @@ -8,6 +8,11 @@ | ||
| 8 | import Foundation | 8 | import Foundation |
| 9 | import WebKit | 9 | import WebKit |
| 10 | 10 | ||
| 11 | +let UpDownTypeH5 = 1///h5 | ||
| 12 | +let UpDownTypePage = 2///原生page页面 | ||
| 13 | +let UpDownTypeShopDetail = 3///店铺详情 | ||
| 14 | +let UpDownTypeShopControlConsole = 4///店铺控制台 | ||
| 15 | + | ||
| 11 | ///上滑显示的VIew | 16 | ///上滑显示的VIew |
| 12 | class CNUpSlideView:UIView{ | 17 | class CNUpSlideView:UIView{ |
| 13 | 18 | ||
| @@ -19,6 +24,8 @@ class CNUpSlideView:UIView{ | @@ -19,6 +24,8 @@ class CNUpSlideView:UIView{ | ||
| 19 | return webView | 24 | return webView |
| 20 | }() | 25 | }() |
| 21 | 26 | ||
| 27 | + var type:Int? | ||
| 28 | + | ||
| 22 | var _url:String? | 29 | var _url:String? |
| 23 | var url:String? { | 30 | var url:String? { |
| 24 | get{ | 31 | get{ |
| @@ -26,9 +33,17 @@ class CNUpSlideView:UIView{ | @@ -26,9 +33,17 @@ class CNUpSlideView:UIView{ | ||
| 26 | } | 33 | } |
| 27 | set{ | 34 | set{ |
| 28 | _url = newValue! | 35 | _url = newValue! |
| 29 | - if (_url != ""){ | ||
| 30 | - let webUrl: URL! = URL.init(string: _url!) | ||
| 31 | - webView.load(URLRequest.init(url:webUrl)) | 36 | + if(type == UpDownTypeH5){ |
| 37 | + if (_url != ""){ | ||
| 38 | + let webUrl: URL! = URL.init(string: _url!) | ||
| 39 | + webView.load(URLRequest.init(url:webUrl)) | ||
| 40 | + } | ||
| 41 | + }else if(type == UpDownTypePage){ | ||
| 42 | + print("UpDownTypePage") | ||
| 43 | + }else if(type == UpDownTypeShopDetail){ | ||
| 44 | + | ||
| 45 | + }else if(type == UpDownTypeShopControlConsole){ | ||
| 46 | + | ||
| 32 | } | 47 | } |
| 33 | } | 48 | } |
| 34 | } | 49 | } |
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
| @@ -148,13 +148,15 @@ final class StandListModel: BaseModel, TableCodable { | @@ -148,13 +148,15 @@ final class StandListModel: BaseModel, TableCodable { | ||
| 148 | var descBackgroundImg: String = ""//首页文字背景图 | 148 | var descBackgroundImg: String = ""//首页文字背景图 |
| 149 | var cardImg: String = ""//卡片背景图 | 149 | var cardImg: String = ""//卡片背景图 |
| 150 | var cardBackgroundImg: String = ""//首页卡片背景图 | 150 | var cardBackgroundImg: String = ""//首页卡片背景图 |
| 151 | - var upPath: String = ""//顶部h5 | ||
| 152 | - var downPath: String = ""//底部h5 | 151 | + var upPath: String = ""//顶部h5 或原生页面pageId |
| 152 | + var upType: Int = 0//下滑类型1:h5 2:原生页面 | ||
| 153 | + var downType: Int = 0//上滑类型1:h5 2:原生页面 | ||
| 154 | + var downPath: String = ""//底部h5 或原生页面pageId | ||
| 153 | var auth: Bool = false//身份是否验证 | 155 | var auth: Bool = false//身份是否验证 |
| 154 | 156 | ||
| 155 | var createTimeString: String = "" | 157 | var createTimeString: String = "" |
| 156 | var timeString: String = "" | 158 | var timeString: String = "" |
| 157 | - | 159 | + |
| 158 | override func mapping(mapper: HelpingMapper) { | 160 | override func mapping(mapper: HelpingMapper) { |
| 159 | mapper <<< | 161 | mapper <<< |
| 160 | self.createTime <-- TransformOf(fromJSON: { [weak self] (raw) -> Int in | 162 | self.createTime <-- TransformOf(fromJSON: { [weak self] (raw) -> Int in |