no message

0d680d42 · Sandy · a4abb3b3 · 0d680d42 · a4abb3b3 · 0d680d42
Commit 0d680d42 authored 9 years ago by Sandy
47 changed files
--- a/ALand.xcodeproj/project.pbxproj
+++ b/ALand.xcodeproj/project.pbxproj
@@ -21,6 +21,8 @@
 		190A46711CE063A5006037CB /* JavenGoodsDetails.m in Sources */ = {isa = PBXBuildFile; fileRef = 190A466F1CE063A5006037CB /* JavenGoodsDetails.m */; };
 		190A46771CE064A4006037CB /* JavenTicket.m in Sources */ = {isa = PBXBuildFile; fileRef = 190A46761CE064A4006037CB /* JavenTicket.m */; };
 		190A467A1CE064FE006037CB /* JavenOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 190A46791CE064FE006037CB /* JavenOrderModel.m */; };
+		190A46BE1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 190A46BD1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib */; };
+		190A46C11CE1BC5D006037CB /* CustomerDetailSectionHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 190A46C01CE1BC5D006037CB /* CustomerDetailSectionHeader.m */; };
 		1912FCD71CCDC945004CF976 /* JavenReseller.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCD61CCDC945004CF976 /* JavenReseller.m */; };
 		1912FCDA1CCDC955004CF976 /* JavenResellerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCD91CCDC955004CF976 /* JavenResellerModel.m */; };
 		1912FCFB1CD08166004CF976 /* CommotityListBrand.m in Sources */ = {isa = PBXBuildFile; fileRef = 1912FCF61CD08166004CF976 /* CommotityListBrand.m */; };
@@ -88,6 +90,7 @@
 		1940D3281C9A58150080678C /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1940D3271C9A58150080678C /* BaseViewController.m */; };
 		1946DC9A1CB7542D00AC6557 /* CatgoryModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1946DC991CB7542D00AC6557 /* CatgoryModel.m */; };
 		194CB5391CD8AA4A0050E59F /* JavenQNManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 194CB5381CD8AA4A0050E59F /* JavenQNManager.m */; };
+		194FB0491CE2CAAF0089A3D5 /* MyAcountHelfViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 194FB0481CE2CAAF0089A3D5 /* MyAcountHelfViewController.m */; };
 		19563C471CDAE60B00AFD0E0 /* MyBandCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19563C461CDAE60B00AFD0E0 /* MyBandCardViewController.m */; };
 		19563C4A1CDAEA3800AFD0E0 /* MyBandBottomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19563C491CDAEA3800AFD0E0 /* MyBandBottomView.m */; };
 		19563C4C1CDAEA4500AFD0E0 /* MyBandBottomView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19563C4B1CDAEA4500AFD0E0 /* MyBandBottomView.xib */; };
@@ -315,6 +318,9 @@
 		190A46761CE064A4006037CB /* JavenTicket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenTicket.m; sourceTree = "<group>"; };
 		190A46781CE064FE006037CB /* JavenOrderModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenOrderModel.h; sourceTree = "<group>"; };
 		190A46791CE064FE006037CB /* JavenOrderModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenOrderModel.m; sourceTree = "<group>"; };
+		190A46BD1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CustomerDetailSectionHeader.xib; sourceTree = "<group>"; };
+		190A46BF1CE1BC5D006037CB /* CustomerDetailSectionHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomerDetailSectionHeader.h; sourceTree = "<group>"; };
+		190A46C01CE1BC5D006037CB /* CustomerDetailSectionHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomerDetailSectionHeader.m; sourceTree = "<group>"; };
 		1912FCD51CCDC945004CF976 /* JavenReseller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenReseller.h; sourceTree = "<group>"; };
 		1912FCD61CCDC945004CF976 /* JavenReseller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenReseller.m; sourceTree = "<group>"; };
 		1912FCD81CCDC955004CF976 /* JavenResellerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenResellerModel.h; sourceTree = "<group>"; };
@@ -443,6 +449,8 @@
 		1946DC991CB7542D00AC6557 /* CatgoryModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CatgoryModel.m; sourceTree = "<group>"; };
 		194CB5371CD8AA4A0050E59F /* JavenQNManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavenQNManager.h; sourceTree = "<group>"; };
 		194CB5381CD8AA4A0050E59F /* JavenQNManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JavenQNManager.m; sourceTree = "<group>"; };
+		194FB0471CE2CAAF0089A3D5 /* MyAcountHelfViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyAcountHelfViewController.h; sourceTree = "<group>"; };
+		194FB0481CE2CAAF0089A3D5 /* MyAcountHelfViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyAcountHelfViewController.m; sourceTree = "<group>"; };
 		19563C451CDAE60B00AFD0E0 /* MyBandCardViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyBandCardViewController.h; sourceTree = "<group>"; };
 		19563C461CDAE60B00AFD0E0 /* MyBandCardViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyBandCardViewController.m; sourceTree = "<group>"; };
 		19563C481CDAEA3800AFD0E0 /* MyBandBottomView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyBandBottomView.h; sourceTree = "<group>"; };
@@ -1333,6 +1341,8 @@
 				190A465E1CE045EB006037CB /* FeedBackViewController.h */,
 				190A465F1CE045EB006037CB /* FeedBackViewController.m */,
 				190A46601CE045EB006037CB /* FeedBackViewController.xib */,
+				194FB0471CE2CAAF0089A3D5 /* MyAcountHelfViewController.h */,
+				194FB0481CE2CAAF0089A3D5 /* MyAcountHelfViewController.m */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -1561,6 +1571,9 @@
 				192900941CD20A5200D226E7 /* CustomerTopView.h */,
 				192900951CD20A5200D226E7 /* CustomerTopView.m */,
 				192900921CD20A3E00D226E7 /* CustomerTopView.xib */,
+				190A46BD1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib */,
+				190A46BF1CE1BC5D006037CB /* CustomerDetailSectionHeader.h */,
+				190A46C01CE1BC5D006037CB /* CustomerDetailSectionHeader.m */,
 			);
 			path = CustomerManagement;
 			sourceTree = "<group>";
@@ -2121,6 +2134,7 @@
 				197975311CA90DA400407E3F /* CommodityManagementTopView.xib in Resources */,
 				1929F1931CA11472000E9B26 /* HomeCollectionViewCell.xib in Resources */,
 				1979754A1CAA4DB900407E3F /* CommodityMutipleSelectBottomView.xib in Resources */,
+				190A46BE1CE1BC4F006037CB /* CustomerDetailSectionHeader.xib in Resources */,
 				1929F16F1C9FCFA6000E9B26 /* Assets.xcassets in Resources */,
 				1929F17E1CA0DE32000E9B26 /* HomeTopView.xib in Resources */,
 				19DC6B1A1CC0B5690064A9FD /* MyTeamCollectionViewCell.xib in Resources */,
@@ -2269,6 +2283,7 @@
 				19DCCB631C9A9EB30072C3BF /* IBTTableViewSectionInfo.m in Sources */,
 				19DCCB5D1C9A9EB30072C3BF /* IBTImagePicker.m in Sources */,
 				19D906B61CC86DA300CD42DC /* SettingViewController.m in Sources */,
+				194FB0491CE2CAAF0089A3D5 /* MyAcountHelfViewController.m in Sources */,
 				19DCCBCB1C9AA0450072C3BF /* UIApplication+CheckFirstRun.m in Sources */,
 				197BA67E1CD851BA000E2087 /* JavenOwnerOrg.m in Sources */,
 				190A467A1CE064FE006037CB /* JavenOrderModel.m in Sources */,
@@ -2326,6 +2341,7 @@
 				191AEE5E1CBCC6D100F5E535 /* Conditions.m in Sources */,
 				19563C4A1CDAEA3800AFD0E0 /* MyBandBottomView.m in Sources */,
 				1979753A1CA9260C00407E3F /* CommodityManagementSortView.m in Sources */,
+				190A46C11CE1BC5D006037CB /* CustomerDetailSectionHeader.m in Sources */,
 				19DCCB701C9A9EB30072C3BF /* IBTUIControl.m in Sources */,
 				199B4D8C1CAE688400451E0E /* SeeLogistics.m in Sources */,
 				197BA67F1CD851BA000E2087 /* JavenPasswordControl.m in Sources */,
@@ -2586,7 +2602,7 @@
 			baseConfigurationReference = AAF51B5D53AE9938C03065C3 /* Pods.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				ENABLE_BITCODE = NO;
 				GCC_PREFIX_HEADER = Aland/PrefixHeader.pch;
 				HEADER_SEARCH_PATHS = (

--- a/ALand/Assets.xcassets/商品详情_iPhone_assets/commodityDetailHome.imageset/commodityDetailHome.png
+++ b/ALand/Assets.xcassets/商品详情_iPhone_assets/commodityDetailHome.imageset/commodityDetailHome.png
--- a/ALand/Assets.xcassets/商品详情_iPhone_assets/commodityDetailHome.imageset/commodityDetailHome@2x.png
+++ b/ALand/Assets.xcassets/商品详情_iPhone_assets/commodityDetailHome.imageset/commodityDetailHome@2x.png
--- a/ALand/Assets.xcassets/店铺_iPhone_assets/homeCollection6.imageset/homeCollection6.png
+++ b/ALand/Assets.xcassets/店铺_iPhone_assets/homeCollection6.imageset/homeCollection6.png
--- a/ALand/Assets.xcassets/店铺_iPhone_assets/homeCollection6.imageset/homeCollection6@2x.png
+++ b/ALand/Assets.xcassets/店铺_iPhone_assets/homeCollection6.imageset/homeCollection6@2x.png
--- a/ALand/CodeClass/Home/Model/Order/JavenOrderModel.h
+++ b/ALand/CodeClass/Home/Model/Order/JavenOrderModel.h
@@ -7,8 +7,14 @@

 #import <Foundation/Foundation.h>
 #import "JavenGoodsDetails.h"
+#import "JavenReseller.h"
+#import "JavenLastModifyInfo.h"
+#import "JavenTicket.h"
+#import "JavenShop.h"
+#import "JavenCreateInfo.h"
 #import "JavenConsumer.h"
 #import "JavenAddress.h"
+
 @class JavenReseller, JavenLastModifyInfo, JavenTicket, JavenShop, JavenCreateInfo, JavenConsumer, JavenAddress;

 @interface JavenOrderModel : NSObject <NSCoding, NSCopying>

--- a/ALand/CodeClass/Home/Model/Order/JavenOrderModel.m
+++ b/ALand/CodeClass/Home/Model/Order/JavenOrderModel.m
@@ -6,14 +6,7 @@
 //

 #import "JavenOrderModel.h"
-#import "JavenGoodsDetails.h"
-#import "JavenReseller.h"
-#import "JavenLastModifyInfo.h"
-#import "JavenTicket.h"
-#import "JavenShop.h"
-#import "JavenCreateInfo.h"
-#import "JavenConsumer.h"
-#import "JavenAddress.h"
+


 NSString *const kJavenOrderModelGoodsDetails = @"goodsDetails";

--- a/ALand/CodeClass/Home/View/CustomerManagement/CustomerDetailSectionHeader.h
+++ b/ALand/CodeClass/Home/View/CustomerManagement/CustomerDetailSectionHeader.h
+//
+//  CustomerDetailSectionHeader.h
+//  ALand
+//
+//  Created by Z on 16/5/10.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "JavenOrderModel.h"
+@interface CustomerDetailSectionHeader : UIView
+
+- (void)viewWithModel:(JavenOrderModel *)model;
+
+@end
--- a/ALand/CodeClass/Home/View/CustomerManagement/CustomerDetailSectionHeader.m
+++ b/ALand/CodeClass/Home/View/CustomerManagement/CustomerDetailSectionHeader.m
+//
+//  CustomerDetailSectionHeader.m
+//  ALand
+//
+//  Created by Z on 16/5/10.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "CustomerDetailSectionHeader.h"
+
+@interface CustomerDetailSectionHeader ()
+@property (weak, nonatomic) IBOutlet UILabel *labelDate;
+@property (weak, nonatomic) IBOutlet UILabel *labelState;
+
+@end
+@implementation CustomerDetailSectionHeader
+
+
+- (void)viewWithModel:(JavenOrderModel *)model {
+    self.labelDate.text = model.createInfo.time;
+    
+    NSArray *arrStateCode = @[@"toBePaid",@"toBeShipped",@"shipped",@"paid",@"cancelled"];
+    NSArray *arrTitle = @[@"待支付",@"待发货",@"已发货",@"已完成",@"已取消"];
+    
+    for (int i = 0; i < arrStateCode.count; i++) {
+        if ([arrStateCode[i] isEqualToString:model.state]) {
+            self.labelState.text = arrTitle[i];
+            break;
+        }
+    }
+}
+/*
+// 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/View/CustomerManagement/CustomerDetailSectionHeader.xib
+++ b/ALand/CodeClass/Home/View/CustomerManagement/CustomerDetailSectionHeader.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"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="CustomerDetailSectionHeader">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="54"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下单时间:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mTa-Dx-d9L">
+                    <rect key="frame" x="8" y="16" width="73" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" white="0.33333333333333331" alpha="0.5" colorSpace="calibratedWhite"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2015-10-23" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F1X-tR-lXs">
+                    <rect key="frame" x="81" y="16" width="92" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" white="0.33333333329999998" alpha="0.5" colorSpace="calibratedWhite"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="未支付" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jd3-yh-r6D">
+                    <rect key="frame" x="310" y="15" width="57" height="23"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="19"/>
+                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstAttribute="trailing" secondItem="jd3-yh-r6D" secondAttribute="trailing" constant="8" id="1aS-NS-5hS"/>
+                <constraint firstItem="mTa-Dx-d9L" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="8" id="Aas-JZ-eah"/>
+                <constraint firstItem="jd3-yh-r6D" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="IXt-fJ-yck"/>
+                <constraint firstItem="mTa-Dx-d9L" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="VQY-kJ-45a"/>
+                <constraint firstItem="F1X-tR-lXs" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="cX7-IH-m8t"/>
+                <constraint firstItem="F1X-tR-lXs" firstAttribute="leading" secondItem="mTa-Dx-d9L" secondAttribute="trailing" id="wyQ-wT-lGv"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <connections>
+                <outlet property="labelDate" destination="F1X-tR-lXs" id="F4b-mb-pOU"/>
+                <outlet property="labelState" destination="jd3-yh-r6D" id="dzU-Rh-deL"/>
+            </connections>
+            <point key="canvasLocation" x="278.5" y="-54"/>
+        </view>
+    </objects>
+</document>
--- a/ALand/CodeClass/Home/View/CustomerManagement/CustomerTopView.h
+++ b/ALand/CodeClass/Home/View/CustomerManagement/CustomerTopView.h
@@ -9,5 +9,9 @@
 #import <UIKit/UIKit.h>

 @interface CustomerTopView : UIView
+@property (weak, nonatomic) IBOutlet UIButton *buttonBac;
+@property (weak, nonatomic) IBOutlet UILabel *labelPhoneNumber;
+@property (weak, nonatomic) IBOutlet UILabel *labelCount;
+@property (weak, nonatomic) IBOutlet UILabel *labelTotalIncome;

 @end
--- a/ALand/CodeClass/Home/View/CustomerManagement/CustomerTopView.m
+++ b/ALand/CodeClass/Home/View/CustomerManagement/CustomerTopView.m
@@ -8,8 +8,23 @@

 #import "CustomerTopView.h"

+@interface CustomerTopView ()
+@property (weak, nonatomic) IBOutlet UIView *viewBottom;
+
+@end
 @implementation CustomerTopView

+
+- (void)awakeFromNib {
+    [self layoutIfNeeded];
+    
+    CLog(@"%f",self.height);
+}
+- (IBAction)actionCall:(id)sender {
+    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:[NSString stringWithFormat:@"tel://%@", self.labelPhoneNumber.text]]];
+    
+}
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

--- a/ALand/CodeClass/Home/View/CustomerManagement/CustomerTopView.xib
+++ b/ALand/CodeClass/Home/View/CustomerManagement/CustomerTopView.xib
@@ -7,12 +7,12 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="CustomerTopView">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="291"/>
+        <view autoresizesSubviews="NO" contentMode="scaleToFill" id="iN0-l3-epB" customClass="CustomerTopView">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="417"/>
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>
-                <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2nM-za-EA6">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="291"/>
+                <view autoresizesSubviews="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2nM-za-EA6">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="417"/>
                    <subviews>
                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1S4-Kh-itU">
                            <rect key="frame" x="0.0" y="0.0" width="375" height="170"/>
@@ -34,7 +34,7 @@
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客户详情" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Va-P3-krV">
                                    <rect key="frame" x="148" y="27" width="80" 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>
                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="defaultUserIcon" translatesAutoresizingMaskIntoConstraints="NO" id="zh4-M8-ENA">
@@ -70,7 +70,7 @@
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="18321155536" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wtj-HV-1wd">
                                    <rect key="frame" x="92" y="14" width="105" height="21"/>
                                    <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>
                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4La-WM-6yb">
@@ -80,6 +80,9 @@
                                        <constraint firstAttribute="width" constant="40" id="eXN-3u-arm"/>
                                    </constraints>
                                    <state key="normal" image="call_icon"/>
+                                    <connections>
+                                        <action selector="actionCall:" destination="iN0-l3-epB" eventType="touchUpInside" id="MwL-hd-xyV"/>
+                                    </connections>
                                </button>
                            </subviews>
                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -96,17 +99,10 @@
                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qCw-1q-3NL">
                            <rect key="frame" x="0.0" y="240" width="375" height="50"/>
                            <subviews>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mTh-nT-kM5">
-                                    <rect key="frame" x="0.0" y="47" width="375" height="1"/>
-                                    <color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="1" id="6IR-ea-cih"/>
-                                    </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="NO9-0w-Ymn">
                                    <rect key="frame" x="16" y="14" width="51" height="21"/>
                                    <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="1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Svt-Uu-aR4">
@@ -118,7 +114,7 @@
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="笔，总收入" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4bO-6a-Snm">
                                    <rect key="frame" x="83" y="14" width="85" height="21"/>
                                    <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="234" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M4D-XV-xmC">
@@ -130,22 +126,19 @@
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="元" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PFs-OD-ZMb">
                                    <rect key="frame" x="207" y="15" width="17" height="21"/>
                                    <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>
                            </subviews>
                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                            <constraints>
                                <constraint firstItem="PFs-OD-ZMb" firstAttribute="leading" secondItem="M4D-XV-xmC" secondAttribute="trailing" constant="4" id="7py-8J-fqk"/>
-                                <constraint firstAttribute="trailing" secondItem="mTh-nT-kM5" secondAttribute="trailing" id="7rz-7g-84T"/>
                                <constraint firstItem="M4D-XV-xmC" firstAttribute="centerY" secondItem="qCw-1q-3NL" secondAttribute="centerY" id="922-X3-m82"/>
                                <constraint firstItem="Svt-Uu-aR4" firstAttribute="centerY" secondItem="qCw-1q-3NL" secondAttribute="centerY" id="E4T-yq-DY1"/>
-                                <constraint firstItem="mTh-nT-kM5" firstAttribute="leading" secondItem="qCw-1q-3NL" secondAttribute="leading" id="HkW-gw-rb2"/>
                                <constraint firstItem="4bO-6a-Snm" firstAttribute="leading" secondItem="Svt-Uu-aR4" secondAttribute="trailing" constant="4" id="Rhx-ag-cL8"/>
                                <constraint firstItem="Svt-Uu-aR4" firstAttribute="leading" secondItem="NO9-0w-Ymn" secondAttribute="trailing" constant="4" id="bX4-wa-smf"/>
                                <constraint firstAttribute="height" constant="50" id="c3D-bd-J5m"/>
                                <constraint firstItem="4bO-6a-Snm" firstAttribute="centerY" secondItem="qCw-1q-3NL" secondAttribute="centerY" id="cNF-JM-9nf"/>
-                                <constraint firstAttribute="bottom" secondItem="mTh-nT-kM5" secondAttribute="bottom" constant="2" id="iOk-5f-hpy"/>
                                <constraint firstItem="NO9-0w-Ymn" firstAttribute="centerY" secondItem="qCw-1q-3NL" secondAttribute="centerY" id="iWX-u9-Okc"/>
                                <constraint firstItem="M4D-XV-xmC" firstAttribute="leading" secondItem="4bO-6a-Snm" secondAttribute="trailing" constant="4" id="lGr-to-QIr"/>
                                <constraint firstItem="PFs-OD-ZMb" firstAttribute="centerY" secondItem="qCw-1q-3NL" secondAttribute="centerY" id="xds-L1-MPh"/>
@@ -175,7 +168,14 @@
                <constraint firstItem="2nM-za-EA6" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Zym-Jt-LUV"/>
            </constraints>
            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="438.5" y="529.5"/>
+            <connections>
+                <outlet property="buttonBac" destination="e1a-5l-BFu" id="LGb-xC-fuU"/>
+                <outlet property="labelCount" destination="Svt-Uu-aR4" id="5sh-7n-JFJ"/>
+                <outlet property="labelPhoneNumber" destination="Wtj-HV-1wd" id="GmR-cI-HKk"/>
+                <outlet property="labelTotalIncome" destination="M4D-XV-xmC" id="h6B-Mg-unY"/>
+                <outlet property="viewBottom" destination="qCw-1q-3NL" id="Ufa-go-YA7"/>
+            </connections>
+            <point key="canvasLocation" x="105.5" y="598.5"/>
        </view>
    </objects>
    <resources>

--- a/ALand/CodeClass/Home/View/MoneyView.h
+++ b/ALand/CodeClass/Home/View/MoneyView.h
@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "JavencommissionAccountModel.h"
 @interface MoneyView : UIView
+@property (weak, nonatomic) IBOutlet UIButton *buttonGoAmount;

 - (void)setMoneyView:(JavencommissionAccountModel *)model;


--- a/ALand/CodeClass/Home/View/MoneyView.m
+++ b/ALand/CodeClass/Home/View/MoneyView.m
@@ -22,14 +22,14 @@
 @implementation MoneyView

 - (void)awakeFromNib {
-    WS(weakSelf)
+    self.buttonEye.imageView.contentMode = UIViewContentModeScaleAspectFit;
    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 = @"******";
+            self.buttonEye.tag = 1;
+            self.labelMoney.text = @"******";
            [self.buttonEye setImage:[UIImage imageNamed:@"Invisible_icon"] forState:UIControlStateNormal];
        }else{
            

--- a/ALand/CodeClass/Home/View/MoneyView.xib
+++ b/ALand/CodeClass/Home/View/MoneyView.xib
@@ -73,20 +73,23 @@
                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="11" id="kGR-iD-Bxa"/>
                    </constraints>
                </imageView>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9zz-rv-FZd">
+                    <rect key="frame" x="0.0" y="0.0" width="320" height="107"/>
+                </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>
                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6h9-Nv-UNf">
-                    <rect key="frame" x="271" y="64" width="30" height="18"/>
+                    <rect key="frame" x="271" y="55" width="30" height="36"/>
                    <constraints>
                        <constraint firstAttribute="width" constant="30" id="a3k-ko-Eep"/>
-                        <constraint firstAttribute="height" constant="18" id="cjT-dS-HRZ"/>
+                        <constraint firstAttribute="height" constant="36" 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>
@@ -107,6 +110,7 @@
                <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"/>
+                <constraint firstItem="9zz-rv-FZd" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="KTj-3C-kyz"/>
                <constraint firstItem="sno-XF-7wp" firstAttribute="top" secondItem="ODe-C6-DGN" secondAttribute="bottom" id="Mbm-zF-a7w"/>
                <constraint firstItem="bWL-2f-gh2" firstAttribute="height" secondItem="k8x-ug-WTe" secondAttribute="height" id="Okk-dl-GDx"/>
                <constraint firstAttribute="trailing" secondItem="Hyn-Rr-wOv" secondAttribute="trailing" constant="10" id="T9I-xB-K9a"/>
@@ -114,9 +118,10 @@
                <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="6h9-Nv-UNf" firstAttribute="top" secondItem="ODe-C6-DGN" secondAttribute="bottom" constant="4" 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 firstAttribute="trailing" secondItem="9zz-rv-FZd" secondAttribute="trailing" id="c4j-Ym-oU3"/>
                <constraint firstItem="Hyn-Rr-wOv" firstAttribute="centerY" secondItem="bWL-2f-gh2" secondAttribute="centerY" id="cfd-zc-b5M"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="leading" secondItem="bWL-2f-gh2" secondAttribute="trailing" constant="10" id="dWF-wo-yQK"/>
                <constraint firstItem="bWL-2f-gh2" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" id="dmE-Oa-g5e"/>
@@ -139,6 +144,7 @@
                <constraint firstItem="Lnc-ho-ySs" firstAttribute="top" secondItem="7rw-kV-aXx" secondAttribute="bottom" constant="18" id="sVY-32-rV8"/>
                <constraint firstItem="bWL-2f-gh2" firstAttribute="width" secondItem="k8x-ug-WTe" secondAttribute="width" id="sd9-2e-2WS"/>
                <constraint firstItem="O8s-DL-Dmx" firstAttribute="centerY" secondItem="MWa-IH-asH" secondAttribute="centerY" id="sht-UM-bN5"/>
+                <constraint firstItem="9zz-rv-FZd" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="tAW-Ue-gHt"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="top" secondItem="MWa-IH-asH" secondAttribute="bottom" constant="8" id="thb-HD-UNh"/>
                <constraint firstItem="bWL-2f-gh2" firstAttribute="centerX" secondItem="oE9-qL-eth" secondAttribute="centerX" id="ttG-zn-0Wc"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="leading" secondItem="bWL-2f-gh2" secondAttribute="trailing" constant="20" id="wbh-O7-qtT"/>
@@ -146,6 +152,7 @@
                <constraint firstItem="Hyn-Rr-wOv" firstAttribute="centerY" secondItem="bWL-2f-gh2" secondAttribute="centerY" id="x2L-xk-WPx"/>
                <constraint firstItem="bWL-2f-gh2" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" id="xjZ-0E-BeK"/>
                <constraint firstItem="Hyn-Rr-wOv" firstAttribute="leading" secondItem="k8x-ug-WTe" secondAttribute="trailing" constant="40" id="y0D-QN-gqU"/>
+                <constraint firstItem="sno-XF-7wp" firstAttribute="top" secondItem="9zz-rv-FZd" secondAttribute="bottom" id="y1x-Bc-N8r"/>
                <constraint firstItem="k8x-ug-WTe" firstAttribute="leading" secondItem="bWL-2f-gh2" secondAttribute="trailing" constant="38" id="zL3-Vj-zwo"/>
            </constraints>
            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
@@ -184,12 +191,13 @@
            </variation>
            <connections>
                <outlet property="buttonEye" destination="6h9-Nv-UNf" id="G83-eF-zWu"/>
+                <outlet property="buttonGoAmount" destination="9zz-rv-FZd" id="IQT-x1-ZQL"/>
                <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"/>
+            <point key="canvasLocation" x="353" y="138.5"/>
        </view>
    </objects>
    <resources>

--- a/ALand/CodeClass/Home/View/Order/OrderCellView.m
+++ b/ALand/CodeClass/Home/View/Order/OrderCellView.m
@@ -23,7 +23,7 @@
    [self.imgCommdity sd_setImageWithURL:[NSURL URLWithString:goods.cover] placeholderImage:kPlaceHolderImage];
    self.labelTitle.text = goods.name;
    self.labelPrice.text = [NSString stringWithFormat:@"￥%.2f",goods.price];
-    self.labelCount.text = [NSString stringWithFormat:@"X%.0f", model.count];
+    self.labelCount.text = [NSString stringWithFormat:@"x%.0f", model.count];
    
 }


--- a/ALand/CodeClass/Home/View/Order/OrderDetailTableViewCell.m
+++ b/ALand/CodeClass/Home/View/Order/OrderDetailTableViewCell.m
@@ -26,7 +26,7 @@
    [self.imgCommdity sd_setImageWithURL:[NSURL URLWithString:goods.cover] placeholderImage:kPlaceHolderImage];
    self.labelTitle.text = goods.name;
    self.labelPrice.text = [NSString stringWithFormat:@"￥%.2f",goods.price];
-    self.labelCount.text = [NSString stringWithFormat:@"%.0f", model.count];
+    self.labelCount.text = [NSString stringWithFormat:@"x%.0f", model.count];
 }

 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {

--- a/ALand/CodeClass/Home/View/Order/OrderDetailTableViewCell.xib
+++ b/ALand/CodeClass/Home/View/Order/OrderDetailTableViewCell.xib
@@ -18,7 +18,7 @@
                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r5S-Ro-8VU" customClass="OrderCellView">
                        <rect key="frame" x="0.0" y="0.0" width="393" height="129"/>
                        <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="commodityManagementImage" translatesAutoresizingMaskIntoConstraints="NO" id="Mc7-h2-x4c">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="commodityManagementImage" translatesAutoresizingMaskIntoConstraints="NO" id="Mc7-h2-x4c">
                                <rect key="frame" x="8" y="8" width="90" height="113"/>
                                <constraints>
                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="90" id="22x-hE-Rpa"/>
@@ -27,6 +27,7 @@
                                </constraints>
                                <variation key="default">
                                    <mask key="constraints">
+                                        <exclude reference="22x-hE-Rpa"/>
                                        <exclude reference="ihX-bo-i9r"/>
                                    </mask>
                                </variation>
@@ -50,7 +51,7 @@
                                <nil key="highlightedColor"/>
                            </label>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥178" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dJx-Eq-r4u">
-                                <rect key="frame" x="298" y="89" width="45" height="21"/>
+                                <rect key="frame" x="308" y="89" width="45" height="21"/>
                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                <nil key="highlightedColor"/>
                            </label>
@@ -63,7 +64,7 @@
                                </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="KHr-8i-qcJ">
-                                <rect key="frame" x="259" y="89" width="39" height="21"/>
+                                <rect key="frame" x="269" y="89" width="39" height="21"/>
                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                <nil key="highlightedColor"/>
@@ -74,7 +75,7 @@
                            <constraint firstAttribute="trailingMargin" secondItem="cAt-eD-6vx" secondAttribute="trailing" id="1RH-5d-fWz"/>
                            <constraint firstAttribute="bottom" secondItem="8kn-MT-U4g" secondAttribute="bottom" constant="19" id="4gf-4J-NsH"/>
                            <constraint firstItem="Mc7-h2-x4c" firstAttribute="leading" secondItem="r5S-Ro-8VU" secondAttribute="leadingMargin" id="5aN-FQ-xIS"/>
-                            <constraint firstAttribute="trailing" secondItem="dJx-Eq-r4u" secondAttribute="trailing" constant="50" id="C6W-5B-Vfo"/>
+                            <constraint firstAttribute="trailing" secondItem="KHr-8i-qcJ" secondAttribute="trailing" constant="85" id="G32-aI-mpL"/>
                            <constraint firstItem="dJx-Eq-r4u" firstAttribute="leading" secondItem="KHr-8i-qcJ" secondAttribute="trailing" id="H6p-31-uZp"/>
                            <constraint firstItem="thy-fG-0wI" firstAttribute="leading" secondItem="r5S-Ro-8VU" secondAttribute="leading" constant="8" id="HPo-JN-THV"/>
                            <constraint firstItem="dJx-Eq-r4u" firstAttribute="leading" secondItem="8kn-MT-U4g" secondAttribute="leading" id="Lse-c0-ldA"/>

--- a/ALand/CodeClass/Home/View/Order/OrderExpressTableViewCell.xib
+++ b/ALand/CodeClass/Home/View/Order/OrderExpressTableViewCell.xib
@@ -18,13 +18,13 @@
                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="买家：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Q9-Yb-5Zd">
                        <rect key="frame" x="8" y="18" width="51" height="21"/>
                        <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="谢德彬" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jog-1Q-NME">
                        <rect key="frame" x="74" y="18" width="51" height="21"/>
                        <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="待支付" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J5p-Wx-HPf">
@@ -71,7 +71,7 @@
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥837" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ga-eZ-C09">
                                <rect key="frame" x="166" y="15" width="48" height="21"/>
                                <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="应付:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iCY-t9-oeZ">

--- a/ALand/CodeClass/Home/View/Order/OrderTableViewCell.xib
+++ b/ALand/CodeClass/Home/View/Order/OrderTableViewCell.xib
@@ -18,13 +18,13 @@
                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="买家：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RqJ-Zt-ur3">
                        <rect key="frame" x="8" y="18" width="51" height="21"/>
                        <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="谢德彬" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hBw-pM-xt9">
                        <rect key="frame" x="74" y="18" width="51" height="21"/>
                        <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" misplaced="YES" text="待支付" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C8f-Oc-X6g">
@@ -71,7 +71,7 @@
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥837" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GFV-0S-gMx">
                                <rect key="frame" x="152" y="15" width="48" height="21"/>
                                <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="佣金:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IC0-sm-vao">

--- a/ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerManagementViewController.m
+++ b/ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerManagementViewController.m
@@ -54,26 +54,10 @@
 - (void)setUpData {
    

-    NSDictionary *params = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
-                                                                  @"parameter" : @{@"operation" : @"string"},
-                                                                  @"parameters" : @[[UserInfo shareInstance].domain]},
-                                                                @{@"operation" : @"createInfo.time between",
-                                                                  @"parameter" : @{@"operation" : @"string"},
-                                                                  @"parameters" : @[self.customerCreateDate, [NSNull null]]},
-                                                                @{@"operation" : @"reseller uuid equals",
-                                                                  @"parameter" : @{@"operation" : @"string"},
-                                                                  @"parameters" : @[[UserInfo shareInstance].uuid]}],
-                                              @"orders" : @[@{@"field" : self.field,
-                                                              @"direction" : self.direction}],
-                                              @"pageSize" : kPageSize,
-                                              @"page" : @0,
-                                              @"probePages" : @0},
-                             @"fetchParts" : @[@""]};
    WS(weakSelf)
-    [[HTTPCilent shareCilent] POST:@"reseller/customer/query" parameters:params success:^(NSURLSessionDataTask *task, id responseObject) {
+    [[HTTPCilent shareCilent] POST:@"reseller/customer/query" parameters:[self getParams] success:^(NSURLSessionDataTask *task, id responseObject) {
        if ([responseObject[@"code"] isEqualToNumber:@0]) {
            
-            
            for (NSDictionary *dic in responseObject[@"queryResult"]) {
                JavenCustomer *customer = [JavenCustomer modelObjectWithDictionary:dic];
                [weakSelf.arrCellData addObject:customer];
@@ -90,6 +74,26 @@
    }];
 }

+- (NSDictionary *)getParams
+{
+    NSDictionary *params = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
+                                                                  @"parameter" : @{@"operation" : @"string"},
+                                                                  @"parameters" : @[[UserInfo shareInstance].domain]},
+                                                                @{@"operation" : @"createInfo.time between",
+                                                                  @"parameter" : @{@"operation" : @"string"},
+                                                                  @"parameters" : @[self.customerCreateDate, [NSNull null]]},
+                                                                @{@"operation" : @"reseller uuid equals",
+                                                                  @"parameter" : @{@"operation" : @"string"},
+                                                                  @"parameters" : @[[UserInfo shareInstance].uuid]}],
+                                              @"orders" : @[@{@"field" : self.field,
+                                                              @"direction" : self.direction}],
+                                              @"pageSize" : kPageSize,
+                                              @"page" : @0,
+                                              @"probePages" : @0},
+                             @"fetchParts" : @[@""]};
+    return params;
+}
+

 - (void)setUpSearchBar {
    UIView *titleView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kWidth - 60, 35)];//allocate titleView
@@ -235,6 +239,7 @@
    
    CustomerViewController *customerVC = [[CustomerViewController alloc] init];
    customerVC.isShowNavigationBar = NO;
+    customerVC.customer = self.arrCellData[indexPath.row];
    [self.navigationController pushViewController:customerVC animated:YES];
 }


--- a/ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerViewController.h
+++ b/ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerViewController.h
@@ -7,7 +7,10 @@
 //

 #import "IBTUIViewController.h"
+#import "JavenCustomer.h"
+

 @interface CustomerViewController : IBTUIViewController
+@property (nonatomic, strong) JavenCustomer *customer;

 @end
--- a/ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerViewController.m
+++ b/ALand/CodeClass/Home/ViewController/CustomerManagement/CustomerViewController.m
@@ -8,26 +8,162 @@

 #import "CustomerViewController.h"
 #import "CustomerTopView.h"
-@interface CustomerViewController ()
+#import "UITableView+Category.h"
+#import "OrderDetailTableViewCell.h"
+#import "CustomerDetailSectionHeader.h"
+#import "JavenOrderModel.h"
+#import "JavenGoodsDetails.h"
+#import "CommotityListModel.h"
+#import "CommodityDetailViewController.h"
+
+#define kCellID @"cellId"
+#define kPageSize @10
+
+@interface CustomerViewController ()<UITableViewDelegate, UITableViewDataSource>
 @property (nonatomic, strong) CustomerTopView *topView;
+@property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, strong) NSMutableArray *arrDatas;
+
 @end

 @implementation CustomerViewController

 - (void)viewDidLoad {
    [super viewDidLoad];
-    [self setUpTopView];

+    [self setUpTableView];
+    [self setUpData];
    // Do any additional setup after loading the view from its nib.
 }

- (void)setUpTopView{
+- (NSMutableArray *)arrDatas {
+    if (!_arrDatas) {
+        _arrDatas = [NSMutableArray array];
+    }
+    return _arrDatas;
+}
+
+- (void)setUpData {
+    WS(weakSelf)
+    [[HTTPCilent shareCilent] POST:@"order/query" parameters:[self getParams] success:^(NSURLSessionDataTask *task, id responseObject) {
+        
+        for (NSDictionary *dic in responseObject[@"queryResult"]) {
+            JavenOrderModel *model = [JavenOrderModel modelObjectWithDictionary:dic];
+            [weakSelf.arrDatas addObject:model];
+        }
+        [weakSelf.tableView reloadData];
+        
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        
+    }];
+}
+
+
+- (NSDictionary *)getParams {
+    NSDictionary *myDictionary = @{@"defintion" : @{@"conditions" : @[@{@"operation" : @"domain equals",
+                                                                        @"parameter" : @{@"operation" : @"string"},
+                                                                        @"parameters" : @[[UserInfo shareInstance].domain]},
+                                                                      @{@"operation" : @"reseller uuid equals",
+                                                                        @"parameter" : @{@"operation" : @"string"},
+                                                                        @"parameters" : @[[UserInfo shareInstance].uuid]},
+                                                                      @{@"operation" : @"consumer uuid equals",
+                                                                        @"parameter" : @{@"operation" : @"string"},
+                                                                        @"parameters" : @[self.customer.consumer.uuid]}],
+                                                    @"orders" : @[@{@"field" : @"reseller",
+                                                                    @"direction" : @"desc"}],
+                                                    @"pageSize" : kPageSize,
+                                                    @"page" : @0,
+                                                    @"probePages" : @0},
+                                   @"fetchParts" : @[@"string"]};
+    return myDictionary;
+}
+
+- (void)setUpTableView {
+    self.tableView = [UITableView groupedTableViewWithTarget:self cellNibName:@"OrderDetailTableViewCell" cellId:kCellID];
+    [self.view addSubview:self.tableView];
+    self.tableView.sd_layout.topEqualToView(self.view).leftEqualToView(self.view).rightEqualToView(self.view).bottomEqualToView(self.view);
+    
+    
    self.topView = [CustomerTopView viewWithNibName:@"CustomerTopView"];
-    self.topView.frame = CGRectMake(0, 0, kWidth, 291);
-    [self.view addSubview:self.topView];
+    self.topView.labelCount.text = [NSString stringWithFormat:@"%.0f", self.customer.orderCount];
+    self.topView.labelTotalIncome.text = [NSString stringWithFormat:@"%.0f", self.customer.commissionTotal];
+    self.topView.labelPhoneNumber.text = self.customer.consumer.mobilephone;
+    kButtonAddAction(self.topView.buttonBac, popAction);
+    
+    self.tableView.contentInset = UIEdgeInsetsMake(291, 0, 0, 0);
+    self.tableView.contentOffset = CGPointMake(0, -291);
+
+    [self.tableView addSubview:self.topView];
+    
+}
+
+- (void)viewDidLayoutSubviews {
+    self.topView.frame = CGRectMake(0, -291, kWidth, 291);
+    
 }


+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
+    CustomerDetailSectionHeader *header = [CustomerDetailSectionHeader viewWithNibName:@"CustomerDetailSectionHeader"];
+    header.width = kWidth;
+    [header viewWithModel:self.arrDatas[section]];
+    return header;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
+    return 50;
+}
+
+//- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
+//    UIView *view = [UIView new];
+//    view.backgroundColor = kSysWhite;
+//    
+//    UIView *line = [UIView new];
+//    [view addSubview:line];
+//    line.backgroundColor = kBacroundColor;
+//    line.sd_layout.bottomEqualToView(view).leftEqualToView(view).rightEqualToView(view).heightIs(1);
+//    
+//    return view;
+//}
+//
+//- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+//    return 20;
+//}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 130;
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return self.arrDatas.count;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return [[self.arrDatas[section] goodsDetails] count];
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    OrderDetailTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellID forIndexPath:indexPath];
+    [cell cellWithModel:[self.arrDatas[indexPath.section] goodsDetails][indexPath.row]];
+    return cell;
+    
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    JavenGoodsDetails *details = [self.arrDatas[indexPath.section] goodsDetails][indexPath.row];
+    CommodityDetailViewController *detailVC = [[CommodityDetailViewController alloc] init];
+    
+    CommotityListModel *model = [[CommotityListModel alloc] init];
+    model.uuid = details.goods.uuid;
+    model.name = details.goods.name;
+    
+    OrderDetailTableViewCell *cell = (OrderDetailTableViewCell *)[tableView cellForRowAtIndexPath:indexPath];
+    detailVC.image = cell.imgCommdity.image;
+    detailVC.model = model;
+    [self.navigationController pushViewController:detailVC animated:YES];
+}
+
 - (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.

--- a/ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m
+++ b/ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m
@@ -20,6 +20,7 @@
 #import "InvitePartnerViewController.h"
 #import "JavenDetailReseller.h"
 #import "JavencommissionAccountModel.h"
+#import "MyAcountViewController.h"

 #define kHomeCollectionViewID @"HomeCollectionViewID"
 #define kCollectionViewHeadHeight 350
@@ -73,6 +74,7 @@
    viewMoney.frame = CGRectMake(0, 0 - kCollectionViewHeadHeight, ScreenSize.width, 340);
    [self.collectionView addSubview:viewMoney];
    
+    kButtonAddAction(self.viewMoney.buttonGoAmount, actionGoAcount);
    
    //添加商品按钮
    UIView *viewAdd = [[UIView alloc] initWithFrame:CGRectMake(0, -51, ScreenSize.width, 50)];
@@ -125,6 +127,7 @@
    
 }

+#pragma mark - action

 - (void)touchAddAction {
    CLog(@"添加商品");
@@ -136,6 +139,14 @@
 }


+- (void)actionGoAcount {
+    MyAcountViewController *acountVC = [[MyAcountViewController alloc] init];
+    acountVC.isShowNavigationBar = NO;
+    acountVC.hidesBottomBarWhenPushed = YES;
+    [self.navigationController pushViewController:acountVC animated:YES];
+}
+
+
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
    return 1;
 }

--- a/ALand/CodeClass/Home/ViewController/HomeViewController.m
+++ b/ALand/CodeClass/Home/ViewController/HomeViewController.m
@@ -19,6 +19,8 @@

 - (void)viewDidLoad {
    [super viewDidLoad];
+    self.isShowNavigationBar = NO;
+
    [self setUpView];
    // Do any additional setup after loading the view.
 }

--- a/ALand/CodeClass/Home/ViewController/InviteParterner/InvitePartnerViewController.m
+++ b/ALand/CodeClass/Home/ViewController/InviteParterner/InvitePartnerViewController.m
@@ -22,6 +22,7 @@
    
    NSURLRequest *request = [[NSURLRequest alloc] initWithURL:[NSURL URLWithString:inviteWebUrl]];
    UIWebView *webView = [UIWebView new];
+    webView.backgroundColor = kBacroundColor;
    [webView loadRequest:request];
    [self.view addSubview:webView];
 //    webView.scrollView.contentInset = UIEdgeInsetsMake(30, 0, 0, 0);

--- a/ALand/CodeClass/Home/ViewController/InviteParterner/InvitePartnerViewController.xib
+++ b/ALand/CodeClass/Home/ViewController/InviteParterner/InvitePartnerViewController.xib
@@ -17,7 +17,7 @@
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>
                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOU-lM-mk6">
-                    <rect key="frame" x="32" y="560" width="311" height="44"/>
+                    <rect key="frame" x="32" y="593" width="311" height="44"/>
                    <constraints>
                        <constraint firstAttribute="width" constant="300" id="L0k-pB-2Td"/>
                        <constraint firstAttribute="width" constant="311" id="aCp-3e-AxW"/>
@@ -41,7 +41,7 @@
            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
            <constraints>
                <constraint firstItem="DOU-lM-mk6" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="2er-dC-vbh"/>
-                <constraint firstAttribute="bottom" secondItem="DOU-lM-mk6" secondAttribute="bottom" constant="63" id="j8V-cB-B4n"/>
+                <constraint firstAttribute="bottom" secondItem="DOU-lM-mk6" secondAttribute="bottom" constant="30" id="j8V-cB-B4n"/>
            </constraints>
            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina47"/>
            <point key="canvasLocation" x="428.5" y="112.5"/>

--- a/ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Order/NoPaymentTableViewController.m
@@ -18,7 +18,6 @@
 #define kPageSize @10

 @interface NoPaymentTableViewController ()
-@property (nonatomic, strong) NSArray *array;
 @property (nonatomic, assign) NSInteger page;
 @property (nonatomic, strong) NSMutableArray *arrDatas;
 @end
@@ -27,7 +26,6 @@

 - (void)viewDidLoad {
    [super viewDidLoad];
-    self.array = @[@2,@3,@5,@10];
    [self.tableView registerNib:[UINib nibWithNibName:@"OrderTableViewCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:kCellId];
    [self.tableView registerNib:[UINib nibWithNibName:@"OrderExpressTableViewCell" bundle:nil] forCellReuseIdentifier:kExpressCell];
    self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;

--- a/ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.m
+++ b/ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.m
@@ -77,7 +77,6 @@
    
    self.tableView.contentInset = UIEdgeInsetsMake(self.atopView.height, 0, self.bottomView.height - 250, 0);
    
-//    self.tableView.frame = CGRectMake(0, 0, kWidth, kHeight - self.atopView.height);
    [self.tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UITableViewScrollPositionTop animated:YES];
    
 }

--- a/ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.xib
+++ b/ALand/CodeClass/Home/ViewController/StoreManagerment/StoreManagermentViewController.xib
@@ -86,10 +86,10 @@
                            <state key="normal" image="bac"/>
                        </button>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hUK-HQ-XXe">
-                            <rect key="frame" x="0.0" y="13" width="46" height="44"/>
+                            <rect key="frame" x="0.0" y="0.0" width="68" height="65"/>
                            <constraints>
-                                <constraint firstAttribute="width" constant="46" id="LY8-iA-fHO"/>
-                                <constraint firstAttribute="height" constant="44" id="Wot-ZA-PZb"/>
+                                <constraint firstAttribute="width" constant="68" id="LY8-iA-fHO"/>
+                                <constraint firstAttribute="height" constant="65" id="Wot-ZA-PZb"/>
                            </constraints>
                            <connections>
                                <action selector="actionBack:" destination="-1" eventType="touchUpInside" id="yqn-yV-Y7U"/>
@@ -111,7 +111,7 @@
                        <constraint firstItem="PBT-3w-ecp" firstAttribute="leading" secondItem="cCx-iM-GxW" secondAttribute="leading" constant="18" id="Php-3h-4HB"/>
                        <constraint firstItem="PBT-3w-ecp" firstAttribute="leading" secondItem="cCx-iM-GxW" secondAttribute="leading" constant="17" id="QXy-R3-P0b"/>
                        <constraint firstItem="R3l-SJ-mVe" firstAttribute="leading" secondItem="4Yy-CO-HtC" secondAttribute="trailing" constant="1" id="XEe-Qm-ii1"/>
-                        <constraint firstItem="hUK-HQ-XXe" firstAttribute="top" secondItem="cCx-iM-GxW" secondAttribute="top" constant="13" id="Yek-FD-W0b"/>
+                        <constraint firstItem="hUK-HQ-XXe" firstAttribute="top" secondItem="cCx-iM-GxW" secondAttribute="top" id="Yek-FD-W0b"/>
                        <constraint firstAttribute="bottom" secondItem="4Yy-CO-HtC" secondAttribute="bottom" constant="57" id="cby-QI-yPW"/>
                        <constraint firstAttribute="bottom" secondItem="PBT-3w-ecp" secondAttribute="bottom" constant="14" id="kiK-Uy-3cZ"/>
                        <constraint firstItem="asy-i8-hFm" firstAttribute="leading" secondItem="PBT-3w-ecp" secondAttribute="trailing" constant="8" id="mGi-eg-U9m"/>

--- a/ALand/CodeClass/Login/LoginViewController.m
+++ b/ALand/CodeClass/Login/LoginViewController.m
@@ -45,9 +45,9 @@
 - (void)defaultLoginAction {
    
    
-//    BaseViewController *baseVC = [[BaseViewController alloc] init];
-//    baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
-//    [self presentViewController:baseVC animated:YES completion:nil];
+    BaseViewController *baseVC = [[BaseViewController alloc] init];
+    baseVC.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
+    [self presentViewController:baseVC animated:YES completion:nil];

    
    if ([[NSUserDefaults standardUserDefaults] objectForKey:@"passWord"]) {

--- a/ALand/CodeClass/MIne/View/MyBandCard/MyBandBottomView.xib
+++ b/ALand/CodeClass/MIne/View/MyBandCard/MyBandBottomView.xib
@@ -7,7 +7,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MyBandBottomView"/>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MyBandBottomView">
+        <view autoresizesSubviews="NO" contentMode="scaleToFill" id="iN0-l3-epB" customClass="MyBandBottomView">
            <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>

--- a/ALand/CodeClass/MIne/ViewController/MineViewController.m
+++ b/ALand/CodeClass/MIne/ViewController/MineViewController.m
@@ -12,7 +12,15 @@
 #import "MyBandCardViewController.h"
 #import "FeedBackViewController.h"
 #import "UIImage+Helper.h"
+#import "InvitePartnerViewController.h"
+#import "JavencommissionAccountModel.h"
+
+
+#import "JavenShopModel.h"
 @interface MineViewController ()
+@property (weak, nonatomic) IBOutlet UILabel *labelTotal;
+@property (nonatomic, strong) JavenShopModel *shopModel;
+@property (nonatomic, strong) JavencommissionAccountModel *accountModel;

 @end

@@ -20,15 +28,35 @@

 - (void)viewDidLoad {
    [super viewDidLoad];
+    self.isShowNavigationBar = NO;
    // Do any additional setup after loading the view from its nib.
 }


+
+- (void)setUpdata {
+    
+    WS(weakSelf)
+    NSString *strGetResseller = [NSString stringWithFormat:@"commission/getAccount/%@", [UserInfo shareInstance].uuid];
+    [[HTTPCilent shareCilent] GET:strGetResseller parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+        if ([responseObject[@"code"] isEqualToNumber:@0]) {
+            
+            weakSelf.accountModel = [JavencommissionAccountModel modelObjectWithDictionary:responseObject[@"commissionAccount"]];
+            self.labelTotal.text = [NSString stringWithFormat:@"%.2f", weakSelf.accountModel.accumulatedIncome];
+        }
+        CLog(@"d");
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        
+    }];
+    
+}
+
 - (IBAction)myAcount:(id)sender {
    CLog(@"myAcount");
    
    MyAcountViewController *acountVC = [[MyAcountViewController alloc] init];
    acountVC.isShowNavigationBar = NO;
+    acountVC.hidesBottomBarWhenPushed = YES;
    [self.navigationController pushViewController:acountVC animated:YES];
    
 }
@@ -44,9 +72,11 @@

 - (IBAction)invitePartner:(id)sender {
    
-    
-    NSString *urlStr = [NSString stringWithFormat:@"%@ShopUser/gpregister/invitationCode/%@.html", [UserInfo shareInstance].webShopBaseUrl, [UserInfo shareInstance].invitationCode];
-    [[ShareInstance shareInstace] showWithTitle:@"Aland" content:@"大伙加入，共同致富！" url:urlStr image:[UIImage appIcon]];
+    InvitePartnerViewController *inviteVC = [[InvitePartnerViewController alloc] init];
+    inviteVC.isShowNavigationBar = YES;
+    inviteVC.title = @"邀请合伙人";
+    inviteVC.hidesBottomBarWhenPushed = YES;
+    [self.navigationController pushViewController:inviteVC animated:YES];
 }

 - (IBAction)actionFeedBack:(id)sender {
@@ -59,6 +89,7 @@
 //设置
 - (IBAction)actionSetting:(id)sender {
    SettingViewController *settingVC = [[SettingViewController alloc] init];
+    settingVC.isShowNavigationBar = YES;
    settingVC.hidesBottomBarWhenPushed = YES;
    [self.navigationController pushViewController:settingVC animated:YES];
    
@@ -72,7 +103,7 @@

 - (void)viewWillAppear:(BOOL)animated {
    [super viewWillAppear:animated];
-    [self.navigationController setNavigationBarHidden:YES animated:YES];
+    [self setUpdata];
 }
 /*
 #pragma mark - Navigation

--- a/ALand/CodeClass/MIne/ViewController/MineViewController.xib
+++ b/ALand/CodeClass/MIne/ViewController/MineViewController.xib
@@ -7,6 +7,7 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MineViewController">
            <connections>
+                <outlet property="labelTotal" destination="92h-UB-Y9a" id="Akd-pk-foC"/>
                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
            </connections>
        </placeholder>
@@ -107,7 +108,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的账户" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Spv-Tw-RFD">
                            <rect key="frame" x="88" y="17" width="68" height="21"/>
                            <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>
                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="lhf-2q-EEQ">
@@ -120,8 +121,8 @@
                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="11" id="mKu-Ye-aEb"/>
                            </constraints>
                        </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥1239.8" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="92h-UB-Y9a">
-                            <rect key="frame" x="266" y="17" width="70" height="21"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥00.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="92h-UB-Y9a">
+                            <rect key="frame" x="284" y="17" width="52" height="21"/>
                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
                            <color key="textColor" red="0.60138541670000001" green="0.60138541670000001" blue="0.60138541670000001" alpha="1" colorSpace="calibratedRGB"/>
                            <nil key="highlightedColor"/>
@@ -173,7 +174,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的银行卡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IQT-d1-85R">
                            <rect key="frame" x="88" y="17" width="85" height="21"/>
                            <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>
                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="hkr-1l-GqW">
@@ -231,7 +232,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="邀请伙伴一起来挣钱" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HtD-aw-Qhq">
                            <rect key="frame" x="88" y="17" width="153" height="21"/>
                            <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>
                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="KRf-7t-UD1">
@@ -289,7 +290,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="帮助与反馈" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4rV-Xa-iGb">
                            <rect key="frame" x="88" y="17" width="85" height="21"/>
                            <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>
                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="GCs-h1-Zdg">
@@ -352,7 +353,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设置" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mmY-98-JCh">
                            <rect key="frame" x="88" y="17" width="34" height="21"/>
                            <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>
                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Hoa-2M-mjx">

--- a/ALand/CodeClass/MIne/ViewController/MyAcountHelfViewController.h
+++ b/ALand/CodeClass/MIne/ViewController/MyAcountHelfViewController.h
+//
+//  MyAcountHelfViewController.h
+//  ALand
+//
+//  Created by Z on 16/5/11.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "IBTUIViewController.h"
+
+@interface MyAcountHelfViewController : IBTUIViewController
+
+@end
--- a/ALand/CodeClass/MIne/ViewController/MyAcountHelfViewController.m
+++ b/ALand/CodeClass/MIne/ViewController/MyAcountHelfViewController.m
+//
+//  MyAcountHelfViewController.m
+//  ALand
+//
+//  Created by Z on 16/5/11.
+//  Copyright © 2016年 Z. All rights reserved.
+//
+
+#import "MyAcountHelfViewController.h"
+
+@interface MyAcountHelfViewController ()
+
+@end
+
+@implementation MyAcountHelfViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.title = @"帮助";
+    
+    NSString *inviteWebUrl = [NSString stringWithFormat:@"%@Wap/helpVisit.html", [UserInfo shareInstance].webShopBaseUrl];
+    
+    NSURLRequest *request = [[NSURLRequest alloc] initWithURL:[NSURL URLWithString:inviteWebUrl]];
+    UIWebView *webView = [UIWebView new];
+    [webView loadRequest:request];
+    [self.view addSubview:webView];
+    webView.scrollView.contentInset = UIEdgeInsetsMake(0, 0, 0, 0);
+    webView.sd_layout.topSpaceToView(self.view, 0).leftSpaceToView(self.view, 0).rightSpaceToView(self.view, 0).bottomSpaceToView(self.view, 0);
+    // Do any additional setup after loading the view.
+}
+
+- (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/MIne/ViewController/MyAcountViewController.m
+++ b/ALand/CodeClass/MIne/ViewController/MyAcountViewController.m
@@ -7,9 +7,10 @@
 //

 #import "MyAcountViewController.h"
-
+#import "JavenShopModel.h"
+#import "MyAcountHelfViewController.h"
 @interface MyAcountViewController ()
-
+@property (nonatomic, strong) JavenShopModel *shopModel;
 @end

 @implementation MyAcountViewController
@@ -19,6 +20,37 @@
    // Do any additional setup after loading the view from its nib.
 }

+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    [self setUpdata];
+}
+
+- (void)setUpdata {
+    
+    WS(weakSelf)
+    [[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"shop/get/%@", [UserInfo shareInstance].shop.uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+        
+        if (weakSelf.shopModel) {
+            [weakSelf.shopModel updateWithDictionary:responseObject[@"shop"]];
+        }else{
+            weakSelf.shopModel = [JavenShopModel modelObjectWithDictionary:responseObject[@"shop"]];
+        }
+        CLog(@"%p",weakSelf.shopModel);
+        //[weakSelf.viewHomeTop updateTopViewInfo:weakSelf.shopModel];
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        
+    }];
+    
+}
+- (IBAction)actionHelp:(id)sender {
+    MyAcountHelfViewController *helpVC = [[MyAcountHelfViewController alloc] init];
+    helpVC.isShowNavigationBar = YES;
+    [self.navigationController pushViewController:helpVC animated:YES];
+    
+}
+- (IBAction)actionBac:(id)sender {
+    [self popAction];
+}
 - (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.

--- a/ALand/CodeClass/MIne/ViewController/MyAcountViewController.xib
+++ b/ALand/CodeClass/MIne/ViewController/MyAcountViewController.xib
@@ -37,11 +37,14 @@
                                                <constraint firstAttribute="height" constant="70" id="O7d-yA-W6S"/>
                                                <constraint firstAttribute="width" constant="46" id="VgO-hY-7xa"/>
                                            </constraints>
+                                            <connections>
+                                                <action selector="actionBac:" destination="-1" eventType="touchUpInside" id="rlO-SA-CoK"/>
+                                            </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="mCL-jB-CAj">
                                            <rect key="frame" x="168" y="27" width="40" 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>
                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="v0z-xY-O0r">
@@ -50,6 +53,9 @@
                                            <state key="normal" title="帮助">
                                                <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                            </state>
+                                            <connections>
+                                                <action selector="actionHelp:" destination="-1" eventType="touchUpInside" id="DfA-ET-e4p"/>
+                                            </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="uKL-7j-fA6">
                                            <rect key="frame" x="14" y="78" width="126" height="22"/>
@@ -254,14 +260,14 @@
                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3AT-uX-tJ0">
                            <rect key="frame" x="250" y="98" width="124" height="96"/>
                            <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jZR-DN-sig">
-                                    <rect key="frame" x="106" y="20" width="0.0" height="0.0"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jZR-DN-sig">
+                                    <rect key="frame" x="62" y="20" width="0.0" height="0.0"/>
                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                    <nil key="highlightedColor"/>
                                </label>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Ci-YP-Pic">
-                                    <rect key="frame" x="91" y="52" width="0.0" height="0.0"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Ci-YP-Pic">
+                                    <rect key="frame" x="62" y="30" width="0.0" height="0.0"/>
                                    <fontDescription key="fontDescription" type="system" pointSize="26"/>
                                    <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                    <nil key="highlightedColor"/>

--- a/ALand/CodeClass/MIne/ViewController/SettingViewController.m
+++ b/ALand/CodeClass/MIne/ViewController/SettingViewController.m
@@ -7,12 +7,14 @@
 //

 #import "SettingViewController.h"
+#import "SDImageCache.h"

 @interface SettingViewController ()
 @property (weak, nonatomic) IBOutlet UIImageView *imageViewIcon;
 @property (weak, nonatomic) IBOutlet UILabel *signature;//个性签名
 @property (weak, nonatomic) IBOutlet UILabel *phoneNumber;

+
 @end

 @implementation SettingViewController
@@ -47,6 +49,18 @@
    }];
 }

+- (IBAction)actionClearCache:(id)sender {
+    MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    WS(weakSelf)
+    [[SDImageCache sharedImageCache] clearDiskOnCompletion:^{
+        [hud hide:YES];
+        
+        [MBProgressHUD Javen_showSuccess:@"清理成功！" onView:weakSelf.view delay:0.7 complete:nil];
+        
+    }];
+}
+
+
 - (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.

--- a/ALand/CodeClass/MIne/ViewController/SettingViewController.xib
+++ b/ALand/CodeClass/MIne/ViewController/SettingViewController.xib
@@ -24,10 +24,10 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人头像" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5VU-rI-onj">
                            <rect key="frame" x="16" y="34" width="72" height="22"/>
                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                            <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>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Tr7-KF-NsW">
+                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Tr7-KF-NsW">
                            <rect key="frame" x="357" y="30" width="10" height="30"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="10" id="21S-TV-ZBG"/>
@@ -64,7 +64,7 @@
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tgc-3e-TQr" userLabel="个性签名">
                    <rect key="frame" x="0.0" y="98" width="375" height="50"/>
                    <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="q4e-UX-9Iq">
+                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="q4e-UX-9Iq">
                            <rect key="frame" x="357" y="10" width="10" height="30"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="10" id="gS6-OO-7Wj"/>
@@ -73,7 +73,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个性签名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l5j-Dw-2FV">
                            <rect key="frame" x="16" y="14" width="72" height="22"/>
                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                            <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="生活如此多娇" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uld-uw-fRn">
@@ -104,7 +104,7 @@
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g2a-cQ-j4f" userLabel="消息设置">
                    <rect key="frame" x="0.0" y="156" width="375" height="50"/>
                    <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="ODV-9G-WcV">
+                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="ODV-9G-WcV">
                            <rect key="frame" x="357" y="10" width="10" height="30"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="10" id="CWA-MV-hPn"/>
@@ -113,7 +113,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="消息设置" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H1a-8W-X7L">
                            <rect key="frame" x="16" y="14" width="72" height="22"/>
                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                            <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="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kev-nC-K8e">
@@ -150,7 +150,7 @@
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7De-WQ-TBD" userLabel="登录密码">
                    <rect key="frame" x="0.0" y="214" width="375" height="50"/>
                    <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="wt1-KT-vOJ">
+                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="wt1-KT-vOJ">
                            <rect key="frame" x="357" y="10" width="10" height="30"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="10" id="q7S-WT-utc"/>
@@ -159,7 +159,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="登录密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7y3-yC-H1c">
                            <rect key="frame" x="42" y="14" width="72" height="22"/>
                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                            <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="修改" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wtQ-UU-0Dw">
@@ -209,7 +209,7 @@
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wea-du-rfh" userLabel="手机号码">
                    <rect key="frame" x="0.0" y="264" width="375" height="50"/>
                    <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="i3E-Tf-yvZ">
+                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="i3E-Tf-yvZ">
                            <rect key="frame" x="357" y="10" width="10" height="30"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="10" id="NwH-25-OHc"/>
@@ -218,7 +218,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码（0860）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D9x-be-TSN">
                            <rect key="frame" x="42" y="14" width="152" height="22"/>
                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                            <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="换绑" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rvv-Y7-dFZ">
@@ -268,7 +268,7 @@
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MiY-le-eXG" userLabel="提现密码">
                    <rect key="frame" x="0.0" y="314" width="375" height="50"/>
                    <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="48E-sg-B55">
+                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="48E-sg-B55">
                            <rect key="frame" x="357" y="10" width="10" height="30"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="10" id="did-6Q-ZDB"/>
@@ -277,7 +277,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提现密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MIO-GX-K5n">
                            <rect key="frame" x="42" y="14" width="72" height="22"/>
                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                            <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="设置" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xl0-z0-dFi">
@@ -327,7 +327,7 @@
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3T0-bi-6UQ" userLabel="清空数据缓存">
                    <rect key="frame" x="0.0" y="372" width="375" height="50"/>
                    <subviews>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Lsf-Uu-0IB">
+                        <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rightIcon" translatesAutoresizingMaskIntoConstraints="NO" id="Lsf-Uu-0IB">
                            <rect key="frame" x="357" y="10" width="10" height="30"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="10" id="3TR-ju-sDy"/>
@@ -336,7 +336,7 @@
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="清空数据缓存" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RyD-Hh-zfJ">
                            <rect key="frame" x="16" y="14" width="108" height="22"/>
                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                            <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="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lbm-6w-I6f">
@@ -347,6 +347,9 @@
                        </label>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CmW-vE-VCQ">
                            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                            <connections>
+                                <action selector="actionClearCache:" destination="-1" eventType="touchUpInside" id="DbB-Ls-WhC"/>
+                            </connections>
                        </button>
                    </subviews>
                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>

--- a/ALand/CodeClass/Massage/ViewController/MassageViewController.m
+++ b/ALand/CodeClass/Massage/ViewController/MassageViewController.m
@@ -16,6 +16,8 @@

 - (void)viewDidLoad {
    [super viewDidLoad];
+    self.isShowNavigationBar = NO;
+
    // Do any additional setup after loading the view.
 }
 - (void)viewWillAppear:(BOOL)animated {

--- a/ALand/CodeClass/Store/ViewController/StoreViewController.m
+++ b/ALand/CodeClass/Store/ViewController/StoreViewController.m
@@ -16,6 +16,8 @@

 - (void)viewDidLoad {
    [super viewDidLoad];
+    self.isShowNavigationBar = NO;
+
    // Do any additional setup after loading the view.
 }
 - (void)viewWillAppear:(BOOL)animated {

--- a/ALand/General/Categories/UITableView+Category.h
+++ b/ALand/General/Categories/UITableView+Category.h
@@ -13,4 +13,6 @@

 + (UITableView *)plainTableViewWithTarget:(id)target cellNibName:(NSString *)nibName cellId:(NSString *)cellId;

+ (UITableView *)groupedTableViewWithTarget:(id)target cellNibName:(NSString *)nibName cellId:(NSString *)cellId;
+
 @end
--- a/ALand/General/Categories/UITableView+Category.m
+++ b/ALand/General/Categories/UITableView+Category.m
@@ -18,4 +18,13 @@
    [tableView registerNib:[UINib nibWithNibName:nibName bundle:[NSBundle mainBundle]] forCellReuseIdentifier:cellId];
    return tableView;
 }
+
+
+ (UITableView *)groupedTableViewWithTarget:(id)target cellNibName:(NSString *)nibName cellId:(NSString *)cellId {
+    UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped];
+    tableView.dataSource = target;
+    tableView.delegate = target;
+    [tableView registerNib:[UINib nibWithNibName:nibName bundle:[NSBundle mainBundle]] forCellReuseIdentifier:cellId];
+    return tableView;
+}
 @end
--- a/ALand/Global/ShareView/ShareContentView.xib
+++ b/ALand/Global/ShareView/ShareContentView.xib
@@ -33,7 +33,7 @@
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="微信好友" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wvf-WK-gyv" customClass="MBLabelWithFontAdapter">
                                    <rect key="frame" x="9" y="104" width="68" height="21"/>
                                    <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>
                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rPq-qs-dfT">
@@ -74,15 +74,15 @@
                                    </constraints>
                                    <variation key="default">
                                        <mask key="constraints">
-                                            <exclude reference="hac-j3-zPV"/>
                                            <exclude reference="hLb-Dg-FNW"/>
+                                            <exclude reference="hac-j3-zPV"/>
                                        </mask>
                                    </variation>
                                </imageView>
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="朋友圈" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OCV-2a-uvi" customClass="MBLabelWithFontAdapter">
                                    <rect key="frame" x="17" y="104" width="51" height="21"/>
                                    <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>
                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F59-TA-szV">
@@ -113,7 +113,7 @@
                                </mask>
                            </variation>
                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2QH-ND-6io">
+                        <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2QH-ND-6io">
                            <rect key="frame" x="160" y="0.0" width="80" height="140"/>
                            <subviews>
                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" image="share_qrcode" translatesAutoresizingMaskIntoConstraints="NO" id="bdH-GV-ayS">
@@ -124,15 +124,15 @@
                                    </constraints>
                                    <variation key="default">
                                        <mask key="constraints">
-                                            <exclude reference="RPK-lR-drc"/>
                                            <exclude reference="7VN-fp-XMY"/>
+                                            <exclude reference="RPK-lR-drc"/>
                                        </mask>
                                    </variation>
                                </imageView>
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="二维码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2qS-kW-Ksz" customClass="MBLabelWithFontAdapter">
                                    <rect key="frame" x="17" y="104" width="51" height="21"/>
                                    <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>
                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="v5n-rV-AUz">
@@ -159,7 +159,7 @@
                                </mask>
                            </variation>
                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KdT-Jr-ynN">
+                        <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KdT-Jr-ynN">
                            <rect key="frame" x="240" y="0.0" width="80" height="140"/>
                            <subviews>
                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" image="share_copyurl" translatesAutoresizingMaskIntoConstraints="NO" id="iFL-Gl-tMp">
@@ -178,7 +178,7 @@
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="复制链接" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zdA-2Z-T9s" customClass="MBLabelWithFontAdapter">
                                    <rect key="frame" x="9" y="104" width="68" height="21"/>
                                    <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>
                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b2G-J2-wZI">
@@ -206,7 +206,7 @@
                            </variation>
                        </view>
                    </subviews>
-                    <color key="backgroundColor" red="0.75686274509999996" green="0.75686274509999996" blue="0.75686274509999996" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                    <constraints>
                        <constraint firstItem="nhd-Lq-ogK" firstAttribute="leading" secondItem="Wfu-Js-LZw" secondAttribute="leading" id="0G9-vh-EPm"/>
                        <constraint firstItem="2QH-ND-6io" firstAttribute="width" secondItem="nhd-Lq-ogK" secondAttribute="width" id="67i-PS-FnS"/>

--- a/ALand/IBTUtilites/IBTUIKit/IBTUIViewController.m
+++ b/ALand/IBTUtilites/IBTUIKit/IBTUIViewController.m
@@ -65,9 +65,10 @@
        [self addLeftBarBtnItemWithName:_cancelButtonName action:@selector(disMissSelf)];
    }
    
-
    [self.navigationController setNavigationBarHidden:!self.isShowNavigationBar animated:YES];

+    
+
 }

 - (void)viewDidAppear:(BOOL)animated {