工分提现界面搭建

Car Release.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.1</string>
+	<string>1.0.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

Car.xcodeproj/project.pbxproj

@@ -21,6 +21,8 @@
 		8F42C00A1E10BC5400A54D40 /* OrderListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42C0091E10BC5400A54D40 /* OrderListTableViewCell.m */; };
 		8F42C00D1E10BF2900A54D40 /* OrderListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F42C00C1E10BF2900A54D40 /* OrderListModel.m */; };
 		8F725CB31E120649006B597D /* OrderDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F725CB21E120649006B597D /* OrderDetailViewController.m */; };
+		8F791BF51E4B0E89005FCB92 /* AccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F791BF41E4B0E89005FCB92 /* AccountViewController.m */; };
+		8F791BF61E4B0E89005FCB92 /* AccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F791BF41E4B0E89005FCB92 /* AccountViewController.m */; };
 		8F8105651E10ECC3009A2AB3 /* UIView+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8105641E10ECC3009A2AB3 /* UIView+Category.m */; };
 		8F8105681E10F58A009A2AB3 /* OrderListFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F8105671E10F58A009A2AB3 /* OrderListFilterViewController.m */; };
 		8F81056E1E110174009A2AB3 /* DateTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F81056D1E110174009A2AB3 /* DateTextField.m */; };
@@ -166,6 +168,8 @@
 		8F42C00C1E10BF2900A54D40 /* OrderListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderListModel.m; sourceTree = "<group>"; };
 		8F725CB11E120649006B597D /* OrderDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderDetailViewController.h; sourceTree = "<group>"; };
 		8F725CB21E120649006B597D /* OrderDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OrderDetailViewController.m; sourceTree = "<group>"; };
+		8F791BF31E4B0E89005FCB92 /* AccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccountViewController.h; sourceTree = "<group>"; };
+		8F791BF41E4B0E89005FCB92 /* AccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccountViewController.m; sourceTree = "<group>"; };
 		8F8105631E10ECC3009A2AB3 /* UIView+Category.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Category.h"; sourceTree = "<group>"; };
 		8F8105641E10ECC3009A2AB3 /* UIView+Category.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Category.m"; sourceTree = "<group>"; };
 		8F8105661E10F58A009A2AB3 /* OrderListFilterViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OrderListFilterViewController.h; sourceTree = "<group>"; };
@@ -341,6 +345,56 @@
 			path = Cells;
 			sourceTree = "<group>";
 		};
+		8F791BED1E4B0E66005FCB92 /* Account（公分提现） */ = {
+			isa = PBXGroup;
+			children = (
+				8F791BEE1E4B0E66005FCB92 /* Cells */,
+				8F791BEF1E4B0E66005FCB92 /* Models */,
+				8F791BF01E4B0E66005FCB92 /* ViewConstrollers */,
+				8F791BF11E4B0E66005FCB92 /* ViewModels */,
+				8F791BF21E4B0E66005FCB92 /* Views */,
+			);
+			name = "Account（公分提现）";
+			path = Account;
+			sourceTree = "<group>";
+		};
+		8F791BEE1E4B0E66005FCB92 /* Cells */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Cells;
+			sourceTree = "<group>";
+		};
+		8F791BEF1E4B0E66005FCB92 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		8F791BF01E4B0E66005FCB92 /* ViewConstrollers */ = {
+			isa = PBXGroup;
+			children = (
+				8F791BF31E4B0E89005FCB92 /* AccountViewController.h */,
+				8F791BF41E4B0E89005FCB92 /* AccountViewController.m */,
+			);
+			path = ViewConstrollers;
+			sourceTree = "<group>";
+		};
+		8F791BF11E4B0E66005FCB92 /* ViewModels */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = ViewModels;
+			sourceTree = "<group>";
+		};
+		8F791BF21E4B0E66005FCB92 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 		8F97C2AF1E0CC4BE00D8A57D = {
 			isa = PBXGroup;
 			children = (
@@ -415,6 +469,7 @@
 		8F97C2EE1E0CCD2B00D8A57D /* CodeClass */ = {
 			isa = PBXGroup;
 			children = (
+				8F791BED1E4B0E66005FCB92 /* Account（公分提现） */,
 				8F97C3171E0CEBA900D8A57D /* Main */,
 				8F97C3091E0CE83B00D8A57D /* LeftView */,
 				8F97C2EF1E0CCD6500D8A57D /* Login */,
@@ -939,6 +994,7 @@
 				8FC2BDBE1E12840300A879C1 /* LBXScanViewStyle.m in Sources */,
 				8F725CB31E120649006B597D /* OrderDetailViewController.m in Sources */,
 				8F42BFFB1E0D208C00A54D40 /* GlobalInstance.m in Sources */,
+				8F791BF51E4B0E89005FCB92 /* AccountViewController.m in Sources */,
 				8F8105681E10F58A009A2AB3 /* OrderListFilterViewController.m in Sources */,
 				8FED4FC51E1252F200591647 /* CalculateHelper.m in Sources */,
 				8FFE3D9A1E13A8AA00BEB6A6 /* car_objc_json_client.m in Sources */,
@@ -1013,6 +1069,7 @@
 				8FFE3DF81E14AC6700BEB6A6 /* LBXScanViewStyle.m in Sources */,
 				8FFE3DF91E14AC6700BEB6A6 /* OrderDetailViewController.m in Sources */,
 				8FFE3DFA1E14AC6700BEB6A6 /* GlobalInstance.m in Sources */,
+				8F791BF61E4B0E89005FCB92 /* AccountViewController.m in Sources */,
 				8FFE3DFB1E14AC6700BEB6A6 /* OrderListFilterViewController.m in Sources */,
 				8FFE3DFC1E14AC6700BEB6A6 /* CalculateHelper.m in Sources */,
 				8FFE3DFD1E14AC6700BEB6A6 /* car_objc_json_client.m in Sources */,

Car/Assets.xcassets/公分提现/Contents.json

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

Car/Assets.xcassets/公分提现/wechat.imageset/Contents.json

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

Car/Assets.xcassets/公分提现/工分提现图标.imageset/Contents.json

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

Car/CodeClass/Account/ViewConstrollers/AccountViewController.h

+//
+//  AccountViewController.h
+//  Car
+//
+//  Created by Javen on 2017/2/8.
+//  Copyright © 2017年 上海勾芒信息科技. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface AccountViewController : BaseViewController
+
+@end

Car/CodeClass/Account/ViewConstrollers/AccountViewController.m

+//
+//  AccountViewController.m
+//  Car
+//
+//  Created by Javen on 2017/2/8.
+//  Copyright © 2017年 上海勾芒信息科技. All rights reserved.
+//
+
+#import "AccountViewController.h"
+
+@interface AccountViewController ()
+
+/**
+ 工分总额
+ */
+@property (weak, nonatomic) IBOutlet UIView *labelTotalScore;
+
+/**
+ 可换公分
+ */
+@property (weak, nonatomic) IBOutlet UILabel *labelValidScore;
+
+/**
+ 公分
+ */
+@property (weak, nonatomic) IBOutlet UITextField *textFieldScore;
+
+/**
+ 工分提现说明
+ */
+@property (weak, nonatomic) IBOutlet UILabel *labelInfo;
+
+/**
+ 提醒绑定微信提示
+ */
+@property (weak, nonatomic) IBOutlet UILabel *labelToWechatInfo;
+@property (weak, nonatomic) IBOutlet UIView *scoreView;
+
+@end
+
+@implementation AccountViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+//    self.scoreView.hidden = YES;
+    self.title = @"工分提现";
+    [self configUI];
+    // Do any additional setup after loading the view.
+}
+
+- (void)configUI {
+    //未绑定微信的底部的提示
+    NSString *contentStr = @"亲，您还没有绑定微信哦，工分提现需要先绑定微信哦，我们的提现金额会提到微信钱包中。                     ";
+    NSRange range = [contentStr rangeOfString:@"提现金额会提到微信钱包中"];
+    NSMutableAttributedString *str = [[NSMutableAttributedString alloc]initWithString:contentStr];
+    //设置：在0-3个单位长度内的内容显示成红色
+    [str addAttribute:NSForegroundColorAttributeName value:kMainColor range:range];
+    self.labelToWechatInfo.attributedText = str;
+    
+    
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#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

Car/CodeClass/LeftView/ViewControllers/LeftTableViewController.m

@@ -11,7 +11,7 @@
 #import "ModifyPswTableViewController.h"
 #import "BillListViewController.h"
 #import "ScanViewController.h"
-#import <AudioToolbox/AudioToolbox.h>
+#import "AccountViewController.h"
 @interface LeftTableViewController ()
 @property (weak, nonatomic) IBOutlet UIImageView *imgUserIcon;
 @property (weak, nonatomic) IBOutlet UILabel *labelName;
@@ -57,7 +57,8 @@
     BillListViewController *billVC = [BillListViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
     [kGlobal.mainNaVC pushViewController:billVC animated:YES];
   }else if (indexPath.row == 1) {//账户
-    [MBProgressHUD j_textOnly:@"正在开发中~"];
+      AccountViewController *accoutVC = [AccountViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];
+      [kGlobal.mainNaVC pushViewController:accoutVC animated:YES];
   }else if (indexPath.row == 2) {//核销卡券
     [self scanCard];
     

Car/CodeClass/LeftView/ViewControllers/WatchLoginViewController.m

@@ -16,39 +16,37 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-  self.title = @"授权登录";
+    self.title = @"授权登录";
     // Do any additional setup after loading the view.
 }
 - (IBAction)actionLogin:(id)sender {
-  [self httpAllowLogin];
+    [self httpAllowLogin];
 }
 
 - (void)httpAllowLogin {
-
-  NSDictionary *param = @{@"deviceId":self.device,
-                          @"token":self.token};
-  WS(weakSelf);
-  [kHttp GET:kWatchLogin parameters:param complete:^(id  _Nullable response, NSError * _Nullable error) {
-    if (kRsSuccess(response)) {
-      [MBProgressHUD j_success:@"登录成功！" complete:^{
-        //连续返回两级
-        long index = [[weakSelf.navigationController viewControllers] indexOfObject:weakSelf];
-        [weakSelf.navigationController
-         popToViewController:[weakSelf.navigationController.viewControllers
-                              objectAtIndex:index - 2]
-         animated:YES];
-      }];
-      
-    }else{
-      kShowRsMsg(response);
-      
-    }
-
-  }];
+    
+    NSDictionary *param = @{@"deviceId":self.device,
+                            @"token":self.token};
+    WS(weakSelf);
+    [kHttp GET:kWatchLogin parameters:param complete:^(id  _Nullable response, NSError * _Nullable error) {
+        if (kRsSuccess(response)) {
+            [MBProgressHUD j_success:@"登录成功！" complete:^{
+                //连续返回两级
+                long index = [[weakSelf.navigationController viewControllers] indexOfObject:weakSelf];
+                [weakSelf.navigationController popToViewController:[weakSelf.navigationController.viewControllers objectAtIndex:index - 2]
+                                                          animated:YES];
+            }];
+            
+        }else{
+            kShowRsMsg(response);
+            
+        }
+        
+    }];
 }
 
 - (IBAction)actionCancel:(id)sender {
-  [self.navigationController popViewControllerAnimated:YES];
+    [self.navigationController popViewControllerAnimated:YES];
 }
 
 
@@ -59,13 +57,13 @@
 }
 
 /*
-#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.
-}
-*/
+ #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

Car/URL.h

@@ -17,14 +17,9 @@ static NSString *const VersionName = @"车族通正式版";
 static NSString *const BASE_IP = @"http://whcar.gomoretech.com";
 #endif
 
-
-
-
-
 /** 请求基准地址 */
 #define REST_BASE_URL [NSString stringWithFormat:@"%@/car-web/app", BASE_IP]
 
-
 static NSString *const kLoginUrl =  @"stationUser/login";
 static NSString *const kUpgradeUrl = @"stationUser/getUpgrade";
 static NSString *const kModifyPswUrl = @"stationUser/modifyPassword";

Car/tools/BaseClass/BaseViewController.m

@@ -17,8 +17,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-  self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
-    self.view.backgroundColor = [UIColor colorWithWhite:0.965 alpha:1.000];
+    self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
+    self.view.backgroundColor = [UIColor colorWithRed:0.94 green:0.94 blue:0.96 alpha:1.00];
     // Do any additional setup after loading the view.
 }