Skip to content

Commit be65db5

Browse files
liao3841054liao3841054
committed
Merge branch 'CodingShop'
2 parents e2ed108 + 1b0febd commit be65db5

51 files changed

Lines changed: 2729 additions & 12 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Coding_iOS.xcodeproj/project.pbxproj‎

Lines changed: 168 additions & 4 deletions
Large diffs are not rendered by default.

‎Coding_iOS/.DS_Store‎

2 KB
Binary file not shown.

Coding_iOS/Coding_iOS-Prefix.pch.example renamed to Coding_iOS/Coding_iOS-Prefix.pch

File renamed without changes.

‎Coding_iOS/Controllers/PointRecordsViewController.m‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#import "PointRecordsViewController.h"
1010
#import "WebViewController.h"
11+
#import "ShopViewController.h"
1112
#import "Coding_NetAPIManager.h"
1213

1314
#import "SVPullToRefresh.h"
@@ -153,8 +154,12 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
153154
[tableView deselectRowAtIndexPath:indexPath animated:YES];
154155
if (indexPath.section == 0 && indexPath.row == 1) {
155156
//商城入口
156-
WebViewController *vc = [WebViewController webVCWithUrlStr:@"/shop/"];
157-
[self.navigationController pushViewController:vc animated:YES];
157+
// WebViewController *vc = [WebViewController webVCWithUrlStr:@"/shop/"];
158+
// [self.navigationController pushViewController:vc animated:YES];
159+
160+
ShopViewController *shopvc = [[ShopViewController alloc] init];
161+
[self.navigationController pushViewController:shopvc animated:YES];
162+
158163
}
159164
}
160165

‎Coding_iOS/Controllers/Shop/DashesLineView.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//
2+
// DashesLineView.h
3+
// BanTang
4+
//
5+
// Created by liaoyp on 15/10/16.
6+
// Copyright © 2015年 JiuZhouYunDong. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
11+
@interface DashesLineView : UIView
12+
13+
@property(nonatomic,strong)UIColor* lineColor;//虚线颜色
14+
15+
16+
17+
@end

‎Coding_iOS/Controllers/Shop/DashesLineView.m‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
//
2+
// DashesLineView.m
3+
// BanTang
4+
//
5+
// Created by liaoyp on 15/10/16.
6+
// Copyright © 2015年 JiuZhouYunDong. All rights reserved.
7+
//
8+
9+
#import "DashesLineView.h"
10+
11+
@implementation DashesLineView
12+
13+
- (instancetype)initWithFrame:(CGRect)frame
14+
{
15+
self = [super initWithFrame:frame];
16+
if (self) {
17+
18+
}
19+
return self;
20+
}
21+
22+
23+
- (void)setLineColor:(UIColor *)lineColor{
24+
_lineColor = lineColor;
25+
[self setNeedsDisplay];
26+
27+
}
28+
29+
- (void)drawRect:(CGRect)rect
30+
{
31+
[super drawRect:rect];
32+
33+
CGContextRef context = UIGraphicsGetCurrentContext();
34+
35+
CGContextBeginPath(context);
36+
37+
CGContextSetLineWidth(context, 1);
38+
39+
CGContextSetStrokeColorWithColor(context, _lineColor.CGColor);
40+
41+
CGFloat lengths[] = {2,2};
42+
43+
CGContextSetLineDash(context, 0, lengths, 2);
44+
45+
CGContextMoveToPoint(context, 0, 0);
46+
47+
CGContextAddLineToPoint(context, CGRectGetWidth(rect), 0);
48+
49+
CGContextStrokePath(context);
50+
51+
CGContextClosePath(context);
52+
53+
}
54+
55+
@end

‎Coding_iOS/Controllers/Shop/ExchangeGoodsViewController.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//
2+
// ExchangeGoodsViewController.h
3+
// Coding_iOS
4+
//
5+
// Created by liaoyp on 15/11/20.
6+
// Copyright © 2015年 Coding. All rights reserved.
7+
//
8+
9+
#import "BaseViewController.h"
10+
#import "ShopGoods.h"
11+
12+
@interface ExchangeGoodsViewController : BaseViewController
13+
14+
@property(nonatomic , strong)ShopGoods *shopGoods;
15+
16+
@end

0 commit comments

Comments
 (0)