Browse Source

我的界面改版

xiongzhu 7 years ago
parent
commit
12bfc24750

BIN
.DS_Store


+ 4 - 1
.gitignore

@@ -72,4 +72,7 @@ iOSInjectionProject/
 ### Objective-C Patch ###
 
 
-# End of https://www.gitignore.io/api/objective-c
+# End of https://www.gitignore.io/api/objective-c
+
+.idea
+.DS_Store

+ 36 - 10
千模.xcodeproj/project.pbxproj

@@ -127,8 +127,13 @@
 		3A72C26921808FA900807101 /* UIImageView+RoundCorner.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A72C26821808FA900807101 /* UIImageView+RoundCorner.m */; };
 		3A94CA632180C4C70093BFCB /* MineItemView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A94CA622180C4C70093BFCB /* MineItemView.xib */; };
 		3A94CA662180C4E10093BFCB /* MineItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A94CA652180C4E10093BFCB /* MineItemView.m */; };
-		3A94CA6A2180CEA60093BFCB /* ShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A94CA692180CEA60093BFCB /* ShadowView.m */; };
-		3A94CA6C2180CEB30093BFCB /* ShadowView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A94CA6B2180CEB30093BFCB /* ShadowView.xib */; };
+		3A9C688221817A45008DAC10 /* ShadowView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A9C688121817A45008DAC10 /* ShadowView.xib */; };
+		3A9C688521817A73008DAC10 /* ShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A9C688421817A73008DAC10 /* ShadowView.m */; };
+		3A9C688921819F39008DAC10 /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A9C688721819F39008DAC10 /* ShareViewController.m */; };
+		3A9C688A21819F39008DAC10 /* ShareViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A9C688821819F39008DAC10 /* ShareViewController.xib */; };
+		3A9C68932181BD1C008DAC10 /* SharePopViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A9C68922181BD1C008DAC10 /* SharePopViewController.m */; };
+		3A9C68952181C04B008DAC10 /* SharePopViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3A9C68942181C04B008DAC10 /* SharePopViewController.xib */; };
+		3A9DD3C4218166BB00A5454F /* UIView+Xib.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A9DD3C2218166BA00A5454F /* UIView+Xib.m */; };
 		3C01182120D1189700FF8785 /* DiscoverImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C01182020D1189700FF8785 /* DiscoverImage.m */; };
 		3C01182320D1190E00FF8785 /* DiscoverImage.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3C01182220D1190E00FF8785 /* DiscoverImage.xib */; };
 		3C01182720D20C4F00FF8785 /* NoImageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C01182520D20C4F00FF8785 /* NoImageCell.m */; };
@@ -584,9 +589,17 @@
 		3A94CA622180C4C70093BFCB /* MineItemView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineItemView.xib; sourceTree = "<group>"; };
 		3A94CA642180C4E10093BFCB /* MineItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineItemView.h; sourceTree = "<group>"; };
 		3A94CA652180C4E10093BFCB /* MineItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MineItemView.m; sourceTree = "<group>"; };
-		3A94CA682180CEA60093BFCB /* ShadowView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShadowView.h; sourceTree = "<group>"; };
-		3A94CA692180CEA60093BFCB /* ShadowView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShadowView.m; sourceTree = "<group>"; };
-		3A94CA6B2180CEB30093BFCB /* ShadowView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShadowView.xib; sourceTree = "<group>"; };
+		3A9C688121817A45008DAC10 /* ShadowView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShadowView.xib; sourceTree = "<group>"; };
+		3A9C688321817A73008DAC10 /* ShadowView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShadowView.h; sourceTree = "<group>"; };
+		3A9C688421817A73008DAC10 /* ShadowView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShadowView.m; sourceTree = "<group>"; };
+		3A9C688621819F39008DAC10 /* ShareViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareViewController.h; sourceTree = "<group>"; };
+		3A9C688721819F39008DAC10 /* ShareViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareViewController.m; sourceTree = "<group>"; };
+		3A9C688821819F39008DAC10 /* ShareViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ShareViewController.xib; sourceTree = "<group>"; };
+		3A9C68912181BD1C008DAC10 /* SharePopViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharePopViewController.h; sourceTree = "<group>"; };
+		3A9C68922181BD1C008DAC10 /* SharePopViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SharePopViewController.m; sourceTree = "<group>"; };
+		3A9C68942181C04B008DAC10 /* SharePopViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SharePopViewController.xib; sourceTree = "<group>"; };
+		3A9DD3C2218166BA00A5454F /* UIView+Xib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+Xib.m"; sourceTree = "<group>"; };
+		3A9DD3C3218166BA00A5454F /* UIView+Xib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+Xib.h"; sourceTree = "<group>"; };
 		3C01181F20D1189700FF8785 /* DiscoverImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DiscoverImage.h; sourceTree = "<group>"; };
 		3C01182020D1189700FF8785 /* DiscoverImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DiscoverImage.m; sourceTree = "<group>"; };
 		3C01182220D1190E00FF8785 /* DiscoverImage.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DiscoverImage.xib; sourceTree = "<group>"; };
@@ -1409,9 +1422,9 @@
 				3A94CA622180C4C70093BFCB /* MineItemView.xib */,
 				3A94CA642180C4E10093BFCB /* MineItemView.h */,
 				3A94CA652180C4E10093BFCB /* MineItemView.m */,
-				3A94CA6B2180CEB30093BFCB /* ShadowView.xib */,
-				3A94CA682180CEA60093BFCB /* ShadowView.h */,
-				3A94CA692180CEA60093BFCB /* ShadowView.m */,
+				3A9C688121817A45008DAC10 /* ShadowView.xib */,
+				3A9C688321817A73008DAC10 /* ShadowView.h */,
+				3A9C688421817A73008DAC10 /* ShadowView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1797,6 +1810,12 @@
 				3A72C25F2180747100807101 /* MineViewController.xib */,
 				3A72C2612180749600807101 /* MineViewController.h */,
 				3A72C2622180749600807101 /* MineViewController.m */,
+				3A9C688621819F39008DAC10 /* ShareViewController.h */,
+				3A9C688721819F39008DAC10 /* ShareViewController.m */,
+				3A9C688821819F39008DAC10 /* ShareViewController.xib */,
+				3A9C68912181BD1C008DAC10 /* SharePopViewController.h */,
+				3A9C68922181BD1C008DAC10 /* SharePopViewController.m */,
+				3A9C68942181C04B008DAC10 /* SharePopViewController.xib */,
 			);
 			path = MyInfo;
 			sourceTree = "<group>";
@@ -2198,6 +2217,8 @@
 				3C0D45D420FDE38B007AE6A8 /* UIScreen+Sports.m */,
 				3A72C26721808FA900807101 /* UIImageView+RoundCorner.h */,
 				3A72C26821808FA900807101 /* UIImageView+RoundCorner.m */,
+				3A9DD3C3218166BA00A5454F /* UIView+Xib.h */,
+				3A9DD3C2218166BA00A5454F /* UIView+Xib.m */,
 			);
 			path = Category;
 			sourceTree = "<group>";
@@ -2390,6 +2411,7 @@
 				3C01182820D20C4F00FF8785 /* NoImageCell.xib in Resources */,
 				2F053C0B2121B1F700FA29C8 /* LICENSE in Resources */,
 				3C01713420E8C318004183B8 /* ImageViewController.xib in Resources */,
+				3A9C68952181C04B008DAC10 /* SharePopViewController.xib in Resources */,
 				3C01712F20E79B1C004183B8 /* TopSearchViewController.xib in Resources */,
 				2FA1AF542127F4FA005F12CA /* NewPwdViewController.xib in Resources */,
 				3C0D45F621008507007AE6A8 /* AlipaySDK.bundle in Resources */,
@@ -2442,7 +2464,7 @@
 				2FF8460E210892D400B8EB66 /* PayOrderCell.xib in Resources */,
 				3C6FC71120DBA51800F51C76 /* PushOrderViewController.xib in Resources */,
 				3CB5805A20BFA34300C64167 /* ActivityDetailViewController.xib in Resources */,
-				3A94CA6C2180CEB30093BFCB /* ShadowView.xib in Resources */,
+				3A9C688221817A45008DAC10 /* ShadowView.xib in Resources */,
 				3C0E1DE620C65D250038CC98 /* OnlineSubViewController.xib in Resources */,
 				3C873CC020DE6F7400F787B8 /* PGDatePicker.podspec in Resources */,
 				3CCC3A7220B3FECF00D84124 /* ActivityCell.xib in Resources */,
@@ -2459,6 +2481,7 @@
 				3A94CA632180C4C70093BFCB /* MineItemView.xib in Resources */,
 				3C0E1DFC20C8DA470038CC98 /* OneImageCell.xib in Resources */,
 				2FA1AF7421280A74005F12CA /* video_chat_tip_receiver.aac in Resources */,
+				3A9C688A21819F39008DAC10 /* ShareViewController.xib in Resources */,
 				2F7651E6212D179400CB3A03 /* DetailOnlyTextCell.xib in Resources */,
 				2FF845DC2106D36700B8EB66 /* Info.plist in Resources */,
 				2FA1AF7021280A74005F12CA /* video_chat_tip_OnCall.aac in Resources */,
@@ -2581,6 +2604,7 @@
 				2F7FC0452123FD1800492F0C /* BannerDetailViewController.m in Sources */,
 				2F043C7B21219CF400887DCB /* IQUIView+Hierarchy.m in Sources */,
 				3C473E9420CE260300EBCC5A /* JSONModelArray.m in Sources */,
+				3A9C68932181BD1C008DAC10 /* SharePopViewController.m in Sources */,
 				3C2804BE20AE6C3E0063239C /* MainViewController.m in Sources */,
 				3C2804E820AE70CC0063239C /* InfoImageViewController.m in Sources */,
 				2FF845ED2106D90A00B8EB66 /* NTESNotificationCenter.m in Sources */,
@@ -2621,6 +2645,7 @@
 				3CB5807320C132DD00C64167 /* AgentComDetailCell.m in Sources */,
 				2FF845D62106D36700B8EB66 /* MASLayoutConstraint.m in Sources */,
 				3C01182E20D24CBD00FF8785 /* CompanyImage.m in Sources */,
+				3A9C688521817A73008DAC10 /* ShadowView.m in Sources */,
 				3CE70F6321146304001C174B /* PayOrderTopCell.m in Sources */,
 				3CCC3A3120B2D09E00D84124 /* TabScrollview.m in Sources */,
 				2F7FC0E3212452A800492F0C /* NSData+NTES.m in Sources */,
@@ -2696,6 +2721,7 @@
 				3C516C5B20F312BF0074BA2E /* MD5String.m in Sources */,
 				3C873D2C20DE728600F787B8 /* PGDatePickerView.m in Sources */,
 				3C64658E20ECB69C000C3571 /* NTESNetCallChatInfo.m in Sources */,
+				3A9DD3C4218166BB00A5454F /* UIView+Xib.m in Sources */,
 				3C2804FA20AE73FB0063239C /* ActivityListViewController.m in Sources */,
 				3CB5802820BCED4600C64167 /* DiscoverListCell.m in Sources */,
 				2F053C012121B1F700FA29C8 /* MJPropertyType.m in Sources */,
@@ -2708,7 +2734,6 @@
 				3CB5801420B7ECB600C64167 /* UIImage+Color.m in Sources */,
 				3CCC3A5E20B3B68800D84124 /* FocusViewController.m in Sources */,
 				3C01182B20D241CB00FF8785 /* AgentModel.m in Sources */,
-				3A94CA6A2180CEA60093BFCB /* ShadowView.m in Sources */,
 				3C873D2520DE728600F787B8 /* PGDatePicker+MonthDayHourMinuteSecond.m in Sources */,
 				3C01713320E8C318004183B8 /* ImageViewController.m in Sources */,
 				3C0E1DF320C77E090038CC98 /* XRCarouselView.m in Sources */,
@@ -2716,6 +2741,7 @@
 				3C873D3920E0F3E400F787B8 /* CustomTextField.m in Sources */,
 				2F7651F5212D18D700CB3A03 /* AgreementViewController.m in Sources */,
 				3CCC3A7120B3FECF00D84124 /* ActivityCell.m in Sources */,
+				3A9C688921819F39008DAC10 /* ShareViewController.m in Sources */,
 				3C873D2720DE728600F787B8 /* PGDatePicker+TimeAndSecond.m in Sources */,
 				2F7FC0A82124518A00492F0C /* SVRadialGradientLayer.m in Sources */,
 				3C6465BC20ECBCFC000C3571 /* rgb.fsh.c in Sources */,

BIN
千模/.DS_Store


+ 1 - 1
千模/AppDelegate.m

@@ -292,7 +292,7 @@ NSString *NTESNotificationLogout = @"NTESNotificationLogout";
         
     }
     
-    [WXApi registerApp:@"wxdf90be1003a874da" enableMTA:YES];
+    [WXApi registerApp:@"wx2d60e82cb3df6926" enableMTA:YES];
     
     //创建并初始化UITabBarController
 //    TabbarController *tabBarController = [[TabbarController alloc]init];

+ 13 - 0
千模/Category/UIView+Xib.h

@@ -0,0 +1,13 @@
+//
+//  UIView+Xib.h
+//  MLProject
+//
+//  Created by 妙龙赖 on 15/11/22.
+//  Copyright © 2015年 妙龙赖. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIView (Xib)
+- (void)setupXib;
+@end

+ 21 - 0
千模/Category/UIView+Xib.m

@@ -0,0 +1,21 @@
+//
+//  UIView+Xib.m
+//  MLProject
+//
+//  Created by 妙龙赖 on 15/11/22.
+//  Copyright © 2015年 妙龙赖. All rights reserved.
+//
+
+#import "UIView+Xib.h"
+#import <objc/runtime.h>
+
+@implementation UIView (Xib)
+- (void)setupXib
+{
+    NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+    NSString *className = NSStringFromClass([self class]);
+    UIView *view = [[bundle loadNibNamed:className owner:self options:nil] firstObject];
+    view.frame = self.bounds;
+    [self addSubview:view];
+}
+@end

+ 0 - 2
千模/MyInfo/MineViewController.h

@@ -7,10 +7,8 @@
 //
 
 #import "ViewController.h"
-#import "ShadowView.h"
 
 NS_ASSUME_NONNULL_BEGIN
-
 @interface MineViewController : ViewController
 
 @end

+ 238 - 35
千模/MyInfo/MineViewController.m

@@ -8,73 +8,286 @@
 
 #import "MineViewController.h"
 #import "UIImageView+RoundCorner.h"
-@interface MineViewController ()
-@property (weak, nonatomic) IBOutlet UIView *headView;
-@property (weak, nonatomic) IBOutlet UIView *bgView;
-@property (weak, nonatomic) IBOutlet UILabel *nameLabel;
-@property (weak, nonatomic) IBOutlet UIImageView *avatarView;
-@property (weak, nonatomic) IBOutlet UIView *shadowView;
+#import "TZImageManager.h"
+#import "TZPhotoPreviewController.h"
+#import "TZImagePickerController.h"
+#import "OrderFormViewController.h"
+#import <AssetsLibrary/AssetsLibrary.h>
+#import <Photos/Photos.h>
+#import "InfoImageViewController.h"
+#import "InfoNickNameViewController.h"
+#import "InfoPhoneNumViewController.h"
+#import "InfoLevelViewController.h"
+#import "InfoMoneyViewController.h"
+#import "ChargeViewController.h"
+#import "LoginViewController.h"
+#import "VideoOrderController.h"
+#import "AboutUsViewController.h"
+#import "ShareViewController.h"
+#import "MineItemView.h"
 
+@interface MineViewController () <TZImagePickerControllerDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate>{
+      NSString *nickName;
+}
+@property(weak, nonatomic) IBOutlet UIView *headView;
+@property(weak, nonatomic) IBOutlet UIView *bgView;
+@property(weak, nonatomic) IBOutlet UILabel *nameLabel;
+@property(weak, nonatomic) IBOutlet UIImageView *avatarView;
+@property(weak, nonatomic) IBOutlet UIView *shadowView;
+
+@property(nonatomic, strong) UIImagePickerController *imagePickerVc;
+@property(nonatomic, copy) NSData *imageData;
+@property(nonatomic, assign) int photoCount;
+@property(nonatomic, assign) int VideoCount;
+@property(weak, nonatomic) IBOutlet MineItemView *menu1;
+@property(weak, nonatomic) IBOutlet MineItemView *menu2;
+@property(weak, nonatomic) IBOutlet MineItemView *menu3;
+@property(weak, nonatomic) IBOutlet MineItemView *menu4;
+@property(weak, nonatomic) IBOutlet MineItemView *menu5;
 @end
 
 @implementation MineViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    [self.navigationController setNavigationBarHidden:YES animated:YES];
     NSArray *constrains = self.headView.constraints;
-    for (NSLayoutConstraint* constraint in constrains) {
+    for (NSLayoutConstraint *constraint in constrains) {
         if (constraint.firstAttribute == NSLayoutAttributeHeight) {
             constraint.constant = 114 + [[UIApplication sharedApplication] statusBarFrame].size.height;
         }
     }
     [self.headView updateConstraints];
     CAGradientLayer *gl = [CAGradientLayer layer];
-    gl.frame =CGRectMake(0, 0, self.headView.frame.size.width, 114 + [[UIApplication sharedApplication] statusBarFrame].size.height);
+    gl.frame = CGRectMake(0, 0, self.headView.frame.size.width, 114 + [[UIApplication sharedApplication] statusBarFrame].size.height);
     gl.startPoint = CGPointMake(0, 0);
     gl.endPoint = CGPointMake(0, 1);
-    gl.colors = @[(__bridge id)[UIColor colorWithRed:251/255.0 green:92/255.0 blue:163/255.0 alpha:1].CGColor, (__bridge id)[UIColor colorWithRed:253/255.0 green:127/255.0 blue:141/255.0 alpha:1].CGColor];
+    gl.colors = @[(__bridge id) [UIColor colorWithRed:251 / 255.0 green:92 / 255.0 blue:163 / 255.0 alpha:1].CGColor, (__bridge id) [UIColor colorWithRed:253 / 255.0 green:127 / 255.0 blue:141 / 255.0 alpha:1].CGColor];
     gl.locations = @[@(0), @(1.0f)];
     [self.headView.layer addSublayer:gl];
-    
+
     UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:self.bgView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(30, 30)];
     CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
     maskLayer.frame = self.bgView.bounds;
     maskLayer.path = maskPath.CGPath;
     self.bgView.layer.mask = maskLayer;
+    self.nameLabel.userInteractionEnabled = YES;
     self.avatarView.layer.cornerRadius = self.avatarView.frame.size.width / 2;
     self.avatarView.layer.borderWidth = 8;
     self.avatarView.layer.borderColor = [UIColor whiteColor].CGColor;
     self.avatarView.layer.masksToBounds = YES;
-    self.shadowView.layer.backgroundColor = [UIColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:1].CGColor;
+    self.avatarView.userInteractionEnabled = YES;
+    self.shadowView.layer.backgroundColor = [UIColor colorWithRed:255 / 255.0 green:255 / 255.0 blue:255 / 255.0 alpha:1].CGColor;
     self.shadowView.layer.cornerRadius = 12;
-    self.shadowView.layer.shadowColor = [UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.08].CGColor;
-    self.shadowView.layer.shadowOffset = CGSizeMake(0,6);
+    self.shadowView.layer.shadowColor = [UIColor colorWithRed:0 / 255.0 green:0 / 255.0 blue:0 / 255.0 alpha:0.08].CGColor;
+    self.shadowView.layer.shadowOffset = CGSizeMake(0, 6);
     self.shadowView.layer.shadowOpacity = 1;
     self.shadowView.layer.shadowRadius = 12;
 }
 
--(void)viewWillAppear:(BOOL)animated{
+- (void)viewWillAppear:(BOOL)animated {
+    [self.navigationController setNavigationBarHidden:YES animated:NO];
     [self getInfo];
 }
 
-- (void)getInfo{
-    NSString *str = [NSString stringWithFormat:@"%@memberInfo?action=getuserinfo&PK=%@",webURL,[Helper sharedAccount].accid];
-    [[AHHttpManager sharedManager]POST:str parameters:nil success:^(id responseObject) {
-        NSLog(@"%@",responseObject);
-        if ([[responseObject objectForKey:@"msg"]isEqualToString:@"success"]) {
+- (void)viewWillDisappear:(BOOL)animated {
+    [self.navigationController setNavigationBarHidden:NO animated:YES];
+}
+
+- (void)getInfo {
+    NSString *str = [NSString stringWithFormat:@"%@memberInfo?action=getuserinfo&PK=%@", webURL, [Helper sharedAccount].accid];
+    [[AHHttpManager sharedManager] POST:str parameters:nil success:^(id responseObject) {
+        NSLog(@"%@", responseObject);
+        if ([[responseObject objectForKey:@"msg"] isEqualToString:@"success"]) {
             NSDictionary *data = responseObject[@"data"];
-            self.nameLabel.text = [data objectForKey:@"pet"];
-            [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@",imageURl,[data objectForKey:@"hphoto"]]] placeholderImage:[UIImage imageNamed:@"default_avatar"]];
-        }else{
+            nickName = data[@"pet"];
+            self.nameLabel.text = data[@"pet"];
+            [self.avatarView sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@%@", imageURl, data[@"hphoto"]]] placeholderImage:[UIImage imageNamed:@"default_avatar"]];
+        } else {
             [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
         }
-    } failure:^(NSError *error) {
-        NSLog(@"error = %@",error);
+    }                           failure:^(NSError *error) {
+        NSLog(@"error = %@", error);
         [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
     }];
 }
 
+- (void)PushInfo {
+    NSString *str = [NSString stringWithFormat:@"%@/upload", webURL];
+    //    NSString *str = @"http://192.168.0.113:8080/thmodel/upload";
+    NSLog(@"str = %@", str);
+    //    NSString *str = [NSString stringWithFormat:@"%@modelInfo?action=doQryBroke",webURL];
+    AFHTTPSessionManager *manger = [AFHTTPSessionManager manager];
+    manger.responseSerializer = [AFHTTPResponseSerializer serializer];
+    manger.requestSerializer = [AFJSONRequestSerializer serializer];
+    manger.securityPolicy.allowInvalidCertificates = YES;
+    NSDictionary *dict = @{@"memberpk": [Helper sharedAccount].accid,
+            @"action": @"hp"
+    };
+    [manger POST:str parameters:dict constructingBodyWithBlock:^(id <AFMultipartFormData> _Nonnull formData) {
+        if (_imageData == NULL) {
+
+        } else {
+            NSLog(@"_imageData = %@", _imageData);
+
+            [formData appendPartWithFileData:_imageData name:@"img" fileName:@"111.png" mimeType:@"image/png"];
+            NSLog(@"image = %@", _imageData);
+        }
+    }   progress:nil success:^(NSURLSessionDataTask *_Nonnull task, id _Nullable responseObject) {
+        NSLog(@"re = %@", responseObject);
+
+        NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:responseObject options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves error:nil];
+        NSString *img = [dic objectForKey:@"img"];
+        [[NIMSDK sharedSDK].userManager updateMyUserInfo:@{@(NIMUserInfoUpdateTagAvatar): [NSString stringWithFormat:@"%@%@", imageURl, img]} completion:nil];
+        NSLog(@"%@", dic);
+    }    failure:^(NSURLSessionDataTask *_Nullable task, NSError *_Nonnull error) {
+
+    }];
+}
+
+- (IBAction)handelTap:(id)sender {
+    switch (((UITapGestureRecognizer *) sender).view.tag) {
+        case 1: {
+            UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+            [actionSheet addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+                [self dismissViewControllerAnimated:YES completion:^{
+                }];
+            }]];
+            [actionSheet addAction:[UIAlertAction actionWithTitle:@"拍照" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+                [self takePhoto];
+            }]];
+            [actionSheet addAction:[UIAlertAction actionWithTitle:@"选择相册照片" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+                [self pushImagePickerController];
+            }]];
+            [self presentViewController:actionSheet animated:YES completion:nil];
+            break;
+        }
+        case 2: {
+            ChargeViewController *chargeVc = [[ChargeViewController alloc] init];
+            chargeVc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:chargeVc animated:YES];
+            break;
+        }
+        case 3: {
+            VideoOrderController *voVC = [[VideoOrderController alloc] init];
+            voVC.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:voVC animated:YES];
+            break;
+        }
+        case 4: {
+            ShareViewController *shareVC = [[ShareViewController alloc] init];
+            shareVC.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:shareVC animated:YES];
+            break;
+        }
+        case 5: {
+            AboutUsViewController *auVC = [[AboutUsViewController alloc] init];
+            auVC.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:auVC animated:YES];
+            break;
+        }
+        case 6: {
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+#pragma 上传头像
+
+- (void)pushImagePickerController {
+
+    TZImagePickerController *imagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 columnNumber:1 delegate:self pushPhotoPickerVc:YES];
+    imagePickerVc.allowPickingGif = NO;
+    imagePickerVc.allowPickingVideo = NO;
+
+    imagePickerVc.allowTakePicture = NO;
+    imagePickerVc.allowCrop = YES;
+
+    // You can get the photos by block, the same as by delegate.
+    // 你可以通过block或者代理,来得到用户选择的照片.
+    [imagePickerVc setDidFinishPickingPhotosHandle:^(NSArray<UIImage *> *photos, NSArray *assets, BOOL isSelectOriginalPhoto) {
+
+    }];
+
+    [self presentViewController:imagePickerVc animated:YES completion:nil];
+}
+
+- (void)takePhoto {
+    AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
+    if ((authStatus == AVAuthorizationStatusRestricted || authStatus == AVAuthorizationStatusDenied) && iOS7Later) {
+        UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:@"无法使用照相机" message:@"请在iPhone的\"设置-隐私-照片\"选项中,\r允许千模访问你的手机相册" preferredStyle:UIAlertControllerStyleAlert];
+        [actionSheet addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+            [self dismissViewControllerAnimated:YES completion:^{
+            }];
+        }]];
+        [self presentViewController:actionSheet animated:YES completion:nil];
+    } else { // 调用相机
+        self.imagePickerVc = [[UIImagePickerController alloc] init];
+        self.imagePickerVc.delegate = self;
+        UIImagePickerControllerSourceType sourceType = UIImagePickerControllerSourceTypeCamera;
+        self.imagePickerVc.sourceType = sourceType;
+        [self presentViewController:self.imagePickerVc animated:YES completion:nil];
+    }
+}
+
+- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
+    if ([picker isKindOfClass:[UIImagePickerController class]]) {
+        [picker dismissViewControllerAnimated:YES completion:nil];
+    }
+}
+
+- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info {
+
+    [picker dismissViewControllerAnimated:YES completion:nil];
+    NSString *type = info[UIImagePickerControllerMediaType];
+    if ([type isEqualToString:@"public.image"]) {
+        TZImagePickerController *tzImagePickerVc = [[TZImagePickerController alloc] initWithMaxImagesCount:1 delegate:self];
+
+        [tzImagePickerVc showProgressHUD];
+        UIImage *image = info[UIImagePickerControllerOriginalImage];
+        // save photo and get asset / 保存图片,获取到asset
+        [[TZImageManager manager] savePhotoWithImage:image completion:^(NSError *error) {
+            if (error) {
+                [tzImagePickerVc hideProgressHUD];
+                NSLog(@"图片保存失败 %@", error);
+            } else {
+                [[TZImageManager manager] getCameraRollAlbum:NO allowPickingImage:YES completion:^(TZAlbumModel *model) {
+                    [[TZImageManager manager] getAssetsFromFetchResult:model.result allowPickingVideo:NO allowPickingImage:YES completion:^(NSArray<TZAssetModel *> *models) {
+                        [tzImagePickerVc hideProgressHUD];
+                        TZAssetModel *assetModel = [models firstObject];
+                        if (tzImagePickerVc.sortAscendingByModificationDate) {
+                            assetModel = [models lastObject];
+                        }
+                        // 允许裁剪,去裁剪
+                        TZImagePickerController *imagePicker = [[TZImagePickerController alloc] initCropTypeWithAsset:assetModel.asset photo:image completion:^(UIImage *cropImage, id asset) {
+
+                            self.imageData = UIImageJPEGRepresentation(cropImage, 0.2);
+                            self.avatarView.image = cropImage;
+                            _imageData = UIImageJPEGRepresentation(cropImage, 0.2);
+                            [self PushInfo];
+                        }];
+                        [self presentViewController:imagePicker animated:YES completion:nil];
+                    }];
+                }];
+            }
+        }];
+    }
+}
+
+- (void)imagePickerController:(TZImagePickerController *)picker didFinishPickingPhotos:(NSArray *)photos sourceAssets:(NSArray *)assets isSelectOriginalPhoto:(BOOL)isSelectOriginalPhoto {
+
+    _imageData = UIImageJPEGRepresentation(photos[0], 0.2);
+    self.avatarView.image = photos[0];
+    [picker dismissViewControllerAnimated:YES completion:nil];
+    [self PushInfo];
+}
+- (IBAction)changeName:(id)sender {
+    InfoNickNameViewController * nameVc = [[InfoNickNameViewController alloc]init];
+    nameVc.nameStr = nickName;
+    [self.navigationController pushViewController:nameVc animated:YES];
+}
+
 - (BOOL)prefersStatusBarHidden {
     return YES;
 }
@@ -82,14 +295,4 @@
 - (UIStatusBarStyle)preferredStatusBarStyle {
     return UIStatusBarStyleLightContent;
 }
-/*
-#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

+ 147 - 13
千模/MyInfo/MineViewController.xib

@@ -15,8 +15,13 @@
                 <outlet property="avatarView" destination="l52-m1-42R" id="W7X-lp-Myx"/>
                 <outlet property="bgView" destination="r9j-ZU-SlD" id="m1X-LN-lPe"/>
                 <outlet property="headView" destination="JMR-FE-a0P" id="Oyz-DF-L4X"/>
+                <outlet property="menu1" destination="4WH-zT-UTg" id="TdB-Ko-f4l"/>
+                <outlet property="menu2" destination="Yd1-Tn-B6L" id="YHd-3Z-33C"/>
+                <outlet property="menu3" destination="SR0-Ty-VJk" id="AYV-I2-Ghp"/>
+                <outlet property="menu4" destination="ofV-pQ-teD" id="XzP-bl-SN9"/>
+                <outlet property="menu5" destination="LiZ-et-Igh" id="eCG-bY-Pf9"/>
                 <outlet property="nameLabel" destination="tnV-pA-N5a" id="4Yj-BS-G5M"/>
-                <outlet property="shadowView" destination="Scm-kG-qvW" id="4Dy-fy-C5l"/>
+                <outlet property="shadowView" destination="IBe-5v-ajR" id="7DJ-B2-QGE"/>
                 <outlet property="view" destination="iN0-l3-epB" id="6qb-1w-qlZ"/>
             </connections>
         </placeholder>
@@ -37,53 +42,182 @@
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="夏秋雨" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tnV-pA-N5a">
-                    <rect key="frame" x="154" y="159" width="67" height="26.5"/>
+                    <rect key="frame" x="154" y="159" width="67" height="27"/>
+                    <gestureRecognizers/>
                     <fontDescription key="fontDescription" type="system" pointSize="22"/>
                     <color key="textColor" red="0.20392156862745098" green="0.20392156862745098" blue="0.20392156862745098" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
+                    <connections>
+                        <outletCollection property="gestureRecognizers" destination="bCh-V1-Hr9" appends="YES" id="qFt-P9-F9p"/>
+                    </connections>
                 </label>
-                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="l52-m1-42R">
+                <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="default_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="l52-m1-42R">
                     <rect key="frame" x="144.5" y="61" width="86" height="86"/>
+                    <gestureRecognizers/>
                     <constraints>
                         <constraint firstAttribute="height" constant="86" id="PdB-sW-AtI"/>
                         <constraint firstAttribute="width" constant="86" id="cvP-rY-NaM"/>
                     </constraints>
+                    <connections>
+                        <outletCollection property="gestureRecognizers" destination="JN3-oE-VBy" appends="YES" id="DMC-qq-Sc3"/>
+                    </connections>
                 </imageView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Scm-kG-qvW">
-                    <rect key="frame" x="20" y="200.5" width="335" height="80"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IBe-5v-ajR" customClass="ShadowView">
+                    <rect key="frame" x="40" y="201" width="295" height="80"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="80" id="w7g-ho-qTS"/>
+                        <constraint firstAttribute="height" constant="80" id="TFj-AB-vM1"/>
                     </constraints>
                 </view>
-                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="15t-8c-yvT" customClass="ShadowView">
-                    <rect key="frame" x="0.0" y="254" width="375" height="159"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <view tag="2" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4WH-zT-UTg" customClass="MineItemView">
+                    <rect key="frame" x="0.0" y="301" width="375" height="60"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <gestureRecognizers/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="60" id="E58-8e-oTU"/>
+                    </constraints>
+                    <connections>
+                        <outletCollection property="gestureRecognizers" destination="gKU-IQ-IVw" appends="YES" id="k0W-C5-AnB"/>
+                    </connections>
+                </view>
+                <view tag="3" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yd1-Tn-B6L" customClass="MineItemView">
+                    <rect key="frame" x="0.0" y="361" width="375" height="60"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <gestureRecognizers/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="60" id="cVs-kP-IkC"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="label" value="视频订单"/>
+                        <userDefinedRuntimeAttribute type="image" keyPath="image" value="into_icon_shipin"/>
+                    </userDefinedRuntimeAttributes>
+                    <connections>
+                        <outletCollection property="gestureRecognizers" destination="V8Y-u0-jSm" appends="YES" id="OSi-6l-g81"/>
+                    </connections>
+                </view>
+                <view tag="4" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SR0-Ty-VJk" customClass="MineItemView">
+                    <rect key="frame" x="0.0" y="421" width="375" height="60"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <gestureRecognizers/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="60" id="mZj-6H-CKc"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="label" value="邀请好友"/>
+                        <userDefinedRuntimeAttribute type="image" keyPath="image" value="into_icon_yaoqing"/>
+                    </userDefinedRuntimeAttributes>
+                    <connections>
+                        <outletCollection property="gestureRecognizers" destination="WY6-WH-aK5" appends="YES" id="3bN-Me-ZqX"/>
+                    </connections>
+                </view>
+                <view tag="5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ofV-pQ-teD" customClass="MineItemView">
+                    <rect key="frame" x="0.0" y="481" width="375" height="60"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <gestureRecognizers/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="60" id="4ez-c9-hvI"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="label" value="联系我们"/>
+                        <userDefinedRuntimeAttribute type="image" keyPath="image" value="into_icon_lianxikefu"/>
+                    </userDefinedRuntimeAttributes>
+                    <connections>
+                        <outletCollection property="gestureRecognizers" destination="ZZG-Ry-lvR" appends="YES" id="jog-QM-Mv8"/>
+                    </connections>
+                </view>
+                <view tag="6" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LiZ-et-Igh" customClass="MineItemView">
+                    <rect key="frame" x="0.0" y="541" width="375" height="60"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <gestureRecognizers/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="60" id="qjt-54-Dx8"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="string" keyPath="label" value="系统设置"/>
+                        <userDefinedRuntimeAttribute type="image" keyPath="image" value="into_icon_shezhi"/>
+                    </userDefinedRuntimeAttributes>
+                    <connections>
+                        <outletCollection property="gestureRecognizers" destination="riJ-gm-AcK" appends="YES" id="zx1-EN-aKP"/>
+                    </connections>
                 </view>
             </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
+                <constraint firstItem="SR0-Ty-VJk" firstAttribute="leading" secondItem="Yd1-Tn-B6L" secondAttribute="leading" id="2Sc-22-YeD"/>
+                <constraint firstItem="60z-Gq-b3E" firstAttribute="trailing" secondItem="IBe-5v-ajR" secondAttribute="trailing" constant="40" id="2Ub-cG-Dlo"/>
                 <constraint firstItem="r9j-ZU-SlD" firstAttribute="top" secondItem="JMR-FE-a0P" secondAttribute="bottom" constant="-30" id="4E2-i3-WaW"/>
+                <constraint firstItem="LiZ-et-Igh" firstAttribute="top" secondItem="ofV-pQ-teD" secondAttribute="bottom" id="54d-s1-ceF"/>
+                <constraint firstItem="LiZ-et-Igh" firstAttribute="trailing" secondItem="ofV-pQ-teD" secondAttribute="trailing" id="5pE-Zw-roa"/>
                 <constraint firstItem="60z-Gq-b3E" firstAttribute="bottom" secondItem="r9j-ZU-SlD" secondAttribute="bottom" id="Czt-28-MCp"/>
+                <constraint firstItem="60z-Gq-b3E" firstAttribute="trailing" secondItem="4WH-zT-UTg" secondAttribute="trailing" id="FyC-Ku-MQc"/>
+                <constraint firstItem="SR0-Ty-VJk" firstAttribute="trailing" secondItem="Yd1-Tn-B6L" secondAttribute="trailing" id="GDV-Yz-ObQ"/>
+                <constraint firstItem="LiZ-et-Igh" firstAttribute="leading" secondItem="ofV-pQ-teD" secondAttribute="leading" id="I3f-11-jSB"/>
+                <constraint firstItem="Yd1-Tn-B6L" firstAttribute="top" secondItem="4WH-zT-UTg" secondAttribute="bottom" id="KmM-SV-7wU"/>
+                <constraint firstItem="Yd1-Tn-B6L" firstAttribute="trailing" secondItem="4WH-zT-UTg" secondAttribute="trailing" id="Lzu-Xx-f7R"/>
+                <constraint firstItem="ofV-pQ-teD" firstAttribute="top" secondItem="SR0-Ty-VJk" secondAttribute="bottom" id="NIO-qR-Yy8"/>
                 <constraint firstItem="r9j-ZU-SlD" firstAttribute="leading" secondItem="60z-Gq-b3E" secondAttribute="leading" id="Nhw-qO-V08"/>
+                <constraint firstItem="IBe-5v-ajR" firstAttribute="leading" secondItem="60z-Gq-b3E" secondAttribute="leading" constant="40" id="OWW-a6-FLp"/>
+                <constraint firstItem="4WH-zT-UTg" firstAttribute="top" secondItem="IBe-5v-ajR" secondAttribute="bottom" constant="20" id="QUC-Po-Hrn"/>
                 <constraint firstItem="l52-m1-42R" firstAttribute="top" secondItem="r9j-ZU-SlD" secondAttribute="top" constant="-43" id="TK1-f7-kti"/>
+                <constraint firstItem="IBe-5v-ajR" firstAttribute="top" secondItem="tnV-pA-N5a" secondAttribute="bottom" constant="15" id="XMY-WW-abm"/>
                 <constraint firstAttribute="top" secondItem="JMR-FE-a0P" secondAttribute="top" id="YjH-SZ-13n"/>
-                <constraint firstItem="Scm-kG-qvW" firstAttribute="leading" secondItem="60z-Gq-b3E" secondAttribute="leading" constant="20" id="aYv-cw-4FB"/>
+                <constraint firstItem="4WH-zT-UTg" firstAttribute="leading" secondItem="60z-Gq-b3E" secondAttribute="leading" id="ZkJ-NM-bEF"/>
+                <constraint firstItem="SR0-Ty-VJk" firstAttribute="top" secondItem="Yd1-Tn-B6L" secondAttribute="bottom" id="fIX-Pg-e4c"/>
+                <constraint firstItem="Yd1-Tn-B6L" firstAttribute="leading" secondItem="4WH-zT-UTg" secondAttribute="leading" id="fbu-Lb-mN8"/>
                 <constraint firstItem="JMR-FE-a0P" firstAttribute="leading" secondItem="60z-Gq-b3E" secondAttribute="leading" id="gJf-xQ-FmV"/>
-                <constraint firstItem="60z-Gq-b3E" firstAttribute="trailing" secondItem="Scm-kG-qvW" secondAttribute="trailing" constant="20" id="gbs-1A-sTs"/>
-                <constraint firstItem="Scm-kG-qvW" firstAttribute="top" secondItem="tnV-pA-N5a" secondAttribute="bottom" constant="15" id="h1E-M8-qkk"/>
                 <constraint firstItem="l52-m1-42R" firstAttribute="centerX" secondItem="60z-Gq-b3E" secondAttribute="centerX" id="kF3-Mz-IOC"/>
                 <constraint firstItem="60z-Gq-b3E" firstAttribute="trailing" secondItem="JMR-FE-a0P" secondAttribute="trailing" id="mSO-Nx-Kfp"/>
+                <constraint firstItem="ofV-pQ-teD" firstAttribute="trailing" secondItem="SR0-Ty-VJk" secondAttribute="trailing" id="pUw-5U-Mdk"/>
+                <constraint firstItem="ofV-pQ-teD" firstAttribute="leading" secondItem="SR0-Ty-VJk" secondAttribute="leading" id="qWL-oQ-nY3"/>
                 <constraint firstItem="tnV-pA-N5a" firstAttribute="centerX" secondItem="60z-Gq-b3E" secondAttribute="centerX" id="rfp-4L-RlE"/>
                 <constraint firstItem="tnV-pA-N5a" firstAttribute="top" secondItem="r9j-ZU-SlD" secondAttribute="top" constant="55" id="vHe-XN-wJ8"/>
                 <constraint firstItem="60z-Gq-b3E" firstAttribute="trailing" secondItem="r9j-ZU-SlD" secondAttribute="trailing" id="wVo-e6-EAW"/>
             </constraints>
+            <nil key="simulatedTopBarMetrics"/>
             <viewLayoutGuide key="safeArea" id="60z-Gq-b3E"/>
-            <point key="canvasLocation" x="39.200000000000003" y="46.326836581709152"/>
+            <point key="canvasLocation" x="4" y="-5"/>
         </view>
+        <tapGestureRecognizer id="JN3-oE-VBy">
+            <connections>
+                <action selector="handelTap:" destination="-1" id="rbs-HF-8cA"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="gKU-IQ-IVw">
+            <connections>
+                <action selector="handelTap:" destination="-1" id="Est-vD-Pnb"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="V8Y-u0-jSm">
+            <connections>
+                <action selector="handelTap:" destination="-1" id="T1F-4B-X3R"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="WY6-WH-aK5">
+            <connections>
+                <action selector="handelTap:" destination="-1" id="eLI-Dy-gjm"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="ZZG-Ry-lvR">
+            <connections>
+                <action selector="handelTap:" destination="-1" id="Uzi-Np-63f"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="riJ-gm-AcK">
+            <connections>
+                <action selector="handelTap:" destination="-1" id="BJl-8X-1M5"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="bCh-V1-Hr9">
+            <connections>
+                <action selector="changeName:" destination="-1" id="weO-iY-Bq0"/>
+            </connections>
+        </tapGestureRecognizer>
     </objects>
     <resources>
         <image name="default_avatar" width="36" height="36"/>
+        <image name="into_icon_lianxikefu" width="30" height="30"/>
+        <image name="into_icon_shezhi" width="30" height="30"/>
+        <image name="into_icon_shipin" width="30" height="30"/>
+        <image name="into_icon_yaoqing" width="30" height="30"/>
     </resources>
 </document>

+ 1 - 1
千模/MyInfo/OrderFormViewController.h

@@ -9,5 +9,5 @@
 #import "ViewController.h"
 
 @interface OrderFormViewController : ViewController
-
+- (instancetype)initWithTab:(NSInteger)tab;
 @end

+ 293 - 246
千模/MyInfo/OrderFormViewController.m

@@ -11,47 +11,90 @@
 #import "PayOrderViewController.h"
 #import "OrderDetailViewController.h"
 
-@interface OrderFormViewController ()<OrderDelegate>
-{
+@interface OrderFormViewController () <OrderDelegate> {
     NSInteger index;
 }
 
-@property (weak, nonatomic) IBOutlet UIView *topVIew;
-@property (weak, nonatomic) IBOutlet UITableView *AlltableView;
-@property (weak, nonatomic) IBOutlet UITableView *NoPaytableView;
-@property (weak, nonatomic) IBOutlet UITableView *IngtableView;
-@property (weak, nonatomic) IBOutlet UITableView *CanceltableView;
-@property (weak, nonatomic) IBOutlet UITableView *DonetableView;
-
-@property (weak, nonatomic) IBOutlet UIView *Image1;
-@property (weak, nonatomic) IBOutlet UIView *Image2;
-@property (weak, nonatomic) IBOutlet UIView *Image3;
-@property (weak, nonatomic) IBOutlet UIView *Image4;
-@property (weak, nonatomic) IBOutlet UIView *Image5;
-
-@property (weak, nonatomic) IBOutlet UIImageView *xiahuaxian1;
-@property (weak, nonatomic) IBOutlet UIImageView *xiahuaxian2;
-@property (weak, nonatomic) IBOutlet UIImageView *xiahuaxian3;
-@property (weak, nonatomic) IBOutlet UIImageView *xiahuaxian5;
-@property (weak, nonatomic) IBOutlet UIImageView *xiahuaxian4;
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *top;
-
-@property (strong, nonatomic) NSMutableArray *AllArray;
-@property (strong, nonatomic) NSMutableArray *NoPayArray;
-@property (strong, nonatomic) NSMutableArray *IngArray;
-@property (strong, nonatomic) NSMutableArray *DoneArray;
-@property (strong, nonatomic) NSMutableArray *CancelArray;
+@property(weak, nonatomic) IBOutlet UIView *topVIew;
+@property(weak, nonatomic) IBOutlet UITableView *AlltableView;
+@property(weak, nonatomic) IBOutlet UITableView *NoPaytableView;
+@property(weak, nonatomic) IBOutlet UITableView *IngtableView;
+@property(weak, nonatomic) IBOutlet UITableView *CanceltableView;
+@property(weak, nonatomic) IBOutlet UITableView *DonetableView;
+
+@property(weak, nonatomic) IBOutlet UIView *Image1;
+@property(weak, nonatomic) IBOutlet UIView *Image2;
+@property(weak, nonatomic) IBOutlet UIView *Image3;
+@property(weak, nonatomic) IBOutlet UIView *Image4;
+@property(weak, nonatomic) IBOutlet UIView *Image5;
+
+@property(weak, nonatomic) IBOutlet UIImageView *xiahuaxian1;
+@property(weak, nonatomic) IBOutlet UIImageView *xiahuaxian2;
+@property(weak, nonatomic) IBOutlet UIImageView *xiahuaxian3;
+@property(weak, nonatomic) IBOutlet UIImageView *xiahuaxian5;
+@property(weak, nonatomic) IBOutlet UIImageView *xiahuaxian4;
+@property(weak, nonatomic) IBOutlet NSLayoutConstraint *top;
+
+@property(strong, nonatomic) NSMutableArray *AllArray;
+@property(strong, nonatomic) NSMutableArray *NoPayArray;
+@property(strong, nonatomic) NSMutableArray *IngArray;
+@property(strong, nonatomic) NSMutableArray *DoneArray;
+@property(strong, nonatomic) NSMutableArray *CancelArray;
 
 @end
 
-@implementation OrderFormViewController
-{
+@implementation OrderFormViewController {
     BOOL InAll;
     BOOL InNoPay;
     BOOL InIng;
     BOOL InDone;
     BOOL InCancel;
 }
+- (instancetype)init {
+    if (self = [super init]) {
+        InAll = YES;
+        InNoPay = NO;
+        InIng = NO;
+        InDone = NO;
+        InCancel = NO;
+    }
+    return self;
+}
+
+- (instancetype)initWithTab:(NSInteger)tab {
+    InAll = NO;
+    InNoPay = NO;
+    InIng = NO;
+    InDone = NO;
+    InCancel = NO;
+    if (self = [super init]) {
+        switch (tab) {
+            case 1: {
+                InAll = YES;
+                break;
+            }
+            case 2: {
+                InNoPay = YES;
+                break;
+            }
+            case 3: {
+                InIng = YES;
+                break;
+            }
+            case 4: {
+                InCancel = YES;
+                break;
+            }
+            case 5: {
+                InDone = YES;
+                break;
+            }
+            default:
+                break;
+        }
+    }
+    return self;
+}
 
 - (NSMutableArray *)AllArray {
     if (!_AllArray) {
@@ -90,30 +133,30 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    if ([UIScreen spt_currentScreenMode]== LESScreenModeIPhoneX){
+    if ([UIScreen spt_currentScreenMode] == LESScreenModeIPhoneX) {
         _top.constant = 100;
     }
-    
-    InAll = YES;
-    InNoPay = NO;
-    InIng = NO;
-    InDone = NO;
-    InCancel = NO;
-    
+
+//    InAll = YES;
+//    InNoPay = NO;
+//    InIng = NO;
+//    InDone = NO;
+//    InCancel = NO;
+
     self.navigationItem.title = @"技能订单";
-    
-    UIButton * btn = [UIButton buttonWithType:UIButtonTypeCustom];
+
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
     btn.frame = CGRectMake(0, 0, 40, 40);
     [btn setImage:[UIImage imageNamed:@"backBtn"] forState:UIControlStateNormal];
-    btn.imageEdgeInsets =  UIEdgeInsetsMake(0, -20, 0, 0);
+    btn.imageEdgeInsets = UIEdgeInsetsMake(0, -20, 0, 0);
     [btn addTarget:self action:@selector(backClick) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithCustomView:btn];
-    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
     nagetiveSpacer.width = -12;//这个值可以根据自己需要自己调整
     self.navigationItem.leftBarButtonItems = @[nagetiveSpacer, leftItem];
-    
+
     self.topVIew.frame = CGRectMake(0, 44, ScreenWidth, 44);
-    
+
     // Do any additional setup after loading the view.
     UITapGestureRecognizer *Tap1 = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(ImageTap1:)];
     [self.Image1 addGestureRecognizer:Tap1];
@@ -125,25 +168,25 @@
     [self.Image4 addGestureRecognizer:Tap4];
     UITapGestureRecognizer *Tap5 = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(ImageTap5:)];
     [self.Image5 addGestureRecognizer:Tap5];
-    
+
     self.Image1.userInteractionEnabled = YES;
     self.Image2.userInteractionEnabled = YES;
     self.Image3.userInteractionEnabled = YES;
     self.Image4.userInteractionEnabled = YES;
     self.Image5.userInteractionEnabled = YES;
-    
-    self.AlltableView.hidden = NO;
-    self.NoPaytableView.hidden = YES;
-    self.IngtableView.hidden = YES;
-    self.DonetableView.hidden = YES;
-    self.CanceltableView.hidden = YES;
-    
-    self.xiahuaxian1.hidden = NO;
-    self.xiahuaxian2.hidden = YES;
-    self.xiahuaxian3.hidden = YES;
-    self.xiahuaxian4.hidden = YES;
-    self.xiahuaxian5.hidden = YES;
-    
+
+    self.AlltableView.hidden = !InAll;
+    self.NoPaytableView.hidden = !InNoPay;
+    self.IngtableView.hidden = !InIng;
+    self.DonetableView.hidden = !InDone;
+    self.CanceltableView.hidden = !InCancel;
+
+    self.xiahuaxian1.hidden = !InAll;
+    self.xiahuaxian2.hidden = !InNoPay;
+    self.xiahuaxian3.hidden = !InIng;
+    self.xiahuaxian4.hidden = !InDone;
+    self.xiahuaxian5.hidden = !InCancel;
+
     self.AlltableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(refreshList)];
     self.AlltableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
     self.NoPaytableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(refreshList)];
@@ -154,379 +197,382 @@
     self.DonetableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
     self.CanceltableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(refreshList)];
     self.CanceltableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
+
+    [self refreshList];
 }
 
--(void)refreshList{
-    
+- (void)refreshList {
+
     index = 1;
     if (InAll) {
         [self.AllArray removeAllObjects];
         [self getList:@"all"];
     }
-    
+
     if (InNoPay) {
         [self.NoPayArray removeAllObjects];
         [self getList:@"1"];
     }
-    
+
     if (InIng) {
         [self.IngArray removeAllObjects];
         [self getList:@"2"];
     }
-    
+
     if (InDone) {
         [self.DoneArray removeAllObjects];
         [self getList:@"3"];
     }
-    
+
     if (InCancel) {
         [self.CancelArray removeAllObjects];
         [self getList:@"4"];
     }
 }
 
-- (void)loadMoreData{
-    
+- (void)loadMoreData {
+
     index++;
     if (InAll) {
         [self getList:@"all"];
     }
-    
+
     if (InNoPay) {
         [self getList:@"1"];
     }
-    
+
     if (InIng) {
         [self getList:@"2"];
     }
-    
+
     if (InDone) {
         [self getList:@"3"];
     }
-    
+
     if (InCancel) {
         [self getList:@"4"];
     }
 }
 
-- (void)viewWillAppear:(BOOL)animated{
-    
+- (void)viewWillAppear:(BOOL)animated {
+
     index = 1;
     if (InAll) {
         [self.AllArray removeAllObjects];
         [self getList:@"all"];
     }
-    
+
     if (InNoPay) {
         [self.NoPayArray removeAllObjects];
         [self getList:@"1"];
     }
-    
+
     if (InIng) {
         [self.IngArray removeAllObjects];
         [self getList:@"2"];
     }
-    
+
     if (InDone) {
         [self.DoneArray removeAllObjects];
         [self getList:@"3"];
     }
-    
+
     if (InCancel) {
         [self.CancelArray removeAllObjects];
         [self getList:@"4"];
     }
 }
 
-- (void)getList:(NSString*)state{
-    
-    NSString *indexStr = [NSString stringWithFormat:@"%zd",index];
-    NSString *str = [NSString stringWithFormat:@"%@order?action=doGetOrder&pk=%@&state=%@&index=%@&size=%@",webURL,[Helper sharedAccount].accid,state,indexStr,@"10"];
-    
-    [[AHHttpManager sharedManager]POST:str parameters:nil success:^(id responseObject) {
-        NSLog(@"%@",responseObject);
-        if ([[responseObject objectForKey:@"msg"]isEqualToString:@"success"]) {
-            NSArray *data = responseObject[@"data"];
-            NSArray * array = [OrderModel arrayOfModelsFromDictionaries:data];
-            
-            NSString *number = responseObject[@"count"];
-            NSInteger num = [number integerValue];
-            
-            if ([state isEqualToString:@"all"]) {
-                [self.AllArray addObjectsFromArray:array];
-                [self.AlltableView reloadData];
-                
-                [self.AlltableView.mj_header endRefreshing];
-                
-                if (num == self.AllArray.count || num == 0) {
-                    [self.AlltableView.mj_footer endRefreshingWithNoMoreData];
-                }else{
-                    [self.AlltableView.mj_footer endRefreshing];
-                }
-            }else if ([state isEqualToString:@"1"]){
-                [self.NoPayArray addObjectsFromArray:array];
-                [self.NoPaytableView reloadData];
-                
-                [self.NoPaytableView.mj_header endRefreshing];
-                
-                if (num == self.NoPayArray.count || num == 0) {
-                    [self.NoPaytableView.mj_footer endRefreshingWithNoMoreData];
-                }else{
-                    [self.NoPaytableView.mj_footer endRefreshing];
-                }
-            }else if ([state isEqualToString:@"2"]){
-                [self.IngArray addObjectsFromArray:array];
-                [self.IngtableView reloadData];
-                
-                [self.IngtableView.mj_header endRefreshing];
-                
-                if (num == self.IngArray.count || num == 0) {
-                    [self.IngtableView.mj_footer endRefreshingWithNoMoreData];
-                }else{
-                    [self.IngtableView.mj_footer endRefreshing];
-                }
-            }else if ([state isEqualToString:@"3"]){
-                [self.DoneArray addObjectsFromArray:array];
-                [self.DonetableView reloadData];
-                
-                [self.DonetableView.mj_header endRefreshing];
-                
-                if (num == self.DoneArray.count || num == 0) {
-                    [self.DonetableView.mj_footer endRefreshingWithNoMoreData];
-                }else{
-                    [self.DonetableView.mj_footer endRefreshing];
-                }
-            }else if ([state isEqualToString:@"4"]){
-                [self.CancelArray addObjectsFromArray:array];
-                [self.CanceltableView reloadData];
-                
-                [self.CanceltableView.mj_header endRefreshing];
-                
-                if (num == self.CancelArray.count || num == 0) {
-                    [self.CanceltableView.mj_footer endRefreshingWithNoMoreData];
-                }else{
-                    [self.CanceltableView.mj_footer endRefreshing];
-                }
-            }
-        }else{
-            [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
-        }
-    } failure:^(NSError *error) {
-        NSLog(@"error = %@",error);
-        [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
-    }];
+- (void)getList:(NSString *)state {
+
+    NSString *indexStr = [NSString stringWithFormat:@"%zd", index];
+    NSString *str = [NSString stringWithFormat:@"%@order?action=doGetOrder&pk=%@&state=%@&index=%@&size=%@", webURL, [Helper sharedAccount].accid, state, indexStr, @"10"];
+
+    [[AHHttpManager sharedManager]
+            POST:str
+      parameters:nil
+         success:^(id responseObject) {
+             NSLog(@"%@", responseObject);
+             if ([[responseObject objectForKey:@"msg"] isEqualToString:@"success"]) {
+                 NSArray *data = responseObject[@"data"];
+                 NSArray *array = [OrderModel arrayOfModelsFromDictionaries:data];
+
+                 NSString *number = responseObject[@"count"];
+                 NSInteger num = [number integerValue];
+
+                 if ([state isEqualToString:@"all"]) {
+                     [self.AllArray addObjectsFromArray:array];
+                     [self.AlltableView reloadData];
+
+                     [self.AlltableView.mj_header endRefreshing];
+
+                     if (num == self.AllArray.count || num == 0) {
+                         [self.AlltableView.mj_footer endRefreshingWithNoMoreData];
+                     } else {
+                         [self.AlltableView.mj_footer endRefreshing];
+                     }
+                 } else if ([state isEqualToString:@"1"]) {
+                     [self.NoPayArray addObjectsFromArray:array];
+                     [self.NoPaytableView reloadData];
+
+                     [self.NoPaytableView.mj_header endRefreshing];
+
+                     if (num == self.NoPayArray.count || num == 0) {
+                         [self.NoPaytableView.mj_footer endRefreshingWithNoMoreData];
+                     } else {
+                         [self.NoPaytableView.mj_footer endRefreshing];
+                     }
+                 } else if ([state isEqualToString:@"2"]) {
+                     [self.IngArray addObjectsFromArray:array];
+                     [self.IngtableView reloadData];
+
+                     [self.IngtableView.mj_header endRefreshing];
+
+                     if (num == self.IngArray.count || num == 0) {
+                         [self.IngtableView.mj_footer endRefreshingWithNoMoreData];
+                     } else {
+                         [self.IngtableView.mj_footer endRefreshing];
+                     }
+                 } else if ([state isEqualToString:@"3"]) {
+                     [self.DoneArray addObjectsFromArray:array];
+                     [self.DonetableView reloadData];
+
+                     [self.DonetableView.mj_header endRefreshing];
+
+                     if (num == self.DoneArray.count || num == 0) {
+                         [self.DonetableView.mj_footer endRefreshingWithNoMoreData];
+                     } else {
+                         [self.DonetableView.mj_footer endRefreshing];
+                     }
+                 } else if ([state isEqualToString:@"4"]) {
+                     [self.CancelArray addObjectsFromArray:array];
+                     [self.CanceltableView reloadData];
+
+                     [self.CanceltableView.mj_header endRefreshing];
+
+                     if (num == self.CancelArray.count || num == 0) {
+                         [self.CanceltableView.mj_footer endRefreshingWithNoMoreData];
+                     } else {
+                         [self.CanceltableView.mj_footer endRefreshing];
+                     }
+                 }
+             } else {
+                 [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
+             }
+         }
+         failure:^(NSError *error) {
+             NSLog(@"error = %@", error);
+             [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
+         }];
 }
 
-- (void)ImageTap1:(UITapGestureRecognizer*)recognizer{
-    
+- (void)ImageTap1:(UITapGestureRecognizer *)recognizer {
+
     self.AlltableView.hidden = NO;
     self.NoPaytableView.hidden = YES;
     self.IngtableView.hidden = YES;
     self.DonetableView.hidden = YES;
     self.CanceltableView.hidden = YES;
-    
+
     self.xiahuaxian1.hidden = NO;
     self.xiahuaxian2.hidden = YES;
     self.xiahuaxian3.hidden = YES;
     self.xiahuaxian4.hidden = YES;
     self.xiahuaxian5.hidden = YES;
-    
+
     InAll = YES;
     InNoPay = NO;
     InIng = NO;
     InDone = NO;
     InCancel = NO;
-    
+
     index = 1;
     [self.AllArray removeAllObjects];
-    
+
     [self getList:@"all"];
 }
 
-- (void)ImageTap2:(UITapGestureRecognizer*)recognizer{
-    
+- (void)ImageTap2:(UITapGestureRecognizer *)recognizer {
+
     self.AlltableView.hidden = YES;
     self.NoPaytableView.hidden = NO;
     self.IngtableView.hidden = YES;
     self.DonetableView.hidden = YES;
     self.CanceltableView.hidden = YES;
-    
+
     self.xiahuaxian1.hidden = YES;
     self.xiahuaxian2.hidden = NO;
     self.xiahuaxian3.hidden = YES;
     self.xiahuaxian4.hidden = YES;
     self.xiahuaxian5.hidden = YES;
-    
+
     InAll = NO;
     InNoPay = YES;
     InIng = NO;
     InDone = NO;
     InCancel = NO;
-    
+
     index = 1;
     [self.NoPayArray removeAllObjects];
-    
+
     [self getList:@"1"];
 }
 
-- (void)ImageTap3:(UITapGestureRecognizer*)recognizer{
-    
+- (void)ImageTap3:(UITapGestureRecognizer *)recognizer {
+
     self.AlltableView.hidden = YES;
     self.NoPaytableView.hidden = YES;
     self.IngtableView.hidden = NO;
     self.DonetableView.hidden = YES;
     self.CanceltableView.hidden = YES;
-    
+
     self.xiahuaxian1.hidden = YES;
     self.xiahuaxian2.hidden = YES;
     self.xiahuaxian3.hidden = NO;
     self.xiahuaxian4.hidden = YES;
     self.xiahuaxian5.hidden = YES;
-    
+
     InAll = NO;
     InNoPay = NO;
     InIng = YES;
     InDone = NO;
     InCancel = NO;
-    
+
     index = 1;
     [self.IngArray removeAllObjects];
-    
+
     [self getList:@"2"];
 }
 
-- (void)ImageTap4:(UITapGestureRecognizer*)recognizer{
-    
+- (void)ImageTap4:(UITapGestureRecognizer *)recognizer {
+
     self.AlltableView.hidden = YES;
     self.NoPaytableView.hidden = YES;
     self.IngtableView.hidden = YES;
     self.DonetableView.hidden = NO;
     self.CanceltableView.hidden = YES;
-    
+
     self.xiahuaxian1.hidden = YES;
     self.xiahuaxian2.hidden = YES;
     self.xiahuaxian3.hidden = YES;
     self.xiahuaxian4.hidden = NO;
     self.xiahuaxian5.hidden = YES;
-    
+
     InAll = NO;
     InNoPay = NO;
     InIng = NO;
     InDone = YES;
     InCancel = NO;
-    
+
     index = 1;
     [self.DoneArray removeAllObjects];
-    
+
     [self getList:@"3"];
 }
 
-- (void)ImageTap5:(UITapGestureRecognizer*)recognizer{
-    
+- (void)ImageTap5:(UITapGestureRecognizer *)recognizer {
+
     self.AlltableView.hidden = YES;
     self.NoPaytableView.hidden = YES;
     self.IngtableView.hidden = YES;
     self.DonetableView.hidden = YES;
     self.CanceltableView.hidden = NO;
-    
+
     self.xiahuaxian1.hidden = YES;
     self.xiahuaxian2.hidden = YES;
     self.xiahuaxian3.hidden = YES;
     self.xiahuaxian4.hidden = YES;
     self.xiahuaxian5.hidden = NO;
-    
+
     InAll = NO;
     InNoPay = NO;
     InIng = NO;
     InDone = NO;
     InCancel = YES;
-    
+
     index = 1;
     [self.CancelArray removeAllObjects];
-    
+
     [self getList:@"4"];
 }
 
--(void)backClick{
+- (void)backClick {
     [self.navigationController popViewControllerAnimated:YES];
 }
 
 #pragma mark - deleDate
--(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
     return 1;
 }
 
-- (CGFloat) tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
-{
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
     return 0.0000000001;
 }
 
--(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
-{
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     return 165;
 }
 
--(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
-    if (tableView==self.AlltableView) {
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    if (tableView == self.AlltableView) {
         return self.AllArray.count;
-    }else if (tableView==self.NoPaytableView){
+    } else if (tableView == self.NoPaytableView) {
         return self.NoPayArray.count;
-    }else if (tableView==self.IngtableView){
+    } else if (tableView == self.IngtableView) {
         return self.IngArray.count;
-    }else if (tableView==self.DonetableView){
+    } else if (tableView == self.DonetableView) {
         return self.DoneArray.count;
-    }else if (tableView==self.CanceltableView){
+    } else if (tableView == self.CanceltableView) {
         return self.CancelArray.count;
     }
     return 0;
 }
 
--(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    if (tableView==self.AlltableView) {
-        OrderCell * cell = [tableView dequeueReusableCellWithIdentifier:@"OrderCell"];
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    if (tableView == self.AlltableView) {
+        OrderCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderCell"];
         if (!cell) {
-            cell = [[[UINib nibWithNibName:@"OrderCell" bundle:nil]instantiateWithOwner:self options:nil]lastObject];
+            cell = [[[UINib nibWithNibName:@"OrderCell" bundle:nil] instantiateWithOwner:self options:nil] lastObject];
             cell.selectionStyle = UITableViewCellSelectionStyleNone;
             cell.model = [self.AllArray objectAtIndex:indexPath.row];
             cell.delegate = self;
         }
         return cell;
 
-    }else if (tableView==self.IngtableView){
-        OrderCell * cell = [tableView dequeueReusableCellWithIdentifier:@"OrderCell"];
+    } else if (tableView == self.IngtableView) {
+        OrderCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderCell"];
         if (!cell) {
-            cell = [[[UINib nibWithNibName:@"OrderCell" bundle:nil]instantiateWithOwner:self options:nil]lastObject];
+            cell = [[[UINib nibWithNibName:@"OrderCell" bundle:nil] instantiateWithOwner:self options:nil] lastObject];
             cell.selectionStyle = UITableViewCellSelectionStyleNone;
             cell.model = [self.IngArray objectAtIndex:indexPath.row];
             cell.delegate = self;
         }
         return cell;
 
-    }else if (tableView==self.NoPaytableView){
-        OrderCell * cell = [tableView dequeueReusableCellWithIdentifier:@"OrderCell"];
+    } else if (tableView == self.NoPaytableView) {
+        OrderCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderCell"];
         if (!cell) {
-            cell = [[[UINib nibWithNibName:@"OrderCell" bundle:nil]instantiateWithOwner:self options:nil]lastObject];
+            cell = [[[UINib nibWithNibName:@"OrderCell" bundle:nil] instantiateWithOwner:self options:nil] lastObject];
             cell.selectionStyle = UITableViewCellSelectionStyleNone;
             cell.model = [self.NoPayArray objectAtIndex:indexPath.row];
             cell.delegate = self;
         }
         return cell;
 
-    }else if (tableView==self.DonetableView){
-        OrderCell * cell = [tableView dequeueReusableCellWithIdentifier:@"OrderCell"];
+    } else if (tableView == self.DonetableView) {
+        OrderCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderCell"];
         if (!cell) {
-            cell = [[[UINib nibWithNibName:@"OrderCell" bundle:nil]instantiateWithOwner:self options:nil]lastObject];
+            cell = [[[UINib nibWithNibName:@"OrderCell" bundle:nil] instantiateWithOwner:self options:nil] lastObject];
             cell.selectionStyle = UITableViewCellSelectionStyleNone;
             cell.model = [self.DoneArray objectAtIndex:indexPath.row];
             cell.delegate = self;
         }
         return cell;
-    }else if (tableView==self.CanceltableView){
-        OrderCell * cell = [tableView dequeueReusableCellWithIdentifier:@"OrderCell"];
+    } else if (tableView == self.CanceltableView) {
+        OrderCell *cell = [tableView dequeueReusableCellWithIdentifier:@"OrderCell"];
         if (!cell) {
-            cell = [[[UINib nibWithNibName:@"OrderCell" bundle:nil]instantiateWithOwner:self options:nil]lastObject];
+            cell = [[[UINib nibWithNibName:@"OrderCell" bundle:nil] instantiateWithOwner:self options:nil] lastObject];
             cell.selectionStyle = UITableViewCellSelectionStyleNone;
             cell.model = [self.CancelArray objectAtIndex:indexPath.row];
             cell.delegate = self;
@@ -537,28 +583,29 @@
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    OrderModel*model;
+    OrderModel *model;
     if (InAll) {
         model = [self.AllArray objectAtIndex:indexPath.row];
-    }else if (InNoPay){
+    } else if (InNoPay) {
         model = [self.NoPayArray objectAtIndex:indexPath.row];
-    }else if (InIng){
+    } else if (InIng) {
         model = [self.IngArray objectAtIndex:indexPath.row];
-    }else if (InDone){
+    } else if (InDone) {
         model = [self.DoneArray objectAtIndex:indexPath.row];
-    }else if (InCancel){
+    } else if (InCancel) {
         model = [self.CancelArray objectAtIndex:indexPath.row];
     }
     NSString *orderpk = model.orderpk;
     NSString *orderState = model.orderstate;
-    OrderDetailViewController *pVc = [[OrderDetailViewController alloc]init];
+    OrderDetailViewController *pVc = [[OrderDetailViewController alloc] init];
     pVc.orderState = orderState;
     pVc.orderpk = orderpk;
     [self.navigationController pushViewController:pVc animated:YES];
 }
 
 #pragma mark 代理事件
-- (void)toPayOrder:(NSString*)orderpk memberPK:(NSString *)memberPk{
+
+- (void)toPayOrder:(NSString *)orderpk memberPK:(NSString *)memberPk {
 //    NSString *str = [NSString stringWithFormat:@"%@order?action=domemberpayorder&orderpk=%@",webURL,orderpk];
 //    [[AHHttpManager sharedManager]POST:str parameters:nil success:^(id responseObject) {
 //        NSLog(@"%@",responseObject);
@@ -577,82 +624,82 @@
 //        NSLog(@"error = %@",error);
 //        [MBProgressHUD showTextHUD:@"付款失败" inView:self.view hideAfterDelay:1];
 //    }];
-    PayOrderViewController *pVc = [[PayOrderViewController alloc]init];
+    PayOrderViewController *pVc = [[PayOrderViewController alloc] init];
     pVc.orderpk = orderpk;
     pVc.isOrderFrom = YES;
     pVc.memberpk = memberPk;
     [self.navigationController pushViewController:pVc animated:YES];
 }
 
-- (void)cancelOrder:(NSString*)orderpk{
-    NSString *str = [NSString stringWithFormat:@"%@order?action=domembercancelorder&orderpk=%@",webURL,orderpk];
-    [[AHHttpManager sharedManager]POST:str parameters:nil success:^(id responseObject) {
-        NSLog(@"%@",responseObject);
-        if ([[responseObject objectForKey:@"msg"]isEqualToString:@"success"]) {
+- (void)cancelOrder:(NSString *)orderpk {
+    NSString *str = [NSString stringWithFormat:@"%@order?action=domembercancelorder&orderpk=%@", webURL, orderpk];
+    [[AHHttpManager sharedManager] POST:str parameters:nil success:^(id responseObject) {
+        NSLog(@"%@", responseObject);
+        if ([[responseObject objectForKey:@"msg"] isEqualToString:@"success"]) {
             [MBProgressHUD showTextHUD:@"订单已取消" inView:self.view hideAfterDelay:1];
-            if(InAll){
+            if (InAll) {
                 [self getList:@"all"];
-            }else if (InNoPay){
+            } else if (InNoPay) {
                 [self getList:@"1"];
-            }else if (InIng){
+            } else if (InIng) {
                 [self getList:@"2"];
-            }else if (InDone){
+            } else if (InDone) {
                 [self getList:@"3"];
-            }else if (InCancel){
+            } else if (InCancel) {
                 [self getList:@"4"];
             }
-        }else{
+        } else {
             [MBProgressHUD showTextHUD:@"取消失败" inView:self.view hideAfterDelay:1];
         }
-    } failure:^(NSError *error) {
-        NSLog(@"error = %@",error);
+    }                           failure:^(NSError *error) {
+        NSLog(@"error = %@", error);
         [MBProgressHUD showTextHUD:@"取消失败" inView:self.view hideAfterDelay:1];
     }];
 }
 
--(void)viewDidLayoutSubviews {
-    
+- (void)viewDidLayoutSubviews {
+
     if ([self.AlltableView respondsToSelector:@selector(setSeparatorInset:)]) {
         [self.AlltableView setSeparatorInset:UIEdgeInsetsZero];
     }
-    if ([self.AlltableView respondsToSelector:@selector(setLayoutMargins:)])  {
+    if ([self.AlltableView respondsToSelector:@selector(setLayoutMargins:)]) {
         [self.AlltableView setLayoutMargins:UIEdgeInsetsZero];
     }
-    
+
     if ([self.NoPaytableView respondsToSelector:@selector(setSeparatorInset:)]) {
         [self.NoPaytableView setSeparatorInset:UIEdgeInsetsZero];
     }
-    if ([self.NoPaytableView respondsToSelector:@selector(setLayoutMargins:)])  {
+    if ([self.NoPaytableView respondsToSelector:@selector(setLayoutMargins:)]) {
         [self.NoPaytableView setLayoutMargins:UIEdgeInsetsZero];
     }
-    
+
     if ([self.IngtableView respondsToSelector:@selector(setSeparatorInset:)]) {
         [self.IngtableView setSeparatorInset:UIEdgeInsetsZero];
     }
-    if ([self.IngtableView respondsToSelector:@selector(setLayoutMargins:)])  {
+    if ([self.IngtableView respondsToSelector:@selector(setLayoutMargins:)]) {
         [self.IngtableView setLayoutMargins:UIEdgeInsetsZero];
     }
-    
+
     if ([self.DonetableView respondsToSelector:@selector(setSeparatorInset:)]) {
         [self.DonetableView setSeparatorInset:UIEdgeInsetsZero];
     }
-    if ([self.DonetableView respondsToSelector:@selector(setLayoutMargins:)])  {
+    if ([self.DonetableView respondsToSelector:@selector(setLayoutMargins:)]) {
         [self.DonetableView setLayoutMargins:UIEdgeInsetsZero];
     }
-    
+
     if ([self.CanceltableView respondsToSelector:@selector(setSeparatorInset:)]) {
         [self.CanceltableView setSeparatorInset:UIEdgeInsetsZero];
     }
-    if ([self.CanceltableView respondsToSelector:@selector(setLayoutMargins:)])  {
+    if ([self.CanceltableView respondsToSelector:@selector(setLayoutMargins:)]) {
         [self.CanceltableView setLayoutMargins:UIEdgeInsetsZero];
     }
 }
 
--(void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat{
+- (void)tableView:(UITableView *)tableView willDisplayCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPat {
     if ([cell respondsToSelector:@selector(setLayoutMargins:)]) {
         [cell setLayoutMargins:UIEdgeInsetsZero];
     }
-    if ([cell respondsToSelector:@selector(setSeparatorInset:)]){
+    if ([cell respondsToSelector:@selector(setSeparatorInset:)]) {
         [cell setSeparatorInset:UIEdgeInsetsZero];
     }
 }

+ 1 - 4
千模/MyInfo/SharePopViewController.h

@@ -8,8 +8,5 @@
 
 #import <UIKit/UIKit.h>
 
-@class HomeModel;
-
-@interface ShareViewController : UIViewController
-- (instancetype)initWithModel:(HomeModel *)model;
+@interface SharePopViewController : UIViewController
 @end

+ 62 - 234
千模/MyInfo/SharePopViewController.m

@@ -6,86 +6,48 @@
 //  Copyright © 2018年 Cen Zhou. All rights reserved.
 //
 
-#import "ShareViewController.h"
-#import "HomeModel.h"
-#import "ShareCell.h"
-#import <UMSocialCore/UMSocialCore.h>
+#import "SharePopViewController.h"
+#import <WXApi.h>
 
-static NSString *shareCell = @"shareCell";
-
-@interface ShareViewController () <UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout>
-@property(nonatomic, strong) UICollectionView *collectionView;
-@property(nonatomic, strong) UIView *contentView;
-@property(nonatomic, strong) NSMutableArray *dataArray;
-@property(nonatomic, strong) HomeModel *model;
+@interface SharePopViewController ()
+@property(weak, nonatomic) IBOutlet UIView *contentView;
+@property(weak, nonatomic) IBOutlet UIImageView *shareWechat;
+@property(weak, nonatomic) IBOutlet UIImageView *shareTimeline;
 @end
 
-@implementation ShareViewController
-- (instancetype)initWithModel:(HomeModel *)model {
-    if (self = [super init]) {
-        _model = model;
-        [self addData];
+@implementation SharePopViewController
+- (instancetype)init {
+    self = [super init];
+    if (self) {
         self.modalPresentationStyle = UIModalPresentationOverCurrentContext;
         self.view.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0];
         self.view.userInteractionEnabled = YES;
     }
+    return self;
+}
 
+- (instancetype)initWithCoder:(NSCoder *)coder {
+    self = [super initWithCoder:coder];
+    if (self) {
+        self.modalPresentationStyle = UIModalPresentationOverCurrentContext;
+        self.view.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0];
+        self.view.userInteractionEnabled = YES;
+    }
     return self;
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(fingerTapped:)];
-    singleTap.cancelsTouchesInView = NO;
-    [self.view addGestureRecognizer:singleTap];
-
-    UIView *contentView = [[UIView alloc] init];
-    contentView.backgroundColor = [UIColor clearColor];
-    self.contentView = contentView;
-    [self.view addSubview:contentView];
-    [contentView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.bottom.left.right.equalTo(self.view);
-        make.height.mas_equalTo(200 * HEIGHT);
-    }];
-    contentView.transform = CGAffineTransformMakeTranslation(0, 200);
-
-    UIView *shareItemView = [[UIView alloc] init];
-    shareItemView.backgroundColor = KLColor_C1;
-    [contentView addSubview:shareItemView];
-    shareItemView.layer.masksToBounds = YES;
-    shareItemView.layer.cornerRadius = 10 * WIDTH;
-    [shareItemView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.left.right.equalTo(contentView);
-        make.bottom.equalTo(contentView).offset(-20 * HEIGHT);
-    }];
-
-    [contentView addSubview:self.collectionView];
-
-    UIView *cancelView = [[UIView alloc] init];
-    cancelView.backgroundColor = [UIColor whiteColor];
-    [contentView addSubview:cancelView];
-    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapCancel)];
-    [cancelView addGestureRecognizer:tap];
-    [cancelView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.bottom.equalTo(contentView);
-        make.height.mas_equalTo(44 * HEIGHT);
-    }];
-
-    UILabel *cancelTint = [[UILabel alloc] init];
-    cancelTint.text = @"取消";
-    cancelTint.textColor = KLColor_B12;
-    cancelTint.font = [UIFont fontWithName:@"PingFangSC-Regular" size:16 * WIDTH];
-    [cancelView addSubview:cancelTint];
-    [cancelTint mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.center.equalTo(cancelView);
-    }];
+    self.contentView.transform = CGAffineTransformMakeTranslation(0, 164);
+    self.shareWechat.userInteractionEnabled = YES;
+    self.shareTimeline.userInteractionEnabled = YES;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [UIView animateWithDuration:0.2
                           delay:0
-                        options:UIViewAnimationOptionCurveEaseInOut
+                        options:UIViewAnimationOptionCurveEaseOut
                      animations:^{
                          self.contentView.transform = CGAffineTransformMakeTranslation(0, 0);
                          self.view.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0.2];
@@ -93,23 +55,40 @@ static NSString *shareCell = @"shareCell";
                      completion:nil];
 }
 
-- (void)addData {
-    self.dataArray = [@[@{@"tint": @"微信好友", @"imageName": @"icon_fenxiang_weixin"}, @{@"tint": @"微信朋友圈", @"imageName": @"icon__fenxiang_pengyouquan"}, @{@"tint": @"手机QQ", @"imageName": @"icon_fenxiang_qq"}, @{@"tint": @"QQ空间", @"imageName": @"icon_fenxiang_qqkongjian"}, @{@"tint": @"微博", @"imageName": @"icon_fenxiang_xinlang"}, @{@"tint": @"违规举报", @"imageName": @"icon_fenxiang_jubao"}] mutableCopy];
+- (IBAction)cancel:(id)sender {
+    [self dismiss];
 }
 
-- (void)fingerTapped:(UITapGestureRecognizer *)gestureRecognizer {
-    CGPoint point = [gestureRecognizer locationInView:self.contentView];
-    if (point.y < 0) {
-        [self tapCancel];
-    }
+- (IBAction)tapItem:(id)sender {
+    NSString *str = [NSString stringWithFormat:@"%@memberInfo?action=getuserinfo&PK=%@", webURL, [Helper sharedAccount].accid];
+    [[AHHttpManager sharedManager]
+            POST:str parameters:nil
+         success:^(id responseObject) {
+             NSLog(@"%@", responseObject);
+             if ([[responseObject objectForKey:@"msg"] isEqualToString:@"success"]) {
+                 NSDictionary *data = responseObject[@"data"];
+
+                 if (((UITapGestureRecognizer *) sender).view.tag == 1) {
+                     [self shareToWechat:WXSceneSession withTitle:@"千模通告" description:@"千模通告" url:[NSString stringWithFormat:@"http://www.baidu.com/?code=%@", data[@"qrcode"]]];
+                 } else if (((UITapGestureRecognizer *) sender).view.tag == 2) {
+                     [self shareToWechat:WXSceneTimeline withTitle:@"千模通告" description:@"千模通告" url:[NSString stringWithFormat:@"http://www.baidu.com/?code=%@", data[@"qrcode"]]];
+                 }
+             } else {
+                 [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
+             }
+         } failure:^(NSError *error) {
+                NSLog(@"error = %@", error);
+                [MBProgressHUD showTextHUD:@"超时" inView:self.view hideAfterDelay:1];
+            }];
+    [self dismiss];
 }
 
-- (void)tapCancel {
+- (void)dismiss {
     [UIView animateWithDuration:0.2
                           delay:0
                         options:UIViewAnimationOptionCurveEaseInOut
                      animations:^{
-                         self.contentView.transform = CGAffineTransformMakeTranslation(0, 200);
+                         self.contentView.transform = CGAffineTransformMakeTranslation(0, 164);
                          self.view.backgroundColor = [UIColor colorWithRed:0 green:0 blue:0 alpha:0];
                      }
                      completion:^(BOOL finished) {
@@ -117,171 +96,20 @@ static NSString *shareCell = @"shareCell";
                      }];
 }
 
-
-- (UICollectionView *)collectionView {
-    if (!_collectionView) {
-        UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        // 设置collectionView的滚动方向,需要注意的是如果使用了collectionview的headerview或者footerview的话, 如果设置了水平滚动方向的话,那么就只有宽度起作用了了
-        [layout setScrollDirection:UICollectionViewScrollDirectionHorizontal];
-        [layout setMinimumLineSpacing:30 * HEIGHT];
-        [layout setMinimumInteritemSpacing:0 * WIDTH];
-        [layout setItemSize:CGSizeMake(50 * WIDTH, 80 * HEIGHT)];
-
-        _collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 40 * HEIGHT, KLScreenW, 80 * HEIGHT) collectionViewLayout:layout];
-        _collectionView.contentInset = UIEdgeInsetsMake(0, 15 * WIDTH, 0, 15 * WIDTH);
-        _collectionView.backgroundColor = [UIColor clearColor];
-        [_collectionView registerClass:[ShareCell class] forCellWithReuseIdentifier:shareCell];
-        //注册头视图
-        _collectionView.dataSource = self;
-        _collectionView.delegate = self;
-        _collectionView.showsHorizontalScrollIndicator = NO;
-        _collectionView.showsVerticalScrollIndicator = NO;
-        _collectionView.bounces = YES;
-    }
-    return _collectionView;
-}
-
-#pragma mark -- UICollectionViewDataSource
-
-/** 每组cell的个数*/
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    return self.dataArray.count;
-}
-
-/** cell的内容*/
-- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-
-    ShareCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:shareCell forIndexPath:indexPath];
-//    cell.backgroundColor = [UIColor whiteColor];
-//    [cell.titleBtn setTitle:self.dataArray[indexPath.row] forState:UIControlStateNormal];
-    NSDictionary *dic = self.dataArray[indexPath.row];
-    cell.logoImageView.image = [UIImage imageNamed:dic[@"imageName"]];
-    cell.tint.text = dic[@"tint"];
-    return cell;
-}
-
-
-#pragma mark -- UICollectionViewDelegate
-
-- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
-    UMSocialPlatformType platform;
-    UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"提示"
-                                                                   message:@"违规举报成功,我们会尽快处理"
-                                                            preferredStyle:UIAlertControllerStyleAlert];
-    UIAlertAction *confirm = [UIAlertAction actionWithTitle:@"确定"
-                                                      style:UIAlertActionStyleDefault
-                                                    handler:^(UIAlertAction *action) {
-                                                        [self tapCancel];
-                                                    }];
-    [alert addAction:confirm];
-    switch (indexPath.row) {
-        case 0:
-            platform = UMSocialPlatformType_WechatSession;
-            break;
-        case 1:
-            platform = UMSocialPlatformType_WechatTimeLine;
-            break;
-        case 2:
-            platform = UMSocialPlatformType_QQ;
-            break;
-        case 3:
-            platform = UMSocialPlatformType_Qzone;
-            break;
-        case 4:
-            platform = UMSocialPlatformType_Sina;
-            break;
-        case 5:
-            [self presentViewController:alert animated:YES completion:nil];
-            return;
-        default:
-            break;
-    }
-    if (indexPath.row == 4) {
-        //创建分享消息对象
-        UMSocialMessageObject *messageObject = [UMSocialMessageObject messageObject];
-
-        //设置文本
-        messageObject.text = [NSString stringWithFormat:@"%@  %@", _model.title, [NSString stringWithFormat:@"http://app.69mx.com/postInfo/share?id=%@", _model.postId]];
-
-        //创建图片内容对象
-        UMShareImageObject *shareObject = [[UMShareImageObject alloc] init];
-        //如果有缩略图,则设置缩略图
-        shareObject.thumbImage = _model.img;
-        [shareObject setShareImage:_model.img];
-
-        //分享消息对象设置分享内容对象
-        messageObject.shareObject = shareObject;
-
-        //调用分享接口
-        [[UMSocialManager defaultManager]
-                shareToPlatform:UMSocialPlatformType_Sina
-                  messageObject:messageObject
-          currentViewController:[self findViewController]
-                     completion:^(id data, NSError *error) {
-                         NSMutableDictionary *params = [@{
-                                 @"id": _model.postId,
-                                 @"shareNum": @1,
-                         } mutableCopy];
-                         [[KeleData sharedInstance]
-                                 updateNum:params
-                                   success:^(id responseObject) {
-                                   }
-                                   failure:^(NSError *error) {
-                                   }];
-                     }];
-    } else {
-        UMSocialMessageObject *messageObject = [UMSocialMessageObject messageObject];
-        NSString *thumbURL = _model.img;
-        UMShareWebpageObject *shareObject = [UMShareWebpageObject
-                shareObjectWithTitle:@"樱桃视频"
-                               descr:_model.title
-                           thumImage:thumbURL];
-        shareObject.webpageUrl = [NSString stringWithFormat:@"http://app.69mx.com/postInfo/share?id=%@", _model.postId];
-        messageObject.shareObject = shareObject;
-        [[UMSocialManager defaultManager]
-                shareToPlatform:platform
-                  messageObject:messageObject
-          currentViewController:[self findViewController]
-                     completion:^(id data, NSError *error) {
-                         NSMutableDictionary *params = [@{
-                                 @"id": _model.postId,
-                                 @"shareNum": @1,
-                         } mutableCopy];
-                         [[KeleData sharedInstance]
-                                 updateNum:params
-                                   success:^(id responseObject) {
-                                   }
-                                   failure:^(NSError *error) {
-                                   }];
-                     }];
-    }
-    [self tapCancel];
-}
-
-- (UIViewController *)findViewController {
-    id target = self;
-    while (target) {
-        target = ((UIResponder *) target).nextResponder;
-        if ([target isKindOfClass:[UIViewController class]]) {
-            break;
-        }
-    }
-    UIViewController *vc = target;
-    return vc;
+- (void)shareToWechat:(enum WXScene)scene withTitle:(NSString *)title description:(NSString *)description url:(NSString *)url {
+    SendMessageToWXReq *req = [[SendMessageToWXReq alloc] init];
+    req.bText = NO;
+    req.scene = scene;
+    WXMediaMessage *urlMessage = [WXMediaMessage message];
+    urlMessage.title = title;
+    urlMessage.description = description;
+    [urlMessage setThumbImage:[UIImage imageNamed:@"AppIcon"]];
+    WXWebpageObject *webObj = [WXWebpageObject object];
+    webObj.webpageUrl = url;
+    urlMessage.mediaObject = webObj;
+    req.message = urlMessage;
+    [WXApi sendReq:req];
 }
-
-- (NSMutableArray *)dataArray {
-    if (!_dataArray) {
-        _dataArray = [NSMutableArray array];
-    }
-    return _dataArray;
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
 /*
 #pragma mark - Navigation
 

+ 104 - 4
千模/MyInfo/SharePopViewController.xib

@@ -1,18 +1,118 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SharePopViewController">
+            <connections>
+                <outlet property="contentView" destination="1iJ-O7-RgC" id="Mgn-KK-viB"/>
+                <outlet property="shareTimeline" destination="kR7-gQ-aQ0" id="Hdv-bW-EdB"/>
+                <outlet property="shareWechat" destination="G4T-wr-2Gr" id="RoC-Tv-nty"/>
+                <outlet property="view" destination="iN0-l3-epB" id="iOJ-US-KoE"/>
+            </connections>
+        </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1iJ-O7-RgC">
+                    <rect key="frame" x="0.0" y="503" width="375" height="164"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e9j-DD-tMm">
+                            <rect key="frame" x="0.0" y="120" width="375" height="44"/>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="44" id="1Jt-le-9tP"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <state key="normal" title="取消"/>
+                            <connections>
+                                <action selector="cancel:" destination="-1" eventType="touchUpInside" id="RbL-0d-hLV"/>
+                            </connections>
+                        </button>
+                        <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="share_icon_weixin" translatesAutoresizingMaskIntoConstraints="NO" id="G4T-wr-2Gr">
+                            <rect key="frame" x="30" y="30" width="44" height="44"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="44" id="Jrh-JE-jip"/>
+                                <constraint firstAttribute="height" constant="44" id="MvK-RD-Lyh"/>
+                            </constraints>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="pRI-Ch-CY9" appends="YES" id="WB3-hy-qCg"/>
+                            </connections>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="微信" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="il7-ul-qWt">
+                            <rect key="frame" x="39.5" y="80" width="25" height="14.5"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="share_icon_pengyouquan" translatesAutoresizingMaskIntoConstraints="NO" id="kR7-gQ-aQ0">
+                            <rect key="frame" x="98" y="30" width="44" height="44"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="44" id="DaL-7W-j1o"/>
+                                <constraint firstAttribute="height" constant="44" id="xUj-Us-BRP"/>
+                            </constraints>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="lwf-eD-6Yu" appends="YES" id="JI2-7E-vH5"/>
+                            </connections>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="朋友圈" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Frt-27-s1D">
+                            <rect key="frame" x="101.5" y="80" width="37" height="14.5"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" red="0.94901960784313721" green="0.95686274509803915" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="e9j-DD-tMm" secondAttribute="trailing" id="6AI-06-Ygn"/>
+                        <constraint firstItem="G4T-wr-2Gr" firstAttribute="top" secondItem="1iJ-O7-RgC" secondAttribute="top" constant="30" id="8qK-bp-yr9"/>
+                        <constraint firstItem="e9j-DD-tMm" firstAttribute="leading" secondItem="1iJ-O7-RgC" secondAttribute="leading" id="BMa-NV-8GF"/>
+                        <constraint firstAttribute="height" constant="164" id="DTP-Oy-ud8"/>
+                        <constraint firstItem="Frt-27-s1D" firstAttribute="centerX" secondItem="kR7-gQ-aQ0" secondAttribute="centerX" id="F7T-kQ-W4V"/>
+                        <constraint firstItem="kR7-gQ-aQ0" firstAttribute="top" secondItem="G4T-wr-2Gr" secondAttribute="top" id="ROW-Hh-hR3"/>
+                        <constraint firstAttribute="bottom" secondItem="e9j-DD-tMm" secondAttribute="bottom" id="Z9L-FA-1cK"/>
+                        <constraint firstItem="il7-ul-qWt" firstAttribute="centerX" secondItem="G4T-wr-2Gr" secondAttribute="centerX" id="Zth-bz-6Kg"/>
+                        <constraint firstItem="Frt-27-s1D" firstAttribute="top" secondItem="kR7-gQ-aQ0" secondAttribute="bottom" constant="6" id="a6C-k2-FqD"/>
+                        <constraint firstItem="il7-ul-qWt" firstAttribute="top" secondItem="G4T-wr-2Gr" secondAttribute="bottom" constant="6" id="bif-dE-Yzg"/>
+                        <constraint firstItem="kR7-gQ-aQ0" firstAttribute="leading" secondItem="G4T-wr-2Gr" secondAttribute="trailing" constant="24" id="cW9-QX-CVq"/>
+                        <constraint firstItem="kR7-gQ-aQ0" firstAttribute="bottom" secondItem="G4T-wr-2Gr" secondAttribute="bottom" id="lOc-cp-bNJ"/>
+                        <constraint firstItem="G4T-wr-2Gr" firstAttribute="leading" secondItem="1iJ-O7-RgC" secondAttribute="leading" constant="30" id="xFk-1a-SJU"/>
+                    </constraints>
+                </view>
+            </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="1iJ-O7-RgC" secondAttribute="trailing" id="3OB-yc-yWx"/>
+                <constraint firstItem="1iJ-O7-RgC" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="CAP-s2-0TS"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="1iJ-O7-RgC" secondAttribute="bottom" id="oF1-v4-tzp"/>
+            </constraints>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <point key="canvasLocation" x="40.799999999999997" y="46.326836581709152"/>
         </view>
+        <tapGestureRecognizer id="pRI-Ch-CY9">
+            <connections>
+                <action selector="tapItem:" destination="-1" id="r2D-uv-zTV"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="9dD-Rp-yYj"/>
+        <tapGestureRecognizer id="lwf-eD-6Yu">
+            <connections>
+                <action selector="tapItem:" destination="-1" id="wvY-vl-Xag"/>
+            </connections>
+        </tapGestureRecognizer>
     </objects>
+    <resources>
+        <image name="share_icon_pengyouquan" width="44" height="44"/>
+        <image name="share_icon_weixin" width="44" height="44"/>
+    </resources>
 </document>

+ 67 - 1
千模/MyInfo/ShareViewController.m

@@ -7,8 +7,13 @@
 //
 
 #import "ShareViewController.h"
+#import "SharePopViewController.h"
 
 @interface ShareViewController ()
+@property(weak, nonatomic) IBOutlet UIView *contentView;
+@property(weak, nonatomic) IBOutlet UIView *wrapperView;
+@property(weak, nonatomic) IBOutlet UIView *wrapperShadow;
+@property(weak, nonatomic) IBOutlet UIView *innerShadow;
 
 @end
 
@@ -16,9 +21,70 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view from its nib.
+    [self.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+    [self.navigationController.navigationBar setShadowImage:[UIImage new]];
+
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
+    btn.frame = CGRectMake(0, 0, 40, 40);
+    [btn setImage:[UIImage imageNamed:@"backBtn"] forState:UIControlStateNormal];
+    btn.imageEdgeInsets = UIEdgeInsetsMake(0, -20, 0, 0);
+    [btn addTarget:self action:@selector(backClick) forControlEvents:UIControlEventTouchUpInside];
+    UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithCustomView:btn];
+    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+    nagetiveSpacer.width = -12;//这个值可以根据自己需要自己调整
+    self.navigationItem.leftBarButtonItems = @[nagetiveSpacer, leftItem];
+
+    // gradient
+    CAGradientLayer *gl = [CAGradientLayer layer];
+    gl.frame = self.contentView.frame;
+    gl.startPoint = CGPointMake(0.5, 0);
+    gl.endPoint = CGPointMake(0.5, 1);
+    gl.colors = @[(__bridge id) [UIColor colorWithRed:251 / 255.0 green:92 / 255.0 blue:163 / 255.0 alpha:1].CGColor, (__bridge id) [UIColor colorWithRed:253 / 255.0 green:127 / 255.0 blue:141 / 255.0 alpha:1].CGColor];
+    gl.locations = @[@(0), @(1.0f)];
+    [self.contentView.layer addSublayer:gl];
+
+
+    CAGradientLayer *outerShadow = [CAGradientLayer layer];
+    outerShadow.frame = self.wrapperView.bounds;
+    outerShadow.startPoint = CGPointMake(0.5, 0);
+    outerShadow.endPoint = CGPointMake(0.5, 1);
+    outerShadow.colors = @[(__bridge id) [UIColor colorWithRed:255 / 255.0 green:222 / 255.0 blue:134 / 255.0 alpha:1].CGColor, (__bridge id) [UIColor colorWithRed:253 / 255.0 green:127 / 255.0 blue:227 / 255.0 alpha:1].CGColor];
+    outerShadow.locations = @[@(0), @(1.0f)];
+    outerShadow.cornerRadius = 24;
+    [self.wrapperView.layer addSublayer:outerShadow];
+    self.wrapperView.layer.cornerRadius = 24;
+    self.wrapperView.layer.shadowColor = [UIColor colorWithRed:83 / 255.0 green:28 / 255.0 blue:28 / 255.0 alpha:0.66].CGColor;
+    self.wrapperView.layer.shadowOffset = CGSizeMake(0, 12);
+    self.wrapperView.layer.shadowOpacity = 1;
+    self.wrapperView.layer.shadowRadius = 18;
+
+    self.wrapperShadow.layer.cornerRadius = 24;
+    self.wrapperShadow.layer.shadowColor = [UIColor colorWithRed:217 / 255.0 green:53 / 255.0 blue:133 / 255.0 alpha:0.78].CGColor;
+    self.wrapperShadow.layer.shadowOffset = CGSizeMake(0, -8);
+    self.wrapperShadow.layer.shadowOpacity = 1;
+    self.wrapperShadow.layer.shadowRadius = 22;
+
+    self.innerShadow.layer.cornerRadius = 20;
+    self.innerShadow.layer.shadowColor = [UIColor colorWithRed:255 / 255.0 green:249 / 255.0 blue:173 / 255.0 alpha:0.78].CGColor;
+    self.innerShadow.layer.shadowOffset = CGSizeMake(0, -6);
+    self.innerShadow.layer.shadowOpacity = 1;
+    self.innerShadow.layer.shadowRadius = 18;
 }
 
+- (void)backClick {
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+- (IBAction)share:(id)sender {
+    SharePopViewController *shareVC = [[SharePopViewController alloc] init];
+    [self presentViewController:shareVC animated:NO completion:nil];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+    [self.navigationController.navigationBar setBackgroundImage:nil forBarMetrics:UIBarMetricsDefault];
+    [self.navigationController.navigationBar setShadowImage:nil];
+    [super viewWillDisappear:animated];
+}
 /*
 #pragma mark - Navigation
 

+ 60 - 5
千模/MyInfo/ShareViewController.xib

@@ -1,22 +1,77 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ShareViewController">
             <connections>
+                <outlet property="contentView" destination="Xea-ta-hlE" id="LOP-1J-zjj"/>
+                <outlet property="innerShadow" destination="Cbr-wZ-df6" id="xBi-jl-AtU"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+                <outlet property="wrapperShadow" destination="tUO-hB-omb" id="70x-DW-Ma1"/>
+                <outlet property="wrapperView" destination="nFp-zN-ayr" id="VJX-eG-tGA"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xea-ta-hlE">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nFp-zN-ayr">
+                    <rect key="frame" x="20" y="209" width="335" height="433"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="433" id="DN3-GG-4rl"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tUO-hB-omb">
+                    <rect key="frame" x="20" y="209" width="335" height="433"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cbr-wZ-df6">
+                    <rect key="frame" x="30" y="209" width="315" height="425"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rGy-Hf-NxZ">
+                            <rect key="frame" x="134" y="263" width="46" height="30"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <state key="normal" title="Button"/>
+                            <connections>
+                                <action selector="share:" destination="-1" eventType="touchUpInside" id="MCI-3R-PIY"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                </view>
+            </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
+            <constraints>
+                <constraint firstItem="Cbr-wZ-df6" firstAttribute="bottom" secondItem="nFp-zN-ayr" secondAttribute="bottom" constant="-8" id="0Aj-ew-rmn"/>
+                <constraint firstAttribute="trailing" secondItem="nFp-zN-ayr" secondAttribute="trailing" constant="20" id="5vj-UH-JxH"/>
+                <constraint firstItem="Cbr-wZ-df6" firstAttribute="trailing" secondItem="nFp-zN-ayr" secondAttribute="trailing" constant="-10" id="9ja-HA-ifY"/>
+                <constraint firstAttribute="trailing" secondItem="Xea-ta-hlE" secondAttribute="trailing" id="AEU-31-ht8"/>
+                <constraint firstItem="Cbr-wZ-df6" firstAttribute="top" secondItem="nFp-zN-ayr" secondAttribute="top" id="Evt-x9-8IO"/>
+                <constraint firstAttribute="bottom" secondItem="Xea-ta-hlE" secondAttribute="bottom" id="H4N-Xs-PXa"/>
+                <constraint firstItem="Cbr-wZ-df6" firstAttribute="leading" secondItem="nFp-zN-ayr" secondAttribute="leading" constant="10" id="Ke7-8N-zBs"/>
+                <constraint firstItem="tUO-hB-omb" firstAttribute="trailing" secondItem="nFp-zN-ayr" secondAttribute="trailing" id="N8p-No-w6r"/>
+                <constraint firstItem="tUO-hB-omb" firstAttribute="top" secondItem="nFp-zN-ayr" secondAttribute="top" id="RLn-0h-w6V"/>
+                <constraint firstAttribute="bottom" secondItem="nFp-zN-ayr" secondAttribute="bottom" constant="25" id="YyJ-EX-Kdu"/>
+                <constraint firstItem="tUO-hB-omb" firstAttribute="bottom" secondItem="nFp-zN-ayr" secondAttribute="bottom" id="ZBY-NL-gtY"/>
+                <constraint firstItem="Xea-ta-hlE" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="d5F-8Y-7ah"/>
+                <constraint firstItem="nFp-zN-ayr" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="20" id="lDN-e2-hve"/>
+                <constraint firstItem="Xea-ta-hlE" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="p3o-bY-IxB"/>
+                <constraint firstItem="tUO-hB-omb" firstAttribute="leading" secondItem="nFp-zN-ayr" secondAttribute="leading" id="pfF-aF-bDr"/>
+            </constraints>
+            <point key="canvasLocation" x="96.799999999999997" y="53.523238380809602"/>
         </view>
     </objects>
 </document>

+ 33 - 32
千模/MyInfo/VideoOrderController.m

@@ -9,12 +9,11 @@
 #import "VideoOrderController.h"
 #import "MyOrderCell.h"
 
-@interface VideoOrderController ()<UITableViewDelegate, UITableViewDataSource>
-{
+@interface VideoOrderController () <UITableViewDelegate, UITableViewDataSource> {
     NSInteger index;
 }
-@property (nonatomic, strong) UITableView *tableView;
-@property (nonatomic, strong) NSMutableArray *dataArr;
+@property(nonatomic, strong) UITableView *tableView;
+@property(nonatomic, strong) NSMutableArray *dataArr;
 @end
 
 @implementation VideoOrderController
@@ -28,31 +27,31 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    
+
     self.navigationItem.title = @"视频订单";
     self.extendedLayoutIncludesOpaqueBars = YES;
-    
-    UIButton * btn = [UIButton buttonWithType:UIButtonTypeCustom];
+
+    UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
     btn.frame = CGRectMake(0, 0, 40, 40);
     [btn setImage:[UIImage imageNamed:@"backBtn"] forState:UIControlStateNormal];
-    btn.imageEdgeInsets =  UIEdgeInsetsMake(0, -20, 0, 0);
+    btn.imageEdgeInsets = UIEdgeInsetsMake(0, -20, 0, 0);
     [btn addTarget:self action:@selector(backClick) forControlEvents:UIControlEventTouchUpInside];
     UIBarButtonItem *leftItem = [[UIBarButtonItem alloc] initWithCustomView:btn];
-    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
+    UIBarButtonItem *nagetiveSpacer = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
     nagetiveSpacer.width = -12;//这个值可以根据自己需要自己调整
     self.navigationItem.leftBarButtonItems = @[nagetiveSpacer, leftItem];
-    
+
     self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth, ScreenHeight) style:UITableViewStyleGrouped];
     self.tableView.backgroundColor = [UIColor whiteColor];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     self.tableView.tableFooterView = [[UIView alloc] init];
-    
+
     self.tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(refreshList)];
     self.tableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
     [self.view addSubview:self.tableView];
-    
+
     index = 1;
     [self getDataFromNetworking];
 }
@@ -61,52 +60,54 @@
     [self.navigationController popViewControllerAnimated:YES];
 }
 
--(void)refreshList{
-    
+- (void)refreshList {
+
     index = 1;
     [self.dataArr removeAllObjects];
     [self getDataFromNetworking];
 }
 
-- (void)loadMoreData{
-    
+- (void)loadMoreData {
+
     index++;
     [self getDataFromNetworking];
 }
 
 #pragma mark -- 网络请求
+
 - (void)getDataFromNetworking {
-    
+
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
-    NSString *indexStr = [NSString stringWithFormat:@"%zd",index];
-    NSString *str = [NSString stringWithFormat:@"%@order?action=getMemberVideoRecordOrder&memberpk=%@&index=%@&size=%@",webURL,[Helper sharedAccount].accid,indexStr,@"10"];
-    NSLog(@"str===============%@",str);
-    [[AHHttpManager sharedManager]POST:str parameters:nil success:^(id responseObject) {
-        NSLog(@"%@",responseObject);
+    NSString *indexStr = [NSString stringWithFormat:@"%zd", index];
+    NSString *str = [NSString stringWithFormat:@"%@order?action=getMemberVideoRecordOrder&memberpk=%@&index=%@&size=%@", webURL, [Helper sharedAccount].accid, indexStr, @"10"];
+    NSLog(@"str===============%@", str);
+    [[AHHttpManager sharedManager] POST:str parameters:nil success:^(id responseObject) {
+        NSLog(@"%@", responseObject);
         [MBProgressHUD hideHUDForView:self.view animated:YES];
-        if ([[responseObject objectForKey:@"msg"]isEqualToString:@"success"]) {
+        if ([[responseObject objectForKey:@"msg"] isEqualToString:@"success"]) {
             [self.dataArr addObjectsFromArray:responseObject[@"data"]];
-            
+
             NSString *number = responseObject[@"count"];
             NSInteger num = [number integerValue];
-            
+
             [self.tableView.mj_header endRefreshing];
             [self.tableView reloadData];
             if (num == self.dataArr.count || num == 0) {
                 [self.tableView.mj_footer endRefreshingWithNoMoreData];
-            }else{
+            } else {
                 [self.tableView.mj_footer endRefreshing];
             }
-        }else{
-            
+        } else {
+
         }
-    } failure:^(NSError *error) {
-        NSLog(@"error = %@",error);
+    }                           failure:^(NSError *error) {
+        NSLog(@"error = %@", error);
         [MBProgressHUD hideHUDForView:self.view animated:YES];
     }];
 }
 
 #pragma mark -- UITableViewDelegate, UITableViewDataSource
+
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
     return self.dataArr.count;
 }
@@ -116,14 +117,14 @@
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    
+
     static NSString *cellid = @"OrderCell";
     MyOrderCell *cell = [tableView dequeueReusableCellWithIdentifier:cellid];
     if (!cell) {
         cell = [[MyOrderCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellid];
     }
     [cell setMyOrderCellValueWithDic:self.dataArr[indexPath.section] titleStr:@"videoOrder"];
-    
+
     return cell;
 }
 

+ 5 - 5
千模/MyInfo/View/MineItemView.h

@@ -8,10 +8,10 @@
 
 #import <UIKit/UIKit.h>
 
-NS_ASSUME_NONNULL_BEGIN
-
+IB_DESIGNABLE
 @interface MineItemView : UIView
-
+@property (nonatomic, assign)IBInspectable NSString *icon;
+@property (nonatomic, strong)IBInspectable NSString *label;
+@property (nonatomic, strong)IBInspectable UIImage *image;
+@property (nonatomic, strong)IBInspectable UIGestureRecognizer *tgr;
 @end
-
-NS_ASSUME_NONNULL_END

+ 34 - 6
千模/MyInfo/View/MineItemView.m

@@ -7,15 +7,43 @@
 //
 
 #import "MineItemView.h"
+@interface MineItemView ()
+@property (weak, nonatomic) IBOutlet UIImageView *iconImageView;
+@property (weak, nonatomic) IBOutlet UILabel *menuLabel;
 
+@end
 @implementation MineItemView
+- (instancetype)initWithFrame:(CGRect)frame{
+    if(self = [super initWithFrame:frame]){
+        NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+        NSString *className = NSStringFromClass([self class]);
+        UIView *view = [[bundle loadNibNamed:className owner:self options:nil] firstObject];
+        view.frame = self.bounds;
+        [self addSubview:view];
+    }
+    return self;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)aDecoder{
+    if(self = [super initWithCoder:aDecoder]){
+        NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+        NSString *className = NSStringFromClass([self class]);
+        UIView *view = [[bundle loadNibNamed:className owner:self options:nil] firstObject];
+        view.frame = self.bounds;
+        [self addSubview:view];
+    }
+    return self;
+}
 
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
+-(void)setIcon:(NSString *)icon{
+    self.iconImageView.image = [UIImage imageNamed:icon];
 }
-*/
 
+-(void)setLabel:(NSString *)label{
+    self.menuLabel.text = label;
+}
+
+-(void)setImage:(UIImage *)image{
+    self.iconImageView.image = image;
+}
 @end

+ 7 - 2
千模/MyInfo/View/MineItemView.xib

@@ -9,9 +9,14 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MineItemView"/>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MineItemView">
+            <connections>
+                <outlet property="iconImageView" destination="GtQ-1O-2A7" id="oKc-cc-rYK"/>
+                <outlet property="menuLabel" destination="gpW-sT-Ruz" id="0kg-vj-tgb"/>
+            </connections>
+        </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MineItemView">
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
             <rect key="frame" x="0.0" y="0.0" width="390" height="73"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>

+ 1 - 1
千模/MyInfo/View/ShadowView.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
-
+IB_DESIGNABLE
 @interface ShadowView : UIView
 
 @end

+ 67 - 6
千模/MyInfo/View/ShadowView.m

@@ -7,15 +7,76 @@
 //
 
 #import "ShadowView.h"
+#import "OrderFormViewController.h"
+
+@interface ShadowView ()
+@property(weak, nonatomic) IBOutlet UIView *contentView;
+@property(weak, nonatomic) IBOutlet UIImageView *item1;
+@property(weak, nonatomic) IBOutlet UIImageView *item2;
+@property(weak, nonatomic) IBOutlet UIImageView *item3;
+@property(weak, nonatomic) IBOutlet UIImageView *item4;
+
+@end
 
 @implementation ShadowView
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+        [self initView];
+    }
+    return self;
+}
 
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
+- (instancetype)initWithCoder:(NSCoder *)aDecoder {
+    if (self = [super initWithCoder:aDecoder]) {
+        [self initView];
+    }
+    return self;
 }
-*/
 
+- (void)initView {
+    NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+    NSString *className = NSStringFromClass([self class]);
+    UIView *view = [[bundle loadNibNamed:className owner:self options:nil] firstObject];
+    view.frame = self.bounds;
+    [self addSubview:view];
+    self.contentView.layer.cornerRadius = 12;
+    self.item1.userInteractionEnabled = YES;
+    self.item2.userInteractionEnabled = YES;
+    self.item3.userInteractionEnabled = YES;
+    self.item4.userInteractionEnabled = YES;
+}
+
+- (IBAction)tapItem:(id)sender {
+    NSInteger type = 1;
+    switch (((UITapGestureRecognizer *) sender).view.tag) {
+        case 1:
+            type = 2;
+            break;
+        case 2:
+            type = 3;
+            break;
+        case 3:
+            type = 5;
+            break;
+        case 4:
+            type = 1;
+            break;
+        default:
+            break;
+    }
+    OrderFormViewController *oVc = [[OrderFormViewController alloc] initWithTab:type];
+    oVc.hidesBottomBarWhenPushed = YES;
+    [[self findViewController].navigationController pushViewController:oVc animated:YES];
+}
+
+- (UIViewController *)findViewController {
+    id target = self;
+    while (target) {
+        target = ((UIResponder *) target).nextResponder;
+        if ([target isKindOfClass:[UIViewController class]]) {
+            break;
+        }
+    }
+    return target;
+}
 @end

+ 187 - 8
千模/MyInfo/View/ShadowView.xib

@@ -1,18 +1,197 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ShadowView">
+            <connections>
+                <outlet property="contentView" destination="Rmo-ka-keR" id="oTU-pa-wJi"/>
+                <outlet property="item1" destination="Vgr-3e-xix" id="Mfj-H8-WC0"/>
+                <outlet property="item2" destination="pwD-By-hLN" id="lE4-4Z-U7a"/>
+                <outlet property="item3" destination="sbw-0k-kvF" id="Hsm-o7-H5u"/>
+                <outlet property="item4" destination="F48-OR-XiD" id="byP-9l-mLz"/>
+            </connections>
+        </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+        <view contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="537" height="95"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Rmo-ka-keR">
+                    <rect key="frame" x="101" y="0.0" width="335" height="95"/>
+                    <subviews>
+                        <imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_daifukuan" translatesAutoresizingMaskIntoConstraints="NO" id="Vgr-3e-xix">
+                            <rect key="frame" x="30" y="16" width="30" height="30"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="kmk-tI-tQy"/>
+                                <constraint firstAttribute="width" constant="30" id="vfo-2O-22a"/>
+                            </constraints>
+                        </imageView>
+                        <imageView userInteractionEnabled="NO" tag="2" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_jinxingzhong" translatesAutoresizingMaskIntoConstraints="NO" id="pwD-By-hLN">
+                            <rect key="frame" x="107" y="16" width="30" height="30"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="ANc-Zg-pZo"/>
+                                <constraint firstAttribute="width" constant="30" id="FRK-Uj-JbG"/>
+                            </constraints>
+                        </imageView>
+                        <imageView userInteractionEnabled="NO" tag="3" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_yiwancheng" translatesAutoresizingMaskIntoConstraints="NO" id="sbw-0k-kvF">
+                            <rect key="frame" x="184" y="16" width="30" height="30"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="LjJ-Ei-xtn"/>
+                                <constraint firstAttribute="width" constant="30" id="SRd-jT-apE"/>
+                            </constraints>
+                        </imageView>
+                        <imageView userInteractionEnabled="NO" tag="4" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="into_icon_quanbu" translatesAutoresizingMaskIntoConstraints="NO" id="F48-OR-XiD">
+                            <rect key="frame" x="275" y="16" width="30" height="30"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="61e-eY-GNY"/>
+                                <constraint firstAttribute="width" constant="30" id="chx-MX-dQ1"/>
+                            </constraints>
+                        </imageView>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dsG-bw-reK">
+                            <rect key="frame" x="244" y="25" width="1" height="45"/>
+                            <color key="backgroundColor" red="0.94901960780000005" green="0.95686274510000002" blue="0.96078431369999995" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="1" id="692-6h-5N5"/>
+                            </constraints>
+                        </view>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="未付款" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yRC-2v-t3W">
+                            <rect key="frame" x="26.5" y="52" width="37" height="14.5"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                            <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="8Hn-6B-d8J">
+                            <rect key="frame" x="103.5" y="52" width="37" height="14.5"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                            <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="9ts-n9-P8O">
+                            <rect key="frame" x="180.5" y="51" width="37" height="15"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                            <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="IB3-OA-0YZ">
+                            <rect key="frame" x="265" y="52" width="50" height="15"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rW7-se-N9t">
+                            <rect key="frame" x="20" y="16" width="50" height="50.5"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="LA5-6e-SFu" appends="YES" id="kpj-0i-Ark"/>
+                            </connections>
+                        </view>
+                        <view tag="2" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OOz-ue-hdm">
+                            <rect key="frame" x="97" y="16" width="50" height="50.5"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="kvJ-eN-dgE" appends="YES" id="IKt-7T-Yo6"/>
+                            </connections>
+                        </view>
+                        <view tag="2" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xsk-wQ-CYZ">
+                            <rect key="frame" x="174" y="16" width="50" height="50"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="Ogi-XO-1Ti" appends="YES" id="81c-Q1-8ha"/>
+                            </connections>
+                        </view>
+                        <view tag="4" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xTx-AT-Bc9">
+                            <rect key="frame" x="265" y="16" width="50" height="51"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <connections>
+                                <outletCollection property="gestureRecognizers" destination="yY9-T0-WSO" appends="YES" id="i4v-3o-qFw"/>
+                            </connections>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstItem="9ts-n9-P8O" firstAttribute="top" secondItem="sbw-0k-kvF" secondAttribute="bottom" constant="5" id="0ST-QX-mcK"/>
+                        <constraint firstItem="xsk-wQ-CYZ" firstAttribute="bottom" secondItem="9ts-n9-P8O" secondAttribute="bottom" id="3UG-ve-3aA"/>
+                        <constraint firstItem="xsk-wQ-CYZ" firstAttribute="trailing" secondItem="sbw-0k-kvF" secondAttribute="trailing" constant="10" id="5MR-cy-J8v"/>
+                        <constraint firstItem="xTx-AT-Bc9" firstAttribute="leading" secondItem="F48-OR-XiD" secondAttribute="leading" constant="-10" id="5q1-iC-MBz"/>
+                        <constraint firstItem="xsk-wQ-CYZ" firstAttribute="leading" secondItem="sbw-0k-kvF" secondAttribute="leading" constant="-10" id="5w7-jP-rpC"/>
+                        <constraint firstItem="dsG-bw-reK" firstAttribute="leading" secondItem="sbw-0k-kvF" secondAttribute="trailing" constant="30" id="7p0-VT-VFq"/>
+                        <constraint firstItem="yRC-2v-t3W" firstAttribute="centerX" secondItem="Vgr-3e-xix" secondAttribute="centerX" id="8U7-Yz-coC"/>
+                        <constraint firstItem="xTx-AT-Bc9" firstAttribute="trailing" secondItem="F48-OR-XiD" secondAttribute="trailing" constant="10" id="DWf-CH-riz"/>
+                        <constraint firstItem="sbw-0k-kvF" firstAttribute="centerY" secondItem="pwD-By-hLN" secondAttribute="centerY" id="EjJ-Hy-2FK"/>
+                        <constraint firstItem="OOz-ue-hdm" firstAttribute="bottom" secondItem="8Hn-6B-d8J" secondAttribute="bottom" id="Fhz-Lv-s1h"/>
+                        <constraint firstItem="9ts-n9-P8O" firstAttribute="centerX" secondItem="sbw-0k-kvF" secondAttribute="centerX" id="Ia5-uc-ngf"/>
+                        <constraint firstItem="Vgr-3e-xix" firstAttribute="top" secondItem="Rmo-ka-keR" secondAttribute="top" constant="16" id="InS-5f-lLT"/>
+                        <constraint firstItem="8Hn-6B-d8J" firstAttribute="top" secondItem="pwD-By-hLN" secondAttribute="bottom" constant="6" id="J4N-HK-Cif"/>
+                        <constraint firstItem="Vgr-3e-xix" firstAttribute="leading" secondItem="Rmo-ka-keR" secondAttribute="leading" constant="30" id="Jz3-oY-TuX"/>
+                        <constraint firstItem="rW7-se-N9t" firstAttribute="top" secondItem="Vgr-3e-xix" secondAttribute="top" id="LAv-bZ-bq1"/>
+                        <constraint firstItem="xTx-AT-Bc9" firstAttribute="bottom" secondItem="IB3-OA-0YZ" secondAttribute="bottom" id="MGg-RE-6Tp"/>
+                        <constraint firstItem="sbw-0k-kvF" firstAttribute="leading" secondItem="pwD-By-hLN" secondAttribute="trailing" constant="47" id="QQf-rO-vjJ"/>
+                        <constraint firstItem="pwD-By-hLN" firstAttribute="leading" secondItem="Vgr-3e-xix" secondAttribute="trailing" constant="47" id="RKn-NG-XB4"/>
+                        <constraint firstItem="OOz-ue-hdm" firstAttribute="leading" secondItem="pwD-By-hLN" secondAttribute="leading" constant="-10" id="TJD-E7-yWp"/>
+                        <constraint firstItem="OOz-ue-hdm" firstAttribute="trailing" secondItem="pwD-By-hLN" secondAttribute="trailing" constant="10" id="WQS-cd-mMO"/>
+                        <constraint firstItem="8Hn-6B-d8J" firstAttribute="centerX" secondItem="pwD-By-hLN" secondAttribute="centerX" id="Y2a-2y-OcQ"/>
+                        <constraint firstItem="xTx-AT-Bc9" firstAttribute="top" secondItem="F48-OR-XiD" secondAttribute="top" id="aVJ-te-ao1"/>
+                        <constraint firstItem="yRC-2v-t3W" firstAttribute="top" secondItem="Vgr-3e-xix" secondAttribute="bottom" constant="6" id="bKx-VQ-AuI"/>
+                        <constraint firstItem="IB3-OA-0YZ" firstAttribute="top" secondItem="F48-OR-XiD" secondAttribute="bottom" constant="6" id="btA-ay-0gH"/>
+                        <constraint firstItem="dsG-bw-reK" firstAttribute="top" secondItem="Rmo-ka-keR" secondAttribute="top" constant="25" id="e3p-GS-q88"/>
+                        <constraint firstAttribute="bottom" secondItem="dsG-bw-reK" secondAttribute="bottom" constant="25" id="f2L-ZI-A27"/>
+                        <constraint firstItem="xsk-wQ-CYZ" firstAttribute="top" secondItem="sbw-0k-kvF" secondAttribute="top" id="fLd-XH-vq4"/>
+                        <constraint firstItem="rW7-se-N9t" firstAttribute="bottom" secondItem="yRC-2v-t3W" secondAttribute="bottom" id="fjl-j7-toW"/>
+                        <constraint firstItem="IB3-OA-0YZ" firstAttribute="centerX" secondItem="F48-OR-XiD" secondAttribute="centerX" id="fm6-qu-XVt"/>
+                        <constraint firstAttribute="width" constant="335" id="gTj-P7-iKM"/>
+                        <constraint firstItem="OOz-ue-hdm" firstAttribute="top" secondItem="pwD-By-hLN" secondAttribute="top" id="gv0-ir-dht"/>
+                        <constraint firstItem="dsG-bw-reK" firstAttribute="centerY" secondItem="Rmo-ka-keR" secondAttribute="centerY" id="iyW-yF-VH1"/>
+                        <constraint firstItem="rW7-se-N9t" firstAttribute="leading" secondItem="Vgr-3e-xix" secondAttribute="leading" constant="-10" id="oYE-OZ-2bT"/>
+                        <constraint firstItem="F48-OR-XiD" firstAttribute="leading" secondItem="sbw-0k-kvF" secondAttribute="trailing" constant="61" id="pJU-qd-wdP"/>
+                        <constraint firstItem="pwD-By-hLN" firstAttribute="centerY" secondItem="Vgr-3e-xix" secondAttribute="centerY" id="s5b-He-oJg"/>
+                        <constraint firstItem="rW7-se-N9t" firstAttribute="trailing" secondItem="Vgr-3e-xix" secondAttribute="trailing" constant="10" id="tGm-JP-Dzp"/>
+                        <constraint firstItem="F48-OR-XiD" firstAttribute="centerY" secondItem="sbw-0k-kvF" secondAttribute="centerY" id="wrx-Ej-JDl"/>
+                    </constraints>
+                </view>
+            </subviews>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <constraints>
+                <constraint firstItem="Rmo-ka-keR" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Ht2-eG-odm"/>
+                <constraint firstAttribute="bottom" secondItem="Rmo-ka-keR" secondAttribute="bottom" id="fgA-W2-ghb"/>
+                <constraint firstItem="Rmo-ka-keR" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="zvv-aL-EWm"/>
+            </constraints>
+            <nil key="simulatedTopBarMetrics"/>
+            <nil key="simulatedBottomBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="65" y="188"/>
         </view>
+        <tapGestureRecognizer id="LA5-6e-SFu">
+            <connections>
+                <action selector="tapItem:" destination="-1" id="V4B-XR-hwi"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="kvJ-eN-dgE">
+            <connections>
+                <action selector="tapItem:" destination="-1" id="2OP-lr-ksF"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="Ogi-XO-1Ti">
+            <connections>
+                <action selector="tapItem:" destination="-1" id="GDo-MQ-vMz"/>
+            </connections>
+        </tapGestureRecognizer>
+        <tapGestureRecognizer id="yY9-T0-WSO">
+            <connections>
+                <action selector="tapItem:" destination="-1" id="vaJ-Gs-HvR"/>
+            </connections>
+        </tapGestureRecognizer>
     </objects>
+    <resources>
+        <image name="into_icon_daifukuan" width="30" height="30"/>
+        <image name="into_icon_jinxingzhong" width="30" height="30"/>
+        <image name="into_icon_quanbu" width="30" height="30"/>
+        <image name="into_icon_yiwancheng" width="30" height="30"/>
+    </resources>
 </document>