添加商品界面调用接口完成

ALand/CodeClass/Home/Model/Commodity/CatgoryModel.h

+//
+//  CatgoryModel.h
+//  ALand
+//
+//  Created by Z on 16/4/8.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class Upper,Createinfo,Operator,Lastmodifyinfo,Operator;
+@interface CatgoryModel : NSObject
+
+@property (nonatomic, copy) NSString *uuid;
+
+@property (nonatomic, copy) NSString *state;
+
+@property (nonatomic, copy) NSString *adescription;
+
+@property (nonatomic, assign) NSInteger version;
+
+@property (nonatomic, strong) Upper *upper;
+
+@property (nonatomic, copy) NSString *domain;
+
+@property (nonatomic, copy) NSString *path;
+
+@property (nonatomic, strong) Lastmodifyinfo *lastModifyInfo;
+
+@property (nonatomic, copy) NSString *code;
+
+@property (nonatomic, assign) NSInteger level;
+
+@property (nonatomic, copy) NSString *pictures;
+
+@property (nonatomic, assign) NSInteger order;
+
+@property (nonatomic, strong) Createinfo *createInfo;
+
+@property (nonatomic, copy) NSString *name;
+
+@end
+@interface Upper : NSObject
+
+@property (nonatomic, copy) NSString *name;
+
+@property (nonatomic, copy) NSString *uuid;
+
+@property (nonatomic, copy) NSString *code;
+
+@end
+

ALand/CodeClass/Home/Model/Commodity/CatgoryModel.m

+//
+//  CatgoryModel.m
+//  ALand
+//
+//  Created by Z on 16/4/8.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "CatgoryModel.h"
+
+@implementation CatgoryModel
+
+@end
+@implementation Upper
+
+@end
+
+

ALand/CodeClass/Home/Model/Commodity/HotBrandModel.h

+//
+//  HotBrandModel.h
+//  ALand
+//
+//  Created by Z on 16/4/7.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class Createinfo,Operator,Lastmodifyinfo,Operator;
+@interface HotBrandModel : NSObject
+
+@property (nonatomic, copy) NSString *uuid;
+
+@property (nonatomic, copy) NSString *state;
+
+@property (nonatomic, copy) NSString *adescription;
+
+@property (nonatomic, assign) NSInteger version;
+
+@property (nonatomic, copy) NSString *domain;
+
+@property (nonatomic, strong) Lastmodifyinfo *lastModifyInfo;
+
+@property (nonatomic, copy) NSString *code;
+
+@property (nonatomic, assign) NSInteger order;
+
+@property (nonatomic, copy) NSString *logo;
+
+@property (nonatomic, copy) NSString *location;
+
+@property (nonatomic, strong) Createinfo *createInfo;
+
+@property (nonatomic, copy) NSString *website;
+
+@property (nonatomic, copy) NSString *name;
+
+@end
+
+
+

ALand/CodeClass/Home/Model/Commodity/HotBrandModel.m

+//
+//  HotBrandModel.m
+//  ALand
+//
+//  Created by Z on 16/4/7.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "HotBrandModel.h"
+
+@implementation HotBrandModel
+
+@end
+
+
+
+
+
+
+
+

ALand/CodeClass/Home/Model/Commodity/RequstBodyCommodityListModel.h

+//
+//  RequstBodyCommodityListModel.h
+//  ALand
+//
+//  Created by Z on 16/4/11.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class Defintion,Orders,Conditions,Parameter,Parameters;
+@interface RequstBodyCommodityListModel : NSObject
+
+@property (nonatomic, strong) Defintion *defintion;
+
+@property (nonatomic, strong) NSArray<NSString *> *fetchParts;
+
+@end
+@interface Defintion : NSObject
+
+@property (nonatomic, assign) NSInteger probePages;
+
+@property (nonatomic, strong) NSArray<Orders *> *orders;
+
+@property (nonatomic, strong) NSArray<Conditions *> *conditions;
+
+@property (nonatomic, assign) NSInteger pageSize;
+
+@property (nonatomic, assign) NSInteger page;
+
+@end
+
+@interface Orders : NSObject
+
+@property (nonatomic, copy) NSString *field;
+
+@property (nonatomic, copy) NSString *direction;
+
+@end
+
+@interface Conditions : NSObject
+
+@property (nonatomic, strong) NSArray<Parameters *> *parameters;
+
+@property (nonatomic, copy) NSString *operation;
+
+@property (nonatomic, strong) Parameter *parameter;
+
+@end
+
+@interface Parameter : NSObject
+
+@end
+
+@interface Parameters : NSObject
+
+@end
+

ALand/CodeClass/Home/Model/Commodity/RequstBodyCommodityListModel.m

+//
+//  RequstBodyCommodityListModel.m
+//  ALand
+//
+//  Created by Z on 16/4/11.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "RequstBodyCommodityListModel.h"
+
+@implementation RequstBodyCommodityListModel
+
+
+- (Defintion *)defintion {
+    if (!_defintion) {
+        _defintion = [[Defintion alloc] init];
+    }
+    return _defintion;
+}
+
+@end
+@implementation Defintion
+
++ (NSDictionary *)objectClassInArray{
+    return @{@"orders" : [Orders class], @"conditions" : [Conditions class]};
+}
+
+- (NSArray<Conditions *> *)conditions {
+    if (!_conditions) {
+        Conditions *condition = [[Conditions alloc] init];
+        _conditions = @[condition];
+    }
+    return _conditions;
+}
+
+@end
+
+
+@implementation Orders
+
+@end
+
+
+@implementation Conditions
+
++ (NSDictionary *)objectClassInArray{
+    return @{@"parameters" : [Parameters class]};
+}
+
+@end
+
+
+@implementation Parameter
+
+@end
+
+
+@implementation Parameters
+
+@end
+
+

ALand/CodeClass/Home/View/Commodity/AddCommodityCollectionViewCell.h

@@ -7,9 +7,10 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "CatgoryModel.h"
 @interface AddCommodityCollectionViewCell : UICollectionViewCell
 
+- (void)cellWithModel:(CatgoryModel *)model indexPath:(NSIndexPath *)indexPath;
 
 - (void)hideTopLine;
 - (void)showTopLine;

ALand/CodeClass/Home/View/Commodity/AddCommodityCollectionViewCell.m

@@ -13,10 +13,33 @@
 @property (weak, nonatomic) IBOutlet UIView *viewLeftLine;
 
 @property (weak, nonatomic) IBOutlet UIView *viewRightLine;
+@property (weak, nonatomic) IBOutlet UIImageView *imgView;
+@property (weak, nonatomic) IBOutlet UILabel *labelTItle;
+@property (weak, nonatomic) IBOutlet UILabel *labelDsc;
 
 @end
 @implementation AddCommodityCollectionViewCell
 
+- (void)cellWithModel:(CatgoryModel *)model indexPath:(NSIndexPath *)indexPath {
+    [self.imgView sd_setImageWithURL:[NSURL URLWithString:model.pictures] placeholderImage:nil];
+    self.labelDsc.text = model.adescription;
+    self.labelTItle.text = model.name;
+    
+    
+    if ((int)indexPath.row / 4 == 0) {
+        [self showTopLine];
+    }else{
+        [self hideTopLine];
+    }
+    
+    if ((int)indexPath.row % 4 == 0) {
+        [self showLeftLine];
+    }else{
+        [self hideLeftLine];
+    }
+
+}
+
 - (void)hideTopLine {
     self.viewTopLine.hidden = YES;
 }

ALand/CodeClass/Home/View/Commodity/AddCommodityCollectionViewCell.xib

@@ -22,7 +22,7 @@
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="简单说明文字" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JTo-s2-j2V">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="简单说明文字" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JTo-s2-j2V">
                         <rect key="frame" x="71" y="226" width="84" height="17"/>
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
@@ -94,11 +94,14 @@
                 </mask>
             </variation>
             <connections>
+                <outlet property="imgView" destination="VbO-vM-Oi6" id="c46-Su-F7z"/>
+                <outlet property="labelDsc" destination="JTo-s2-j2V" id="IdG-eU-H9d"/>
+                <outlet property="labelTItle" destination="iW3-33-j9z" id="IOU-xT-CpD"/>
                 <outlet property="viewLeftLine" destination="hqW-Bi-eFK" id="Jzf-jU-90j"/>
                 <outlet property="viewRightLine" destination="Bnp-YW-t2r" id="xNo-A8-H0t"/>
                 <outlet property="viewTopLine" destination="J9w-w0-0Ry" id="jWz-4K-zES"/>
             </connections>
-            <point key="canvasLocation" x="187" y="361"/>
+            <point key="canvasLocation" x="336" y="302"/>
         </collectionViewCell>
     </objects>
     <resources>

ALand/CodeClass/Home/View/Commodity/HotCommodityCell.h

@@ -7,9 +7,12 @@
 //
 
 #import <UIKit/UIKit.h>
-
+#import "HotBrandModel.h"
 @interface HotCommodityCell : UICollectionViewCell
+@property (weak, nonatomic) IBOutlet UIImageView *imageViewPic;
+
 
+- (void)cellWithModel:(HotBrandModel *)model indexPath:(NSIndexPath *)indexPath;
 
 - (void)hideRight;
 - (void)showRight;

ALand/CodeClass/Home/View/Commodity/HotCommodityCell.m

@@ -15,6 +15,17 @@
 @end
 @implementation HotCommodityCell
 
+- (void)cellWithModel:(HotBrandModel *)model indexPath:(NSIndexPath *)indexPath {
+    
+    if ((int)indexPath.row % 3 == 2) {
+        [self showRight];
+    }else{
+        [self hideRight];
+    }
+    
+    [self.imageViewPic sd_setImageWithURL:[NSURL URLWithString:model.logo] placeholderImage:nil];
+    
+}
 
 - (void)hideRight {
     self.viewRight.hidden = YES;

ALand/CodeClass/Home/View/Commodity/HotCommodityCell.xib

@@ -16,20 +16,6 @@
                     <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" misplaced="YES" image="hotIcon" translatesAutoresizingMaskIntoConstraints="NO" id="JCd-BI-c3c">
                         <rect key="frame" x="74" y="56" width="142" height="110"/>
                     </imageView>
-                    <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wkg-ww-hVo">
-                        <rect key="frame" x="8" y="56" width="37" height="118"/>
-                        <color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="calibratedRGB"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="1" id="OFH-0O-7Hg"/>
-                        </constraints>
-                    </view>
-                    <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0uc-Vm-6A8">
-                        <rect key="frame" x="258" y="61" width="37" height="118"/>
-                        <color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="calibratedRGB"/>
-                        <constraints>
-                            <constraint firstAttribute="width" constant="1" id="R0Y-1m-QUt"/>
-                        </constraints>
-                    </view>
                     <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="S8b-kg-0m9" customClass="HotCommodityCell">
                         <rect key="frame" x="95" y="189" width="98" height="23"/>
                         <color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="calibratedRGB"/>
@@ -44,31 +30,36 @@
                             <constraint firstAttribute="height" constant="1" id="Qhj-QZ-2YV"/>
                         </constraints>
                     </view>
+                    <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f0P-VR-27O">
+                        <rect key="frame" x="256" y="46" width="37" height="118"/>
+                        <color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="1" id="cAO-73-Oaw"/>
+                            <constraint firstAttribute="width" constant="1" id="zhB-Jc-ZCJ"/>
+                        </constraints>
+                    </view>
                 </subviews>
                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             </view>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="JCd-BI-c3c" secondAttribute="bottom" id="3s0-9D-J5B"/>
-                <constraint firstAttribute="trailing" secondItem="0uc-Vm-6A8" secondAttribute="trailing" id="7Uy-0p-BcR"/>
-                <constraint firstAttribute="bottom" secondItem="0uc-Vm-6A8" secondAttribute="bottom" id="HLh-LE-pjI"/>
-                <constraint firstItem="wkg-ww-hVo" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="HiI-vW-u5f"/>
+                <constraint firstAttribute="trailing" secondItem="f0P-VR-27O" secondAttribute="trailing" id="HfF-qc-Pjl"/>
                 <constraint firstItem="bSo-Z3-jeB" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="Lt7-ZX-UZB"/>
                 <constraint firstAttribute="trailing" secondItem="JCd-BI-c3c" secondAttribute="trailing" constant="10" id="Oc6-Od-4dP"/>
-                <constraint firstAttribute="bottom" secondItem="wkg-ww-hVo" secondAttribute="bottom" id="Tbl-mU-NcN"/>
                 <constraint firstAttribute="trailing" secondItem="S8b-kg-0m9" secondAttribute="trailing" id="a9t-ju-DFw"/>
                 <constraint firstItem="bSo-Z3-jeB" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="aTz-VG-Mb0"/>
+                <constraint firstAttribute="bottom" secondItem="f0P-VR-27O" secondAttribute="bottom" id="cEk-j5-lYW"/>
+                <constraint firstItem="f0P-VR-27O" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="g59-St-POd"/>
                 <constraint firstItem="JCd-BI-c3c" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="jU1-gS-GOs"/>
                 <constraint firstItem="S8b-kg-0m9" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="l1o-tz-FMI"/>
-                <constraint firstItem="0uc-Vm-6A8" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="mFN-Em-JNo"/>
                 <constraint firstAttribute="trailing" secondItem="bSo-Z3-jeB" secondAttribute="trailing" id="nz2-uM-vfo"/>
                 <constraint firstAttribute="bottom" secondItem="S8b-kg-0m9" secondAttribute="bottom" id="u3v-ET-XDG"/>
                 <constraint firstItem="JCd-BI-c3c" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="10" id="wtm-8M-atL"/>
-                <constraint firstItem="wkg-ww-hVo" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="xVX-jx-Bpq"/>
             </constraints>
             <size key="customSize" width="315" height="220"/>
             <connections>
-                <outlet property="viewRight" destination="0uc-Vm-6A8" id="JG4-kH-v8Y"/>
+                <outlet property="imageViewPic" destination="JCd-BI-c3c" id="0PG-L7-j4I"/>
             </connections>
             <point key="canvasLocation" x="392.5" y="285"/>
         </collectionViewCell>

ALand/CodeClass/Home/View/CommodityManagementTopView.m

@@ -28,6 +28,7 @@
     
     ManagementViewController *manageVC = [[ManagementViewController alloc] init];
     [self hideSortView];
+    manageVC.isShowNavigationBar = YES;
     [[self viewController] PushViewController:manageVC animated:YES];
     
     CLog(@"m");

ALand/CodeClass/Home/View/CommodityMutipleSelectBottomView.xib

@@ -11,7 +11,7 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="95"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kJF-jD-kCU">
+                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kJF-jD-kCU">
                     <rect key="frame" x="8" y="0.0" width="67" height="95"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="35" id="T70-gy-1Ql"/>
@@ -28,14 +28,14 @@
                         </mask>
                     </variation>
                 </button>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="k9d-7S-PR5">
+                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="k9d-7S-PR5">
                     <rect key="frame" x="173" y="26" width="66" height="44"/>
                     <fontDescription key="fontDescription" type="system" pointSize="21"/>
                     <state key="normal" title="下架" backgroundImage="greenbtn_bg">
                         <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
                 </button>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QZW-mi-oUQ">
+                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QZW-mi-oUQ">
                     <rect key="frame" x="100" y="26" width="65" height="44"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="aLI-tT-ELQ"/>
@@ -45,7 +45,7 @@
                         <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </state>
                 </button>
-                <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Md-Ga-YFh">
+                <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="749" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Md-Ga-YFh">
                     <rect key="frame" x="247" y="26" width="65" height="44"/>
                     <fontDescription key="fontDescription" type="system" pointSize="21"/>
                     <state key="normal" title="上架" backgroundImage="greenbtn_bg">

ALand/CodeClass/Home/View/CommodityTableViewCell.xib

@@ -30,7 +30,7 @@
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bloem天然草本更年期综合营养 胶囊100粒 " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sKb-Ty-VZw">
                         <rect key="frame" x="114" y="13" width="192" height="41"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥279" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="exC-Ji-hHu">
@@ -48,7 +48,7 @@
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥9.8" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eSJ-Pe-NgQ">
                         <rect key="frame" x="218" y="69" width="50" height="24"/>
                         <fontDescription key="fontDescription" type="system" pointSize="20"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="销量：19" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WH8-2u-i8A">

ALand/CodeClass/Home/View/SelectPhotoView.m

@@ -37,6 +37,9 @@
     self.takePhotoBlock();
 }
 
+- (IBAction)galleryAction:(id)sender {
+    self.galleryBlock();
+}
 
 /*
 // Only override drawRect: if you perform custom drawing.

ALand/CodeClass/Home/View/SelectPhotoView.xib

@@ -57,6 +57,9 @@
                                 <constraint firstAttribute="width" constant="60" id="rFa-e3-zhR"/>
                             </constraints>
                             <state key="normal" image="Gallery"/>
+                            <connections>
+                                <action selector="galleryAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="eWf-VB-rGm"/>
+                            </connections>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="图库" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CfC-ay-xMf">
                             <rect key="frame" x="62" y="76" width="34" height="21"/>

ALand/CodeClass/Home/ViewController/Commodity/AddCommodityViewController.m

@@ -13,6 +13,8 @@
 #import "HotCommodityCell.h"
 #import "AddCommodityFooterCollectionReusableView.h"
 #import "CommodityListViewController.h"
+#import "HotBrandModel.h"
+#import "CatgoryModel.h"
 
 #define kHotCellId @"addCommodityCellHot"
 #define kCellId @"addCommodityCell"
@@ -20,7 +22,7 @@
 #define kFooterId @"footerId"
 #define kMargin 0
 @interface AddCommodityViewController ()<UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout>
-
+@property (nonatomic, strong) NSMutableArray *arrData;
 @property (nonatomic, strong) UICollectionView *collectionView;
 @end
 
@@ -31,11 +33,49 @@
     self.navigationItem.title = @"添加商品";
     [self setUpCollectionView];
     [self updateStatueBarAppearance];
+    [self setUpdata];
     // Do any additional setup after loading the view.
 }
+- (NSMutableArray *)arrData {
+    if (!_arrData) {
+        _arrData = [NSMutableArray array];
+    }
+    return _arrData;
+}
+
+- (void)setUpdata {
+    WS(weakSelf)
+    [[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"app/getGoodsFilter/%@", @"0001"] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+        
+        NSMutableArray *arrHotBrand = [NSMutableArray array];
+        for (NSDictionary *dic in responseObject[@"hotBrands"]) {
+            [HotBrandModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{@"aid":@"id",
+                         @"adescription":@"description",
+                         @"aoperator":@"operator"};
+            }];
+            HotBrandModel *model = [HotBrandModel mj_objectWithKeyValues:dic];
+            [arrHotBrand addObject:model];
+            CLog(@"d");
+        }
+        [weakSelf.arrData addObject:arrHotBrand];
+        
+        NSMutableArray *arrCategory = [NSMutableArray array];
+        for (NSDictionary *dic in responseObject[@"categories"]) {
+            [CatgoryModel mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+                return @{@"aid":@"id",
+                         @"adescription":@"description",
+                         @"aoperator":@"operator"};
+            }];
+            CatgoryModel *model = [CatgoryModel mj_objectWithKeyValues:dic];
+            [arrCategory addObject:model];
+        }
+        [weakSelf.arrData addObject:arrCategory];
         
-- (void)setUpdate {
+        [self.collectionView reloadData];
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
         
+    }];
 }
 
 //设置navigationbar颜色
@@ -131,52 +171,39 @@
 }
 
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
-    return 5;
+    return self.arrData.count;
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    if (section == 0) {
-        return 3;
-    }else{
-        return 6;
-    }
+    
+        return [self.arrData[section] count];
 }
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+    
+    //热门品牌
     if (indexPath.section == 0) {
         HotCommodityCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kHotCellId forIndexPath:indexPath];
+        [cell cellWithModel:self.arrData[indexPath.section][indexPath.row] indexPath:indexPath];
 
-//        
-        if ((int)indexPath.row % 3 == 2) {
-            [cell showRight];
-        }else{
-            [cell hideRight];
-        }
         return cell;
-    }else{
-        
-        AddCommodityCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kCellId forIndexPath:indexPath];
         
+    //分类
+    }else if(indexPath.section == 1){
         
+        AddCommodityCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kCellId forIndexPath:indexPath];
         
-        if ((int)indexPath.row / 4 == 0) {
-            [cell showTopLine];
-        }else{
-            [cell hideTopLine];
-        }
+        [cell cellWithModel:self.arrData[indexPath.section][indexPath.row] indexPath:indexPath];
         
-        if ((int)indexPath.row % 4 == 0) {
-            [cell showLeftLine];
-        }else{
-            [cell hideLeftLine];
-        }
         return cell;
     }
+    return nil;
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
         CommodityListViewController *commodityVC = [[CommodityListViewController alloc] init];
         commodityVC.hidesBottomBarWhenPushed = YES;
+    commodityVC.model = self.arrData[indexPath.section][indexPath.row];
         [self.navigationController pushViewController:commodityVC animated:YES];
 }
 

ALand/CodeClass/Home/ViewController/Commodity/CommodityListViewController.h

@@ -9,5 +9,5 @@
 #import "IBTUIViewController.h"
 
 @interface CommodityListViewController : IBTUIViewController
-
+@property (nonatomic, strong) id model;
 @end

ALand/CodeClass/Home/ViewController/Commodity/CommodityListViewController.m

@@ -10,6 +10,9 @@
 #import "CommodityListCollectionViewCell.h"
 #import "SortView.h"
 #import "CommodityDetailViewController.h"
+#import "RequstBodyCommodityListModel.h"
+#import "HotBrandModel.h"
+
 #define kCellID @"commodityCell"
 @interface CommodityListViewController ()<UICollectionViewDataSource, UICollectionViewDelegate>
 @property (nonatomic, strong) UICollectionView *collectionView;
@@ -24,9 +27,39 @@
     self.view.backgroundColor = kBacroundColor;
     [self setUpSortView];
     [self setUpCollectionView];
+    [self setUpData];
     // Do any additional setup after loading the view.
 }
 
+- (void)setUpData {
+    RequstBodyCommodityListModel *requstBody = [[RequstBodyCommodityListModel alloc] init];
+    if ([self.model isKindOfClass:[HotBrandModel class]]) {
+        HotBrandModel *model = self.model;
+        requstBody.defintion.conditions[0].operation = [NSString stringWithFormat:@"goodsData brand %@ equals", model.uuid];
+        requstBody.defintion.conditions[0].parameters = @[model.uuid];
+        //requstBody.defintion.orders = @[@"10",@"1",@"1"];
+        requstBody.defintion.pageSize = 10;
+        requstBody.defintion.page = 0;
+        requstBody.defintion.probePages = 0;
+        
+        NSDictionary *params = requstBody.mj_keyValues;
+        
+        [[HTTPCilent shareCilent] POST:@"goods/query2" parameters:params success:^(NSURLSessionDataTask *task, id responseObject) {
+            
+            
+            CLog(@"d");
+        } failure:^(NSURLSessionDataTask *task, NSError *error) {
+            
+        }];
+    }
+    
+    
+    
+    
+}
+
+
+
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [self.navigationController setNavigationBarHidden:NO];

ALand/CodeClass/Home/ViewController/CommodityManagementViewController.m

@@ -95,7 +95,7 @@
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    [self.navigationController setNavigationBarHidden:NO];
+    //[self.navigationController setNavigationBarHidden:NO];
 }
 
 - (void)didReceiveMemoryWarning {

ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m

@@ -121,6 +121,7 @@
         {
             CommodityManagementViewController *managementVC = [[CommodityManagementViewController alloc] init];
             managementVC.hidesBottomBarWhenPushed = YES;
+            managementVC.isShowNavigationBar = YES;
             [self.navigationController pushViewController:managementVC animated:YES];
             
         }
@@ -129,6 +130,7 @@
         {
             OrderViewController *orderVC = [[OrderViewController alloc] init];
             orderVC.hidesBottomBarWhenPushed = YES;
+            orderVC.isShowNavigationBar = YES;
             [self.navigationController pushViewController:orderVC animated:YES];
         }
             

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

@@ -50,11 +50,6 @@
     
 }
 
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    [self.navigationController setNavigationBarHidden:NO];
-}
-
 
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];

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

@@ -10,6 +10,8 @@
 #import "StoreQRCodeViewController.h"
 #import "SelectPhotoView.h"
 #import "CoverShadowView.h"
+#import "StoreNameViewController.h"
+#import "introductionViewController.h"
 @interface StoreManagermentViewController ()<UINavigationControllerDelegate, UIImagePickerControllerDelegate>
 @property (nonatomic, strong) SelectPhotoView *photoView;
 @property (nonatomic, strong) CoverShadowView *shadowView;
@@ -44,7 +46,7 @@
         
         //相册
         _photoView.galleryBlock = ^{
-            
+            [weakSelf gallery];
         };
         
         //阴影点击事件
@@ -58,6 +60,7 @@
 }
 
 - (void)takePhotoAction {
+    [self hide];
     if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
         UIAlertView *alert = [[UIAlertView alloc] initWithTitle:nil message:@"找不到相机" delegate:nil cancelButtonTitle:nil otherButtonTitles:@"确定", nil];
         [alert show];
@@ -71,6 +74,20 @@
     }
 }
 
+- (void)gallery {
+    [self hide];
+    if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) {
+        UIImagePickerController * picker = [[UIImagePickerController alloc]init];
+        picker.delegate = self;
+        picker.allowsEditing = YES;//是否可以编辑
+        //打开相册选择照片
+        picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary;
+        // 模态进入相册
+        [self presentViewController:picker animated:YES completion:nil];
+    }
+}
+
+
 /**
  *  显示阴影和底部的弹框
  */
@@ -84,6 +101,9 @@
     [self.shadowView hide];
 }
 
+- (IBAction)actionBack:(id)sender {
+    [self PopViewControllerAnimated:YES];
+}
 
 - (IBAction)headSculpture:(id)sender {
     CLog(@"头像");
@@ -91,13 +111,21 @@
 }
 
 - (IBAction)shopName:(id)sender {
+    StoreNameViewController *nameVC = [[StoreNameViewController alloc] initWithNibName:@"StoreNameViewController" bundle:nil];
+    nameVC.isShowNavigationBar = YES;
+    [self.navigationController pushViewController:nameVC animated:YES];
 }
 - (IBAction)shopIntroduction:(id)sender {
+    introductionViewController *introVC = [[introductionViewController alloc] initWithNibName:@"introductionViewController" bundle:nil];
+    introVC.isShowNavigationBar = YES;
+    [self.navigationController pushViewController:introVC animated:YES];
 }
 - (IBAction)shopLV:(id)sender {
+    
 }
 - (IBAction)QRCodeAction:(id)sender {
     StoreQRCodeViewController *QRCodeVC = [[StoreQRCodeViewController alloc] initWithNibName:@"StoreQRCodeViewController" bundle:nil];
+    
     [self.navigationController pushViewController:QRCodeVC animated:YES];
     
 }

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

@@ -76,6 +76,9 @@
                                 <constraint firstAttribute="width" constant="12" id="CPa-fC-cp8"/>
                             </constraints>
                             <state key="normal" image="bac"/>
+                            <connections>
+                                <action selector="actionBack:" destination="-1" eventType="touchUpInside" id="ByM-CS-SM8"/>
+                            </connections>
                         </button>
                     </subviews>
                     <color key="backgroundColor" red="0.34509803921568627" green="0.75686274509803919" blue="0.050980392156862744" alpha="1" colorSpace="calibratedRGB"/>

ALand/CodeClass/Home/ViewController/StoreManagerment/StoreNameViewController.h

+//
+//  StoreNameViewController.h
+//  ALand
+//
+//  Created by Z on 16/4/7.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "IBTUIViewController.h"
+
+@interface StoreNameViewController : IBTUIViewController
+
+@end

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

+//
+//  StoreNameViewController.m
+//  ALand
+//
+//  Created by Z on 16/4/7.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "StoreNameViewController.h"
+
+@interface StoreNameViewController ()
+
+@end
+
+@implementation StoreNameViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.navigationItem.title = @"店铺名称";
+    // Do any additional setup after loading the view from its nib.
+}
+
+
+- (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

ALand/CodeClass/Home/ViewController/StoreManagerment/StoreNameViewController.xib

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="StoreNameViewController">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </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="ALc-34-26d">
+                    <rect key="frame" x="0.0" y="20" width="375" height="49"/>
+                    <subviews>
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="deL-BR-euJ">
+                            <rect key="frame" x="16" y="10" width="343" height="30"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="bF5-mo-edx"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <textInputTraits key="textInputTraits"/>
+                        </textField>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="deL-BR-euJ" secondAttribute="trailing" constant="16" id="ZS3-uO-3OY"/>
+                        <constraint firstAttribute="bottom" secondItem="deL-BR-euJ" secondAttribute="bottom" constant="9" id="jJm-Y2-OBh"/>
+                        <constraint firstItem="deL-BR-euJ" firstAttribute="top" secondItem="ALc-34-26d" secondAttribute="top" constant="10" id="qon-9U-QRF"/>
+                        <constraint firstItem="deL-BR-euJ" firstAttribute="leading" secondItem="ALc-34-26d" secondAttribute="leading" constant="16" id="z8k-SZ-X0T"/>
+                    </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="TXP-n0-MIE">
+                    <rect key="frame" x="16" y="77" width="210" height="18"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                    <color key="textColor" red="0.50823958329999996" green="0.50823958329999996" blue="0.50823958329999996" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6bk-SN-0aE">
+                    <rect key="frame" x="16" y="140" width="343" height="44"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="300" id="t3f-bF-Bfe"/>
+                        <constraint firstAttribute="height" constant="44" id="yxw-16-mEI"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                    <state key="normal" title="保 存" backgroundImage="rigist_btn_bg">
+                        <color key="titleColor" red="0.97254901959999995" green="0.97254901959999995" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
+                    </state>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="t3f-bF-Bfe"/>
+                        </mask>
+                    </variation>
+                </button>
+            </subviews>
+            <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
+            <constraints>
+                <constraint firstItem="deL-BR-euJ" firstAttribute="leading" secondItem="TXP-n0-MIE" secondAttribute="leading" id="2n1-Ra-iso"/>
+                <constraint firstItem="6bk-SN-0aE" firstAttribute="trailing" secondItem="deL-BR-euJ" secondAttribute="trailing" id="HZL-NY-d7n"/>
+                <constraint firstItem="ALc-34-26d" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="20" id="Z0V-XA-xLP"/>
+                <constraint firstItem="6bk-SN-0aE" firstAttribute="top" secondItem="TXP-n0-MIE" secondAttribute="bottom" constant="45" id="Zsv-M4-qFy"/>
+                <constraint firstItem="TXP-n0-MIE" firstAttribute="top" secondItem="ALc-34-26d" secondAttribute="bottom" constant="8" id="lZv-Ne-Q7E"/>
+                <constraint firstItem="6bk-SN-0aE" firstAttribute="leading" secondItem="deL-BR-euJ" secondAttribute="leading" id="oWS-mx-phF"/>
+                <constraint firstItem="ALc-34-26d" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="wgI-Ic-BoN"/>
+                <constraint firstAttribute="trailing" secondItem="ALc-34-26d" secondAttribute="trailing" id="xvX-LV-hC9"/>
+            </constraints>
+            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
+            <point key="canvasLocation" x="249.5" y="353.5"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="rigist_btn_bg" width="490" height="65"/>
+    </resources>
+</document>

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

@@ -18,7 +18,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    UIImage *qrcode = [UIImage createNonInterpolatedUIImageFormCIImage:[UIImage createQRForString:@"http://blog.yourtion.com"] withSize:250.0f];
+    UIImage *qrcode = [UIImage createNonInterpolatedUIImageFormCIImage:[UIImage createQRForString:@"http://list.jd.hk/list.html?cat=1319%2C1527%2C1556&gjz=0&go=0"] withSize:250.0f];
     UIImage *customQrcode = [UIImage imageBlackToTransparent:qrcode withRed:60.0f andGreen:74.0f andBlue:89.0f];
     self.imageViewQRCode.image = customQrcode;
     // set shadow

ALand/CodeClass/Home/ViewController/StoreManagerment/introductionViewController.h

+//
+//  introductionViewController.h
+//  ALand
+//
+//  Created by Z on 16/4/7.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "IBTUIViewController.h"
+
+@interface introductionViewController : IBTUIViewController
+
+@end

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

+//
+//  introductionViewController.m
+//  ALand
+//
+//  Created by Z on 16/4/7.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "introductionViewController.h"
+
+@interface introductionViewController ()
+
+@end
+
+@implementation introductionViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view from its nib.
+}
+
+- (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

ALand/CodeClass/Home/ViewController/StoreManagerment/introductionViewController.xib

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="introductionViewController">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </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="E6i-A0-uZ0">
+                    <rect key="frame" x="0.0" y="20" width="375" height="195"/>
+                    <subviews>
+                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="JdS-U6-Nfk">
+                            <rect key="frame" x="16" y="0.0" width="343" height="195"/>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                        </textView>
+                    </subviews>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstItem="JdS-U6-Nfk" firstAttribute="top" secondItem="E6i-A0-uZ0" secondAttribute="top" id="Bxh-yi-rqa"/>
+                        <constraint firstAttribute="trailing" secondItem="JdS-U6-Nfk" secondAttribute="trailing" constant="16" id="jy8-hg-V93"/>
+                        <constraint firstAttribute="bottom" secondItem="JdS-U6-Nfk" secondAttribute="bottom" id="m29-lX-kSO"/>
+                        <constraint firstItem="JdS-U6-Nfk" firstAttribute="leading" secondItem="E6i-A0-uZ0" secondAttribute="leading" constant="16" id="tbs-Tb-Ses"/>
+                    </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="Ggl-qk-VWW">
+                    <rect key="frame" x="16" y="223" width="180" height="18"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                    <color key="textColor" red="0.50823958329999996" green="0.50823958329999996" blue="0.50823958329999996" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4nz-BE-3OY">
+                    <rect key="frame" x="16" y="286" width="343" height="44"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="44" id="IpR-h4-oq5"/>
+                        <constraint firstAttribute="width" constant="300" id="PUr-Us-CDz"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                    <state key="normal" title="保 存" backgroundImage="rigist_btn_bg">
+                        <color key="titleColor" red="0.97254901959999995" green="0.97254901959999995" blue="0.97254901959999995" alpha="1" colorSpace="calibratedRGB"/>
+                    </state>
+                    <variation key="default">
+                        <mask key="constraints">
+                            <exclude reference="PUr-Us-CDz"/>
+                        </mask>
+                    </variation>
+                </button>
+            </subviews>
+            <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
+            <constraints>
+                <constraint firstItem="Ggl-qk-VWW" firstAttribute="top" secondItem="E6i-A0-uZ0" secondAttribute="bottom" constant="8" id="4rA-Ka-kGe"/>
+                <constraint firstItem="4nz-BE-3OY" firstAttribute="top" secondItem="Ggl-qk-VWW" secondAttribute="bottom" constant="45" id="7R1-LT-i6e"/>
+                <constraint firstItem="JdS-U6-Nfk" firstAttribute="leading" secondItem="Ggl-qk-VWW" secondAttribute="leading" id="8xL-9J-afi"/>
+                <constraint firstItem="JdS-U6-Nfk" firstAttribute="leading" secondItem="4nz-BE-3OY" secondAttribute="leading" id="A0c-qU-XsT"/>
+                <constraint firstItem="E6i-A0-uZ0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="HL0-2m-QxH"/>
+                <constraint firstAttribute="trailing" secondItem="E6i-A0-uZ0" secondAttribute="trailing" id="dVb-8y-jj0"/>
+                <constraint firstItem="JdS-U6-Nfk" firstAttribute="trailing" secondItem="4nz-BE-3OY" secondAttribute="trailing" id="m4N-LC-Dry"/>
+                <constraint firstItem="E6i-A0-uZ0" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="20" id="oGx-fb-PYR"/>
+                <constraint firstAttribute="bottom" secondItem="E6i-A0-uZ0" secondAttribute="bottom" constant="452" id="ovE-Bw-nu3"/>
+            </constraints>
+            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
+            <point key="canvasLocation" x="325.5" y="414.5"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="rigist_btn_bg" width="490" height="65"/>
+    </resources>
+</document>

ALand/CodeClass/Login/Base.lproj/ToLoginViewController.xib

@@ -60,12 +60,12 @@
                                 <constraint firstAttribute="height" constant="30" id="bqM-pK-6q9"/>
                             </constraints>
                         </imageView>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入手机号码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5eD-la-0j7">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" placeholder="请输入手机号码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5eD-la-0j7">
                             <rect key="frame" x="70" y="10" width="273" height="30"/>
                             <fontDescription key="fontDescription" type="system" pointSize="18"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mu2-3E-jKv">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" placeholder="请输入密码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mu2-3E-jKv">
                             <rect key="frame" x="70" y="65" width="273" height="22"/>
                             <fontDescription key="fontDescription" type="system" pointSize="18"/>
                             <textInputTraits key="textInputTraits"/>

ALand/CodeClass/Login/LoginViewController.m

@@ -10,13 +10,20 @@
 #import "ToLoginViewController.h"
 #import "RigistViewController.h"
 @interface LoginViewController ()
+@property (weak, nonatomic) IBOutlet UIButton *buttonQQ;
+@property (weak, nonatomic) IBOutlet UIButton *buttonWX;
+@property (weak, nonatomic) IBOutlet UIButton *buttonWeibo;
 
 @end
 
 @implementation LoginViewController
 
+
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.buttonQQ.imageView.contentMode = UIViewContentModeScaleAspectFit;
+    self.buttonWX.imageView.contentMode = UIViewContentModeScaleAspectFit;
+    self.buttonWeibo.imageView.contentMode = UIViewContentModeScaleAspectFit;
     // Do any additional setup after loading the view.
 }
 
@@ -43,6 +50,7 @@
 
 
 - (IBAction)toTencentLogin:(UIButton *)sender {
+    
 }
 
 - (IBAction)toWeiChatLogin:(id)sender {

ALand/CodeClass/Login/LoginViewController.xib

@@ -7,6 +7,9 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LoginViewController">
             <connections>
+                <outlet property="buttonQQ" destination="z3d-I1-xgq" id="5yb-hV-Q8v"/>
+                <outlet property="buttonWX" destination="MLu-aw-fed" id="vDv-aG-Vge"/>
+                <outlet property="buttonWeibo" destination="GKk-w1-UAd" id="Is7-a9-E6b"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
             </connections>
         </placeholder>
@@ -97,7 +100,7 @@
                     <color key="textColor" red="0.60000002379999995" green="0.60000002379999995" blue="0.60000002379999995" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z3d-I1-xgq">
+                <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z3d-I1-xgq">
                     <rect key="frame" x="56" y="569" width="46" height="44"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="KxF-6a-zN9"/>
@@ -105,7 +108,7 @@
                         <constraint firstAttribute="height" constant="44" id="dAV-9a-8ez"/>
                         <constraint firstAttribute="width" constant="46" id="fDN-v7-yl4"/>
                     </constraints>
-                    <state key="normal" backgroundImage="qq"/>
+                    <state key="normal" image="qq"/>
                     <variation key="default">
                         <mask key="constraints">
                             <exclude reference="dAV-9a-8ez"/>
@@ -116,18 +119,18 @@
                         <action selector="toTencentLogin:" destination="-1" eventType="touchUpInside" id="rUM-wZ-v0N"/>
                     </connections>
                 </button>
-                <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MLu-aw-fed">
-                    <rect key="frame" x="164" y="569" width="46" height="44"/>
+                <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MLu-aw-fed">
+                    <rect key="frame" x="165" y="569" width="46" height="44"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="8gK-Qk-xIj"/>
                         <constraint firstAttribute="width" constant="46" id="WUh-lF-P0E"/>
                     </constraints>
-                    <state key="normal" backgroundImage="weichat"/>
+                    <state key="normal" image="weichat"/>
                     <connections>
                         <action selector="toWeiChatLogin:" destination="-1" eventType="touchUpInside" id="1Pg-O6-y4K"/>
                     </connections>
                 </button>
-                <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GKk-w1-UAd">
+                <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GKk-w1-UAd">
                     <rect key="frame" x="272" y="569" width="46" height="44"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="83t-5K-vGR"/>
@@ -135,7 +138,7 @@
                         <constraint firstAttribute="width" constant="46" id="EXs-9P-oSU"/>
                         <constraint firstAttribute="width" constant="46" id="XqQ-p4-qLl"/>
                     </constraints>
-                    <state key="normal" backgroundImage="weibo"/>
+                    <state key="normal" image="weibo"/>
                     <variation key="default">
                         <mask key="constraints">
                             <exclude reference="83t-5K-vGR"/>

ALand/CodeClass/Login/ToLoginViewController.m

@@ -33,6 +33,9 @@
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     [[HTTPCilent shareCilent] POST:@"app/resellerLogin" parameters:paramers success:^(NSURLSessionDataTask *task, id responseObject) {
         UserInfo *info = [UserInfo shareInstance];
+        [UserInfo mj_setupReplacedKeyFromPropertyName:^NSDictionary *{
+            return @{@"description":@"adescription"};
+        }];
         info = [UserInfo mj_objectWithKeyValues:responseObject[@"reseller"]];
         
         [MBProgressHUD hideHUDForView:self.view animated:YES];

ALand/Global/UserInfo.h

@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-@class Certificate,Lastmodifyinfo,Passwordcontrol,Shop,Createinfo,Ownerorg,Logincontrol;
+@class Certificate,Lastmodifyinfo,Passwordcontrol,Shop,Createinfo,Ownerorg,Logincontrol,Operator;
 @interface UserInfo : NSObject
 
 @property (nonatomic, copy) NSString *birthday;
@@ -61,9 +61,11 @@
 
 @property (nonatomic, strong) Logincontrol *loginControl;
 
+@property (nonatomic, copy) NSString *adescription;
 
 + (UserInfo *)shareInstance;
 @end
+
 @interface Certificate : NSObject
 
 @property (nonatomic, strong) NSArray *bankCards;
@@ -84,16 +86,18 @@
 
 @interface Lastmodifyinfo : NSObject
 
-@property (nonatomic, copy) NSString *operator;
-
 @property (nonatomic, assign) long long time;
 
+@property (nonatomic, strong) Operator *aoperator;
+
 @end
 
 @interface Passwordcontrol : NSObject
 
 @property (nonatomic, assign) long long created;
 
+@property (nonatomic, copy) NSString *ainitPassword; //initPassword
+
 @property (nonatomic, assign) long long expiry;
 
 @end
@@ -110,7 +114,7 @@
 
 @interface Createinfo : NSObject
 
-@property (nonatomic, copy) NSString *operator;
+@property (nonatomic, strong) Operator *aoperator;
 
 @property (nonatomic, assign) long long time;
 
@@ -136,3 +140,10 @@
 
 @end
 
+@interface Operator : NSObject
+
+@property (nonatomic, copy) NSString *aid;
+
+@property (nonatomic, copy) NSString *fullName;
+
+@end

ALand/Global/UserInfo.m

@@ -56,6 +56,6 @@
 
 @end
 
+@implementation Operator
 
-
-
+@end

ALand/IBTUtilites/IBTUIKit/IBTUIViewController.h

@@ -13,6 +13,7 @@
 
 @property (assign, nonatomic) NSUInteger *m_uiVcType;
 @property (strong, nonatomic) IBTLoadingView *loadingViewX;
+@property (nonatomic, assign) BOOL isShowNavigationBar;
 
 @property (assign, nonatomic) BOOL bNotAutoAddCancelButton;
 @property (strong, nonatomic) NSString *cancelButtonName; // 为当前设置 ModuleView Left Close button

ALand/IBTUtilites/IBTUIKit/IBTUIViewController.m

@@ -53,6 +53,13 @@
         }
         [self addLeftBarBtnItemWithName:_cancelButtonName action:@selector(disMissSelf)];
     }
+    
+    if (self.isShowNavigationBar == YES) {
+        [self.navigationController setNavigationBarHidden:NO animated:YES];
+    }else if (self.isShowNavigationBar == NO){
+        [self.navigationController setNavigationBarHidden:YES animated:YES];
+
+    }
 }
 
 - (void)viewDidAppear:(BOOL)animated {

ALand/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>zh_CN</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

ALand/Macro/UrlHeader.h

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