no message

src/common/css/common.css

@@ -1,176 +1,179 @@
-.u-f {
-	display: flex;
-}
-
-.u-f-a {
-	display: flex;
-	align-items: center;
-}
-
-.u-f-ajc {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.u-f-ajs {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-
-.u-f-adc {
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-}
-
-.blue-card-border {
-	border: 4px solid #E2F0FC;
-	border-radius: 16upx;
-	background: #FFFFFF;
-}
-
-.maxWidth {
-	width: 100%
-}
-@font-face {
-  font-family: 'iconfont';  /* Project id 3376246 */
-  src: url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.eot?t=1651739388185'); /* IE9 */
-  src: url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.eot?t=1651739388185#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.woff2?t=1651739388185') format('woff2'),
-       url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.woff?t=1651739388185') format('woff'),
-       url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.ttf?t=1651739388185') format('truetype'),
-       url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.svg?t=1651739388185#iconfont') format('svg');
-}
-.iconfont {
-	font-family: "iconfont" !important;
-	font-size: 13px;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-webkit-text-stroke-width: 0.2px;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.lh-30 {
-	line-height: 30px;
-}
-
-.lh-40 {
-	line-height: 40px;
-}
-
-.border-bottom {
-	border-bottom: 1px solid #ccc;
-}
-
-.item-border {
-	border: 1px dashed #333;
-}
-
-image {
-	object-fit: contain;
-}
-
-.padding-bottom-200 {
-	padding-bottom: 200rpx;
-}
-
-.cu-form-input {
-	flex: 1;
-	height: 100%;
-	line-height: 100%;
-}
-
-.top-bg-view {
-	width: 100%;
-	height: 375rpx;
-}
-
-.box-shadow {
-	box-shadow: 0px 0px 8px 2px rgba(0, 0, 0, 0.08);
-}
-
-.content-bg {
-	position: absolute;
-	width: 100%;
-	height: 100%;
-	z-index: -1;
-}
-
-.scale-radio {
-	transform: scale(0.6);
-}
-.text-ellipsis{
-  text-overflow: ellipsis;
-  overflow: hidden;
-  white-space: nowrap;
-}
-.page{
-	width:100%;
-	background: #ededed;
-}
-input{
-	padding:0 30rpx;
-}
-.text-student{
-	color:#5fd0e4;
-}
-.bg-student{
-	background-color:#5fd0e4;
-}
-.text-sort{
-	color: #FF6600;
-}
-.point{
-	background: #62d5e4;
-	margin-top: -5px;
-	width: 8px;
-	height: 5px;
-	border-radius: 999em;
-}
-.header{
-	position: fixed;
-	z-index:999;
-  left: 0;
-  right: 0;
-  top: 0;
-	padding:20rpx;
-	background-color:#fff;
-}
-.header-title{
-	display:flex;
-	justify-content: space-between;
-	align-items: center;
-	margin-bottom:10px;
-	font-size:22px;
-	color:#000;
-	font-weight:bold;
-}
-.header-title-main{
-	text-align: center;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.cu-btn.disabled{
-	opacity: .7;
-}
-.avatar{
-	width:75px;
-	height:75px;
-	border-radius:50%;
-}
-.avatar.lg{
-	width:128rpx;
-	height:128rpx;
-}
-.avatar.md{
-	width:96rpx;
-	height:96rpx;
-}
-.avatar.left{
-	position:absolute;
-	left:30rpx;
-}
+.u-f {
+	display: flex;
+}
+
+.u-f-a {
+	display: flex;
+	align-items: center;
+}
+
+.u-f-ajc {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.u-f-ajs {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.u-f-adc {
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+}
+
+.blue-card-border {
+	border: 4px solid #E2F0FC;
+	border-radius: 16upx;
+	background: #FFFFFF;
+}
+
+.maxWidth {
+	width: 100%
+}
+@font-face {
+  font-family: 'iconfont';  /* Project id 3376246 */
+  src: url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.eot?t=1651739388185'); /* IE9 */
+  src: url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.eot?t=1651739388185#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.woff2?t=1651739388185') format('woff2'),
+       url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.woff?t=1651739388185') format('woff'),
+       url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.ttf?t=1651739388185') format('truetype'),
+       url('//at.alicdn.com/t/font_3376246_nwm42j68ejq.svg?t=1651739388185#iconfont') format('svg');
+}
+.iconfont {
+	font-family: "iconfont" !important;
+	font-size: 13px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: 0.2px;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.lh-30 {
+	line-height: 30px;
+}
+
+.lh-40 {
+	line-height: 40px;
+}
+
+.border-bottom {
+	border-bottom: 1px solid #ccc;
+}
+
+.item-border {
+	border: 1px dashed #333;
+}
+
+image {
+	object-fit: contain;
+}
+
+.padding-bottom-200 {
+	padding-bottom: 200rpx;
+}
+
+.cu-form-input {
+	flex: 1;
+	height: 100%;
+	line-height: 100%;
+}
+
+.top-bg-view {
+	width: 100%;
+	height: 375rpx;
+}
+
+.box-shadow {
+	box-shadow: 0px 0px 8px 2px rgba(0, 0, 0, 0.08);
+}
+
+.content-bg {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	z-index: -1;
+}
+
+.scale-radio {
+	transform: scale(0.6);
+}
+.text-ellipsis{
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.page{
+	width:100%;
+	background: #ededed;
+}
+input{
+	padding:0 30rpx;
+}
+.text-student{
+	color:#5fd0e4;
+}
+.bg-student{
+	background-color:#5fd0e4;
+}
+.bg-normal{
+	background-color: #4DB8E4;
+}
+.text-sort{
+	color: #FF6600;
+}
+.point{
+	background: #62d5e4;
+	margin-top: -5px;
+	width: 8px;
+	height: 5px;
+	border-radius: 999em;
+}
+.header{
+	position: fixed;
+	z-index:999;
+  left: 0;
+  right: 0;
+  top: 0;
+	padding:20rpx;
+	background-color:#fff;
+}
+.header-title{
+	display:flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom:10px;
+	font-size:22px;
+	color:#000;
+	font-weight:bold;
+}
+.header-title-main{
+	text-align: center;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+}
+.cu-btn.disabled{
+	opacity: .7;
+}
+.avatar{
+	width:75px;
+	height:75px;
+	border-radius:50%;
+}
+.avatar.lg{
+	width:128rpx;
+	height:128rpx;
+}
+.avatar.md{
+	width:96rpx;
+	height:96rpx;
+}
+.avatar.left{
+	position:absolute;
+	left:30rpx;
+}

src/common/utils/index.js

@@ -1,190 +1,201 @@
-/**
- * This is just a simple version of deep copy
- * Has a lot of edge cases bug
- * If you want to use a perfect deep copy, use lodash's _.cloneDeep
- * @param {Object} source 源数据
- * @returns {Object} targetObj 复制后的数据
- */
-export function deepClone (source) {
-  if (!source && typeof source !== 'object') {
-    throw new Error('error arguments', 'deepClone')
-  }
-  const targetObj = source.constructor === Array ? [] : {}
-  Object.keys(source).forEach(keys => {
-    if (source[keys] && typeof source[keys] === 'object') {
-      targetObj[keys] = deepClone(source[keys])
-    } else {
-      targetObj[keys] = source[keys]
-    }
-  })
-  return targetObj
-}
-
-/**
- * 判断val是否是空对象
- * @param {*} val js变量
- * @returns {Boolean} 返回boolean值
- */
-export const isEmpty = function (val) {
-  // null or undefined
-  if (val === null) return true
-
-  if (typeof val === 'boolean') return false
-
-  if (typeof val === 'number') return !val
-
-  if (val instanceof Error) return val.message === ''
-
-  switch (Object.prototype.toString.call(val)) {
-    // String or Array
-    case '[object String]':
-    case '[object Array]':
-      return !val.length
-
-    // Map or Set or File
-    case '[object File]':
-    case '[object Map]':
-    case '[object Set]': {
-      return !val.size
-    }
-    // Plain Object
-    case '[object Object]': {
-      return !Object.keys(val).length
-    }
-  }
-
-  return false
-}
-
-/**
- * 验证手机号
- * @param {*} phone 手机号
- * @returns {Boolean} boolean值
- */
-export function validatePhone (phone) {
-  const reg = /^[1]([3-9])[0-9]{9}$/
-  return reg.test(phone)
-}
-
-/**
- * 获取URL中的参数
- * @param {String} url
- * @returns {String} 要获取的参数name
- */
-export function getQueryString (url, name) {
-  const reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
-  const r = url.substr(1).match(reg)
-  if (r !== null) {
-    return r[2]
-  }
-  return null
-}
-
-/**
- * 根据对象的某个key排序
- * @param {*} 对象
- */
-export function sortObject (property) {
-  return function (obj1, obj2) {
-    const value1 = obj1[property]
-    const value2 = obj2[property]
-    return value1 - value2
-  }
-}
-/**
- * 根据对象的某个key倒序排序
- * @param {*} 对象
- */
-export function sortDescObject (property) {
-  return function (obj1, obj2) {
-    const value1 = obj1[property]
-    const value2 = obj2[property]
-    return value2 - value1
-  }
-}
-
-/**
- * 判断商标是否是无效的
- * @param {String} 商标状态
- * @returns {Boolean} boolean值
- */
-export function tmIsIneffective (status) {
-  return status === '商标无效'
-}
-
-/**
- *将json对象转化为url要拼接的字符串
- */
-export function encodeParam (link, params) {
-  let url = ''
-  if (params && Object.keys(params).length > 0) {
-    for (const k in params) {
-      const value = params[k] !== undefined ? params[k] : ''
-      url += '&' + k + '=' + encodeURIComponent(value)
-    }
-    url = url ? url.substring(1) : ''
-    if (params) {
-      link += (link.indexOf('?') < 0 && params ? '?' : '&') + url
-    }
-  }
-  return link
-}
-/**
- * 计算时间
- * @param {*} time
- * @param {*} cFormat
- */
-export function parseTime(time, cFormat) {
-  if (arguments.length === 0) {
-    return null
-  }
-  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
-  let date
-  if (typeof time === 'object') {
-    date = time
-  } else {
-    if (('' + time).length === 10) time = parseInt(time) * 1000
-    date = new Date(time)
-  }
-  const formatObj = {
-    y: date.getFullYear(),
-    m: date.getMonth() + 1,
-    d: date.getDate(),
-    h: date.getHours(),
-    i: date.getMinutes(),
-    s: date.getSeconds(),
-    a: date.getDay()
-  }
-  const timeStr = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key]
-    if (key === 'a') return ['一', '二', '三', '四', '五', '六', '日'][value - 1]
-    if (result.length > 0 && value < 10) {
-      value = '0' + value
-    }
-    return value || 0
-  })
-  return timeStr
-}
-// 获取任意时间
-export function getDate(date, AddDayCount = 0) {
-  if (!date) {
-    date = new Date()
-  }
-  if (typeof date !== 'object') {
-    date = date.replace(/-/g, '/')
-  }
-  const dd = new Date(date)
-
-  dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
-
-  const y = dd.getFullYear()
-  const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
-  const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
-  return {
-    fullDate: y + '-' + m + '-' + d,
-    year: y,
-    month: m,
-    date: d,
-    day: dd.getDay()
-  }
-}
+/**
+ * This is just a simple version of deep copy
+ * Has a lot of edge cases bug
+ * If you want to use a perfect deep copy, use lodash's _.cloneDeep
+ * @param {Object} source 源数据
+ * @returns {Object} targetObj 复制后的数据
+ */
+export function deepClone (source) {
+  if (!source && typeof source !== 'object') {
+    throw new Error('error arguments', 'deepClone')
+  }
+  const targetObj = source.constructor === Array ? [] : {}
+  Object.keys(source).forEach(keys => {
+    if (source[keys] && typeof source[keys] === 'object') {
+      targetObj[keys] = deepClone(source[keys])
+    } else {
+      targetObj[keys] = source[keys]
+    }
+  })
+  return targetObj
+}
+
+/**
+ * 判断val是否是空对象
+ * @param {*} val js变量
+ * @returns {Boolean} 返回boolean值
+ */
+export const isEmpty = function (val) {
+  // null or undefined
+  if (val === null) return true
+
+  if (typeof val === 'boolean') return false
+
+  if (typeof val === 'number') return !val
+
+  if (val instanceof Error) return val.message === ''
+
+  switch (Object.prototype.toString.call(val)) {
+    // String or Array
+    case '[object String]':
+    case '[object Array]':
+      return !val.length
+
+    // Map or Set or File
+    case '[object File]':
+    case '[object Map]':
+    case '[object Set]': {
+      return !val.size
+    }
+    // Plain Object
+    case '[object Object]': {
+      return !Object.keys(val).length
+    }
+  }
+
+  return false
+}
+
+/**
+ * 验证手机号
+ * @param {*} phone 手机号
+ * @returns {Boolean} boolean值
+ */
+export function validatePhone (phone) {
+  const reg = /^[1]([3-9])[0-9]{9}$/
+  return reg.test(phone)
+}
+
+/**
+ * 获取URL中的参数
+ * @param {String} url
+ * @returns {String} 要获取的参数name
+ */
+export function getQueryString (url, name) {
+  const reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
+  const r = url.substr(1).match(reg)
+  if (r !== null) {
+    return r[2]
+  }
+  return null
+}
+
+/**
+ * 根据对象的某个key排序
+ * @param {*} 对象
+ */
+export function sortObject (property) {
+  return function (obj1, obj2) {
+    const value1 = obj1[property]
+    const value2 = obj2[property]
+    return value1 - value2
+  }
+}
+/**
+ * 根据对象的某个key倒序排序
+ * @param {*} 对象
+ */
+export function sortDescObject (property) {
+  return function (obj1, obj2) {
+    const value1 = obj1[property]
+    const value2 = obj2[property]
+    return value2 - value1
+  }
+}
+
+/**
+ * 判断商标是否是无效的
+ * @param {String} 商标状态
+ * @returns {Boolean} boolean值
+ */
+export function tmIsIneffective (status) {
+  return status === '商标无效'
+}
+
+/**
+ *将json对象转化为url要拼接的字符串
+ */
+export function encodeParam (link, params) {
+  let url = ''
+  if (params && Object.keys(params).length > 0) {
+    for (const k in params) {
+      const value = params[k] !== undefined ? params[k] : ''
+      url += '&' + k + '=' + encodeURIComponent(value)
+    }
+    url = url ? url.substring(1) : ''
+    if (params) {
+      link += (link.indexOf('?') < 0 && params ? '?' : '&') + url
+    }
+  }
+  return link
+}
+/**
+ * 计算时间
+ * @param {*} time
+ * @param {*} cFormat
+ */
+export function parseTime(time, cFormat) {
+  if (arguments.length === 0) {
+    return null
+  }
+  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if (('' + time).length === 10) time = parseInt(time) * 1000
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const timeStr = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    if (key === 'a') return ['一', '二', '三', '四', '五', '六', '日'][value - 1]
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return timeStr
+}
+// 获取任意时间
+export function getDate(date, AddDayCount = 0) {
+  if (!date) {
+    date = new Date()
+  }
+  if (typeof date !== 'object') {
+    date = date.replace(/-/g, '/')
+  }
+  const dd = new Date(date)
+
+  dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+
+  const y = dd.getFullYear()
+  const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+  const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+  return {
+    fullDate: y + '-' + m + '-' + d,
+    fullMonth: y + '-' + m,
+    year: y,
+    month: m,
+    date: d,
+    day: dd.getDay()
+  }
+}
+// 检测文件类型
+export function checkTypes(source, type) {
+  const types = {
+    video: ['m3u8', 'ts', 'mp4', '3gp', 'asf', 'wmv', 'avi', 'mkv', 'rmvb', 'flv', 'mp3', 'ogg', 'amr'],
+    imgs: ['png', 'jpg', 'jpeg']
+  }
+  if (!types[type]) return false// 不存在检测类型
+  const arr = source.split('.')
+  return types[type].includes(arr[arr.length - 1])
+}

src/components/calendar.vue

@@ -0,0 +1,233 @@
+<template>
+<view class='wrap'>
+  <view class='header-cal'>
+    <view  v-for="(item,index) in date" :key="index">{{item}}<view></view>
+    </view>
+  </view>
+  <view class='date-box'>
+    <view v-for="(item,index) in dateArr"  :key="index"   @tap="calendarTap(item,index)">
+      <view class="date-head1" :class="[todayIndex===index ? 'operationInProgress' : (showBusiness?item.styleClass:''), {'showOverdue':item.showOverdue}]">
+        <view >{{item.dateNum}}</view>
+      </view>
+    </view>
+
+  </view>
+</view>
+
+</template>
+
+<script>
+export default {
+  props: {
+    year: {
+      type: Number,
+      value: 0
+    },
+    month: {
+      type: Number,
+      value: 0
+    },
+    showBusiness: { // 是否显示业务标记
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      date: ['日', '一', '二', '三', '四', '五', '六'],
+      dateArr: [],
+      todayIndex: -1// 操作索引,默认指向当天
+    }
+  },
+  onLoad(options) {
+  },
+  methods: {
+    calendarTap(item, index) {
+      this.todayIndex = index
+      this.$emit('changeDate', item.date)
+    },
+    selCalendar(year, month) {
+      this.dateInit(year, month - 1)
+    },
+    setAttendance(attendance) { // 设置日历考勤
+      const start = this.dateArr.findIndex(item => item.dateNum)
+      attendance.map((item, index) => {
+        if (item !== 'stateless') {
+          const pos = start + index
+          const dateObj = this.dateArr[pos]
+          this.$set(dateObj, 'styleClass', item)
+          this.$set(this.dateArr, pos, dateObj)
+        }
+      })
+    },
+    dateInit(setYear, setMonth) {
+      // 1.获取当前时间
+      var date = new Date()
+      var currentYear = date.getFullYear() // 获取完整的年份(4位)
+      var currentMonth = date.getMonth() + 1 // 获取当前月份(0-11,0代表1月)
+      var currentDate = date.getDate() // 获取当前日(1-31)
+      var currentTime = '' + currentYear + (currentMonth > 9 ? currentMonth : '0' + currentMonth) + (currentDate > 9 ? currentDate : '0' + currentDate)
+      // 全部时间的月份都是按0~11基准，显示月份才+1
+      const dateArr = [] // 需要遍历的日历数组数据
+      let arrLen = 0 // dateArr的数组长度
+      const now = setYear ? new Date(setYear, setMonth) : new Date()
+      const year = setYear || now.getFullYear()
+      let nextYear = 0
+      const month = setMonth || now.getMonth() // 没有+1方便后面计算当月总天数
+      const nextMonth = (month + 1) > 11 ? 1 : (month + 1)
+      const startWeek = new Date(year + '/' + (month + 1) + '/' + 1).getDay() // 目标月1号对应的星期
+      let dayNums = new Date(year, nextMonth, 0).getDate() // 获取目标月有多少天
+      let obj = {}
+      let num = 0
+      let showOverdue = 0
+
+      if (month + 1 > 11) {
+        nextYear = year + 1
+        dayNums = new Date(nextYear, nextMonth, 0).getDate()
+      }
+      arrLen = startWeek + dayNums // 渲染日期格子数量包括空格子
+      for (let i = 0; i < arrLen; i++) {
+        if (i >= startWeek) {
+          num = i - startWeek + 1
+          // 计算 -- 需要渲染的过期时间
+          const renderingTime = '' + year + (month + 1 > 9 ? month + 1 : '0' + (month + 1)) + (num > 9 ? num : '0' + num)
+          if (Number(currentTime) > Number(renderingTime)) {
+            showOverdue = 1 // 过期
+          } else {
+            showOverdue = 0 // 有效
+          }
+          obj = {
+            year: year,
+            month: month + 1,
+            dateNum: num,
+            date: renderingTime,
+            showOverdue: showOverdue
+          }
+        } else {
+          obj = {}
+        }
+        dateArr[i] = obj
+      }
+      this.dateArr = dateArr
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.date-show{
+  position: relative;
+  width: 250rpx;
+  font-family: PingFang-SC-Regular;
+  font-size: 40rpx;
+  color: #282828;
+  text-align: center;
+  margin: 59rpx auto 10rpx;
+}
+.lt-arrow,.rt-arrow{
+  position: absolute;
+  top: 1rpx;
+  width: 60rpx;
+  height: 60rpx;
+}
+.lt-arrow image,.rt-arrow image{
+  width: 14rpx;
+  height: 26rpx;
+}
+.lt-arrow{
+  left: -110rpx;
+  transform: rotate(180deg);
+}
+.rt-arrow{
+  right: -100rpx;
+}
+.header-cal{
+  font-size: 0;
+  /* padding: 0 24rpx;  */
+}
+.header-cal>view{
+  display: inline-block;
+  width: 14.285%;
+  color: #5fd0e4;
+  font-size: 30rpx;
+  text-align: center;
+  /* border-bottom: 1px solid #D0D0D0;  */
+  padding: 39rpx 0;
+}
+.weekMark{
+  position: relative;
+}
+.weekMark view{
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  border-bottom: 1px solid #22A7F6;
+}
+.date-box{
+  font-size: 0;
+  padding: 10rpx 0;
+}
+.date-box>view{
+  position: relative;
+  display: inline-block;
+  width: 14.285%;
+  color: #020202;
+  font-size: 40rpx;
+  text-align: center;
+  vertical-align: middle;
+  margin: 15rpx 0;
+}
+.date-head1{
+  height: 60rpx;
+  line-height: 60rpx;
+  font-size: 26rpx;
+  border-radius: 12rpx;
+}
+.date-head2{
+  background: #20BA96;
+  color: #fff;
+  height: 60rpx;
+  line-height: 60rpx;
+  font-size: 26rpx;
+  border-radius: 12rpx;
+}
+.date-weight{
+  font-size: 22rpx;
+  padding: 15rpx 0;
+}
+.nowDay .date-weight{
+  color: #22A7F6;
+}
+/* 过期样式*/
+.showOverdue{
+  color: #5fd0e4;
+}
+/* 正在操作样式*/
+.operationInProgress{
+  background: #20BA96;
+  color: #fff;
+}
+/* 正常样式*/
+.normal{
+  background:  #4DB8E4;
+  color: #fff;
+}
+/* 异常样式*/
+.abnormal{
+  background:  #FF7361;
+  color: #fff;
+}
+.leave{
+	background:#3390F5;
+	color: #fff;
+}
+.late{
+	background:#fbbd08;
+	color: #fff;
+}
+.absenteeism{
+	background:#e54d42;
+	color: #fff;
+}
+</style>

src/pages/class/shoppingCart.vue

@@ -85,7 +85,7 @@ export default {
     get_list() {
       _shopList().then(res => {
         this.list = res.data
-        const carts = this.list.map(item => Number(item.class_attend_id))
+        const carts = this.list.map(item => item.class_attend_id)
         this.$store.dispatch('setCarts', carts)// 刷新购物车
       })
     },
@@ -108,7 +108,7 @@ export default {
     pay(item) {
       const order = JSON.stringify([item])
       let carts = deepClone(this.carts)
-      const index = carts.indexOf(Number(item.class_attend_id))
+      const index = carts.indexOf(item.class_attend_id)
       carts = carts.splice(index, 1)
       if (!this.phone) {
         return this.globalNavigateTo('bindPhone')

src/pages/mine/parents.vue

@@ -1,228 +1,227 @@
-<template>
-	<view class="page">
-		<cu-custom :isBack="true" title="授权接送">
-		</cu-custom>
-		<scroll-view>
-			<view class="cu-card case no-card">
-				<view class="cu-item shadow">
-					<view class="image">
-      			<image src="/static/imgs/mine/img.png" mode="widthFix"></image>
-						 <view class="image-tag">应趣教育 课后百科</view>
-					</view>
-				</view>
-			</view>
-			<view class="cu-card">
-					<view class="cu-item shadhow">
-						  <view class="students-title flex justify-between align-center">
-								 <view class="text-lg">监护人列表</view>
-								 <view class="text-xs text-grey">
-									 <text class="cuIcon-roundaddfill text-cyan margin-left-xl add-icon"
-									 @tap="showModal" data-target="ChooseModal"
-									 ></text>
-								 </view>
-							</view>
-							<view class="cu-list menu-avatar">
-									<view class="cu-item" v-for="parent in parents" :key="parent.id">
-										<image mode="scaleToFill" :src="parent.avatar||defaultAvatar" class="avatar md left"></image>
-										<view class="content">
-											<view>{{parent.username}}</view>
-											<view class="text-gray">{{parent.mobile}}</view>
-										</view>
-									</view>
-							</view>
-					 </view>
-			</view>
-		</scroll-view>
-		<!-- 添加授权人 -->
-    <view class="cu-modal" :class="modalName=='ChooseModal'?'show':''" @tap="hideModal">
-      <view class="cu-dialog bg-student" @tap.stop=''>
-        <view class="cu-bar justify-around">
-          <view class="content modal-title">添加授权人</view>
-        </view>
-        <view class="padding-xl text-left modal-body">
-				  <view>
-            <input type="text"  v-model.trim="params.username" placeholder="请输入授权人姓名" class="student-input text-black text-lg">
-          </view>
-					<view class="margin-top">
-            <input type="text"  v-model.trim="params.mobile"
-						@input="changePhone"
-						 placeholder="请输入授权人手机号" class="student-input text-black text-lg">
-          </view>
-					<view class="margin-top auth-item">
-            <input type="text"  v-model.trim="params.captcha" placeholder="请输入验证码" class="student-input text-black text-lg">
-						 <text class="auth-code text-cyan" :class="{'text-gray':disableSendMsgBtn}" :disabled="disableSendMsgBtn"
-            @tap="getCode">{{sendMsg}}</text>
-          </view>
-					<view class="margin-top">
-						 <button class="student-input text-student text-center" @tap="save">确认授权</button>
-					</view>
-        </view>
-        <view class="cu-bar modal-footer">
-          <view class="action"></view>
-        </view>
-      </view>
-    </view>
-	</view>
-</template>
-
-<script>
-import { _getPickup, _getCode, _addPickup } from '@/api/auth'
-import validate from '@/common/utils/ys-validate'
-export default {
-  data() {
-    return {
-      modalName: null,
-      parents: [],
-      params: {
-        username: '',
-        mobile: '',
-        captcha: ''
-      },
-      rules: [
-        { name: 'username', required: true, type: 'required', errmsg: '请输入授权人姓名' },
-        { name: 'mobile', required: true, type: 'phone', errmsg: '请输入正确手机号' },
-        { name: 'captcha', required: true, type: 'number', errmsg: '请输入正确的验证码' }
-      ],
-      sendTime: 60,
-      disableSendMsgBtn: true,
-      sendMsg: '获取验证码',
-      defaultAvatar: 'http://parent.kehoubaike.com/static/img/7f4e775d2e04234d1e1994b13146f6b.e5c47f3.png'
-    }
-  },
-  onLoad(options) {
-    this.get_list()
-  },
-  methods: {
-    showModal(e) {
-      this.modalName = e.currentTarget.dataset.target
-    },
-    hideModal(e) {
-      this.modalName = null
-    },
-    save() {
-      const validRes = validate.validate(this.params, this.rules)
-      if (!validRes.isOk) {
-        uni.showToast({
-          icon: 'none',
-          title: validRes.errmsg
-        })
-        return false
-      }
-      _addPickup(this.params).then(res => {
-        this.hideModal()
-        this.get_list()
-      })
-    },
-    changePhone(e) {
-      if (/^[1]([3-9])[0-9]{9}$/.test(e.detail.value)) {
-        this.disableSendMsgBtn = false
-      } else {
-        this.disableSendMsgBtn = true
-      }
-    },
-    getCode() {
-      console.log(111)
-      if (!this.disableSendMsgBtn) {
-        this.leftTime = this.sendTime
-        this.timing(this.leftTime)
-        _getCode({ phone: this.params.mobile }).then(res => {
-          uni.showToast({
-            title: '验证码发送成功! 请注意查收！',
-            duration: 3000
-          })
-        })
-      }
-    },
-    timing () {
-      this.disableSendMsgBtn = true
-      const temSendMsgText = this.sendMsg
-      this.sendMsg = this.leftTime + '秒后重试'
-      this.timeInterval = setInterval(() => {
-        this.leftTime--
-        this.sendMsg = this.leftTime + '秒后重试'
-        if (this.leftTime <= 0) {
-          this.sendMsg = temSendMsgText
-          clearInterval(this.timeInterval)
-          if (/^[1]([3-9])[0-9]{9}$/.test(this.form.phone)) {
-            this.disableSendMsgBtn = false
-          }
-        }
-      }, 1000)
-    },
-    get_list() {
-      _getPickup().then(res => {
-        this.parents = res.data.pickup_data
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.page{
-	height:100vh;
-}
-.image{
-	padding-bottom:20px;
-}
-.image-tag{
-	position:absolute;
-	top:10px;
-	left:10px;
-	font-size:24px;
-	font-weight:bold;
-	color: #6d4f26;
-}
-.students-title{
-	padding:30rpx;
-}
-.add-icon{
-	display:inline-block;
-	width:40px;
-	height:40px;
-	line-height:40px;
-	text-align:center;
-	font-size:22px;
-}
-.student-input{
-	height:40px;
-	line-height:40px;
-	border-radius:20px;
-	background-color:#fff;
-}
-.radius-student{
-	border-radius:20rpx;
-}
-.cu-inner{
-	margin:10rpx;
-	display:flex;
-	align-items:center;
-	width:100%;
-}
-.cu-inner.checked{
-    background: #5fd0e4;
-    color: #fff;
-    border-radius: 20rpx;
-}
-.cu-dialog{
-	width:90%;
-}
-.modal-title{
-    font-weight: bold;
-    color: #516029;
-    font-size: 20px;
-}
-.font-check{
-	font-size:22px;
-}
-.auth-item{
-	position:relative;
-}
-.auth-code{
-	position:absolute;
-	z-index:99;
-	top:10px;
-	right:20rpx;
-	font-size:14px;
-}
-</style>
+<template>
+	<view class="page">
+		<cu-custom :isBack="true" title="授权接送">
+		</cu-custom>
+		<scroll-view>
+			<view class="cu-card case no-card">
+				<view class="cu-item shadow">
+					<view class="image">
+      			<image src="/static/imgs/mine/img.png" mode="widthFix"></image>
+						 <view class="image-tag">应趣教育 课后百科</view>
+					</view>
+				</view>
+			</view>
+			<view class="cu-card">
+					<view class="cu-item shadhow">
+						  <view class="students-title flex justify-between align-center">
+								 <view class="text-lg">监护人列表</view>
+								 <view class="text-xs text-grey">
+									 <text class="cuIcon-roundaddfill text-cyan margin-left-xl add-icon"
+									 @tap="showModal" data-target="ChooseModal"
+									 ></text>
+								 </view>
+							</view>
+							<view class="cu-list menu-avatar">
+									<view class="cu-item" v-for="parent in parents" :key="parent.id">
+										<image mode="scaleToFill" :src="parent.avatar||defaultAvatar" class="avatar md left"></image>
+										<view class="content">
+											<view>{{parent.username}}</view>
+											<view class="text-gray">{{parent.mobile}}</view>
+										</view>
+									</view>
+							</view>
+					 </view>
+			</view>
+		</scroll-view>
+		<!-- 添加授权人 -->
+    <view class="cu-modal" :class="modalName=='ChooseModal'?'show':''" @tap="hideModal">
+      <view class="cu-dialog bg-student" @tap.stop=''>
+        <view class="cu-bar justify-around">
+          <view class="content modal-title">添加授权人</view>
+        </view>
+        <view class="padding-xl text-left modal-body">
+				  <view>
+            <input type="text"  v-model.trim="params.username" placeholder="请输入授权人姓名" class="student-input text-black text-lg">
+          </view>
+					<view class="margin-top">
+            <input type="text"  v-model.trim="params.mobile"
+						@input="changePhone"
+						 placeholder="请输入授权人手机号" class="student-input text-black text-lg">
+          </view>
+					<view class="margin-top auth-item">
+            <input type="text"  v-model.trim="params.captcha" placeholder="请输入验证码" class="student-input text-black text-lg">
+						 <text class="auth-code text-cyan" :class="{'text-gray':disableSendMsgBtn}" :disabled="disableSendMsgBtn"
+            @tap="getCode">{{sendMsg}}</text>
+          </view>
+					<view class="margin-top">
+						 <button class="student-input text-student text-center" @tap="save">确认授权</button>
+					</view>
+        </view>
+        <view class="cu-bar modal-footer">
+          <view class="action"></view>
+        </view>
+      </view>
+    </view>
+	</view>
+</template>
+
+<script>
+import { _getPickup, _getCode, _addPickup } from '@/api/auth'
+import validate from '@/common/utils/ys-validate'
+export default {
+  data() {
+    return {
+      modalName: null,
+      parents: [],
+      params: {
+        username: '',
+        mobile: '',
+        captcha: ''
+      },
+      rules: [
+        { name: 'username', required: true, type: 'required', errmsg: '请输入授权人姓名' },
+        { name: 'mobile', required: true, type: 'phone', errmsg: '请输入正确手机号' },
+        { name: 'captcha', required: true, type: 'number', errmsg: '请输入正确的验证码' }
+      ],
+      sendTime: 60,
+      disableSendMsgBtn: true,
+      sendMsg: '获取验证码',
+      defaultAvatar: 'http://parent.kehoubaike.com/static/img/7f4e775d2e04234d1e1994b13146f6b.e5c47f3.png'
+    }
+  },
+  onLoad(options) {
+    this.get_list()
+  },
+  methods: {
+    showModal(e) {
+      this.modalName = e.currentTarget.dataset.target
+    },
+    hideModal(e) {
+      this.modalName = null
+    },
+    save() {
+      const validRes = validate.validate(this.params, this.rules)
+      if (!validRes.isOk) {
+        uni.showToast({
+          icon: 'none',
+          title: validRes.errmsg
+        })
+        return false
+      }
+      _addPickup(this.params).then(res => {
+        this.hideModal()
+        this.get_list()
+      })
+    },
+    changePhone(e) {
+      if (/^[1]([3-9])[0-9]{9}$/.test(e.detail.value)) {
+        this.disableSendMsgBtn = false
+      } else {
+        this.disableSendMsgBtn = true
+      }
+    },
+    getCode() {
+      if (!this.disableSendMsgBtn) {
+        this.leftTime = this.sendTime
+        this.timing(this.leftTime)
+        _getCode({ phone: this.params.mobile }).then(res => {
+          uni.showToast({
+            title: '验证码发送成功! 请注意查收！',
+            duration: 3000
+          })
+        })
+      }
+    },
+    timing () {
+      this.disableSendMsgBtn = true
+      const temSendMsgText = this.sendMsg
+      this.sendMsg = this.leftTime + '秒后重试'
+      this.timeInterval = setInterval(() => {
+        this.leftTime--
+        this.sendMsg = this.leftTime + '秒后重试'
+        if (this.leftTime <= 0) {
+          this.sendMsg = temSendMsgText
+          clearInterval(this.timeInterval)
+          if (/^[1]([3-9])[0-9]{9}$/.test(this.form.phone)) {
+            this.disableSendMsgBtn = false
+          }
+        }
+      }, 1000)
+    },
+    get_list() {
+      _getPickup().then(res => {
+        this.parents = res.data.pickup_data
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page{
+	height:100vh;
+}
+.image{
+	padding-bottom:20px;
+}
+.image-tag{
+	position:absolute;
+	top:10px;
+	left:10px;
+	font-size:24px;
+	font-weight:bold;
+	color: #6d4f26;
+}
+.students-title{
+	padding:30rpx;
+}
+.add-icon{
+	display:inline-block;
+	width:40px;
+	height:40px;
+	line-height:40px;
+	text-align:center;
+	font-size:22px;
+}
+.student-input{
+	height:40px;
+	line-height:40px;
+	border-radius:20px;
+	background-color:#fff;
+}
+.radius-student{
+	border-radius:20rpx;
+}
+.cu-inner{
+	margin:10rpx;
+	display:flex;
+	align-items:center;
+	width:100%;
+}
+.cu-inner.checked{
+    background: #5fd0e4;
+    color: #fff;
+    border-radius: 20rpx;
+}
+.cu-dialog{
+	width:90%;
+}
+.modal-title{
+    font-weight: bold;
+    color: #516029;
+    font-size: 20px;
+}
+.font-check{
+	font-size:22px;
+}
+.auth-item{
+	position:relative;
+}
+.auth-code{
+	position:absolute;
+	z-index:99;
+	top:10px;
+	right:20rpx;
+	font-size:14px;
+}
+</style>

src/pages/myStudents/myStudents.vue

@@ -213,7 +213,7 @@ export default {
     },
     setCarts() { // 刷新购物车
       _shopList().then(res => {
-        const carts = res.data.map(item => Number(item.class_attend_id))
+        const carts = res.data.map(item => item.class_attend_id)
         this.$store.dispatch('setCarts', carts)
       })
     },

src/pages/studentcenter/classVideo.vue

@@ -1,64 +1,68 @@
-<template>
-  <view class="page">
-		<cu-custom :isBack="true" title="课堂视频"></cu-custom>
-		<scroll-view scroll-y="true"
-			:style="[{height:'calc(100vh - '+ topHeader+'px)'}]">
-			<view class="content">
-				<view class="course-img">
-					<swiper class="swiper" :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration">
-						<swiper-item v-for="(item,index) in detail.course_data.image" :key="index">
-							<view class="swiper-item">
-								  <image :src="item" mode="widthFix"></image>
-							</view>
-						</swiper-item>
-					</swiper>
-				</view>
-				<view>
-					<view class="title flex align-center">
-						<text class="iconfont" style="font-size:24px;">&#xe76d;</text>课堂视频
-					</view>
-					<view class="list">
-						<view class="cu-card case" v-for="(video,index) in detail.moments_data.data" :key="index">
-							<view class="cu-item shadow">
-								<view class="image">
-									<video :src="video" style="width:100%;"></video>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      topHeader: this.globalCustomBarHeight,
-      detail: {},
-      swiper: {
-        indicatorDots: true,
-        autoplay: true,
-        interval: 2000,
-        duration: 500
-      }
-    }
-  },
-  onLoad() {
-    this.init()
-  },
-  methods: {
-    init() {
-      this.detail = JSON.parse(uni.getStorageSync('daily_class'))
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.page{
-	height:100vh;
-}
-</style>
+<template>
+  <view class="page">
+		<cu-custom :isBack="true" title="课堂视频"></cu-custom>
+		<scroll-view scroll-y="true"
+			:style="[{height:'calc(100vh - '+ topHeader+'px)'}]">
+			<view class="content">
+				<view class="course-img">
+					<swiper class="swiper" :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration">
+						<swiper-item v-for="(item,index) in detail.course_data.image" :key="index">
+							<view class="swiper-item">
+								  <image :src="item" mode="widthFix"></image>
+							</view>
+						</swiper-item>
+					</swiper>
+				</view>
+				<view>
+					<view class="title flex align-center">
+						<text class="iconfont" style="font-size:24px;">&#xe76d;</text>课堂视频
+					</view>
+					<view class="list" v-if='detail.moments_data'>
+						<view class="cu-card case" v-for="(video,index) in detail.moments_data.data" :key="index">
+							<view class="cu-item shadow">
+								<view class="image">
+									<image :src="video.images" v-if="checkTypes(video.images,'imgs')" style="width:100%;"></image>
+									<video :src="video.images" v-if="checkTypes(video.images,'video')" style="width:100%;"></video>
+									<view class="padding-xs">{{video.content}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import { checkTypes } from '@/common/utils/index'
+export default {
+  data() {
+    return {
+      topHeader: this.globalCustomBarHeight,
+      detail: {},
+      swiper: {
+        indicatorDots: true,
+        autoplay: true,
+        interval: 2000,
+        duration: 500
+      }
+    }
+  },
+  onLoad() {
+    this.init()
+  },
+  methods: {
+    checkTypes,
+    init() {
+      this.detail = JSON.parse(uni.getStorageSync('daily_class'))
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page{
+	height:100vh;
+}
+</style>

src/pages/studentcenter/evaluate.vue

@@ -13,7 +13,7 @@
 			</view>
 		</view>
 		<view class="comment bg-white margin-top padding-lr padding-tb-lg">
-			<view>请评价(已对班主任匿名，请放心评价)</view>
+			<view>请评价</view>
 			<view class="flex text-center margin-top" style="padding-left:80rpx;">
 					<view class="flex-sub">
 						<img src="/static/imgs/class/satisfaction.png" mode="widthFix" style="width:70px;">
@@ -74,9 +74,11 @@ export default {
   methods: {
     init() {
       _commentDetail({ plan_id: this.params.plan_id }).then(res => {
-        this.teacher = res.teacher_data
-        this.params.teacher_id = this.teacher ? this.teacher.teacher_id : 'undefined'
-        this.satisfaction = res.satisfaction_data
+        this.teacher = res.data.teacher_data
+        this.params.teacher_id = this.teacher.teacher_id
+        this.satisfaction = res.data.satisfaction_data
+        this.params.statisfaction = this.satisfaction.satisfaction
+        this.params.agency_statisfaction = this.satisfaction.agency_satisfaction
       })
     },
     evaluate(type, value) { // 评价

src/pages/studentcenter/index.vue

@@ -20,9 +20,40 @@
 		<view v-if="type==='schedule'">
 			<scroll-view scroll-y="true"
 			:style="[{marginTop:'56px',height:'calc(100vh - 114px - '+ topHeader+'px)'}]">
-			 <uni-calendar class="uni-calendar--hook" :selected="info.selected"
-				style="padding-top:100px;"
-				:showMonth="false" @change="changeDay" @monthSwitch="monthSwitch" />
+				<view class="calendar padding-tb solid-bottom bg-white">
+					<view class="calendar-header flex justify-between padding-lr-sm">
+							<view>
+									<picker mode="date" :value="info.chooseDate" :fields="info.fields"
+											@change="bindDateChange"
+											:start="info.start" :end="info.end">
+												<view class="picker text-student text-xl">
+													{{info.chooseDate}}
+													<text class="cuIcon-right lg"></text>
+												</view>
+										</picker>
+							</view>
+							<view>
+								共{{present.attendance_data.length}}天
+							</view>
+					</view>
+					<view class="calendar-main">
+						<calendar :year="year" :month="month"  :showBusiness="true" @changeDate="chooseDay" ref="calendar"></calendar>
+					</view>
+					<view class="calendar-marks flex justify-end padding-lr-sm">
+							<view class="margin-left-sm">
+								<view class="cu-tag bg-blue margin-right-sm"></view><text class="text-sm">请假</text>
+							</view>
+							<view class="margin-left-sm">
+								<view class="cu-tag bg-yellow margin-right-sm"></view><text class="text-sm">迟到</text>
+							</view>
+							<view class="margin-left-sm">
+								<view class="cu-tag bg-normal margin-right-sm"></view><text class="text-sm">正常</text>
+							</view>
+							<view class="margin-left-sm">
+								<view class="cu-tag bg-red margin-right-sm"></view><text class="text-sm">旷课</text>
+							</view>
+					</view>
+				</view>
 				<view class="cu-card margin-top-xs padding-xs">
 					<view class="cu-item day-info">
 						<view class="day-title flex justify-between solid-bottom padding text-lg">
@@ -113,13 +144,13 @@
 
 <script>
 import NP from 'number-precision'
-import { uniCalendar } from '@dcloudio/uni-ui'
+import calendar from '@/components/calendar.vue'
 import { _nowCourse, _courseHistory, _attendance, _dateCourse } from '@/api/course'
 import { getDate } from '@/common/utils'
 import swiperTab from '@/components/swiper-tab.vue'
 export default {
   components: {
-    uniCalendar, swiperTab
+    swiperTab, calendar
   },
   data () {
     return {
@@ -130,14 +161,19 @@ export default {
       page_num: 1,
       noMore: false, // 加载判断
       list: [],
-      classList: [], // 日程表
+      classList: [], // 日程表当天
+      courses: [], // 日程表全部
       info: { // 日历数据
+        chooseDate: '', // 选中日期
         year: '',
         month: '',
         day: '',
-        selected: []
+        fields: 'month',
+        start: '',
+        end: ''
       },
       present: {
+        attendance_data: [],
         absenteeism_num: 0,
         actual_section_num: 5,
         be_section_num: 5,
@@ -147,16 +183,16 @@ export default {
       }, // 实际出席情况
       attendance: { // 出席统计数据
         leave_num: {
-          title: '请假', times: 2, color: '#9bde78'
-        },
-        normal_num: {
-          title: '正常', times: 3, color: '#e0be60'
+          title: '请假', times: 2, color: '#3390F5'
         },
         late_num: {
-          title: '迟到', times: 1, color: '#61d4e2'
+          title: '迟到', times: 1, color: '#fbbd08'
+        },
+        normal_num: {
+          title: '正常', times: 3, color: '#4DB8E4'
         },
         absenteeism_num: {
-          title: '旷课', times: 0, color: '#d697eb'
+          title: '旷课', times: 0, color: '#e54d42'
         }
       }
     }
@@ -166,6 +202,9 @@ export default {
     this.info.year = this.info.year || today.year
     this.info.month = this.info.month || today.month
     this.info.day = this.info.day || today.date
+    this.info.chooseDate = this.info.chooseDate || today.fullMonth
+    this.info.start = (this.info.year - 1) + '-' + '01-01'
+    this.info.end = this.info.year + '-' + (Number(this.info.month) + 1) + '-' + this.info.day
     this.init()
   },
   methods: {
@@ -177,11 +216,13 @@ export default {
       }
     },
     getSehedule() {
+      this.setCalendar()
       this.get_attend().then(res => {
         this.present = res.data
-        this.fix_attend(res.data)
+        this.fix_attend(res.data)// 出席统计
+        this.setAttendance(res.data.attendance_data)// 日历显示出席日期
         this.drawChart()
-        this.get_dateCourse()
+        this.get_dateCourse()// 获取日期课程列表
       })
     },
     classOperation(id) { // 上课
@@ -205,6 +246,9 @@ export default {
         this.get_history()
       }
     },
+    chooseDay(day) {
+      this.classList = this.courses.filter(item => item.date.replace(/-/g, '') === day)// 匹配当天数据
+    },
     get_course() {
       _nowCourse({ page_num: this.page_num }).then(res => {
         if (this.page_num > 1) {
@@ -243,20 +287,21 @@ export default {
       this.page_num = 1
       this.get_list()
     },
-    changeDay(e) {
-      this.info.day = e.date
-      // 模拟动态打卡
-      // if (this.info.selected.length > 5) return
-      // this.info.selected.push({
-      //   date: e.fulldate,
-      //   info: '打卡'
-      // })
-    },
-    monthSwitch(e) {
-      this.info.year = e.year
-      this.info.month = e.month < 10 ? '0' + e.month : e.month
+    bindDateChange(e) {
+      const value = e.detail.value
+      const [year, month] = value.split('-')
+      this.info.year = year
+      this.info.month = month
+      this.info.chooseDate = value
       this.getSehedule()
     },
+    setCalendar() {
+      this.$refs.calendar.selCalendar(this.info.year, this.info.month)
+    },
+    setAttendance(attendance) { // 补充出席情况
+      if (!attendance) return
+      this.$refs.calendar.setAttendance(attendance)
+    },
     get_attend() { // 获取出席情况
       const date = this.info.year + '-' + this.info.month
       return new Promise((resolve, reject) => {
@@ -272,6 +317,7 @@ export default {
     get_dateCourse() { // 获取对应日期数据
       _dateCourse({ year: this.info.year, month: this.info.month }).then(res => {
         this.classList = res.data
+        this.courses = res.data
       })
     },
     draw (ele, key) {

src/pages/studentcenter/operation.vue

@@ -1,168 +1,168 @@
-<template>
-	<view class="page">
-		<cu-custom :isBack="true" title="课堂操作"></cu-custom>
-		<scroll-view scroll-y="true"
-			:style="[{height:'calc(100vh - '+ topHeader+'px)'}]">
-			<view class="content">
-				<view class="course-img">
-					<swiper class="swiper" :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration">
-						<swiper-item v-for="(item,index) in detail.course_data.image" :key="index">
-							<view class="swiper-item">
-								  <image :src="item" mode="widthFix"></image>
-							</view>
-						</swiper-item>
-					</swiper>
-				</view>
-				<view class="detail bg-white padding">
-					<view class="detail-title">{{detail.course_data.attend_name}}</view>
-					<view class="detail-item">
-						<text class="cuIcon-title text-student"></text>
-						<text class="text-gray">周期</text>
-						<text class="text-black margin-left-xs">{{detail.course_data.start_at}}</text>
-					</view>
-					<view class="detail-item flex">
-						<text class="text-gray" style="width:40px;"></text>
-						<text class="text-black margin-left-xs">{{detail.course_data.end_at}}</text>
-					</view>
-					<view class="detail-item margin-top-xs">
-						<text class="cuIcon-title text-student"></text>
-						<text class="text-gray">年级</text>
-						<text class="text-black margin-left-xs">{{detail.course_data.grade}}</text>
-					</view>
-				</view>
-				<view class="teacher flex bg-white padding margin-tb-sm">
-					<image mode="scaleToFill" :src="teacher_avatar" class="avatar lg"></image>
-					<view class="flex-sub margin-left">
-						 <view class="teacher-title">{{detail.teacher.username||''}}老师授课</view>
-						 <view class="teacher-item">所属机构：{{detail.teacher.agency_name||''}}</view>
-						<view class="teacher-exp flex">
-							 <view class="exp-item">{{detail.teacher.honor||''}}</view>
-							 <view class="exp-item">{{detail.teacher.introduce||''}}</view>
-						 </view>
-					</view>
-				</view>
-				<view class="cu-timeline">
-					<view class="cu-time">详情</view>
-					<view class="cu-item">
-						<view class="cu-content time-item flex justify-between">
-							<view class="time-left text-black flex-sub">评价</view>
-							<view class="time-right text-student" @tap="check('studentEvaluate')">
-								查看
-							</view>
-						</view>
-					</view>
-					<view class="cu-item">
-						<view class="cu-content time-item flex justify-between">
-							<view class="time-left text-black flex-sub">上课时间
-								<view>{{detail.course_data.start_at}}</view>
-							</view>
-						</view>
-					</view>
-					<view class="cu-item">
-						<view class="cu-content time-item flex justify-between">
-							<view class="time-left text-black flex-sub">课堂签到
-								<view>{{detail.call_status.title}}</view>
-							</view>
-						</view>
-					</view>
-					<view class="cu-item">
-						<view class="cu-content time-item flex justify-between">
-							<view class="time-left text-black flex-sub">课堂视频</view>
-							<view class="time-right text-student" @tap="check('studentVideo')">
-								查看
-							</view>
-						</view>
-					</view>
-					<view class="cu-item">
-						<view class="cu-content time-item flex justify-between">
-							<view class="time-left text-black flex-sub">课堂作品</view>
-							<view class="time-right text-student" @tap="check('studentWorks')">
-								查看
-							</view>
-						</view>
-					</view>
-					<view class="cu-item">
-						<view class="cu-content time-item flex justify-between">
-							<view class="time-left text-black flex-sub">下课时间
-								<view>{{detail.course_data.end_at}}</view>
-							</view>
-						</view>
-					</view>
-					<view class="cu-item">
-						<view class="cu-content time-item flex justify-between">
-							<view class="time-left text-black flex-sub">安全交接</view>
-							<view class="time-right text-student" @tap="check('studentSignin')">
-								查看
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-import { _dailiClass } from '@/api/course'
-export default {
-  data() {
-    return {
-      topHeader: this.globalCustomBarHeight,
-      plan_id: 0,
-      detail: {},
-      swiper: {
-        indicatorDots: true,
-        autoplay: true,
-        interval: 2000,
-        duration: 500
-      },
-      teacher_avatar: '/static/imgs/class/logo0.png'
-    }
-  },
-  onLoad(options) {
-    const id = decodeURIComponent(options.id)
-    if (!id) uni.navigateBack()
-    this.plan_id = id
-    this.init()
-  },
-  methods: {
-    check(page) {
-      this.globalNavigateTo(page, { plan_id: this.plan_id })
-    },
-    init() {
-      _dailiClass({ plan_id: this.plan_id }).then(res => {
-        this.detail = res.data
-        uni.setStorage({
-          data: JSON.stringify(this.detail),
-          key: 'daily_class'
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '~@/common/css/mixin.scss';
-.page{
-	height:100vh;
-}
-.detail{
-	&-title{
-		@include title(10px,22px);
-	}
-}
-.teacher{
-	&-title{
-		@include title(4px,18px);
-	}
-}
-.time-item{
-	line-height:32px;
-	.time-left{
-	}
-	.time-right{
-		width:120rpx;
-	}
-}
-</style>
+<template>
+	<view class="page">
+		<cu-custom :isBack="true" title="课堂操作"></cu-custom>
+		<scroll-view scroll-y="true"
+			:style="[{height:'calc(100vh - '+ topHeader+'px)'}]">
+			<view class="content">
+				<view class="course-img">
+					<swiper class="swiper" :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration">
+						<swiper-item v-for="(item,index) in detail.course_data.image" :key="index">
+							<view class="swiper-item">
+								  <image :src="item" mode="widthFix"></image>
+							</view>
+						</swiper-item>
+					</swiper>
+				</view>
+				<view class="detail bg-white padding">
+					<view class="detail-title">{{detail.course_data.attend_name}}</view>
+					<view class="detail-item">
+						<text class="cuIcon-title text-student"></text>
+						<text class="text-gray">周期</text>
+						<text class="text-black margin-left-xs">{{detail.course_data.start_at}}</text>
+					</view>
+					<view class="detail-item flex">
+						<text class="text-gray" style="width:40px;"></text>
+						<text class="text-black margin-left-xs">{{detail.course_data.end_at}}</text>
+					</view>
+					<view class="detail-item margin-top-xs">
+						<text class="cuIcon-title text-student"></text>
+						<text class="text-gray">年级</text>
+						<text class="text-black margin-left-xs">{{detail.course_data.grade}}</text>
+					</view>
+				</view>
+				<view class="teacher flex bg-white padding margin-tb-sm">
+					<image mode="scaleToFill" :src="teacher_avatar" class="avatar lg"></image>
+					<view class="flex-sub margin-left">
+						 <view class="teacher-title">{{detail.teacher.username||''}}老师授课</view>
+						 <view class="teacher-item">所属机构：{{detail.teacher.agency_name||''}}</view>
+						<view class="teacher-exp flex">
+							 <view class="exp-item">{{detail.teacher.honor||''}}</view>
+							 <view class="exp-item">{{detail.teacher.introduce||''}}</view>
+						 </view>
+					</view>
+				</view>
+				<view class="cu-timeline">
+					<view class="cu-time">详情</view>
+					<view class="cu-item">
+						<view class="cu-content time-item flex justify-between">
+							<view class="time-left text-black flex-sub">评价</view>
+							<view class="time-right text-student" v-if="detail.teacher&&detail.teacher.username" @tap="check('studentEvaluate')">
+								查看
+							</view>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="cu-content time-item flex justify-between">
+							<view class="time-left text-black flex-sub">上课时间
+								<view>{{detail.course_data.start_at}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="cu-content time-item flex justify-between">
+							<view class="time-left text-black flex-sub">课堂签到
+								<view>{{detail.call_status.title}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="cu-content time-item flex justify-between">
+							<view class="time-left text-black flex-sub">课堂视频</view>
+							<view class="time-right text-student" @tap="check('studentVideo')">
+								查看
+							</view>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="cu-content time-item flex justify-between">
+							<view class="time-left text-black flex-sub">课堂作品</view>
+							<view class="time-right text-student" @tap="check('studentWorks')">
+								查看
+							</view>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="cu-content time-item flex justify-between">
+							<view class="time-left text-black flex-sub">下课时间
+								<view>{{detail.course_data.end_at}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="cu-item">
+						<view class="cu-content time-item flex justify-between">
+							<view class="time-left text-black flex-sub">安全交接</view>
+							<view class="time-right text-student" @tap="check('studentSignin')">
+								查看
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import { _dailiClass } from '@/api/course'
+export default {
+  data() {
+    return {
+      topHeader: this.globalCustomBarHeight,
+      plan_id: 0,
+      detail: {},
+      swiper: {
+        indicatorDots: true,
+        autoplay: true,
+        interval: 2000,
+        duration: 500
+      },
+      teacher_avatar: '/static/imgs/class/logo0.png'
+    }
+  },
+  onLoad(options) {
+    const id = decodeURIComponent(options.id)
+    if (!id) uni.navigateBack()
+    this.plan_id = id
+    this.init()
+  },
+  methods: {
+    check(page) {
+      this.globalNavigateTo(page, { plan_id: this.plan_id })
+    },
+    init() {
+      _dailiClass({ plan_id: this.plan_id }).then(res => {
+        this.detail = res.data
+        uni.setStorage({
+          data: JSON.stringify(this.detail),
+          key: 'daily_class'
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/common/css/mixin.scss';
+.page{
+	height:100vh;
+}
+.detail{
+	&-title{
+		@include title(10px,22px);
+	}
+}
+.teacher{
+	&-title{
+		@include title(4px,18px);
+	}
+}
+.time-item{
+	line-height:32px;
+	.time-left{
+	}
+	.time-right{
+		width:120rpx;
+	}
+}
+</style>

src/pages/studentcenter/signIn.vue

@@ -20,7 +20,7 @@
 				</view>
     	</view>
 		</view>
-		<view class="content">
+		<view class="content" v-if="info.status">
 			<view class="content_title">签到说明</view>
     	<view>接到学生后请“点击签到”按钮作为签到</view>
 			<view class="button" :style="checked?'background: #ddd':''"  hover-class="button_hover" @tap="signIn">
@@ -68,13 +68,15 @@ export default {
     init() {
       _getSignIn({ plan_id: this.plan_id }).then(res => {
         this.info = res.data.sign_data
-        this.checked = !this.info.status
+        this.checked = this.info.status === 1
       })
     },
     signIn() {
       if (this.checked) return false
       _toSignIn({ clock_in_id: this.info.clock_in_id }).then(res => {
-        this.checked = true
+        if (res.code === 1) {
+          this.checked = true
+        }
       })
     }
   }
@@ -83,6 +85,7 @@ export default {
 
 <style lang="scss" scoped>
 .header{
+	position:static;
   border-radius: 0 0 10px 10px;
   padding: .8rem;
   .icon_title{
@@ -110,7 +113,7 @@ export default {
   }
 }
 .content{
-  margin-top: .8rem;
+  margin-top: .2rem;
   background: #fff;
   color: #888;
   padding: 2rem;

src/pages/studentcenter/works.vue

@@ -1,62 +1,67 @@
-<template>
-  <view class="page">
-		<cu-custom :isBack="true" title="课堂作品"></cu-custom>
-		<scroll-view scroll-y="true"
-			:style="[{height:'calc(100vh - '+ topHeader+'px)'}]">
-			<view class="content">
-				<view class="course-img">
-					<swiper class="swiper" :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration">
-						<swiper-item v-for="(item,index) in detail.course_data.image" :key="index">
-							<view class="swiper-item">
-								  <image :src="item" mode="widthFix"></image>
-							</view>
-						</swiper-item>
-					</swiper>
-				</view>
-				<view>
-					<view class="title">课堂作品</view>
-					<view class="list">
-						<view class="cu-card case" v-for="(item,index) in detail.student_comment_data" :key="index">
-							<view class="cu-item shadow">
-								<view class="image">
-									<image :src="item.images" style="width:100%;"></image>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      topHeader: this.globalCustomBarHeight,
-      detail: {},
-      swiper: {
-        indicatorDots: true,
-        autoplay: true,
-        interval: 2000,
-        duration: 500
-      }
-    }
-  },
-  onLoad() {
-    this.init()
-  },
-  methods: {
-    init() {
-      this.detail = JSON.parse(uni.getStorageSync('daily_class'))
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.page{
-	height:100vh;
-}
-</style>
+<template>
+  <view class="page">
+		<cu-custom :isBack="true" title="课堂作品"></cu-custom>
+		<scroll-view scroll-y="true"
+			:style="[{height:'calc(100vh - '+ topHeader+'px)'}]">
+			<view class="content">
+				<view class="course-img">
+					<swiper class="swiper" :indicator-dots="swiper.indicatorDots" :autoplay="swiper.autoplay" :interval="swiper.interval" :duration="swiper.duration">
+						<swiper-item v-for="(item,index) in detail.course_data.image" :key="index">
+							<view class="swiper-item">
+								  <image :src="item" mode="widthFix"></image>
+							</view>
+						</swiper-item>
+					</swiper>
+				</view>
+				<view>
+					<view class="title margin-top-sm">课堂作品</view>
+					<view class="list">
+						<view class="cu-card case" v-for="(item,index) in detail.student_comment_data.data" :key="index">
+							<view class="cu-item shadow">
+								<view class="image">
+									<view v-for="(img,i) in item.images" :key="i">
+										 <image :src="img" v-if="checkTypes(img,'imgs')" mode="aspectFit" style="width:100%;"></image>
+									   <video :src="img" v-if="checkTypes(img,'video')"  style="width:100%;"></video>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import { checkTypes } from '@/common/utils/index'
+export default {
+  data() {
+    return {
+      topHeader: this.globalCustomBarHeight,
+      detail: {},
+      swiper: {
+        indicatorDots: true,
+        autoplay: true,
+        interval: 2000,
+        duration: 500
+      }
+    }
+  },
+  onLoad() {
+    this.init()
+  },
+  methods: {
+    checkTypes,
+    init() {
+      this.detail = JSON.parse(uni.getStorageSync('daily_class'))
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page{
+	height:100vh;
+}
+</style>

src/store/user.js

@@ -1,6 +1,6 @@
 export default {
   state: {
-    user: {},
+    user: null,
     token: '',
     session: '',
     kid: 0,
@@ -9,7 +9,8 @@ export default {
   },
   getters: {
     user(state) {
-      return state.user.nickName ? state.user : JSON.parse(uni.getStorageSync('user'))
+      const user = uni.getStorageSync('user')
+      return state.user || user ? JSON.parse(user) : {}
     },
     kid(state) {
       return state.kid || uni.getStorageSync('kid')
@@ -24,12 +25,13 @@ export default {
       return state.session || uni.getStorageSync('session')
     },
     carts(state) {
-      return state.carts || JSON.parse(uni.getStorageSync('carts'))
+      const carts = uni.getStorageSync('carts')
+      return state.carts || carts ? JSON.parse(carts) : []
     }
   },
   mutations: {
     CLEAR(state) {
-      state.user = {}
+      state.user = null
       state.token = ''
       state.session = ''
       state.phone = ''
@@ -37,7 +39,7 @@ export default {
       state.carts = null
       uni.clearStorageSync()
     },
-    SET_USER(state, user = {}) {
+    SET_USER(state, user) {
       state.user = user
       uni.setStorage({
         key: 'user',
@@ -72,7 +74,7 @@ export default {
         data: session
       })
     },
-    SET_CARTS(state, carts = []) {
+    SET_CARTS(state, carts) {
       state.carts = carts
       uni.setStorage({
         key: 'carts',