Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GeliBusinessPlatform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ljy
GeliBusinessPlatform
Commits
ed374529
Commit
ed374529
authored
May 15, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改方法
parent
37fa92ba
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
39 additions
and
29 deletions
+39
-29
GeliBusinessPlatform.xcodeproj/project.pbxproj
GeliBusinessPlatform.xcodeproj/project.pbxproj
+0
-8
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
+9
-1
GeliBusinessPlatform/View/Cell/KuWeiCell.swift
GeliBusinessPlatform/View/Cell/KuWeiCell.swift
+1
-1
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
...orm/ViewController/商品详情/ProductDetailViewController.swift
+2
-2
GeliBusinessPlatform/ViewController/新增、编辑(查看)仓库/CheckWareHourseViewController.swift
...ontroller/新增、编辑(查看)仓库/CheckWareHourseViewController.swift
+24
-17
GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift
...orm/ViewController/新增规格/CreatNewSpecsViewController.swift
+3
-0
No files found.
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @
ed374529
...
@@ -286,8 +286,6 @@
...
@@ -286,8 +286,6 @@
E0F97B0D24516B1F001BD600
/* AddImgCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B0B24516B1F001BD600
/* AddImgCell.xib */
;
};
E0F97B0D24516B1F001BD600
/* AddImgCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B0B24516B1F001BD600
/* AddImgCell.xib */
;
};
E0F97B102451728D001BD600
/* AddGuiGeCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B0E2451728D001BD600
/* AddGuiGeCell.swift */
;
};
E0F97B102451728D001BD600
/* AddGuiGeCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B0E2451728D001BD600
/* AddGuiGeCell.swift */
;
};
E0F97B112451728D001BD600
/* AddGuiGeCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B0F2451728D001BD600
/* AddGuiGeCell.xib */
;
};
E0F97B112451728D001BD600
/* AddGuiGeCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B0F2451728D001BD600
/* AddGuiGeCell.xib */
;
};
E0F97B1424517A31001BD600
/* CommendCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B1224517A31001BD600
/* CommendCell.swift */
;
};
E0F97B1524517A31001BD600
/* CommendCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B1324517A31001BD600
/* CommendCell.xib */
;
};
E0F97B1724517C87001BD600
/* AutoTextField.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B1624517C87001BD600
/* AutoTextField.swift */
;
};
E0F97B1724517C87001BD600
/* AutoTextField.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B1624517C87001BD600
/* AutoTextField.swift */
;
};
E0F97B1A2451951D001BD600
/* ShangPinGguiGeCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B182451951D001BD600
/* ShangPinGguiGeCell.swift */
;
};
E0F97B1A2451951D001BD600
/* ShangPinGguiGeCell.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B182451951D001BD600
/* ShangPinGguiGeCell.swift */
;
};
E0F97B1B2451951D001BD600
/* ShangPinGguiGeCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B192451951D001BD600
/* ShangPinGguiGeCell.xib */
;
};
E0F97B1B2451951D001BD600
/* ShangPinGguiGeCell.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
E0F97B192451951D001BD600
/* ShangPinGguiGeCell.xib */
;
};
...
@@ -769,8 +767,6 @@
...
@@ -769,8 +767,6 @@
E0F97B0B24516B1F001BD600
/* AddImgCell.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
AddImgCell.xib
;
sourceTree
=
"<group>"
;
};
E0F97B0B24516B1F001BD600
/* AddImgCell.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
AddImgCell.xib
;
sourceTree
=
"<group>"
;
};
E0F97B0E2451728D001BD600
/* AddGuiGeCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
AddGuiGeCell.swift
;
sourceTree
=
"<group>"
;
};
E0F97B0E2451728D001BD600
/* AddGuiGeCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
AddGuiGeCell.swift
;
sourceTree
=
"<group>"
;
};
E0F97B0F2451728D001BD600
/* AddGuiGeCell.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
AddGuiGeCell.xib
;
sourceTree
=
"<group>"
;
};
E0F97B0F2451728D001BD600
/* AddGuiGeCell.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
AddGuiGeCell.xib
;
sourceTree
=
"<group>"
;
};
E0F97B1224517A31001BD600
/* CommendCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
CommendCell.swift
;
sourceTree
=
"<group>"
;
};
E0F97B1324517A31001BD600
/* CommendCell.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
CommendCell.xib
;
sourceTree
=
"<group>"
;
};
E0F97B1624517C87001BD600
/* AutoTextField.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
AutoTextField.swift
;
sourceTree
=
"<group>"
;
};
E0F97B1624517C87001BD600
/* AutoTextField.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
AutoTextField.swift
;
sourceTree
=
"<group>"
;
};
E0F97B182451951D001BD600
/* ShangPinGguiGeCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
ShangPinGguiGeCell.swift
;
sourceTree
=
"<group>"
;
};
E0F97B182451951D001BD600
/* ShangPinGguiGeCell.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
ShangPinGguiGeCell.swift
;
sourceTree
=
"<group>"
;
};
E0F97B192451951D001BD600
/* ShangPinGguiGeCell.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
ShangPinGguiGeCell.xib
;
sourceTree
=
"<group>"
;
};
E0F97B192451951D001BD600
/* ShangPinGguiGeCell.xib */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file.xib
;
path
=
ShangPinGguiGeCell.xib
;
sourceTree
=
"<group>"
;
};
...
@@ -1853,8 +1849,6 @@
...
@@ -1853,8 +1849,6 @@
E0F97B0B24516B1F001BD600
/* AddImgCell.xib */
,
E0F97B0B24516B1F001BD600
/* AddImgCell.xib */
,
E0F97B0E2451728D001BD600
/* AddGuiGeCell.swift */
,
E0F97B0E2451728D001BD600
/* AddGuiGeCell.swift */
,
E0F97B0F2451728D001BD600
/* AddGuiGeCell.xib */
,
E0F97B0F2451728D001BD600
/* AddGuiGeCell.xib */
,
E0F97B1224517A31001BD600
/* CommendCell.swift */
,
E0F97B1324517A31001BD600
/* CommendCell.xib */
,
E0F97B182451951D001BD600
/* ShangPinGguiGeCell.swift */
,
E0F97B182451951D001BD600
/* ShangPinGguiGeCell.swift */
,
E0F97B192451951D001BD600
/* ShangPinGguiGeCell.xib */
,
E0F97B192451951D001BD600
/* ShangPinGguiGeCell.xib */
,
E042F7362452766100CDFA12
/* AdressSelectCell.swift */
,
E042F7362452766100CDFA12
/* AdressSelectCell.swift */
,
...
@@ -2487,7 +2481,6 @@
...
@@ -2487,7 +2481,6 @@
E0C4F4BE244EF53D00CC7E2F
/* BindStepTwoViewController.xib in Resources */
,
E0C4F4BE244EF53D00CC7E2F
/* BindStepTwoViewController.xib in Resources */
,
E00B0B1C24629E99006DC846
/* SJMapCell.xib in Resources */
,
E00B0B1C24629E99006DC846
/* SJMapCell.xib in Resources */
,
E02C882B2456B4BA00925766
/* WLGZCell.xib in Resources */
,
E02C882B2456B4BA00925766
/* WLGZCell.xib in Resources */
,
E0F97B1524517A31001BD600
/* CommendCell.xib in Resources */
,
E042F735245274F200CDFA12
/* YunDanLieBiaoCell.xib in Resources */
,
E042F735245274F200CDFA12
/* YunDanLieBiaoCell.xib in Resources */
,
E0D197CB24484D90002B080C
/* PersonCenterCell.xib in Resources */
,
E0D197CB24484D90002B080C
/* PersonCenterCell.xib in Resources */
,
E07B1E63245921A60055BA3C
/* KeHuXQCell.xib in Resources */
,
E07B1E63245921A60055BA3C
/* KeHuXQCell.xib in Resources */
,
...
@@ -2825,7 +2818,6 @@
...
@@ -2825,7 +2818,6 @@
F956D5C0246A3789003FF510
/* OrderDetailModel.swift in Sources */
,
F956D5C0246A3789003FF510
/* OrderDetailModel.swift in Sources */
,
E0DDCB1D244AE81800DF54C7
/* GuanLianKeHuCell.swift in Sources */
,
E0DDCB1D244AE81800DF54C7
/* GuanLianKeHuCell.swift in Sources */
,
E0D197BF2448431C002B080C
/* BabyBluetooth.m in Sources */
,
E0D197BF2448431C002B080C
/* BabyBluetooth.m in Sources */
,
E0F97B1424517A31001BD600
/* CommendCell.swift in Sources */
,
E0D4165F24482AAF008DCAB4
/* AccountViewController.swift in Sources */
,
E0D4165F24482AAF008DCAB4
/* AccountViewController.swift in Sources */
,
F950FDB32451820D00C40530
/* TitleAndSelCalendarView.swift in Sources */
,
F950FDB32451820D00C40530
/* TitleAndSelCalendarView.swift in Sources */
,
F95A9EED24558E3D00867849
/* ChangeGoodsPriceVC.swift in Sources */
,
F95A9EED24558E3D00867849
/* ChangeGoodsPriceVC.swift in Sources */
,
...
...
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
ed374529
No preview for this file type
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
View file @
ed374529
...
@@ -22,6 +22,7 @@ import IQKeyboardManagerSwift
...
@@ -22,6 +22,7 @@ import IQKeyboardManagerSwift
@objc
optional
func
GLAlertSelectEditAction
(
sender
:
Int
)
@objc
optional
func
GLAlertSelectEditAction
(
sender
:
Int
)
//库位专用
//库位专用
@objc
optional
func
KuWeiDataArr
(
sender
:
Array
<
Any
>
)
@objc
optional
func
KuWeiDataArr
(
sender
:
Array
<
Any
>
)
}
}
class
GLAlertSelectView
:
UIView
,
UITableViewDelegate
,
UITableViewDataSource
,
TitleAndSelectCellDelegate
,
KuWeiCellCellDelegate
{
class
GLAlertSelectView
:
UIView
,
UITableViewDelegate
,
UITableViewDataSource
,
TitleAndSelectCellDelegate
,
KuWeiCellCellDelegate
{
var
isMultipleS
:
Bool
=
false
var
isMultipleS
:
Bool
=
false
...
@@ -136,6 +137,13 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
...
@@ -136,6 +137,13 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
return
dataArr
.
count
return
dataArr
.
count
}
}
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
if
(
titleLbl
.
text
?
.
contains
(
"库位"
))
!
{
print
(
indexPath
.
row
)
selectNum
=
indexPath
.
row
}
}
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
if
(
titleLbl
.
text
?
.
contains
(
"库位"
))
!
{
if
(
titleLbl
.
text
?
.
contains
(
"库位"
))
!
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"KuWei"
)
as!
KuWeiCell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"KuWei"
)
as!
KuWeiCell
...
@@ -169,7 +177,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
...
@@ -169,7 +177,7 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
}
}
@IBAction
func
submitClick
(
_
sender
:
Any
)
{
@IBAction
func
submitClick
(
_
sender
:
Any
)
{
if
(
titleLbl
.
text
?
.
contains
(
"库位"
))
!
{
if
(
titleLbl
.
text
?
.
contains
(
"库位"
))
!
{
delegate
?
.
GLAlertSelectViewClick
?(
selectNum
:
selectNum
!
,
view
:
self
)
}
else
{
}
else
{
if
isMultipleS
==
false
{
if
isMultipleS
==
false
{
delegate
?
.
GLAlertSelectViewClick
?(
selectNum
:
selectNum
!
,
view
:
self
)
delegate
?
.
GLAlertSelectViewClick
?(
selectNum
:
selectNum
!
,
view
:
self
)
...
...
GeliBusinessPlatform/View/Cell/KuWeiCell.swift
View file @
ed374529
...
@@ -25,7 +25,7 @@ class KuWeiCell: UITableViewCell {
...
@@ -25,7 +25,7 @@ class KuWeiCell: UITableViewCell {
}
}
override
func
awakeFromNib
()
{
override
func
awakeFromNib
()
{
super
.
awakeFromNib
()
super
.
awakeFromNib
()
self
.
selectionStyle
=
.
none
//
self.selectionStyle = .none
// Initialization code
// Initialization code
}
}
...
...
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
View file @
ed374529
...
@@ -336,10 +336,10 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -336,10 +336,10 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
glSelectView
=
view
glSelectView
=
view
}
}
if
cell
.
nameLbl
.
text
==
"预设预付定金时间段"
{
if
cell
.
nameLbl
.
text
==
"预设预付定金时间段"
{
print
(
"定金时间段"
)
}
}
if
cell
.
nameLbl
.
text
==
"预设预付尾款时间段"
{
if
cell
.
nameLbl
.
text
==
"预设预付尾款时间段"
{
print
(
"预付尾款时"
)
}
}
}
}
//MARK:---选择商品分类返回数据
//MARK:---选择商品分类返回数据
...
...
GeliBusinessPlatform/ViewController/新增、编辑(查看)仓库/CheckWareHourseViewController.swift
View file @
ed374529
...
@@ -35,6 +35,7 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
...
@@ -35,6 +35,7 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
var
lianXiRen
=
""
//联系人
var
lianXiRen
=
""
//联系人
var
phone
=
""
//电话
var
phone
=
""
//电话
var
shiFouMoRen
=
false
//是否默认
var
shiFouMoRen
=
false
//是否默认
var
kuWeiSelect
:
Int
?
//库位选择
override
func
viewDidLoad
()
{
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
super
.
viewDidLoad
()
...
@@ -148,34 +149,40 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
...
@@ -148,34 +149,40 @@ class CheckWareHourseViewController: BaseViewController,UITableViewDelegate,UITa
print
(
cangKuName
)
print
(
cangKuName
)
print
(
kuWeiName
)
print
(
kuWeiName
)
print
(
listArray
[
warehourseType
!
])
print
(
listArray
[
warehourseType
!
])
print
(
listArray
[
kuWeiSelect
!
])
// if sender.tag == 999 {//请选择或填写包含库位的确定按钮
// if sender.tag == 999 {//请选择或填写包含库位的确定按钮
// print("tag 999")
// print("tag 999")
//
//
// }else{
// }else{
// if sender.titleString == "确定"{
// if sender.titleString == "确定"{
// print("确定 -- 仓库类型:\(warehourseType) (0:冷冻、1:冷藏、2:常温)")
// print("确定 -- 仓库类型:\(warehourseType) (0:冷冻、1:冷藏、2:常温)")
// }else{
// }else{
// if sender.titleString == "保存" {
// if sender.titleString == "保存" {
// sender.titleString = "编辑"
// sender.titleString = "编辑"
// statusStr = sender.titleString
// statusStr = sender.titleString
// print("确定 -- 仓库类型:\(warehourseType) (0:冷冻、1:冷藏、2:常温)")
// print("确定 -- 仓库类型:\(warehourseType) (0:冷冻、1:冷藏、2:常温)")
//
//
// }else{
// }else{
// sender.titleString = "保存"
// sender.titleString = "保存"
// statusStr = sender.titleString
// statusStr = sender.titleString
// }
// }
// }
// }
// }
// }
}
}
//库位
//库位
func
GLAlertSelectViewClick
(
selectNum
:
Int
,
view
:
GLAlertSelectView
){
func
GLAlertSelectViewClick
(
selectNum
:
Int
,
view
:
GLAlertSelectView
){
if
view
.
titleLbl
.
text
!.
contains
(
"库位"
)
{
kuWeiSelect
=
selectNum
}
else
{
warehourseType
=
selectNum
warehourseType
=
selectNum
}
glSelectView
?
.
removeFromSuperview
()
glSelectView
?
.
removeFromSuperview
()
glSelectView
=
nil
glSelectView
=
nil
listView
.
reloadData
()
listView
.
reloadData
()
}
}
func
GLAlertSelectDelAction
(
sender
:
Array
<
Any
>
)
{
func
GLAlertSelectDelAction
(
sender
:
Array
<
Any
>
)
{
print
(
sender
)
print
(
sender
)
}
}
...
...
GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift
View file @
ed374529
...
@@ -93,6 +93,8 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -93,6 +93,8 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
navbar
.
title
=
barTitle
navbar
.
title
=
barTitle
self
.
view
.
addSubview
(
navbar
)
self
.
view
.
addSubview
(
navbar
)
if
datasArr
.
count
>
1
&&
barTitle
!.
contains
(
"编辑"
)
==
true
{
//展示topbar
if
datasArr
.
count
>
1
&&
barTitle
!.
contains
(
"编辑"
)
==
true
{
//展示topbar
isJieTiJiaSetting
=
true
SetTopFrame
(
view
:
topBarView
,
height
:
41
)
SetTopFrame
(
view
:
topBarView
,
height
:
41
)
if
collectView
==
nil
{
if
collectView
==
nil
{
let
collectionView
=
UICollectionView
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
0
,
height
:
0
),
collectionViewLayout
:
layout
)
let
collectionView
=
UICollectionView
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
0
,
height
:
0
),
collectionViewLayout
:
layout
)
...
@@ -378,6 +380,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
...
@@ -378,6 +380,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
let
view
=
NewCreateHeader
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
fullScreenWidth
,
height
:
49
))
let
view
=
NewCreateHeader
(
frame
:
CGRect
(
x
:
0
,
y
:
0
,
width
:
fullScreenWidth
,
height
:
49
))
view
.
delegate
=
self
view
.
delegate
=
self
view
.
infoSw
.
isOn
=
isJieTiJiaSetting
view
.
infoSw
.
isOn
=
isJieTiJiaSetting
if
isJieTiJiaSetting
==
false
{
if
isJieTiJiaSetting
==
false
{
return
view
return
view
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment