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
ad04a038
Commit
ad04a038
authored
May 28, 2020
by
刘俊宏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
626 iOS:“待发货”的现货订单详情,点击“退款”后,不应该还有“退货”&“打印”按钮,因为还没“发货”。
parent
8772d33b
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
0 deletions
+3
-0
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
...ata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
...essPlatform/Model/OrderManageModel/OrderDetailModel.swift
+3
-0
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
...ssPlatform/ViewController/订单详情/OrderDViewController.swift
+0
-0
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
View file @
ad04a038
No preview for this file type
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
View file @
ad04a038
...
@@ -68,6 +68,8 @@ class OrderDetailResModel: Mappable {
...
@@ -68,6 +68,8 @@ class OrderDetailResModel: Mappable {
var
order_status
:
Int
?
//订单状态
var
order_status
:
Int
?
//订单状态
var
order_status_d
:
Int
?
//订单详细状态
var
order_status_d
:
Int
?
//订单详细状态
var
shipping_type
:
Int
?
//配送方式:1派送,2自提
var
shipping_type
:
Int
?
//配送方式:1派送,2自提
var
shipping_status
:
Int
?
//商品配送情况;0未发货,1已发货,2已收货,4退货
var
sale_res
:
OrderDetailSaleResModel
?
//订单预售详情(不是预售订单为空数组,无key=>value)
var
sale_res
:
OrderDetailSaleResModel
?
//订单预售详情(不是预售订单为空数组,无key=>value)
required
init
?(
map
:
Map
)
{
required
init
?(
map
:
Map
)
{
...
@@ -105,6 +107,7 @@ class OrderDetailResModel: Mappable {
...
@@ -105,6 +107,7 @@ class OrderDetailResModel: Mappable {
other_price
<-
map
[
"other_price"
]
other_price
<-
map
[
"other_price"
]
shipping_type
<-
map
[
"shipping_type"
]
shipping_type
<-
map
[
"shipping_type"
]
sale_res
<-
map
[
"sale_res"
]
sale_res
<-
map
[
"sale_res"
]
shipping_status
<-
map
[
"shipping_status"
]
}
}
}
}
...
...
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @
ad04a038
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