修改左侧用户名显示样式

Car/Base.lproj/Main.storyboard

@@ -19,49 +19,33 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <view key="tableHeaderView" contentMode="scaleToFill" id="ruX-KL-B7N">
-                            <rect key="frame" x="0.0" y="0.0" width="375" height="220"/>
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="193"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="leftvc_user_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="1wJ-ii-sbY">
-                                    <rect key="frame" x="16" y="100" width="60" height="60"/>
+                                    <rect key="frame" x="16" y="86.5" width="60" height="60"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="60" id="AiL-g0-lqH"/>
                                         <constraint firstAttribute="height" constant="60" id="YUI-gE-mOJ"/>
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张小凡[2002]" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p2d-5s-Jvt">
-                                    <rect key="frame" x="92" y="100" width="110.5" height="21"/>
+                                    <rect key="frame" x="92" y="106" width="110.5" height="21"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="psF-nB-Uu1">
-                                    <rect key="frame" x="92" y="133" width="55.5" height="22"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥128元" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pkt-Cz-bN7">
-                                    <rect key="frame" x="147.5" y="131.5" width="78" height="26"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="21"/>
-                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                             <constraints>
-                                <constraint firstItem="psF-nB-Uu1" firstAttribute="bottom" secondItem="1wJ-ii-sbY" secondAttribute="bottom" constant="-5" id="7ex-fJ-Shg"/>
-                                <constraint firstItem="p2d-5s-Jvt" firstAttribute="top" secondItem="1wJ-ii-sbY" secondAttribute="top" id="Clh-Be-AK9"/>
+                                <constraint firstItem="p2d-5s-Jvt" firstAttribute="centerY" secondItem="1wJ-ii-sbY" secondAttribute="centerY" id="NuC-OH-dhp"/>
                                 <constraint firstItem="1wJ-ii-sbY" firstAttribute="leading" secondItem="ruX-KL-B7N" secondAttribute="leading" constant="16" id="VmK-P1-Qpd"/>
-                                <constraint firstItem="psF-nB-Uu1" firstAttribute="leading" secondItem="p2d-5s-Jvt" secondAttribute="leading" id="cQY-ho-rNf"/>
                                 <constraint firstItem="1wJ-ii-sbY" firstAttribute="centerY" secondItem="ruX-KL-B7N" secondAttribute="centerY" constant="20" id="dVS-On-XV4"/>
-                                <constraint firstItem="pkt-Cz-bN7" firstAttribute="leading" secondItem="psF-nB-Uu1" secondAttribute="trailing" id="dze-3k-OMa"/>
                                 <constraint firstItem="p2d-5s-Jvt" firstAttribute="leading" secondItem="1wJ-ii-sbY" secondAttribute="trailing" constant="16" id="sua-Kq-JU5"/>
-                                <constraint firstItem="pkt-Cz-bN7" firstAttribute="centerY" secondItem="psF-nB-Uu1" secondAttribute="centerY" id="wtu-cR-Vqs"/>
                             </constraints>
                         </view>
                         <view key="tableFooterView" contentMode="scaleToFill" id="rqg-Fl-VWf" userLabel="footerView">
-                            <rect key="frame" x="0.0" y="385" width="375" height="44"/>
+                            <rect key="frame" x="0.0" y="358" width="375" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         </view>
@@ -69,7 +53,7 @@
                             <tableViewSection id="2v7-iq-Gdb">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="MNb-b0-8ld">
-                                        <rect key="frame" x="0.0" y="220" width="375" height="55"/>
+                                        <rect key="frame" x="0.0" y="193" width="375" height="55"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MNb-b0-8ld" id="e2Y-0h-fwq">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
@@ -99,7 +83,7 @@
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" rowHeight="55" id="9kl-2z-IJU">
-                                        <rect key="frame" x="0.0" y="275" width="375" height="55"/>
+                                        <rect key="frame" x="0.0" y="248" width="375" height="55"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9kl-2z-IJU" id="FuF-Rg-4nb">
                                             <rect key="frame" x="0.0" y="0.0" width="342" height="55"/>
@@ -129,7 +113,7 @@
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="55" id="iSx-hH-F0d">
-                                        <rect key="frame" x="0.0" y="330" width="375" height="55"/>
+                                        <rect key="frame" x="0.0" y="303" width="375" height="55"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iSx-hH-F0d" id="9Lp-9Y-OgP">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="55"/>
@@ -170,12 +154,11 @@
                     <connections>
                         <outlet property="imgUserIcon" destination="1wJ-ii-sbY" id="FTa-zz-1Ys"/>
                         <outlet property="labelName" destination="p2d-5s-Jvt" id="VGX-Qg-0Fa"/>
-                        <outlet property="labelScore" destination="pkt-Cz-bN7" id="fyd-R3-4T6"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="TPk-zH-0Po" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-564" y="641"/>
+            <point key="canvasLocation" x="-564" y="640.92953523238384"/>
         </scene>
         <!--Card View Controller-->
         <scene sceneID="OX6-Eb-4qg">

Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m

@@ -22,102 +22,89 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-  //设置文字和图标的颜色
-  self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
+    //设置文字和图标的颜色
+    self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
-  [super viewWillAppear:animated];
-  [self httpRequest];
-}
-
-- (void)httpRequest {
-//  NSDictionary *param = @{@"userId":kUser.fid};
-//  WS(weakSelf);
-//  [kHttp GET:kAccountGetUrl parameters:param complete:^(id  _Nullable response, NSError * _Nullable error) {
-//    if (kRsSuccess(response)) {
-//      weakSelf.acct = [[StationUserAcctEntity alloc] initWithDictionary:response[@"data"] error:nil];
-//      [weakSelf configUIWithAcct];
-//    }
-//  }];
+    [super viewWillAppear:animated];
+    [self configUIWithAcct];
 }
 
 - (void)configUIWithAcct {
-//  self.labelName.text = kUser.realName;
-//  self.labelScore.text = [CalculateHelper getMoneyStringFrom:self.acct.balance];
+    self.labelName.text = kUser.realName;
+    self.labelScore.text = nil;
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-  [tableView deselectRowAtIndexPath:indexPath animated:YES];
-  [kGlobal.sideSlipVC showMainView];
-  
-  if (indexPath.row == 0) {//核销订单
-    [self scanCard];
-    
-  }else if (indexPath.row == 1) {//修改密码
-    ModifyPswTableViewController *modifyVC = [ModifyPswTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
-    [kGlobal.mainNaVC pushViewController:modifyVC animated:YES];
-  }else if (indexPath.row == 2) {//退出登录
-    
-    [kGlobal.sideSlipVC dismissViewControllerAnimated:YES completion:nil];
-  }
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    [kGlobal.sideSlipVC showMainView];
+
+    if (indexPath.row == 0) { //核销订单
+        [self scanCard];
+
+    } else if (indexPath.row == 1) { //修改密码
+        ModifyPswTableViewController *modifyVC = [ModifyPswTableViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
+        [kGlobal.mainNaVC pushViewController:modifyVC animated:YES];
+    } else if (indexPath.row == 2) { //退出登录
+
+        [kGlobal.sideSlipVC dismissViewControllerAnimated:YES completion:nil];
+    }
 }
 
 - (void)scanCard {
-  //设置扫码区域参数
-  LBXScanViewStyle *style = [[LBXScanViewStyle alloc]init];
-  style.centerUpOffset = 44;
-  style.photoframeAngleStyle = LBXScanViewPhotoframeAngleStyle_Inner;
-  style.photoframeLineW = 2;
-  style.photoframeAngleW = 18;
-  style.photoframeAngleH = 18;
-  style.isNeedShowRetangle = YES;
-  
-  style.anmiationStyle = LBXScanViewAnimationStyle_LineMove;
-  
-  style.colorAngle = [UIColor colorWithRed:0./255 green:200./255. blue:20./255. alpha:1.0];
-  
-  
-  //qq里面的线条图片
-  UIImage *imgLine = [UIImage imageNamed:@"CodeScan.bundle/qrcode_Scan_weixin_Line"];
-  
-  // imgLine = [self createImageWithColor:[UIColor colorWithRed:120/255. green:221/255. blue:71/255. alpha:1.0]];
-  
-  style.animationImage = imgLine;
-  
-  ScanViewController *vc = [ScanViewController new];
-  vc.style = style;
-  vc.type = scanTypeCard;
-  [kGlobal.mainNaVC pushViewController:vc animated:YES];
+    //设置扫码区域参数
+    LBXScanViewStyle *style = [[LBXScanViewStyle alloc] init];
+    style.centerUpOffset = 44;
+    style.photoframeAngleStyle = LBXScanViewPhotoframeAngleStyle_Inner;
+    style.photoframeLineW = 2;
+    style.photoframeAngleW = 18;
+    style.photoframeAngleH = 18;
+    style.isNeedShowRetangle = YES;
+
+    style.anmiationStyle = LBXScanViewAnimationStyle_LineMove;
+
+    style.colorAngle = [UIColor colorWithRed:0. / 255 green:200. / 255. blue:20. / 255. alpha:1.0];
+
+    //qq里面的线条图片
+    UIImage *imgLine = [UIImage imageNamed:@"CodeScan.bundle/qrcode_Scan_weixin_Line"];
+
+    // imgLine = [self createImageWithColor:[UIColor colorWithRed:120/255. green:221/255. blue:71/255. alpha:1.0]];
+
+    style.animationImage = imgLine;
+
+    ScanViewController *vc = [ScanViewController new];
+    vc.style = style;
+    vc.type = scanTypeCard;
+    [kGlobal.mainNaVC pushViewController:vc animated:YES];
 }
 
 - (void)scanWatchCode {
-  //设置扫码区域参数
-  LBXScanViewStyle *style = [[LBXScanViewStyle alloc]init];
-  style.centerUpOffset = 44;
-  style.photoframeAngleStyle = LBXScanViewPhotoframeAngleStyle_Inner;
-  style.photoframeLineW = 2;
-  style.photoframeAngleW = 18;
-  style.photoframeAngleH = 18;
-  style.isNeedShowRetangle = YES;
-  
-  style.anmiationStyle = LBXScanViewAnimationStyle_LineMove;
-  
-  style.colorAngle = [UIColor colorWithRed:0./255 green:200./255. blue:20./255. alpha:1.0];
-  
-  
-  //qq里面的线条图片
-  UIImage *imgLine = [UIImage imageNamed:@"CodeScan.bundle/qrcode_Scan_weixin_Line"];
-  
-  // imgLine = [self createImageWithColor:[UIColor colorWithRed:120/255. green:221/255. blue:71/255. alpha:1.0]];
-  
-  style.animationImage = imgLine;
-  
-  ScanViewController *vc = [ScanViewController new];
-  vc.style = style;
-  vc.type = scanTypeLogin;
-  //vc.isOpenInterestRect = YES;
-  [kGlobal.mainNaVC pushViewController:vc animated:YES];
+    //设置扫码区域参数
+    LBXScanViewStyle *style = [[LBXScanViewStyle alloc] init];
+    style.centerUpOffset = 44;
+    style.photoframeAngleStyle = LBXScanViewPhotoframeAngleStyle_Inner;
+    style.photoframeLineW = 2;
+    style.photoframeAngleW = 18;
+    style.photoframeAngleH = 18;
+    style.isNeedShowRetangle = YES;
+
+    style.anmiationStyle = LBXScanViewAnimationStyle_LineMove;
+
+    style.colorAngle = [UIColor colorWithRed:0. / 255 green:200. / 255. blue:20. / 255. alpha:1.0];
+
+    //qq里面的线条图片
+    UIImage *imgLine = [UIImage imageNamed:@"CodeScan.bundle/qrcode_Scan_weixin_Line"];
+
+    // imgLine = [self createImageWithColor:[UIColor colorWithRed:120/255. green:221/255. blue:71/255. alpha:1.0]];
+
+    style.animationImage = imgLine;
+
+    ScanViewController *vc = [ScanViewController new];
+    vc.style = style;
+    vc.type = scanTypeLogin;
+    //vc.isOpenInterestRect = YES;
+    [kGlobal.mainNaVC pushViewController:vc animated:YES];
 }
 
 - (void)didReceiveMemoryWarning {

Car/tools/BaseClass/BaseListViewController.m

@@ -113,6 +113,7 @@
 - (void)listTableViewReloadData {
     [MBProgressHUD j_hideLoadingView];
     
+    //停止下拉刷新
     if (self.tableView.mj_header.isRefreshing) {
         [self.tableView.mj_header endRefreshing];
         if (self.arrData.count == self.pageSize) {
@@ -120,6 +121,7 @@
         }else{
             [self.tableView.mj_footer endRefreshingWithNoMoreData];
         }
+        //停止下拉加载
     }else if (self.tableView.mj_footer.isRefreshing){
         
         if (self.arrData.count < self.pageSize * self.page) {