Merge branch 'develop' into feature/publish

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

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -522,6 +522,7 @@
 		A7F6891423572D69000C313F /* CircleLeavingMessageCommentListFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F6891323572D69000C313F /* CircleLeavingMessageCommentListFooterView.swift */; };
 		A7F68916235738EB000C313F /* CircleLeavingMessageCommentTopStepTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F68915235738EB000C313F /* CircleLeavingMessageCommentTopStepTableViewCell.swift */; };
 		A7F689182358030D000C313F /* CommunityCircleCommentModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F689172358030C000C313F /* CommunityCircleCommentModel.swift */; };
+		A7FE09152367C8B1007A73EA /* PublishArticleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FE09142367C8B1007A73EA /* PublishArticleViewController.swift */; };
 		A7FF1577228C824300A85748 /* OrderModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A7FF1576228C824300A85748 /* OrderModule.xcassets */; };
 		A7FF1598228D092A00A85748 /* OrderListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF1597228D092A00A85748 /* OrderListModel.swift */; };
 		A7FF159C228D9E3D00A85748 /* OrderRefundDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF159B228D9E3C00A85748 /* OrderRefundDetailModel.swift */; };
@@ -1277,6 +1278,7 @@
 		A7F6891323572D69000C313F /* CircleLeavingMessageCommentListFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleLeavingMessageCommentListFooterView.swift; sourceTree = "<group>"; };
 		A7F68915235738EB000C313F /* CircleLeavingMessageCommentTopStepTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleLeavingMessageCommentTopStepTableViewCell.swift; sourceTree = "<group>"; };
 		A7F689172358030C000C313F /* CommunityCircleCommentModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommunityCircleCommentModel.swift; sourceTree = "<group>"; };
+		A7FE09142367C8B1007A73EA /* PublishArticleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishArticleViewController.swift; sourceTree = "<group>"; };
 		A7FF1576228C824300A85748 /* OrderModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = OrderModule.xcassets; sourceTree = "<group>"; };
 		A7FF1597228D092A00A85748 /* OrderListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderListModel.swift; sourceTree = "<group>"; };
 		A7FF159B228D9E3C00A85748 /* OrderRefundDetailModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderRefundDetailModel.swift; sourceTree = "<group>"; };
@@ -4895,6 +4897,22 @@
 			path = Cell;
 			sourceTree = "<group>";
 		};
+		A7FE09122367C892007A73EA /* PublishArticle */ = {
+			isa = PBXGroup;
+			children = (
+				A7FE09132367C8A0007A73EA /* ViewController */,
+			);
+			path = PublishArticle;
+			sourceTree = "<group>";
+		};
+		A7FE09132367C8A0007A73EA /* ViewController */ = {
+			isa = PBXGroup;
+			children = (
+				A7FE09142367C8B1007A73EA /* PublishArticleViewController.swift */,
+			);
+			path = ViewController;
+			sourceTree = "<group>";
+		};
 		BD01B1F722BC673900CE9F36 /* PublishTakePhoto */ = {
 			isa = PBXGroup;
 			children = (
@@ -5086,6 +5104,7 @@
 		BD12B67122B4E96100AEB10B /* PublishModule */ = {
 			isa = PBXGroup;
 			children = (
+				A7FE09122367C892007A73EA /* PublishArticle */,
 				BD929CCD22B904A30098C139 /* PublishViewController.swift */,
 				BDE376C922C1B5350055E2EA /* AliyunVideo */,
 				BD12B67222B4E99800AEB10B /* PublishMediaPicker */,
@@ -6352,6 +6371,7 @@
 				A71AA52822732173008FF1A5 /* SwiftMoyaNetWorkServiceConfig.swift in Sources */,
 				A747D846235D9DF6007F4E33 /* CircleAlbumSectionHeaderCollectionReusableView.swift in Sources */,
 				A76893AA233B38AA00819EC3 /* MessageRouterModuleType.swift in Sources */,
+				A7FE09152367C8B1007A73EA /* PublishArticleViewController.swift in Sources */,
 				A70B2C102286A3BC00B2449F /* ProductDetailModel.swift in Sources */,
 				A747D840235D8116007F4E33 /* CircleAlbumHeaderView.swift in Sources */,
 				A7A17E5F22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift in Sources */,

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishArticle/ViewController/PublishArticleViewController.swift

@@ -0,0 +1,32 @@
+//
+//  PublishArticleViewController.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/10/29.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class PublishArticleViewController: H5CommonViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        navigationBar.addSubview(publishButton)
+        publishButton.snp.makeConstraints { (make) in
+            make.centerX.equalTo(navigationBar.leftButton)
+            make.right.equalTo(-14)
+        }
+        
+    }
+    
+    lazy var publishButton: UIButton = {
+        let publishButton = UIButton()
+        publishButton.setBackgroundImage(UIImage.imageWithColor(color: kThemeColor), for: UIControl.State.normal)
+        publishButton.setBackgroundImage(UIImage.imageWithColor(color: kd8d8d8Color), for: UIControl.State.disabled)
+        publishButton.setTitle("发布", for: UIControl.State.normal)
+        publishButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        publishButton.titleLabel?.font = kMediumFont13
+        return publishButton
+    }()
+}