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
1f6d63a5
Commit
1f6d63a5
authored
Dec 02, 2020
by
刘俊宏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1196 iOS:工作中心-分销分账设置:隐藏商品分享解散“1对1结算”
parent
7e1ab83d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
30 deletions
+30
-30
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
...ata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/ViewController/分销商分账设置/DistributorSettingViewController.swift
...Controller/分销商分账设置/DistributorSettingViewController.swift
+13
-13
GeliBusinessPlatform/ViewController/分销商分账设置/DistributorSettingViewController.xib
...ewController/分销商分账设置/DistributorSettingViewController.xib
+17
-17
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
View file @
1f6d63a5
No preview for this file type
GeliBusinessPlatform/ViewController/分销商分账设置/DistributorSettingViewController.swift
View file @
1f6d63a5
...
@@ -35,15 +35,15 @@ class DistributorSettingViewController: BaseViewController {
...
@@ -35,15 +35,15 @@ class DistributorSettingViewController: BaseViewController {
dbt_type
=
"2"
dbt_type
=
"2"
}
}
if
dataM
?
.
share_type
==
1
{
//
if dataM?.share_type == 1 {
sharetypeBtn1
.
setImage
(
UIImage
.
init
(
named
:
"yuxuan"
),
for
:
.
normal
)
//
sharetypeBtn1 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
sharetypeBtn2
.
setImage
(
UIImage
.
init
(
named
:
"daixuan"
),
for
:
.
normal
)
//
sharetypeBtn2 .setImage(UIImage.init(named: "daixuan"), for: .normal)
share_type
=
"1"
//
share_type = "1"
}
else
if
dataM
?
.
share_type
==
2
{
//
}else if dataM?.share_type == 2 {
sharetypeBtn1
.
setImage
(
UIImage
.
init
(
named
:
"daixuan"
),
for
:
.
normal
)
sharetypeBtn1
.
setImage
(
UIImage
.
init
(
named
:
"daixuan"
),
for
:
.
normal
)
sharetypeBtn2
.
setImage
(
UIImage
.
init
(
named
:
"yuxuan"
),
for
:
.
normal
)
sharetypeBtn2
.
setImage
(
UIImage
.
init
(
named
:
"yuxuan"
),
for
:
.
normal
)
share_type
=
"2"
share_type
=
"2"
}
//
}
}
}
}
}
...
@@ -67,17 +67,17 @@ class DistributorSettingViewController: BaseViewController {
...
@@ -67,17 +67,17 @@ class DistributorSettingViewController: BaseViewController {
@IBOutlet
weak
var
sharetypeBtn2
:
UIButton
!
@IBOutlet
weak
var
sharetypeBtn2
:
UIButton
!
@IBAction
func
sharetypeAction
(
_
sender
:
UIButton
)
{
@IBAction
func
sharetypeAction
(
_
sender
:
UIButton
)
{
if
sharetypeBtn1
==
sender
{
//
if sharetypeBtn1 == sender {
sharetypeBtn1
.
setImage
(
UIImage
.
init
(
named
:
"yuxuan"
),
for
:
.
normal
)
//
sharetypeBtn1 .setImage(UIImage.init(named: "yuxuan"), for: .normal)
sharetypeBtn2
.
setImage
(
UIImage
.
init
(
named
:
"daixuan"
),
for
:
.
normal
)
//
sharetypeBtn2 .setImage(UIImage.init(named: "daixuan"), for: .normal)
share_type
=
"1"
//
share_type = "1"
//
}
else
if
sharetypeBtn2
==
sender
{
//
}else if sharetypeBtn2 == sender{
sharetypeBtn1
.
setImage
(
UIImage
.
init
(
named
:
"daixuan"
),
for
:
.
normal
)
sharetypeBtn1
.
setImage
(
UIImage
.
init
(
named
:
"daixuan"
),
for
:
.
normal
)
sharetypeBtn2
.
setImage
(
UIImage
.
init
(
named
:
"yuxuan"
),
for
:
.
normal
)
sharetypeBtn2
.
setImage
(
UIImage
.
init
(
named
:
"yuxuan"
),
for
:
.
normal
)
share_type
=
"2"
share_type
=
"2"
}
//
}
}
}
@IBAction
func
submitAction
(
_
sender
:
Any
)
{
@IBAction
func
submitAction
(
_
sender
:
Any
)
{
//保存
//保存
...
...
GeliBusinessPlatform/ViewController/分销商分账设置/DistributorSettingViewController.xib
View file @
1f6d63a5
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"17
15
6"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"17
50
6"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<dependencies>
<dependencies>
<deployment
identifier=
"iOS"
/>
<deployment
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"17
126
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"17
505
"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"System colors in document resources"
minToolsVersion=
"11.0"
/>
<capability
name=
"System colors in document resources"
minToolsVersion=
"11.0"
/>
...
@@ -136,18 +136,8 @@
...
@@ -136,18 +136,8 @@
<color
key=
"textColor"
name=
"标题字颜色"
/>
<color
key=
"textColor"
name=
"标题字颜色"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"7Jf-Vg-Ti2"
>
<rect
key=
"frame"
x=
"110"
y=
"259"
width=
"78"
height=
"19"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<state
key=
"normal"
title=
" 1对1结算"
image=
"daixuan"
>
<color
key=
"titleColor"
name=
"标题字颜色"
/>
</state>
<connections>
<action
selector=
"sharetypeAction:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"WEM-cs-sfa"
/>
</connections>
</button>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"kUr-sL-blR"
>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"kUr-sL-blR"
>
<rect
key=
"frame"
x=
"
213
"
y=
"259"
width=
"85"
height=
"19"
/>
<rect
key=
"frame"
x=
"
110
"
y=
"259"
width=
"85"
height=
"19"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<state
key=
"normal"
title=
" 1对多结算"
image=
"yuxuan"
>
<state
key=
"normal"
title=
" 1对多结算"
image=
"yuxuan"
>
<color
key=
"titleColor"
name=
"标题字颜色"
/>
<color
key=
"titleColor"
name=
"标题字颜色"
/>
...
@@ -162,6 +152,16 @@
...
@@ -162,6 +152,16 @@
<color
key=
"textColor"
name=
"灰色字体颜色"
/>
<color
key=
"textColor"
name=
"灰色字体颜色"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<button
hidden=
"YES"
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"7Jf-Vg-Ti2"
>
<rect
key=
"frame"
x=
"218"
y=
"259"
width=
"78"
height=
"19"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<state
key=
"normal"
title=
" 1对1结算"
image=
"daixuan"
>
<color
key=
"titleColor"
name=
"标题字颜色"
/>
</state>
<connections>
<action
selector=
"sharetypeAction:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"WEM-cs-sfa"
/>
</connections>
</button>
</subviews>
</subviews>
<viewLayoutGuide
key=
"safeArea"
id=
"fnl-2z-Ty3"
/>
<viewLayoutGuide
key=
"safeArea"
id=
"fnl-2z-Ty3"
/>
<color
key=
"backgroundColor"
name=
"白色背景色"
/>
<color
key=
"backgroundColor"
name=
"白色背景色"
/>
...
@@ -180,28 +180,28 @@
...
@@ -180,28 +180,28 @@
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"bottom"
secondItem=
"U8z-0Z-8lJ"
secondAttribute=
"bottom"
id=
"KTe-2w-5Fj"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"bottom"
secondItem=
"U8z-0Z-8lJ"
secondAttribute=
"bottom"
id=
"KTe-2w-5Fj"
/>
<constraint
firstItem=
"cd1-Ru-T4p"
firstAttribute=
"top"
secondItem=
"abH-an-xUL"
secondAttribute=
"bottom"
constant=
"20"
id=
"Kes-eI-MPy"
/>
<constraint
firstItem=
"cd1-Ru-T4p"
firstAttribute=
"top"
secondItem=
"abH-an-xUL"
secondAttribute=
"bottom"
constant=
"20"
id=
"Kes-eI-MPy"
/>
<constraint
firstItem=
"rdF-Hk-QO2"
firstAttribute=
"leading"
secondItem=
"1Jz-fi-X6W"
secondAttribute=
"leading"
id=
"LmN-2g-637"
/>
<constraint
firstItem=
"rdF-Hk-QO2"
firstAttribute=
"leading"
secondItem=
"1Jz-fi-X6W"
secondAttribute=
"leading"
id=
"LmN-2g-637"
/>
<constraint
firstItem=
"120-wO-RM3"
firstAttribute=
"leading"
secondItem=
"kUr-sL-blR"
secondAttribute=
"leading"
id=
"NgH-9B-pnd"
/>
<constraint
firstItem=
"WrZ-HX-Mdp"
firstAttribute=
"leading"
secondItem=
"1Jz-fi-X6W"
secondAttribute=
"trailing"
constant=
"25"
id=
"Okm-0L-J6z"
/>
<constraint
firstItem=
"WrZ-HX-Mdp"
firstAttribute=
"leading"
secondItem=
"1Jz-fi-X6W"
secondAttribute=
"trailing"
constant=
"25"
id=
"Okm-0L-J6z"
/>
<constraint
firstItem=
"120-wO-RM3"
firstAttribute=
"leading"
secondItem=
"7Jf-Vg-Ti2"
secondAttribute=
"leading"
id=
"PRZ-gw-For"
/>
<constraint
firstItem=
"rdF-Hk-QO2"
firstAttribute=
"top"
secondItem=
"M3H-QL-Wkh"
secondAttribute=
"bottom"
constant=
"10"
id=
"Pdg-gl-f44"
/>
<constraint
firstItem=
"rdF-Hk-QO2"
firstAttribute=
"top"
secondItem=
"M3H-QL-Wkh"
secondAttribute=
"bottom"
constant=
"10"
id=
"Pdg-gl-f44"
/>
<constraint
firstItem=
"1Jz-fi-X6W"
firstAttribute=
"leading"
secondItem=
"M3H-QL-Wkh"
secondAttribute=
"trailing"
constant=
"15"
id=
"Qn1-VT-M8P"
/>
<constraint
firstItem=
"1Jz-fi-X6W"
firstAttribute=
"leading"
secondItem=
"M3H-QL-Wkh"
secondAttribute=
"trailing"
constant=
"15"
id=
"Qn1-VT-M8P"
/>
<constraint
firstItem=
"U8z-0Z-8lJ"
firstAttribute=
"trailing"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"trailing"
id=
"RL3-D0-13p"
/>
<constraint
firstItem=
"U8z-0Z-8lJ"
firstAttribute=
"trailing"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"trailing"
id=
"RL3-D0-13p"
/>
<constraint
firstItem=
"NCh-yY-mA1"
firstAttribute=
"top"
secondItem=
"rdF-Hk-QO2"
secondAttribute=
"bottom"
constant=
"20"
id=
"S7e-CW-qUl"
/>
<constraint
firstItem=
"NCh-yY-mA1"
firstAttribute=
"top"
secondItem=
"rdF-Hk-QO2"
secondAttribute=
"bottom"
constant=
"20"
id=
"S7e-CW-qUl"
/>
<constraint
firstItem=
"UWP-yu-lmR"
firstAttribute=
"trailing"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"trailing"
id=
"TTR-h4-hwV"
/>
<constraint
firstItem=
"UWP-yu-lmR"
firstAttribute=
"trailing"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"trailing"
id=
"TTR-h4-hwV"
/>
<constraint
firstItem=
"
kUr-sL-blR"
firstAttribute=
"leading"
secondItem=
"7Jf-Vg-Ti2"
secondAttribute=
"trailing"
constant=
"25"
id=
"Wyu-ex-0KT
"
/>
<constraint
firstItem=
"
7Jf-Vg-Ti2"
firstAttribute=
"leading"
secondItem=
"kUr-sL-blR"
secondAttribute=
"trailing"
constant=
"23"
id=
"WUv-c2-cds
"
/>
<constraint
firstItem=
"2Yp-84-pY1"
firstAttribute=
"trailing"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"leading"
constant=
"95"
id=
"XGL-xU-9pB"
/>
<constraint
firstItem=
"2Yp-84-pY1"
firstAttribute=
"trailing"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"leading"
constant=
"95"
id=
"XGL-xU-9pB"
/>
<constraint
firstItem=
"2Yp-84-pY1"
firstAttribute=
"top"
secondItem=
"NCh-yY-mA1"
secondAttribute=
"bottom"
constant=
"20"
id=
"Zb7-RR-zRv"
/>
<constraint
firstItem=
"2Yp-84-pY1"
firstAttribute=
"top"
secondItem=
"NCh-yY-mA1"
secondAttribute=
"bottom"
constant=
"20"
id=
"Zb7-RR-zRv"
/>
<constraint
firstItem=
"UWP-yu-lmR"
firstAttribute=
"top"
secondItem=
"U8z-0Z-8lJ"
secondAttribute=
"bottom"
id=
"ZjI-3U-xNb"
/>
<constraint
firstItem=
"UWP-yu-lmR"
firstAttribute=
"top"
secondItem=
"U8z-0Z-8lJ"
secondAttribute=
"bottom"
id=
"ZjI-3U-xNb"
/>
<constraint
firstItem=
"120-wO-RM3"
firstAttribute=
"top"
secondItem=
"cd1-Ru-T4p"
secondAttribute=
"bottom"
constant=
"10"
id=
"ckC-DG-VG9"
/>
<constraint
firstItem=
"120-wO-RM3"
firstAttribute=
"top"
secondItem=
"cd1-Ru-T4p"
secondAttribute=
"bottom"
constant=
"10"
id=
"ckC-DG-VG9"
/>
<constraint
firstItem=
"abH-an-xUL"
firstAttribute=
"leading"
secondItem=
"i5M-Pr-FkT"
secondAttribute=
"leading"
constant=
"15"
id=
"gjm-I0-mAd"
/>
<constraint
firstItem=
"abH-an-xUL"
firstAttribute=
"leading"
secondItem=
"i5M-Pr-FkT"
secondAttribute=
"leading"
constant=
"15"
id=
"gjm-I0-mAd"
/>
<constraint
firstItem=
"HfM-JI-5kt"
firstAttribute=
"leading"
secondItem=
"sJn-mb-uqO"
secondAttribute=
"leading"
id=
"h9f-kh-Tyf"
/>
<constraint
firstItem=
"HfM-JI-5kt"
firstAttribute=
"leading"
secondItem=
"sJn-mb-uqO"
secondAttribute=
"leading"
id=
"h9f-kh-Tyf"
/>
<constraint
firstItem=
"kUr-sL-blR"
firstAttribute=
"leading"
secondItem=
"cd1-Ru-T4p"
secondAttribute=
"trailing"
constant=
"15"
id=
"imS-YK-uG7"
/>
<constraint
firstItem=
"kUr-sL-blR"
firstAttribute=
"centerY"
secondItem=
"cd1-Ru-T4p"
secondAttribute=
"centerY"
id=
"jXd-bb-0TW"
/>
<constraint
firstItem=
"kUr-sL-blR"
firstAttribute=
"centerY"
secondItem=
"cd1-Ru-T4p"
secondAttribute=
"centerY"
id=
"jXd-bb-0TW"
/>
<constraint
firstItem=
"7Jf-Vg-Ti2"
firstAttribute=
"leading"
secondItem=
"cd1-Ru-T4p"
secondAttribute=
"trailing"
constant=
"15"
id=
"lgF-yU-JfX"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"trailing"
secondItem=
"NCh-yY-mA1"
secondAttribute=
"trailing"
id=
"mlU-MB-6dk"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"trailing"
secondItem=
"NCh-yY-mA1"
secondAttribute=
"trailing"
id=
"mlU-MB-6dk"
/>
<constraint
firstItem=
"WrZ-HX-Mdp"
firstAttribute=
"centerY"
secondItem=
"M3H-QL-Wkh"
secondAttribute=
"centerY"
id=
"n2n-kv-nAG"
/>
<constraint
firstItem=
"WrZ-HX-Mdp"
firstAttribute=
"centerY"
secondItem=
"M3H-QL-Wkh"
secondAttribute=
"centerY"
id=
"n2n-kv-nAG"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"trailing"
secondItem=
"rdF-Hk-QO2"
secondAttribute=
"trailing"
constant=
"10"
id=
"na2-Rx-5x3"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"trailing"
secondItem=
"rdF-Hk-QO2"
secondAttribute=
"trailing"
constant=
"10"
id=
"na2-Rx-5x3"
/>
<constraint
firstItem=
"UWP-yu-lmR"
firstAttribute=
"leading"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"leading"
id=
"nka-fx-VTh"
/>
<constraint
firstItem=
"UWP-yu-lmR"
firstAttribute=
"leading"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"leading"
id=
"nka-fx-VTh"
/>
<constraint
firstItem=
"7Jf-Vg-Ti2"
firstAttribute=
"centerY"
secondItem=
"cd1-Ru-T4p"
secondAttribute=
"centerY"
id=
"tiO-JV-Q9v"
/>
<constraint
firstItem=
"abH-an-xUL"
firstAttribute=
"top"
secondItem=
"HfM-JI-5kt"
secondAttribute=
"bottom"
constant=
"20"
id=
"waw-NM-mmJ"
/>
<constraint
firstItem=
"abH-an-xUL"
firstAttribute=
"top"
secondItem=
"HfM-JI-5kt"
secondAttribute=
"bottom"
constant=
"20"
id=
"waw-NM-mmJ"
/>
<constraint
firstItem=
"7Jf-Vg-Ti2"
firstAttribute=
"top"
secondItem=
"abH-an-xUL"
secondAttribute=
"bottom"
constant=
"20"
id=
"whP-p5-DWz"
/>
<constraint
firstItem=
"HfM-JI-5kt"
firstAttribute=
"top"
secondItem=
"2Yp-84-pY1"
secondAttribute=
"bottom"
constant=
"10"
id=
"xPP-Qm-9ZD"
/>
<constraint
firstItem=
"HfM-JI-5kt"
firstAttribute=
"top"
secondItem=
"2Yp-84-pY1"
secondAttribute=
"bottom"
constant=
"10"
id=
"xPP-Qm-9ZD"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"trailing"
secondItem=
"HfM-JI-5kt"
secondAttribute=
"trailing"
constant=
"10"
id=
"zvR-s1-LiO"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"trailing"
secondItem=
"HfM-JI-5kt"
secondAttribute=
"trailing"
constant=
"10"
id=
"zvR-s1-LiO"
/>
</constraints>
</constraints>
...
...
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