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
8867d7d6
Commit
8867d7d6
authored
May 05, 2017
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.增加开发环境。2.保存的单据不显示费用。
parent
ad699d4e
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
65 additions
and
12 deletions
+65
-12
project.pbxproj
XFFruit.xcodeproj/project.pbxproj
+7
-6
Contents.json
XFFruit/Images.xcassets/AppIcon-1.appiconset/Contents.json
+20
-0
Contents.json
XFFruit/Images.xcassets/AppIcon.appiconset/Contents.json
+20
-0
Info.plist
XFFruit/Info.plist
+2
-2
ICRAppMacro.h
XFFruit/Macro/ICRAppMacro.h
+4
-4
NewPurchaseViewController.m
...trollers/Purchase/Controllers/NewPurchaseViewController.m
+11
-0
PurchaseBill.h
XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h
+1
-0
No files found.
XFFruit.xcodeproj/project.pbxproj
View file @
8867d7d6
...
...
@@ -2046,13 +2046,14 @@
path
=
Views
;
sourceTree
=
"<group>"
;
};
7281A0A71B8974120052B1AC
/* Purchase */
=
{
7281A0A71B8974120052B1AC
/* Purchase
(采购单)
*/
=
{
isa
=
PBXGroup
;
children
=
(
7281A0A81B8974120052B1AC
/* Controllers */
,
7281A0AD1B8974120052B1AC
/* Models */
,
7281A0AE1B8974120052B1AC
/* Views */
,
);
name
=
"Purchase(采购单)"
;
path
=
Purchase
;
sourceTree
=
"<group>"
;
};
...
...
@@ -2952,7 +2953,7 @@
724171641B9D30660094DF55
/* ChooseViewController */
,
35CF33911B95B419001211EF
/* GXFCommon */
,
35CF33721B953E8D001211EF
/* Process(加工单) */
,
7281A0A71B8974120052B1AC
/* Purchase */
,
7281A0A71B8974120052B1AC
/* Purchase
(采购单)
*/
,
FE17F67A1B85CA5B0078CE96
/* PurchaseNotice */
,
7217E9C01B72364300FE5C1D
/* Survey */
,
C159180B1ABE88030013B391
/* Login */
,
...
...
@@ -4423,7 +4424,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.xffruit
;
PRODUCT_NAME
=
XFFruit
;
PROVISIONING_PROFILE
=
"
e2cec26c-3666-4512-9b9a-cdb4cd9da56d
"
;
PROVISIONING_PROFILE
=
""
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
};
name
=
Debug
;
...
...
@@ -4433,8 +4434,8 @@
baseConfigurationReference
=
7DDFB1D460448C3B45118195
/* Pods.release.xcconfig */
;
buildSettings
=
{
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
CODE_SIGN_IDENTITY
=
"iPhone D
eveloper: jie zhang (9V9955H2BK)
"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone D
eveloper: jie zhang (9V9955H2BK)
"
;
CODE_SIGN_IDENTITY
=
"iPhone D
istribution: Shanghai Gomore Information Technology Co.,Ltd
"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone D
istribution: Shanghai Gomore Information Technology Co.,Ltd
"
;
COPYING_PRESERVES_HFS_DATA
=
NO
;
ENABLE_BITCODE
=
NO
;
GCC_PREFIX_HEADER
=
"XFFruit/XFFruit-Prefix.pch"
;
...
...
@@ -4448,7 +4449,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.xffruit
;
PRODUCT_NAME
=
XFFruit
;
PROVISIONING_PROFILE
=
"
e2cec26c-3666-4512-9b9a-cdb4cd9da56d
"
;
PROVISIONING_PROFILE
=
""
;
USER_HEADER_SEARCH_PATHS
=
"${SRCROOT}/**"
;
};
name
=
Release
;
...
...
XFFruit/Images.xcassets/AppIcon-1.appiconset/Contents.json
View file @
8867d7d6
{
"images"
:
[
{
"idiom"
:
"iphone"
,
"size"
:
"20x20"
,
"scale"
:
"2x"
},
{
"idiom"
:
"iphone"
,
"size"
:
"20x20"
,
"scale"
:
"3x"
},
{
"size"
:
"29x29"
,
"idiom"
:
"iphone"
,
...
...
@@ -54,6 +64,16 @@
"filename"
:
"Icon-60@3x.png"
,
"scale"
:
"3x"
},
{
"idiom"
:
"ipad"
,
"size"
:
"20x20"
,
"scale"
:
"1x"
},
{
"idiom"
:
"ipad"
,
"size"
:
"20x20"
,
"scale"
:
"2x"
},
{
"size"
:
"29x29"
,
"idiom"
:
"ipad"
,
...
...
XFFruit/Images.xcassets/AppIcon.appiconset/Contents.json
View file @
8867d7d6
{
"images"
:
[
{
"idiom"
:
"iphone"
,
"size"
:
"20x20"
,
"scale"
:
"2x"
},
{
"idiom"
:
"iphone"
,
"size"
:
"20x20"
,
"scale"
:
"3x"
},
{
"size"
:
"29x29"
,
"idiom"
:
"iphone"
,
...
...
@@ -51,6 +61,16 @@
"filename"
:
"AppIcon180x180.png"
,
"scale"
:
"3x"
},
{
"idiom"
:
"ipad"
,
"size"
:
"20x20"
,
"scale"
:
"1x"
},
{
"idiom"
:
"ipad"
,
"size"
:
"20x20"
,
"scale"
:
"2x"
},
{
"idiom"
:
"ipad"
,
"size"
:
"29x29"
,
...
...
XFFruit/Info.plist
View file @
8867d7d6
...
...
@@ -15,11 +15,11 @@
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
string
>
APPL
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
1.2.1
2
<
/string
>
<
string
>
1.2.1
3
<
/string
>
<
k
e
y
>
CFBundleSignature
<
/k
e
y
>
<
string
>
????
<
/string
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
>
0
<
/string
>
<
string
>
1.2.13
<
/string
>
<
k
e
y
>
NSAppTransportSecurity
<
/k
e
y
>
<
d
i
c
t
>
<
k
e
y
>
NSAllowsArbitraryLoads
<
/k
e
y
>
...
...
XFFruit/Macro/ICRAppMacro.h
View file @
8867d7d6
...
...
@@ -29,14 +29,14 @@
#define HTTP_REST_REPORT_BASE_URL @"http://jdcg.demo.hd123.cn:7080"
#else
//********
阿里云内部测试
环境********
//#define HTTP_REST_API_BASE_URL @"http://
218.244.151.129:758
0/cruiser-server/rest"
//********
开发
环境********
//#define HTTP_REST_API_BASE_URL @"http://
gomoredev:809
0/cruiser-server/rest"
//********测试环境********
//
#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"
#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7280/cruiser-server/rest"
////********正式环境*********
#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest"
//
#define HTTP_REST_API_BASE_URL @"http://122.224.171.126:7380/cruiser-server/rest"
#define HTTP_REST_REPORT_BASE_URL @"http://122.224.171.126:7380"
#endif
...
...
XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m
View file @
8867d7d6
...
...
@@ -121,6 +121,17 @@ typedef enum : NSUInteger {
}
_aBottomView
.
productVC
.
productArr
=
arr
;
[
_aBottomView
.
productVC
.
tableView
reloadData
];
NSMutableArray
*
arrCost
=
[
NSMutableArray
array
];
for
(
NSDictionary
*
dic
in
_purchaseBill
.
accountDetails
)
{
FeeAcountDetail
*
cost
=
[[
FeeAcountDetail
alloc
]
init
];
[
cost
setValuesForKeysWithDictionary
:
dic
];
[
arrCost
addObject
:
cost
];
}
_aBottomView
.
costVC
.
costArr
=
arrCost
;
[
_aBottomView
.
costVC
.
tableView
reloadData
];
}
-
(
void
)
addTransportCost
:
(
NSNotification
*
)
fination
{
...
...
XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h
View file @
8867d7d6
...
...
@@ -38,4 +38,5 @@
@property
(
nonatomic
,
strong
)
NSString
*
purchaserCode
;
//采购员代码
@property
(
nonatomic
,
strong
)
NSArray
*
products
;
@property
(
strong
,
nonatomic
)
NSArray
*
accountDetails
;
@end
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