bug fix

ALand.xcodeproj/project.pbxproj

@@ -2920,7 +2920,7 @@
 			baseConfigurationReference = AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = Aland/PrefixHeader.pch;

ALand/CodeClass/Home/View/Order/OrderDetailBottomView.m

@@ -40,6 +40,10 @@
     self.height = self.viewRemark.bottom + 163;
 }
 
+- (void)layoutSubviews {
+    
+}
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

ALand/CodeClass/Home/View/Order/OrderDetailBottomView.xib

@@ -11,8 +11,8 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="337"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RJv-jW-sXA">
-                    <rect key="frame" x="0.0" y="164" width="320" height="195"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RJv-jW-sXA">
+                    <rect key="frame" x="0.0" y="164" width="320" height="173"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FNl-YE-JKf">
                             <rect key="frame" x="0.0" y="8" width="320" height="30"/>
@@ -131,8 +131,8 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Ej-sj-xdJ">
                             <rect key="frame" x="0.0" y="0.0" width="320" height="30"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="商品金额：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N4g-xA-5Vq">
-                                    <rect key="frame" x="20" y="5" width="85" height="21"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="商品金额：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N4g-xA-5Vq">
+                                    <rect key="frame" x="20" y="5" width="80" height="20"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
@@ -156,8 +156,8 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="03T-0h-Ufa">
                             <rect key="frame" x="0.0" y="30" width="320" height="30"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="运费：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="upY-P3-t4v">
-                                    <rect key="frame" x="20" y="5" width="85" height="21"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="运费：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="upY-P3-t4v">
+                                    <rect key="frame" x="20" y="5" width="48" height="20"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
@@ -187,8 +187,8 @@
                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="￥827" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wye-4u-nVq">
-                                    <rect key="frame" x="253" y="5" width="47" height="21"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥827" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wye-4u-nVq">
+                                    <rect key="frame" x="255" y="5" width="45" height="20"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
@@ -297,7 +297,7 @@
                 <outlet property="labelTotal" destination="VEX-fb-el0" id="AbW-N5-hm8"/>
                 <outlet property="viewRemark" destination="CoV-Us-WDw" id="JZe-Oc-FgW"/>
             </connections>
-            <point key="canvasLocation" x="236" y="-72.5"/>
+            <point key="canvasLocation" x="44" y="-89.5"/>
         </view>
     </objects>
 </document>

ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.h

@@ -7,8 +7,9 @@
 //
 
 #import <UIKit/UIKit.h>
-
 @interface NoPaymentTableViewController : UITableViewController
 @property (nonatomic, copy) NSString *orderTag;
+@property (nonatomic, assign) BOOL isFirstLoaded;
 
+- (void)setUpData;
 @end

ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.m

@@ -31,7 +31,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+    self.isFirstLoaded = YES;
     [self.tableView registerNib:[UINib nibWithNibName:@"OrderDetailTableViewCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:kCellId];
     [self.tableView registerNib:[UINib nibWithNibName:@"OrderListHeaderView" bundle:nil] forHeaderFooterViewReuseIdentifier:kHeaderID];
     [self.tableView registerNib:[UINib nibWithNibName:@"OrderListFooterView" bundle:nil] forHeaderFooterViewReuseIdentifier:kFooterID];
@@ -40,6 +40,7 @@
     WS(weakSelf)
     self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
         weakSelf.page = 0;
+        [MBProgressHUD showHUDAddedTo:kWindow animated:YES];
         [weakSelf.arrDatas removeAllObjects];
         [weakSelf setUpData];
     }];
@@ -48,7 +49,7 @@
         self.page += 1;
         [weakSelf setUpData];
     }];
-    [self setUpData];
+//    [self setUpData];
 
 }
 - (NSMutableArray *)arrDatas {
@@ -59,8 +60,11 @@
 }
 
 - (void)setUpData {
+    self.isFirstLoaded = NO;
     WS(weakSelf)
     [[HTTPCilent shareCilent] POST:@"order/query" parameters:[self getParams] success:^(NSURLSessionDataTask *task, id responseObject) {
+        [MBProgressHUD hideHUDForView:kWindow];
+        
         for (NSDictionary *dic in responseObject[@"queryResult"]) {
             JavenOrderModel *model = [JavenOrderModel modelObjectWithDictionary:dic];
             [weakSelf.arrDatas addObject:model];
@@ -79,7 +83,8 @@
         }
         
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
-        
+        [weakSelf.tableView.mj_header endRefreshing];
+        [weakSelf.tableView.mj_footer endRefreshing];
     }];
     
     
@@ -161,7 +166,6 @@
     
 }
 
-
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
     OrderDetailViewController *orderDetailVC = [[OrderDetailViewController alloc] init];
     if ([self.title isEqualToString:@"代支付"]) {
@@ -177,7 +181,7 @@
     }
     
     orderDetailVC.isShowNavigationBar = YES;
-    orderDetailVC.model = self.arrDatas[indexPath.row];
+    orderDetailVC.model = self.arrDatas[indexPath.section];
     [self.navigationController pushViewController:orderDetailVC animated:YES];
 }
 

ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.m

@@ -112,6 +112,7 @@
     OrderDetailTableViewCell *cell = (OrderDetailTableViewCell *)[tableView cellForRowAtIndexPath:indexPath];
     detailVC.image = cell.imgCommdity.image;
     detailVC.model = model;
+    detailVC.isShowNavigationBar = NO;
     [self.navigationController pushViewController:detailVC animated:YES];
 }
 

ALand/CodeClass/Home/ViewController/Order/OrderViewController.m

@@ -9,6 +9,7 @@
 #import "OrderViewController.h"
 #import "JavenMultipleViewWithHeader.h"
 #import "NoPaymentTableViewController.h"
+#import "MJRefresh.h"
 @interface OrderViewController ()
 @property (nonatomic, strong) JavenMultipleViewWithHeader *viewMutiple;
 @end
@@ -55,9 +56,9 @@
         NoPaymentTableViewController *noPayMentVC = [[NoPaymentTableViewController alloc] initWithStyle:UITableViewStyleGrouped];
         noPayMentVC.orderTag = arrTitle[i];
         [arrVC addObject:noPayMentVC];
+        if (i == 0) [noPayMentVC.tableView.mj_header beginRefreshing];
     }
 
-    
     _viewMutiple = [[JavenMultipleViewWithHeader alloc] initWithFrame:CGRectMake(0, 0, kWidth, kHeight)
                                                                 views:arrVC
                                                                titles:arrTitle
@@ -68,6 +69,10 @@
                                                       backgroundColor:kBacroundColor
                                                           titleHeight:40
                                                         titleBtnWidth:kWidth / arrTitle.count];
+    
+    _viewMutiple.getCurrentBlock = ^(NoPaymentTableViewController *vc){
+        [vc.tableView.mj_header beginRefreshing];
+    };
     [self.view addSubview:_viewMutiple];
     
 }

ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.m

@@ -264,6 +264,7 @@
 - (IBAction)shopIntroduction:(id)sender {
     introductionViewController *introVC = [[introductionViewController alloc] initWithNibName:@"introductionViewController" bundle:nil];
     introVC.isShowNavigationBar = YES;
+    introVC.title = @"店铺简介";
     introVC.shopModel = self.shopModel;
     [self.navigationController pushViewController:introVC animated:YES];
 }

ALand/CodeClass/Login/NextResetPasswordViewController.m

@@ -22,17 +22,23 @@
     [super viewDidLoad];
     self.isPasswordVisible = NO;
     self.navigationItem.title = @"重置密码";
-    [self.sendCode startWithTime:60 title:@"重新发送" countDownTitle:@"s" mainColor:nil countColor:nil mainTitleColor:[UIColor colorWithHexString:@"51B2F6"] countTitleColor:[UIColor colorWithHexString:@"888888"]];
+    [self.sendCode startWithTime:60 title:@"重新发送" countDownTitle:@"秒" mainColor:nil countColor:nil mainTitleColor:[UIColor colorWithHexString:@"51B2F6"] countTitleColor:[UIColor colorWithHexString:@"888888"]];
     // Do any additional setup after loading the view from its nib.
 }
 - (IBAction)sendCodeAction:(UIButton *)sender {
-    [self.sendCode startWithTime:60 title:@"重新发送" countDownTitle:@"s" mainColor:nil countColor:nil mainTitleColor:[UIColor colorWithHexString:@"51B2F6"] countTitleColor:[UIColor colorWithHexString:@"888888"]];
+    [self.sendCode startWithTime:60 title:@"重新发送" countDownTitle:@"秒" mainColor:nil countColor:nil mainTitleColor:[UIColor colorWithHexString:@"51B2F6"] countTitleColor:[UIColor colorWithHexString:@"888888"]];
     
 }
 
 //确定
 - (IBAction)confirmAction:(UIButton *)sender {
     
+    if (self.password.text.length < 6 || self.password.text.length > 12) {
+        [MBProgressHUD Javen_showError:@"密码长度6~12位" onView:kWindow delay:0.5 complete:nil];
+        return;
+    }
+    
+    
     NSDictionary *params = @{@"domain" : kDomain,
                                    @"mobilephone" : self.mobilePhone,
                                    @"smsCode" : self.labelCode.text,

ALand/CodeClass/Login/ResetPasswordViewController.m

@@ -49,6 +49,8 @@
                 nextVC.isShowNavigationBar = YES;
                 nextVC.mobilePhone = weakSelf.phoneNumber.text;
                 [weakSelf.navigationController pushViewController:nextVC animated:YES];
+            }else{
+                [MBProgressHUD Javen_showError:responseObject[@"message"] onView:kWindow delay:2 complete:nil];
             }
         } failure:^(NSURLSessionDataTask *task, NSError *error) {
             

ALand/CodeClass/Login/RigistViewController.m

@@ -69,7 +69,7 @@
     
     [[HTTPCilent shareCilent] GET:@"app/sendSms" parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
         CLog(@"------->发送验证码");
-        [weakSelf.sendCodeBtn startWithTime:60 title:@"发送验证码" countDownTitle:@"s" mainColor:nil countColor:nil mainTitleColor:[UIColor colorWithHexString:@"51B2F6"] countTitleColor:[UIColor colorWithHexString:@"888888"]];
+        [weakSelf.sendCodeBtn startWithTime:60 title:@"发送验证码" countDownTitle:@"秒" mainColor:nil countColor:nil mainTitleColor:[UIColor colorWithHexString:@"51B2F6"] countTitleColor:[UIColor colorWithHexString:@"888888"]];
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
         
     }];

ALand/CodeClass/MIne/ViewController/ChangePasswordViewController.m

@@ -31,6 +31,12 @@
 }
 
 - (IBAction)actionChangePassword:(id)sender {
+    
+    if (self.labelNewPassword.text.length < 6 || self.labelNewPassword.text.length > 12) {
+        [MBProgressHUD Javen_showError:@"密码长度6~12位" onView:kWindow delay:0.5 complete:nil];
+        return;
+    }
+    
     UserInfo *info = [UserInfo shareInstance];
     [MBProgressHUD Javen_showMessage:@"修改中" onView:self.view];
     NSDictionary *params = @{@"operCtx" : [info getOperCtx],

ALand/General/Categories/MBProgressHUD+Javen.m

@@ -138,6 +138,7 @@
 
 + (MBProgressHUD *)Javen_showSuccess:(NSString *)success onView:(UIView *)view delay:(NSTimeInterval)time complete:(void (^)(void))complete
 {
+    [kWindow endEditing:YES];
     MBProgressHUD *hud = [[MBProgressHUD alloc] initWithView:view];
     [view addSubview:hud];
     

ALand/General/JavenMultipleViewWithHeader.h

@@ -7,8 +7,10 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "NoPaymentTableViewController.h"
+typedef void(^currentVCBlock)(NoPaymentTableViewController *);
 @interface JavenMultipleViewWithHeader : UIView<UIScrollViewDelegate>
+@property (nonatomic, copy) currentVCBlock getCurrentBlock;
 
 
 - (instancetype)initWithFrame:(CGRect)frame views:(NSArray *)views titles:(NSArray *)titles target:(id)target selectTextColor:(UIColor *)selectTextColor selectBackgroundColor:(UIColor *)selectBackgroundColor textColor:(UIColor *)textColor backgroundColor:(UIColor *)abackgroundColor titleHeight:(CGFloat)height titleBtnWidth:(CGFloat)width;

ALand/General/JavenMultipleViewWithHeader.m

@@ -7,7 +7,7 @@
 //
 
 #import "JavenMultipleViewWithHeader.h"
-
+#import "MJRefresh.h"
 
 
 @interface JavenMultipleViewWithHeader ()
@@ -25,10 +25,10 @@
 @property (nonatomic, strong) UIColor *normalColor;
 @property (nonatomic, assign) CGFloat titleButtonWith;
 @property (nonatomic, assign) CGFloat titleScrollViewHeight;
-
 @property (nonatomic, strong) UIView *bottomFlowView;
 
 
+
 @end
 
 
@@ -66,10 +66,6 @@
         [self addSubview:viewLineBottom];
         viewLineBottom.sd_layout.leftEqualToView(self).rightEqualToView(self).bottomEqualToView(titleScrollView).heightIs(1);
         
-        
-
-        
-        
         _buttonArr = [NSMutableArray array];
         for (int i = 0; i < titles.count; i++) {
             UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -122,54 +118,57 @@
 
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
     if (scrollView.tag == 111001) {
-        NSLog(@"%f",scrollView.contentOffset.y);
+        NSInteger currentIndex = [[NSNumber numberWithFloat:scrollView.contentOffset.x / self.frame.size.width] integerValue];
+        CLog(@"%ld",(long)currentIndex);
         
-        for (UIButton *btn in _buttonArr) {
-            if (btn.tag == scrollView.contentOffset.x / self.frame.size.width + 11100) {
-                [btn setTitleColor:_selectTextColor forState:UIControlStateNormal];
-                btn.backgroundColor = _selectBackgroundColor;
+        [self animateWithIndex:currentIndex];
+
+    }
+}
+
+- (void)changeToSelectedView:(UIButton *)btn {
     WS(weakSelf)
     [UIView animateWithDuration:0.3 animations:^{
         weakSelf.bottomFlowView.centerX = btn.centerX;
     }];
+    NSInteger currentIndex = btn.tag - 11100;
+    [_viewScrollView setContentOffset:CGPointMake(currentIndex * self.frame.size.width, 0) animated:YES];
 
-            }else{
-                 [btn setTitleColor:_textColor forState:UIControlStateNormal];
-                btn.backgroundColor = _abackgroundColor;
-            }
-        }
-    }
+    [self animateWithIndex:currentIndex];
 }
 
-- (void)changeToSelectedView:(UIButton *)btn {
-    for (UIButton *button in _buttonArr) {
-        button.backgroundColor = _abackgroundColor;
-        [button setTitleColor:_textColor forState:UIControlStateNormal];
 
+- (void)animateWithIndex:(NSInteger)index {
+    NoPaymentTableViewController *noVC = self.viewArr[index];
+    if (noVC.isFirstLoaded){
+        [noVC.tableView.mj_header beginRefreshing];
     }
     
+    for (UIButton *btn in _buttonArr) {
+        if (btn.tag == index + 11100) {
+            [btn setTitleColor:_selectTextColor forState:UIControlStateNormal];
+            btn.backgroundColor = _selectBackgroundColor;
             WS(weakSelf)
             [UIView animateWithDuration:0.3 animations:^{
                 weakSelf.bottomFlowView.centerX = btn.centerX;
             }];
             
-    [btn setBackgroundColor:_selectBackgroundColor];
-    [btn setTitleColor:_selectTextColor forState:UIControlStateNormal];
-    
+        }else{
+            [btn setTitleColor:_textColor forState:UIControlStateNormal];
+            btn.backgroundColor = _abackgroundColor;
+        }
+    }
 
-    NSInteger currentIndex = btn.tag - 11100;
-    //_viewScrollView.contentOffset = CGPointMake(currentIndex * self.frame.size.width, 0);
-    [_viewScrollView setContentOffset:CGPointMake(currentIndex * self.frame.size.width, 0) animated:YES];
 }
 
 
 
 /*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
+ // Only override drawRect: if you perform custom drawing.
+ // An empty implementation adversely affects performance during animation.
+ - (void)drawRect:(CGRect)rect {
  // Drawing code
-}
-*/
+ }
+ */
 
 @end

ALand/Macro/UrlHeader.h

@@ -9,7 +9,7 @@
 #ifndef UrlHeader_h
 #define UrlHeader_h
 
-#define REST_BASE_URL @"http://service.bloem.cn/aland-server/rest"
+#define REST_BASE_URL @"http://139.196.195.30:8080/aland-server/rest"
 #define kDomain @"0001" //组织代码