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
1de8d0af
Commit
1de8d0af
authored
Sep 07, 2016
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除新建采购单金额不能为0限制
parent
5db190e9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
project.pbxproj
XFFruit.xcodeproj/project.pbxproj
+4
-4
Info.plist
XFFruit/Info.plist
+1
-1
ShopDetaileViewController.m
...trollers/PurchaseNotice/Views/ShopDetaileViewController.m
+10
-10
No files found.
XFFruit.xcodeproj/project.pbxproj
View file @
1de8d0af
...
@@ -3573,7 +3573,7 @@
...
@@ -3573,7 +3573,7 @@
);
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.xffruit
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.xffruit
;
PRODUCT_NAME
=
XFFruit
;
PRODUCT_NAME
=
XFFruit
;
PROVISIONING_PROFILE
=
""
;
PROVISIONING_PROFILE
=
"
e2cec26c-3666-4512-9b9a-cdb4cd9da56d
"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
};
};
name
=
Debug
;
name
=
Debug
;
...
@@ -3583,8 +3583,8 @@
...
@@ -3583,8 +3583,8 @@
baseConfigurationReference
=
7DDFB1D460448C3B45118195
/* Pods.release.xcconfig */
;
baseConfigurationReference
=
7DDFB1D460448C3B45118195
/* Pods.release.xcconfig */
;
buildSettings
=
{
buildSettings
=
{
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
CODE_SIGN_IDENTITY
=
"iPhone D
istribution: Shanghai Gomore Information Technology Co.,Ltd
"
;
CODE_SIGN_IDENTITY
=
"iPhone D
eveloper: jie zhang (9V9955H2BK)
"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone D
istribution: Shanghai Gomore Information Technology Co.,Ltd
"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone D
eveloper: jie zhang (9V9955H2BK)
"
;
COPYING_PRESERVES_HFS_DATA
=
NO
;
COPYING_PRESERVES_HFS_DATA
=
NO
;
ENABLE_BITCODE
=
NO
;
ENABLE_BITCODE
=
NO
;
GCC_PREFIX_HEADER
=
"XFFruit/XFFruit-Prefix.pch"
;
GCC_PREFIX_HEADER
=
"XFFruit/XFFruit-Prefix.pch"
;
...
@@ -3598,7 +3598,7 @@
...
@@ -3598,7 +3598,7 @@
);
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.xffruit
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.xffruit
;
PRODUCT_NAME
=
XFFruit
;
PRODUCT_NAME
=
XFFruit
;
PROVISIONING_PROFILE
=
""
;
PROVISIONING_PROFILE
=
"
e2cec26c-3666-4512-9b9a-cdb4cd9da56d
"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
};
};
name
=
Release
;
name
=
Release
;
...
...
XFFruit/Info.plist
View file @
1de8d0af
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
string
>
APPL
<
/string
>
<
string
>
APPL
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
1.2.
9
<
/string
>
<
string
>
1.2.
10
<
/string
>
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
string
>
????
<
/string
>
<
string
>
????
<
/string
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
...
...
XFFruit/ViewControllers/PurchaseNotice/Views/ShopDetaileViewController.m
View file @
1de8d0af
...
@@ -131,15 +131,15 @@ typedef enum : NSUInteger {
...
@@ -131,15 +131,15 @@ typedef enum : NSUInteger {
//基础数量
//基础数量
foundationQuantity
.
text
=
self
.
shopDetail
.
foundationQuantity
;
foundationQuantity
.
text
=
self
.
shopDetail
.
foundationQuantity
;
//基础单价
//基础单价
if
([
self
.
shopDetail
.
foundationUnitPrice
floatValue
]
>
0
)
{
//
if ([self.shopDetail.foundationUnitPrice floatValue] > 0) {
foundationUnitPrice
.
text
=
[
self
.
shopDetail
.
foundationUnitPrice
stringValue
];
foundationUnitPrice
.
text
=
[
self
.
shopDetail
.
foundationUnitPrice
stringValue
];
}
//
}
self
.
basePrice
=
self
.
shopDetail
.
foundationUnitPrice
;
self
.
basePrice
=
self
.
shopDetail
.
foundationUnitPrice
;
//包装单价
//包装单价
if
([
self
.
shopDetail
.
packageUnitPrice
floatValue
]
>
0
)
{
//
if ([self.shopDetail.packageUnitPrice floatValue] > 0) {
packageUnitPrice
.
text
=
[
self
.
shopDetail
.
packageUnitPrice
stringValue
];
packageUnitPrice
.
text
=
[
self
.
shopDetail
.
packageUnitPrice
stringValue
];
}
//
}
self
.
packPrice
=
self
.
shopDetail
.
packageUnitPrice
;
self
.
packPrice
=
self
.
shopDetail
.
packageUnitPrice
;
//总金额
//总金额
if
([
self
.
shopDetail
.
totalMoney
floatValue
]
<=
0
)
{
if
([
self
.
shopDetail
.
totalMoney
floatValue
]
<=
0
)
{
...
@@ -277,10 +277,10 @@ typedef enum : NSUInteger {
...
@@ -277,10 +277,10 @@ typedef enum : NSUInteger {
ShowMessage
(
@"商品数量不能为0"
);
ShowMessage
(
@"商品数量不能为0"
);
return
NO
;
return
NO
;
}
}
if
([
packageUnitPrice
.
text
floatValue
]
<=
0
||
[
foundationUnitPrice
.
text
floatValue
]
<=
0
||
[
totalMoney
.
text
floatValue
]
<=
0
)
{
//
if ([packageUnitPrice.text floatValue] <=0 || [foundationUnitPrice.text floatValue] <= 0 || [totalMoney.text floatValue]<= 0) {
ShowMessage
(
@"商品价格不能0"
);
//
ShowMessage(@"商品价格不能0");
return
NO
;
//
return NO;
}
//
}
return
YES
;
return
YES
;
}
}
#pragma mark - 协议方法
#pragma mark - 协议方法
...
@@ -348,11 +348,11 @@ typedef enum : NSUInteger {
...
@@ -348,11 +348,11 @@ typedef enum : NSUInteger {
textField
.
delegate
=
self
;
textField
.
delegate
=
self
;
[
cell
.
contentView
addSubview
:
textField
];
[
cell
.
contentView
addSubview
:
textField
];
UILabel
*
label
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
CGRectGetMaxX
(
textField
.
frame
)
+
5
,
0
,
2
0
,
TableHeight
)];
UILabel
*
label
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
CGRectGetMaxX
(
textField
.
frame
)
+
5
,
0
,
3
0
,
TableHeight
)];
label
.
textColor
=
GXF_CONTENT_COLOR
;
label
.
textColor
=
GXF_CONTENT_COLOR
;
label
.
font
=
GXF_FIFTEENTEN_SIZE
;
label
.
font
=
GXF_FIFTEENTEN_SIZE
;
[
cell
.
contentView
addSubview
:
label
];
[
cell
.
contentView
addSubview
:
label
];
if
(
indexPath
.
row
==
2
)
{
if
(
indexPath
.
row
==
2
)
{
UILabel
*
labelTwo
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
100
+
LeftMargin
,
0
,
50
,
TableHeight
)];
UILabel
*
labelTwo
=
[[
UILabel
alloc
]
initWithFrame
:
CGRectMake
(
100
+
LeftMargin
,
0
,
50
,
TableHeight
)];
labelTwo
.
text
=
@"1*"
;
labelTwo
.
text
=
@"1*"
;
...
...
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