Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
X
xffruit
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
张杰
xffruit
Commits
c11d352c
Commit
c11d352c
authored
8 years ago
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
b10258bc
master
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
8 deletions
+18
-8
Info.plist
XFFruit/Info.plist
+2
-2
IBTLoadingView.m
XFFruit/Utilities/IBTUIKit/IBTLoadingView.m
+1
-1
ShopDetaileViewController.m
...trollers/PurchaseNotice/Views/ShopDetaileViewController.m
+3
-0
ReceiveProductViewController.m
...lers/Receiving/Controllers/ReceiveProductViewController.m
+3
-2
TransferProductViewController.m
...lers/Transfer/Controllers/TransferProductViewController.m
+1
-1
TransportPurchaseCell.m
...t/ViewControllers/Transport/Views/TransportPurchaseCell.m
+8
-2
No files found.
XFFruit/Info.plist
View file @
c11d352c
...
...
@@ -15,11 +15,11 @@
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
string
>
APPL
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
1.2.3
2
<
/string
>
<
string
>
1.2.3
3
<
/string
>
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
string
>
????
<
/string
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
>
1.2.3
2
<
/string
>
<
string
>
1.2.3
3
<
/string
>
<
k
e
y
>
NSAppTransportSecurity
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
NSAllowsArbitraryLoads
<
/k
e
y
>
...
...
This diff is collapsed.
Click to expand it.
XFFruit/Utilities/IBTUIKit/IBTLoadingView.m
View file @
c11d352c
...
...
@@ -54,7 +54,7 @@
hud
.
mode
=
MBProgressHUDModeText
;
hud
.
margin
=
10
.
0
f
;
hud
.
yOffset
=
60
.
0
f
;
[
hud
hide
:
YES
afterDelay
:
1
];
[
hud
hide
:
YES
afterDelay
:
4
];
}
+
(
void
)
showProgressLabel
:(
NSString
*
)
text
{
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
View file @
c11d352c
...
...
@@ -433,6 +433,9 @@ typedef enum : NSUInteger {
_measureUnitLabel
=
label
;
textField
.
placeholder
=
@"输入包装规格"
;
textField
.
tag
=
111
;
textField
.
userInteractionEnabled
=
self
.
intertype
!=
ShopDetailInterTypeTranfer
;
[
textField
addTarget
:
self
action
:
@selector
(
textChange
:
)
forControlEvents
:
UIControlEventAllEditingEvents
];
packageSpecification
=
textField
;
//包装规格
}
else
if
([
title
isEqualToString
:
@"包装数量"
])
{
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Receiving/Controllers/ReceiveProductViewController.m
View file @
c11d352c
...
...
@@ -166,7 +166,8 @@
[
cell
.
editBtn
addTarget
:
self
action
:
@selector
(
editClick
:
)
forControlEvents
:
UIControlEventTouchUpInside
];
if
(
self
.
productArr
.
count
>
0
)
{
TransferPdtDetail
*
billP
=
self
.
productArr
[
indexPath
.
row
];
NSMutableArray
*
arrSection
=
[
self
.
dictData
objectForKey
:
self
.
arrBillNumber
[
indexPath
.
section
]];
TransferPdtDetail
*
billP
=
arrSection
[
indexPath
.
row
];
[
cell
setBillProduct
:
billP
row
:
indexPath
.
row
defaultState
:
self
.
defaultState
[
indexPath
.
row
]];
}
// cell.backgroundColor = [UIColor redColor];
...
...
@@ -174,7 +175,7 @@
}
-
(
BOOL
)
isHaveIndexPath
:
(
NSIndexPath
*
)
indexPath
{
for
(
NSIndexPath
*
path
in
_selectRowArr
)
{
if
(
path
.
row
==
indexPath
.
row
)
{
if
(
path
==
indexPath
)
{
return
YES
;
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transfer/Controllers/TransferProductViewController.m
View file @
c11d352c
...
...
@@ -160,7 +160,7 @@
}
-
(
BOOL
)
isHaveIndexPath
:
(
NSIndexPath
*
)
indexPath
{
for
(
NSIndexPath
*
path
in
_selectRowArr
)
{
if
(
path
.
row
==
indexPath
.
row
)
{
if
(
path
==
indexPath
)
{
return
YES
;
}
}
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Transport/Views/TransportPurchaseCell.m
View file @
c11d352c
...
...
@@ -63,7 +63,7 @@
__weak
TransportPurchaseCell
*
weakSelf
=
self
;
self
.
headCell
=
[[
HeaderCell
alloc
]
initWithFrame
:
CGRectMake
(
0
,
0
,
ScreenSize
.
width
,
38
)
WithCheckBoxArr
:
arr
checkBox
:^
(
BOOL
isSelect
)
{
if
(
isSelect
)
{
[
weakSelf
.
selectArr
removeAllObjects
];
//
[weakSelf.selectArr removeAllObjects];
for
(
TransportPdtDetail
*
pdt
in
weakSelf
.
secondArr
)
{
if
(
pdt
.
shippedFlag
.
boolValue
)
{
...
...
@@ -74,7 +74,13 @@
}
}
[
weakSelf
.
selectArr
addObjectsFromArray
:
weakSelf
.
secondArr
];
for
(
TransportPdtDetail
*
pdt
in
weakSelf
.
secondArr
)
{
if
(
!
[
weakSelf
.
selectArr
containsObject
:
pdt
])
{
[
weakSelf
.
selectArr
addObject
:
pdt
];
}
}
// [weakSelf.selectArr addObjectsFromArray:weakSelf.secondArr];
}
else
{
[
weakSelf
.
selectArr
removeObjectsInArray
:
weakSelf
.
secondArr
];
...
...
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