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
5acdc77a
Commit
5acdc77a
authored
Nov 16, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
字体颜色改变
parent
52bb20cb
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
5 deletions
+18
-5
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Assets.xcassets/背景色/#FAA376.colorset/Contents.json
...atform/Assets.xcassets/背景色/#FAA376.colorset/Contents.json
+2
-2
GeliBusinessPlatform/View/Cell/GYS_FX_ProductCellTableViewCell.swift
...sPlatform/View/Cell/GYS_FX_ProductCellTableViewCell.swift
+1
-0
GeliBusinessPlatform/View/Cell/GYS_FX_ProductCellTableViewCell.xib
...essPlatform/View/Cell/GYS_FX_ProductCellTableViewCell.xib
+12
-1
GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift
...sPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift
+3
-2
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
5acdc77a
No preview for this file type
GeliBusinessPlatform/Assets.xcassets/背景色/#FAA376.colorset/Contents.json
View file @
5acdc77a
...
...
@@ -4,7 +4,7 @@
"color"
:
{
"color-space"
:
"srgb"
,
"components"
:
{
"alpha"
:
"0.
69
0"
,
"alpha"
:
"0.
80
0"
,
"blue"
:
"0.463"
,
"green"
:
"0.639"
,
"red"
:
"0.980"
...
...
@@ -22,7 +22,7 @@
"color"
:
{
"color-space"
:
"srgb"
,
"components"
:
{
"alpha"
:
"0.
69
0"
,
"alpha"
:
"0.
80
0"
,
"blue"
:
"0.463"
,
"green"
:
"0.639"
,
"red"
:
"0.980"
...
...
GeliBusinessPlatform/View/Cell/GYS_FX_ProductCellTableViewCell.swift
View file @
5acdc77a
...
...
@@ -13,6 +13,7 @@ protocol GYS_FX_ProductCellDelegate {
}
class
GYS_FX_ProductCellTableViewCell
:
UITableViewCell
{
@IBOutlet
weak
var
color_lbl
:
UILabel
!
var
delegate
:
GYS_FX_ProductCellDelegate
?
@IBAction
func
btnAction
(
_
sender
:
UIButton
)
{
...
...
GeliBusinessPlatform/View/Cell/GYS_FX_ProductCellTableViewCell.xib
View file @
5acdc77a
...
...
@@ -129,9 +129,17 @@
<constraint
firstAttribute=
"height"
constant=
"1"
id=
"9xG-aS-jTC"
/>
</constraints>
</view>
<label
hidden=
"YES"
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Label"
textAlignment=
"center"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"okO-4P-1Ww"
>
<rect
key=
"frame"
x=
"15"
y=
"80"
width=
"90"
height=
"25"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"11"
/>
<color
key=
"textColor"
name=
"白色背景色"
/>
<nil
key=
"highlightedColor"
/>
</label>
</subviews>
<color
key=
"backgroundColor"
name=
"白色背景色"
/>
<constraints>
<constraint
firstItem=
"okO-4P-1Ww"
firstAttribute=
"centerY"
secondItem=
"rhK-mv-sfb"
secondAttribute=
"centerY"
id=
"0zV-yq-hCS"
/>
<constraint
firstItem=
"okO-4P-1Ww"
firstAttribute=
"centerX"
secondItem=
"rhK-mv-sfb"
secondAttribute=
"centerX"
id=
"1nR-aO-x9x"
/>
<constraint
firstItem=
"kGs-Qz-GbO"
firstAttribute=
"top"
secondItem=
"io4-Mx-VZ7"
secondAttribute=
"bottom"
constant=
"8"
id=
"2bi-hC-gxR"
/>
<constraint
firstItem=
"ugc-WK-r7L"
firstAttribute=
"top"
secondItem=
"z5k-CZ-aID"
secondAttribute=
"top"
constant=
"35.5"
id=
"4Tt-au-IaX"
/>
<constraint
firstItem=
"tnU-5r-Jfg"
firstAttribute=
"leading"
secondItem=
"Bjz-wA-QCI"
secondAttribute=
"leading"
id=
"4la-xp-itU"
/>
...
...
@@ -154,6 +162,8 @@
<constraint
firstItem=
"N0T-3l-rU8"
firstAttribute=
"bottom"
secondItem=
"rhK-mv-sfb"
secondAttribute=
"bottom"
id=
"nWw-HI-LFc"
/>
<constraint
firstItem=
"kGs-Qz-GbO"
firstAttribute=
"leading"
secondItem=
"io4-Mx-VZ7"
secondAttribute=
"leading"
id=
"oGw-y5-d27"
/>
<constraint
firstItem=
"Cae-xu-msI"
firstAttribute=
"leading"
secondItem=
"ugc-WK-r7L"
secondAttribute=
"trailing"
constant=
"8"
id=
"oa0-Dd-Byp"
/>
<constraint
firstItem=
"okO-4P-1Ww"
firstAttribute=
"width"
secondItem=
"rhK-mv-sfb"
secondAttribute=
"width"
id=
"ojS-PZ-N3p"
/>
<constraint
firstItem=
"okO-4P-1Ww"
firstAttribute=
"height"
secondItem=
"rhK-mv-sfb"
secondAttribute=
"height"
id=
"plL-rG-FL4"
/>
<constraint
firstItem=
"Bjz-wA-QCI"
firstAttribute=
"trailing"
secondItem=
"tnU-5r-Jfg"
secondAttribute=
"trailing"
id=
"qbA-7Z-RKC"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"Cae-xu-msI"
secondAttribute=
"trailing"
constant=
"8"
id=
"sA8-84-yMl"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"ugc-WK-r7L"
secondAttribute=
"bottom"
constant=
"35.5"
id=
"wOK-CV-7oB"
/>
...
...
@@ -196,6 +206,7 @@
<color
key=
"backgroundColor"
name=
"app底色"
/>
<connections>
<outlet
property=
"FX_Percent_Lbl"
destination=
"rhK-mv-sfb"
id=
"2jQ-Xp-BSC"
/>
<outlet
property=
"color_lbl"
destination=
"okO-4P-1Ww"
id=
"w3h-oa-1IJ"
/>
<outlet
property=
"item_Icon_Img"
destination=
"WYJ-BO-wv9"
id=
"vgb-ui-8ct"
/>
<outlet
property=
"leftValue"
destination=
"Hm5-HY-mc7"
id=
"USY-ug-Pjx"
/>
<outlet
property=
"left_btn"
destination=
"qor-h2-doo"
id=
"D95-B4-Mtj"
/>
...
...
@@ -215,7 +226,7 @@
<resources>
<image
name=
"daixuan"
width=
"19"
height=
"19"
/>
<namedColor
name=
"#FAA376"
>
<color
red=
"0.98000001907348633"
green=
"0.63899999856948853"
blue=
"0.46299999952316284"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<color
red=
"0.98000001907348633"
green=
"0.63899999856948853"
blue=
"0.46299999952316284"
alpha=
"
0.6899999976158142
1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</namedColor>
<namedColor
name=
"app底色"
>
<color
red=
"0.94509803921568625"
green=
"0.94509803921568625"
blue=
"0.94509803921568625"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
...
...
GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift
View file @
5acdc77a
...
...
@@ -71,7 +71,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
let
vc
=
DistributorSettingAlertView
(
frame
:
self
.
view
.
bounds
)
vc
.
tag
=
idx
vc
.
data
=
datas
[
idx
]
print
(
"abc = "
,
vc
.
data
?
.
commission_type
)
vc
.
delegate
=
self
self
.
view
.
addSubview
(
vc
)
}
...
...
@@ -339,6 +338,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
cell
.
old_price_Lbl
.
text
=
"¥"
+
model
.
price
!
if
model
.
commission_type
==
1
{
cell
.
FX_Percent_Lbl
.
isHidden
=
false
cell
.
FX_Percent_Lbl
.
text
=
"分销("
+
StringByInt
(
number
:
model
.
commission_per
!
)
+
"%)"
}
else
if
model
.
commission_type
==
2
{
cell
.
FX_Percent_Lbl
.
isHidden
=
false
...
...
@@ -358,7 +358,8 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
if
model
.
goods_thumb
!=
nil
{
cell
.
item_Icon_Img
.
sd_setImage
(
with
:
URL
(
string
:
SERVERCE_ImageHost
+
model
.
goods_thumb
!
))
}
cell
.
color_lbl
.
isHidden
=
cell
.
FX_Percent_Lbl
.
isHidden
cell
.
color_lbl
.
text
=
cell
.
FX_Percent_Lbl
.
text
return
cell
}
var
selectItem
:
Array
<
Int
>
=
[]
...
...
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