| custom-tab-bar/data.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/home/home.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/personalCenter/certificate/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/personalCenter/certificate/index.wxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/personalCenter/index.wxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/personalCenter/myCollection/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/personalCenter/myCollection/index.wxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/personalCenter/myOrder/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/personalCenter/myOrder/index.wxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/teacherCertification/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/teacherCertification/index.wxml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
custom-tab-bar/data.js
@@ -27,7 +27,10 @@ { text: '个人中心', url: 'pages/personalCenter/index', <<<<<<< HEAD icon: '/static/images/home/my@2x.png', activeIcon: '/static/images/home/my-click@2x.png' ======= >>>>>>> master }, ]; pages/home/home.js
@@ -404,4 +404,5 @@ }) } }); pages/personalCenter/certificate/index.js
@@ -1,4 +1,3 @@ Page({ /** pages/personalCenter/certificate/index.wxml
@@ -1 +1,6 @@ <<<<<<< HEAD ======= <!--pages/personalCenter/certificate/index.wxml--> <text>pages/personalCenter/certificate/index.wxml</text> >>>>>>> master pages/personalCenter/index.wxml
@@ -1,3 +1,4 @@ <<<<<<< HEAD <view class="background {{ isWhite ? 'white':''}}"> <text class="text">个人中心</text> </view> @@ -67,4 +68,8 @@ </view> </view> </view> </view> </view> ======= <!--pages/personalCenter/index.wxml--> <text>pages/personalCenter/index.wxml</text> >>>>>>> master pages/personalCenter/myCollection/index.js
@@ -1,4 +1,3 @@ Page({ /** pages/personalCenter/myCollection/index.wxml
@@ -1 +1,6 @@ <text>我的收藏</text> <<<<<<< HEAD <text>我的收藏</text> ======= <!--pages/personalCenter/myCollection/index.wxml--> <text>pages/personalCenter/myCollection/index.wxml</text> >>>>>>> master pages/personalCenter/myOrder/index.js
@@ -1,4 +1,3 @@ Page({ /** pages/personalCenter/myOrder/index.wxml
@@ -1 +1,6 @@ <text>我的订单</text> <<<<<<< HEAD <text>我的订单</text> ======= <!--pages/personalCenter/myOrder/index.wxml--> <text>pages/personalCenter/myOrder/index.wxml</text> >>>>>>> master pages/teacherCertification/index.js
@@ -1,4 +1,8 @@ <<<<<<< HEAD // pages/bookServices/index.js ======= // pages/teacherCertification/index.js >>>>>>> master Page({ /** pages/teacherCertification/index.wxml
@@ -1,3 +1,4 @@ <<<<<<< HEAD <view class="container"> <view class="tips"> 仅限学校本课程任课教师申请；请上传有效在职教师工作证将有助于审核。 @@ -89,4 +90,8 @@ </form> </view> </view> </view> ======= <!--pages/teacherCertification/index.wxml--> <text>pages/teacherCertification/index.wxml</text> >>>>>>> master
