家长首页

app.json

 {
   "pages":[
-    
+    "pages/home/parents/index",
     "pages/home/teacher/index",
     "pages/add_record/index",
-    "pages/home/reviewer/index",
-    "pages/home/parents/index"
-    
+    "pages/home/reviewer/index"
   ],
   "window":{
     "backgroundTextStyle":"light",

app.wxss

@@ -116,7 +116,7 @@
 }
 
 /* 首页顶部 */
-.home-header {
+.kg-home-header {
   height: 180rpx;
   margin-left: 32rpx;
   margin-right: 32rpx;
@@ -127,7 +127,7 @@
   height: 120rpx;
   width: 120rpx;
   border-radius: 60rpx;
-  background-color: blueviolet;
+  /* background-color: blueviolet; */
 }
 
 /* 性别图标 */

pages/home/parents/index.wxml

 <!--pages/home/parents/index.wxml-->
-<view class='home-header'> 
+<import src='/template/operate_btn/index.wxml'></import>
 
+<view class='kg-separater' style='height:2rpx;'></view>
+<view class='kg-home-header kg-flex-row'>
+  <template is='userInfo' data="{{userImg:'/src/img/defaut_teacher_icon.png',title:'张小华',subTitle:'向日葵小班',sex:'m'}}"></template>
+  <view></view>
 </view>
+<view class='kg-separater'></view>
+
+<scroll-view style='height:calc(100vh - 200rpx)' scroll-y='true'>
+  <view class='timeline-cell'>
+    <view class='timeline-line-container'>
+      <view class='timeline-line'></view>
+      <image class='timeline-cycle' src='/src/img/timeline-cycle.jpeg'></image>
+    </view>
+    <view class='kg-quantity-cell timeline-content'>
+      <view class='kg-flex-row' style='margin-bottom:20rpx;'>
+        <text class='kg-text-title'>2018-09-11 星期二</text>
+        <text class='kg-text-normal-gray'>王xx老师记录</text>
+      </view>
+      <template is='imgTextView' data="{{img:'eat',text:'饮食'}}"> </template>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>早餐</text>
+        <text class='kg-text-normal-gray'>正常</text>
+      </view>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>早餐</text>
+        <text class='kg-text-normal-gray'>正常</text>
+      </view>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>早餐</text>
+        <text class='kg-text-normal-gray'>正常</text>
+      </view>
+      <!-- 睡觉 -->
+      <template is='imgTextView' data="{{img:'sleep',text:'睡觉'}}"> </template>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>午睡</text>
+        <text class='kg-text-normal-gray'>50分钟</text>
+      </view>
+      <!-- wc -->
+      <template is='imgTextView' data="{{img:'wc',text:'WC'}}"> </template>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>pee</text>
+        <text class='kg-text-normal-gray'>4次</text>
+      </view>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>poo</text>
+        <text class='kg-text-normal-gray'>4次</text>
+      </view>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>diaper</text>
+        <text class='kg-text-normal-gray'>4次</text>
+      </view>
+      <!-- 今日照片 -->
+      <template is='imgTextView' data="{{img:'today',text:'今日照片'}}"> </template>
+      <view class='home-student-picture-item' style='margin-left:40rpx;'>
+        <image src='/src/img/student_picture.png' class='home-student-picture' mode='aspectFill'></image>
+        <image src='/src/img/student_picture.png' class='home-student-picture' mode='aspectFill'></image>
+        <image src='/src/img/student_picture.png' class='home-student-picture' mode='aspectFill'></image>
+      </view>
+    </view>
+  </view>
+
+  <view class='timeline-cell'>
+    <view class='timeline-line-container'>
+      <view class='timeline-line'></view>
+      <image class='timeline-cycle' src='/src/img/timeline-cycle.jpeg'></image>
+    </view>
+    <view class='kg-quantity-cell timeline-content'>
+      <view class='kg-flex-row' style='margin-bottom:20rpx;'>
+        <text class='kg-text-title'>2018-09-11 星期二</text>
+        <text class='kg-text-normal-gray'>王xx老师记录</text>
+      </view>
+      <template is='imgTextView' data="{{img:'eat',text:'饮食'}}"> </template>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>早餐</text>
+        <text class='kg-text-normal-gray'>正常</text>
+      </view>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>早餐</text>
+        <text class='kg-text-normal-gray'>正常</text>
+      </view>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>早餐</text>
+        <text class='kg-text-normal-gray'>正常</text>
+      </view>
+      <!-- 睡觉 -->
+      <template is='imgTextView' data="{{img:'sleep',text:'睡觉'}}"> </template>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>午睡</text>
+        <text class='kg-text-normal-gray'>50分钟</text>
+      </view>
+      <!-- wc -->
+      <template is='imgTextView' data="{{img:'wc',text:'WC'}}"> </template>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>pee</text>
+        <text class='kg-text-normal-gray'>4次</text>
+      </view>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>poo</text>
+        <text class='kg-text-normal-gray'>4次</text>
+      </view>
+      <view class='kg-flex-row timeline-content-detail'>
+        <text class='kg-text-normal-gray'>diaper</text>
+        <text class='kg-text-normal-gray'>4次</text>
+      </view>
+      <!-- 今日照片 -->
+      <template is='imgTextView' data="{{img:'today',text:'今日照片'}}"> </template>
+      <view class='home-student-picture-item' style='margin-left:40rpx;'>
+        <image src='/src/img/student_picture.png' class='home-student-picture' mode='aspectFill'></image>
+        <image src='/src/img/student_picture.png' class='home-student-picture' mode='aspectFill'></image>
+        <image src='/src/img/student_picture.png' class='home-student-picture' mode='aspectFill'></image>
+      </view>
+    </view>
+  </view>
+</scroll-view>
\ No newline at end of file

pages/home/parents/index.wxss

 /* pages/home/parents/index.wxss */
+
+@import '../teacher/index.wxss'
+.timeline-cell {
+  /* position: relative; */
+  /* height: 400rpx; */
+  display: flex;
+  flex-direction: row;
+  /* background-color: rgb(149, 240, 198); */
+
+}
+
+.timeline-line-container {
+  position: relative;
+  /* background-color: white; */
+  width: 30px;
+  left: 0px;
+  top: 0px;
+  bottom: 0px;
+  /* background-color: rgb(42, 110, 78); */
+}
+
+.timeline-line {
+  position: absolute;
+  background-color: #dcddde;
+  /* background-color: red; */
+  width: 2px;
+  left: 15px;
+  top: 0px;
+  bottom: 0px;
+}
+/* 时间轴的圈圈 */
+.timeline-cycle {
+  position: absolute;
+  width: 15px;
+  height: 15px;
+  left: calc((30px - 15px) / 2);
+  top: 55rpx;
+}
+
+.timeline-content {
+  flex-grow: 1;
+  margin-top: 10px;
+  margin-left: 4px;
+  margin-bottom: 10px;
+  margin-right: 10px;
+  /* background-color: red; */
+}
+
+.timeline-content-detail {
+  margin-left:60rpx;
+  margin-right:60rpx;
+  margin-bottom:10rpx;
+}
\ No newline at end of file

pages/home/teacher/index.js

@@ -6,7 +6,7 @@ Page({
    */
   data: {
     signIcon:"/src/img/signin.png",
-    userIcon:"/src/img/defaut_teacher_icon.jpg",
+    userIcon:"/src/img/defaut_teacher_icon.png",
 
   },
 

pages/home/teacher/index.wxml

 <!--pages/home/teacher/index.wxml-->
 <import src='/template/operate_btn/index.wxml'></import>
-<view class='home-header kg-flex-row'>
-  <template is='userInfo' data="{{userImg:userIcon,title:'向日葵小班-张老师',subTitle:'共19人',sex:''}}">
-  </template>
-
+<view class='kg-separater' style='height:2rpx;'></view>
+<view class='kg-home-header kg-flex-row'>
+  <template is='userInfo' data="{{userImg:userIcon,title:'向日葵小班-张老师',subTitle:'共19人',sex:''}}"></template>
   <view class='home-header-roll-call'>
     <image class='roll-call-image' src='{{signIcon}}'></image>
     <view class='roll-call-title'>点名</view>

template/operate_btn/index.wxml

@@ -48,7 +48,7 @@ subTitle:副标题
   <view class='kg-flex-row'>
     <image class='kg-user-icon' src='{{userImg}}'></image>
     <view class='kg-flex-column' style='margin-left: 16rpx;height: 120rpx;'>
-      <view class='kg-flex-row'>
+      <view class='kg-flex-row' style='justify-content:flex-start;'>
         <view class='kg-text-title'>{{title}}</view>
         <template is="sex" data="{{sex:sex}}"></template>
       </view>
@@ -71,9 +71,10 @@ sex:性别 f/m (女性/男性)
     </view>
   </view>
 </template>
+
 <!-- 图片+文字 -->
 <template name='imgTextView'>
-  <view class='kg-flex-row'>
+  <view class='kg-flex-row' style='justify-content: flex-start;height:60rpx;'>
     <image src='/src/img/{{img}}.png' style='width: 50rpx;height: 40rpx;'></image>
     <text class='kg-text-normal-dark' style='margin-left:10rpx'>{{text}}</text>
   </view>