Skip to content

A
ALand
Commit 60b617d9 authored by Sandy's avatar Sandy
Browse files
Options

个人中心

parent 4dfc1af4
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 13 deletions
ALand/Assets.xcassets/店铺_iPhone_assets/homeCollection6.imageset/Contents.json
View file @ 60b617d9
......@@ -2,12 +2,12 @@
"images" : [
{
"idiom" : "universal",
"filename" : "homeCollection7.png",
"filename" : "homeCollection6.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "homeCollection7@2x.png",
"filename" : "homeCollection6@2x.png",
"scale" : "2x"
},
{
......
ALand/Assets.xcassets/店铺_iPhone_assets/homeCollection7.imageset/Contents.json 0 → 100644
View file @ 60b617d9
{
"images" : [
{
"idiom" : "universal",
"filename" : "homeCollection7.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "homeCollection7@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
ALand/BaseClass/BaseViewController.m
View file @ 60b617d9
......@@ -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"];
......
ALand/CodeClass/Home/View/HomeCollectionViewCell.h
View file @ 60b617d9
......@@ -10,5 +10,6 @@
@interface HomeCollectionViewCell : UICollectionViewCell
@property (weak, nonatomic) IBOutlet UIImageView *imgView;
@property (weak, nonatomic) IBOutlet UILabel *labelTitle;
@end
ALand/CodeClass/Home/View/HomeCollectionViewCell.xib
View file @ 60b617d9
......@@ -13,27 +13,36 @@
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="133" height="175"/>
<subviews>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="homeCollection0" translatesAutoresizingMaskIntoConstraints="NO" id="D99-gm-QhP">
<rect key="frame" x="0.0" y="10" width="133" height="155"/>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="homeCollection7" translatesAutoresizingMaskIntoConstraints="NO" id="D99-gm-QhP">
<rect key="frame" x="0.0" y="10" width="133" height="130"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人中心" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ayL-bO-xEB">
<rect key="frame" x="35" y="150" width="64" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<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="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="D99-gm-QhP" secondAttribute="bottom" constant="35" id="9ka-xi-sYF"/>
<constraint firstItem="ayL-bO-xEB" firstAttribute="top" secondItem="D99-gm-QhP" secondAttribute="bottom" constant="10" id="N7W-2f-wH7"/>
<constraint firstItem="ayL-bO-xEB" firstAttribute="centerX" secondItem="D99-gm-QhP" secondAttribute="centerX" id="ZIK-5u-Isf"/>
<constraint firstItem="D99-gm-QhP" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" constant="10" id="aZq-nH-q2d"/>
<constraint firstItem="D99-gm-QhP" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="jXj-Lf-0f1"/>
<constraint firstAttribute="bottom" secondItem="D99-gm-QhP" secondAttribute="bottom" constant="10" id="qTX-cx-Pfg"/>
<constraint firstAttribute="trailing" secondItem="D99-gm-QhP" secondAttribute="trailing" id="zAQ-0v-9If"/>
</constraints>
<size key="customSize" width="133" height="175"/>
<connections>
<outlet property="imgView" destination="D99-gm-QhP" id="33R-h5-L3T"/>
<outlet property="labelTitle" destination="ayL-bO-xEB" id="Mds-jQ-v0l"/>
</connections>
<point key="canvasLocation" x="289.5" y="426.5"/>
</collectionViewCell>
</objects>
<resources>
<image name="homeCollection0" width="80" height="116"/>
<image name="homeCollection7" width="75" height="75"/>
</resources>
</document>
ALand/CodeClass/Home/ViewController/Commodity/CommodityDetailViewController.m
View file @ 60b617d9
......@@ -160,6 +160,7 @@
// 页面加载完成之后调用
- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
{
self.bottomView.userInteractionEnabled = YES;
[MBProgressHUD hideHUDForView:self.view];
}
// 页面加载失败时调用
......
ALand/CodeClass/Home/ViewController/HomeCollectionViewController.m
View file @ 60b617d9
......@@ -31,6 +31,8 @@
@property (nonatomic, strong) UICollectionView *collectionView;
@property (nonatomic, strong) MoneyView *viewMoney;
@property (nonatomic, strong) NSMutableArray *arrImages;
@property (nonatomic, strong) NSArray *arrTitles;
@property (nonatomic, strong) JavenDetailReseller *reseller;
@property (nonatomic, strong) JavencommissionAccountModel *accountModel;
@end
......@@ -42,12 +44,12 @@
self.automaticallyAdjustsScrollViewInsets = NO;
_arrImages = [NSMutableArray array];
for (int i = 0; i < 7; i++) {
for (int i = 0; i < 8; i++) {
NSString *imageName = [NSString stringWithFormat:@"homeCollection%d",i];
[_arrImages addObject:imageName];
}
self.arrTitles = @[@"商品管理",@"订单管理",@"客户管理",@"我的团队",@"店铺设置",@"邀请合伙人",@"代客下单",@"个人中心"];
//添加collectionview
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
......@@ -171,6 +173,7 @@
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
HomeCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kHomeCollectionViewID forIndexPath:indexPath];
cell.imgView.image = [UIImage imageNamed:self.arrImages[indexPath.row]];
cell.labelTitle.text = self.arrTitles[indexPath.row];
return cell;
}
......@@ -245,6 +248,7 @@
case 7://榜
{
[self.tabBarController setSelectedIndex:self.tabBarController.viewControllers.count - 1];
}
break;
......
ALand/CodeClass/Login/LoginViewController.m
View file @ 60b617d9
......@@ -46,9 +46,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"]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment