diff --git a/XFFruit.xcodeproj/project.pbxproj b/XFFruit.xcodeproj/project.pbxproj index 297f7172e267b8f4c242492473a257922c314756..5fd17263f64e259f1a5b06ededb8ef507b9aead8 100644 --- a/XFFruit.xcodeproj/project.pbxproj +++ b/XFFruit.xcodeproj/project.pbxproj @@ -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 Developer: jie zhang (9V9955H2BK)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: jie zhang (9V9955H2BK)"; + CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: 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; diff --git a/XFFruit/Images.xcassets/AppIcon-1.appiconset/Contents.json b/XFFruit/Images.xcassets/AppIcon-1.appiconset/Contents.json index d405fb9604ccd5d998e363ce5baff847a0168f75..1ceb5027daf658aa33ea77c7512b521b329106ed 100644 --- a/XFFruit/Images.xcassets/AppIcon-1.appiconset/Contents.json +++ b/XFFruit/Images.xcassets/AppIcon-1.appiconset/Contents.json @@ -1,5 +1,15 @@ { "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", diff --git a/XFFruit/Images.xcassets/AppIcon.appiconset/Contents.json b/XFFruit/Images.xcassets/AppIcon.appiconset/Contents.json index ae0c5c6118a89ba36d9ef36b6b26362a20bc2fd5..c8aab8631fb8a315f10bc1b7d32a33da7813d843 100644 --- a/XFFruit/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/XFFruit/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "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", diff --git a/XFFruit/Info.plist b/XFFruit/Info.plist index 4cac3e3bc4993a322dd3a79a5e3084f45f25df0e..d21bf14c8dfcce542aa5c72d7e573295fb6c7a17 100644 --- a/XFFruit/Info.plist +++ b/XFFruit/Info.plist @@ -15,11 +15,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.2.12</string> + <string>1.2.13</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>0</string> + <string>1.2.13</string> <key>NSAppTransportSecurity</key> <dict> <key>NSAllowsArbitraryLoads</key> diff --git a/XFFruit/Macro/ICRAppMacro.h b/XFFruit/Macro/ICRAppMacro.h index ff6f4a5ed38a4731759f6e75f22bcc1119cc7e2b..85553eced70daad69504d205bf7bad059028f7bd 100644 --- a/XFFruit/Macro/ICRAppMacro.h +++ b/XFFruit/Macro/ICRAppMacro.h @@ -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:7580/cruiser-server/rest" +//********å¼€å‘环境******** +//#define HTTP_REST_API_BASE_URL @"http://gomoredev:8090/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 diff --git a/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m b/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m index 7862c5792a2d10afe20ec4588ba53b921df3e784..7996c4dee2c098fc6cfa304960605302fe46a14b 100644 --- a/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m +++ b/XFFruit/ViewControllers/Purchase/Controllers/NewPurchaseViewController.m @@ -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{ diff --git a/XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h b/XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h index b7c2b86712eae50061f04ff9e478406b0945a71d..a1d0421f39f38261ad1d5493c059cf024c7ab043 100644 --- a/XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h +++ b/XFFruit/ViewControllers/Purchase/Models/PurchaseBill.h @@ -38,4 +38,5 @@ @property (nonatomic, strong) NSString *purchaserCode;//采è´å‘˜ä»£ç @property (nonatomic,strong)NSArray *products; +@property (strong, nonatomic) NSArray *accountDetails; @end