ios/PlayPai.git

			@@ -14,7 +14,7 @@


			class VideoViewModel:RefreshModel<VideosModel>{
			let position = BehaviorRelay<Int>(value: 1)
			let position = BehaviorRelay<Int>(value: 1) //1=线上课得积分，2=看视频得奖励
			let search = BehaviorRelay<String>(value: "")

			override func api() -> (Observable<BaseResponse<[VideosModel]>>)? {
			@@ -47,7 +47,13 @@

			override func viewDidLoad() {
			super.viewDidLoad()
			let type = BannerPositionType(rawValue: viewModel.position.value)!

			var type:BannerPositionType!
			if viewModel.position.value == 1{
			type = .onlineCourse
			}else{
			type = .video
			}
			Services.bannerList(position: type).subscribe(onNext: {[weak self] data in
			if let models = data.data{
			self?.searchView.bannerView.setImages(images: models.map({$0.img}),type: .URL, imageClickBlock: { index in
			@@ -58,9 +64,6 @@

			viewModel.configure(collectionView,needMore: false)
			viewModel.beginRefresh()
			// collectionView.jq_setEmptyView { setView in
			// setView.verticalOffset(-300)
			// }
			}

			override func setUI() {

			@@ -75,6 +75,7 @@
			self?.label_studyState.backgroundColor = UIColor(hexStr: "#FD9331").withAlphaComponent(0.29)
			self?.label_studyState.textColor = Def_ThemeColor
			}
			self?.label_studyState.isHidden = false

			self?.img_introduceCover.sd_setImage(with: URL(string: model.introductionDrawing)) {[weak self] image, error, type, url in
			if let img = image{

			@@ -250,11 +250,11 @@
			let vc = ActivityListVC()
			push(vc: vc)
			case .video:
			let vc = CourseOnlineListVC(position: 3)
			let vc = CourseOnlineListVC(position: 2)
			vc.title = "看视频得奖励"
			push(vc: vc)
			case .coin:
			let vc = CourseOnlineListVC(position: 2)
			let vc = CourseOnlineListVC(position: 1)
			vc.title = "线上课得积分"
			push(vc: vc)
			case .ticket:

	WanPai/Root/Course/VC/CourseOnlineListVC.swift	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WanPai/Root/Course/VC/CourseVideoDetailVC.swift	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WanPai/Root/Home/VC/HomeVC.swift	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史