Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pr/3 #4

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e2d18b7
Merge pull request #1 from shenchong/master
maxiaohua Feb 24, 2016
4a0619c
Merge pull request #2 from shenchong/master
maxiaohua Feb 26, 2016
7a125dd
创建首页控制器,隐藏默认导航栏,并创建自定义导航栏
MaJasmine Feb 28, 2016
3ba60b8
在自定义导航栏中添加城市按钮
MaJasmine Feb 28, 2016
8666cfd
在城市按钮旁边添加向下箭头
MaJasmine Feb 28, 2016
1393d8d
在自定义导航栏中添加地图按钮
MaJasmine Feb 28, 2016
1498b64
在自定义导航栏中添加搜索框
MaJasmine Feb 28, 2016
e8ff8e0
完成自定义导航栏的扫一扫功能
MaJasmine Feb 28, 2016
b38bd50
完成按钮点击的界面跳转操作
MaJasmine Feb 28, 2016
46970d5
完成城市按钮的点击时,向下箭头旋转的功能
MaJasmine Feb 28, 2016
10af4f8
添加遮盖和城市选择控件,完成点击删除功能
MaJasmine Feb 28, 2016
f6fa373
初始化tableView
MaJasmine Feb 28, 2016
4704cb0
tableView数据源设置完成
MaJasmine Feb 28, 2016
23b59f1
完成猜你喜欢部分
MaJasmine Feb 29, 2016
5c90d28
在项目中创建文件夹
MaJasmine Feb 29, 2016
efa9a31
完善猜你喜欢的cell
MaJasmine Feb 29, 2016
14de097
完成首页后3个section的第一个row
MaJasmine Feb 29, 2016
ab4f13b
完成美食1元row= 0
MaJasmine Feb 29, 2016
97dc0ee
完成美食session
MaJasmine Feb 29, 2016
7cf78a9
创建购物商场模块
MaJasmine Mar 1, 2016
51f6387
1
shenchong Mar 1, 2016
673ceee
2
shenchong Mar 1, 2016
9e6cdf9
2
shenchong Mar 1, 2016
c7cd3fe
Merge branch 'maxiaohua-master'
shenchong Mar 1, 2016
fefa178
注释数据log
MaJasmine Mar 1, 2016
2ddc7dc
学习其他人代码
MaJasmine Mar 2, 2016
86c1c87
商家-主页filter筛选
shenchong Mar 3, 2016
1bcaf22
改了cell的颜色
MaJasmine Mar 9, 2016
81110f5
Merge remote-tracking branch 'origin/developer' into developer
MaJasmine Mar 9, 2016
ecbd2c1
设置购物商城
MaJasmine Mar 9, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified EMMeituan/.DS_Store
Binary file not shown.
336 changes: 336 additions & 0 deletions EMMeituan/EMMeituan.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Binary file not shown.
7 changes: 4 additions & 3 deletions EMMeituan/EMMeituan/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="14F1605" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
<viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
Expand Down
15 changes: 15 additions & 0 deletions EMMeituan/EMMeituan/Home/Controller/HomeViewController.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// HomeViewController.h
// EMMeituan
//
// Created by mazhi'hua on 16/2/28.
// Copyright © 2016年 easemob. All rights reserved.
//

#import <UIKit/UIKit.h>

@interface HomeViewController : UIViewController

@property (nonatomic,strong) UITableView * tableView;

@end
Loading