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
c9c486a2
Commit
c9c486a2
authored
May 13, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商品详情串联
parent
8875f252
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
42 additions
and
21 deletions
+42
-21
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
+19
-6
GeliBusinessPlatform/ViewController/代客下单(购物)/DaiKeXiaDanGouWuViewController.swift
...wController/代客下单(购物)/DaiKeXiaDanGouWuViewController.swift
+1
-1
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
...orm/ViewController/商品详情/ProductDetailViewController.swift
+0
-0
GeliBusinessPlatform/ViewController/新增、编辑品牌/PinPaiListViewController.swift
...orm/ViewController/新增、编辑品牌/PinPaiListViewController.swift
+9
-9
GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift
...orm/ViewController/新增规格/CreatNewSpecsViewController.swift
+0
-0
GeliBusinessPlatform/ViewController/新增规格/YuShouCell.swift
GeliBusinessPlatform/ViewController/新增规格/YuShouCell.swift
+9
-1
GeliBusinessPlatform/ViewController/新增规格/YuShouCell.xib
GeliBusinessPlatform/ViewController/新增规格/YuShouCell.xib
+3
-3
GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.swift
...atform/ViewController/新增采购单/XinCaiGouViewController.swift
+1
-1
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
c9c486a2
No preview for this file type
GeliBusinessPlatform/View/AlertView/GLAlertSelectView.swift
View file @
c9c486a2
...
@@ -10,7 +10,7 @@ import UIKit
...
@@ -10,7 +10,7 @@ import UIKit
import
IQKeyboardManagerSwift
import
IQKeyboardManagerSwift
@objc
protocol
GLAlertSelectViewDelegate
{
@objc
protocol
GLAlertSelectViewDelegate
{
@objc
optional
func
GLAlertSelectViewClick
(
selectNum
:
NSString
,
view
:
UI
View
)
@objc
optional
func
GLAlertSelectViewClick
(
selectNum
:
NSString
,
view
:
GLAlertSelect
View
)
@objc
optional
func
GLAlertMoreSelectViewClick
(
sender
:
NSArray
,
view
:
UIView
)
@objc
optional
func
GLAlertMoreSelectViewClick
(
sender
:
NSArray
,
view
:
UIView
)
@objc
optional
func
GLAlertSelectViewClose
(
sender
:
UIButton
)
@objc
optional
func
GLAlertSelectViewClose
(
sender
:
UIButton
)
...
@@ -20,11 +20,14 @@ import IQKeyboardManagerSwift
...
@@ -20,11 +20,14 @@ import IQKeyboardManagerSwift
@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
contentView
:
UIView
!
var
contentView
:
UIView
!
var
delegate
:
GLAlertSelectViewDelegate
?
var
delegate
:
GLAlertSelectViewDelegate
?
var
inputTextTF
:
UITextField
?
var
inputTextTF
:
UITextField
?
var
selectArray
:
NSMutableArray
?
var
selectArray
:
NSMutableArray
?
var
selectNum
:
String
?
=
""
var
selectNum
:
String
?
=
""
var
selectLblText
:
String
?
=
""
var
dataArr
=
Array
<
String
>
(){
var
dataArr
=
Array
<
String
>
(){
didSet
{
didSet
{
var
tbvH
=
CGFloat
(
dataArr
.
count
*
49
)
var
tbvH
=
CGFloat
(
dataArr
.
count
*
49
)
...
@@ -142,9 +145,17 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
...
@@ -142,9 +145,17 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
cell
.
titleLbl
.
text
=
dataArr
[
indexPath
.
row
]
cell
.
titleLbl
.
text
=
dataArr
[
indexPath
.
row
]
cell
.
delegate
=
self
cell
.
delegate
=
self
cell
.
tag
=
indexPath
.
row
cell
.
tag
=
indexPath
.
row
for
item
in
selectArray
!
{
if
isMultipleS
==
true
{
let
row
=
"
\(
item
)
"
as!
NSString
for
item
in
selectArray
!
{
if
row
.
integerValue
==
indexPath
.
row
{
let
row
=
"
\(
item
)
"
as!
NSString
if
row
.
integerValue
==
indexPath
.
row
{
cell
.
titleLbl
.
textColor
=
UIColor
(
named
:
"蓝色字体颜色"
)
cell
.
selectBtn
.
isSelected
=
true
}
}
}
else
{
let
str
=
selectNum
as!
NSString
if
str
.
integerValue
==
indexPath
.
row
{
cell
.
titleLbl
.
textColor
=
UIColor
(
named
:
"蓝色字体颜色"
)
cell
.
titleLbl
.
textColor
=
UIColor
(
named
:
"蓝色字体颜色"
)
cell
.
selectBtn
.
isSelected
=
true
cell
.
selectBtn
.
isSelected
=
true
}
}
...
@@ -169,10 +180,12 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
...
@@ -169,10 +180,12 @@ class GLAlertSelectView: UIView,UITableViewDelegate,UITableViewDataSource,TitleA
if
selectNum
!.
count
>
0
{
if
selectNum
!.
count
>
0
{
for
item
in
selectTbv
.
visibleCells
{
for
item
in
selectTbv
.
visibleCells
{
let
cel
=
item
as!
TitleAndSelectCell
let
cel
=
item
as!
TitleAndSelectCell
cel
.
titleLbl
.
textColor
=
UIColor
(
named
:
"标题字颜色"
)
cel
.
selectBtn
.
isSelected
=
false
cel
.
selectBtn
.
isSelected
=
false
if
cell
==
cel
{
if
cell
==
cel
{
cell
.
selectBtn
.
isSelected
=
true
cel
.
selectBtn
.
isSelected
=
true
selectNum
=
"
\(
cell
.
tag
)
"
cel
.
titleLbl
.
textColor
=
UIColor
(
named
:
"蓝色字体颜色"
)
selectNum
=
"
\(
cel
.
tag
)
"
}
}
}
}
}
else
{
}
else
{
...
...
GeliBusinessPlatform/ViewController/代客下单(购物)/DaiKeXiaDanGouWuViewController.swift
View file @
c9c486a2
...
@@ -178,7 +178,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
...
@@ -178,7 +178,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
glSelectView
=
view
glSelectView
=
view
}
}
}
}
func
GLAlertSelectViewClick
(
selectNum
:
NSString
,
view
:
UI
View
)
{
func
GLAlertSelectViewClick
(
selectNum
:
NSString
,
view
:
GLAlertSelect
View
)
{
print
(
"单选"
,
selectNum
)
print
(
"单选"
,
selectNum
)
glSelectView
?
.
removeFromSuperview
()
glSelectView
?
.
removeFromSuperview
()
glSelectView
=
nil
glSelectView
=
nil
...
...
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
View file @
c9c486a2
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/新增、编辑品牌/PinPaiListViewController.swift
View file @
c9c486a2
...
@@ -72,19 +72,19 @@ class PinPaiListViewController: BaseViewController,UISearchBarDelegate,SearchBar
...
@@ -72,19 +72,19 @@ class PinPaiListViewController: BaseViewController,UISearchBarDelegate,SearchBar
return
49
return
49
}
}
func
tableView
(
_
tableView
:
UITableView
,
numberOfRowsInSection
section
:
Int
)
->
Int
{
func
tableView
(
_
tableView
:
UITableView
,
numberOfRowsInSection
section
:
Int
)
->
Int
{
return
dataModelArray
!.
count
return
12
}
}
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"TitleAndBtnCell"
)
as!
TitleAndBtnCell
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"TitleAndBtnCell"
)
as!
TitleAndBtnCell
let
rowModel
=
dataModelArray
!
[
indexPath
.
row
]
as!
GeneralInfoBrandModel
//
let rowModel = dataModelArray![indexPath.row] as! GeneralInfoBrandModel
cell
.
nameLbl
.
text
=
rowModel
.
brand_name
//
cell.nameLbl.text = rowModel.brand_name
cell
.
contentLbl
.
text
=
""
//
cell.contentLbl.text = ""
cell
.
btn
.
isUserInteractionEnabled
=
false
//
cell.btn.isUserInteractionEnabled = false
cell
.
selectionStyle
=
.
gray
//
cell.selectionStyle = .gray
if
isSelectData
{
//
if isSelectData {
cell
.
arrowImg
.
isHidden
=
true
//
cell.arrowImg.isHidden = true
}
//
}
return
cell
return
cell
}
}
var
selectModel
:
GeneralInfoBrandModel
?
=
nil
var
selectModel
:
GeneralInfoBrandModel
?
=
nil
...
...
GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift
View file @
c9c486a2
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/新增规格/YuShouCell.swift
View file @
c9c486a2
...
@@ -9,11 +9,12 @@
...
@@ -9,11 +9,12 @@
import
UIKit
import
UIKit
@objc
protocol
YuShouCellDelegate
{
@objc
protocol
YuShouCellDelegate
{
@objc
optional
func
YuShouCellSwitchStatus
(
sender
:
UISwitch
)
@objc
optional
func
YuShouCellSwitchStatus
(
sender
:
UISwitch
)
@objc
optional
func
YuShouCellTFContent
(
Price
:
NSString
)
}
}
class
YuShouCell
:
UITableViewCell
{
class
YuShouCell
:
UITableViewCell
{
var
delegate
:
YuShouCellDelegate
?
var
delegate
:
YuShouCellDelegate
?
@IBOutlet
weak
var
inputTF3
:
UITextField
!
@IBOutlet
weak
var
inputTF3
:
UITextField
!
@IBOutlet
weak
var
inputTF2
:
NSLayoutConstraint
!
@IBOutlet
weak
var
inputTF2
:
UITextField
!
@IBOutlet
weak
var
inputTF1
:
UITextField
!
@IBOutlet
weak
var
inputTF1
:
UITextField
!
@IBOutlet
weak
var
infoSw
:
UISwitch
!
@IBOutlet
weak
var
infoSw
:
UISwitch
!
override
func
awakeFromNib
()
{
override
func
awakeFromNib
()
{
...
@@ -22,8 +23,15 @@ var delegate:YuShouCellDelegate?
...
@@ -22,8 +23,15 @@ var delegate:YuShouCellDelegate?
infoSw
.
transform
=
CGAffineTransform
(
scaleX
:
0.8
,
y
:
0.8
)
infoSw
.
transform
=
CGAffineTransform
(
scaleX
:
0.8
,
y
:
0.8
)
infoSw
.
addTarget
(
self
,
action
:
#selector(
switchChange(sender:)
)
,
for
:
.
valueChanged
)
infoSw
.
addTarget
(
self
,
action
:
#selector(
switchChange(sender:)
)
,
for
:
.
valueChanged
)
inputTF1
.
addTarget
(
self
,
action
:
#selector(
textTfValueChange(sender:)
)
,
for
:
.
editingChanged
)
inputTF2
.
addTarget
(
self
,
action
:
#selector(
textTfValueChange(sender:)
)
,
for
:
.
editingChanged
)
inputTF3
.
addTarget
(
self
,
action
:
#selector(
textTfValueChange(sender:)
)
,
for
:
.
editingChanged
)
// Initialization code
// Initialization code
}
}
@objc
func
textTfValueChange
(
sender
:
UITextField
){
delegate
?
.
YuShouCellTFContent
?(
Price
:
"
\(
inputTF1
.
text
!
)
_
\(
inputTF2
.
text
!
)
_
\(
inputTF3
.
text
!
)
"
as
NSString
)
}
@objc
func
switchChange
(
sender
:
UISwitch
){
@objc
func
switchChange
(
sender
:
UISwitch
){
delegate
?
.
YuShouCellSwitchStatus
?(
sender
:
sender
)
delegate
?
.
YuShouCellSwitchStatus
?(
sender
:
sender
)
}
}
...
...
GeliBusinessPlatform/ViewController/新增规格/YuShouCell.xib
View file @
c9c486a2
...
@@ -145,7 +145,7 @@
...
@@ -145,7 +145,7 @@
<connections>
<connections>
<outlet
property=
"infoSw"
destination=
"05q-1N-wvO"
id=
"HtL-79-Qch"
/>
<outlet
property=
"infoSw"
destination=
"05q-1N-wvO"
id=
"HtL-79-Qch"
/>
<outlet
property=
"inputTF1"
destination=
"COH-zY-OUo"
id=
"hNT-E8-8k9"
/>
<outlet
property=
"inputTF1"
destination=
"COH-zY-OUo"
id=
"hNT-E8-8k9"
/>
<outlet
property=
"inputTF2"
destination=
"
b8D-hX-Yk3"
id=
"YpH-fW-FaR
"
/>
<outlet
property=
"inputTF2"
destination=
"
Qb7-aM-usa"
id=
"svg-gl-51Y
"
/>
<outlet
property=
"inputTF3"
destination=
"mht-f5-qwh"
id=
"lPo-lt-ttH"
/>
<outlet
property=
"inputTF3"
destination=
"mht-f5-qwh"
id=
"lPo-lt-ttH"
/>
</connections>
</connections>
<point
key=
"canvasLocation"
x=
"131.8840579710145"
y=
"112.83482142857142"
/>
<point
key=
"canvasLocation"
x=
"131.8840579710145"
y=
"112.83482142857142"
/>
...
@@ -153,10 +153,10 @@
...
@@ -153,10 +153,10 @@
</objects>
</objects>
<resources>
<resources>
<namedColor
name=
"标题字颜色"
>
<namedColor
name=
"标题字颜色"
>
<color
red=
"0.180
3921568627451"
green=
"0.1803921568627451"
blue=
"0.1803921568627451
"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
red=
"0.180
00000715255737"
green=
"0.18000000715255737"
blue=
"0.18000000715255737
"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</namedColor>
</namedColor>
<namedColor
name=
"标题字颜色"
>
<namedColor
name=
"标题字颜色"
>
<color
red=
"0.180
00000715255737"
green=
"0.18000000715255737"
blue=
"0.18000000715255737
"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
red=
"0.180
3921568627451"
green=
"0.1803921568627451"
blue=
"0.1803921568627451
"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</namedColor>
</namedColor>
<namedColor
name=
"灰色分界线"
>
<namedColor
name=
"灰色分界线"
>
<color
red=
"0.92941176470588238"
green=
"0.92941176470588238"
blue=
"0.92941176470588238"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
red=
"0.92941176470588238"
green=
"0.92941176470588238"
blue=
"0.92941176470588238"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
...
...
GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.swift
View file @
c9c486a2
...
@@ -251,7 +251,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -251,7 +251,7 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
print
(
"AddGuiGeCellClick"
)
print
(
"AddGuiGeCellClick"
)
}
}
func
GLAlertSelectViewClick
(
selectNum
:
NSString
,
view
:
UI
View
)
{
func
GLAlertSelectViewClick
(
selectNum
:
NSString
,
view
:
GLAlertSelect
View
)
{
print
(
"单选"
,
selectNum
)
print
(
"单选"
,
selectNum
)
glSelectView
?
.
removeFromSuperview
()
glSelectView
?
.
removeFromSuperview
()
glSelectView
=
nil
glSelectView
=
nil
...
...
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