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
1bea2681
Commit
1bea2681
authored
Feb 23, 2021
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改文案绝对值改为固定提成
parent
62d31008
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
12 deletions
+2
-12
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/View/AlertView/DistributorSettingAlertView.xib
...ssPlatform/View/AlertView/DistributorSettingAlertView.xib
+2
-2
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift
...rm/ViewController/分销订单管理/RetailManageViewController.swift
+0
-10
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
1bea2681
No preview for this file type
GeliBusinessPlatform/View/AlertView/DistributorSettingAlertView.xib
View file @
1bea2681
...
...
@@ -135,9 +135,9 @@
<nil
key=
"highlightedColor"
/>
</label>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"puW-3j-GZy"
>
<rect
key=
"frame"
x=
"181"
y=
"121"
width=
"
67
"
height=
"19"
/>
<rect
key=
"frame"
x=
"181"
y=
"121"
width=
"
80
"
height=
"19"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<state
key=
"normal"
title=
"
绝对值
"
image=
"daixuan"
>
<state
key=
"normal"
title=
"
固定提成
"
image=
"daixuan"
>
<color
key=
"titleColor"
name=
"标题字颜色"
/>
</state>
<connections>
...
...
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.swift
View file @
1bea2681
...
...
@@ -56,15 +56,12 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
listView
.
mj_footer
=
footerMJ
listView
.
mj_header
?
.
beginRefreshing
()
}
//MARK:--loadData
//MARK:--列表数据源
var
dataArr
:
Array
<
dbtOrderLisDataModel
>
=
[]
// var dataArr2:Array<dbtOrderLisDataModel> = []
@objc
func
loadData
(){
isUpData
=
true
//结算方式(0全部1人工结算 2自动结算(3待自动结算、4已自动结算)(5待人工结算6已人工结算))
page
=
1
let
dic
=
[
"user_token"
:
UserToken
as
Any
,
"keyword"
:
keyword
,
"page"
:
page
,
"dbt_type"
:
dbt_type
,
"dbt_people"
:
dbt_people
,
"start_time"
:
startTime
as
Any
,
"end_time"
:
endTime
as
Any
]
...
...
@@ -88,12 +85,9 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
}
failture
:
{
(
error
)
in
self
.
listView
.
mj_header
?
.
endRefreshing
()
}
}
@objc
func
loadMoreData
(){
let
dic
=
[
"user_token"
:
UserToken
as
Any
,
"keyword"
:
keyword
,
"page"
:
page
,
"dbt_type"
:
dbt_type
,
"dbt_people"
:
dbt_people
,
"start_time"
:
startTime
as
Any
,
"end_time"
:
endTime
as
Any
]
dbtOrderLis
(
dic
)
{
(
data
)
in
let
dataM
=
data
as!
dbtOrderLisModel
...
...
@@ -141,7 +135,6 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
}
else
{
cell
.
dotImgV
.
isHidden
=
false
}
return
cell
}
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
...
...
@@ -155,13 +148,10 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
let
vc
=
RetailManageDetailViewController
()
let
goodArrModel
=
self
.
dataArr
[
indexPath
.
section
]
vc
.
orderId
=
goodArrModel
.
order_id
// vc.orderId = 12746
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
}
}
@objc
func
didselectCellHorF
(
sender
:
UITapGestureRecognizer
){
if
self
.
title
==
"代销订单"
{
...
...
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