Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
VirtualCard-iOS
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
APP
VirtualCard-iOS
Commits
b7582c6b
Commit
b7582c6b
authored
Jul 15, 2019
by
胡红磊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单中心物流编号问题及点击取消
parent
f3c9fa6e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
6 deletions
+19
-6
VirtualPayment.xcscheme
....xcodeproj/xcshareddata/xcschemes/VirtualPayment.xcscheme
+5
-0
OrderDetailController.m
...asses/Mall/Function/3C/Controller/OrderDetailController.m
+1
-1
OrderDetailLogisticsCell.xib
...ction/3C/View/NewOrderDetail/OrderDetailLogisticsCell.xib
+13
-5
No files found.
VirtualPayment/VirtualPayment.xcodeproj/xcshareddata/xcschemes/VirtualPayment.xcscheme
View file @
b7582c6b
...
@@ -62,6 +62,11 @@
...
@@ -62,6 +62,11 @@
</BuildableReference>
</BuildableReference>
</BuildableProductRunnable>
</BuildableProductRunnable>
<AdditionalOptions>
<AdditionalOptions>
<AdditionalOption
key =
"NSZombieEnabled"
value =
"YES"
isEnabled =
"YES"
>
</AdditionalOption>
</AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
</LaunchAction>
<ProfileAction
<ProfileAction
...
...
VirtualPayment/VirtualPayment/QGClasses/Mall/Function/3C/Controller/OrderDetailController.m
View file @
b7582c6b
...
@@ -469,7 +469,7 @@
...
@@ -469,7 +469,7 @@
[
paramDictM
setValue
:
self
.
orderDetailModel
.
expressInfo
.
deliveryCode
forKey
:
@"orderDetailModel"
];
[
paramDictM
setValue
:
self
.
orderDetailModel
.
expressInfo
.
deliveryCode
forKey
:
@"orderDetailModel"
];
}
}
[
Mediator
performTarget
:[
QGMediatorClassTools
QGClassNameWithHeaderType
:
QGHeaderTypeQGTimeLineViewController
]
parameters
:
paramDictM
handlerBlock
:
nil
];
//
[Mediator performTarget:[QGMediatorClassTools QGClassNameWithHeaderType:QGHeaderTypeQGTimeLineViewController] parameters:paramDictM handlerBlock:nil];
}
else
if
([
confirg
isEqualToString
:
@"商品信息"
])
{
}
else
if
([
confirg
isEqualToString
:
@"商品信息"
])
{
//进入商品详情
//进入商品详情
[
Mediator
performTarget
:[
QGMediatorClassTools
QGClassNameWithHeaderType
:
QGHeaderTypeQGCommodityDetailVC
]
parameters
:@{
@"skuId"
:
self
.
orderDetailModel
.
product
.
productId
}
handlerBlock
:
nil
];
[
Mediator
performTarget
:[
QGMediatorClassTools
QGClassNameWithHeaderType
:
QGHeaderTypeQGCommodityDetailVC
]
parameters
:@{
@"skuId"
:
self
.
orderDetailModel
.
product
.
productId
}
handlerBlock
:
nil
];
...
...
VirtualPayment/VirtualPayment/QGClasses/Mall/Function/3C/View/NewOrderDetail/OrderDetailLogisticsCell.xib
View file @
b7582c6b
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"11201"
systemVersion=
"15F34"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
colorMatched=
"YES"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"14490.70"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
useAutolayout=
"YES"
useTraitCollections=
"YES"
colorMatched=
"YES"
>
<device
id=
"retina6_1"
orientation=
"portrait"
>
<adaptation
id=
"fullscreen"
/>
</device>
<dependencies>
<dependencies>
<deployment
identifier=
"iOS"
/>
<deployment
identifier=
"iOS"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
1161
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.IBCocoaTouchPlugin"
version=
"1
4490.49
"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
</dependencies>
</dependencies>
<objects>
<objects>
...
@@ -12,31 +15,36 @@
...
@@ -12,31 +15,36 @@
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"100"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"100"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<tableViewCellContentView
key=
"contentView"
opaque=
"NO"
clipsSubviews=
"YES"
multipleTouchEnabled=
"YES"
contentMode=
"center"
tableViewCell=
"wfg-vb-uV2"
id=
"nzp-kq-5g3"
>
<tableViewCellContentView
key=
"contentView"
opaque=
"NO"
clipsSubviews=
"YES"
multipleTouchEnabled=
"YES"
contentMode=
"center"
tableViewCell=
"wfg-vb-uV2"
id=
"nzp-kq-5g3"
>
<
frame
key=
"frameInset"
width=
"375"
height=
"99
"
/>
<
rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"375"
height=
"99.5
"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
<subviews>
<subviews>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"AddressSeprator"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"nyi-0t-yVA"
>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"AddressSeprator"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"nyi-0t-yVA"
>
<rect
key=
"frame"
x=
"0.0"
y=
"97.5"
width=
"375"
height=
"2"
/>
<constraints>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"2"
id=
"xzq-a6-ag3"
/>
<constraint
firstAttribute=
"height"
constant=
"2"
id=
"xzq-a6-ag3"
/>
</constraints>
</constraints>
</imageView>
</imageView>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"huoche"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"pda-H3-iXK"
>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"huoche"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"pda-H3-iXK"
>
<rect
key=
"frame"
x=
"30"
y=
"28"
width=
"23"
height=
"17"
/>
<constraints>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"17"
id=
"0FB-eK-SUb"
/>
<constraint
firstAttribute=
"height"
constant=
"17"
id=
"0FB-eK-SUb"
/>
<constraint
firstAttribute=
"width"
constant=
"23"
id=
"KVk-Kj-zmO"
/>
<constraint
firstAttribute=
"width"
constant=
"23"
id=
"KVk-Kj-zmO"
/>
</constraints>
</constraints>
</imageView>
</imageView>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"订单出库状态"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
numberOfLines=
"0"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"58z-Uc-VqI"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"订单出库状态"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
numberOfLines=
"0"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"58z-Uc-VqI"
>
<rect
key=
"frame"
x=
"67"
y=
"27"
width=
"272"
height=
"17"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"14"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"14"
/>
<color
key=
"textColor"
red=
"0.20000000000000001"
green=
"0.20000000000000001"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<color
key=
"textColor"
red=
"0.20000000000000001"
green=
"0.20000000000000001"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"商品出库时间"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"A3R-XG-APX"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"商品出库时间"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"A3R-XG-APX"
>
<rect
key=
"frame"
x=
"67"
y=
"54"
width=
"86"
height=
"17"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
weight=
"light"
pointSize=
"14"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
weight=
"light"
pointSize=
"14"
/>
<color
key=
"textColor"
red=
"0.20000000000000001"
green=
"0.20000000000000001"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<color
key=
"textColor"
red=
"0.20000000000000001"
green=
"0.20000000000000001"
blue=
"0.20000000000000001"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"detail_icon"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"jnd-vL-eWT"
>
<imageView
hidden=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"detail_icon"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"jnd-vL-eWT"
>
<rect
key=
"frame"
x=
"345"
y=
"41"
width=
"10"
height=
"18"
/>
<constraints>
<constraints>
<constraint
firstAttribute=
"height"
constant=
"18"
id=
"OD5-Va-y8V"
/>
<constraint
firstAttribute=
"height"
constant=
"18"
id=
"OD5-Va-y8V"
/>
<constraint
firstAttribute=
"width"
constant=
"10"
id=
"RYe-5x-7K5"
/>
<constraint
firstAttribute=
"width"
constant=
"10"
id=
"RYe-5x-7K5"
/>
...
...
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