Merge branch 'double11' into develop

* double11:
  修改 版本号 1.0.0.7
  同步 UI刷新
  1、修改 版本号 1.0.0.6 2、处理一处 bug异常
  默认 展示title

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
#	galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift
#	galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/VM/YHMySignatureDetailViewModel.swift

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -6678,7 +6678,11 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
+<<<<<<< HEAD
 				CURRENT_PROJECT_VERSION = 1;
+=======
+				CURRENT_PROJECT_VERSION = 7;
+>>>>>>> double11
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -6728,7 +6732,11 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
+<<<<<<< HEAD
 				CURRENT_PROJECT_VERSION = 1;
+=======
+				CURRENT_PROJECT_VERSION = 7;
+>>>>>>> double11
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift

@@ -235,6 +235,11 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard self != nil else { return }
             if json.code == 200 {
+//                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(from: dic) else {
+//                    callBackBlock(false,nil)
+//                    return
+//                }
+//                self?.pageUrl = result.url
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/VM/YHMySignatureDetailViewModel.swift

@@ -189,6 +189,11 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
+//                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(from: dic) else {
+//                    callBackBlock(false,nil)
+//                    return
+//                }
+//                self.pageUrl = result.url
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -269,7 +269,7 @@ extension YHJsApi {
                             let id : Int = jsonObject["id"] as? Int ?? -1
                             let isFullScreen : Int = jsonObject["isFullScreen"] as? Int ?? 1
                             let navTitle : String = jsonObject["navTitle"] as? String ?? ""
-                            let hideNavigationTitleFlag : Int = jsonObject["hideNavigationTitleFlag"] as? Int ?? 1
+                            let hideNavigationTitleFlag : Int = jsonObject["hideNavigationTitleFlag"] as? Int ?? 0
                             
                             if isInformationUrl == 1 {
                                 //资讯详情