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
42fea0c7
Commit
42fea0c7
authored
5 years ago
by
刘俊宏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单详情+新增商品合并
parent
7b8bccd6
Changes
15
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
289 additions
and
116 deletions
+289
-116
GeliBusinessPlatform.xcodeproj/project.pbxproj
GeliBusinessPlatform.xcodeproj/project.pbxproj
+28
-20
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
...ata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Interface/Interface_Z.plist
GeliBusinessPlatform/Interface/Interface_Z.plist
+4
-0
GeliBusinessPlatform/Model/OrderInterface.swift
GeliBusinessPlatform/Model/OrderInterface.swift
+15
-0
GeliBusinessPlatform/Model/OrderManageModel/CusListAllModel.swift
...nessPlatform/Model/OrderManageModel/CusListAllModel.swift
+46
-0
GeliBusinessPlatform/Model/OrderManageModel/GetGoodsInfoModel.swift
...ssPlatform/Model/OrderManageModel/GetGoodsInfoModel.swift
+9
-0
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
...essPlatform/Model/OrderManageModel/OrderDetailModel.swift
+52
-3
GeliBusinessPlatform/SceneDelegate.swift
GeliBusinessPlatform/SceneDelegate.swift
+1
-1
GeliBusinessPlatform/View/Cell/GuanLianKeHuCell.xib
GeliBusinessPlatform/View/Cell/GuanLianKeHuCell.xib
+24
-26
GeliBusinessPlatform/ViewController/商品分类/GoodsClassViewController.swift
...atform/ViewController/商品分类/GoodsClassViewController.swift
+1
-1
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
...inessPlatform/ViewController/商品管理/GoodsManageListVC.swift
+15
-9
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
+6
-14
GeliBusinessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.swift
...essPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.swift
+54
-7
GeliBusinessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.xib
...inessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.xib
+34
-35
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
...ssPlatform/ViewController/订单详情/OrderDViewController.swift
+0
-0
No files found.
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @
42fea0c7
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
View file @
42fea0c7
No preview for this file type
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @
42fea0c7
...
...
@@ -67,5 +67,9 @@
<string>
Order/orderReturnedGoodsAd
</string>
<key>
修改订单支付方式(状态)
</key>
<string>
Order/editPayType
</string>
<key>
获取客户信息
</key>
<string>
Customer/cusListAll
</string>
<key>
获取商品信息
</key>
<string>
Adminorder/getGoodsInfo
</string>
</dict>
</plist>
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/Model/OrderInterface.swift
View file @
42fea0c7
...
...
@@ -219,3 +219,18 @@ func editPayType(_ params:[String:Any],success:@escaping (_ res:Any)->(),failtur
failture
(
error
)
}
}
//MARK:--获取客户信息
/**
params-key:
user_token(验证token)
*/
func
cusListAll
(
_
params
:[
String
:
Any
],
success
:
@escaping
(
_
res
:
Any
)
->
(),
failture
:
@escaping
(
_
error
:
Error
)
->
())
{
NetworkRequest
.
sharedInstance
.
postRequest
(
"获取客户信息"
,
params
,
{
(
rep
:
DataResponse
<
CusListAllModel
>
)
in
},
success
:
{
(
data
)
in
success
(
data
)
})
{
(
error
)
in
failture
(
error
)
}
}
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/Model/OrderManageModel/CusListAllModel.swift
0 → 100644
View file @
42fea0c7
//
// CusListAllModel.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/5/14.
// Copyright © 2020 junye lu. All rights reserved.
//
import
Foundation
import
ObjectMapper
//获取客户信息
class
CusListAllModel
:
Mappable
{
var
code
:
Int
?
var
message
:
String
?
var
data
:
Array
<
CusListAllDataModel
>
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
code
<-
map
[
"code"
]
message
<-
map
[
"message"
]
data
<-
map
[
"data"
]
}
}
class
CusListAllDataModel
:
Mappable
{
var
cus_id
:
Int
?
//客户id
var
cus_name
:
String
?
//客户名
var
company
:
String
?
//公司名
var
cus_type
:
Int
?
//客户类型: 1个人 2企业
var
user_name
:
String
?
//客户绑定的用户名
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
cus_id
<-
map
[
"cus_id"
]
cus_name
<-
map
[
"cus_name"
]
company
<-
map
[
"company"
]
cus_type
<-
map
[
"cus_type"
]
user_name
<-
map
[
"user_name"
]
}
}
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/Model/OrderManageModel/GetGoodsInfoModel.swift
0 → 100644
View file @
42fea0c7
//
// GetGoodsInfoModel.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/5/14.
// Copyright © 2020 junye lu. All rights reserved.
//
import
Foundation
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
View file @
42fea0c7
...
...
@@ -24,9 +24,9 @@ class OrderDetailModel: Mappable {
}
}
class
OrderDetailDataModel
:
Mappable
{
var
order_res
:
Array
<
GoodsResModel
>
?
//商品数据
var
order_goods
:
Array
<
GoodsResModel
>
?
//商品数据
var
receiving
:
Array
<
GoodsResModel
>
?
//商品数据
var
order_res
:
OrderDetailResModel
?
//订单信息
var
order_goods
:
Array
<
OrderDetailGoodsModel
>
?
//订单商品
var
receiving
:
OrderDetailReceivingModel
?
//收货信息
required
init
?(
map
:
Map
)
{
...
...
@@ -47,6 +47,8 @@ class OrderDetailResModel: Mappable {
var
goods_amount
:
String
?
var
order_amount
:
String
?
var
discount_amount
:
String
?
var
logistics_price
:
String
?
//物流费用
var
other_price
:
String
?
//其他费用
var
sum_amount
:
String
?
//订单合计价格
var
from
:
String
?
var
lc_id
:
String
?
...
...
@@ -62,6 +64,9 @@ class OrderDetailResModel: Mappable {
var
from_cn
:
String
?
//订单来源中文
var
pay_type_cn
:
String
?
//支付方式中文
var
pay_status_cn
:
String
?
//支付状态中文
var
order_type
:
Int
?
//订单类型 1普通2期货3团购4预售
var
order_status
:
Int
?
//订单状态
var
order_status_d
:
Int
?
//订单详细状态
required
init
?(
map
:
Map
)
{
...
...
@@ -91,8 +96,52 @@ class OrderDetailResModel: Mappable {
from_cn
<-
map
[
"from_cn"
]
pay_type_cn
<-
map
[
"pay_type_cn"
]
pay_status_cn
<-
map
[
"pay_status_cn"
]
order_type
<-
map
[
"order_type"
]
order_status
<-
map
[
"order_status"
]
order_status_d
<-
map
[
"order_status_d"
]
logistics_price
<-
map
[
"logistics_price"
]
other_price
<-
map
[
"other_price"
]
}
}
func
orderStatusStrByInt
(
statusNumber
:
Int
)
->
String
?
{
var
str
=
""
switch
statusNumber
{
case
0
:
str
=
"未确定"
break
//待付款
case
1
:
str
=
"待付款"
break
case
6
:
str
=
"待发货"
break
case
7
:
str
=
"待收货"
break
//订单完成
case
5
:
str
=
"订单完成"
break
//订单关闭
case
8
:
str
=
"订单关闭"
break
//已取消
case
2
:
str
=
"已取消"
//用户取消(预售
break
default
:
break
}
return
str
}
class
OrderDetailGoodsModel
:
Mappable
{
var
og_id
:
Int
?
//订单商品号
var
goods_id
:
Int
?
//商品id
...
...
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/SceneDelegate.swift
View file @
42fea0c7
...
...
@@ -88,7 +88,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, UITabBarControllerDeleg
// Create the SwiftUI view that provides the window contents.
tabBarController
.
viewControllers
=
[
v1
,
v2
,
v3
,
v4
,
v5
]
// tabBarController.selectedIndex = 2
tabBarController
.
selectedIndex
=
1
let
contentView
=
tabBarController
if
let
windowScene
=
sceneC
as?
UIWindowScene
{
...
...
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/View/Cell/GuanLianKeHuCell.xib
View file @
42fea0c7
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"1
5702
"
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
6096
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<dependencies>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
5704
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
6087
"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
...
...
@@ -33,7 +33,6 @@
<rect
key=
"frame"
x=
"95"
y=
"15"
width=
"42"
height=
"18.5"
/>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"18.5"
id=
"FLa-W0-nr3"
/>
<constraint
firstAttribute=
"width"
constant=
"42"
id=
"MRk-8r-uhY"
/>
</constraints>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"标题字颜色"
/>
...
...
@@ -49,7 +48,6 @@
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"reciver"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"QI3-nS-9hL"
>
<rect
key=
"frame"
x=
"160.5"
y=
"15"
width=
"42"
height=
"18.5"
/>
<constraints>
<constraint
firstAttribute=
"width"
constant=
"42"
id=
"PBi-wq-5YM"
/>
<constraint
firstAttribute=
"height"
constant=
"18.5"
id=
"ln6-6M-b4L"
/>
</constraints>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"13"
/>
...
...
@@ -77,27 +75,6 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"企业"
textAlignment=
"center"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"5Vq-Jz-GTW"
>
<rect
key=
"frame"
x=
"137"
y=
"41.5"
width=
"32"
height=
"17"
/>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"17"
id=
"Eb7-L3-66T"
/>
<constraint
firstAttribute=
"width"
constant=
"32"
id=
"wub-97-un4"
/>
</constraints>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"11"
/>
<color
key=
"textColor"
name=
"企业、预售字体"
/>
<nil
key=
"highlightedColor"
/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute
type=
"color"
keyPath=
"borderColor"
>
<color
key=
"value"
name=
"企业、预售字体"
/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute
type=
"number"
keyPath=
"borderWidth"
>
<real
key=
"value"
value=
"1"
/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute
type=
"number"
keyPath=
"cornerRadius"
>
<real
key=
"value"
value=
"3"
/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"湛江丰源水产有限公司"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"vLg-1W-z2S"
>
<rect
key=
"frame"
x=
"95"
y=
"63.5"
width=
"245"
height=
"15"
/>
<constraints>
...
...
@@ -132,6 +109,27 @@
<constraint
firstAttribute=
"height"
constant=
"1"
id=
"hct-Td-2CF"
/>
</constraints>
</view>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"企业"
textAlignment=
"center"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"5Vq-Jz-GTW"
>
<rect
key=
"frame"
x=
"95"
y=
"41.5"
width=
"32"
height=
"17"
/>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"17"
id=
"Eb7-L3-66T"
/>
<constraint
firstAttribute=
"width"
constant=
"32"
id=
"wub-97-un4"
/>
</constraints>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"11"
/>
<color
key=
"textColor"
name=
"企业、预售字体"
/>
<nil
key=
"highlightedColor"
/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute
type=
"color"
keyPath=
"borderColor"
>
<color
key=
"value"
name=
"企业、预售字体"
/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute
type=
"number"
keyPath=
"borderWidth"
>
<real
key=
"value"
value=
"1"
/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute
type=
"number"
keyPath=
"cornerRadius"
>
<real
key=
"value"
value=
"3"
/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<constraints>
<constraint
firstItem=
"QI3-nS-9hL"
firstAttribute=
"centerY"
secondItem=
"llc-wu-Qjo"
secondAttribute=
"centerY"
id=
"3cI-Bb-s4F"
/>
...
...
@@ -144,7 +142,6 @@
<constraint
firstItem=
"ljV-Gc-YnI"
firstAttribute=
"top"
secondItem=
"H2p-sc-9uM"
secondAttribute=
"top"
id=
"GCg-gX-SYB"
/>
<constraint
firstItem=
"k7A-Qs-Puc"
firstAttribute=
"leading"
secondItem=
"WR0-yV-WjT"
secondAttribute=
"trailing"
constant=
"10"
id=
"Jdc-Ll-m3r"
/>
<constraint
firstAttribute=
"trailingMargin"
secondItem=
"vLg-1W-z2S"
secondAttribute=
"trailing"
constant=
"15"
id=
"KOW-Bj-cOn"
/>
<constraint
firstItem=
"5Vq-Jz-GTW"
firstAttribute=
"leading"
secondItem=
"YvY-yP-Zr7"
secondAttribute=
"trailing"
constant=
"10"
id=
"Opx-Ak-iTq"
/>
<constraint
firstItem=
"YvY-yP-Zr7"
firstAttribute=
"leading"
secondItem=
"WR0-yV-WjT"
secondAttribute=
"trailing"
constant=
"10"
id=
"PZD-FR-vo1"
/>
<constraint
firstItem=
"5Vq-Jz-GTW"
firstAttribute=
"centerY"
secondItem=
"YvY-yP-Zr7"
secondAttribute=
"centerY"
id=
"WUM-7S-6Tq"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"ljV-Gc-YnI"
secondAttribute=
"bottom"
id=
"WeE-ry-Kge"
/>
...
...
@@ -155,6 +152,7 @@
<constraint
firstItem=
"llc-wu-Qjo"
firstAttribute=
"centerY"
secondItem=
"k7A-Qs-Puc"
secondAttribute=
"centerY"
id=
"kfs-Cj-xiI"
/>
<constraint
firstItem=
"WR0-yV-WjT"
firstAttribute=
"leading"
secondItem=
"H2p-sc-9uM"
secondAttribute=
"leading"
constant=
"15"
id=
"kra-Qt-lhu"
/>
<constraint
firstItem=
"F70-8y-cQB"
firstAttribute=
"centerY"
secondItem=
"WR0-yV-WjT"
secondAttribute=
"centerY"
id=
"p4k-Zt-rJK"
/>
<constraint
firstItem=
"5Vq-Jz-GTW"
firstAttribute=
"leading"
secondItem=
"WR0-yV-WjT"
secondAttribute=
"trailing"
constant=
"10"
id=
"tav-3L-1yQ"
/>
<constraint
firstItem=
"llc-wu-Qjo"
firstAttribute=
"leading"
secondItem=
"k7A-Qs-Puc"
secondAttribute=
"trailing"
constant=
"4"
id=
"veA-rN-M0X"
/>
<constraint
firstItem=
"vLg-1W-z2S"
firstAttribute=
"top"
secondItem=
"YvY-yP-Zr7"
secondAttribute=
"bottom"
constant=
"5"
id=
"vrn-r3-pdX"
/>
</constraints>
...
...
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/商品分类/GoodsClassViewController.swift
View file @
42fea0c7
...
...
@@ -227,7 +227,7 @@ class GoodsClassViewController: BaseViewController , UITableViewDelegate, UITabl
}
let
reloadSet
=
IndexSet
.
init
(
arrayLiteral
:
indexPath
.
section
)
tableV
.
reload
Sections
(
reloadSet
,
with
:
.
automatic
)
tableV
.
reload
Data
(
)
}
}
...
...
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
View file @
42fea0c7
...
...
@@ -418,24 +418,30 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
if
rowModel
.
is_show
==
0
{
if
isTrue
{
//"下架"
editField
([
"user_token"
:
""
,
"function_id"
:
"15"
,
"prval"
:
"goods_id"
,
"value"
:
"0"
,],
success
:
{
(
data
)
in
self
.
loadData
()
})
{
(
erro
)
in
}
print
(
"下架下架下架"
)
// editField(["user_token":"","function_id":"15","prval":"goods_id","value":"0",], success: { (data) in
// self.loadData()
// }) { (erro) in
//
// }
}
else
{
//"入库"
print
(
"入库--入库"
)
}
}
else
if
rowModel
.
is_show
==
1
{
if
isTrue
{
//"入库"
print
(
"入库===入库"
)
}
else
{
//"上架"
editField
([
"user_token"
:
""
,
"function_id"
:
"15"
,
"prval"
:
rowModel
.
goods_id
,
"value"
:
"1"
,],
success
:
{
(
data
)
in
self
.
loadData
()
})
{
(
erro
)
in
print
(
"上架上架上架上架"
)
}
// editField(["user_token":"","function_id":"15","prval":rowModel.goods_id,"value":"1",], success: { (data) in
// self.loadData()
// }) { (erro) in
//
// }
}
}
}
...
...
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
View file @
42fea0c7
...
...
@@ -21,19 +21,6 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
var
page
:
Int
=
0
var
isUpData
=
false
var
selectData
:
String
=
""
{
didSet
{
print
(
"筛选条件=---"
)
//动效刷新
tableV
.
reloadData
()
tableV
.
performBatchUpdates
({
UIView
.
animate
(
views
:
self
.
tableV
!.
visibleCells
,
animations
:
self
.
animations
,
completion
:
{
})
},
completion
:
nil
)
}
}
//MARK:--列表数据源
var
dataArr
:
Array
<
OrderListDataModel
>
=
[]
override
func
viewDidLoad
()
{
...
...
@@ -96,7 +83,12 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
self
.
tableV
.
reloadData
()
self
.
tableV
?
.
mj_header
?
.
endRefreshing
()
self
.
page
=
2
self
.
tableV
.
performBatchUpdates
({
UIView
.
animate
(
views
:
self
.
tableV
!.
visibleCells
,
animations
:
self
.
animations
,
completion
:
{
})
},
completion
:
nil
)
})
{
(
error
)
in
self
.
tableV
?
.
mj_header
?
.
endRefreshing
()
...
...
@@ -130,7 +122,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
var
tableV
:
UITableView
!
var
tableSearchV
:
UITableView
!
=
nil
private
let
animations
=
[
AnimationType
.
from
(
direction
:
.
bottom
,
offset
:
15
0*
glscale
)]
private
let
animations
=
[
AnimationType
.
from
(
direction
:
.
bottom
,
offset
:
30
0*
glscale
)]
func
setTabv
()
{
tableV
=
UITableView
()
...
...
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.swift
View file @
42fea0c7
...
...
@@ -8,23 +8,27 @@
import
UIKit
import
ViewAnimator
@objc
protocol
GuanLianKehuVCDelegate
{
@objc
optional
func
btnSelect
(
keHuData
:
Any
)
import
LGButton
protocol
GuanLianKehuVCDelegate
{
func
GuanLianKehuSelect
(
keHuData
:
CusListAllDataModel
)
}
class
GuanLianKehuVC
:
BaseViewController
,
UITableViewDelegate
,
UITableViewDataSource
,
GuanLianKeHuCellDelegate
{
var
delegate
:
GuanLianKehuVCDelegate
?
var
selectIdx
:
Int
?
//暂代关联客户数据
var
selectIdx
:
Int
?
=
nil
//暂代关联客户数据
@IBAction
func
submitAction
(
_
sender
:
Any
)
{
@IBAction
func
submitAction
(
_
sender
:
LGButton
)
{
print
(
"确定"
)
if
selectIdx
!=
nil
{
delegate
?
.
btnSelect
?(
keHuData
:
selectIdx
)
self
.
delegate
?
.
GuanLianKehuSelect
(
keHuData
:
self
.
dataArr
[
selectIdx
!
])
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
}
else
{
HUD
.
flash
(
.
label
(
"请选择关联客户"
),
delay
:
1.2
)
}
}
@IBOutlet
weak
var
contentView
:
UIView
!
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
...
...
@@ -32,6 +36,26 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
self
.
view
.
addSubview
(
navbar
)
setTabv
()
}
//MARK:--传入已选客户
var
cus_id
:
Int
?
=
nil
//MARK:--列表数据源
var
dataArr
:
Array
<
CusListAllDataModel
>
=
[]
//MARK:--加载数据
@objc
func
loadData
()
{
let
UserToken
=
UserDefaults
.
standard
.
value
(
forKey
:
"user_token"
)
cusListAll
([
"user_token"
:
UserToken
as
Any
],
success
:
{
(
data
)
in
self
.
dataArr
.
removeAll
()
let
dataM
=
data
as!
CusListAllModel
dataM
.
data
?
.
forEach
({
(
model
)
in
self
.
dataArr
.
append
(
model
)
})
self
.
tableV
.
reloadData
()
self
.
tableV
?
.
mj_header
?
.
endRefreshing
()
})
{
(
error
)
in
}
}
var
tableV
:
UITableView
!
private
let
animations
=
[
AnimationType
.
from
(
direction
:
.
bottom
,
offset
:
150*
glscale
)]
...
...
@@ -52,17 +76,40 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
footerTbV
.
backgroundColor
=
UIColor
.
init
(
named
:
"白色背景色"
)
tableV
.
tableFooterView
=
footerTbV
//下拉刷新相关设置
headerMJ
.
setRefreshingTarget
(
self
,
refreshingAction
:
#selector(
loadData
)
)
self
.
tableV
!.
mj_header
=
headerMJ
self
.
tableV
.
mj_header
?
.
beginRefreshing
()
}
func
tableView
(
_
tableView
:
UITableView
,
numberOfRowsInSection
section
:
Int
)
->
Int
{
return
3
return
dataArr
.
count
}
func
tableView
(
_
tableView
:
UITableView
,
cellForRowAt
indexPath
:
IndexPath
)
->
UITableViewCell
{
let
cell
=
tableView
.
dequeueReusableCell
(
withIdentifier
:
"GuanLianKeHuCell"
)
as!
GuanLianKeHuCell
cell
.
delegate
=
self
cell
.
tag
=
indexPath
.
row
let
rowModel
=
self
.
dataArr
[
indexPath
.
row
]
cell
.
senderLbl
.
text
=
rowModel
.
cus_name
cell
.
receiverLbl
.
text
=
rowModel
.
user_name
if
rowModel
.
cus_type
==
1
{
cell
.
personLbl
.
isHidden
=
false
cell
.
companyLbl
.
isHidden
=
true
}
else
{
cell
.
personLbl
.
isHidden
=
true
cell
.
companyLbl
.
isHidden
=
false
}
cell
.
detailLbl
.
text
=
rowModel
.
company
if
cus_id
!=
nil
{
if
cus_id
==
rowModel
.
cus_id
{
cell
.
imgBtn
.
isSelected
=
true
selectIdx
=
indexPath
.
row
}
}
return
cell
}
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
...
...
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.xib
View file @
42fea0c7
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"1
5702
"
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
6096
"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
useSafeAreas=
"YES"
colorMatched=
"YES"
>
<device
id=
"retina6_1"
orientation=
"portrait"
appearance=
"light"
/>
<dependencies>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
5704
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
6087
"
/>
<capability
name=
"Named colors"
minToolsVersion=
"9.0"
/>
<capability
name=
"Safe area layout guides"
minToolsVersion=
"9.0"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
...
...
@@ -19,18 +19,14 @@
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"414"
height=
"896"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
heightSizable=
"YES"
/>
<subviews>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"US6-R4-qxF"
customClass=
"LGButton"
customModule=
"LGButton"
>
<rect
key=
"frame"
x=
"0.0"
y=
"813"
width=
"414"
height=
"49"
/>
<color
key=
"backgroundColor"
name=
"蓝色字体颜色"
/>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"49"
id=
"5xr-Qj-HWT"
/>
</constraints>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"3TM-jG-VM2"
>
<rect
key=
"frame"
x=
"0.0"
y=
"44"
width=
"414"
height=
"769"
/>
<color
key=
"backgroundColor"
name=
"白色背景色"
/>
</view>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"YKd-bD-avz"
customClass=
"LGButton"
customModule=
"LGButton"
>
<rect
key=
"frame"
x=
"0.0"
y=
"813"
width=
"414"
height=
"83"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
cocoaTouchSystemColor=
"whiteColor"
/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute
type=
"boolean"
keyPath=
"isSkeletonable"
value=
"YES"
/>
<userDefinedRuntimeAttribute
type=
"string"
keyPath=
"titleString"
value=
"确定"
/>
<userDefinedRuntimeAttribute
type=
"number"
keyPath=
"titleFontSize"
>
<real
key=
"value"
value=
"17"
/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute
type=
"color"
keyPath=
"gradientStartColor"
>
<color
key=
"value"
name=
"按钮渐变色上"
/>
</userDefinedRuntimeAttribute>
...
...
@@ -39,36 +35,39 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action
selector=
"submitAction:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"
i1h-Ro-dcZ
"
/>
<action
selector=
"submitAction:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"
ajM-Wd-f7v
"
/>
</connections>
</view>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
buttonType=
"roundedRect"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"fUh-0E-kXZ"
>
<rect
key=
"frame"
x=
"0.0"
y=
"862"
width=
"414"
height=
"50"
/>
<color
key=
"backgroundColor"
name=
"按钮渐变色下,字体颜色"
/>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
usesAttributedText=
"YES"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"xiH-O8-cNV"
>
<rect
key=
"frame"
x=
"0.0"
y=
"813"
width=
"414"
height=
"49"
/>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"
50"
id=
"6jk-sA-tZb
"
/>
<constraint
firstAttribute=
"height"
constant=
"
49"
id=
"A03-0x-HL7
"
/>
</constraints>
<state
key=
"normal"
>
<color
key=
"titleColor"
name=
"按钮渐变色下,字体颜色"
/>
</state>
</button>
<view
contentMode=
"scaleToFill"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"3TM-jG-VM2"
>
<rect
key=
"frame"
x=
"0.0"
y=
"44"
width=
"414"
height=
"769"
/>
<color
key=
"backgroundColor"
name=
"白色背景色"
/>
</view>
<attributedString
key=
"attributedText"
>
<fragment
content=
"确定"
>
<attributes>
<color
key=
"NSColor"
name=
"白色背景色"
/>
<font
key=
"NSFont"
size=
"17"
name=
"PingFangSC-Medium"
/>
<paragraphStyle
key=
"NSParagraphStyle"
alignment=
"center"
lineBreakMode=
"wordWrapping"
baseWritingDirection=
"natural"
tighteningFactorForTruncation=
"0.0"
/>
</attributes>
</fragment>
</attributedString>
<nil
key=
"highlightedColor"
/>
</label>
</subviews>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
cocoaTouchSystemColor=
"whiteColor"
/>
<constraints>
<constraint
firstItem=
"fUh-0E-kXZ"
firstAttribute=
"top"
secondItem=
"US6-R4-qxF"
secondAttribute=
"bottom"
id=
"4oc-7X-nPj"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"YKd-bD-avz"
secondAttribute=
"bottom"
id=
"1tt-vZ-qy7"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"trailing"
secondItem=
"xiH-O8-cNV"
secondAttribute=
"trailing"
id=
"3M5-Wl-Z78"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"trailing"
secondItem=
"3TM-jG-VM2"
secondAttribute=
"trailing"
id=
"4tF-Ah-gJ7"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"bottom"
secondItem=
"xiH-O8-cNV"
secondAttribute=
"bottom"
id=
"AGO-O3-b7S"
/>
<constraint
firstItem=
"YKd-bD-avz"
firstAttribute=
"top"
secondItem=
"3TM-jG-VM2"
secondAttribute=
"bottom"
id=
"Afo-4Q-0Ae"
/>
<constraint
firstItem=
"3TM-jG-VM2"
firstAttribute=
"leading"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"leading"
id=
"Hqt-Qn-BQ9"
/>
<constraint
firstItem=
"3TM-jG-VM2"
firstAttribute=
"top"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"top"
id=
"Ics-t0-UuG"
/>
<constraint
firstItem=
"fUh-0E-kXZ"
firstAttribute=
"leading"
secondItem=
"i5M-Pr-FkT"
secondAttribute=
"leading"
id=
"LJ8-2p-TWo"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"trailing"
secondItem=
"US6-R4-qxF"
secondAttribute=
"trailing"
id=
"U01-EV-dom"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"bottom"
secondItem=
"US6-R4-qxF"
secondAttribute=
"bottom"
id=
"XWg-QJ-Det"
/>
<constraint
firstItem=
"US6-R4-qxF"
firstAttribute=
"top"
secondItem=
"3TM-jG-VM2"
secondAttribute=
"bottom"
id=
"fqZ-Ea-rhD"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"fUh-0E-kXZ"
secondAttribute=
"trailing"
id=
"wmN-Jb-mVD"
/>
<constraint
firstItem=
"US6-R4-qxF"
firstAttribute=
"leading"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"leading"
id=
"xio-WK-uuf"
/>
<constraint
firstItem=
"YKd-bD-avz"
firstAttribute=
"top"
secondItem=
"xiH-O8-cNV"
secondAttribute=
"top"
id=
"bKE-lf-XfE"
/>
<constraint
firstItem=
"fnl-2z-Ty3"
firstAttribute=
"trailing"
secondItem=
"YKd-bD-avz"
secondAttribute=
"trailing"
id=
"esk-4d-ys9"
/>
<constraint
firstItem=
"YKd-bD-avz"
firstAttribute=
"leading"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"leading"
id=
"mWk-CS-2Up"
/>
<constraint
firstItem=
"xiH-O8-cNV"
firstAttribute=
"leading"
secondItem=
"fnl-2z-Ty3"
secondAttribute=
"leading"
id=
"rjg-po-6wf"
/>
</constraints>
<viewLayoutGuide
key=
"safeArea"
id=
"fnl-2z-Ty3"
/>
<point
key=
"canvasLocation"
x=
"131.8840579710145"
y=
"134.59821428571428"
/>
...
...
@@ -84,8 +83,8 @@
<namedColor
name=
"白色背景色"
>
<color
red=
"1"
green=
"1"
blue=
"1"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</namedColor>
<namedColor
name=
"
蓝色字体颜
色"
>
<color
red=
"
0.27799999713897705"
green=
"0.56099998950958252"
blue=
"0.88999998569488525
"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
<namedColor
name=
"
白色背景
色"
>
<color
red=
"
1"
green=
"1"
blue=
"1
"
alpha=
"1"
colorSpace=
"custom"
customColorSpace=
"sRGB"
/>
</namedColor>
</resources>
</document>
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @
42fea0c7
This diff is collapsed.
Click to expand it.
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