商城 - app 端要增加对商品型号的支持

Author: wanghengheng

Coding_iOS.xcodeproj/project.pbxproj

@@ -527,8 +527,8 @@
 		4ED558321B4FA68400FC10CB /* dismissBtn_Nav@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ED558311B4FA68400FC10CB /* dismissBtn_Nav@2x.png */; };
 		4ED618151C3A6B4B0017946C /* LocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED618141C3A6B4B0017946C /* LocationViewController.m */; };
 		4ED618181C3A6CA50017946C /* LocationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED618171C3A6CA50017946C /* LocationCell.m */; };
-		4ED6181B1C3A72AE0017946C /* ShopAddressCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED6181A1C3A72AE0017946C /* ShopAddressCell.m */; };
-		4ED6181D1C3A72CF0017946C /* ShopAddressCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4ED6181C1C3A72CF0017946C /* ShopAddressCell.xib */; };
+		4ED6181B1C3A72AE0017946C /* ShopMutileValueCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ED6181A1C3A72AE0017946C /* ShopMutileValueCell.m */; };
+		4ED6181D1C3A72CF0017946C /* ShopMutileValueCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4ED6181C1C3A72CF0017946C /* ShopMutileValueCell.xib */; };
 		4ED6181F1C3A732F0017946C /* button_arrow_left@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ED6181E1C3A732F0017946C /* button_arrow_left@2x.png */; };
 		4ED618211C3BD79B0017946C /* task_activity_icon_remove_watcher@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ED618201C3BD79B0017946C /* task_activity_icon_remove_watcher@2x.png */; };
 		4ED618241C3CB1AF0017946C /* taskWatchers@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ED618221C3CB1AF0017946C /* taskWatchers@2x.png */; };
@@ -1857,9 +1857,9 @@
 		4ED618141C3A6B4B0017946C /* LocationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocationViewController.m; sourceTree = "<group>"; };
 		4ED618161C3A6CA50017946C /* LocationCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocationCell.h; sourceTree = "<group>"; };
 		4ED618171C3A6CA50017946C /* LocationCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocationCell.m; sourceTree = "<group>"; };
-		4ED618191C3A72AE0017946C /* ShopAddressCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopAddressCell.h; sourceTree = "<group>"; };
-		4ED6181A1C3A72AE0017946C /* ShopAddressCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopAddressCell.m; sourceTree = "<group>"; };
-		4ED6181C1C3A72CF0017946C /* ShopAddressCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ShopAddressCell.xib; sourceTree = "<group>"; };
+		4ED618191C3A72AE0017946C /* ShopMutileValueCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopMutileValueCell.h; sourceTree = "<group>"; };
+		4ED6181A1C3A72AE0017946C /* ShopMutileValueCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopMutileValueCell.m; sourceTree = "<group>"; };
+		4ED6181C1C3A72CF0017946C /* ShopMutileValueCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ShopMutileValueCell.xib; sourceTree = "<group>"; };
 		4ED6181E1C3A732F0017946C /* button_arrow_left@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "button_arrow_left@2x.png"; sourceTree = "<group>"; };
 		4ED618201C3BD79B0017946C /* task_activity_icon_remove_watcher@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "task_activity_icon_remove_watcher@2x.png"; sourceTree = "<group>"; };
 		4ED618221C3CB1AF0017946C /* taskWatchers@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "taskWatchers@2x.png"; sourceTree = "<group>"; };
@@ -5153,9 +5153,9 @@
 				D02BE0AE1C0434DB008374C0 /* PRMRSearchCell.m */,
 				4ED618161C3A6CA50017946C /* LocationCell.h */,
 				4ED618171C3A6CA50017946C /* LocationCell.m */,
-				4ED618191C3A72AE0017946C /* ShopAddressCell.h */,
-				4ED6181A1C3A72AE0017946C /* ShopAddressCell.m */,
-				4ED6181C1C3A72CF0017946C /* ShopAddressCell.xib */,
+				4ED618191C3A72AE0017946C /* ShopMutileValueCell.h */,
+				4ED6181A1C3A72AE0017946C /* ShopMutileValueCell.m */,
+				4ED6181C1C3A72CF0017946C /* ShopMutileValueCell.xib */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -5560,7 +5560,7 @@
 				4EA7F12D1A6D0C4D00A046BD /* icon_project_private_old@2x.png in Resources */,
 				D0C447FC1C02DCA200DC1C4B /* timeBtn_Nav@2x.png in Resources */,
 				7E8E59821B6F91C40083CA02 /* bubble_right_play_0@2x.png in Resources */,
-				4ED6181D1C3A72CF0017946C /* ShopAddressCell.xib in Resources */,
+				4ED6181D1C3A72CF0017946C /* ShopMutileValueCell.xib in Resources */,
 				4E96E7DD1A1B537E0037C098 /* icon_file_movie@2x.png in Resources */,
 				4E93F23D1B84356500017916 /* file_menu_icon_open@2x.png in Resources */,
 				D0C447F41C02DCA200DC1C4B /* addBtn_Nav@2x.png in Resources */,
@@ -6153,7 +6153,7 @@
 				8EA6D13219E240C40076D59C /* RegisterViewController.m in Sources */,
 				923399661C00441700F29E04 /* ShopBanner.m in Sources */,
 				8EF643C519FF7E2900F7EEB0 /* TitleRImageMoreCell.m in Sources */,
-				4ED6181B1C3A72AE0017946C /* ShopAddressCell.m in Sources */,
+				4ED6181B1C3A72AE0017946C /* ShopMutileValueCell.m in Sources */,
 				4E217F151A70EDC700F6DF88 /* SVWebViewControllerActivitySafari.m in Sources */,
 				4E8D5D5A1B45295D00B70936 /* HOTPGenerator.m in Sources */,
 				8EA6D14519E240C40076D59C /* TweetDetailViewController.m in Sources */,

Coding_iOS/Controllers/Shop/ExchangeGoodsViewController.m

@@ -13,7 +13,8 @@
 #import "ShopGoodsInfoView.h"
 #import "UIView+Common.h"
 #import "LocationViewController.h"
-#import "ShopAddressCell.h"
+#import "ShopMutileValueCell.h"
+#import "ActionSheetStringPicker.h"
 
 #define kCellIdentifier_ShopOrderTextFieldCell @"ShopOrderTextFieldCell.h"
 
@@ -26,6 +27,7 @@ @interface ExchangeGoodsViewController () <UITableViewDataSource, UITableViewDel
 
 @property (strong, nonatomic) NSString *receiverName, *receiverAddress, *receiverPhone, *remark;
 @property (strong, nonatomic) NSArray *locations;
+@property (strong, nonatomic) ShopGoodsOption *option;
 @end
 
 @implementation ExchangeGoodsViewController
@@ -78,7 +80,7 @@ - (void)viewDidLoad {
         tableView.delegate = self;
         tableView.dataSource = self;
         [tableView registerClass:[ShopOrderTextFieldCell class] forCellReuseIdentifier:kCellIdentifier_ShopOrderTextFieldCell];
-        [tableView registerNib:[UINib nibWithNibName:kCellIdentifier_ShopAddressCell bundle:nil] forCellReuseIdentifier:kCellIdentifier_ShopAddressCell];
+        [tableView registerNib:[UINib nibWithNibName:kCellIdentifier_ShopMutileValueCell bundle:nil] forCellReuseIdentifier:kCellIdentifier_ShopMutileValueCell];
         tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
         tableView.separatorColor = [UIColor colorWithHexString:@"0xFFDDDDDD"];
         tableView.separatorInset = UIEdgeInsetsMake(0, 12, 0, 12);
@@ -129,17 +131,24 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    NSInteger row = 5;
+    NSInteger row = self.shopGoods.options.count > 0? 6: 5;
     return row;
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (indexPath.row == 1) {
-        ShopAddressCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_ShopAddressCell forIndexPath:indexPath];
-        cell.locationF.text = [[self.locations valueForKey:@"name"] componentsJoinedByString:@" - "];
+    if (indexPath.row == 1 || indexPath.row == 5) {
+        ShopMutileValueCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_ShopMutileValueCell forIndexPath:indexPath];
+        if (indexPath.row == 1) {
+            cell.titleL.text = @"所在地 *";
+            cell.valueF.text = [[self.locations valueForKey:@"name"] componentsJoinedByString:@" - "];
+        }else{
+            cell.titleL.text = @"选项";
+            cell.valueF.text = self.option.name;
+        }
         return cell;
-    }else{
+    }
+    else{
         ShopOrderTextFieldCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_ShopOrderTextFieldCell forIndexPath:indexPath];
 
         switch (indexPath.row) {
@@ -191,8 +200,8 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (indexPath.row == 1) {
-        return [ShopAddressCell cellHeight];
+    if (indexPath.row == 1 || indexPath.row == 5) {
+        return [ShopMutileValueCell cellHeight];
     }else{
         return [ShopOrderTextFieldCell cellHeight];
     }
@@ -208,6 +217,17 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     if (indexPath.row == 1) {
         [self goToLocationVC];
+    }else if (indexPath.row == 5){
+        NSArray *rows = [self.shopGoods.options valueForKey:@"name"];
+        NSInteger index = self.option? [self.shopGoods.options indexOfObject:self.option]: 0;
+        __weak typeof(self) weakSelf = self;
+        [ActionSheetStringPicker showPickerWithTitle:nil rows:@[rows] initialSelection:@[@(index)] doneBlock:^(ActionSheetStringPicker *picker, NSArray *selectedIndex, NSArray *selectedValue) {
+            NSInteger newIndex = [(NSNumber *)selectedIndex.firstObject integerValue];
+            if (weakSelf.shopGoods.options.count > newIndex) {
+                weakSelf.option = weakSelf.shopGoods.options[newIndex];
+                [weakSelf.myTableView reloadData];
+            }
+        } cancelBlock:nil origin:self.view];
     }
 }
 
@@ -261,9 +281,7 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
             [NSObject showHudTipStr:@"密码不能为空"];
             return;
         }
-        
         [self exchangeActionRquest:field.text];
-
     }
 }
 
@@ -284,6 +302,9 @@ - (void)exchangeActionRquest:(NSString *)pwd
                 mparms[@"city"] =
                 mparms[@"district"] = nil;
             }
+            if (self.option.id) {
+                mparms[@"option_id"] = self.option.id;
+            }
 
             mparms[@"receiverAddress"] = _receiverAddress;
             mparms[@"receiverPhone"] = _receiverPhone;

Coding_iOS/Models/ShopGoods.h

@@ -15,6 +15,12 @@
 @property (strong, nonatomic) NSString *image ,*name ,*giftId;
 @property (assign, nonatomic) BOOL exchangeable; //能否兑换的
 @property (strong, nonatomic) NSString *description_mine;
-
+@property (strong, nonatomic) NSArray *options;
+@property (strong, nonatomic) NSDictionary *propertyArrayMap;
 
 @end
+
+@interface ShopGoodsOption : BaseModel
+@property (strong, nonatomic) NSNumber *id, *gift_id, *status, *size;
+@property (strong, nonatomic) NSString *name;
+@end

Coding_iOS/Models/ShopGoods.m

@@ -9,5 +9,17 @@
 #import "ShopGoods.h"
 
 @implementation ShopGoods
-
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        _propertyArrayMap = [NSDictionary dictionaryWithObjectsAndKeys:
+                             @"ShopGoodsOption", @"options", nil];
+    }
+    return self;
+}
 @end
+
+@implementation ShopGoodsOption
+
+@end

Coding_iOS/Views/Cell/ShopAddressCell.h

@@ -0,0 +1,18 @@
+//
+//  ShopMutileValueCell.h
+//  Coding_iOS
+//
+//  Created by Ease on 16/1/4.
+//  Copyright © 2016年 Coding. All rights reserved.
+//
+
+#define kCellIdentifier_ShopMutileValueCell @"ShopMutileValueCell"
+
+#import <UIKit/UIKit.h>
+
+@interface ShopMutileValueCell : UITableViewCell
+@property (weak, nonatomic) IBOutlet UITextField *valueF;
+@property (weak, nonatomic) IBOutlet UILabel *titleL;
+
++ (CGFloat)cellHeight;
+@end

Coding_iOS/Views/Cell/ShopMutileValueCell.h

@@ -1,14 +1,14 @@
 //
-//  ShopAddressCell.m
+//  ShopMutileValueCell.m
 //  Coding_iOS
 //
 //  Created by Ease on 16/1/4.
 //  Copyright © 2016年 Coding. All rights reserved.
 //
 
-#import "ShopAddressCell.h"
+#import "ShopMutileValueCell.h"
 
-@implementation ShopAddressCell
+@implementation ShopMutileValueCell
 + (CGFloat)cellHeight{
     return 100;
 }

Coding_iOS/Views/Cell/ShopAddressCell.m renamed to Coding_iOS/Views/Cell/ShopMutileValueCell.m

@@ -8,7 +8,7 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ShopAddressCell" rowHeight="100" id="nqW-9T-8Qd" customClass="ShopAddressCell">
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ShopMutileValueCell" rowHeight="100" id="nqW-9T-8Qd" customClass="ShopMutileValueCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nqW-9T-8Qd" id="aUs-Fo-8GQ">
@@ -76,7 +76,8 @@
                 </constraints>
             </tableViewCellContentView>
             <connections>
-                <outlet property="locationF" destination="XXX-Xd-G2g" id="zTs-bp-6c4"/>
+                <outlet property="titleL" destination="yZm-gB-sVo" id="Bqe-7T-wxs"/>
+                <outlet property="valueF" destination="XXX-Xd-G2g" id="DqK-cu-KKU"/>
             </connections>
         </tableViewCell>
     </objects>