Skip to content

G
galaxy-iOS
Commit a80d4cb6 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

商城列表弹窗

parent 30504666
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 22 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ a80d4cb6
......@@ -15,6 +15,7 @@
04013E402CF99505001A8E40 /* live.json in Resources */ = {isa = PBXBuildFile; fileRef = 04013E3F2CF99505001A8E40 /* live.json */; };
04013E422CFADF6B001A8E40 /* YHShareAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04013E412CFADF6B001A8E40 /* YHShareAlertView.swift */; };
04013E442CFD7F66001A8E40 /* YHLiveStateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04013E432CFD7F66001A8E40 /* YHLiveStateViewController.swift */; };
04013E462CFDA9AD001A8E40 /* YHLiveShopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04013E452CFDA9AD001A8E40 /* YHLiveShopView.swift */; };
040450CF2CC8A0F400D1CFE5 /* YHResignDocumentMultiLineTipsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 040450CE2CC8A0F400D1CFE5 /* YHResignDocumentMultiLineTipsCell.swift */; };
0408C3632BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0408C3622BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift */; };
0409BEEB2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0409BEEA2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift */; };
......@@ -1087,6 +1088,7 @@
04013E3F2CF99505001A8E40 /* live.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = live.json; sourceTree = "<group>"; };
04013E412CFADF6B001A8E40 /* YHShareAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareAlertView.swift; sourceTree = "<group>"; };
04013E432CFD7F66001A8E40 /* YHLiveStateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLiveStateViewController.swift; sourceTree = "<group>"; };
04013E452CFDA9AD001A8E40 /* YHLiveShopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLiveShopView.swift; sourceTree = "<group>"; };
040450CE2CC8A0F400D1CFE5 /* YHResignDocumentMultiLineTipsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignDocumentMultiLineTipsCell.swift; sourceTree = "<group>"; };
0408C3622BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVideoPlayerControlView.swift; sourceTree = "<group>"; };
0409BEEA2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleProfileListCell.swift; sourceTree = "<group>"; };
......@@ -3000,6 +3002,7 @@
04564D5E2CF565C7004456E4 /* YHInputBottomBar.swift */,
04564D7D2CF8D03D004456E4 /* YHFloatingWindow.swift */,
04013E412CFADF6B001A8E40 /* YHShareAlertView.swift */,
04013E452CFDA9AD001A8E40 /* YHLiveShopView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -6076,6 +6079,7 @@
040AE97C2CE7410100310241 /* YHWorkExperiencePositionViewModel.swift in Sources */,
04CE1ADD2C2AD91F001CB80A /* YHActivityDetailCell.swift in Sources */,
04AA19FD2BB40D5C00C1CBBD /* Applegate(JPush).swift in Sources */,
04013E462CFDA9AD001A8E40 /* YHLiveShopView.swift in Sources */,
04912F7E2CB7B2BA00CC3105 /* YHResignAppointOptionResultCell.swift in Sources */,
A567E5972BD7643D00D5D5A0 /* YHHomeModel.swift in Sources */,
04AF82D82C291E960028CE2A /* YHMatchUserViewModel.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterViewController.swift
View file @ a80d4cb6
......@@ -238,29 +238,32 @@ extension YHServiceCenterViewController {
}
@objc func pushOrderView() {
var flag = true
if self.state == 1 || self.state == 3 {
flag = false
}
YHServiceMoreAlertView.show(flag) {[weak self] index in
guard let self = self else { return }
if index == 1 {
let vc = YHOrderDetailViewController()
vc.model = oldModel
vc.backDate = { [weak self] model in
guard let self = self else { return }
self.model = model
self.state = 0
self.headIndex = 0
self.isCanSelectStep = false
}
self.navigationController?.pushViewController(vc)
} else {
let view = YHOffivialApprovalGuildLineCheckView.sheetView()
view.show()
}
YHLiveShopView.show() { index in
}
// var flag = true
// if self.state == 1 || self.state == 3 {
// flag = false
// }
// YHServiceMoreAlertView.show(flag) {[weak self] index in
// guard let self = self else { return }
// if index == 1 {
// let vc = YHOrderDetailViewController()
// vc.model = oldModel
// vc.backDate = { [weak self] model in
// guard let self = self else { return }
// self.model = model
// self.state = 0
// self.headIndex = 0
// self.isCanSelectStep = false
// }
// self.navigationController?.pushViewController(vc)
// } else {
// let view = YHOffivialApprovalGuildLineCheckView.sheetView()
// view.show()
// }
// }
//
}
@objc func selectTimeStep() {
......
galaxy/galaxy/Res/Assets.xcassets/YinHeLive/live_shop_add.imageset/Contents.json 0 → 100644
View file @ a80d4cb6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_shop_add@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_shop_add@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/YinHeLive/live_shop_head.imageset/Contents.json 0 → 100644
View file @ a80d4cb6
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_shop_head@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_shop_head@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment