Merge branch 'feature/jeremy' into develop

# Conflicts:
#	RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -342,7 +342,7 @@
 		A7D5F22922BB686200F8E9AF /* BaseJSWebBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F22822BB686200F8E9AF /* BaseJSWebBaseViewController.swift */; };
 		A7D5F22B22BB687100F8E9AF /* BaseJSWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F22A22BB687100F8E9AF /* BaseJSWebViewController.swift */; };
 		A7D5F22D22BB689700F8E9AF /* WKWebViewEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F22C22BB689700F8E9AF /* WKWebViewEnum.swift */; };
-		A7D5F23322BB9BE600F8E9AF /* CommunityMyInvitationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F23222BB9BE600F8E9AF /* CommunityMyInvitationViewController.swift */; };
+		A7D5F23322BB9BE600F8E9AF /* H5CommonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F23222BB9BE600F8E9AF /* H5CommonViewController.swift */; };
 		A7D5F24D22BC720000F8E9AF /* WVJBModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F24C22BC720000F8E9AF /* WVJBModel.swift */; };
 		A7D5F25022BC7B3700F8E9AF /* WebViewJavascriptBridgeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F24F22BC7B3700F8E9AF /* WebViewJavascriptBridgeManager.swift */; };
 		A7DC467F22783A47001F3EFC /* EditExpressAddressTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DC467E22783A47001F3EFC /* EditExpressAddressTableViewCell.swift */; };
@@ -903,7 +903,7 @@
 		A7D5F22822BB686200F8E9AF /* BaseJSWebBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseJSWebBaseViewController.swift; sourceTree = "<group>"; };
 		A7D5F22A22BB687100F8E9AF /* BaseJSWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseJSWebViewController.swift; sourceTree = "<group>"; };
 		A7D5F22C22BB689700F8E9AF /* WKWebViewEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKWebViewEnum.swift; sourceTree = "<group>"; };
-		A7D5F23222BB9BE600F8E9AF /* CommunityMyInvitationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityMyInvitationViewController.swift; sourceTree = "<group>"; };
+		A7D5F23222BB9BE600F8E9AF /* H5CommonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = H5CommonViewController.swift; sourceTree = "<group>"; };
 		A7D5F24C22BC720000F8E9AF /* WVJBModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WVJBModel.swift; sourceTree = "<group>"; };
 		A7D5F24F22BC7B3700F8E9AF /* WebViewJavascriptBridgeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewJavascriptBridgeManager.swift; sourceTree = "<group>"; };
 		A7DC467E22783A47001F3EFC /* EditExpressAddressTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditExpressAddressTableViewCell.swift; sourceTree = "<group>"; };
@@ -1501,7 +1501,6 @@
 			isa = PBXGroup;
 			children = (
 				A719EE6722AF438E001AAC98 /* Community */,
-				A7D5F23022BB9B6D00F8E9AF /* CommunityMyInvitation */,
 				A74322A522B8FE5F0017C367 /* CommunityFindFriends */,
 				A7C0FDFC22B66B3C00BC1E86 /* CommunityFeaturedTopics */,
 				BD1FC18222B09F4700D55081 /* CommunitySubComment */,
@@ -2065,7 +2064,7 @@
 		A738D203225AEAD000EEE860 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				A7D5F24B22BC71ED00F8E9AF /* WVJB */,
+				A7D5F24B22BC71ED00F8E9AF /* WVJBModel */,
 				A72A73722233966800B21995 /* RootModel */,
 				A71738A922898651000AEA6A /* ShopModel */,
 				A7B4E736228190810012914A /* CommonModel */,
@@ -2498,6 +2497,7 @@
 				A7FF155A228C689C00A85748 /* OrderModule */,
 				A71AF0A3226E9D8A001730FE /* SearchModule */,
 				A729B5A52266DBC9004AE098 /* CommonModules */,
+				A7D5F25122BC8A7600F8E9AF /* H5Modules */,
 			);
 			path = Modules;
 			sourceTree = "<group>";
@@ -3440,28 +3440,28 @@
 			path = CommunityPlanet;
 			sourceTree = "<group>";
 		};
-		A7D5F23022BB9B6D00F8E9AF /* CommunityMyInvitation */ = {
+		A7D5F23022BB9B6D00F8E9AF /* H5Common */ = {
 			isa = PBXGroup;
 			children = (
 				A7D5F23122BB9B9C00F8E9AF /* ViewController */,
 			);
-			path = CommunityMyInvitation;
+			path = H5Common;
 			sourceTree = "<group>";
 		};
 		A7D5F23122BB9B9C00F8E9AF /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
-				A7D5F23222BB9BE600F8E9AF /* CommunityMyInvitationViewController.swift */,
+				A7D5F23222BB9BE600F8E9AF /* H5CommonViewController.swift */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
 		};
-		A7D5F24B22BC71ED00F8E9AF /* WVJB */ = {
+		A7D5F24B22BC71ED00F8E9AF /* WVJBModel */ = {
 			isa = PBXGroup;
 			children = (
 				A7D5F24C22BC720000F8E9AF /* WVJBModel.swift */,
 			);
-			path = WVJB;
+			path = WVJBModel;
 			sourceTree = "<group>";
 		};
 		A7D5F24E22BC7B0500F8E9AF /* WebViewJavascriptBridgeManager */ = {
@@ -3472,6 +3472,14 @@
 			path = WebViewJavascriptBridgeManager;
 			sourceTree = "<group>";
 		};
+		A7D5F25122BC8A7600F8E9AF /* H5Modules */ = {
+			isa = PBXGroup;
+			children = (
+				A7D5F23022BB9B6D00F8E9AF /* H5Common */,
+			);
+			path = H5Modules;
+			sourceTree = "<group>";
+		};
 		A7DF50D922A556C300998908 /* BrowsePictures */ = {
 			isa = PBXGroup;
 			children = (
@@ -4916,7 +4924,8 @@
 				A7C0FDF822B6671C00BC1E86 /* PopularVideoCollectionViewCell.swift in Sources */,
 				A7E19FA822BA2CDF009BCCE1 /* SearchProductListViewController.swift in Sources */,
 				BD4B50AE22BC815F0073B516 /* PublishFilterCollectionCell.swift in Sources */,
-				A7D5F23322BB9BE600F8E9AF /* CommunityMyInvitationViewController.swift in Sources */,
+				BD929CCA22B8CFB10098C139 /* AliyunPathManager.m in Sources */,
+				A7D5F23322BB9BE600F8E9AF /* H5CommonViewController.swift in Sources */,
 				BD13B6C522BA034D008BB323 /* PublishEditAddAddressCell.swift in Sources */,
 				A7B4E71F228131720012914A /* ProductSlidingLeftRightCollectionViewCell.swift in Sources */,
 				A77F2CB72232010F001BD3F6 /* MineViewController.swift in Sources */,

RainbowPlanet/RainbowPlanet/Base/BaseWebViewController/BaseJSWebBaseViewController.swift

@@ -26,6 +26,7 @@ class BaseJSWebBaseViewController: BaseViewController {
         super.viewDidLoad()
         setupViews()
         
+        
     }
     
     override func setupViews() {
@@ -37,6 +38,7 @@ class BaseJSWebBaseViewController: BaseViewController {
     override func setupData() {
         //// 加载普通URL
         if (URLString != nil) {
+            NXLLog(URLString!)
             webloadType(.URLString(url: URLString!))
         }
         
@@ -63,7 +65,7 @@ class BaseJSWebBaseViewController: BaseViewController {
     
     lazy var wkWebView: WKWebView = {
         /// 创建webveiew
-        let wkWebView = WKWebView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: kScreenHeight-48-kNavBarTotalHeight-kTabBarTotalHeight))
+        let wkWebView = WKWebView(frame: CGRect(x: 0, y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight-kNavBarTotalHeight))
         // 监听支持KVO的属性
         wkWebView.addObserver(self, forKeyPath: "estimatedProgress", options: .new, context: nil)
         wkWebView.addObserver(self, forKeyPath: "title", options: .new, context: nil)
@@ -73,7 +75,7 @@ class BaseJSWebBaseViewController: BaseViewController {
     /// 进度条
     lazy var progressView: UIProgressView = {
         let progressView =  UIProgressView(progressViewStyle: .default)
-        progressView.frame = CGRect(x: CGFloat(0.0), y:0, width: CGFloat(wkWebView.width), height: 3)
+        progressView.frame = CGRect(x: CGFloat(0.0), y:kNavBarTotalHeight, width: CGFloat(wkWebView.width), height: 3)
         progressView.trackTintColor = UIColor.clear
         progressView.progressTintColor = kThemeColor
         return progressView
@@ -159,6 +161,7 @@ class BaseJSWebBaseViewController: BaseViewController {
                 progressView.alpha = 0.0
                 progressView .setProgress(0.0, animated: false)
             }
+           NXLLog(wkWebView.estimatedProgress)
         }else if keyPath == "title" {
             let vc = wkWebView.findViewController() as? BaseViewController
             _ = vc?.navigationBar.title = wkWebView.title

RainbowPlanet/RainbowPlanet/Macro/Common.swift

@@ -239,3 +239,9 @@ func priceConversionNone(price:Int) -> String {
     let price = Float(price)/100
     return String(format: "¥ %.2f", price)
 }
+
+func commonCopy(string:String) {
+    let pasteboard = UIPasteboard.general
+    pasteboard.string = string
+    SwiftProgressHUD.shared().showText("复制成功")
+}

RainbowPlanet/RainbowPlanet/Macro/HTMLURLMacro.swift

@@ -8,5 +8,14 @@
 
 import Foundation
 
+let kH5DevelopSever = true
+let kH5BetaSever = false
+let kH5ProductSever = false
+
+
+
+let kHTMLCommunityPlanetUrl = "http://h5.dev.caihongxingqiu.com/planet"
+
+//let kHTMLCommunityPlanetUrl = "http://h5.dev.caihongxingqiu.com/planet"
 
 

RainbowPlanet/RainbowPlanet/Manager/WebViewJavascriptBridgeManager/WebViewJavascriptBridgeManager.swift

@@ -11,22 +11,32 @@ import WebViewJavascriptBridge
 import SwiftyJSON
 
 class WebViewJavascriptBridgeManager: NSObject {
+    
+    typealias CallDataClosure = (_ wbjbModel: WVJBModel) -> Void
+    
     static let shared : WebViewJavascriptBridgeManager = WebViewJavascriptBridgeManager()
     
-    func callHandlerH5(bridge: WebViewJavascriptBridge) {
-        bridge.callHandler("h5", data:  UserModel.shared().getH5UserInfo())
+    /// 返回用户信息
+    ///
+    /// - Parameter bridge: 交互对象
+    func callHandlerH5(bridge: WebViewJavascriptBridge?) {
+        bridge?.callHandler("h5", data:  UserModel.shared().getH5UserInfo())
     }
     
-//    typealias CallDataClosure = (_ <#arguments#>: <#type#>) -> <#return value#>
-//    
-//    func registerHandlerApp(bridge: WebViewJavascriptBridge) {
-//        bridge.registerHandler("app", handler: { data, responseCallback in
-//            if let data = data {
-//                let jsonData = JSON(data)
-//            }
-//            responseCallback!(nil)
-//        })
-//    }
-    
     
+    /// 注册回调
+    ///
+    /// - Parameters:
+    ///   - bridge: 交互对象
+    ///   - callDataClosure: 回调
+    func registerHandlerApp(bridge: WebViewJavascriptBridge?,callDataClosure:@escaping CallDataClosure) {
+        bridge?.registerHandler("app", handler: { data, responseCallback in
+            if let data = data {
+                let jsonData = JSON(data)
+                let wbjbModel = WVJBModel(JSONString: jsonData.description)
+                callDataClosure(wbjbModel ?? WVJBModel())
+            }
+            responseCallback!(nil)
+        })
+    }
 }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -105,13 +105,43 @@ class CommunityViewController: BaseViewController {
         
         // 星球H5
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityPlanetH5"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
-            let vc = CommunityMyInvitationViewController()
-            self?.navigationController?.pushViewController(vc, animated: true)
+            let wvjbModel = notification.object as? WVJBModel
+            // 链接
+            if WVJBModelType(rawValue: wvjbModel!.type!)  == .link {
+                 let vc = H5CommonViewController()
+                let URLString = wvjbModel!.params!.url!
+                vc.URLString = URLString
+                self?.navigationController?.pushViewController(vc, animated: true)
+            }
+            // 复制邀请码
+            if WVJBModelType(rawValue: wvjbModel!.type!)  == .copy {
+                commonCopy(string: wvjbModel!.params!.content!)
+            }
+            
+            // 跳转原生
+            if WVJBModelType(rawValue: wvjbModel!.type!)  == .view {
+                // 发布
+                if WVJBParamsModelPage(rawValue: wvjbModel!.params!.page ?? "") == .publist {
+                    let vc = PublishViewController()
+                    self?.present(vc, animated: true, completion: nil)
+                }
+                
+                // 去参与
+                if WVJBParamsModelPage(rawValue: wvjbModel!.params!.page ?? "") == .join {
+                    self?.reloadSegmentedView()
+                }
+            }
         }
-        
     }
     
-    
+    //选中推荐
+    func reloadSegmentedView() {
+        self.segmentedView.selectItemAt(index: 1)
+        self.segmentedView.defaultSelectedIndex = 1
+        self.listContainerView.defaultSelectedIndex = 1
+        self.segmentedDataSource.reloadData(selectedIndex: 1)
+
+    }
     /// navigationBar
     private lazy var communityNavigationBarView: CommunityNavigationBarView = {
         let communityNavigationBarView = CommunityNavigationBarView()
@@ -126,8 +156,7 @@ class CommunityViewController: BaseViewController {
         segmentedView.dataSource = segmentedDataSource
         segmentedView.indicators = [indicator]
         segmentedView.contentScrollView = listContainerView.scrollView
-        segmentedView.selectItemAt(index: 0)
-        segmentedView.defaultSelectedIndex = 0
+        segmentedView.defaultSelectedIndex = 1
         return segmentedView
     }()
     
@@ -144,7 +173,7 @@ class CommunityViewController: BaseViewController {
         segmentedDataSource.titleSelectedFont = kBoldFont22
         
         //reloadData(selectedIndex:)方法一定要调用，方法内部会刷新数据源数组
-        segmentedDataSource.reloadData(selectedIndex: 0)
+        segmentedDataSource.reloadData(selectedIndex: 1)
         
         return segmentedDataSource
     }()
@@ -161,7 +190,7 @@ class CommunityViewController: BaseViewController {
     private lazy var listContainerView: JXSegmentedListContainerView = {
         let listContainerView = JXSegmentedListContainerView(dataSource: self)
         listContainerView.didAppearPercent = 0.01
-        listContainerView.defaultSelectedIndex = 0
+        listContainerView.defaultSelectedIndex = 1
         return listContainerView
     }()
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Planet/CommunityPlanet/CommunityPlanetViewController.swift

@@ -18,8 +18,7 @@ class CommunityPlanetViewController: BaseJSWebViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-//        self.URLString = "http://h5.dev.caihongxingqiu.com/planet"
-        self.URLString = "http://192.168.23.135:8899/planet"
+        self.URLString = "http://192.168.23.134:8820/planet"
         setupViews()
         setupData()
         
@@ -34,27 +33,15 @@ class CommunityPlanetViewController: BaseJSWebViewController {
     override func setupViews() {
         super.setupViews()
         self.wkWebView.navigationDelegate = self
-        self.wkWebView.scrollView.addHeaderWithHeader(withBeginRefresh: true, animation: false) { [weak self] (page) in
-            self?.bridge.callHandler("h5", data:  UserModel.shared().getH5UserInfo())
-            self?.reload()
-        }
-
     }
     override func setupData() {
         super.setupData()
-        //获取当前时间
-        let userModel = UserModel.shared().getModel()
-        var dic = Dictionary<String,Any>()
-        dic.updateValue(userModel?.token as Any, forKey: "token")
-        dic.updateValue(userModel?.accessToken as Any, forKey: "accessToken")
-        bridge.registerHandler("app", handler: { data, responseCallback in
-            if let data = data {
-                let jsonData = JSON(data)
-                NotificationCenter.default.post(name: NSNotification.Name("CommunityPlanetH5"), object: jsonData)
-            }
-            responseCallback!(nil)
-        })
-
+        self.wkWebView.scrollView.addHeaderWithHeader(withBeginRefresh: true, animation: false) { [weak self] (page) in
+            WebViewJavascriptBridgeManager.shared.callHandlerH5(bridge: self?.bridge)
+        }
+        WebViewJavascriptBridgeManager.shared.registerHandlerApp(bridge: bridge) { (wvjbModel) in
+            NotificationCenter.default.post(name: NSNotification.Name("CommunityPlanetH5"), object: wvjbModel)
+        }
     }
 }
 

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityMyInvitation/ViewController/CommunityMyInvitationViewController.swift

@@ -11,16 +11,11 @@ import WebKit
 import SwiftyJSON
 
 
-class CommunityMyInvitationViewController: BaseJSWebBaseViewController {
+class H5CommonViewController: BaseJSWebBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
-        view.insertSubview(navigationBar, aboveSubview: wkWebView)
-//                self.URLString = "http://h5.dev.caihongxingqiu.com/planet"
-        self.URLString = "http://192.168.23.135:8899/planet"
-        //        self.HTMLName = "ExampleApp"
         setupViews()
         setupData()
-        
     }
     
     override func didReceiveMemoryWarning() {
@@ -37,33 +32,16 @@ class CommunityMyInvitationViewController: BaseJSWebBaseViewController {
     /// 加载数据
     override func setupData() {
         super.setupData()
-        bridge.registerHandler("readyTest", handler: { data, responseCallback in
-            if let data = data {
-                let jsonData = JSON(data)
-                NXLLog("bridgeReady==\(jsonData)")
-            }
-            var dic1 = Dictionary<String,Any>()
-            dic1.updateValue("love you", forKey: "content")
-            responseCallback!(dic1)
-        })
-        getUserInfo()
-        wkWebView.scrollView.addHeaderWithHeader(withBeginRefresh: false, animation: false) { [weak self] (page) in
-            self?.getUserInfo()
-            self?.reload()
+        self.wkWebView.scrollView.addHeaderWithHeader(withBeginRefresh: true, animation: false) { [weak self] (page) in
+            WebViewJavascriptBridgeManager.shared.callHandlerH5(bridge: self?.bridge)
+        }
+        WebViewJavascriptBridgeManager.shared.registerHandlerApp(bridge: bridge) { (wvjbModel) in
+            
         }
-    }
-    
-    /// 获取用户信息并传值
-    func getUserInfo(){
-        let userModel = UserModel.shared().getModel()
-        var dic = Dictionary<String,Any>()
-        dic.updateValue(userModel?.token as Any, forKey: "token")
-        dic.updateValue(userModel?.accessToken as Any, forKey: "accessToken")
-        self.bridge.callHandler("bridgeReady", data: dic)
     }
 }
 
-extension CommunityMyInvitationViewController : WKNavigationDelegate {
+extension H5CommonViewController : WKNavigationDelegate {
     
     //服务器开始请求的时候调用
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift

@@ -101,9 +101,7 @@ class UserPersonalCenterViewController: BaseViewController {
     
     /// 编辑
     func pushModifyData() {
-//        let vc = ModifyDataViewController()
-//        self.navigationController?.pushViewController(vc, animated: true)
-        let vc = CommunityMyInvitationViewController()
+        let vc = ModifyDataViewController()
         self.navigationController?.pushViewController(vc, animated: true)
         
     }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailInfoTableViewCell.swift

@@ -89,9 +89,7 @@ class OrderDetailInfoTableViewCell: UITableViewCell {
         copyButton.layer.borderWidth = 1
         copyButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            let pasteboard = UIPasteboard.general
-            pasteboard.string = self?.contents?[0]
-            SwiftProgressHUD.shared().showText("复制成功")
+            commonCopy(string: self?.contents?[0] ?? "")
         }).disposed(by: disposeBag)
         return copyButton
     }()

RainbowPlanet/RainbowPlanet/Service/Model/UserModel/UserModel.swift

@@ -148,13 +148,9 @@ class UserModel : NSObject, NSCoding, Mappable{
     func getH5UserInfo() -> Dictionary<String,Any> {
         //获取当前时间
         let userModel = getModel()
-        var dic = Dictionary<String,Any>()
-        dic.updateValue(userModel?.token as Any, forKey: "token")
-        dic.updateValue(userModel?.accessToken as Any, forKey: "accessToken")
         var userInfoDic = Dictionary<String,Any>()
         userInfoDic.updateValue("userInfo", forKey: "type")
-        userInfoDic.updateValue(dic, forKey: "params")
-        
+        userInfoDic.updateValue(userModel?.toJSON() as Any, forKey: "params")
         return userInfoDic
     }
 

RainbowPlanet/RainbowPlanet/Service/Model/WVJB/WVJBModel.swift

@@ -12,18 +12,20 @@ import ObjectMapper
 enum WVJBModelType : String {
     case share = "share"
     case view = "view"
+    case link = "link"
+    case copy = "copy"
 }
 /// WebViewJavascriptBridgeModel 简写 WVJBModel
 class WVJBModel:NSObject,Mappable{
 
-    var type : WVJBModelType?
+    var type : String?
     var params : WVJBParamsModel?
 
 	class func newInstance(map: Map) -> Mappable?{
 		return WVJBModel()
 	}
 	required init?(map: Map){}
-	private override init(){}
+    override init(){}
     
     func mapping(map: Map)
     {
@@ -36,21 +38,21 @@ enum WVJBParamsModelType : String {
     case invite = "invite"
 }
 
-
-
 /// 交互类型参数
 ///
 /// - publist: 发布
 /// - join: 参与
 enum WVJBParamsModelPage : String {
-    case publist = "publist"
+    case publist = "publish"
     case join = "join"
 }
 /// WebViewJavascriptBridgeParameterModel 简写 WVJBParameterModel
 class WVJBParamsModel:NSObject,Mappable {
 
-    var type : WVJBParamsModelPage?
-    var page : WVJBParamsModelPage?
+    var type : String?
+    var page :String?
+    var url : String?
+    var content : String?
     
     class func newInstance(map: Map) -> Mappable?{
         return WVJBParamsModel()
@@ -62,6 +64,8 @@ class WVJBParamsModel:NSObject,Mappable {
     {
         type <- map["type"]
         page <- map["page"]
+        url <- map["url"]
+        content <- map["content"]
     }
 
 }