IOSGroup / ParentAssistant

13 Apr, 2018

4 commits

c33c3ada COMMIT Browse File »

Cao yang
2018-04-13 16:56:33 +0800
d572a428 统一背景色,优化UI Browse File »

Cao yang
2018-04-13 16:55:52 +0800
b51616b7 考勤补卡页面添加 Browse File »

Cao yang
2018-04-13 16:22:40 +0800
32f28146 Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »
```
…t into parentassistant

* 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistant:
  commit
  添加请假页面
  隐藏首页
  添加图片
```
葛建军
2018-04-13 14:55:30 +0800

12 Apr, 2018

2 commits

01e860af commit Browse File »

Cao yang
2018-04-12 17:33:41 +0800
839b987a 添加请假页面 Browse File »

Cao yang
2018-04-12 17:32:26 +0800

10 Apr, 2018

6 commits

a2a153f1 隐藏首页 Browse File »

Cao yang
2018-04-10 17:12:23 +0800
ecf1f11c 添加图片 Browse File »

Cao yang
2018-04-10 16:57:14 +0800
59a2bac0 应用页面初步搭建 Browse File »

Cao yang
2018-04-10 15:02:56 +0800
10668bdc 调整样式 Browse File »

Cao yang
2018-04-10 14:39:48 +0800
c7ed30f2 commit Browse File »

Cao yang
2018-04-10 11:43:34 +0800
1ec3b7df 修改成长页面 Browse File »

Cao yang
2018-04-10 11:08:46 +0800

08 Apr, 2018

2 commits

684fa2de 调试接口,优化接口地址 Browse File »

Cao yang
2018-04-08 17:55:57 +0800
ac85ee8f 给network瘦身,添加德育报告和场景接口 Browse File »

Cao yang
2018-04-08 17:10:53 +0800

27 Mar, 2018

3 commits

10d1b272 添加报告页面左右按钮 Browse File »

Cao yang
2018-03-27 17:45:37 +0800
b4536405 Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »
```
…t into parentassistant

# Conflicts:
#	ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
```
Cao yang
2018-03-27 15:36:42 +0800
6f4faf3d 添加日历控件 Browse File »

Cao yang
2018-03-27 15:24:58 +0800

26 Mar, 2018

4 commits

913c6d04 场景详情布局微调 Browse File »

Cao yang
2018-03-26 17:43:54 +0800
88ceffe7 完善报告页面 Browse File »

Cao yang
2018-03-26 15:59:45 +0800
c725fa81 Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »
```
…t into parentassistant
```
左丞
2018-03-26 10:44:11 +0800
55f4e53f 点击折线图添加数字显示 Browse File »

Cao yang
2018-03-26 10:09:53 +0800

24 Mar, 2018

12 commits

79394633 适配高度 Browse File »

Cao yang
2018-03-24 17:58:38 +0800
e90237f3 Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »
```
…t into parentassistant

# Conflicts:
#	ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
```
Cao yang
2018-03-24 17:55:49 +0800
e2bed55c commit Browse File »

Cao yang
2018-03-24 17:55:12 +0800
ae179549 Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »
```
…t into parentassistant

* 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistant:
  手动隐藏空白页
```
葛建军
2018-03-24 17:45:38 +0800
866dc83e 给折线图添加虚线和下划线 Browse File »

Cao yang
2018-03-24 17:45:12 +0800
86839389 手动隐藏空白页 Browse File »

Cao yang
2018-03-24 15:55:30 +0800
62b816d3 commit Browse File »

Cao yang
2018-03-24 15:49:42 +0800
680290e7 Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »
```
…t into parentassistant

# Conflicts:
#	ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
```
Cao yang
2018-03-24 15:49:01 +0800
977aef3c commit Browse File »

Cao yang
2018-03-24 15:47:35 +0800
eb22308c 合并冲突 Browse File »

Cao yang
2018-03-24 15:39:12 +0800
8b892b8e Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »
```
…t into parentassistant

# Conflicts:
#	ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
```
Cao yang
2018-03-24 15:28:21 +0800
8a4950fa 页面尺寸规范,完善页面 Browse File »

Cao yang
2018-03-24 15:27:03 +0800

23 Mar, 2018

3 commits

f015f8e3 封装折线图空间,适配页面 Browse File »

Cao yang
2018-03-23 18:09:15 +0800
e7237aba commit Browse File »

Cao yang
2018-03-23 10:23:59 +0800
58c1dc9c 提交 Browse File »

Cao yang
2018-03-23 10:01:38 +0800