Skip to content

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

优化

parent fd17ea9f
Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 109 deletions
api/request.js
View file @ e39b4613
......@@ -11,8 +11,8 @@ const ERR_NOT_ACCESS_TOKEN = 21;
var DEF_APP_CONFIG = {
appId: "wxfc3355043e579968", // 勾芒小程序测试号
// 开发环境
domain: 'http://dev.gomoretech.com/preschool-test',
baseUrl: "http://dev.gomoretech.com/preschool-test"
domain: 'http://dev.gomoretech.com/preschool',
baseUrl: "http://dev.gomoretech.com/preschool"
// 川哥本地环境
// domain: 'http://192.168.199.230:8080/preschool',
// baseUrl: "http://192.168.199.230:8080/preschool",
......
api/teacher.js
View file @ e39b4613
......@@ -75,5 +75,13 @@ module.exports = {
return request.post('/wxsite/teacher/setRecord.do', params)
},
deleteRecord(recordId){
let params = {
recordId: recordId
}
return request.post('/wxsite/teacher/deleteRecord.do', params)
}
}
\ No newline at end of file
app.js
View file @ e39b4613
......@@ -47,14 +47,15 @@ App({
"diet_milk": "饮用牛奶",
"sleep_time": "睡觉时间",
"wc_pee": "小便",
"wc_poo": "便",
"wc_diaper": "换尿布"
"wc_poo": "大便",
"wc_diaper": "尿不湿"
},
eatStates: {
"less": "少",
"normal": "正常",
"more": "多"
},
studentPaymentTypes: { 'nursery_all': '全托', 'nursery_morning': '上午托', 'nursery_afternoon': '下午托', }
}
})
\ No newline at end of file
app.wxss
View file @ e39b4613
......@@ -57,6 +57,7 @@
flex-direction: row;
height: 60rpx;
align-items: center;
justify-content: space-between;
}
.kg-quantity-cell {
......
pages/add_record/index.js
View file @ e39b4613
......@@ -15,7 +15,7 @@ Page({
'selected': true
},
{
'value': '睡觉',
'value': '睡眠',
'code': 'sleep',
'selected': false
},
......@@ -29,7 +29,11 @@ Page({
studentIds: [],
controlIndex: 0,
categoryCode: ['diet_morning', 'diet_morning_more', 'diet_afternoon', 'diet_afternoon_more', 'diet_evening'],//, 'diet_water', 'diet_milk'
// 饮食子分类
categorys: [],
wcCategoryCode: ['wc_pee', 'wc_poo','wc_diaper'],
// 大小便子分类
wcCategorys:[],
typeIndex: 0,
inputModel: [
......@@ -133,6 +137,42 @@ Page({
picRemark: inputValue
})
},
headerBtnTap: function (e) {
var arrRecord = []
let eatState = null
if (this.data.controlIndex == 0) {
arrRecord = this.data.eatRecord
} else if (this.data.controlIndex == 1) {
arrRecord = this.data.sleepRecord
} else if (this.data.controlIndex == 2) {
arrRecord = this.data.wcRecord;
}
var arrRecordList = []
var item = arrRecord[0].recordItems[0]
req.deleteRecord(item.id).then(res=>{
console.log(res)
wx.showToast({
title: '删除成功~',
duration: 1500
})
setTimeout(() => {
wx.navigateBack({
})
}, 1500)
}).catch(function (err) {
wx.showToast({
title: err.message ? err.message : '网络错误',
icon: 'none',
duration: 2000
});
});
},
//删除图片
deleteImg: function(e) {
......@@ -149,10 +189,16 @@ Page({
//选择小分类
tapType: function(e) {
let index = null
if (e.target.dataset.index != this.data.typeIndex) {
index = e.target.dataset.index
}
this.setData({
typeIndex: e.target.dataset.index,
typeIndex: index,
})
this.getRecord()
},
......@@ -183,14 +229,22 @@ Page({
// 初始化分类数据
configCategory: function() {
// 饮食分类
var categorys = this.data.categorys
for (var i = 0; i < this.data.categoryCode.length; i++) {
let category = this.data.recordTypes[this.data.categoryCode[i]]
categorys.push(category)
}
var wcCategorys = this.data.wcCategorys
for (var i = 0; i < this.data.wcCategoryCode.length; i++) {
let category = this.data.recordTypes[this.data.wcCategoryCode[i]]
wcCategorys.push(category)
}
this.setData({
categorys: categorys
categorys: categorys,
wcCategorys: wcCategorys
})
},
......@@ -203,6 +257,8 @@ Page({
let type = ''
if (this.data.controlIndex == 0) {
type = this.data.categoryCode[this.data.typeIndex]
} else if (this.data.controlIndex == 2){
type = this.data.wcCategoryCode[this.data.typeIndex]
}
req.queryRecordList(category, type, studentIds).then(res => {
......@@ -233,11 +289,13 @@ Page({
r.cellUnit = '毫升'
break
}
if (r.recordType == 'diet_water') {
if (r.recordType == 'diet_water' || this.data.wcCategoryCode.indexOf(r.recordType) != -1) {
r.cellType = 'input'
r.cellUnit = '次'
break
}
for (var j = 0, len = optionTag.length; j < len; j++) {
var tag = optionTag[j]
if (r.recordType == tag) {
......@@ -250,6 +308,10 @@ Page({
}
}
// 如果小分类没有被选中，去除数据
if (this.data.typeIndex == null) {
item.recordItems = []
}
}
if (this.data.controlIndex == 0) {
this.setData({
......@@ -261,27 +323,27 @@ Page({
})
} else if (this.data.controlIndex == 2) {
for (var i = 0; i < res.length; i++) {
var item = res[i]
var pee = '0'
var poo = '0'
var diaper = '0'
item.cellType = 'select'
item.cellOptions = ['小便', '大便', '尿不湿']
for (var j = 0; j < item.recordItems.length; j++) {
var r = item.recordItems[j]
if (r.recordType == 'wc_pee') {
pee = r.value
} else if (r.recordType == 'wc_poo') {
poo = r.value
} else if (r.recordType == 'wc_diaper') {
diaper = r.value
}
console.log('pee ' + pee + ' poo ' + poo + ' diaper ' + diaper)
}
let wcString = '小便 ' + pee + '次 大便 ' + poo + '次 尿不湿 ' + diaper + '次'
item.wcString = wcString
}
// for (var i = 0; i < res.length; i++) {
// var item = res[i]
// var pee = '0'
// var poo = '0'
// var diaper = '0'
// item.cellType = 'select'
// item.cellOptions = ['小便', '大便', '尿不湿']
// for (var j = 0; j < item.recordItems.length; j++) {
// var r = item.recordItems[j]
// if (r.recordType == 'wc_pee') {
// pee = r.value
// } else if (r.recordType == 'wc_poo') {
// poo = r.value
// } else if (r.recordType == 'wc_diaper') {
// diaper = r.value
// }
// console.log('pee ' + pee + ' poo ' + poo + ' diaper ' + diaper)
// }
// let wcString = '小便 ' + pee + '次 大便 ' + poo + '次 尿不湿 ' + diaper + '次'
// item.wcString = wcString
// }
this.setData({
wcRecord: res
......@@ -298,19 +360,19 @@ Page({
let records = this.getCurrentRecord()
var item = records[cellIndex].recordItems[0]
let selectIndex = e.currentTarget.dataset.optionindex
if (this.data.controlIndex == 2) {
if (records[cellIndex].optionIndex == selectIndex) {
records[cellIndex].optionIndex = null
}else{
records[cellIndex].optionIndex = selectIndex
}
} else {
// if (this.data.controlIndex == 2) {
// if (records[cellIndex].optionIndex == selectIndex) {
// records[cellIndex].optionIndex = null
// }else{
// records[cellIndex].optionIndex = selectIndex
// }
// } else {
if (item.optionIndex == selectIndex) {
item.optionIndex = null
}else{
item.optionIndex = selectIndex
}
}
// }
if (this.data.controlIndex == 0) {
this.setData({
......@@ -367,6 +429,7 @@ Page({
operateTap: function(event) {
console.log(event._relatedInfo.anchorTargetText)
var arrRecord = []
let eatState = null
if (this.data.controlIndex == 0) {
arrRecord = this.data.eatRecord
} else if (this.data.controlIndex == 1) {
......@@ -375,31 +438,10 @@ Page({
arrRecord = this.data.wcRecord;
}
var arrRecordList = []
let eatStatus = Object.keys(this.data.eatStates)
let wcStatus = ["wc_pee", "wc_poo", "wc_diaper"]
for (var i = 0; i < arrRecord.length; i++) {
var item = arrRecord[i]
if (this.data.controlIndex == 2 && item.optionIndex != null) {
var wcType = wcStatus[item.optionIndex]
var r = null
for (var j = 0; j < item.recordItems.length; j++) {
if (item.recordItems[j].recordType == wcType) {
r = item.recordItems[j]
}
}
if (!r) {
r = {}
r.recordType = wcType
r.recordCategory = "wc"
r.value = '0';
item.recordItems.push(r)
}
r.value = (parseInt(r.value) + 1).toString()
}
for (var j = 0; j < item.recordItems.length; j++) {
var recordItem = item.recordItems[j]
var value = recordItem.value;
......@@ -416,7 +458,7 @@ Page({
"sysCompanyCode": recordItem.sysCompanyCode,
"recordCategory": recordItem.recordCategory,
"recordType": recordItem.recordType,
"eatState": eatStatus[recordItem.optionIndex],
"eatState": Object.keys(this.data.eatStates)[recordItem.optionIndex],
"value": value,
"signSummaryId": item.signSummaryId
}
......@@ -428,7 +470,7 @@ Page({
let remark = null
let picRemark = null
if (this.data.studentIds.length == 1) {
signSummaryId = arrRecordList[0].signSummaryId
signSummaryId = arrRecord[0].signSummaryId
remark = this.data.remark
picRemark = this.data.picRemark
......
pages/add_record/index.wxml
View file @ e39b4613
<!-- pages/add_record/index.wxml -->
<import src='/template/operate_btn/index.wxml'></import>
<view class='kg-separater ' style='height:2rpx;'></view>
<view class="segmentedControl">
<!-- 循环遍历 -->
......@@ -11,7 +12,7 @@
<view hidden='{{controlIndex != 0}}'>
<!-- 滑动区域 -->
<scroll-view style='height:calc(100vh - 50px - 2rpx - 20rpx - 140rpx)' scroll-y='true'>
<template is="section_header" data="{{title:'分类'}}"></template>
<template is="section_header" data="{{title:'分类',rightTitle:!hidePhoto ? '清除' : ''}}"></template>
<!-- 分类选项 -->
<view class="category">
<view wx:for="{{categorys}}" wx:key="{{item}}">
......@@ -24,7 +25,7 @@
<!-- 数量 -->
<view style='margin:20rpx'>
<view wx:for="{{eatRecord}}" wx:for-index="dietIndex" wx:key="{{item.signSummaryId}}">
<view wx:for="{{item.recordItems}}" wx:for-item="r" wx:key="{{item.id}}">
<view wx:for="{{item.recordItems}}" wx:for-item="r" wx:key="{{item.id}}">
<view class='kg-quantity-cell'>
<template is='quantity_cell' data="{{title:item.recordStudentName,type:r.cellType,unit:r.cellUnit, options: r.cellOptions, selectOptionIndex:r.optionIndex, cellIndex:dietIndex, inputValue:r.value}}"></template>
</view>
......@@ -35,7 +36,8 @@
<view wx:if="{{!hidePhoto}}">
<textarea placeholder=' 请输入您要备注的信息...' class='add_remark' value='{{remark}}' bindinput='remarkInput'></textarea>
<view class='kg-separater'></view>
<template is="section_header" data="{{title:'今日拍照'}}"></template>
<button class='img_title' open-type='getUserInfo'>今日拍照</button>
<view class='kg-separater ' style='height:2rpx;'></view>
<view class='home-student-picture-item' style='padding-left:20rpx;padding-bottom:40rpx;'>
<!-- 选择的图片 -->
<view wx:for="{{pictureUrl}}" wx:key="{{item}}">
......@@ -63,7 +65,7 @@
<scroll-view style='height:calc(100vh - 50px - 2rpx - 20rpx - 140rpx)' scroll-y='true'>
<view style='margin:20rpx'>
<view wx:for="{{sleepRecord}}" wx:for-index="dietIndex" wx:key="{{item.signSummaryId}}">
<view wx:for="{{item.recordItems}}" wx:for-item="r" wx:key="{{item.id}}">
<view wx:for="{{item.recordItems}}" wx:for-item="r" wx:key="{{item.id}}">
<view class='kg-quantity-cell'>
<template is='quantity_cell' data="{{title:item.recordStudentName,type:r.cellType,unit:r.cellUnit, options: r.cellOptions, selectOptionIndex:r.optionIndex, cellIndex:dietIndex, inputValue:r.value}}"></template>
</view>
......@@ -73,7 +75,8 @@
<view wx:if="{{!hidePhoto}}">
<textarea placeholder=' 请输入您要备注的信息...' class='add_remark' value='{{remark}}' bindinput='remarkInput'></textarea>
<view class='kg-separater'></view>
<template is="section_header" data="{{title:'今日拍照'}}"></template>
<button class='img_title' open-type='getUserInfo'>今日拍照</button>
<view class='kg-separater ' style='height:2rpx;'></view>
<view class='home-student-picture-item' style='padding-left:20rpx;padding-bottom:40rpx;'>
<!-- 选择的图片 -->
<view wx:for="{{pictureUrl}}" wx:key="{{item}}">
......@@ -97,20 +100,42 @@
<!-- WC -->
<view hidden='{{controlIndex != 2}}'>
<scroll-view style='height:calc(100vh - 50px - 2rpx - 20rpx - 140rpx)' scroll-y='true'>
<template is="section_header" data="{{title:'分类'}}"></template>
<!-- 分类选项 -->
<view class="category">
<view wx:for="{{wcCategorys}}" wx:key="{{item}}">
<view class="eat_category_btn {{typeIndex == index ? 'selected' : ''}}" bindtap='tapType' data-index='{{index}}'>
{{item}}
</view>
</view>
</view>
<view class='kg-separater'></view>
<view style='margin:20rpx'>
<view wx:for="{{wcRecord}}" wx:for-index="dietIndex" wx:key="{{item.signSummaryId}}">
<!-- <view wx:for="{{item.recordItems}}" wx:for-item="r"> -->
<view wx:for="{{item.recordItems}}" wx:for-item="r" wx:key="{{item.id}}">
<view class='kg-quantity-cell'>
<template is='quantity_cell' data="{{title:item.recordStudentName,type:r.cellType,unit:r.cellUnit, options: r.cellOptions, selectOptionIndex:r.optionIndex, cellIndex:dietIndex, inputValue:r.value}}"></template>
</view>
</view>
</view>
</view>
<!-- <view style='margin:20rpx'>
<view wx:for="{{wcRecord}}" wx:for-index="dietIndex" wx:key="{{item.signSummaryId}}">
<view class='kg-quantity-cell'>
<template is='quantity_cell' data="{{title:item.recordStudentName,type:item.cellType,unit:item.cellUnit, options: item.cellOptions, selectOptionIndex:item.optionIndex, cellIndex:dietIndex, inputValue:item.value}}"></template>
<text class='kg-text-normal-gray' style='margin-top:20rpx;color: black;' space="ensp">{{item.wcString}}</text>
<!-- </view> -->
</view>
</view>
</view>
</view> -->
<view wx:if="{{!hidePhoto}}">
<textarea placeholder=' 请输入您要备注的信息...' class='add_remark' value='{{remark}}' bindinput='remarkInput'></textarea>
<view class='kg-separater'></view>
<template is="section_header" data="{{title:'今日拍照'}}"></template>
<button class='img_title' open-type='getUserInfo'>今日拍照</button>
<view class='kg-separater ' style='height:2rpx;'></view>
<view class='home-student-picture-item' style='padding-left:20rpx;padding-bottom:40rpx;'>
<!-- 选择的图片 -->
<view wx:for="{{pictureUrl}}" wx:key="{{item}}">
......
pages/add_record/index.wxss
View file @ e39b4613
......@@ -94,5 +94,14 @@
margin:20rpx 16rpx;
background-color: #f1f1f1;
border-radius: 5px;
}
.img_title {
margin-left: 20rpx;
margin-top: 20rpx;
margin-bottom: 20rpx;
background-color: #f9aa76;
color: white;
font-size: 14px;
width: calc((100vw - 20px) / 3 - 1px);
}
pages/home/parents/index.wxml
View file @ e39b4613
......@@ -4,10 +4,14 @@
<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>
<view class='home-header-roll-call' bindtap='changePwdTap'>
<image class='roll-call-image' src='{{rightIcon}}'></image>
<view class='roll-call-title'>修改密码</view>
<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'>
<image class='roll-call-image' src='{{rightIcon}}'></image>
<view class='roll-call-title' style='margin-top:20rpx;'>修改密码</view>
</view>
</view>
</view>
<view class='kg-separater'></view>
......@@ -21,7 +25,7 @@
<view class='kg-quantity-cell timeline-content'>
<view class='kg-flex-row' style='margin-bottom:20rpx;'>
<text class='kg-text-title'>{{item.recordDate}}</text>
<text class='kg-text-normal-gray'>{{item.teacher ? item.teacher.realName : ""}}记录</text>
<text class='kg-text-normal-gray'>{{item.teacher ? item.teacher.name : ""}}记录</text>
</view>
......@@ -35,12 +39,12 @@
<text class='kg-text-normal-gray'>{{dietItem.z_eatState}}</text>
</view>
</view>
<!-- 睡觉 -->
<view wx:for="{{item.sleepRecord}}" wx:for-item="sleepItem" wx:for-index="sleepIndex">
<view wx:if="{{sleepIndex == 0}}">
<view class='kg-separater' style='height:2rpx;margin-left:80rpx;margin-right:0rpx;'></view>
<view class='kg-separater' style='height:2rpx;margin-left:80rpx;margin-right:0rpx;'></view>
<template is='imgTextView' data="{{img:'sleep',text:'睡觉'}}"> </template>
</view>
<view class='kg-flex-row timeline-content-detail'>
......@@ -53,7 +57,7 @@
<!-- wc -->
<view wx:for="{{item.wcRecord}}" wx:for-item="wcItem" wx:for-index="wcIndex">
<view wx:if="{{wcIndex == 0}}">
<view class='kg-separater' style='height:2rpx;margin-left:80rpx;margin-right:0rpx;'></view>
<view class='kg-separater' style='height:2rpx;margin-left:80rpx;margin-right:0rpx;'></view>
<template is='imgTextView' data="{{img:'wc',text:'WC'}}"> </template>
</view>
<view class='kg-flex-row timeline-content-detail'>
......@@ -61,15 +65,17 @@
<text class='kg-text-normal-gray'>{{wcItem.value}}次</text>
</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">
<image src='{{picItem}}' class='home-student-picture' catchtap='previewPic' data-index='{{index}}' data-picIndex='{{picIndex}}' mode='aspectFill'></image>
<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/parents/index.wxss
View file @ e39b4613
/* 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); */
}
.top_logo{
/* position:fixed;
top: 0rpx;
right: 32rpx; */
height:55rpx;
width: 104rpx;
}
.timeline-line-container {
......
pages/home/reviewer/index.js
View file @ e39b4613
......@@ -52,6 +52,8 @@ Page({
for (var i = 0; i < res.length; i++) {
var item = res[i]
item.signDate = item.signDate.substr(0, 10)
let paymentType = app.globalData.studentPaymentTypes[item.studentPaymentType]
item.signStudentName = item.signStudentName + ' (' + paymentType + ')'
//图片
var arrPic = []
let arrIds = []
......@@ -87,7 +89,8 @@ Page({
teacherId: app.globalData.login.user.id,
classList: app.globalData.login.classes,
reviewerName: app.globalData.login.user.name,
userIcon: app.globalData.login.wxaUser.avatarUrl
userIcon: app.globalData.login.wxaUser.avatarUrl,
kindergarten: app.globalData.login.preschoolName
})
......
pages/home/sign/index.js
View file @ e39b4613
......@@ -9,9 +9,7 @@ Page({
*/
data: {
selectTags: {},
classId: "",
studentPaymentTypes: { 'nursery_all': '全托', 'nursery_morning': '上午托', 'nursery_afternoon': '下午托',}
classId: ""
},
/**
......@@ -23,7 +21,7 @@ Page({
console.log(res)
for (var i = 0; i < res.length; i++) {
var record = res[i]
let paymentType = this.data.studentPaymentTypes[record.studentPaymentType]
let paymentType = app.globalData.studentPaymentTypes[record.studentPaymentType]
record.name = record.name + ' (' + paymentType + ')'
//存在签到id,说明已经签到过,自动打勾
if (record.signSummaryId) {
......
pages/home/teacher/index.js
View file @ e39b4613
......@@ -109,6 +109,8 @@ Page({
for (var i = 0; i < res.length; i++) {
var item = res[i]
item.signDate = item.signDate.substr(0, 10)
let paymentType = app.globalData.studentPaymentTypes[item.studentPaymentType]
item.signStudentName = item.signStudentName + ' (' + paymentType + ')'
var arrPic = []
let arrIds = []
if (item.picture != null && item.picture != '') {
......
pages/home/teacher/index.wxml
View file @ e39b4613
......@@ -20,7 +20,7 @@
<view class='kg-text-normal-dark'>{{item.signStudentName}}</view>
<template is="sex" data="{{sex:item.signStudentSex == '0' ? 'male' : 'female'}}"></template>
</view>
<template is='imgTextView' data="{{img:'zhaopian',text:item.arrIds.length}}"></template>
<view></view>
</view>
<!-- 图片 -->
......@@ -34,6 +34,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>
</view>
......
pages/login/index.wxml
View file @ e39b4613
<!--pages/login/index.wxml-->
<import src='/template/operate_btn/index.wxml'></import>
<view class='kg-separater' style='height:2rpx;'></view>
<image class='login_logo' src='/src/img/login_logo.png'></image>
<view style='padding:16px;margin-top:50rpx;'>
<view class='kg-text-normal-gray'>手机号</view>
<input placeholder='请输入手机号登录' style='margin:30rpx 0rpx;' bindinput='inputAction' value='{{mobile}}'></input>
......
pages/login/index.wxss
View file @ e39b4613
/* pages/login/index.wxss */
\ No newline at end of file
/* pages/login/index.wxss */
.login_logo{
height: 126rpx;
width: 240rpx;
margin-left: calc((100vw - 240rpx)/2);
margin-top: 50rpx;
}
\ No newline at end of file
pages/reset_psw/index.js
View file @ e39b4613
......@@ -30,7 +30,7 @@ Page({
operateTap: function(e) {
req.changePassword(this.data.oldPSW, this.data.psw).then(res=>{
wx.showToast({
title: '修改成功, 下次登录请使用新密码',
title: '修改成功~',
duration: 1500
})
setTimeout(() => {
......
pages/review_student/index.js
View file @ e39b4613
// pages/review_student/index.js
const request = require('../../api/teacher.js')
const utils = require('../../utils/util.js')
const app = getApp()
Page({
......@@ -11,20 +12,8 @@ Page({
signSummaryId: "",
recordDetail: {},
showAuditBtn: true,
recordTypes: {
"diet_morning": '早餐',
"diet_afternoon": "午餐",
"diet_milk": "牛奶",
"diet_evening": "晚餐",
"diet_morning_more": "上午加餐",
"diet_afternoon_more": "下午加餐",
"diet_water": "喝水",
"diet_milk": "饮用牛奶",
"sleep_time": "睡觉时间",
"wc_pee": "小便",
"wc_poo": "便",
"wc_diaper": "换尿布"
},
/* 所有的小分类字典 */
recordTypes: app.globalData.recordTypes,
eatStates: {
"less": "少",
"normal": "正常",
......@@ -36,7 +25,8 @@ Page({
picRemark: '',
studentName: '',
kindergarten: '',
sex: ''
sex: '',
pictureIds: []
},
//加载详情
......@@ -113,7 +103,9 @@ Page({
previewPic: function (e) {
var current = this.data.arrPic[e.target.dataset.picIndex]
let index = e.target.dataset.picindex
console.log(e)
var current = this.data.arrPic[index]
wx.previewImage({
current: current,
urls: this.data.arrPic
......@@ -121,6 +113,14 @@ Page({
},
tapCell: function (e) {
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 : ''),
})
},
operateTap: function(e) {
this.auditSignSummary(this.data.signSummaryId)
},
......
pages/review_student/index.wxml
View file @ e39b4613
......@@ -9,7 +9,7 @@
<view class='kg-separater'></view>
<scroll-view style='height:calc(100vh - 200rpx - 140rpx)' scroll-y='true'>
<view class='kg-quantity-cell timeline-content' style='margin-left:20rpx;margin-bottom:30rpx;'>
<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>
<text class='kg-text-normal-gray'>{{recordDetail.teacher ? recordDetail.teacher.name : ""}}记录</text>
......@@ -55,7 +55,7 @@
<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">
<image src='{{picItem}}' class='home-student-picture' catchtap='previewPic' data-index='{{index}}' data-picIndex='{{picIndex}}' mode='aspectFill'></image>
<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>
......
template/operate_btn/index.wxml
View file @ e39b4613
......@@ -12,19 +12,22 @@
<!--通用的分区标题-->
<template name='section_header'>
<view class='kg-section-header'>
<view style='width:10rpx; height:33rpx;background-color:#f9aa76; margin-left:20rpx'></view>
<view class='kg-text-normal-gray' style='margin-left:16rpx'>{{title}}</view>
<view class='kg-flex-row'>
<view style='width:10rpx; height:33rpx;background-color:#f9aa76; margin-left:20rpx'></view>
<view class='kg-text-normal-gray' style='margin-left:16rpx'>{{title}}</view>
</view>
<view style='margin-right:20rpx;font-size:30rpx;color:#1e9bfa;' bindtap='headerBtnTap'>{{rightTitle}}</view>
</view>
</template>
<!-- 添加记录的cell -->
<template name='quantity_cell'>
<view class='kg-flex-row '>
<view class='g-text-normal-dark'>{{title}}</view>
<view class='kg-text-normal-dark'>{{title}}</view>
<view wx:if="{{type == 'input'}}">
<!-- 输入型cell -->
<view class='kg-flex-row'>
<input class='kg-border' style='width:140rpx;margin-right:10rpx;' bindinput="bindKeyInput" data-cellIndex='{{cellIndex}}' value="{{inputValue}}" type='number'></input>
<input class='kg-border' style='width:140rpx;margin-right:10rpx;' bindinput="bindKeyInput" data-cellIndex='{{cellIndex}}' value="{{inputValue}}" type='number'></input>
<view class='kg-text-normal-gray'>{{unit}}</view>
</view>
</view>
......@@ -32,7 +35,7 @@
<view wx:if="{{type == 'select'}}">
<!-- 选择型cell -->
<view class='kg-flex-row'>
<view wx:for="{{options}}" wx:for-index="optionIndex" wx:key="{{item}}">
<view wx:for="{{options}}" wx:for-index="optionIndex" wx:key="{{item}}">
<view class="eat_category_btn {{selectOptionIndex == optionIndex ? 'selected' : ''}}" bindtap='quantityCellTap' data-optionIndex='{{optionIndex}}' data-cellIndex='{{cellIndex}}' style='width: 120rpx;margin-right: 0rpx;margin-bottom: 0rpx;margin-left:20rpx;'>{{item}}</view>
</view>
</view>
......
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