Skip to content

K
Kindergarten
Commit 51a7791d authored by 张杰's avatar 张杰
Browse files
Options

no message

parent ecd36884
Expand all Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 48 deletions
pages/home/parents/index.js
View file @ 51a7791d
......@@ -19,7 +19,7 @@ Page({
eatStates: app.globalData.eatStates,
rightIcon: '/src/img/xiugaimima.png',
pictureId: "",
userIcon: "",
userIcon: "/src/img/defaut_teacher_icon.png",
selectPic: [],
student: {},
//顶部加载提示信息
......@@ -147,14 +147,18 @@ Page({
}
let student = app.globalData.login.students[0]
var studentId = student.id
let pic = utils.handleImgShow(student.picture)
console.log(pic)
this.setData({
student: student,
userIcon: pic,
sex: student.sex
})
if (student.picture != null) {
let pic = utils.handleImgShow(student.picture)
this.setData({
userIcon: pic
})
}
},
httpRequest: function() {
......
pages/home/parents/index.wxml
View file @ 51a7791d
......@@ -30,6 +30,17 @@
<text class='kg-text-light-gray'>{{item.teacher ? item.teacher.name : ""}}记录</text>
</view>
<!-- 今日照片 -->
<template is='imgTextView' data="{{img:'today',text:'今日照片'}}"> </template>
<view class='home-student-picture-item' style='margin-left:40rpx;'>
<view wx:for="{{item.arrPic}}" wx:for-item="picItem" wx:for-index="picIndex" wx:key="picItem">
<image src='{{picItem}}' class='home-student-picture' catchtap='previewPic' data-index='{{index}}' data-picIndex='{{picIndex}}' mode='aspectFill'></image>
</view>
</view>
<text class='kg-text-normal-gray' style='margin-left:60rpx;'>{{item.pictureRemark ? item.pictureRemark : ''}}</text>
<view class='kg-separater' style='height:2rpx;margin-left:80rpx;margin-right:0rpx;'></view>
<!-- 饮食 -->
<view wx:for="{{item.dietRecord}}" wx:for-item="dietItem" wx:for-index="dietIndex" wx:key="dietItem.id">
......@@ -37,7 +48,7 @@
<template is='imgTextView' data="{{img:'eat',text:'饮食'}}"> </template>
</view>
<view class='kg-flex-row timeline-content-detail'>
<text class='kg-text-normal-gray' style='width:130rpx;'>{{dietItem.z_recordType}}</text>
<text class='kg-text-normal-gray' style='width:160rpx;'>{{dietItem.z_recordType}}</text>
<text class='kg-text-normal-gray' style='width:130rpx;'>{{dietItem.z_eatState}}</text>
</view>
</view>
......@@ -68,16 +79,6 @@
</view>
</view>
<text class='kg-text-normal-gray' style='margin-left:60rpx;'>{{item.remark ? item.remark : ''}}</text>
<view class='kg-separater' style='height:2rpx;margin-left:80rpx;margin-right:0rpx;'></view>
<!-- 今日照片 -->
<template is='imgTextView' data="{{img:'today',text:'今日照片'}}"> </template>
<view class='home-student-picture-item' style='margin-left:40rpx;'>
<view wx:for="{{item.arrPic}}" wx:for-item="picItem" wx:for-index="picIndex" wx:key="picItem">
<image src='{{picItem}}' class='home-student-picture' catchtap='previewPic' data-index='{{index}}' data-picIndex='{{picIndex}}' mode='aspectFill'></image>
</view>
</view>
<text class='kg-text-normal-gray' style='margin-left:60rpx;'>{{item.pictureRemark ? item.pictureRemark : ''}}</text>
</view>
</view>
......
pages/home/reviewer/index.js
View file @ 51a7791d
......@@ -101,7 +101,7 @@ Page({
if (this.data.classList.length > 0) {
this.data.classId = this.data.classList[0].id
}
this.querySignSummary()
},
/**
......@@ -115,7 +115,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
this.querySignSummary()
},
/**
......
pages/login/index.wxss
View file @ 51a7791d
This diff is collapsed.
pages/review_student/index.js
View file @ 51a7791d
......@@ -41,6 +41,26 @@ Page({
var num = date.getDay()
res.recordDate = dateStr + " " + show_day[date.getDay()]
this.setData({
remark: res.remark,
picRemark: res.pictureRemark
})
if (res.pictures != null) {
this.data.pictureIds = res.pictures.split(",")
var arrPic = []
for (var i = 0; i < this.data.pictureIds.length; i++) {
let id = this.data.pictureIds[i]
arrPic.push(utils.handleImgShow(id))
}
this.setData({
arrPic: arrPic
})
}
// 饮食
var dietRecords = res['dietRecord']
for (var j = 0; j < dietRecords.length; j++) {
......@@ -112,7 +132,7 @@ Page({
},
previewPic: function (e) {
previewPic: function(e) {
let index = e.target.dataset.picindex
console.log(e)
var current = this.data.arrPic[index]
......@@ -123,7 +143,11 @@ Page({
},
tapCell: function (e) {
tapCell: function(e) {
//审核通过不允许修改
// if (!this.data.showAuditBtn) {
// return;
// }
console.log(e)
let student = this.data.recordDetail
wx.navigateTo({
......@@ -149,25 +173,23 @@ Page({
})
}
this.setData({
remark: remark,
picRemark: picRemark,
studentName: options.studentName,
sex: options.sex
})
if (options.pictureIds != null) {
this.data.pictureIds = JSON.parse(options.pictureIds)
var arrPic = []
for (var i = 0; i < this.data.pictureIds.length; i++) {
let id = this.data.pictureIds[i]
arrPic.push(utils.handleImgShow(id))
}
this.setData({
arrPic: arrPic
})
}
// if (options.pictureIds != null) {
// this.data.pictureIds = JSON.parse(options.pictureIds)
// var arrPic = []
// for (var i = 0; i < this.data.pictureIds.length; i++) {
// let id = this.data.pictureIds[i]
// arrPic.push(utils.handleImgShow(id))
// }
// this.setData({
// arrPic: arrPic
// })
// }
this.getRecordDetailForSignId()
},
/**
......@@ -181,7 +203,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
this.getRecordDetailForSignId()
},
/**
......
pages/review_student/index.json
View file @ 51a7791d
{}
\ No newline at end of file
{
"navigationBarTitleText": "详情"
}
\ No newline at end of file
pages/review_student/index.wxml
View file @ 51a7791d
......@@ -15,6 +15,15 @@
<text class='kg-text-normal-gray'>{{recordDetail.teacher ? recordDetail.teacher.name : ""}}记录</text>
</view>
<!-- 今日照片 -->
<template is='imgTextView' data="{{img:'today',text:'今日照片'}}"> </template>
<view class='home-student-picture-item' style='margin-left:40rpx;'>
<view wx:for="{{arrPic}}" wx:for-item="picItem" wx:for-index="picIndex" wx:key="item.id">
<image src='{{picItem}}' class='home-student-picture' catchtap='previewPic' data-picIndex='{{picIndex}}' mode='aspectFill'></image>
</view>
</view>
<text class='kg-text-light-gray' style='margin-left:60rpx;'>{{picRemark ? picRemark : ''}}</text>
<!-- 饮食 -->
<view wx:for="{{recordDetail.dietRecord}}" wx:for-item="dietItem" wx:for-index="dietIndex" wx:key="item.id">
<view wx:if="{{dietIndex == 0}}">
......@@ -34,7 +43,7 @@
</view>
<view class='kg-flex-row timeline-content-detail'>
<text class='kg-text-normal-gray'>午睡</text>
<text class='kg-text-normal-gray'>{{sleepItem.value}}分钟</text>
<text class='kg-text-normal-gray'>{{sleepItem.value ? sleepItem.value : ''}}分钟</text>
</view>
</view>
......@@ -46,19 +55,12 @@
</view>
<view class='kg-flex-row timeline-content-detail'>
<text class='kg-text-normal-gray'>{{wcItem.z_recordType}}</text>
<text class='kg-text-normal-gray'>{{wcItem.value}}次</text>
<text class='kg-text-normal-gray'>{{wcItem.value ? wcItem.value : ''}}次</text>
</view>
</view>
<text class='kg-text-normal-gray' style='margin-left:60rpx;'>{{remark}}</text>
<text class='kg-text-light-gray' style='margin-left:60rpx;'>{{remark ? remark : ''}}</text>
<!-- 今日照片 -->
<template is='imgTextView' data="{{img:'today',text:'今日照片'}}"> </template>
<view class='home-student-picture-item' style='margin-left:40rpx;'>
<view wx:for="{{arrPic}}" wx:for-item="picItem" wx:for-index="picIndex" wx:key="item.id">
<image src='{{picItem}}' class='home-student-picture' catchtap='previewPic' data-picIndex='{{picIndex}}' mode='aspectFill'></image>
</view>
</view>
<text class='kg-text-normal-gray' style='margin-left:60rpx;'>{{picRemark}}</text>
</view>
<view style='height:140rpx;'></view>
......
src/img/eat.png
View replaced file @ ecd36884 View file @ 51a7791d
src/img/eat.png

2.23 KB | W: 0px | H: 0px

src/img/eat.png

2.24 KB | W: 0px | H: 0px

src/img/eat.png
src/img/eat.png
src/img/eat.png
src/img/eat.png
  • 2-up
  • Swipe
  • Onion skin
src/img/sleep.png
View replaced file @ ecd36884 View file @ 51a7791d
src/img/sleep.png

2.34 KB | W: 0px | H: 0px

src/img/sleep.png

2.4 KB | W: 0px | H: 0px

src/img/sleep.png
src/img/sleep.png
src/img/sleep.png
src/img/sleep.png
  • 2-up
  • Swipe
  • Onion skin
src/img/today.png
View replaced file @ ecd36884 View file @ 51a7791d
src/img/today.png

1.81 KB | W: 0px | H: 0px

src/img/today.png

1.83 KB | W: 0px | H: 0px

src/img/today.png
src/img/today.png
src/img/today.png
src/img/today.png
  • 2-up
  • Swipe
  • Onion skin
src/img/wc.png
View replaced file @ ecd36884 View file @ 51a7791d
src/img/wc.png

1.91 KB | W: 0px | H: 0px

src/img/wc.png

1.97 KB | W: 0px | H: 0px

src/img/wc.png
src/img/wc.png
src/img/wc.png
src/img/wc.png
  • 2-up
  • Swipe
  • Onion skin
src/img/xiugaimima.png
View replaced file @ ecd36884 View file @ 51a7791d
src/img/xiugaimima.png

1.96 KB | W: 0px | H: 0px

src/img/xiugaimima.png

1.71 KB | W: 0px | H: 0px

src/img/xiugaimima.png
src/img/xiugaimima.png
src/img/xiugaimima.png
src/img/xiugaimima.png
  • 2-up
  • Swipe
  • Onion skin
template/operate_btn/index.wxml
View file @ 51a7791d
......@@ -89,7 +89,7 @@ sex:性别 f/m (女性/男性)
<!-- 图片+文字 -->
<template name='imgTextView'>
<view class='kg-flex-row' style='justify-content: flex-start;height:80rpx;'>
<image src='/src/img/{{img}}.png' style='width: 50rpx;height: 40rpx;'></image>
<image src='/src/img/{{img}}.png' style='width: 44rpx;height: 44rpx;'></image>
<text class='kg-text-normal-dark' style='margin-left:10rpx;font-weight:bold;'>{{text != null ? text : ""}}</text>
</view>
</template>
\ No newline at end of file
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