bug fix

HDMall.xcodeproj/project.pbxproj

@@ -81,6 +81,7 @@
 		8F973C271F21FD54003D3ADB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F973BF01F21F6DD003D3ADB /* Main.storyboard */; };
 		8F973C321F21FE32003D3ADB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F973C2F1F21FE32003D3ADB /* AppDelegate.m */; };
 		8F973C341F21FE32003D3ADB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F973C301F21FE32003D3ADB /* main.m */; };
+		8FED0FB41F38602F004916CC /* AboutTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FED0FB31F38602F004916CC /* AboutTableViewController.m */; };
 		8FEF5E641F285E56001496E3 /* CALayer+Addtions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FEF5E481F285E56001496E3 /* CALayer+Addtions.m */; };
 		8FEF5E661F285E56001496E3 /* ChineseLogHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FEF5E4A1F285E56001496E3 /* ChineseLogHelper.m */; };
 		8FEF5E6A1F285E56001496E3 /* MBProgressHUD+Addtions.m in Sources */ = {isa = PBXBuildFile; fileRef = 8FEF5E4E1F285E56001496E3 /* MBProgressHUD+Addtions.m */; };
@@ -266,6 +267,8 @@
 		8F973C2E1F21FE32003D3ADB /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		8F973C2F1F21FE32003D3ADB /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		8F973C301F21FE32003D3ADB /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		8FED0FB21F38602F004916CC /* AboutTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutTableViewController.h; sourceTree = "<group>"; };
+		8FED0FB31F38602F004916CC /* AboutTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutTableViewController.m; sourceTree = "<group>"; };
 		8FEF5E471F285E56001496E3 /* CALayer+Addtions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CALayer+Addtions.h"; sourceTree = "<group>"; };
 		8FEF5E481F285E56001496E3 /* CALayer+Addtions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CALayer+Addtions.m"; sourceTree = "<group>"; };
 		8FEF5E491F285E56001496E3 /* ChineseLogHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChineseLogHelper.h; sourceTree = "<group>"; };
@@ -929,6 +932,8 @@
 		8F973C171F21FB77003D3ADB /* ViewControllers */ = {
 			isa = PBXGroup;
 			children = (
+				8FED0FB21F38602F004916CC /* AboutTableViewController.h */,
+				8FED0FB31F38602F004916CC /* AboutTableViewController.m */,
 				8F1040B61F25C8A000B4C16E /* MineTableViewController.h */,
 				8F1040B71F25C8A000B4C16E /* MineTableViewController.m */,
 			);
@@ -1231,6 +1236,7 @@
 				8F4BFCD31F2EF543003EA16B /* SaleInputListViewController.m in Sources */,
 				8F250D311F297DA80031B4BC /* XWCircleSpreadAnimator.m in Sources */,
 				8F1040C71F25CA1800B4C16E /* BusinessCollectionViewController.m in Sources */,
+				8FED0FB41F38602F004916CC /* AboutTableViewController.m in Sources */,
 				8F250D411F297DA80031B4BC /* XWCoolAnimator.m in Sources */,
 				8F4BFCE21F2F02CB003EA16B /* SaleInputTopView.m in Sources */,
 				8FEF5E721F285E56001496E3 /* NSString+Additions.m in Sources */,
@@ -1420,9 +1426,9 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/HDMall/HDMall_TEST.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomoretech.HDMall.zj;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.hdmall;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "\"${PODS_ROOT}/**";
 			};
@@ -1441,9 +1447,9 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/HDMall/HDMall_TEST.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.gomoretech.HDMall.zj;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.hdmall;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "\"${PODS_ROOT}/**";
 			};

HDMall/CodeClass/Business/SaleInput/SaleInput.storyboard

@@ -301,7 +301,7 @@
                                                     <constraint firstAttribute="width" constant="10" id="lkK-6z-8HF"/>
                                                 </constraints>
                                             </imageView>
-                                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NOi-wj-KWg">
+                                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NOi-wj-KWg" customClass="DatePickerTextField">
                                                 <rect key="frame" x="114" y="0.0" width="237" height="40"/>
                                                 <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <color key="textColor" red="1" green="0.9999405146" blue="0.99998033050000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -829,7 +829,7 @@
                                                     <constraint firstAttribute="width" constant="10" id="vXO-2s-MFG"/>
                                                 </constraints>
                                             </imageView>
-                                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wjM-gK-Lex">
+                                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wjM-gK-Lex" customClass="DatePickerTextField">
                                                 <rect key="frame" x="114" y="0.0" width="237" height="40"/>
                                                 <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <color key="textColor" red="1" green="0.9999405146" blue="0.99998033050000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

HDMall/CodeClass/Business/SaleInput/ViewControllers/SaleInputAddViewController.h

@@ -21,4 +21,7 @@
 @property (weak, nonatomic) IBOutlet UIButton *btnBottom;
 @property (strong, nonatomic) SaleInputViewModel *viewModel;
 @property (weak, nonatomic) IBOutlet SaleInputTopView *topView;
+
+- (void)httpPayments;
+- (void)allInputMoney;
 @end

HDMall/CodeClass/Business/SaleInput/ViewControllers/SaleInputAddViewController.m

@@ -21,10 +21,7 @@
     UIBarButtonItem *rightBtn = [[UIBarButtonItem alloc] initWithTitle:@"历史查询" style:UIBarButtonItemStylePlain target:self action:@selector(actionGoHistory)];
     self.navigationItem.rightBarButtonItem = rightBtn;
     
-    WS(weakSelf);
-    [self.viewModel httpAllPayments:^(BOOL isSuccess) {
-        [weakSelf.tableView reloadData];
-    }];
+    [self httpPayments];
 }
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
@@ -95,7 +92,11 @@
 }
 
 - (void)httpPayments {
-    
+    WS(weakSelf);
+    [self.viewModel httpAllPayments:^(BOOL isSuccess) {
+        [weakSelf.tableView reloadData];
+        [weakSelf.topView httpToDayData];
+    }];
 }
 
 #pragma mark - actions
@@ -104,11 +105,17 @@
     self.viewModel.request.saleCount = @(self.totalView.textFieldBillCount.text.integerValue);
     self.viewModel.request.contract = self.topView.contract;
     WS(weakSelf);
-    [self.viewModel httpSubmit:^(BOOL isSuccess) {
+    //赋值
+    kCanNotBeNil(self.viewModel.request.contract, @"请选择合同");
+    
+    [self alertTitle:@"温馨提示" msg:@"确认提交？" okAction:^(UIAlertAction * _Nullable action) {
+        [weakSelf.viewModel httpSubmit:^(BOOL isSuccess) {
             if (isSuccess) {
                 [weakSelf.navigationController popViewControllerAnimated:YES];
             }
         }];
+        
+    } cancelAction:nil];
 }
 
 /**

HDMall/CodeClass/Business/SaleInput/ViewControllers/SaleInputDetailViewController.m

@@ -36,10 +36,16 @@
     
     self.totalView.textFieldBillCount.text = self.viewModel.detail.saleCount.stringValue;
     [self.topView.btnStore setTitle:self.viewModel.detail.contract.name forState:UIControlStateNormal];
-    self.topView.textFieldDate.text = [self.viewModel.detail.saleDate substringToIndex:11];
+    self.topView.textFieldDate.text = self.viewModel.detail.saleDate;
+    [self allInputMoney];
+    [self.topView httpToDayData];
     [self.tableView reloadData];
 }
 
+- (void)httpPayments {
+    CLog(@"空实现父类httpPayments方法");
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

HDMall/CodeClass/Business/SaleInput/ViewModels/SaleInputViewModel.h

@@ -32,8 +32,6 @@ typedef NS_ENUM(NSInteger, SaleInputType) {
  */
 - (void)httpAllPayments:(blockCallBack)callBack;
 
-- (void)httpUpload;
-
 - (void)httpSubmit:(blockCallBack)callBack;
 
 - (void)httpDetailWithUuid:(NSString *)uuid callBack:(blockCallBack)callBack;

HDMall/CodeClass/Business/SaleInput/ViewModels/SaleInputViewModel.m

@@ -37,12 +37,8 @@
 }
 
 - (void)httpSubmit:(blockCallBack)callBack {
-    //赋值
-    kCanNotBeNil(self.request.contract, @"请选择合同");
-    
     self.request.oper = AppGlobal.user.code;
     self.request.store = [HMSaleInputDetail_store modelWithDic:AppGlobal.user.store.toDictionary];
-//    self.request.tenant = [HMSaleInputDetail_tenant modelWithDic:AppGlobal.user.tenant.toDictionary];
     self.request.receiver = @"contract";
     self.request.balance = false;
     self.request.saleDate = [[NSDate date] yearMonthDayString];
@@ -88,7 +84,18 @@
     [ZJHttpManager GET:url parameters:nil complete:^(id responseObject, NSError *error) {
         if (kIsResponse) {
             self.detail = [HMSaleInputDetail modelWithDic:responseObject[@"data"]];
+            //支付方式列表
             self.arrPayments = self.detail.payments;
+            
+            //附件列表
+            [self.picVM.arrPics removeAllObjects];
+            for (NSString *name in self.detail.mediaFiles) {
+                NSString *url = [NSString stringWithFormat:@"%@/hdmall/media/download?moduleName=sale&num=%@&fileName=%@",REST_BASE_URL, self.detail.billNumber, name];
+                ZJBaseFileModel *file = [ZJBaseFileModel new];
+                file.fileUrl = url;
+                [self.picVM.arrPics addObject:file];
+            }
+            
             callBack(true);
         }else{
             callBack(false);

HDMall/CodeClass/Business/SaleInput/Views/SaleInputTopView.h

@@ -7,12 +7,13 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "DatePickerTextField.h"
 #import "HMSaleInputDetail.h"
 @interface SaleInputTopView : UIView
 /** 选择商铺 */
 @property (weak, nonatomic) IBOutlet UIButton *btnStore;
 /** 销售日期 */
-@property (weak, nonatomic) IBOutlet UITextField *textFieldDate;
+@property (weak, nonatomic) IBOutlet DatePickerTextField *textFieldDate;
 /** 今日累计 */
 @property (weak, nonatomic) IBOutlet UILabel *labelTodayTotal;
 //两个三角
@@ -20,4 +21,6 @@
 @property (weak, nonatomic) IBOutlet UIImageView *right2;
 @property (strong, nonatomic) HMSaleInputDetail_contract *contract;
 @property (nonatomic, copy) void (^blockDidChooseDate)(void);
+
+- (void)httpToDayData;
 @end

HDMall/CodeClass/Business/SaleInput/Views/SaleInputTopView.m

@@ -7,29 +7,26 @@
 //
 
 #import "SaleInputTopView.h"
-
+#import "CalculateHelper.h"
 @interface SaleInputTopView ()<UITextFieldDelegate>
-@property (strong, nonatomic) UIDatePicker *datePicker;
 @end
 @implementation SaleInputTopView
 
 - (void)awakeFromNib {
     [super awakeFromNib];
-//    if (kUser.isTenant) {
-//        self.btnStore.userInteractionEnabled = NO;
-//        self.right1.hidden = YES;
-//    }
-    self.datePicker = [[UIDatePicker alloc] initWithFrame:CGRectMake(0, 0, kWidth, 216)];
-    self.datePicker.maximumDate = [NSDate date];
-    self.textFieldDate.inputView = self.datePicker;
-    self.textFieldDate.delegate = self;
-    self.datePicker.datePickerMode = UIDatePickerModeDate;
-    self.textFieldDate.text = [self.datePicker.date yearMonthDayString];
-}
-
-- (void)textFieldDidEndEditing:(UITextField *)textField {
-    self.textFieldDate.text = [self.datePicker.date yearMonthDayString];
-    self.blockDidChooseDate();
+    if (!AppGlobal.isMall) {
+        self.btnStore.userInteractionEnabled = NO;
+        self.right1.hidden = YES;
+        UserInfo_contracts *contract = AppGlobal.user.contracts[0];
+        self.contract = [HMSaleInputDetail_contract modelWithDic:contract.toDictionary];
+        [self.btnStore setTitle:contract.name forState:UIControlStateNormal];
+    }
+    self.textFieldDate.type = DateTextFieldYearMonthDay;
+    self.textFieldDate.rangeType = DateTextFieldRangeBefore;
+    WS(weakSelf);
+    self.textFieldDate.blockEndEdit = ^{
+            [weakSelf httpToDayData];
+    };
 }
 
 - (IBAction)actionContract:(id)sender {
@@ -37,6 +34,7 @@
         UserInfo_contracts *contract = AppGlobal.user.contracts[0];
         self.contract = [HMSaleInputDetail_contract modelWithDic:contract.toDictionary];
         [self.btnStore setTitle:contract.name forState:UIControlStateNormal];
+        [self httpToDayData];
     }else{
         UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"选择合同" message:nil preferredStyle:(UIAlertControllerStyleAlert)];
         
@@ -44,6 +42,7 @@
             UIAlertAction *action = [UIAlertAction actionWithTitle:contract.name style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                 self.contract = [HMSaleInputDetail_contract modelWithDic:contract.toDictionary];
                 [self.btnStore setTitle:contract.name forState:UIControlStateNormal];
+                [self httpToDayData];
             }];
             [alert addAction:action];
         }
@@ -55,5 +54,31 @@
     }
 }
 
+/**
+ *  获取今日的销售录入数据
+ */
+- (void)httpToDayData {
+    kCanNotBeNil(self.contract.uuid, @"请选择合同！");
+    NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys:self.contract.uuid, @"contract", [NSDictionary dictionaryWithObjectsAndKeys:[self.textFieldDate.text stringByAppendingString:@" 00:00:00"], @"beginDate", [self.textFieldDate.text stringByAppendingString:@" 23:59:59"], @"endDate", nil], @"dateRange", nil];
+    [MBProgressHUD j_loading];
+    WS(weakSelf);
+    [ZJHttpManager POST:@"hdmall/salesinput/getSalesTotal" parameters:params complete:^(id responseObject, NSError *error) {
+        [MBProgressHUD j_hideLoadingView];
+        if (kIsResponse) {
+            NSArray *data = responseObject[@"data"];
+            
+            if (IsNotNullObject(data) && data.count > 0) {
+                NSDictionary *record = data[0];
+                weakSelf.labelTodayTotal.text = [CalculateHelper getMoneyStringFrom:record[@"total"]];
+            } else {
+                //没有查到数据，默认显示0
+                weakSelf.labelTodayTotal.text = @"0";
+            }
+        } else {
+            kFalseHttpTips;
+        }
+    }];
+}
+
 
 @end

HDMall/CodeClass/Login/ViewControllers/LoginViewController.m

@@ -63,7 +63,10 @@
     self.viewModel.loginRequest.type = AppGlobal.isMall ? LoginTypeMall : LoginTypeTenant;
     WS(weakSelf);
     [self.viewModel login:^(id responseObject, NSError *error) {
-        [MBProgressHUD j_hideLoadingView];
+//        [MBProgressHUD j_hideLoadingView];
+        [MBProgressHUD j_success:@"登录成功！" complete:^{
+            [weakSelf.viewModel openMain];
+        }];
         AppGlobal.savedPWD = weakSelf.textFieldPWD.text;
         AppGlobal.savedName = weakSelf.textFieldName.text;
         [AppGlobal saveBaseInfo];

HDMall/CodeClass/Login/ViewModels/LoginViewModel.h

@@ -15,5 +15,8 @@
 - (void)login:(void (^)(id responseObject, NSError *error))complete;
 
 - (void)open:(UIViewController *)viewController;
+/** 到登录界面 */
 - (void)openLogin;
+/** 到主界面 */
+- (void)openMain;
 @end

HDMall/CodeClass/Login/ViewModels/LoginViewModel.m

@@ -18,7 +18,6 @@
             AppGlobal.user = [UserInfo modelWithDic:responseObject[@"data"]];
             
             complete(responseObject, error);
-            [weakSelf openMain];
         }else{
             kFalseHttpTips;
         }

HDMall/CodeClass/Mine/ViewControllers/AboutTableViewController.h

+//
+//  AboutTableViewController.h
+//  RealEstateManagement
+//
+//  Created by Z on 16/6/29.
+//  Copyright © 2016年 上海勾芒信息科技. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AboutTableViewController : UITableViewController
+
+@end

HDMall/CodeClass/Mine/ViewControllers/AboutTableViewController.m

+//
+//  AboutTableViewController.m
+//  RealEstateManagement
+//
+//  Created by Z on 16/6/29.
+//  Copyright © 2016年 上海勾芒信息科技. All rights reserved.
+//
+
+#import "AboutTableViewController.h"
+
+@interface AboutTableViewController ()
+@property (weak, nonatomic) IBOutlet UILabel *labelAppName;
+@property (weak, nonatomic) IBOutlet UILabel *labelVersion;
+@property (weak, nonatomic) IBOutlet UILabel *labelMobile;
+@property (weak, nonatomic) IBOutlet UIImageView *imgTop;
+
+@end
+
+@implementation AboutTableViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.imgTop.image = APP_ICON;
+    self.labelAppName.text = APP_NAME;
+    self.labelVersion.text = APP_VERSION;
+    self.labelMobile.text = APP_MOBILE;
+    CLog(@"%@",APP_NAME);
+    
+    //版权信息
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, kHeight - 50 - 64, kWidth, 30)];
+    label.font = [UIFont systemFontOfSize:15];
+    label.textAlignment = NSTextAlignmentCenter;
+    label.text = APP_COPYRIGHT;
+    [self.tableView addSubview:label];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    if (indexPath.row == 1) {
+        UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"拨打电话？" message:APP_MOBILE preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertAction *okActtion= [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            [[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"tel://%@", APP_MOBILE]]];
+        }];
+        UIAlertAction *cancelACtion = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:nil];
+        [alertVC addAction:okActtion];
+        [alertVC addAction:cancelACtion];
+        [self presentViewController:alertVC animated:YES completion:nil];
+    }
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+
+
+
+/*
+// Override to support editing the table view.
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (editingStyle == UITableViewCellEditingStyleDelete) {
+        // Delete the row from the data source
+        [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
+    } else if (editingStyle == UITableViewCellEditingStyleInsert) {
+        // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view
+    }   
+}
+*/
+
+/*
+// Override to support rearranging the table view.
+- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
+}
+*/
+
+/*
+// Override to support conditional rearranging of the table view.
+- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
+    // Return NO if you do not want the item to be re-orderable.
+    return YES;
+}
+*/
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

HDMall/Supporting Files/Assets.xcassets/progressHud/Checkmark.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Checkmark.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Checkmark@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Checkmark@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

HDMall/Supporting Files/Assets.xcassets/progressHud/Contents.json

+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

HDMall/Supporting Files/Assets.xcassets/progressHud/cross.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "图层-0.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "图层-0@2x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

HDMall/Tools/BaseClass/ZJBaseFileModel.h

@@ -22,6 +22,8 @@
 
 @property (nonatomic, strong)  NSString <Ignore>  * localPath;
 
+@property (nonatomic, strong)  NSString <Ignore>  * fileUrl;
+
 @property (strong, nonatomic) UIImage <Ignore> * image;
 
 @property (strong, nonatomic) NSData <Ignore> * data;

HDMall/Tools/BaseClass/ZJBaseFileModel.m

@@ -42,9 +42,11 @@
         cache = [NSCache new];
     });
     
-    NSString *url = [cache objectForKey:self.idField];
     
-    if (url) {
+    NSString *url = [cache objectForKey:self.idField];
+    if (self.fileUrl) {
+        fileUrl(self.fileUrl);
+    }else if (url) {
         fileUrl(url);
     }else {
 //        [kHttp getAttachmentWithId:self.idField

HDMall/Tools/PictureTableViewCell/RepairAddPicCollectionViewCell.m

@@ -10,6 +10,7 @@
 #import "ZJBaseFileModel.h"
 @implementation RepairAddPicCollectionViewCell
 - (void)awakeFromNib {
+    [super awakeFromNib];
   self.layer.borderColor = [UIColor colorWithWhite:0.902 alpha:1.000].CGColor;
   self.layer.borderWidth = 1;
   UILongPressGestureRecognizer *longPress =

Podfile

@@ -16,6 +16,7 @@ abstract_target 'hdmall_base' do
     pod 'JSONKit-NoWarning', '~> 1.2'
     pod 'RadioButton'
     pod 'TZImagePickerController', '~> 1.8.4'
+    pod 'DatePickerTextField', '~> 1.0.2'
 #  target 'HDMall' do
 #  end
   target 'HDMall_TEST' do

Podfile.lock

@@ -14,6 +14,7 @@ PODS:
   - AFNetworking/Serialization (3.0.4)
   - AFNetworking/UIKit (3.0.4):
     - AFNetworking/NSURLSession
+  - DatePickerTextField (1.0.2)
   - DZNEmptyDataSet (1.8.1)
   - FDFullscreenPopGesture (1.1)
   - IQKeyboardManager (4.0.10)
@@ -30,6 +31,7 @@ PODS:
 
 DEPENDENCIES:
   - AFNetworking (~> 3.0.4)
+  - DatePickerTextField (~> 1.0.2)
   - DZNEmptyDataSet
   - FDFullscreenPopGesture (= 1.1)
   - IQKeyboardManager (~> 4.0.6)
@@ -44,6 +46,7 @@ DEPENDENCIES:
 
 SPEC CHECKSUMS:
   AFNetworking: a0075feb321559dc78d9d85b55d11caa19eabb93
+  DatePickerTextField: e04e071ba02d0ee3ce61b74e1a38456e7d186f4b
   DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
   FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
   IQKeyboardManager: 593ee99b88381f4b9ccb22bd680f22606351bd41
@@ -56,6 +59,6 @@ SPEC CHECKSUMS:
   TZImagePickerController: 612c79b572efd0363c7a966daad7a974c2d6b458
   UMengAnalytics-NO-IDFA: 16666e32edce5be44ae5b14aaaa7f3582e09d6ab
 
-PODFILE CHECKSUM: c017ac8a85d92e34ba60fa747d2d9eca3dd63550
+PODFILE CHECKSUM: 73b43da2a716dd5e9a55324f12be10d233ee9633
 
 COCOAPODS: 1.2.1