商品分类

8b28ccf0 · Sandy · 939ad3a7 · 8b28ccf0 · 8b28ccf0 · 8b28ccf0
Commit 8b28ccf0 authored Mar 24, 2016 by Sandy
39 changed files
--- a/ALand.xcodeproj/project.pbxproj
+++ b/ALand.xcodeproj/project.pbxproj
@@ -40,6 +40,12 @@
 		199BC7D61C9BBE0D00E4E0B8 /* MineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D51C9BBE0D00E4E0B8 /* MineViewController.m */; };
 		199BC7D91C9BBE1A00E4E0B8 /* MassageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 199BC7D81C9BBE1A00E4E0B8 /* MassageViewController.m */; };
 		19A1C8411CA27564003E5DD9 /* UserInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 19A1C8401CA27564003E5DD9 /* UserInfo.m */; };
+		19A1C8481CA28683003E5DD9 /* CommodityListCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 19A1C8461CA28683003E5DD9 /* CommodityListCollectionViewCell.m */; };
+		19A1C8491CA28683003E5DD9 /* CommodityListCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19A1C8471CA28683003E5DD9 /* CommodityListCollectionViewCell.xib */; };
+		19A1C89A1CA38048003E5DD9 /* SortView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19A1C8991CA38048003E5DD9 /* SortView.m */; };
+		19ADD3671CA3A16C00EE6E5A /* CoverShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19ADD3661CA3A16C00EE6E5A /* CoverShadowView.m */; };
+		19ADD36A1CA3AC9D00EE6E5A /* UIButton+Category.m in Sources */ = {isa = PBXBuildFile; fileRef = 19ADD3691CA3AC9D00EE6E5A /* UIButton+Category.m */; };
+		19ADD36E1CA3B88A00EE6E5A /* CommodityListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19ADD36D1CA3B88A00EE6E5A /* CommodityListViewController.m */; };
 		19DCCB591C9A9EB30072C3BF /* IBTAudioController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB0C1C9A9EB30072C3BF /* IBTAudioController.m */; };
 		19DCCB5A1C9A9EB30072C3BF /* IBTAudioRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB0E1C9A9EB30072C3BF /* IBTAudioRecorder.m */; };
 		19DCCB5B1C9A9EB30072C3BF /* IBTAudioServicesManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 19DCCB101C9A9EB30072C3BF /* IBTAudioServicesManager.m */; };
@@ -193,6 +199,17 @@
 		199BC7D81C9BBE1A00E4E0B8 /* MassageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MassageViewController.m; sourceTree = "<group>"; };
 		19A1C83F1CA27564003E5DD9 /* UserInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInfo.h; sourceTree = "<group>"; };
 		19A1C8401CA27564003E5DD9 /* UserInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UserInfo.m; sourceTree = "<group>"; };
+		19A1C8451CA28683003E5DD9 /* CommodityListCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommodityListCollectionViewCell.h; sourceTree = "<group>"; };
+		19A1C8461CA28683003E5DD9 /* CommodityListCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommodityListCollectionViewCell.m; sourceTree = "<group>"; };
+		19A1C8471CA28683003E5DD9 /* CommodityListCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CommodityListCollectionViewCell.xib; sourceTree = "<group>"; };
+		19A1C8981CA38048003E5DD9 /* SortView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SortView.h; sourceTree = "<group>"; };
+		19A1C8991CA38048003E5DD9 /* SortView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SortView.m; sourceTree = "<group>"; };
+		19ADD3651CA3A16C00EE6E5A /* CoverShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoverShadowView.h; sourceTree = "<group>"; };
+		19ADD3661CA3A16C00EE6E5A /* CoverShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoverShadowView.m; sourceTree = "<group>"; };
+		19ADD3681CA3AC9D00EE6E5A /* UIButton+Category.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIButton+Category.h"; sourceTree = "<group>"; };
+		19ADD3691CA3AC9D00EE6E5A /* UIButton+Category.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIButton+Category.m"; sourceTree = "<group>"; };
+		19ADD36C1CA3B88A00EE6E5A /* CommodityListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommodityListViewController.h; sourceTree = "<group>"; };
+		19ADD36D1CA3B88A00EE6E5A /* CommodityListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommodityListViewController.m; sourceTree = "<group>"; };
 		19DCCACD1C9A9AD60072C3BF /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
 		19DCCB0B1C9A9EB30072C3BF /* IBTAudioController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IBTAudioController.h; sourceTree = "<group>"; };
 		19DCCB0C1C9A9EB30072C3BF /* IBTAudioController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IBTAudioController.m; sourceTree = "<group>"; };
@@ -624,6 +641,8 @@
 			children = (
 				199BC7C11C9B9B7700E4E0B8 /* UIButton+countDown.h */,
 				199BC7C21C9B9B7700E4E0B8 /* UIButton+countDown.m */,
+				19ADD3681CA3AC9D00EE6E5A /* UIButton+Category.h */,
+				19ADD3691CA3AC9D00EE6E5A /* UIButton+Category.m */,
 			);
 			path = "UIButton+Category";
 			sourceTree = "<group>";
@@ -633,10 +652,21 @@
 			children = (
 				19A1C83F1CA27564003E5DD9 /* UserInfo.h */,
 				19A1C8401CA27564003E5DD9 /* UserInfo.m */,
+				19ADD3651CA3A16C00EE6E5A /* CoverShadowView.h */,
+				19ADD3661CA3A16C00EE6E5A /* CoverShadowView.m */,
 			);
 			path = Global;
 			sourceTree = "<group>";
 		};
+		19ADD36B1CA3B88A00EE6E5A /* Commodity */ = {
+			isa = PBXGroup;
+			children = (
+				19ADD36C1CA3B88A00EE6E5A /* CommodityListViewController.h */,
+				19ADD36D1CA3B88A00EE6E5A /* CommodityListViewController.m */,
+			);
+			path = Commodity;
+			sourceTree = "<group>";
+		};
 		19DCCA851C9A95E70072C3BF /* Home */ = {
 			isa = PBXGroup;
 			children = (
@@ -666,6 +696,11 @@
 				1929F18F1CA11472000E9B26 /* HomeCollectionViewCell.h */,
 				1929F1901CA11472000E9B26 /* HomeCollectionViewCell.m */,
 				1929F1911CA11472000E9B26 /* HomeCollectionViewCell.xib */,
+				19A1C8451CA28683003E5DD9 /* CommodityListCollectionViewCell.h */,
+				19A1C8461CA28683003E5DD9 /* CommodityListCollectionViewCell.m */,
+				19A1C8471CA28683003E5DD9 /* CommodityListCollectionViewCell.xib */,
+				19A1C8981CA38048003E5DD9 /* SortView.h */,
+				19A1C8991CA38048003E5DD9 /* SortView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -673,6 +708,7 @@
 		19DCCA881C9A95E70072C3BF /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
+				19ADD36B1CA3B88A00EE6E5A /* Commodity */,
 				199BC79F1C9AA7DF00E4E0B8 /* HomeViewController.h */,
 				199BC7A01C9AA7DF00E4E0B8 /* HomeViewController.m */,
 				1929F18C1CA10C94000E9B26 /* HomeCollectionViewController.h */,
@@ -1112,6 +1148,7 @@
 				1929F1931CA11472000E9B26 /* HomeCollectionViewCell.xib in Resources */,
 				1929F16F1C9FCFA6000E9B26 /* Assets.xcassets in Resources */,
 				1929F17E1CA0DE32000E9B26 /* HomeTopView.xib in Resources */,
+				19A1C8491CA28683003E5DD9 /* CommodityListCollectionViewCell.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1186,6 +1223,7 @@
 			files = (
 				19DCCBC91C9AA0450072C3BF /* NSNull+OVNatural.m in Sources */,
 				19DCCB791C9A9EB30072C3BF /* IBTWebViewController.m in Sources */,
+				19ADD3671CA3A16C00EE6E5A /* CoverShadowView.m in Sources */,
 				199BC7BE1C9B045B00E4E0B8 /* RigistViewController.m in Sources */,
 				199BC7D01C9BAC9600E4E0B8 /* MyTools.m in Sources */,
 				199BC7B11C9AD4FD00E4E0B8 /* LoginViewController.m in Sources */,
@@ -1212,6 +1250,7 @@
 				1929F1841CA0EA64000E9B26 /* MoneyView.m in Sources */,
 				19A1C8411CA27564003E5DD9 /* UserInfo.m in Sources */,
 				19DCCBC81C9AA0450072C3BF /* NSMutableArray+SafeInsert.m in Sources */,
+				19A1C8481CA28683003E5DD9 /* CommodityListCollectionViewCell.m in Sources */,
 				19DCCBFA1C9AA2180072C3BF /* UIActionSheet+Blocks.m in Sources */,
 				19DCCBCA1C9AA0450072C3BF /* NSString+TrimmingAdditions.m in Sources */,
 				1929F1811CA0E597000E9B26 /* UIView+Category.m in Sources */,
@@ -1256,8 +1295,10 @@
 				19DCCBD51C9AA0450072C3BF /* UITableViewCell+Helper.m in Sources */,
 				19DCCBE01C9AA0450072C3BF /* JTOptionCell.m in Sources */,
 				19DCCBE11C9AA0450072C3BF /* JTOptionsEntity.m in Sources */,
+				19ADD36A1CA3AC9D00EE6E5A /* UIButton+Category.m in Sources */,
 				1940D2EC1C9A56730080678C /* main.m in Sources */,
 				19DCCBF91C9AA2180072C3BF /* RIButtonItem.m in Sources */,
+				19A1C89A1CA38048003E5DD9 /* SortView.m in Sources */,
 				19DCCBD61C9AA0450072C3BF /* UIView+FindUIViewController.m in Sources */,
 				199BC7A11C9AA7DF00E4E0B8 /* HomeViewController.m in Sources */,
 				19DCCBF01C9AA1D50072C3BF /* GTOCommonTools.m in Sources */,
@@ -1275,6 +1316,7 @@
 				19DCCBDC1C9AA0450072C3BF /* IBTDatePickerViewController.m in Sources */,
 				19DCCB781C9A9EB30072C3BF /* IBTWebProgressBar.m in Sources */,
 				19DCCBFE1C9AA2A90072C3BF /* ICRDataBaseController.m in Sources */,
+				19ADD36E1CA3B88A00EE6E5A /* CommodityListViewController.m in Sources */,
 				19DCCBD41C9AA0450072C3BF /* UITabBarItem+Universal.m in Sources */,
 				19DCCBE51C9AA0450072C3BF /* ICRFunctionItemControl.m in Sources */,
 				1929F18E1CA10C94000E9B26 /* HomeCollectionViewController.m in Sources */,

--- a/ALand/Application/AppDelegate.m
+++ b/ALand/Application/AppDelegate.m
--- a/ALand/Assets.xcassets/CommodityList/Contents.json
+++ b/ALand/Assets.xcassets/CommodityList/Contents.json
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/CommodityList/commodityAdded.imageset/Contents.json
+++ b/ALand/Assets.xcassets/CommodityList/commodityAdded.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "commodityAdded.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "commodityAdded@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/CommodityList/commodityAdded.imageset/commodityAdded.png
+++ b/ALand/Assets.xcassets/CommodityList/commodityAdded.imageset/commodityAdded.png
--- a/ALand/Assets.xcassets/CommodityList/commodityAdded.imageset/commodityAdded@2x.png
+++ b/ALand/Assets.xcassets/CommodityList/commodityAdded.imageset/commodityAdded@2x.png
--- a/ALand/Assets.xcassets/CommodityList/commodityImage.imageset/Contents.json
+++ b/ALand/Assets.xcassets/CommodityList/commodityImage.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "commodityImage.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "commodityImage@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/CommodityList/commodityImage.imageset/commodityImage.png
+++ b/ALand/Assets.xcassets/CommodityList/commodityImage.imageset/commodityImage.png
--- a/ALand/Assets.xcassets/CommodityList/commodityImage.imageset/commodityImage@2x.png
+++ b/ALand/Assets.xcassets/CommodityList/commodityImage.imageset/commodityImage@2x.png
--- a/ALand/Assets.xcassets/CommodityList/commodityShare.imageset/Contents.json
+++ b/ALand/Assets.xcassets/CommodityList/commodityShare.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "commodityShare.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "commodityShare@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/CommodityList/commodityShare.imageset/commodityShare.png
+++ b/ALand/Assets.xcassets/CommodityList/commodityShare.imageset/commodityShare.png
--- a/ALand/Assets.xcassets/CommodityList/commodityShare.imageset/commodityShare@2x.png
+++ b/ALand/Assets.xcassets/CommodityList/commodityShare.imageset/commodityShare@2x.png
--- a/ALand/Assets.xcassets/CommodityList/commodityUnAdded.imageset/Contents.json
+++ b/ALand/Assets.xcassets/CommodityList/commodityUnAdded.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "commodityUnAdded.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "commodityUnAdded@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/CommodityList/commodityUnAdded.imageset/commodityUnAdded.png
+++ b/ALand/Assets.xcassets/CommodityList/commodityUnAdded.imageset/commodityUnAdded.png
--- a/ALand/Assets.xcassets/CommodityList/commodityUnAdded.imageset/commodityUnAdded@2x.png
+++ b/ALand/Assets.xcassets/CommodityList/commodityUnAdded.imageset/commodityUnAdded@2x.png
--- a/ALand/Assets.xcassets/CommodityList/downIcon.imageset/Contents.json
+++ b/ALand/Assets.xcassets/CommodityList/downIcon.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "downIcon.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "downIcon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/CommodityList/downIcon.imageset/downIcon.png
+++ b/ALand/Assets.xcassets/CommodityList/downIcon.imageset/downIcon.png
--- a/ALand/Assets.xcassets/CommodityList/downIcon.imageset/downIcon@2x.png
+++ b/ALand/Assets.xcassets/CommodityList/downIcon.imageset/downIcon@2x.png
--- a/ALand/Assets.xcassets/MoneyView/eyeOpen.imageset/Contents.json
+++ b/ALand/Assets.xcassets/MoneyView/eyeOpen.imageset/Contents.json
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "eyeOpen.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "eyeOpen@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
--- a/ALand/Assets.xcassets/MoneyView/eyeOpen.imageset/eyeOpen.png
+++ b/ALand/Assets.xcassets/MoneyView/eyeOpen.imageset/eyeOpen.png
--- a/ALand/Assets.xcassets/MoneyView/eyeOpen.imageset/eyeOpen@2x.png
+++ b/ALand/Assets.xcassets/MoneyView/eyeOpen.imageset/eyeOpen@2x.png
--- a/ALand/CodeClass/Home/View/CommodityListCollectionViewCell.h
+++ b/ALand/CodeClass/Home/View/CommodityListCollectionViewCell.h
+//
+//  CommodityListCollectionViewCell.h
+//  ALand
+//
+//  Created by Z on 16/3/23.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+#import <UIKit/UIKit.h>
+@interface CommodityListCollectionViewCell : UICollectionViewCell
+@property (weak, nonatomic) IBOutlet UILabel *labelRealPrice;
+@property (weak, nonatomic) IBOutlet UILabel *labelSalePrice;
+@end
--- a/ALand/CodeClass/Home/View/CommodityListCollectionViewCell.m
+++ b/ALand/CodeClass/Home/View/CommodityListCollectionViewCell.m
+//
+//  CommodityListCollectionViewCell.m
+//  ALand
+//
+//  Created by Z on 16/3/23.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+#import "CommodityListCollectionViewCell.h"
+@interface CommodityListCollectionViewCell ()
+@property (weak, nonatomic) IBOutlet UIImageView *imageViewTop;
+@property (weak, nonatomic) IBOutlet UILabel *labelTitle;
+@property (weak, nonatomic) IBOutlet UILabel *labelCommission;
+@end
+@implementation CommodityListCollectionViewCell
+- (void)awakeFromNib {
+    // Initialization code
+}
+@end
--- a/ALand/CodeClass/Home/View/CommodityListCollectionViewCell.xib
+++ b/ALand/CodeClass/Home/View/CommodityListCollectionViewCell.xib
--- a/ALand/CodeClass/Home/View/MoneyView.m
+++ b/ALand/CodeClass/Home/View/MoneyView.m
@@ -8,8 +8,57 @@
 #import "MoneyView.h"
+@interface MoneyView ()
+@property (weak, nonatomic) IBOutlet UILabel *labelMoney;
+@property (weak, nonatomic) IBOutlet UILabel *labelMonthIncome;
+@property (weak, nonatomic) IBOutlet UILabel *labelMonthSale;
+@property (weak, nonatomic) IBOutlet UILabel *labelMonthOrder;
+@property (weak, nonatomic) IBOutlet UIButton *buttonEye;//tag为0，则显示星号，tag为1，显示金额
+@property (nonatomic, copy) NSString *realMoney;
+@end
 @implementation MoneyView
+- (void)awakeFromNib {
+    WS(weakSelf)
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        NSString *str = [[NSUserDefaults standardUserDefaults] objectForKey:@"hideMoney"];
+        if ([str isEqualToString:@"YES"]) {
+            weakSelf.buttonEye.tag = 1;
+            weakSelf.labelMoney.text = @"******";
+        }else{
+        }
+    });
+}
+- (IBAction)buttonEyeAction:(UIButton *)sender {
+    if (sender.tag == 0) {
+        self.labelMoney.text = @"******";
+        sender.tag = 1;
+        [[NSUserDefaults standardUserDefaults] setObject:@"YES" forKey:@"hideMoney"];
+    }else{
+        self.labelMoney.text = @"23421";
+        sender.tag = 0;
+        [[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:@"hideMoney"];
+    }
+}
+//设置总收入金额
+- (void)setMondeyNumber:(NSString *)number{
+    if (self.buttonEye.tag == 0) {
+    }else{
+        self.labelMoney.text = number;
+    }
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

--- a/ALand/CodeClass/Home/View/MoneyView.xib
+++ b/ALand/CodeClass/Home/View/MoneyView.xib
@@ -59,18 +59,34 @@
                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                    <nil key="highlightedColor"/>
                </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="00.0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lnc-ho-ySs">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="234234" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lnc-ho-ySs">
-                    <rect key="frame" x="17" y="56" width="70" height="37"/>
+                    <rect key="frame" x="17" y="56" width="120" height="35"/>
-                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="31"/>
+                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="32"/>
                    <color key="textColor" red="0.96862745098039216" green="0.36862745098039218" blue="0.36862745098039218" alpha="1" colorSpace="calibratedRGB"/>
                    <nil key="highlightedColor"/>
                </label>
                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="ODe-C6-DGN">
-                    <rect key="frame" x="341" y="0.0" width="13" height="107"/>
+                    <rect key="frame" x="343" y="9" width="13" height="42"/>
                    <constraints>
                        <constraint firstAttribute="width" constant="13" id="0Ui-lP-8GE"/>
+                        <constraint firstAttribute="height" constant="42" id="JJZ-Jq-vcu"/>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="11" id="kGR-iD-Bxa"/>
                    </constraints>
                </imageView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6h9-Nv-UNf">
+                    <rect key="frame" x="326" y="64" width="30" height="18"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="30" id="a3k-ko-Eep"/>
+                        <constraint firstAttribute="height" constant="18" id="cjT-dS-HRZ"/>
+                    </constraints>
+                    <state key="normal" image="eyeOpen"/>
+                    <connections>
+                        <action selector="buttonEyeAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="zqv-Sh-tXI"/>
+                    </connections>
+                </button>
+                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="eyeOpen" translatesAutoresizingMaskIntoConstraints="NO" id="CVC-Fd-5lZ">
+                    <rect key="frame" x="332" y="56" width="33" height="34"/>
+                </imageView>
            </subviews>
            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
            <constraints>
@@ -87,6 +103,7 @@
                <constraint firstItem="k8x-ug-WTe" firstAttribute="centerY" secondItem="bWL-2f-gh2" secondAttribute="centerY" id="GZi-lM-Lio"/>
                <constraint firstItem="MWa-IH-asH" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="H76-oi-oVn"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="leading" secondItem="bWL-2f-gh2" secondAttribute="trailing" constant="20" id="HPL-Gj-Scb"/>
+                <constraint firstAttribute="trailing" secondItem="ODe-C6-DGN" secondAttribute="trailing" constant="19" id="Hh9-af-MHS"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="centerY" secondItem="bWL-2f-gh2" secondAttribute="centerY" id="Hw2-B1-y5R"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="width" secondItem="Hyn-Rr-wOv" secondAttribute="width" id="JfK-LQ-fcB"/>
                <constraint firstItem="7rw-kV-aXx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="17" id="Jjf-vP-g1q"/>
@@ -97,6 +114,7 @@
                <constraint firstItem="k8x-ug-WTe" firstAttribute="leading" secondItem="bWL-2f-gh2" secondAttribute="trailing" constant="20" id="XX2-JM-X8g"/>
                <constraint firstItem="Hyn-Rr-wOv" firstAttribute="leading" secondItem="k8x-ug-WTe" secondAttribute="trailing" constant="20" id="Yjp-06-ZgA"/>
                <constraint firstAttribute="bottom" secondItem="MWa-IH-asH" secondAttribute="bottom" constant="44" id="ZrL-JL-K6Y"/>
+                <constraint firstItem="6h9-Nv-UNf" firstAttribute="top" secondItem="ODe-C6-DGN" secondAttribute="bottom" constant="13" id="aIK-fc-J2G"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="leading" secondItem="bWL-2f-gh2" secondAttribute="trailing" constant="20" id="aep-TD-tkE"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="leading" secondItem="bWL-2f-gh2" secondAttribute="trailing" constant="10" id="b3e-xD-7g8"/>
                <constraint firstItem="Hyn-Rr-wOv" firstAttribute="centerY" secondItem="bWL-2f-gh2" secondAttribute="centerY" id="cfd-zc-b5M"/>
@@ -106,10 +124,13 @@
                <constraint firstItem="Hyn-Rr-wOv" firstAttribute="leading" secondItem="k8x-ug-WTe" secondAttribute="trailing" constant="10" id="e55-pX-zgA"/>
                <constraint firstAttribute="trailing" secondItem="sno-XF-7wp" secondAttribute="trailing" id="et4-mm-hKl"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="top" secondItem="MWa-IH-asH" secondAttribute="bottom" constant="8" id="ggd-Gu-kIt"/>
+                <constraint firstItem="6h9-Nv-UNf" firstAttribute="centerY" secondItem="Lnc-ho-ySs" secondAttribute="centerY" id="h4G-q8-0LQ"/>
+                <constraint firstItem="6h9-Nv-UNf" firstAttribute="baseline" secondItem="Lnc-ho-ySs" secondAttribute="baseline" id="hZW-Ba-XuG"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="top" secondItem="MWa-IH-asH" secondAttribute="bottom" constant="8" id="iSZ-ar-FVT"/>
-                <constraint firstItem="ODe-C6-DGN" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="jK8-jP-5a9"/>
+                <constraint firstItem="ODe-C6-DGN" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="9" id="jK8-jP-5a9"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="centerY" secondItem="bWL-2f-gh2" secondAttribute="centerY" id="jKm-3i-4Np"/>
                <constraint firstItem="Hyn-Rr-wOv" firstAttribute="leading" secondItem="k8x-ug-WTe" secondAttribute="trailing" constant="20" id="jMN-cA-Mfi"/>
+                <constraint firstItem="ODe-C6-DGN" firstAttribute="trailing" secondItem="6h9-Nv-UNf" secondAttribute="trailing" id="jnh-va-qkv"/>
                <constraint firstAttribute="trailing" secondItem="Hyn-Rr-wOv" secondAttribute="trailing" constant="20" id="kzv-TI-fKn"/>
                <constraint firstAttribute="trailing" secondItem="Hyn-Rr-wOv" secondAttribute="trailing" constant="20" id="px6-Z8-sS6"/>
                <constraint firstItem="Lnc-ho-ySs" firstAttribute="leading" secondItem="7rw-kV-aXx" secondAttribute="leading" id="qcA-WM-ls1"/>
@@ -129,7 +150,11 @@
            </constraints>
            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
            <variation key="default">
+                <mask key="subviews">
+                    <exclude reference="CVC-Fd-5lZ"/>
+                </mask>
                <mask key="constraints">
+                    <exclude reference="Mbm-zF-a7w"/>
                    <exclude reference="9cT-Xa-K2j"/>
                    <exclude reference="dmE-Oa-g5e"/>
                    <exclude reference="xjZ-0E-BeK"/>
@@ -153,12 +178,22 @@
                    <exclude reference="rVN-WN-i2P"/>
                    <exclude reference="x2L-xk-WPx"/>
                    <exclude reference="y0D-QN-gqU"/>
+                    <exclude reference="hZW-Ba-XuG"/>
+                    <exclude reference="whw-6t-8In"/>
                </mask>
            </variation>
-            <point key="canvasLocation" x="530.5" y="160.5"/>
+            <connections>
+                <outlet property="buttonEye" destination="6h9-Nv-UNf" id="G83-eF-zWu"/>
+                <outlet property="labelMoney" destination="Lnc-ho-ySs" id="58N-RR-Eyj"/>
+                <outlet property="labelMonthIncome" destination="oE9-qL-eth" id="TVR-AH-ebv"/>
+                <outlet property="labelMonthOrder" destination="O8s-DL-Dmx" id="8a8-3M-ZcY"/>
+                <outlet property="labelMonthSale" destination="MWa-IH-asH" id="mgR-sg-mZk"/>
+            </connections>
+            <point key="canvasLocation" x="353.5" y="138.5"/>
        </view>
    </objects>
    <resources>
+        <image name="eyeOpen" width="38" height="23"/>
        <image name="moneyViewLine" width="540" height="121"/>
        <image name="rightIcon" width="17" height="30"/>
    </resources>

--- a/ALand/CodeClass/Home/View/SortView.h
+++ b/ALand/CodeClass/Home/View/SortView.h
+//
+//  SortView.h
+//  ALand
+//
+//  Created by Z on 16/3/24.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+#import <UIKit/UIKit.h>
+typedef void (^sortBlock)(BOOL);
+typedef void (^selectedRow)(NSInteger);
+@interface SortView : UIView
+@property (nonatomic, copy) sortBlock leftSortAction;
+@property (nonatomic, copy) sortBlock rightAction;
+@property (nonatomic, copy) selectedRow selecedBlock;
+- (instancetype)customNew;
+@end
--- a/ALand/CodeClass/Home/View/SortView.m
+++ b/ALand/CodeClass/Home/View/SortView.m
+//
+//  SortView.m
+//  ALand
+//
+//  Created by Z on 16/3/24.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+#import "SortView.h"
+#import "CoverShadowView.h"
+@interface SortView ()<UITableViewDataSource, UITableViewDelegate>
+@property (nonatomic, assign) CGFloat clickCount;
+@property (nonatomic, strong) CoverShadowView *coverView;
+@property (nonatomic, strong) UIButton *leftBtn;
+@property (nonatomic, strong) UIButton *rightBtn;
+@property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, strong) NSArray *arrTitles;
+@property (nonatomic, strong) NSMutableArray *arrSelectedMark;
+@end
+@implementation SortView
+- (instancetype)customNew {
+    //SortView *sortView = [SortView new];
+    UIView *grayLine = [UIView new];
+    [self addSubview:grayLine];
+    grayLine.sd_layout.topSpaceToView(self, 5).bottomSpaceToView(self, 5).centerXEqualToView(self).centerYEqualToView(self).widthIs(1);
+    grayLine.backgroundColor = kBacroundColor;
+    UIButton *leftButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    [self addSubview:leftButton];
+    self.leftBtn = leftButton;
+    [leftButton setTitle:@"综合排序          " forState:UIControlStateNormal];
+    [leftButton setTitleColor:kTextColorBlack forState:UIControlStateNormal];
+    [leftButton setImage:[UIImage imageNamed:@"downIcon"] forState:UIControlStateNormal];
+    [leftButton addTarget:self action:@selector(leftAction:) forControlEvents:UIControlEventTouchUpInside];
+    leftButton.imageView.tintColor = kTextColorGray;
+    leftButton.imageEdgeInsets = UIEdgeInsetsMake(0, 115, 0, 0);
+    leftButton.sd_layout.topEqualToView(self).leftEqualToView(self).rightSpaceToView(grayLine,0).bottomEqualToView(self);
+    [leftButton updateLayout];
+    self.rightBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    [self addSubview:self.rightBtn];
+    [self.rightBtn setNormalStateWithTitle:@"销量优先" titleColor:kTextColorBlack image:nil];
+    self.rightBtn.sd_layout.leftSpaceToView(grayLine,0).topEqualToView(self).bottomEqualToView(self).rightEqualToView(self);
+    [self.rightBtn addTarget:self action:@selector(rightBtnAction) forControlEvents:UIControlEventTouchUpInside];
+    UIView *viewGrayBottom = [UIView new];
+    viewGrayBottom.backgroundColor = kCutLineColorLiteGray;
+    [self addSubview:viewGrayBottom];
+    viewGrayBottom.sd_layout.bottomEqualToView(self).leftEqualToView(self).rightEqualToView(self).heightIs(1);
+    return self;
+}
+- (void)rightBtnAction {
+    [self.rightBtn setTitleColor:kCustomGreenColor forState:UIControlStateNormal];
+    [self.leftBtn setTitleColor:kTextColorBlack forState:UIControlStateNormal];
+}
+- (CoverShadowView *)coverView {
+    if (!_coverView) {
+        _coverView = [[CoverShadowView alloc] initWithSpaceToTop:self.bottom + 64];
+        [self.window addSubview:_coverView];
+        WS(weakSelf)
+        _coverView.tapAction = ^{
+            [weakSelf leftAction:nil];
+        };
+        self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, self.bottom + 64, ScreenSize.width, 0) style:UITableViewStylePlain];
+        self.tableView.delegate = self;
+        self.tableView.dataSource = self;
+        self.arrTitles = @[@"综合排序",@"新品排序",@"收藏排序",@"价格从低到高",@"价格从高到低",@"佣金从低到高",@"佣金从高到低"];
+        self.arrSelectedMark = [NSMutableArray array];
+        for (int i = 0; i < self.arrTitles.count; i++) {
+            [self.arrSelectedMark addObject:@"NO"];
+        }
+        [self.arrSelectedMark replaceObjectAtIndex:0 withObject:@"YES"];
+        [self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:@"reuseIdentifier"];
+        [self.window addSubview:self.tableView];
+        [self showTableView];
+    }
+    return _coverView;
+}
+#pragma mark ==============animate==============
+- (void)showTableView {
+    WS(weakSelf)
+    [UIView animateWithDuration:0.3 delay:0 options:(UIViewAnimationOptionCurveEaseIn) animations:^{
+        weakSelf.tableView.height = 44 * weakSelf.arrTitles.count;
+    } completion:nil];
+}
+- (void)hideTableView {
+    WS(weakSelf)
+    [UIView animateWithDuration:0.3 animations:^{
+        weakSelf.tableView.height = 0;
+    }];
+}
+#pragma mark ==============table delegate==============
+- (void)resetMark {
+    for (int i = 0; i  < self.arrTitles.count; i++) {
+        [self.arrSelectedMark replaceObjectAtIndex:i withObject:@"NO"];
+    }
+}
+#pragma mark - Table view data source
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+#warning Incomplete implementation, return the number of sections
+    return 1;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+#warning Incomplete implementation, return the number of rows
+    return self.arrTitles.count;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
+    [self resetMark];
+    [self.arrSelectedMark replaceObjectAtIndex:indexPath.row withObject:@"YES"];
+    UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+    [cell setAccessoryType:UITableViewCellAccessoryCheckmark];
+    [tableView reloadData];
+    [self leftAction:nil];
+    self.selecedBlock(indexPath.row);
+    [self setLeftBtnTitle:self.arrTitles[indexPath.row]];
+    [self.leftBtn setTitleColor:kCustomGreenColor forState:UIControlStateNormal];
+    [self.rightBtn setTitleColor:kTextColorBlack forState:UIControlStateNormal];
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"reuseIdentifier" forIndexPath:indexPath];
+    cell.textLabel.text = self.arrTitles[indexPath.row];
+    // Configure the cell...
+    cell.tintColor = kCustomGreenColor;
+    if ([self.arrSelectedMark[indexPath.row] isEqualToString:@"YES"]) {
+        cell.textLabel.textColor = kCustomGreenColor;
+        [cell setAccessoryType:UITableViewCellAccessoryCheckmark];
+    }else{
+        cell.textLabel.textColor = [UIColor blackColor];
+        [cell setAccessoryType:UITableViewCellAccessoryNone];
+    }
+    return cell;
+}
+- (void)setLeftBtnTitle:(NSString *)str {
+    [self.leftBtn setTitle:[NSString stringWithFormat:@"%@            ",str] forState:UIControlStateNormal];
+    if (str.length > 4) {
+        self.leftBtn.imageEdgeInsets = UIEdgeInsetsMake(0, 130, 0, 0);
+        self.leftBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -10, 0, 0);
+    }else{
+        self.leftBtn.imageEdgeInsets = UIEdgeInsetsMake(0, 115, 0, 0);
+        self.leftBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0);
+    }
+}
+- (void)leftAction:(UIButton *)btn {
+    if (self.clickCount != M_PI) {
+        [self.coverView show];
+        [self showTableView];
+        self.leftSortAction(YES);
+    }else{
+        [self.coverView hide];
+        [self hideTableView];
+        self.leftSortAction(NO);
+    }
+    [self iconAnimate];
+}
+- (void)iconAnimate {
+    self.clickCount = self.clickCount + M_PI;
+    if (self.clickCount > M_PI * 2 ) {
+        self.clickCount = M_PI;
+    }
+    WS(weakSelf)
+    [UIView animateWithDuration:0.3 animations:^{
+        weakSelf.leftBtn.imageView.transform = CGAffineTransformMakeRotation(weakSelf.clickCount);
+    }];
+}
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+@end
--- a/ALand/CodeClass/Home/ViewController/Commodity/CommodityListViewController.h
+++ b/ALand/CodeClass/Home/ViewController/Commodity/CommodityListViewController.h
+//
+//  CommodityListViewController.h
+//  ALand
+//
+//  Created by Z on 16/3/23.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+#import "IBTUIViewController.h"
+@interface CommodityListViewController : IBTUIViewController
+@end
--- a/ALand/CodeClass/Home/ViewController/Commodity/CommodityListViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Commodity/CommodityListViewController.m
+//
+//  CommodityListViewController.m
+//  ALand
+//
+//  Created by Z on 16/3/23.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+#import "CommodityListViewController.h"
+#import "CommodityListCollectionViewCell.h"
+#import "SortView.h"
+#define kCellID @"commodityCell"
+@interface CommodityListViewController ()<UICollectionViewDataSource, UICollectionViewDelegate>
+@property (nonatomic, strong) UICollectionView *collectionView;
+@property (nonatomic, strong) SortView *sortView;
+@end
+@implementation CommodityListViewController
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.navigationItem.title = @"商品列表";
+    self.view.backgroundColor = kBacroundColor;
+    [self setUpSortView];
+    [self setUpCollectionView];
+    // Do any additional setup after loading the view.
+}
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [self.navigationController setNavigationBarHidden:NO];
+}
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    //CLog(@"%@",NSStringFromCGRect(_sortView.frame));
+}
+- (void)setUpSortView {
+    _sortView = [[[SortView alloc] init] customNew];
+    [self.view addSubview:_sortView];
+    _sortView.sd_layout.topSpaceToView(self.view,1).leftEqualToView(self.view).rightEqualToView(self.view).heightIs(44);
+    _sortView.backgroundColor = [UIColor whiteColor];
+    //根据是否点开排序列表，控制返回按钮是否可以点击
+    WS(weakSelf)
+    _sortView.leftSortAction = ^(BOOL isOpen){
+        //CLog(@"%d",isOpen);
+        weakSelf.navigationItem.leftBarButtonItem.enabled = !isOpen;
+    };
+    //点击排序列表之后回调传入选中行数
+    _sortView.selecedBlock = ^(NSInteger row){
+        CLog(@"%ld", (long)row);
+    };
+}
+- (void)setUpCollectionView {
+    UICollectionViewFlowLayout *layOut = [[UICollectionViewFlowLayout alloc] init];
+    layOut.minimumLineSpacing = 10;
+    layOut.itemSize = CGSizeMake((ScreenSize.width - 30)/2, ScreenSize.height / 2.2);
+    _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layOut];
+    [self.view addSubview:_collectionView];
+    _collectionView.sd_layout.topSpaceToView(self.view, 50).leftEqualToView(self.view).bottomEqualToView(self.view).rightEqualToView(self.view);
+    _collectionView.contentInset = UIEdgeInsetsMake(0, 10, 0, 10);
+    _collectionView.delegate = self;
+    _collectionView.dataSource = self;
+    _collectionView.backgroundColor = kBacroundColor;
+    [_collectionView registerNib:[UINib nibWithNibName:@"CommodityListCollectionViewCell" bundle:[NSBundle mainBundle]] forCellWithReuseIdentifier:kCellID];
+}
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+    return 20;
+}
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+    CommodityListCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kCellID forIndexPath:indexPath];
+    NSArray *arr = @[@"234",@"23",@"234234",@"2344",@"33",@"2",@"234",@"23",@"234234",@"2344",@"33",@"2",@"234",@"23",@"234234",@"2344",@"33",@"2",@"234",@"23",@"234234",@"2344",@"33",@"2"];
+    cell.labelSalePrice.text = arr[indexPath.row];
+    return cell;
+}
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+/*
+#pragma mark - Navigation
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+@end
--- a/ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m
+++ b/ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m
@@ -9,6 +9,7 @@
 #import "HomeCollectionViewController.h"
 #import "MoneyView.h"
 #import "HomeCollectionViewCell.h"
+#import "CommodityListViewController.h"
 #define kHomeCollectionViewID @"HomeCollectionViewID"
 #define kCollectionViewHeadHeight 350
 #import "SDCycleScrollView.h"
@@ -86,6 +87,9 @@
 - (void)touchAddAction {
    CLog(@"添加商品");
+    CommodityListViewController *commodityVC = [[CommodityListViewController alloc] init];
+    commodityVC.hidesBottomBarWhenPushed = YES;
+    [self.navigationController pushViewController:commodityVC animated:YES];
 }

--- a/ALand/CodeClass/Home/ViewController/HomeViewController.m
+++ b/ALand/CodeClass/Home/ViewController/HomeViewController.m
@@ -9,6 +9,7 @@
 #import "HomeViewController.h"
 #import "HomeTopView.h"
 #import "HomeCollectionViewController.h"
 @interface HomeViewController ()
 @end
@@ -37,18 +38,6 @@
    [self.view addSubview:homeCollectionView.view];
    homeCollectionView.view.sd_layout.topSpaceToView(viewHomeTop, 0).leftEqualToView(self.view).rightEqualToView(self.view).bottomEqualToView(self.view);
    [homeCollectionView.view updateLayout];    
-//    [self.view addSubview:self.collectionView];
-//    _collectionView.backgroundColor = [UIColor colorWithWhite:0.949 alpha:1.000];
-//    _collectionView.contentSize = CGSizeMake(0, ScreenSize.height - 150);
-//    _collectionView.sd_layout.topSpaceToView(viewHomeTop,0).leftEqualToView(self.view).rightEqualToView(self.view).bottomEqualToView(self.view);
-//    [_collectionView  updateLayout];
 }
 - (void)didReceiveMemoryWarning {

--- a/ALand/CodeClass/Login/LoginViewController.xib
+++ b/ALand/CodeClass/Login/LoginViewController.xib
@@ -19,10 +19,10 @@
                    <rect key="frame" x="0.0" y="0.0" width="375" height="502"/>
                    <subviews>
                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_top" translatesAutoresizingMaskIntoConstraints="NO" id="gIO-Jz-jhA">
-                            <rect key="frame" x="71" y="94" width="234" height="128"/>
+                            <rect key="frame" x="71" y="94" width="234" height="136"/>
                        </imageView>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Drd-sW-LYv">
-                            <rect key="frame" x="32" y="272" width="311" height="44"/>
+                            <rect key="frame" x="32" y="274" width="311" height="44"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="300" id="1bQ-Cb-7AQ"/>
                                <constraint firstAttribute="height" constant="44" id="YYQ-Ir-pJ1"/>
@@ -41,7 +41,7 @@
                            </connections>
                        </button>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Te4-Rx-W0K">
-                            <rect key="frame" x="32" y="346" width="311" height="44"/>
+                            <rect key="frame" x="32" y="348" width="311" height="44"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="300" id="do6-tj-oIb"/>
                                <constraint firstAttribute="height" constant="44" id="hO8-nY-x1O"/>
@@ -73,11 +73,12 @@
                        <constraint firstItem="gIO-Jz-jhA" firstAttribute="top" secondItem="Tdr-oJ-D2D" secondAttribute="top" constant="94" id="VUr-5i-RNg"/>
                        <constraint firstAttribute="trailing" secondItem="Drd-sW-LYv" secondAttribute="trailing" constant="32" id="Yvj-Ij-yee"/>
                        <constraint firstAttribute="trailing" secondItem="Te4-Rx-W0K" secondAttribute="trailing" constant="32" id="s7F-0h-8kx"/>
-                        <constraint firstItem="Drd-sW-LYv" firstAttribute="top" secondItem="gIO-Jz-jhA" secondAttribute="bottom" constant="50" id="toG-Yd-KdR"/>
+                        <constraint firstItem="Drd-sW-LYv" firstAttribute="top" secondItem="gIO-Jz-jhA" secondAttribute="bottom" constant="44" id="toG-Yd-KdR"/>
                    </constraints>
                    <variation key="default">
                        <mask key="constraints">
                            <exclude reference="3YX-cm-g6m"/>
+                            <exclude reference="G8x-w3-2bW"/>
                            <exclude reference="PFp-AF-Qmc"/>
                            <exclude reference="KRj-Ju-bKK"/>
                        </mask>

--- a/ALand/General/Categories/UIButton+Category/UIButton+Category.h
+++ b/ALand/General/Categories/UIButton+Category/UIButton+Category.h
+//
+//  UIButton+Category.h
+//  ALand
+//
+//  Created by Z on 16/3/24.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+#import <UIKit/UIKit.h>
+@interface UIButton (Category)
+- (void)setNormalStateWithTitle:(NSString *)title titleColor:(UIColor *)titleColor image:(UIImage *)image;
+@end
--- a/ALand/General/Categories/UIButton+Category/UIButton+Category.m
+++ b/ALand/General/Categories/UIButton+Category/UIButton+Category.m
+//
+//  UIButton+Category.m
+//  ALand
+//
+//  Created by Z on 16/3/24.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+#import "UIButton+Category.h"
+@implementation UIButton (Category)
+- (void)setNormalStateWithTitle:(NSString *)title titleColor:(UIColor *)titleColor image:(UIImage *)image {
+    [self setTitle:title forState:UIControlStateNormal];
+    [self setTitleColor:titleColor forState:UIControlStateNormal];
+    [self setImage:image forState:UIControlStateNormal];
+}
+@end
--- a/ALand/Global/CoverShadowView.h
+++ b/ALand/Global/CoverShadowView.h
+//
+//  CoverShadowView.h
+//  ALand
+//
+//  Created by Z on 16/3/24.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+#import <UIKit/UIKit.h>
+typedef void (^tapBlock)(void);
+@interface CoverShadowView : UIView
+@property (nonatomic, copy) tapBlock tapAction;
+- (instancetype)initWithSpaceToTop:(CGFloat)spaceToTop;
+- (void)show;
+- (void)hide;
+@end
--- a/ALand/Global/CoverShadowView.m
+++ b/ALand/Global/CoverShadowView.m
+//
+//  CoverShadowView.m
+//  ALand
+//
+//  Created by Z on 16/3/24.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+#import "CoverShadowView.h"
+@implementation CoverShadowView
+- (instancetype)initWithSpaceToTop:(CGFloat)spaceToTop;
+{
+    self = [super init];
+    if (self) {
+        self.backgroundColor = [UIColor colorWithWhite:0.000 alpha:0.172];
+        self.alpha = 0;
+        self.frame = CGRectMake(0, spaceToTop, ScreenSize.width, ScreenSize.height - spaceToTop);
+        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(doTap)];
+        [self addGestureRecognizer:tap];
+    }
+    return self;
+}
+- (void)doTap {
+    self.tapAction();
+}
+- (void)show {
+    WS(weakSelf)
+    [UIView animateWithDuration:0.2 animations:^{
+        weakSelf.alpha = 1;
+    }];
+}
+- (void)hide {
+    WS(weakSelf)
+    [UIView animateWithDuration:0.2 animations:^{
+        weakSelf.alpha = 0;
+    }];
+}
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+@end
--- a/ALand/Macro/AppHeader.h
+++ b/ALand/Macro/AppHeader.h
@@ -12,9 +12,25 @@
 #define kMainTextColor [UIColor colorWithRed:0.486 green:0.765 blue:0.145 alpha:1.000];
 #define kCustomGrayColor [UIColor colorWithWhite:0.533 alpha:1.000];
-#define kCustomGreenColor [UIColor colorWithRed:0.486 green:0.765 blue:0.145 alpha:1.000];
+#define kCustomGreenColor [UIColor colorWithRed:0.486 green:0.765 blue:0.145 alpha:1.000]
 #define kRandomColor [UIColor colorWithRed:arc4random()%256/255.0 green:arc4random()%256/255.0 blue:arc4random()%256/255.0 alpha:1.000]
 #define kBacroundColor                   [UIColor colorWithWhite:0.949 alpha:1.000]
+#define kTextColorBlack                   [UIColor colorWithWhite:0.067 alpha:1.000]
+#define kTextColorDarkGray                   [UIColor colorWithWhite:0.200 alpha:1.000]
+#define kTextColorGray                   [UIColor colorWithWhite:0.400 alpha:1.000]
+#define kTextColorLiteGray                  [UIColor colorWithWhite:0.600 alpha:1.000]
+#define kCutLineColorLiteGray [UIColor colorWithWhite:0.867 alpha:1.000]
+#define kCutLineColorGray [UIColor colorWithWhite:0.820 alpha:1.000]
+#define kCutLineColorDarkGray [UIColor colorWithWhite:0.757 alpha:1.000]
+#define kPriceColor [UIColor colorWithRed:1.000 green:0.392 blue:0.392 alpha:1.000];
+#define WS(weakSelf)  __weak __typeof(&*self)weakSelf = self;
 #define ICR_TINTCOLOR                   [UIColor colorWithR:63 g:134 b:244 a:1]//天蓝色
 #define ICR_VIEW_BG_COLOR               [UIColor whiteColor]

--- a/ALand/Macro/IMPHeader.h
+++ b/ALand/Macro/IMPHeader.h
@@ -14,4 +14,5 @@
 #import "UIView+Category.h"
 #import "UIImageView+WebCache.h"
 #import "UserInfo.h"
+#import "UIButton+Category.h"
 #endif /* IMPHeader_h */