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
d0071fa7
Commit
d0071fa7
authored
Dec 03, 2020
by
刘俊宏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完成分销订单最新修正
parent
04e100aa
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
101 additions
and
48 deletions
+101
-48
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
...ata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Model/get_dbt_rule_model/getDbtRuleModel.swift
...ssPlatform/Model/get_dbt_rule_model/getDbtRuleModel.swift
+10
-2
GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.xib
...essPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.xib
+2
-2
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift
...wController/分销订单管理/RetailManageDetailViewController.swift
+23
-10
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift
...rm/ViewController/分销订单管理/RetailManageViewController.swift
+0
-0
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.xib
...form/ViewController/分销订单管理/RetailManageViewController.xib
+0
-0
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageFooterView.swift
...m/ViewController/分销订单管理/View/RetailManageFooterView.swift
+1
-0
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageFooterView.xib
...orm/ViewController/分销订单管理/View/RetailManageFooterView.xib
+28
-11
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageHeaderView.swift
...m/ViewController/分销订单管理/View/RetailManageHeaderView.swift
+4
-5
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageHeaderView.xib
...orm/ViewController/分销订单管理/View/RetailManageHeaderView.xib
+0
-0
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageViewCell.swift
...orm/ViewController/分销订单管理/View/RetailManageViewCell.swift
+1
-0
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageViewCell.xib
...tform/ViewController/分销订单管理/View/RetailManageViewCell.xib
+22
-12
GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.xib
...sPlatform/ViewController/订单列表/OrderListViewController.xib
+10
-6
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
View file @
d0071fa7
No preview for this file type
GeliBusinessPlatform/Model/get_dbt_rule_model/getDbtRuleModel.swift
View file @
d0071fa7
...
...
@@ -88,6 +88,7 @@ class dbtOrderLisModel: Mappable {
class
dbtOrderLisDataModel
:
Mappable
{
var
order_id
:
Int
?
var
shop_id
:
Int
?
var
order_sn
:
String
?
var
dbt_type
:
Int
?
var
dbt_target
:
Int
?
...
...
@@ -96,12 +97,14 @@ class dbtOrderLisDataModel: Mappable {
var
commission_status
:
Int
?
var
user_name
:
String
?
var
order_goods
:
Array
<
dbtOrderLisGoodsDataModel
>
?
var
pay_status
:
Int
?
//支付状态;0未付款;1欠款;2已付款3付款异常,线下汇款(4待提交凭证,5审核中,6重新提交凭证,7审核成功),8(部分)账期支付,9欠款(废弃)
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
order_id
<-
map
[
"order_id"
]
shop_id
<-
map
[
"shop_id"
]
order_sn
<-
map
[
"order_sn"
]
dbt_type
<-
map
[
"dbt_type"
]
dbt_target
<-
map
[
"dbt_target"
]
...
...
@@ -110,19 +113,24 @@ class dbtOrderLisDataModel: Mappable {
commission_status
<-
map
[
"commission_status"
]
user_name
<-
map
[
"user_name"
]
order_goods
<-
map
[
"order_goods"
]
pay_status
<-
map
[
"pay_status"
]
}
}
class
dbtOrderLisGoodsDataModel
:
Mappable
{
var
goods_name
:
String
?
var
goods_number
:
Int
?
var
amount
:
String
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
goods_name
<-
map
[
"goods_name"
]
goods_number
<-
map
[
"goods_number"
]
amount
<-
map
[
"amount"
]
}
}
//MARK: - 供应商铺货界面商品和商家查询
...
...
GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.xib
View file @
d0071fa7
<?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"
/>
<dependencies>
<deployment
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"17
12
5"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"17
50
5"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"System colors in document resources"
minToolsVersion=
"11.0"
/>
...
...
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift
View file @
d0071fa7
...
...
@@ -31,21 +31,34 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
}
//MARK:--加载数据
var
orderId
:
Int
?
//订单编号
var
dbt_shop_id
:
Int
?
=
nil
var
dataMdoel
:
OrderDetailDataModel
?
=
nil
let
UserToken
=
UserDefaults
.
standard
.
value
(
forKey
:
"user_token"
)
func
loadData
()
{
HUD
.
flash
(
.
progress
)
orderDetail
([
"user_token"
:
UserToken
as
Any
,
"order_id"
:
orderId
as
Any
],
success
:
{
[
self
]
(
data
)
in
HUD
.
hide
(
animated
:
true
)
let
dataM
=
data
as!
OrderDetailModel
self
.
dataMdoel
=
dataM
.
data
self
.
listView
.
reloadData
()
})
{
(
error
)
in
self
.
listView
.
isHidden
=
true
if
dbt_shop_id
!=
nil
{
orderDetail
([
"user_token"
:
UserToken
as
Any
,
"order_id"
:
orderId
as
Any
,
"dbt_shop_id"
:
dbt_shop_id
as
Any
],
success
:
{
[
self
]
(
data
)
in
HUD
.
hide
(
animated
:
true
)
let
dataM
=
data
as!
OrderDetailModel
self
.
dataMdoel
=
dataM
.
data
self
.
listView
.
reloadData
()
})
{
(
error
)
in
self
.
listView
.
isHidden
=
true
}
}
else
{
orderDetail
([
"user_token"
:
UserToken
as
Any
,
"order_id"
:
orderId
as
Any
],
success
:
{
[
self
]
(
data
)
in
HUD
.
hide
(
animated
:
true
)
let
dataM
=
data
as!
OrderDetailModel
self
.
dataMdoel
=
dataM
.
data
self
.
listView
.
reloadData
()
})
{
(
error
)
in
self
.
listView
.
isHidden
=
true
}
}
}
func
numberOfSections
(
in
tableView
:
UITableView
)
->
Int
{
if
self
.
dataMdoel
==
nil
{
...
...
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift
View file @
d0071fa7
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.xib
View file @
d0071fa7
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageFooterView.swift
View file @
d0071fa7
...
...
@@ -17,6 +17,7 @@ class RetailManageFooterView: UIView {
@IBAction
func
ActionByBtn
(
_
sender
:
UIButton
)
{
delgate
?
.
tapRetailManageFooterBtnAction
(
sender
:
sender
.
tag
)
}
@IBOutlet
weak
var
priceLbl
:
UILabel
!
@IBOutlet
weak
var
actionBtn
:
UIButton
!
@IBOutlet
weak
var
moneyLbl
:
UILabel
!
@IBOutlet
weak
var
contentBgView
:
UIView
!
...
...
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageFooterView.xib
View file @
d0071fa7
<?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"
/>
<dependencies>
<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=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"System colors in document resources"
minToolsVersion=
"11.0"
/>
...
...
@@ -15,37 +15,38 @@
<outlet
property=
"actionBtn"
destination=
"2A1-E3-ezo"
id=
"F6k-yP-6HB"
/>
<outlet
property=
"contentBgView"
destination=
"Q67-Wj-Dca"
id=
"RdH-6q-rFn"
/>
<outlet
property=
"moneyLbl"
destination=
"DU0-hj-Wex"
id=
"Nip-lf-4Bw"
/>
<outlet
property=
"priceLbl"
destination=
"rt2-yJ-U8I"
id=
"Pdz-d6-GRm"
/>
</connections>
</placeholder>
<placeholder
placeholderIdentifier=
"IBFirstResponder"
id=
"-2"
customClass=
"UIResponder"
/>
<view
contentMode=
"scaleToFill"
id=
"iN0-l3-epB"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"
414
"
height=
"331"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"
515
"
height=
"331"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
heightSizable=
"YES"
/>
<subviews>
<view
clipsSubviews=
"YES"
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Q67-Wj-Dca"
>
<rect
key=
"frame"
x=
"15"
y=
"0.0"
width=
"
384
"
height=
"331"
/>
<rect
key=
"frame"
x=
"15"
y=
"0.0"
width=
"
485
"
height=
"331"
/>
<subviews>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"GLe-RE-bAi"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"
384
"
height=
"1"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"
485
"
height=
"1"
/>
<color
key=
"backgroundColor"
name=
"灰色分界线"
/>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"1"
id=
"erF-fm-M52"
/>
</constraints>
</view>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"12500.00(
佣金200元
)"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"DU0-hj-Wex"
>
<rect
key=
"frame"
x=
"
233"
y=
"16"
width=
"136
"
height=
"19"
/>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"12500.00(
未结算
)"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"DU0-hj-Wex"
>
<rect
key=
"frame"
x=
"
358"
y=
"16"
width=
"112
"
height=
"19"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"#F57575"
/>
<nil
key=
"highlightedColor"
/>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"
金额
:"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"HNd-Yn-970"
>
<rect
key=
"frame"
x=
"
191
"
y=
"16"
width=
"39"
height=
"19"
/>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"
佣金
:"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"HNd-Yn-970"
>
<rect
key=
"frame"
x=
"
316
"
y=
"16"
width=
"39"
height=
"19"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"标题字颜色"
/>
<nil
key=
"highlightedColor"
/>
</label>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
buttonType=
"system"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"2A1-E3-ezo"
>
<rect
key=
"frame"
x=
"
239
"
y=
"55"
width=
"130"
height=
"30"
/>
<rect
key=
"frame"
x=
"
340
"
y=
"55"
width=
"130"
height=
"30"
/>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"30"
id=
"6ws-mc-JjN"
/>
<constraint
firstAttribute=
"width"
constant=
"130"
id=
"BMa-bg-Ae0"
/>
...
...
@@ -69,10 +70,23 @@
<action
selector=
"ActionByBtn:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"POP-nq-Wgz"
/>
</connections>
</button>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"金额:"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"cWY-Ns-39Y"
>
<rect
key=
"frame"
x=
"208.5"
y=
"16"
width=
"39"
height=
"19"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"标题字颜色"
/>
<nil
key=
"highlightedColor"
/>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"12500.00"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"rt2-yJ-U8I"
>
<rect
key=
"frame"
x=
"250.5"
y=
"16"
width=
"55.5"
height=
"19"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"#F57575"
/>
<nil
key=
"highlightedColor"
/>
</label>
</subviews>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
<constraints>
<constraint
firstItem=
"DU0-hj-Wex"
firstAttribute=
"top"
secondItem=
"GLe-RE-bAi"
secondAttribute=
"bottom"
constant=
"15"
id=
"0gO-0r-VeR"
/>
<constraint
firstItem=
"rt2-yJ-U8I"
firstAttribute=
"leading"
secondItem=
"cWY-Ns-39Y"
secondAttribute=
"trailing"
constant=
"3"
id=
"7ae-CZ-MGb"
/>
<constraint
firstItem=
"2A1-E3-ezo"
firstAttribute=
"top"
secondItem=
"DU0-hj-Wex"
secondAttribute=
"bottom"
constant=
"20"
id=
"Bqo-tB-1xp"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"DU0-hj-Wex"
secondAttribute=
"trailing"
constant=
"15"
id=
"Cjx-4U-FjT"
/>
<constraint
firstItem=
"DU0-hj-Wex"
firstAttribute=
"leading"
secondItem=
"HNd-Yn-970"
secondAttribute=
"trailing"
constant=
"3"
id=
"JSX-0W-vob"
/>
...
...
@@ -80,7 +94,10 @@
<constraint
firstItem=
"GLe-RE-bAi"
firstAttribute=
"leading"
secondItem=
"Q67-Wj-Dca"
secondAttribute=
"leading"
id=
"OhS-no-0na"
/>
<constraint
firstItem=
"HNd-Yn-970"
firstAttribute=
"centerY"
secondItem=
"DU0-hj-Wex"
secondAttribute=
"centerY"
id=
"PNC-3e-hKG"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"GLe-RE-bAi"
secondAttribute=
"trailing"
id=
"Qzt-Gm-10E"
/>
<constraint
firstItem=
"rt2-yJ-U8I"
firstAttribute=
"centerY"
secondItem=
"HNd-Yn-970"
secondAttribute=
"centerY"
id=
"ShW-bl-ZGT"
/>
<constraint
firstItem=
"cWY-Ns-39Y"
firstAttribute=
"centerY"
secondItem=
"rt2-yJ-U8I"
secondAttribute=
"centerY"
id=
"gEj-yc-oZj"
/>
<constraint
firstItem=
"GLe-RE-bAi"
firstAttribute=
"top"
secondItem=
"Q67-Wj-Dca"
secondAttribute=
"top"
id=
"hBz-yR-jeg"
/>
<constraint
firstItem=
"HNd-Yn-970"
firstAttribute=
"leading"
secondItem=
"rt2-yJ-U8I"
secondAttribute=
"trailing"
constant=
"10"
id=
"tXH-qZ-lT9"
/>
</constraints>
</view>
</subviews>
...
...
@@ -93,7 +110,7 @@
<constraint
firstAttribute=
"trailing"
secondItem=
"Q67-Wj-Dca"
secondAttribute=
"trailing"
constant=
"15"
id=
"uzL-xJ-Gle"
/>
</constraints>
<freeformSimulatedSizeMetrics
key=
"simulatedDestinationMetrics"
/>
<point
key=
"canvasLocation"
x=
"
-19"
y=
"8
9"
/>
<point
key=
"canvasLocation"
x=
"
52.898550724637687"
y=
"88.72767857142856
9"
/>
</view>
</objects>
<resources>
...
...
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageHeaderView.swift
View file @
d0071fa7
...
...
@@ -11,13 +11,12 @@ import UIKit
class
RetailManageHeaderView
:
UIView
{
var
contentView
:
UIView
!
@IBOutlet
weak
var
comLeft
:
NSLayoutConstraint
!
@IBOutlet
weak
var
contentBgView
:
UIView
!
@IBOutlet
weak
var
stateLbl
:
UILabel
!
@IBOutlet
weak
var
snNumLbl
:
UILabel
!
@IBOutlet
weak
var
comTypeLbl
:
UILabel
!
@IBOutlet
weak
var
payTypeLbl
:
UILabel
!
@IBOutlet
weak
var
nameLbl
:
UILabel
!
//初始化时将xib中的view添加进来
override
init
(
frame
:
CGRect
)
{
super
.
init
(
frame
:
frame
)
...
...
@@ -26,7 +25,7 @@ class RetailManageHeaderView: UIView {
contentView
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
top
.
right
.
bottom
.
equalToSuperview
()
}
contentBgView
.
layer
.
cornerRadius
=
10
;
contentBgView
.
layer
.
cornerRadius
=
10
;
contentBgView
.
layer
.
maskedCorners
=
[
CACornerMask
.
layerMinXMinYCorner
,
CACornerMask
.
layerMaxXMinYCorner
]
}
...
...
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageHeaderView.xib
View file @
d0071fa7
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageViewCell.swift
View file @
d0071fa7
...
...
@@ -18,6 +18,7 @@ class RetailManageViewCell: UITableViewCell {
}
@IBOutlet
weak
var
numLbl
:
UILabel
!
@IBOutlet
weak
var
priceLbl
:
UILabel
!
@IBOutlet
weak
var
dotImgV
:
UIImageView
!
@IBOutlet
weak
var
goodsLbl
:
UILabel
!
override
func
setSelected
(
_
selected
:
Bool
,
animated
:
Bool
)
{
...
...
GeliBusinessPlatform/ViewController/分销订单管理/View/RetailManageViewCell.xib
View file @
d0071fa7
<?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"
/>
<dependencies>
<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=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"System colors in document resources"
minToolsVersion=
"11.0"
/>
...
...
@@ -13,29 +13,35 @@
<placeholder
placeholderIdentifier=
"IBFilesOwner"
id=
"-1"
userLabel=
"File's Owner"
/>
<placeholder
placeholderIdentifier=
"IBFirstResponder"
id=
"-2"
customClass=
"UIResponder"
/>
<tableViewCell
contentMode=
"scaleToFill"
selectionStyle=
"default"
indentationWidth=
"10"
rowHeight=
"228"
id=
"KGk-i7-Jjw"
customClass=
"RetailManageViewCell"
customModule=
"TestClass"
customModuleProvider=
"target"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"3
31
"
height=
"228"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"3
75
"
height=
"228"
/>
<autoresizingMask
key=
"autoresizingMask"
flexibleMaxX=
"YES"
flexibleMaxY=
"YES"
/>
<tableViewCellContentView
key=
"contentView"
opaque=
"NO"
clipsSubviews=
"YES"
multipleTouchEnabled=
"YES"
contentMode=
"center"
tableViewCell=
"KGk-i7-Jjw"
id=
"H2p-sc-9uM"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"3
31
"
height=
"228"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"3
75
"
height=
"228"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<subviews>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"UDV-hj-QDc"
>
<rect
key=
"frame"
x=
"15"
y=
"0.0"
width=
"3
01
"
height=
"228"
/>
<rect
key=
"frame"
x=
"15"
y=
"0.0"
width=
"3
45
"
height=
"228"
/>
<subviews>
<imageView
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"scaleAspectFit"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"dotLine"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"7Tt-vd-rRF"
>
<rect
key=
"frame"
x=
"15"
y=
"227"
width=
"
286
"
height=
"1"
/>
<rect
key=
"frame"
x=
"15"
y=
"227"
width=
"
330
"
height=
"1"
/>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"1"
id=
"jLb-Fe-NA5"
/>
</constraints>
</imageView>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"商品"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"zL3-WS-mto"
>
<rect
key=
"frame"
x=
"15"
y=
"104.5"
width=
"
26
"
height=
"19"
/>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"商品
发撒风扇都法师法师法师法师飞洒发都发凡是都是
"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"zL3-WS-mto"
>
<rect
key=
"frame"
x=
"15"
y=
"104.5"
width=
"
185
"
height=
"19"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"灰色字体颜色"
/>
<nil
key=
"highlightedColor"
/>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"x1"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"rz0-eV-8Mh"
>
<rect
key=
"frame"
x=
"274"
y=
"104.5"
width=
"12"
height=
"19"
/>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"×200"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"rz0-eV-8Mh"
>
<rect
key=
"frame"
x=
"215"
y=
"105"
width=
"31.5"
height=
"18.5"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"灰色字体颜色"
/>
<nil
key=
"highlightedColor"
/>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"¥55050.00"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Y4l-v0-mzx"
>
<rect
key=
"frame"
x=
"269"
y=
"105"
width=
"66"
height=
"18.5"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"灰色字体颜色"
/>
<nil
key=
"highlightedColor"
/>
...
...
@@ -43,14 +49,17 @@
</subviews>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
<constraints>
<constraint
firstAttribute=
"trailing"
secondItem=
"rz0-eV-8Mh"
secondAttribute=
"trailing"
constant=
"15"
id=
"2s4-Eh-yaY"
/>
<constraint
firstItem=
"Y4l-v0-mzx"
firstAttribute=
"leading"
relation=
"greaterThanOrEqual"
secondItem=
"rz0-eV-8Mh"
secondAttribute=
"trailing"
constant=
"5"
id=
"7IB-4X-cqv"
/>
<constraint
firstItem=
"Y4l-v0-mzx"
firstAttribute=
"centerY"
secondItem=
"UDV-hj-QDc"
secondAttribute=
"centerY"
id=
"BTP-KQ-scT"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"Y4l-v0-mzx"
secondAttribute=
"trailing"
constant=
"10"
id=
"JMO-kE-xLx"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"rz0-eV-8Mh"
secondAttribute=
"leading"
constant=
"130"
id=
"LiC-eN-DEJ"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"7Tt-vd-rRF"
secondAttribute=
"trailing"
id=
"MH4-9F-Lhw"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"7Tt-vd-rRF"
secondAttribute=
"bottom"
id=
"Pxe-Il-Xwa"
/>
<constraint
firstItem=
"rz0-eV-8Mh"
firstAttribute=
"centerY"
secondItem=
"UDV-hj-QDc"
secondAttribute=
"centerY"
id=
"Q1f-U0-WcG"
/>
<constraint
firstItem=
"zL3-WS-mto"
firstAttribute=
"leading"
secondItem=
"UDV-hj-QDc"
secondAttribute=
"leading"
constant=
"15"
id=
"QPN-Gg-hpV"
/>
<constraint
firstItem=
"zL3-WS-mto"
firstAttribute=
"centerY"
secondItem=
"UDV-hj-QDc"
secondAttribute=
"centerY"
id=
"dLO-Q8-hMy"
/>
<constraint
firstItem=
"7Tt-vd-rRF"
firstAttribute=
"leading"
secondItem=
"UDV-hj-QDc"
secondAttribute=
"leading"
constant=
"15"
id=
"hcL-ig-85r"
/>
<constraint
first
Attribute=
"trailing"
relation=
"greaterThanOrEqual"
secondItem=
"zL3-WS-mto"
secondAttribute=
"trailing"
constant=
"60"
id=
"sZb-jU-gGU
"
/>
<constraint
first
Item=
"rz0-eV-8Mh"
firstAttribute=
"leading"
secondItem=
"zL3-WS-mto"
secondAttribute=
"trailing"
constant=
"15"
id=
"vdW-pV-u2A
"
/>
</constraints>
</view>
</subviews>
...
...
@@ -67,6 +76,7 @@
<outlet
property=
"dotImgV"
destination=
"7Tt-vd-rRF"
id=
"pjf-F7-9Kw"
/>
<outlet
property=
"goodsLbl"
destination=
"zL3-WS-mto"
id=
"wYK-Xt-SgC"
/>
<outlet
property=
"numLbl"
destination=
"rz0-eV-8Mh"
id=
"emd-H7-AOF"
/>
<outlet
property=
"priceLbl"
destination=
"Y4l-v0-mzx"
id=
"wOo-K5-VIH"
/>
</connections>
<point
key=
"canvasLocation"
x=
"73.188405797101453"
y=
"184.15178571428569"
/>
</tableViewCell>
...
...
GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.xib
View file @
d0071fa7
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"1
6097
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"1
7506
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<device
id=
"retina4_7"
orientation=
"portrait"
appearance=
"light"
/>
<dependencies>
<deployment
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
6087
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
7505
"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"System colors in document resources"
minToolsVersion=
"11.0"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
</dependencies>
<objects>
...
...
@@ -23,7 +24,7 @@
<subviews>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"f4t-Fn-Swl"
userLabel=
"searchView"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"320"
height=
"45"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
cocoaTouchSystemColor=
"whiteColor"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"45"
id=
"yth-ne-PfG"
/>
</constraints>
...
...
@@ -44,10 +45,11 @@
</view>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"gk3-xb-88Q"
>
<rect
key=
"frame"
x=
"0.0"
y=
"46"
width=
"375"
height=
"621"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
cocoaTouchSystemColor=
"whiteColor"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
</view>
</subviews>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
cocoaTouchSystemColor=
"whiteColor"
/>
<viewLayoutGuide
key=
"safeArea"
id=
"fnl-2z-Ty3"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
<constraints>
<constraint
firstItem=
"gk3-xb-88Q"
firstAttribute=
"top"
secondItem=
"ETb-BZ-IdF"
secondAttribute=
"bottom"
id=
"99k-0E-t0t"
/>
<constraint
firstItem=
"ETb-BZ-IdF"
firstAttribute=
"top"
secondItem=
"f4t-Fn-Swl"
secondAttribute=
"bottom"
id=
"JQs-Tb-3vz"
/>
...
...
@@ -63,7 +65,6 @@
<constraint
firstItem=
"f4t-Fn-Swl"
firstAttribute=
"leading"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"leading"
id=
"ytf-De-vhY"
/>
<constraint
firstItem=
"gk3-xb-88Q"
firstAttribute=
"leading"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"leading"
id=
"zmL-6P-JFb"
/>
</constraints>
<viewLayoutGuide
key=
"safeArea"
id=
"fnl-2z-Ty3"
/>
<point
key=
"canvasLocation"
x=
"132"
y=
"153.37331334332833"
/>
</view>
</objects>
...
...
@@ -72,5 +73,8 @@
<namedColor
name=
"灰色分界线"
>
<color
red=
"0.92941176470588238"
green=
"0.92941176470588238"
blue=
"0.92941176470588238"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</namedColor>
<systemColor
name=
"systemBackgroundColor"
>
<color
white=
"1"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"genericGamma22GrayColorSpace"
/>
</systemColor>
</resources>
</document>
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