Browse Source

Merge branch 'master' of ssh://10.10.100.21/source/iOSUU

# Conflicts:
#	shiku_im/shiku_im/RN/Controllers/YRReactVC.m
huangyp 6 years ago
parent
commit
71a175f9b6
100 changed files with 190 additions and 116 deletions
  1. 52 6
      shiku_im/shiku_im.xcodeproj/project.pbxproj
  2. 1 1
      shiku_im/shiku_im/Comment/UASMethodTools.h
  3. 1 1
      shiku_im/shiku_im/Comment/UASMethodTools.m
  4. 23 0
      shiku_im/shiku_im/Images.xcassets/工作台图标/工作台首页_BI服务.imageset/Contents.json
  5. BIN
      shiku_im/shiku_im/Images.xcassets/工作台图标/工作台首页_BI服务.imageset/工作台首页_BI服务.png
  6. BIN
      shiku_im/shiku_im/Images.xcassets/工作台图标/工作台首页_BI服务.imageset/工作台首页_BI服务@2x.png
  7. BIN
      shiku_im/shiku_im/Images.xcassets/工作台图标/工作台首页_BI服务.imageset/工作台首页_BI服务@3x.png
  8. 1 1
      shiku_im/shiku_im/OutWorkModel.h
  9. 1 1
      shiku_im/shiku_im/OutWorkModel.m
  10. 3 1
      shiku_im/shiku_im/RN/Controllers/YRReactVC.m
  11. 1 1
      shiku_im/shiku_im/Register&Login/viewModel/UASLoginViewModel.h
  12. 1 1
      shiku_im/shiku_im/Register&Login/viewModel/UASLoginViewModel.m
  13. 1 1
      shiku_im/shiku_im/addressBook(通讯录)/NewAddPeopleTableViewCell.h
  14. 1 1
      shiku_im/shiku_im/addressBook(通讯录)/NewAddPeopleTableViewCell.m
  15. 1 1
      shiku_im/shiku_im/addressBook(通讯录)/NewAddPeopleVC.h
  16. 1 1
      shiku_im/shiku_im/addressBook(通讯录)/NewAddPeopleVC.m
  17. 1 1
      shiku_im/shiku_im/addressBook(通讯录)/NewContractPeopleVC.h
  18. 1 1
      shiku_im/shiku_im/addressBook(通讯录)/NewContractPeopleVC.m
  19. 1 1
      shiku_im/shiku_im/controller/AddBusinessViewController.h
  20. 1 1
      shiku_im/shiku_im/controller/AddBusinessViewController.m
  21. 1 1
      shiku_im/shiku_im/controller/AllJOTableViewCell.h
  22. 1 1
      shiku_im/shiku_im/controller/AllJOTableViewCell.m
  23. 1 1
      shiku_im/shiku_im/controller/ApplySubscribeViewController.h
  24. 1 1
      shiku_im/shiku_im/controller/ApplySubscribeViewController.m
  25. 1 1
      shiku_im/shiku_im/controller/B2BChangeViewController.h
  26. 1 1
      shiku_im/shiku_im/controller/B2BChangeViewController.m
  27. 1 1
      shiku_im/shiku_im/controller/B2BHandleTaskCell.h
  28. 1 1
      shiku_im/shiku_im/controller/B2BHandleTaskCell.m
  29. 1 1
      shiku_im/shiku_im/controller/B2BHandleTaskModle.h
  30. 1 1
      shiku_im/shiku_im/controller/B2BHandleTaskModle.m
  31. 1 1
      shiku_im/shiku_im/controller/B2BMyHandleWorkVC.h
  32. 1 1
      shiku_im/shiku_im/controller/B2BMyHandleWorkVC.m
  33. 1 1
      shiku_im/shiku_im/controller/B2BNewTaskVC.h
  34. 1 1
      shiku_im/shiku_im/controller/B2BNewTaskVC.m
  35. 1 1
      shiku_im/shiku_im/controller/CreatBussinessVC.h
  36. 1 1
      shiku_im/shiku_im/controller/CreatBussinessVC.m
  37. 1 1
      shiku_im/shiku_im/controller/ERPHandleTaskCell.h
  38. 1 1
      shiku_im/shiku_im/controller/ERPHandleTaskCell.m
  39. 1 1
      shiku_im/shiku_im/controller/ERPHandleTaskModle.h
  40. 1 1
      shiku_im/shiku_im/controller/ERPHandleTaskModle.m
  41. 1 1
      shiku_im/shiku_im/controller/ERPHandleTaskVC.h
  42. 1 1
      shiku_im/shiku_im/controller/ERPHandleTaskVC.m
  43. 1 1
      shiku_im/shiku_im/controller/HVCollectionViewCell.h
  44. 1 1
      shiku_im/shiku_im/controller/HVCollectionViewCell.m
  45. 1 1
      shiku_im/shiku_im/controller/JODidSubscribleTableViewCell.h
  46. 1 1
      shiku_im/shiku_im/controller/JODidSubscribleTableViewCell.m
  47. 1 1
      shiku_im/shiku_im/controller/JOTableViewCell.h
  48. 1 1
      shiku_im/shiku_im/controller/JOTableViewCell.m
  49. 1 1
      shiku_im/shiku_im/controller/NewSubscribleManageViewController.h
  50. 1 1
      shiku_im/shiku_im/controller/NewSubscribleManageViewController.m
  51. 1 1
      shiku_im/shiku_im/controller/SubscribleDetailViewController.h
  52. 1 1
      shiku_im/shiku_im/controller/SubscribleDetailViewController.m
  53. 1 1
      shiku_im/shiku_im/controller/ZXVisitReportViewController.h
  54. 1 1
      shiku_im/shiku_im/controller/ZXVisitReportViewController.m
  55. 1 1
      shiku_im/shiku_im/controller/ZXsubButton.h
  56. 1 1
      shiku_im/shiku_im/controller/ZXsubButton.m
  57. 1 1
      shiku_im/shiku_im/controller/myOA/AlldocumentsViewController.h
  58. 1 1
      shiku_im/shiku_im/controller/myOA/ApplyCardViewController.h
  59. 1 1
      shiku_im/shiku_im/controller/myOA/ApplyCardViewController.m
  60. 1 1
      shiku_im/shiku_im/controller/myOA/CustomStepProgressView.h
  61. 1 1
      shiku_im/shiku_im/controller/myOA/CustomStepProgressView.m
  62. 1 1
      shiku_im/shiku_im/controller/myOA/CustomTableViewCell.h
  63. 1 1
      shiku_im/shiku_im/controller/myOA/CustomTableViewCell.m
  64. 1 1
      shiku_im/shiku_im/controller/myOA/CustomeApproveIdeaView.h
  65. 1 1
      shiku_im/shiku_im/controller/myOA/CustomeApproveIdeaView.m
  66. 1 1
      shiku_im/shiku_im/controller/myOA/ERPNewTaskViewController.h
  67. 1 1
      shiku_im/shiku_im/controller/myOA/ERPNewTaskViewController.m
  68. 1 1
      shiku_im/shiku_im/controller/myOA/IndependentOAViewController.h
  69. 1 1
      shiku_im/shiku_im/controller/myOA/NSJSONSerialization+ZXJSON.h
  70. 1 1
      shiku_im/shiku_im/controller/myOA/NSJSONSerialization+ZXJSON.m
  71. 1 1
      shiku_im/shiku_im/controller/myOA/OutWorkingSettingViewController.h
  72. 1 1
      shiku_im/shiku_im/controller/myOA/OutWorkingSettingViewController.m
  73. 1 1
      shiku_im/shiku_im/controller/myOA/VisitReportCustomView.h
  74. 1 1
      shiku_im/shiku_im/controller/myOA/VisitReportCustomView.m
  75. 5 1
      shiku_im/shiku_im/controller/myOA/YRWebVC.h
  76. 15 16
      shiku_im/shiku_im/controller/myOA/YRWebVC.m
  77. 1 1
      shiku_im/shiku_im/controller/subscribeManageViewController.h
  78. 1 1
      shiku_im/shiku_im/controller/subscribeManageViewController.m
  79. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/controller/MerchantSettingVC.h
  80. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/controller/MerchantSettingVC.m
  81. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/controller/PersonSettingsVC.h
  82. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/controller/PersonSettingsVC.m
  83. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/controller/PeopleListVC.h
  84. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/controller/PeopleListVC.m
  85. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/model/ServicePeopleModel.h
  86. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/model/ServicePeopleModel.m
  87. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/view/ServicePeopleCell.h
  88. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/view/ServicePeopleCell.m
  89. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/controller/EmployeeDayOffVC.h
  90. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/controller/EmployeeDayOffVC.m
  91. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/model/EmployeeListModel.h
  92. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/model/EmployeeListModel.m
  93. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/view/EmployeeListCell.h
  94. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/view/EmployeeListCell.m
  95. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/员工休息日列表/EmployeeListVC.h
  96. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/员工休息日列表/EmployeeListVC.m
  97. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/商家休息日设置/BusinessOffListVC.h
  98. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/商家休息日设置/BusinessOffListVC.m
  99. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/商家休息日设置/controller/BusinessDayOffVC.h
  100. 1 1
      shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/商家休息日设置/controller/BusinessDayOffVC.m

+ 52 - 6
shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -204,7 +204,6 @@
 		20D1D46E1FF39E5C00484427 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 20D1D4661FF39E5900484427 /* README.txt */; };
 		20D1D4711FF39E5C00484427 /* read_me.txt in Resources */ = {isa = PBXBuildFile; fileRef = 20D1D46D1FF39E5C00484427 /* read_me.txt */; };
 		20D2E7BC1F4BBA3E00DE0314 /* libSVProgressHUD.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 20D2E7BB1F4BBA3E00DE0314 /* libSVProgressHUD.a */; };
-		20D2E7C41F4BBEE600DE0314 /* MoreDataVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 20D2E7C01F4BBEE600DE0314 /* MoreDataVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		20D2E7CB1F4BD45F00DE0314 /* UASListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 20D2E7CA1F4BD45F00DE0314 /* UASListModel.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		20D65EC21F748F6E0097F596 /* UASInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 20D65EC01F748F6E0097F596 /* UASInputView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		20D65EC51F74902F0097F596 /* UASBaseVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 20D65EC41F74902F0097F596 /* UASBaseVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -1455,6 +1454,8 @@
 		995230A421476B4000BBEFAD /* UASClientMaCarefulCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 995230A321476B4000BBEFAD /* UASClientMaCarefulCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		995230A72147BCE700BBEFAD /* UASAddPreClientVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 995230A62147BCE700BBEFAD /* UASAddPreClientVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		995288D1215CE1F100305FFB /* UASVisitPlanVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 995288D0215CE1F100305FFB /* UASVisitPlanVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+		99596A392315215D004545EB /* YRBiServeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99596A382315215D004545EB /* YRBiServeVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+		99596A40231528CF004545EB /* MoreDataVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 99596A3F231528CE004545EB /* MoreDataVC.m */; };
 		995CD902214F7A180068859B /* UASClientDetailVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 995CD901214F7A180068859B /* UASClientDetailVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		995CD905214F7A930068859B /* UASClientDetailFooterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 995CD904214F7A930068859B /* UASClientDetailFooterView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
 		995CD908214FA1F70068859B /* UASClientDocuVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 995CD907214FA1F70068859B /* UASClientDocuVC.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -3223,8 +3224,6 @@
 		20D1D46A1FF39E5B00484427 /* UMSocialWechatHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMSocialWechatHandler.h; sourceTree = "<group>"; };
 		20D1D46D1FF39E5C00484427 /* read_me.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = read_me.txt; sourceTree = "<group>"; };
 		20D2E7BB1F4BBA3E00DE0314 /* libSVProgressHUD.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSVProgressHUD.a; path = "../../../../Library/Developer/Xcode/DerivedData/shiku_im-drjguawcmcisupglbmvvvvmfnjsg/Build/Products/Debug-iphoneos/SVProgressHUD/libSVProgressHUD.a"; sourceTree = "<group>"; };
-		20D2E7BF1F4BBEE600DE0314 /* MoreDataVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoreDataVC.h; sourceTree = "<group>"; };
-		20D2E7C01F4BBEE600DE0314 /* MoreDataVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MoreDataVC.m; sourceTree = "<group>"; };
 		20D2E7C91F4BD45F00DE0314 /* UASListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UASListModel.h; sourceTree = "<group>"; };
 		20D2E7CA1F4BD45F00DE0314 /* UASListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UASListModel.m; sourceTree = "<group>"; };
 		20D65EC01F748F6E0097F596 /* UASInputView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASInputView.m; sourceTree = "<group>"; };
@@ -5133,6 +5132,10 @@
 		995230A62147BCE700BBEFAD /* UASAddPreClientVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASAddPreClientVC.m; sourceTree = "<group>"; };
 		995288CF215CE1F100305FFB /* UASVisitPlanVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASVisitPlanVC.h; sourceTree = "<group>"; };
 		995288D0215CE1F100305FFB /* UASVisitPlanVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASVisitPlanVC.m; sourceTree = "<group>"; };
+		99596A372315215D004545EB /* YRBiServeVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YRBiServeVC.h; sourceTree = "<group>"; };
+		99596A382315215D004545EB /* YRBiServeVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YRBiServeVC.m; sourceTree = "<group>"; };
+		99596A3E231528CE004545EB /* MoreDataVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MoreDataVC.h; path = "shiku_im/文件夹1/MoreDataVC.h"; sourceTree = SOURCE_ROOT; };
+		99596A3F231528CE004545EB /* MoreDataVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MoreDataVC.m; path = "shiku_im/文件夹1/MoreDataVC.m"; sourceTree = SOURCE_ROOT; };
 		995CD900214F7A180068859B /* UASClientDetailVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientDetailVC.h; sourceTree = "<group>"; };
 		995CD901214F7A180068859B /* UASClientDetailVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UASClientDetailVC.m; sourceTree = "<group>"; };
 		995CD903214F7A930068859B /* UASClientDetailFooterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UASClientDetailFooterView.h; sourceTree = "<group>"; };
@@ -8068,8 +8071,8 @@
 		20D2E7BE1F4BBEE600DE0314 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
-				20D2E7BF1F4BBEE600DE0314 /* MoreDataVC.h */,
-				20D2E7C01F4BBEE600DE0314 /* MoreDataVC.m */,
+				99596A3E231528CE004545EB /* MoreDataVC.h */,
+				99596A3F231528CE004545EB /* MoreDataVC.m */,
 				2002D8F11F6B79CF00A3B19A /* UASSearchMoreVC.h */,
 				2002D8F21F6B79CF00A3B19A /* UASSearchMoreVC.m */,
 			);
@@ -10529,6 +10532,7 @@
 		4DE842771E949DE900D20EA2 /* Work(工作) */ = {
 			isa = PBXGroup;
 			children = (
+				99596A3623152124004545EB /* BIService */,
 				271CAB2D21C0DED5006FCCD8 /* 多明细通用表单 */,
 				2759C8362140B03800BA8105 /* CRM3.0 */,
 				2771C7ED20B537370066984D /* 英唐之歌 */,
@@ -12213,6 +12217,47 @@
 			name = UIDevice;
 			sourceTree = "<group>";
 		};
+		99596A3623152124004545EB /* BIService */ = {
+			isa = PBXGroup;
+			children = (
+				99596A3D2315217E004545EB /* Others */,
+				99596A3C23152175004545EB /* Views */,
+				99596A3B2315216D004545EB /* Models */,
+				99596A3A23152163004545EB /* Controllers */,
+			);
+			path = BIService;
+			sourceTree = "<group>";
+		};
+		99596A3A23152163004545EB /* Controllers */ = {
+			isa = PBXGroup;
+			children = (
+				99596A372315215D004545EB /* YRBiServeVC.h */,
+				99596A382315215D004545EB /* YRBiServeVC.m */,
+			);
+			path = Controllers;
+			sourceTree = "<group>";
+		};
+		99596A3B2315216D004545EB /* Models */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		99596A3C23152175004545EB /* Views */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
+		99596A3D2315217E004545EB /* Others */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Others;
+			sourceTree = "<group>";
+		};
 		996069D9230CD21A0073E089 /* WebView */ = {
 			isa = PBXGroup;
 			children = (
@@ -19385,6 +19430,7 @@
 				CC1D1912195432CA0029F7FD /* ICSDrawerController.m in Sources */,
 				CC6D87201939E51A00AE1EBA /* JXWaitView.m in Sources */,
 				273E9EA01DAF738A006295CF /* UMSWhatTableViewController.m in Sources */,
+				99596A392315215D004545EB /* YRBiServeVC.m in Sources */,
 				CC875A5B19361892007D2DA1 /* NSCharacterSet_Extensions.m in Sources */,
 				273F3F4F1D373B9E00160ECE /* UIColor+Zirkfied.m in Sources */,
 				7D37F76D1E6986030073D7DE /* JLHDThreeCell.m in Sources */,
@@ -19618,6 +19664,7 @@
 				271CAB3621C0DFC3006FCCD8 /* MoreGridDocuVC.m in Sources */,
 				AAF05DAB1EC1E6C7006A3BFE /* selectBusinessTableViewCell.m in Sources */,
 				273E9EB71DAF76C8006295CF /* UMSocialShareSelectionViewCell.m in Sources */,
+				99596A40231528CF004545EB /* MoreDataVC.m in Sources */,
 				7DEAF0B61FDE728C00DFE5FD /* BTServiceModel.m in Sources */,
 				273316AD1D2CD7B400BD978C /* UILabel+Boldify.m in Sources */,
 				CCE241F618FFB8EB00A3CB5A /* XMPPIQ+JabberRPC.m in Sources */,
@@ -19770,7 +19817,6 @@
 				27524F78214A041D0050869B /* ScheduleRemindVC.m in Sources */,
 				CC3017731951BABF0059BADA /* DialogUtil.m in Sources */,
 				CCC02C5A1A80DB0B004E32B5 /* searchData.m in Sources */,
-				20D2E7C41F4BBEE600DE0314 /* MoreDataVC.m in Sources */,
 				CC1D1913195432CA0029F7FD /* ICSDropShadowView.m in Sources */,
 				CCE2422218FFB8EB00A3CB5A /* XMPPMessageArchiving_Message_CoreDataObject.m in Sources */,
 				CCE242FC18FFB8EB00A3CB5A /* XMPPJID.m in Sources */,

+ 1 - 1
shiku_im/shiku_im/Comment/UASMethodTools.h

@@ -2,7 +2,7 @@
 //  UASMethodTools.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/11/16.
+//  Created by  on 2017/11/16.
 //
 
 #import <Foundation/Foundation.h>

+ 1 - 1
shiku_im/shiku_im/Comment/UASMethodTools.m

@@ -2,7 +2,7 @@
 //  UASMethodTools.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/11/16.
+//  Created by  on 2017/11/16.
 //
 
 #import "UASMethodTools.h"

+ 23 - 0
shiku_im/shiku_im/Images.xcassets/工作台图标/工作台首页_BI服务.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "工作台首页_BI服务.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "工作台首页_BI服务@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "工作台首页_BI服务@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
shiku_im/shiku_im/Images.xcassets/工作台图标/工作台首页_BI服务.imageset/工作台首页_BI服务.png


BIN
shiku_im/shiku_im/Images.xcassets/工作台图标/工作台首页_BI服务.imageset/工作台首页_BI服务@2x.png


BIN
shiku_im/shiku_im/Images.xcassets/工作台图标/工作台首页_BI服务.imageset/工作台首页_BI服务@3x.png


+ 1 - 1
shiku_im/shiku_im/OutWorkModel.h

@@ -2,7 +2,7 @@
 //  OutWorkModel.h
 //  shiku_im
 //
-//  Created by 周西 on 16/12/12.
+//  Created by  on 16/12/12.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/OutWorkModel.m

@@ -2,7 +2,7 @@
 //  OutWorkModel.m
 //  shiku_im
 //
-//  Created by 周西 on 16/12/12.
+//  Created by  on 16/12/12.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 3 - 1
shiku_im/shiku_im/RN/Controllers/YRReactVC.m

@@ -50,7 +50,9 @@ static NSMutableDictionary * rootDic = nil;
 //
     self.moduleName = self.moduleName?:@"UU_RN";
     
+
     NSString * strUrl = @"http://10.1.80.97:8081/index.bundle?platform=ios";
+
     jsCodeLocation = [NSURL URLWithString:strUrl] ;
     
     if (!rootDic) {
@@ -58,7 +60,7 @@ static NSMutableDictionary * rootDic = nil;
         rootDic = [NSMutableDictionary dictionary];
         
         
-        RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:@"UU_RN"
+        RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation moduleName:@"RNApp"
                                                      initialProperties:@{@"UU":@"UU_RN"}
                                                          launchOptions:nil];
         

+ 1 - 1
shiku_im/shiku_im/Register&Login/viewModel/UASLoginViewModel.h

@@ -2,7 +2,7 @@
 //  UASLoginViewModel.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/11/10.
+//  Created by  on 2017/11/10.
 //
 
 #import <Foundation/Foundation.h>

+ 1 - 1
shiku_im/shiku_im/Register&Login/viewModel/UASLoginViewModel.m

@@ -2,7 +2,7 @@
 //  UASLoginViewModel.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/11/10.
+//  Created by  on 2017/11/10.
 //
 
 #import "UASLoginViewModel.h"

+ 1 - 1
shiku_im/shiku_im/addressBook(通讯录)/NewAddPeopleTableViewCell.h

@@ -2,7 +2,7 @@
 //  NewAddPeopleTableViewCell.h
 //  shiku_im
 //
-//  Created by 周西 on 17/4/13.
+//  Created by  on 17/4/13.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/addressBook(通讯录)/NewAddPeopleTableViewCell.m

@@ -2,7 +2,7 @@
 //  NewAddPeopleTableViewCell.m
 //  shiku_im
 //
-//  Created by 周西 on 17/4/13.
+//  Created by  on 17/4/13.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/addressBook(通讯录)/NewAddPeopleVC.h

@@ -2,7 +2,7 @@
 //  NewAddPeopleVC.h
 //  shiku_im
 //
-//  Created by 周西 on 17/4/12.
+//  Created by  on 17/4/12.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/addressBook(通讯录)/NewAddPeopleVC.m

@@ -2,7 +2,7 @@
 //  NewAddPeopleVC.m
 //  shiku_im
 //
-//  Created by 周西 on 17/4/12.
+//  Created by  on 17/4/12.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/addressBook(通讯录)/NewContractPeopleVC.h

@@ -2,7 +2,7 @@
 //  NewContractPeopleVC.h
 //  shiku_im
 //
-//  Created by 周西 on 17/5/2.
+//  Created by  on 17/5/2.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/addressBook(通讯录)/NewContractPeopleVC.m

@@ -2,7 +2,7 @@
 //  NewContractPeopleVC.m
 //  shiku_im
 //
-//  Created by 周西 on 17/5/2.
+//  Created by  on 17/5/2.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/AddBusinessViewController.h

@@ -2,7 +2,7 @@
 //  AddBusinessViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 16/6/23.
+//  Created by  on 16/6/23.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/AddBusinessViewController.m

@@ -2,7 +2,7 @@
 //  AddBusinessViewController.m
 //  shiku_im
 //
-//  Created by 周西 on 16/6/23.
+//  Created by  on 16/6/23.
 //  Copyright © 2016年 Reese. All rights reserved.
 
 #import "AddBusinessViewController.h"

+ 1 - 1
shiku_im/shiku_im/controller/AllJOTableViewCell.h

@@ -2,7 +2,7 @@
 //  AllJOTableViewCell.h
 //  shiku_im
 //
-//  Created by 周西 on 16/9/7.
+//  Created by  on 16/9/7.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/AllJOTableViewCell.m

@@ -2,7 +2,7 @@
 //  AllJOTableViewCell.m
 //  shiku_im
 //
-//  Created by 周西 on 16/9/7.
+//  Created by  on 16/9/7.
 //  Copyright © 2016年 Reese. All rights reserved.
 
 #import "AllJOTableViewCell.h"

+ 1 - 1
shiku_im/shiku_im/controller/ApplySubscribeViewController.h

@@ -2,7 +2,7 @@
 //  ApplySubscribeViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 16/9/7.
+//  Created by  on 16/9/7.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ApplySubscribeViewController.m

@@ -2,7 +2,7 @@
 //  ApplySubscribeViewController.m
 //  shiku_im
 //
-//  Created by 周西 on 16/9/7.
+//  Created by  on 16/9/7.
 //  Copyright © 2016年 Reese. All rights reserved.
 
 #import "ApplySubscribeViewController.h"

+ 1 - 1
shiku_im/shiku_im/controller/B2BChangeViewController.h

@@ -2,7 +2,7 @@
 //  B2BChangeViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 17/3/20.
+//  Created by  on 17/3/20.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/B2BChangeViewController.m

@@ -2,7 +2,7 @@
 //  B2BChangeViewController.m
 //  shiku_im
 //
-//  Created by 周西 on 17/3/20.
+//  Created by  on 17/3/20.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/B2BHandleTaskCell.h

@@ -2,7 +2,7 @@
 //  B2BHandleTaskCell.h
 //  shiku_im
 //
-//  Created by 周西 on 17/3/29.
+//  Created by  on 17/3/29.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/B2BHandleTaskCell.m

@@ -2,7 +2,7 @@
 //  B2BHandleTaskCell.m
 //  shiku_im
 //
-//  Created by 周西 on 17/3/29.
+//  Created by  on 17/3/29.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/B2BHandleTaskModle.h

@@ -2,7 +2,7 @@
 //  B2BHandleTaskModle.h
 //  shiku_im
 //
-//  Created by 周西 on 17/3/29.
+//  Created by  on 17/3/29.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/B2BHandleTaskModle.m

@@ -2,7 +2,7 @@
 //  B2BHandleTaskModle.m
 //  shiku_im
 //
-//  Created by 周西 on 17/3/29.
+//  Created by  on 17/3/29.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/B2BMyHandleWorkVC.h

@@ -2,7 +2,7 @@
 //  B2BMyHandleWorkViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 17/3/29.
+//  Created by  on 17/3/29.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/B2BMyHandleWorkVC.m

@@ -2,7 +2,7 @@
 //  B2BMyHandleWorkVC.m
 //  shiku_im
 //
-//  Created by 周西 on 17/3/29.
+//  Created by  on 17/3/29.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/B2BNewTaskVC.h

@@ -2,7 +2,7 @@
 //  B2BNewTaskVC.h
 //  shiku_im
 //
-//  Created by 周西 on 17/3/21.
+//  Created by  on 17/3/21.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/B2BNewTaskVC.m

@@ -2,7 +2,7 @@
 //  B2BNewTaskVC.m
 //  shiku_im
 //
-//  Created by 周西 on 17/3/21.
+//  Created by  on 17/3/21.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/CreatBussinessVC.h

@@ -2,7 +2,7 @@
 //  CreatBussinessVC.h
 //  shiku_im
 //
-//  Created by 周西 on 17/5/2.
+//  Created by  on 17/5/2.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/CreatBussinessVC.m

@@ -2,7 +2,7 @@
 //  CreatBussinessVC.m
 //  shiku_im
 //
-//  Created by 周西 on 17/5/2.
+//  Created by  on 17/5/2.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ERPHandleTaskCell.h

@@ -2,7 +2,7 @@
 //  ERPHandleTaskCell.h
 //  shiku_im
 //
-//  Created by 周西 on 17/4/1.
+//  Created by  on 17/4/1.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ERPHandleTaskCell.m

@@ -2,7 +2,7 @@
 //  ERPHandleTaskCell.m
 //  shiku_im
 //
-//  Created by 周西 on 17/4/1.
+//  Created by  on 17/4/1.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ERPHandleTaskModle.h

@@ -2,7 +2,7 @@
 //  ERPHandleTaskModle.h
 //  shiku_im
 //
-//  Created by 周西 on 17/3/31.
+//  Created by  on 17/3/31.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ERPHandleTaskModle.m

@@ -2,7 +2,7 @@
 //  ERPHandleTaskModle.m
 //  shiku_im
 //
-//  Created by 周西 on 17/3/31.
+//  Created by  on 17/3/31.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ERPHandleTaskVC.h

@@ -2,7 +2,7 @@
 //  ERPHandleTaskVC.h
 //  shiku_im
 //
-//  Created by 周西 on 17/3/31.
+//  Created by  on 17/3/31.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ERPHandleTaskVC.m

@@ -2,7 +2,7 @@
 //  ERPHandleTaskVC.m
 //  shiku_im
 //
-//  Created by 周西 on 17/3/31.
+//  Created by  on 17/3/31.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/HVCollectionViewCell.h

@@ -2,7 +2,7 @@
 //  HVCollectionViewCell.h
 //  shiku_im
 //
-//  Created by 周西 on 16/7/6.
+//  Created by  on 16/7/6.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/HVCollectionViewCell.m

@@ -2,7 +2,7 @@
 //  HVCollectionViewCell.m
 //  shiku_im
 //
-//  Created by 周西 on 16/7/6.
+//  Created by  on 16/7/6.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 #import "HVCollectionViewCell.h"

+ 1 - 1
shiku_im/shiku_im/controller/JODidSubscribleTableViewCell.h

@@ -2,7 +2,7 @@
 //  JODidSubscribleTableViewCell.h
 //  shiku_im
 //
-//  Created by 周西 on 16/10/11.
+//  Created by  on 16/10/11.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/JODidSubscribleTableViewCell.m

@@ -2,7 +2,7 @@
 //  JODidSubscribleTableViewCell.m
 //  shiku_im
 //
-//  Created by 周西 on 16/10/11.
+//  Created by  on 16/10/11.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/JOTableViewCell.h

@@ -2,7 +2,7 @@
 //  JOTableViewCell.h
 //  shiku_im
 //
-//  Created by 周西 on 16/9/6.
+//  Created by  on 16/9/6.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/JOTableViewCell.m

@@ -2,7 +2,7 @@
 //  JOTableViewCell.m
 //  shiku_im
 //
-//  Created by 周西 on 16/9/6.
+//  Created by  on 16/9/6.
 //  Copyright © 2016年 Reese. All rights reserved.
 
 #import "JOTableViewCell.h"

+ 1 - 1
shiku_im/shiku_im/controller/NewSubscribleManageViewController.h

@@ -2,7 +2,7 @@
 //  NewSubscribleManageViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 16/10/10.
+//  Created by  on 16/10/10.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/NewSubscribleManageViewController.m

@@ -2,7 +2,7 @@
 //  NewSubscribleManageViewController.m
 //  shiku_im
 //
-//  Created by 周西 on 16/10/10.
+//  Created by  on 16/10/10.
 //  Copyright © 2016年 Reese. All rights reserved.
 
 #import "NewSubscribleManageViewController.h"

+ 1 - 1
shiku_im/shiku_im/controller/SubscribleDetailViewController.h

@@ -2,7 +2,7 @@
 //  SubscribleDetailViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 16/10/11.
+//  Created by  on 16/10/11.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/SubscribleDetailViewController.m

@@ -2,7 +2,7 @@
 //  SubscribleDetailViewController.m
 //  shiku_im
 //
-//  Created by 周西 on 16/10/11.
+//  Created by  on 16/10/11.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ZXVisitReportViewController.h

@@ -2,7 +2,7 @@
 //  ZXVisitReportViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 17/5/3.
+//  Created by  on 17/5/3.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ZXVisitReportViewController.m

@@ -2,7 +2,7 @@
 //  ZXVisitReportViewController.m
 //  shiku_im
 //
-//  Created by 周西 on 17/5/3.
+//  Created by  on 17/5/3.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ZXsubButton.h

@@ -2,7 +2,7 @@
 //  ZXsubButton.h
 //  shiku_im
 //
-//  Created by 周西 on 16/9/28.
+//  Created by  on 16/9/28.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/ZXsubButton.m

@@ -2,7 +2,7 @@
 //  ZXsubButton.m
 //  shiku_im
 //
-//  Created by 周西 on 16/9/28.
+//  Created by  on 16/9/28.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/AlldocumentsViewController.h

@@ -2,7 +2,7 @@
 //  AlldocumentsViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 17/2/23.
+//  Created by  on 17/2/23.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/ApplyCardViewController.h

@@ -2,7 +2,7 @@
 //  ApplyCardViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 16/11/17.
+//  Created by  on 16/11/17.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/ApplyCardViewController.m

@@ -2,7 +2,7 @@
 //  ApplyCardViewController.m
 //  shiku_im
 //
-//  Created by 周西 on 16/11/17.
+//  Created by  on 16/11/17.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/CustomStepProgressView.h

@@ -2,7 +2,7 @@
 //  CustomStepProgressView.h
 //  shiku_im
 //
-//  Created by 周西 on 17/5/19.
+//  Created by  on 17/5/19.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/CustomStepProgressView.m

@@ -2,7 +2,7 @@
 //  CustomStepProgressView.m
 //  shiku_im
 //
-//  Created by 周西 on 17/5/19.
+//  Created by  on 17/5/19.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/CustomTableViewCell.h

@@ -2,7 +2,7 @@
 //  CustomTableViewCell.h
 //  shiku_im
 //
-//  Created by 周西 on 17/5/8.
+//  Created by  on 17/5/8.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/CustomTableViewCell.m

@@ -2,7 +2,7 @@
 //  CustomTableViewCell.m
 //  shiku_im
 //
-//  Created by 周西 on 17/5/8.
+//  Created by  on 17/5/8.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/CustomeApproveIdeaView.h

@@ -2,7 +2,7 @@
 //  CustomeApproveIdeaView.h
 //  shiku_im
 //
-//  Created by 周西 on 17/4/12.
+//  Created by  on 17/4/12.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/CustomeApproveIdeaView.m

@@ -2,7 +2,7 @@
 //  CustomeApproveIdeaView.m
 //  shiku_im
 //
-//  Created by 周西 on 17/4/12.
+//  Created by  on 17/4/12.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/ERPNewTaskViewController.h

@@ -2,7 +2,7 @@
 //  ERPNewTaskViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 17/3/27.
+//  Created by  on 17/3/27.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/ERPNewTaskViewController.m

@@ -2,7 +2,7 @@
 //  ERPNewTaskViewController.m
 //  shiku_im
 //
-//  Created by 周西 on 17/3/27.
+//  Created by  on 17/3/27.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/IndependentOAViewController.h

@@ -2,7 +2,7 @@
 //  IndependentOAViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 17/2/22.
+//  Created by  on 17/2/22.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/NSJSONSerialization+ZXJSON.h

@@ -2,7 +2,7 @@
 //  NSJSONSerialization+ZXJSON.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/11/30.
+//  Created by  on 2017/11/30.
 //
 
 #import <Foundation/Foundation.h>

+ 1 - 1
shiku_im/shiku_im/controller/myOA/NSJSONSerialization+ZXJSON.m

@@ -2,7 +2,7 @@
 //  NSJSONSerialization+ZXJSON.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/11/30.
+//  Created by  on 2017/11/30.
 //
 
 #import "NSJSONSerialization+ZXJSON.h"

+ 1 - 1
shiku_im/shiku_im/controller/myOA/OutWorkingSettingViewController.h

@@ -2,7 +2,7 @@
 //  OutWorkingSettingViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 16/11/22.
+//  Created by  on 16/11/22.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/OutWorkingSettingViewController.m

@@ -2,7 +2,7 @@
 //  OutWorkingSettingViewController.m
 //  shiku_im
 //
-//  Created by 周西 on 16/11/22.
+//  Created by  on 16/11/22.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/VisitReportCustomView.h

@@ -2,7 +2,7 @@
 //  VisitReportCustomView.h
 //  shiku_im
 //
-//  Created by 周西 on 17/5/8.
+//  Created by  on 17/5/8.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/myOA/VisitReportCustomView.m

@@ -2,7 +2,7 @@
 //  VisitReportCustomView.m
 //  shiku_im
 //
-//  Created by 周西 on 17/5/8.
+//  Created by  on 17/5/8.
 //  Copyright © 2017年 UAS. All rights reserved.
 //
 

+ 5 - 1
shiku_im/shiku_im/controller/myOA/YRWebVC.h

@@ -14,7 +14,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property(copy,nonatomic)NSString *url;
 
-@property(copy,nonatomic)void(^backBlock)(void);
+/**
+ 名称,传入则显示该名称,否则显示网页名称
+ */
+@property(copy,nonatomic)NSString *titleName;
+
 
 @end
 

+ 15 - 16
shiku_im/shiku_im/controller/myOA/YRWebVC.m

@@ -9,6 +9,7 @@
 #import "YRWebVC.h"
 #import "AppDelegate.h"
 #import "UIDevice+extension.h"
+#import "UINavigationController+popGes.h"
 #import <WebKit/WebKit.h>
 #import <JavaScriptCore/JavaScriptCore.h>
 
@@ -86,6 +87,11 @@
     
     [self.webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
     
+    if (self.titleName) {
+        
+        self.title = self.titleName;
+        
+    }
     
 }
 
@@ -93,7 +99,11 @@
     
     [self.webView evaluateJavaScript:@"document.title" completionHandler:^(NSString * _Nullable title , NSError * _Nullable error) {
         
-        self.title = title;
+        if (self.titleName.length == 0) {
+            
+         self.title = title;
+            
+        }
         
     }];
     
@@ -132,9 +142,10 @@
     //调用横屏代码
     [UIDevice switchNewOrientation:UIInterfaceOrientationLandscapeRight];
     
-    
     [self.navigationController setNavigationBarHidden:YES animated:YES];
     
+    self.im_interactivePopDisabled = YES;
+    
 }
 //竖屏
 -(void)chartInterfaceOrientationMaskPortrait{
@@ -147,6 +158,8 @@
     
     [self.navigationController setNavigationBarHidden:NO animated:YES];
     
+     self.im_interactivePopDisabled = NO;
+    
 }
 
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
@@ -169,25 +182,11 @@
     
 }
 
--(void)viewDidDisappear:(BOOL)animated{
-    
-    [super viewDidDisappear:animated];
-    
-    if (self.backBlock) {
-        
-        self.backBlock();
-        
-    }
-    
-    
-    
-}
 
 -(void)removeAllMsgHandler{
     
     [self.webView.configuration.userContentController removeScriptMessageHandlerForName:@"event"];
     
-    
 }
 
 -(void)dealloc{

+ 1 - 1
shiku_im/shiku_im/controller/subscribeManageViewController.h

@@ -2,7 +2,7 @@
 //  subscribeManageViewController.h
 //  shiku_im
 //
-//  Created by 周西 on 16/9/6.
+//  Created by  on 16/9/6.
 //  Copyright © 2016年 Reese. All rights reserved.
 //
 

+ 1 - 1
shiku_im/shiku_im/controller/subscribeManageViewController.m

@@ -2,7 +2,7 @@
 //  subscribeManageViewController.m
 //  shiku_im
 //
-//  Created by 周西 on 16/9/6.
+//  Created by  on 16/9/6.
 //  Copyright © 2016年 Reese. All rights reserved.
 #define JOStatusCellMargin 15
 #import "subscribeManageViewController.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/controller/MerchantSettingVC.h

@@ -2,7 +2,7 @@
 //  MerchantSettingVC.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/10.
+//  Created by  on 2017/10/10.
 //
 
 #import <UIKit/UIKit.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/controller/MerchantSettingVC.m

@@ -2,7 +2,7 @@
 //  MerchantSettingVC.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/10.
+//  Created by  on 2017/10/10.
 //
 
 #import "MerchantSettingVC.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/controller/PersonSettingsVC.h

@@ -2,7 +2,7 @@
 //  PersonSettingsVC.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/10.
+//  Created by  on 2017/10/10.
 //
 
 #import <UIKit/UIKit.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/controller/PersonSettingsVC.m

@@ -2,7 +2,7 @@
 //  PersonSettingsVC.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/10.
+//  Created by  on 2017/10/10.
 //
 
 #import "PersonSettingsVC.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/controller/PeopleListVC.h

@@ -2,7 +2,7 @@
 //  PeopleListVC.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/16.
+//  Created by  on 2017/10/16.
 //
 
 #import <UIKit/UIKit.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/controller/PeopleListVC.m

@@ -2,7 +2,7 @@
 //  PeopleListVC.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/16.
+//  Created by  on 2017/10/16.
 //
 
 #import "PeopleListVC.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/model/ServicePeopleModel.h

@@ -2,7 +2,7 @@
 //  ServicePeopleModel.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/17.
+//  Created by  on 2017/10/17.
 //
 
 #import <Foundation/Foundation.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/model/ServicePeopleModel.m

@@ -2,7 +2,7 @@
 //  ServicePeopleModel.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/17.
+//  Created by  on 2017/10/17.
 //
 
 #import "ServicePeopleModel.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/view/ServicePeopleCell.h

@@ -2,7 +2,7 @@
 //  ServicePeopleCell.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/16.
+//  Created by  on 2017/10/16.
 //
 
 #import <UIKit/UIKit.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/人员设置/人员列表/view/ServicePeopleCell.m

@@ -2,7 +2,7 @@
 //  ServicePeopleCell.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/16.
+//  Created by  on 2017/10/16.
 //
 
 #import "ServicePeopleCell.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/controller/EmployeeDayOffVC.h

@@ -2,7 +2,7 @@
 //  EmployeeDayOffVC.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/10.
+//  Created by  on 2017/10/10.
 //
 
 #import <UIKit/UIKit.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/controller/EmployeeDayOffVC.m

@@ -2,7 +2,7 @@
 //  EmployeeDayOffVC.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/10.
+//  Created by  on 2017/10/10.
 //
 
 #import "EmployeeDayOffVC.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/model/EmployeeListModel.h

@@ -2,7 +2,7 @@
 //  EmployeeListModel.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/17.
+//  Created by  on 2017/10/17.
 //
 
 #import <Foundation/Foundation.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/model/EmployeeListModel.m

@@ -2,7 +2,7 @@
 //  EmployeeListModel.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/17.
+//  Created by  on 2017/10/17.
 //
 
 #import "EmployeeListModel.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/view/EmployeeListCell.h

@@ -2,7 +2,7 @@
 //  EmployeeListCell.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/17.
+//  Created by  on 2017/10/17.
 //
 
 #import <UIKit/UIKit.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/view/EmployeeListCell.m

@@ -2,7 +2,7 @@
 //  EmployeeListCell.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/17.
+//  Created by  on 2017/10/17.
 //
 
 #import "EmployeeListCell.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/员工休息日列表/EmployeeListVC.h

@@ -2,7 +2,7 @@
 //  EmployeeListVC.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/17.
+//  Created by  on 2017/10/17.
 //
 
 #import <UIKit/UIKit.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/员工休息日设置/员工休息日列表/EmployeeListVC.m

@@ -2,7 +2,7 @@
 //  EmployeeListVC.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/17.
+//  Created by  on 2017/10/17.
 //
 
 #import "EmployeeListVC.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/商家休息日设置/BusinessOffListVC.h

@@ -2,7 +2,7 @@
 //  BusinessOffListVC.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/17.
+//  Created by  on 2017/10/17.
 //
 
 #import <UIKit/UIKit.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/商家休息日设置/BusinessOffListVC.m

@@ -2,7 +2,7 @@
 //  BusinessOffListVC.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/17.
+//  Created by  on 2017/10/17.
 //
 
 #import "BusinessOffListVC.h"

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/商家休息日设置/controller/BusinessDayOffVC.h

@@ -2,7 +2,7 @@
 //  BusinessDayOffVC.h
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/10.
+//  Created by  on 2017/10/10.
 //
 
 #import <UIKit/UIKit.h>

+ 1 - 1
shiku_im/shiku_im/controller/预约小秘书/服务预约/商家设置/商家休息日设置/controller/BusinessDayOffVC.m

@@ -2,7 +2,7 @@
 //  BusinessDayOffVC.m
 //  shiku_im
 //
-//  Created by 周西 on 2017/10/10.
+//  Created by  on 2017/10/10.
 //
 
 #import "BusinessDayOffVC.h"

Some files were not shown because too many files changed in this diff