diff --git a/ALand/Assets.xcassets/smallEmptyImage.imageset/Contents.json b/ALand/Assets.xcassets/smallEmptyImage.imageset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..79dbfb285b767a1172c4ec131eeb217181523080
--- /dev/null
+++ b/ALand/Assets.xcassets/smallEmptyImage.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "smallEmptyImage.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/ALand/Assets.xcassets/smallEmptyImage.imageset/smallEmptyImage.png b/ALand/Assets.xcassets/smallEmptyImage.imageset/smallEmptyImage.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1d202bc0ec5934d11a67049e013e730f92b72f4
Binary files /dev/null and b/ALand/Assets.xcassets/smallEmptyImage.imageset/smallEmptyImage.png differ
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_canceled.imageset/Contents.json" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_canceled.imageset/Contents.json"
new file mode 100644
index 0000000000000000000000000000000000000000..ed32d8dc09b0f0516d88b7c91cfbc1a780f7d9fe
--- /dev/null
+++ "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_canceled.imageset/Contents.json"
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "orderDetail_canceled.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "orderDetail_canceled@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_canceled.imageset/orderDetail_canceled.png" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_canceled.imageset/orderDetail_canceled.png"
new file mode 100644
index 0000000000000000000000000000000000000000..1cf45f6e38fb22b3b3cc7e27bfb4e9914c917a76
Binary files /dev/null and "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_canceled.imageset/orderDetail_canceled.png" differ
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_canceled.imageset/orderDetail_canceled@2x.png" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_canceled.imageset/orderDetail_canceled@2x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..653a783a59baaa15109fa07da9b174ae21fed652
Binary files /dev/null and "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_canceled.imageset/orderDetail_canceled@2x.png" differ
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_completed.imageset/Contents.json" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_completed.imageset/Contents.json"
new file mode 100644
index 0000000000000000000000000000000000000000..0fb1461db0bb71611b3fdb5a5f922a1e0042bd3f
--- /dev/null
+++ "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_completed.imageset/Contents.json"
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "orderDetail_completed.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "orderDetail_completed@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_completed.imageset/orderDetail_completed.png" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_completed.imageset/orderDetail_completed.png"
new file mode 100644
index 0000000000000000000000000000000000000000..8c0be83cfd20d194bad6d0f1b0bd332560b7a61a
Binary files /dev/null and "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_completed.imageset/orderDetail_completed.png" differ
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_completed.imageset/orderDetail_completed@2x.png" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_completed.imageset/orderDetail_completed@2x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..5c8138bf4d31a94dc81c6e1c897e7f4236f222bf
Binary files /dev/null and "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_completed.imageset/orderDetail_completed@2x.png" differ
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_transported.imageset/Contents.json" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_transported.imageset/Contents.json"
new file mode 100644
index 0000000000000000000000000000000000000000..e7fdf90c9048eb540ae9e971929e85cbc8dfda8b
--- /dev/null
+++ "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_transported.imageset/Contents.json"
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "orderDetail_transported.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "orderDetail_transported@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_transported.imageset/orderDetail_transported.png" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_transported.imageset/orderDetail_transported.png"
new file mode 100644
index 0000000000000000000000000000000000000000..b4a85eab177daedea9ae0a453c13871932476cd2
Binary files /dev/null and "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_transported.imageset/orderDetail_transported.png" differ
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_transported.imageset/orderDetail_transported@2x.png" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_transported.imageset/orderDetail_transported@2x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..ea5a9b915ef549715fa72bd36cea922cb0d61ddb
Binary files /dev/null and "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_transported.imageset/orderDetail_transported@2x.png" differ
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitefortransport.imageset/Contents.json" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitefortransport.imageset/Contents.json"
new file mode 100644
index 0000000000000000000000000000000000000000..1c773e777646b730deb61eea82ece29e90102195
--- /dev/null
+++ "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitefortransport.imageset/Contents.json"
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "orderDetail_waitefortransport.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "orderDetail_waitefortransport@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitefortransport.imageset/orderDetail_waitefortransport.png" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitefortransport.imageset/orderDetail_waitefortransport.png"
new file mode 100644
index 0000000000000000000000000000000000000000..7c0fa83042ffdf9a1ff1054af00aedd95cdbf8a9
Binary files /dev/null and "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitefortransport.imageset/orderDetail_waitefortransport.png" differ
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitefortransport.imageset/orderDetail_waitefortransport@2x.png" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitefortransport.imageset/orderDetail_waitefortransport@2x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..b3f280a4637239a34cd4297f508f32bf3ae3e1f4
Binary files /dev/null and "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitefortransport.imageset/orderDetail_waitefortransport@2x.png" differ
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitforpay.imageset/Contents.json" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitforpay.imageset/Contents.json"
new file mode 100644
index 0000000000000000000000000000000000000000..eed9b6144d2e21f2d0caf815a1b477f4b6cdcd8d
--- /dev/null
+++ "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitforpay.imageset/Contents.json"
@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "filename" : "orderDetail_waitforpay.png",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "orderDetail_waitforpay@2x.png",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitforpay.imageset/orderDetail_waitforpay.png" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitforpay.imageset/orderDetail_waitforpay.png"
new file mode 100644
index 0000000000000000000000000000000000000000..9e85b4e0abd3f6d2001327dec8bbbc8de0f6797e
Binary files /dev/null and "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitforpay.imageset/orderDetail_waitforpay.png" differ
diff --git "a/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitforpay.imageset/orderDetail_waitforpay@2x.png" "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitforpay.imageset/orderDetail_waitforpay@2x.png"
new file mode 100644
index 0000000000000000000000000000000000000000..b6fd91b514ece64401fcb2c61a30b713e23ff5fb
Binary files /dev/null and "b/ALand/Assets.xcassets/\345\225\206\345\223\201\350\257\246\346\203\205_iPhone_assets/orderDetail_waitforpay.imageset/orderDetail_waitforpay@2x.png" differ
diff --git a/ALand/BaseClass/BaseViewController.m b/ALand/BaseClass/BaseViewController.m
index 1cfa48355ca9b56ed9cd329fc04ca92b6fb5e882..1672dc0b18d6be347d87497161c5aeb3cf5b0abc 100644
--- a/ALand/BaseClass/BaseViewController.m
+++ b/ALand/BaseClass/BaseViewController.m
@@ -31,7 +31,7 @@
[self addChildVC:homeVC title:@"店铺" imageName:@"home_tabbar" selectImgName:@"home_selected_tabbar"];
- [self addChildVC:storeVC title:@"商城" imageName:@"store_tabbar" selectImgName:@"store_selected_tabbar"];
+// [self addChildVC:storeVC title:@"商城" imageName:@"store_tabbar" selectImgName:@"store_selected_tabbar"];
[self addChildVCNoNavigationbar:masageVC title:@"消æ¯" imageName:@"message_tabbar" selectImgName:@"message_selected_tabbar"];
[self addChildVC:mineVC title:@"我的" imageName:@"mine_tabbar" selectImgName:@"mine_selected_tabbar"];
diff --git a/ALand/CodeClass/Home/View/Order/OrderDetailTopView.m b/ALand/CodeClass/Home/View/Order/OrderDetailTopView.m
index ed0095ff2b29a874f6dac04a608798843c963e25..6eab66e9596eca6ff7bbc2ac3775c6291b4d2a10 100644
--- a/ALand/CodeClass/Home/View/Order/OrderDetailTopView.m
+++ b/ALand/CodeClass/Home/View/Order/OrderDetailTopView.m
@@ -10,6 +10,8 @@
@interface OrderDetailTopView ()
@property (weak, nonatomic) IBOutlet UIView *viewExpress;
+@property (weak, nonatomic) IBOutlet UIImageView *imgIcon;
+@property (weak, nonatomic) IBOutlet UILabel *labelState;
@end
@implementation OrderDetailTopView
@@ -25,6 +27,41 @@
[self.viewExpress removeFromSuperview];
}
+
+ switch (self.orderType) {
+ case ORDERTOPTYPE_NOPAYMENT:
+ {
+ self.imgIcon.image = [UIImage imageNamed:@"orderDetail_waitforpay"];
+ self.labelState.text = @"ç‰å¾…付款";
+ }
+ break;
+ case ORDERTOPTYPE_WAITFORDISPATCH:
+ {
+ self.imgIcon.image = [UIImage imageNamed:@"orderDetail_waitefortransport"];
+ self.labelState.text = @"ç‰å¾…å‘è´§";
+ }
+ break;
+ case ORDERTOPTYPE_TRANSPORTED:
+ {
+ self.imgIcon.image = [UIImage imageNamed:@"orderDetail_transported"];
+ self.labelState.text = @"å·²å‘è´§";
+ }
+ break;
+ case ORDERTOPTYPE_COMMPLETE:
+ {
+ self.imgIcon.image = [UIImage imageNamed:@"orderDetail_completed"];
+ self.labelState.text = @"已完æˆ";
+ }
+ break;
+ case ORDERTOPTYPE_CANCELED:
+ {
+ self.imgIcon.image = [UIImage imageNamed:@"orderDetail_canceled"];
+ self.labelState.text = @"å·²å–消";
+ }
+ break;
+ default:
+ break;
+ }
}
- (void)updateHeight {
@@ -32,9 +69,9 @@
}
- (void)viewWithModel:(JavenOrderModel *)model {
- self.labelName = model.consumer.name;
+ self.labelName.text = model.address.name;
JavenAddress *address = model.address;
- self.labelAddress.text = [NSString stringWithFormat:@"%@%@%@%@", address.nation ? address.nation : @"", address.city, address.country, address.address];
+ self.labelAddress.text = [NSString stringWithFormat:@"%@%@%@%@%@", address.nation ? address.nation : @"", address.province, address.city, address.country, address.address];
self.labelPhoneNumber.text = model.consumer.code;
}
diff --git a/ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib b/ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib
index b067c5c7086a7a86d93f612f5a0133288d5ef69d..2805e9c7d3cc43a368c1a563aa06b2a13b897f65 100644
--- a/ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib
+++ b/ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib
@@ -168,12 +168,21 @@
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="orderDetail_waitefortransport" translatesAutoresizingMaskIntoConstraints="NO" id="CCq-Cf-mp9">
+ <rect key="frame" x="216" y="10" width="74" height="100"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="74" id="VMy-2S-sy9"/>
+ <constraint firstAttribute="height" constant="100" id="jMo-VD-pwn"/>
+ </constraints>
+ </imageView>
</subviews>
<color key="backgroundColor" red="0.48627450979999998" green="0.76470588240000004" blue="0.1450980392" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="120" id="5NF-bg-COp"/>
<constraint firstItem="nyc-Bh-qZx" firstAttribute="centerY" secondItem="hQw-oZ-PUV" secondAttribute="centerY" id="B1x-lb-Dsd"/>
+ <constraint firstItem="CCq-Cf-mp9" firstAttribute="centerY" secondItem="nyc-Bh-qZx" secondAttribute="centerY" id="Ygb-Ld-d90"/>
<constraint firstItem="nyc-Bh-qZx" firstAttribute="leading" secondItem="hQw-oZ-PUV" secondAttribute="leading" constant="22" id="ecB-5T-290"/>
+ <constraint firstAttribute="trailing" secondItem="CCq-Cf-mp9" secondAttribute="trailing" constant="30" id="wBq-Go-aSq"/>
</constraints>
</view>
</subviews>
@@ -208,11 +217,13 @@
</variation>
<connections>
<outlet property="bottomView" destination="kMe-iN-q0b" id="RF7-79-dgV"/>
+ <outlet property="imgIcon" destination="CCq-Cf-mp9" id="Kot-eG-EsE"/>
<outlet property="labelAddress" destination="rM9-W2-1PT" id="Vpk-og-XdW"/>
<outlet property="labelExpress" destination="qgd-cT-Y2S" id="qkY-uL-Ys8"/>
<outlet property="labelExpressTime" destination="KAE-q5-yVI" id="mUx-78-qVY"/>
<outlet property="labelName" destination="J01-8B-y5r" id="jwt-aT-2P0"/>
<outlet property="labelPhoneNumber" destination="v7R-er-zaD" id="jiO-J8-KxV"/>
+ <outlet property="labelState" destination="nyc-Bh-qZx" id="A7V-bB-9BO"/>
<outlet property="viewExpress" destination="9bs-ar-XXb" id="rCv-CW-UTd"/>
</connections>
<point key="canvasLocation" x="180" y="291"/>
@@ -222,5 +233,6 @@
<image name="call_icon" width="45" height="45"/>
<image name="icon_order_address" width="33" height="32"/>
<image name="icon_order_car" width="36" height="29"/>
+ <image name="orderDetail_waitefortransport" width="103" height="88"/>
</resources>
</document>
diff --git a/ALand/CodeClass/Login/LoginViewController.m b/ALand/CodeClass/Login/LoginViewController.m
index 72b814d44cd9b88262f7f98e2736405bb72b1331..7cb7cd62ee8d8912343674df7dd2d1ef97d58833 100644
--- a/ALand/CodeClass/Login/LoginViewController.m
+++ b/ALand/CodeClass/Login/LoginViewController.m
@@ -46,10 +46,10 @@
- (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"]) {
diff --git a/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.h b/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.h
index b06719097d715dbf7da7b18b9b8ccec41c6ce2c2..b7d4339b0dc1c98b55e4c69c17dc71babd046adb 100644
--- a/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.h
+++ b/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.h
@@ -7,7 +7,9 @@
//
#import <UIKit/UIKit.h>
-
+#import "JavenBankCards.h"
@interface BankTableViewCell : UITableViewCell
+
+- (void)cellWithModel:(JavenBankCards *)model;
@end
diff --git a/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.m b/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.m
index 029eaf165c7d7696887bd034a463306f7601d420..65debf556d5f2775984d08bc4b059b213fe62f2e 100644
--- a/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.m
+++ b/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.m
@@ -10,10 +10,17 @@
@interface BankTableViewCell ()
@property (weak, nonatomic) IBOutlet UIImageView *imgViewBackground;
+@property (weak, nonatomic) IBOutlet UILabel *labelBankName;
+@property (weak, nonatomic) IBOutlet UILabel *labelBankNO;
@end
@implementation BankTableViewCell
+- (void)cellWithModel:(JavenBankCards *)model {
+ self.labelBankName.text = model.bank;
+ self.labelBankNO.text = [NSString stringWithFormat:@"**** **** **** %@", [model.cardNo substringWithRange:NSMakeRange(model.cardNo.length - 4, 4)]];
+}
+
- (void)awakeFromNib {
// Initialization code
self.imgViewBackground.layer.masksToBounds = YES;
diff --git a/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.xib b/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.xib
index b8e995387b9f91866a266b748709ae55cd879f9e..62d99d7fc066d214e02a769a6629587ba380e60f 100644
--- a/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.xib
+++ b/ALand/CodeClass/MIne/View/MyBandCard/BankTableViewCell.xib
@@ -32,7 +32,7 @@
<constraint firstAttribute="height" constant="50" id="NZD-As-l8U"/>
</constraints>
</imageView>
- <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="储蓄å¡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xJ7-8i-4f5">
+ <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="储蓄å¡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xJ7-8i-4f5">
<rect key="frame" x="90" y="54" width="45" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -72,6 +72,8 @@
</tableViewCellContentView>
<connections>
<outlet property="imgViewBackground" destination="CD7-rL-3Ij" id="H9j-dt-pFj"/>
+ <outlet property="labelBankNO" destination="jAQ-ZS-i4d" id="Q2g-Zx-hhv"/>
+ <outlet property="labelBankName" destination="1bl-Gu-RDW" id="JWi-4r-jbM"/>
</connections>
<point key="canvasLocation" x="385" y="387"/>
</tableViewCell>
diff --git a/ALand/CodeClass/MIne/View/MyBandCard/MyBandBottomView.xib b/ALand/CodeClass/MIne/View/MyBandCard/MyBandBottomView.xib
index 98daccf05b0008c345338a4d2a4e9c863ef8ce49..9264587e55b27356d62fe27b0923038e8ea2e96d 100644
--- a/ALand/CodeClass/MIne/View/MyBandCard/MyBandBottomView.xib
+++ b/ALand/CodeClass/MIne/View/MyBandCard/MyBandBottomView.xib
@@ -11,7 +11,7 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XEH-EO-w12">
+ <button opaque="NO" contentMode="scaleAspectFit" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XEH-EO-w12">
<rect key="frame" x="0.0" y="1" width="320" height="59"/>
<constraints>
<constraint firstAttribute="width" constant="130" id="CeF-dx-cXo"/>
@@ -21,7 +21,7 @@
<state key="normal" title=" æ·»åŠ é“¶è¡Œå¡" image="mine_add_icon">
<color key="titleColor" red="0.34509803919999998" green="0.75686274509999996" blue="0.050980392159999999" alpha="1" colorSpace="calibratedRGB"/>
</state>
- <state key="selected" title="修改"/>
+ <state key="selected" title=" 修改" image="smallEmptyImage"/>
<variation key="default">
<mask key="constraints">
<exclude reference="CeF-dx-cXo"/>
@@ -67,5 +67,6 @@
</objects>
<resources>
<image name="mine_add_icon" width="20" height="20"/>
+ <image name="smallEmptyImage" width="1" height="1"/>
</resources>
</document>
diff --git a/ALand/CodeClass/MIne/ViewController/MineViewController.m b/ALand/CodeClass/MIne/ViewController/MineViewController.m
index 9ecd9186e429d43570d0a0cd926c1f7e87b400eb..4c939feafb3f2411a6c7e6005a4681a9fcc86bce 100644
--- a/ALand/CodeClass/MIne/ViewController/MineViewController.m
+++ b/ALand/CodeClass/MIne/ViewController/MineViewController.m
@@ -71,7 +71,7 @@
MyBandCardViewController *myBankCardVC = [[MyBandCardViewController alloc] init];
myBankCardVC.isShowNavigationBar = YES;
myBankCardVC.hidesBottomBarWhenPushed = YES;
- myBankCardVC.reseller = self.reseller;
+// myBankCardVC.reseller = self.reseller;
[self.navigationController pushViewController:myBankCardVC animated:YES];
}
diff --git a/ALand/CodeClass/MIne/ViewController/MyAcountViewController.m b/ALand/CodeClass/MIne/ViewController/MyAcountViewController.m
index 4f436e4ce1efd18d46768b2bcdcb1b946a542fe8..054e22261d2f12b916154b4a1a5eb11b5a040596 100644
--- a/ALand/CodeClass/MIne/ViewController/MyAcountViewController.m
+++ b/ALand/CodeClass/MIne/ViewController/MyAcountViewController.m
@@ -54,12 +54,19 @@
}];
}
+
+
- (IBAction)actionHelp:(id)sender {
MyAcountHelfViewController *helpVC = [[MyAcountHelfViewController alloc] init];
helpVC.isShowNavigationBar = YES;
[self.navigationController pushViewController:helpVC animated:YES];
}
+
+- (IBAction)actionGoBill:(id)sender {
+}
+
+
- (IBAction)actionBac:(id)sender {
[self popAction];
}
diff --git a/ALand/CodeClass/MIne/ViewController/MyAcountViewController.xib b/ALand/CodeClass/MIne/ViewController/MyAcountViewController.xib
index ddc0c0dfa7e970cb2dad9c7765367bce43f5f5c7..eaf24c27f0fff3b8ea864b863564a16d67cbab44 100644
--- a/ALand/CodeClass/MIne/ViewController/MyAcountViewController.xib
+++ b/ALand/CodeClass/MIne/ViewController/MyAcountViewController.xib
@@ -74,19 +74,29 @@
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
- <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="è´¦å•" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aQ2-Ra-9g7">
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="è´¦å•" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aQ2-Ra-9g7">
<rect key="frame" x="320" y="77" width="40" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
- <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_bill" translatesAutoresizingMaskIntoConstraints="NO" id="egs-2O-iKB">
+ <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_bill" translatesAutoresizingMaskIntoConstraints="NO" id="egs-2O-iKB">
<rect key="frame" x="314" y="116" width="53" height="43"/>
<constraints>
<constraint firstAttribute="height" constant="43" id="MX8-di-oyd"/>
<constraint firstAttribute="width" constant="53" id="opN-wf-o4B"/>
</constraints>
</imageView>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W6s-1P-UTv">
+ <rect key="frame" x="297" y="70" width="78" height="98"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="78" id="He6-a6-9WP"/>
+ <constraint firstAttribute="height" constant="98" id="Lh9-uD-wqh"/>
+ </constraints>
+ <connections>
+ <action selector="actionGoBill:" destination="-1" eventType="touchUpInside" id="OXv-qh-YhR"/>
+ </connections>
+ </button>
</subviews>
<color key="backgroundColor" red="0.48627450979999998" green="0.76470588240000004" blue="0.1450980392" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
@@ -97,7 +107,9 @@
<constraint firstItem="uKL-7j-fA6" firstAttribute="leading" secondItem="GpK-ZS-xDF" secondAttribute="leading" constant="14" id="I4V-JL-QVI"/>
<constraint firstItem="PPm-Va-bG0" firstAttribute="top" secondItem="GpK-ZS-xDF" secondAttribute="top" constant="18" id="PHS-8g-KdE"/>
<constraint firstItem="qUL-pA-7p5" firstAttribute="top" secondItem="GpK-ZS-xDF" secondAttribute="top" id="QvF-5D-Wnt"/>
+ <constraint firstAttribute="trailing" secondItem="W6s-1P-UTv" secondAttribute="trailing" id="Ved-z0-F9Z"/>
<constraint firstItem="mvG-Qa-pDy" firstAttribute="top" secondItem="uKL-7j-fA6" secondAttribute="bottom" constant="8" id="WUS-My-6ky"/>
+ <constraint firstItem="W6s-1P-UTv" firstAttribute="top" secondItem="v0z-xY-O0r" secondAttribute="bottom" constant="13" id="XG5-bI-PAZ"/>
<constraint firstItem="aQ2-Ra-9g7" firstAttribute="centerX" secondItem="v0z-xY-O0r" secondAttribute="centerX" id="XQc-Ey-H97"/>
<constraint firstItem="mCL-jB-CAj" firstAttribute="centerX" secondItem="GpK-ZS-xDF" secondAttribute="centerX" id="Z1L-Yg-zuw"/>
<constraint firstAttribute="trailing" secondItem="v0z-xY-O0r" secondAttribute="trailing" constant="15" id="cic-Ii-Dpg"/>
@@ -355,7 +367,7 @@
</view>
</objects>
<resources>
- <image name="bac" width="13" height="24"/>
+ <image name="bac" width="11" height="20"/>
<image name="icon_bill" width="54" height="57"/>
</resources>
</document>
diff --git a/ALand/CodeClass/MIne/ViewController/MyBandCard/AddDetailInfoViewController.m b/ALand/CodeClass/MIne/ViewController/MyBandCard/AddDetailInfoViewController.m
index 62e4843d91ec68b3c5d0520076440d0886654db0..2b1cf4b4ea2615501b96aaa75f259a296309be62 100644
--- a/ALand/CodeClass/MIne/ViewController/MyBandCard/AddDetailInfoViewController.m
+++ b/ALand/CodeClass/MIne/ViewController/MyBandCard/AddDetailInfoViewController.m
@@ -60,28 +60,18 @@
}
- (NSDictionary *)getParams {
- JavenBankCards *bankCard = [[JavenBankCards alloc] init];
+ JavenBankCards *bankCard;
+
+ if (self.reseller.certificate.bankCards.count > 0) {
+ bankCard = self.reseller.certificate.bankCards[0];
+ }else{
+ bankCard = [[JavenBankCards alloc] init];
+ }
+
bankCard.cardNo = self.bankCardID;
bankCard.bank = [self.labelBankName.text componentsSeparatedByString:@"·"][0];
NSDictionary *dic = [bankCard dictionaryRepresentation];
-
- NSDictionary *myDictionary = @{@"uuid" : [NSNull null],
- @"owner" : @{@"uuid" : [NSNull null],
- @"code" : [NSNull null],
- @"name" : [NSNull null]},
- @"carrier" : [NSNull null],
- @"address" : @{@"nation" : [NSNull null],
- @"province" : [NSNull null],
- @"city" : [NSNull null],
- @"country" : [NSNull null],
- @"address" : [NSNull null],
- @"zip" : [NSNull null]},
- @"bank" : [self.labelBankName.text componentsSeparatedByString:@"·"][0],
- @"branchBank" : [NSNull null],
- @"cardNo" : self.bankCardID};
-
-
self.reseller.certificate.bankCards = @[dic];
NSDictionary *params = [self getParamsWithReseller:self.reseller];
return params;
diff --git a/ALand/CodeClass/MIne/ViewController/MyBandCard/MyBandCardViewController.m b/ALand/CodeClass/MIne/ViewController/MyBandCard/MyBandCardViewController.m
index 5f928aa709b73e2bdc055390b3d7c59e80ef2756..9633b8d8f5652754f4c83a2781807b92761c3231 100644
--- a/ALand/CodeClass/MIne/ViewController/MyBandCard/MyBandCardViewController.m
+++ b/ALand/CodeClass/MIne/ViewController/MyBandCard/MyBandCardViewController.m
@@ -31,6 +31,10 @@
[self addBottomView];
// Do any additional setup after loading the view.
}
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+ [self getReseller];
+}
- (void)setUpTableView {
self.tableView = [UITableView plainTableViewWithTarget:self cellNibName:@"BankTableViewCell" cellId:kCellID];
@@ -46,11 +50,13 @@
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
- return 1;
+ return self.reseller.certificate.bankCards.count;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
BankTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellID forIndexPath:indexPath];
+ JavenBankCards *bankModel = self.reseller.certificate.bankCards[indexPath.row];
+ [cell cellWithModel:bankModel];
return cell;
}
@@ -81,7 +87,20 @@
[self.navigationController pushViewController:addBankIDVC animated:YES];
}
-
+- (void)getReseller{
+ WS(weakSelf)
+ [[HTTPCilent shareCilent] GET:[NSString stringWithFormat:@"reseller/get/%@", [UserInfo shareInstance].uuid] parameters:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+ if ([responseObject[@"code"] isEqualToNumber:@0]) {
+ weakSelf.reseller = [JavenResellerBigModel modelObjectWithDictionary:responseObject[@"reseller"]];
+ [weakSelf.tableView reloadData];
+ weakSelf.bottomView.btnAdd.selected = self.reseller.certificate.bankCards.count == 1;
+
+ }
+
+ } failure:^(NSURLSessionDataTask *task, NSError *error) {
+
+ }];
+}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
diff --git a/ALand/Global/ModelsFiles/JavenCertificate.m b/ALand/Global/ModelsFiles/JavenCertificate.m
index e3b553d7f538578b3c838ffac788bf9ceba5f300..2745c7be253ce541b6fac6a11a843fa8914061c6 100644
--- a/ALand/Global/ModelsFiles/JavenCertificate.m
+++ b/ALand/Global/ModelsFiles/JavenCertificate.m
@@ -1,11 +1,12 @@
//
// JavenCertificate.m
//
-// Created by Z on 16/5/3
+// Created by Z on 16/5/16
// Copyright (c) 2016 __MyCompanyName__. All rights reserved.
//
#import "JavenCertificate.h"
+#import "JavenBankCards.h"
NSString *const kJavenCertificateIdValidated = @"idValidated";
@@ -38,10 +39,22 @@ NSString *const kJavenCertificateTrueName = @"trueName";
// This check serves to make sure that a non-NSDictionary object
// passed into the model class doesn't break the parsing.
if(self && [dict isKindOfClass:[NSDictionary class]]) {
- self.idValidated = [[self objectOrNilForKey:kJavenCertificateIdValidated fromDictionary:dict] boolValue];
- self.bankCards = [self objectOrNilForKey:kJavenCertificateBankCards fromDictionary:dict];
- self.trueName = [self objectOrNilForKey:kJavenCertificateTrueName fromDictionary:dict];
-
+ self.idValidated = [[self objectOrNilForKey:kJavenCertificateIdValidated fromDictionary:dict] boolValue];
+ NSObject *receivedJavenBankCards = [dict objectForKey:kJavenCertificateBankCards];
+ NSMutableArray *parsedJavenBankCards = [NSMutableArray array];
+ if ([receivedJavenBankCards isKindOfClass:[NSArray class]]) {
+ for (NSDictionary *item in (NSArray *)receivedJavenBankCards) {
+ if ([item isKindOfClass:[NSDictionary class]]) {
+ [parsedJavenBankCards addObject:[JavenBankCards modelObjectWithDictionary:item]];
+ }
+ }
+ } else if ([receivedJavenBankCards isKindOfClass:[NSDictionary class]]) {
+ [parsedJavenBankCards addObject:[JavenBankCards modelObjectWithDictionary:(NSDictionary *)receivedJavenBankCards]];
+ }
+
+ self.bankCards = [NSArray arrayWithArray:parsedJavenBankCards];
+ self.trueName = [self objectOrNilForKey:kJavenCertificateTrueName fromDictionary:dict];
+
}
return self;
@@ -64,11 +77,11 @@ NSString *const kJavenCertificateTrueName = @"trueName";
}
[mutableDict setValue:[NSArray arrayWithArray:tempArrayForBankCards] forKey:kJavenCertificateBankCards];
[mutableDict setValue:self.trueName forKey:kJavenCertificateTrueName];
-
+
return [NSDictionary dictionaryWithDictionary:mutableDict];
}
-- (NSString *)description
+- (NSString *)description
{
return [NSString stringWithFormat:@"%@", [self dictionaryRepresentation]];
}
@@ -86,7 +99,7 @@ NSString *const kJavenCertificateTrueName = @"trueName";
- (id)initWithCoder:(NSCoder *)aDecoder
{
self = [super init];
-
+
self.idValidated = [aDecoder decodeBoolForKey:kJavenCertificateIdValidated];
self.bankCards = [aDecoder decodeObjectForKey:kJavenCertificateBankCards];
self.trueName = [aDecoder decodeObjectForKey:kJavenCertificateTrueName];
@@ -95,7 +108,7 @@ NSString *const kJavenCertificateTrueName = @"trueName";
- (void)encodeWithCoder:(NSCoder *)aCoder
{
-
+
[aCoder encodeBool:_idValidated forKey:kJavenCertificateIdValidated];
[aCoder encodeObject:_bankCards forKey:kJavenCertificateBankCards];
[aCoder encodeObject:_trueName forKey:kJavenCertificateTrueName];
@@ -106,7 +119,7 @@ NSString *const kJavenCertificateTrueName = @"trueName";
JavenCertificate *copy = [[JavenCertificate alloc] init];
if (copy) {
-
+
copy.idValidated = self.idValidated;
copy.bankCards = [self.bankCards copyWithZone:zone];
copy.trueName = [self.trueName copyWithZone:zone];