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
f58baaac
Commit
f58baaac
authored
Jul 16, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补充逻辑完成
parent
b5bac413
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
2 deletions
+41
-2
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
+20
-2
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
...ssPlatform/ViewController/订单详情/OrderDViewController.swift
+21
-0
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
f58baaac
No preview for this file type
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
View file @
f58baaac
...
...
@@ -334,7 +334,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
let
alertView
=
GeliAlertView
(
frame
:
self
.
view
.
window
!.
bounds
)
alertView
.
delegate
=
self
;
alertView
.
tishiLbl
.
text
=
""
alertView
.
titileLbl
.
text
=
"是否
\(
sender
.
titleLabel
?
.
text
)
?"
alertView
.
titileLbl
.
text
=
"是否
\(
sender
.
titleLabel
!.
text
!
)
?"
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
tag
=
rowModel
.
order_id
!
self
.
view
.
window
?
.
addSubview
(
alertView
)
...
...
@@ -343,7 +343,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
let
alertView
=
GeliAlertView
(
frame
:
self
.
view
.
window
!.
bounds
)
alertView
.
delegate
=
self
;
alertView
.
tishiLbl
.
text
=
""
alertView
.
titileLbl
.
text
=
"是否
\(
sender
.
titleLabel
?
.
text
)
?"
alertView
.
titileLbl
.
text
=
"是否
\(
sender
.
titleLabel
!.
text
!
)
?"
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
tag
=
rowModel
.
order_id
!
self
.
view
.
window
?
.
addSubview
(
alertView
)
...
...
@@ -366,6 +366,15 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
tag
=
rowModel
.
order_id
!
self
.
view
.
window
?
.
addSubview
(
alertView
)
}
else
if
sender
.
titleLabel
?
.
text
==
"先货后款"
{
isSrueOrder
=
9
let
alertView
=
GeliAlertView
(
frame
:
self
.
view
.
window
!.
bounds
)
alertView
.
delegate
=
self
;
alertView
.
tishiLbl
.
text
=
""
alertView
.
titileLbl
.
text
=
"是否
\(
sender
.
titleLabel
!.
text
!
)
?"
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
tag
=
rowModel
.
order_id
!
self
.
view
.
window
?
.
addSubview
(
alertView
)
}
else
if
sender
.
titleLabel
?
.
text
==
"发货"
{
isSrueOrder
=
4
if
rowModel
.
order_type
==
4
{
...
...
@@ -507,6 +516,15 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
self
.
tableV
.
mj_header
?
.
beginRefreshing
()
})
{
(
error
)
in
}
break
case
9
:
orderConfirm
([
"user_token"
:
UserToken
as
Any
,
"order_id"
:
sender
.
tag
as
Any
,
"goods_before_pay"
:
1
as
Any
],
success
:
{
(
data
)
in
HUD
.
flash
(
.
labeledSubSuccess
(
subtitle
:
"提交成功"
),
delay
:
1.2
)
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"orderChange"
),
object
:
nil
)
self
.
tableV
.
mj_header
?
.
beginRefreshing
()
})
{
(
error
)
in
}
break
default
:
...
...
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @
f58baaac
...
...
@@ -145,6 +145,18 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
switch
sender
.
titleLabel
?
.
text
{
case
"先货后款"
:
let
alertView
=
GeliAlertView
(
frame
:
self
.
view
.
window
!.
bounds
)
alertView
.
delegate
=
self
;
alertView
.
tishiLbl
.
text
=
""
alertView
.
titileLbl
.
text
=
"是否先货后款?"
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确认"
),
for
:
.
normal
)
alertView
.
rightBtn
.
tag
=
1010
self
.
view
.
window
?
.
addSubview
(
alertView
)
break
case
"修改价格"
:
if
isYuShou
{
let
vc
=
XiuGaiYuShouJiaViewController
()
...
...
@@ -1288,6 +1300,15 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self
.
loadData
()
})
{
(
error
)
in
}
}
else
if
sender
.
tag
==
1010
{
orderConfirm
([
"user_token"
:
UserToken
as
Any
,
"order_id"
:
sender
.
tag
as
Any
,
"goods_before_pay"
:
1
as
Any
],
success
:
{
(
data
)
in
HUD
.
flash
(
.
labeledSubSuccess
(
subtitle
:
"提交成功"
),
delay
:
1.2
)
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"orderChange"
),
object
:
nil
)
self
.
delegate
?
.
refishingOrderDchange
()
self
.
loadData
()
})
{
(
error
)
in
}
}
else
if
sender
.
tag
==
1009
{
refuseOrder
([
"user_token"
:
UserToken
as
Any
,
"order_id"
:
sender
.
tag
as
Any
],
success
:
{
(
data
)
in
...
...
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