Commit 9b4e2ab5 authored by 张杰's avatar 张杰

bug fix

parent 5b88e6d2
......@@ -55,7 +55,8 @@ Page({
var studentId = student.id
this.setData({
student:student,
userIcon: app.globalData.login.wxaUser.avatarUrl
userIcon: app.globalData.login.wxaUser.avatarUrl,
sex: student.sex
})
request.queryStudentRecord(that.data.page, that.data.pageSize, studentId).then(res => {
......
......@@ -3,7 +3,7 @@
<view class='kg-separater' style='height:2rpx;'></view>
<view class='kg-home-header kg-flex-row'>
<template is='userInfo' data="{{userImg:userIcon,title:student.name,subTitle:student.className,sex:'male'}}"></template>
<template is='userInfo' data="{{userImg:userIcon,title:student.name,subTitle:student.className,sex:sex}}"></template>
<view class='kg-flex-column' style='align-items:flex-end;'>
<image class='top_logo' src='/src/img/parent_logo.png'></image>
<view class='home-header-roll-call' bindtap='changePwdTap'>
......
......@@ -85,12 +85,16 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
// 设置日期
let date = new Date()
let dateStr = utils.formatDate(date)
this.setData({
teacherId: app.globalData.login.user.id,
classList: app.globalData.login.classes,
reviewerName: app.globalData.login.user.name,
userIcon: app.globalData.login.wxaUser.avatarUrl,
kindergarten: app.globalData.login.preschoolName
kindergarten: app.globalData.login.preschoolName,
dateStr: dateStr
})
......
......@@ -9,7 +9,7 @@
<view class='kg-separater'></view>
<scroll-view style='height:calc(100vh - 200rpx)' scroll-y='true'>
<template is="section_header" data="{{title:'2018-09-12'}}"></template>
<template is="section_header" data="{{title:dateStr}}"></template>
<view class="category">
<view wx:for="{{classList}}" wx:key="id" id="{{item.id}}" bindtap='tapClass'>
......@@ -25,7 +25,6 @@
<view class='kg-text-normal-dark'>{{item.signStudentName}}</view>
<template is="sex" data="{{sex:item.signStudentSex}}"></template>
</view>
<template is='imgTextView' data="{{img:'zhaopian',text:item.arrIds.length}}"></template>
</view>
<!-- 图片 -->
<!-- <view class='home-student-picture-item'>
......@@ -38,6 +37,7 @@
<template is='imgTextView' data="{{img:'eat',text:item.eatCount ? item.eatCount : 0}}"> </template>
<template is='imgTextView' data="{{img:'sleep',text:item.sleepTotal ? item.sleepTotal : 0 }}"> </template>
<template is='imgTextView' data="{{img:'wc',text:item.wcCount ? item.wcCount : 0 }}"> </template>
<template is='imgTextView' data="{{img:'zhaopian',text:item.arrIds.length}}"></template>
</view>
</view>
</scroll-view>
\ No newline at end of file
......@@ -21,7 +21,7 @@ Page({
},
getAllStudent: function(classId) {
this.data.selectTags = {}
req.getAllStudent(classId).then(res => {
console.log(res)
for (var i = 0; i < res.length; i++) {
......
......@@ -117,7 +117,7 @@ Page({
console.log(e)
let student = this.data.recordDetail
wx.navigateTo({
url: '/pages/add_record/index?studentIds=' + JSON.stringify([this.data.signSummaryId]) + '&pictureIds=' + JSON.stringify(this.data.pictureIds) + '&remark=' + (this.data.remark ? this.data.remark : '') + '&picRemark=' + (this.data.pictureRemark ? this.data.pictureRemark : ''),
url: '/pages/add_record/index?studentIds=' + JSON.stringify([this.data.signSummaryId]) + '&pictureIds=' + JSON.stringify(this.data.pictureIds) + '&remark=' + (this.data.remark ? this.data.remark : '') + '&picRemark=' + (this.data.picRemark ? this.data.picRemark : ''),
})
},
......
......@@ -8,7 +8,7 @@
</view>
<view class='kg-separater'></view>
<scroll-view style='height:calc(100vh - 200rpx - 140rpx)' scroll-y='true'>
<scroll-view style='height:calc(100vh - 200rpx)' scroll-y='true'>
<view class='kg-quantity-cell timeline-content' style='margin-left:20rpx;margin-bottom:30rpx;' bindtap='tapCell'>
<view class='kg-flex-row' style='margin-bottom:20rpx;'>
<text class='kg-text-title'>{{recordDetail.recordDate}}</text>
......@@ -60,6 +60,7 @@
</view>
<text class='kg-text-normal-gray' style='margin-left:60rpx;'>{{picRemark}}</text>
</view>
<view style='height:140rpx;'></view>
</scroll-view>
<template is="operate_btn" data="{{title:'通过'}}" wx:if="{{showAuditBtn}}"></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