src/api/course.js

@@ -12,27 +12,31 @@ export function _intelligentDates () {
 export function _intelligentInterests () {
 	return fetch('/parents/Intelligent/getLigentCategory')
 }
+//智能报课关键词检索
+export function _intelligentGetKeys (params) {
+	return fetch('/parents/Intelligent/getKeywords', params)
+}
 //智能报课获取课程
 export function _intelligentCourses (params) {
 	return fetch('/parents/Intelligent/pickLigentCourse', params)
 }
-// 获取课程筛选选项 parents/Mycourses/advanced_filter
+// 获取课程筛选选项
 export function _filter (params) {
 	return fetch('/parents/Mycourses/advanced_filter', params)
 }
-// 课程详情 parents/Mycourses/course_details
+// 课程详情
 export function _detail (params) {
 	return fetch('/parents/Mycourses/course_details', params)
 }
-// 课程套餐详情 parents/Mycourses/course_gift
+// 课程套餐详情
 export function _gift (params) {
 	return fetch('/parents/Mycourses/course_gift', params)
 }
-// 课程评价 parents/Mycourses/now_details_comment
+// 课程评价
 export function _comments (params) {
 	return fetch('/parents/Mycourses/now_details_comment', params, 'POST', false)
 }
-// 添加购物车 parents/Commit/join_shop
+// 添加购物车
 export function _joinShop (params, showFail = true) {
 	return fetch('/parents/Commit/join_shop', params, 'POST', showFail)
 }
@@ -40,23 +44,23 @@ export function _joinShop (params, showFail = true) {
 export function _joinShops (params) {
 	return fetch('/parents/Commit/joinShopMulti', params)
 }
-// 购物车列表 /parents/Shopping/index
+// 购物车列表
 export function _shopList (params) {
 	return fetch('/parents/Shopping/index', params)
 }
-// 删除购物车 /parents/Shopping/del_shopping
+// 删除购物车
 export function _delShop (params) {
 	return fetch('/parents/Shopping/del_shopping', params)
 }
-// 生成订单 parents/Commit/order
+// 生成订单
 export function _createOrder (params) {
 	return fetch('/parents/Commit/order', params)
 }
-// 订单列表 parents/Ordercentre/index
+// 订单列表
 export function _orderCenter (params) {
 	return fetch('/parents/Ordercentre/index', params)
 }
-// 退课数据 get_dropcourse_byorder
+// 退课数据
 export function _dropList (params) {
 	return fetch('/parents/dropcourse/get_dropcourse_byorder', params)
 }
@@ -64,43 +68,43 @@ export function _dropList (params) {
 export function _payOrder (params) {
 	return fetch('/parents/pay/payment', params)
 }
-// 取消订单 /parents/Ordercentre/del_order
+// 取消订单
 export function _cancelOrder (params) {
 	return fetch('/parents/Ordercentre/del_order', params)
 }
-// 进行退课 /parents/dropcourse/to_drop_course
+// 进行退课
 export function _dropCourse (params) {
 	return fetch('/parents/dropcourse/to_drop_course', params)
 }
-// 历史课程 /parents/Mycourses/course_history
+// 历史课程
 export function _courseHistory (params) {
 	return fetch('/parents/Mycourses/course_history', params)
 }
-// 我的课程 /parents/Mycourses/course_history
+// 我的课程
 export function _nowCourse (params) {
 	return fetch('/parents/Mycourses/now_course', params)
 }
-// 课程表 /parents/Mycourses/date_course
+// 课程表
 export function _dateCourse (params) {
 	return fetch('/parents/Mycourses/date_course', params)
 }
-// 考勤记录 /parents/attendance/get_attendance
+// 考勤记录
 export function _attendance (params) {
 	return fetch('/parents/attendance/get_attendance', params)
 }
-// 课堂详情 /parents/dailyclass/get_dailyclass_details
+// 课堂详情
 export function _dailiClass (params) {
 	return fetch('/parents/dailyclass/get_dailyclass_details', params)
 }
-// 安全交接情况 /parents/sign/get_sign
+// 安全交接情况
 export function _getSignIn (params) {
 	return fetch('/parents/sign/get_sign', params)
 }
-// 进行安全交接 /parents/sign/to_sign
+// 进行安全交接
 export function _toSignIn (params) {
 	return fetch('/parents/sign/to_sign', params)
 }
-// 进行评价 /parents/Todayclass/comment
+// 进行评价
 export function _tocomment (params) {
 	return fetch('/parents/Todayclass/comment', params)
 }
@@ -122,13 +126,13 @@ export function _getStudentFiles (params) {
 }
 //获取年级
 export function _getGrades () {
-	return fetch('/parents/init/get_grades')
+	return fetch('/parents/student/grade_list')
 }
 //获取班级
 export function _getClasses (params) {
-	return fetch('/parents/init/get_classes', params)
+	return fetch('/parents/student/class_list', params)
 }
 //修改信息
 export function _fixStudent (params) {
-	return fetch('/parents/init/edit_student', params)
+	return fetch('/parents/student/update', params)
 }

src/components/calendar.vue

@@ -1,19 +1,19 @@
 <template>
-<view class='wrap'>
-  <view class='header-cal'>
-    <view  v-for="(item,index) in date" :key="index">{{item}}<view></view>
+  <view class="wrap">
+    <view class="header-cal">
+      <view v-for="(item, index) in date" :key="index">{{ item }}<view></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 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, 'date-class': item.dateClass }]"
+        >
+          <view>{{ item.dateNum }}</view>
+        </view>
       </view>
     </view>
-
   </view>
-</view>
-
 </template>
 
 <script>
@@ -27,7 +27,8 @@ export default {
       type: Number,
       value: 0
     },
-    showBusiness: { // 是否显示业务标记
+    showBusiness: {
+      // 是否显示业务标记
       type: Boolean,
       default: false
     }
@@ -36,11 +37,10 @@ export default {
     return {
       date: ['日', '一', '二', '三', '四', '五', '六'],
       dateArr: [],
-      todayIndex: -1// 操作索引,默认指向当天
+      todayIndex: -1 // 操作索引,默认指向当天
     }
   },
-  onLoad(options) {
-  },
+  onLoad(options) {},
   methods: {
     calendarTap(item, index) {
       this.todayIndex = index
@@ -49,7 +49,8 @@ export default {
     selCalendar(year, month) {
       this.dateInit(year, month - 1)
     },
-    setAttendance(attendance) { // 设置日历考勤
+    setAttendance(attendance) {
+      // 设置日历考勤
       const start = this.dateArr.findIndex(item => item.dateNum)
       attendance.map((item, index) => {
         if (item !== 'stateless') {
@@ -60,6 +61,12 @@ export default {
         }
       })
     },
+    setClass(days) {
+      //区分有课日期
+      this.dateArr.map(item => {
+        this.$set(item, 'dateClass', days.includes(item.dateNum))
+      })
+    },
     dateInit(setYear, setMonth) {
       // 1.获取当前时间
       var date = new Date()
@@ -74,7 +81,7 @@ export default {
       const year = setYear || now.getFullYear()
       let nextYear = 0
       const month = setMonth || now.getMonth() // 没有+1方便后面计算当月总天数
-      const nextMonth = (month + 1) > 11 ? 1 : (month + 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 = {}
@@ -115,7 +122,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.date-show{
+.date-show {
   position: relative;
   width: 250rpx;
   font-family: PingFang-SC-Regular;
@@ -124,28 +131,30 @@ export default {
   text-align: center;
   margin: 59rpx auto 10rpx;
 }
-.lt-arrow,.rt-arrow{
+.lt-arrow,
+.rt-arrow {
   position: absolute;
   top: 1rpx;
   width: 60rpx;
   height: 60rpx;
 }
-.lt-arrow image,.rt-arrow image{
+.lt-arrow image,
+.rt-arrow image {
   width: 14rpx;
   height: 26rpx;
 }
-.lt-arrow{
+.lt-arrow {
   left: -110rpx;
   transform: rotate(180deg);
 }
-.rt-arrow{
+.rt-arrow {
   right: -100rpx;
 }
-.header-cal{
+.header-cal {
   font-size: 0;
   /* padding: 0 24rpx;  */
 }
-.header-cal>view{
+.header-cal > view {
   display: inline-block;
   width: 14.285%;
   color: #5fd0e4;
@@ -154,21 +163,21 @@ export default {
   /* border-bottom: 1px solid #D0D0D0;  */
   padding: 39rpx 0;
 }
-.weekMark{
+.weekMark {
   position: relative;
 }
-.weekMark view{
+.weekMark view {
   position: absolute;
   bottom: 0;
   left: 0;
   width: 100%;
-  border-bottom: 1px solid #22A7F6;
+  border-bottom: 1px solid #22a7f6;
 }
-.date-box{
+.date-box {
   font-size: 0;
   padding: 10rpx 0;
 }
-.date-box>view{
+.date-box > view {
   position: relative;
   display: inline-block;
   width: 14.285%;
@@ -178,56 +187,106 @@ export default {
   vertical-align: middle;
   margin: 15rpx 0;
 }
-.date-head1{
+.date-head1 {
+  position: relative;
   height: 60rpx;
   line-height: 60rpx;
   font-size: 26rpx;
   border-radius: 12rpx;
+  color: #ccc;
 }
-.date-head2{
-  background: #20BA96;
+.date-head2 {
+  background: #20ba96;
   color: #fff;
   height: 60rpx;
   line-height: 60rpx;
   font-size: 26rpx;
   border-radius: 12rpx;
 }
-.date-weight{
+.date-class {
+  color: #000;
+}
+.date-weight {
   font-size: 22rpx;
   padding: 15rpx 0;
 }
-.nowDay .date-weight{
-  color: #22A7F6;
+.nowDay .date-weight {
+  color: #22a7f6;
 }
 /* 过期样式*/
-.showOverdue{
+.showOverdue {
   color: #5fd0e4;
 }
 /* 正在操作样式*/
-.operationInProgress{
-  background: #20BA96;
-  color: #fff;
+.operationInProgress {
+  // background: #20ba96;
+  // color: #fff;
+  color: #20ba96;
 }
 /* 正常样式*/
-.normal{
-  background:  #4DB8E4;
-  color: #fff;
+.normal {
+  // background: #4db8e4;
+  // color: #fff;
+  &:after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 0;
+    height: 0;
+    border-color: #39b54a transparent;
+    border-width: 0 0 12px 12px;
+    border-style: solid;
+  }
 }
 /* 异常样式*/
-.abnormal{
-  background:  #FF7361;
-  color: #fff;
+.abnormal {
+  // background: #ff7361;
+  // color: #fff;
+  &:after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 0;
+    height: 0;
+    border-color: #ff7361 transparent;
+    border-width: 0 0 12px 12px;
+    border-style: solid;
+  }
 }
-.leave{
-	background:#3390F5;
-	color: #fff;
+.leave {
+  // background: #3390f5;
+  // color: #fff;
+  &:after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 0;
+    height: 0;
+    border-color: #3390f5 transparent;
+    border-width: 0 0 12px 12px;
+    border-style: solid;
+  }
 }
-.late{
-	background:#fbbd08;
-	color: #fff;
+.late {
+  // background: #fbbd08;
+  // color: #fff;
+  &:after {
+    content: '';
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 0;
+    height: 0;
+    border-color: #fbbd08 transparent;
+    border-width: 0 0 12px 12px;
+    border-style: solid;
+  }
 }
-.absenteeism{
-	background:#e54d42;
-	color: #fff;
+.absenteeism {
+  background: #e54d42;
+  color: #fff;
 }
 </style>

src/pages/class/gift.vue

@@ -14,8 +14,14 @@
       <swiper @change="swipeChange" :current="cur" class="swipe">
         <swiper-item @touchmove.stop>
           <view class="btn-check-group padding">
-            <checkbox-group @change="checkboxChange" class="flex justify-between" style="flex-wrap: wrap;" id="week">
-              <label class="btn-check-label margin" :class="{ 'bg-light-green': params.week.includes(item.key + '') }" v-for="item in days" :key="item.key">
+            <checkbox-group @change="checkboxChange" class="flex justify-between border-bottom" style="flex-wrap: wrap;" id="week">
+              <label class="btn-check-label margin" :class="{ 'bg-light-green': params.week.includes(item.key + '') }" v-for="item in days.week" :key="item.key">
+                <checkbox :value="item.key" />
+                {{ item.value }}
+              </label>
+            </checkbox-group>
+            <checkbox-group @change="checkboxChange" class="flex justify-between" style="flex-wrap: wrap;" id="tuoguan">
+              <label class="btn-check-label margin" :class="{ 'bg-light-green': params.week.includes(item.key + '') }" v-for="item in days.tuoguan" :key="item.key">
                 <checkbox :value="item.key" />
                 {{ item.value }}
               </label>
@@ -27,22 +33,37 @@
         </swiper-item>
         <swiper-item @touchmove.stop>
           <view class="btn-check-group padding">
-            <view class="margin">
-              <input v-model="params.hobbyOther" placeholder="输入兴趣内容  如:画画" class="margin-top input-border" />
+            <view class="margin-bottom">
+              <view class="flex align-center">
+                <input v-model="serachKey" placeholder="输入兴趣内容  如:画画" class="margin-top input-border" @confirm="search" />
+                <text class="cuIcon-search margin-left" style="font-size: 36rpx;" @tap="search"></text>
+              </view>
+              <view class="margin-top-sm">
+                <view v-for="(h, i) in params.hobbyOther" :key="i" class="hobby"
+                  >{{ h }}
+                  <text class="cuIcon-close del-hobby text-red" @tap="delHobby(h)"></text>
+                </view>
+              </view>
             </view>
-            <view class="interests">
+            <view class="interests" v-if="interests.length > 0">
               <img src="/static/imgs/intelligent-bg.png" mode="widthFix" alt="" />
-              <checkbox-group @change="checkboxChange" id="hobby">
-                <view v-for="(item, index) in interests" :key="item.id" :style="[{ top: index * 80 + 'rpx', left: (index % 2) * 320 + index * 40 + 'rpx' }]" class="interest">
+              <checkbox-group id="hobby">
+                <view
+                  v-for="(item, index) in interests"
+                  :key="index"
+                  :style="[{ top: index * 80 + 'rpx', left: (index % 2) * 320 + index * 40 + 'rpx' }]"
+                  @tap="chooseInterest(item)"
+                  class="interest"
+                >
                   <label
                     class="btn-check-label margin"
                     :style="{
-                      color: params.hobby.includes(item.id + '') ? '#fff' : '#000',
-                      backgroundColor: params.hobby.includes(item.id + '') ? colors[index % 4] : '#f0f0f0'
+                      color: params.hobbyOther.includes(item) ? '#fff' : '#000',
+                      backgroundColor: params.hobbyOther.includes(item) ? colors[3] : '#f0f0f0'
                     }"
                   >
-                    <checkbox :value="item.id" />
-                    {{ item.name }}
+                    <checkbox :value="item" />
+                    {{ item }}
                   </label>
                   <text class="cuIcon-title" :style="[{ color: colors[index % 4] }]"></text>
                 </view>
@@ -60,11 +81,6 @@
           </view>
           <view v-else>
             <view class="VerticalBox">
-              <scroll-view class="VerticalNav nav" scroll-y scroll-with-animation :scroll-top="verticalNavTop" :style="'height:calc(100vh - 70px - 40px - ' + topHeader + 'px)'">
-                <view class="cu-item" :class="index == tabCur ? 'text-green cur' : ''" v-for="(item, index) in attends" :key="index" @tap="TabSelect" :data-id="index">
-                  {{ weekList[index] }}
-                </view>
-              </scroll-view>
               <scroll-view
                 class="VerticalMain padding-sm"
                 scroll-y
@@ -73,38 +89,41 @@
                 :scroll-into-view="'main-' + mainCur"
                 @scroll="VerticalMain"
               >
-                <radio-group @change="changeClass" style="width: 100%;" v-for="(attend, i) in attends" :key="i">
-                  <view class="cu-item bg-white padding margin-bottom-sm" v-for="(item, index) in attend.list" v-show="i == mainCur" :key="index" :id="'main-' + index">
-                    <view class="cu-bar solid-bottom">
-                      <view>
-                        <label>
-                          <view class="flex justify-between align-center">
-                            <view
-                              ><text>{{ item.attend_name }}</text></view
-                            >
+                <checkbox-group style="width: 100%;" v-model="checked">
+                  <view class="cu-item bg-white padding margin-bottom-sm" v-for="(item, i) in attends" :key="i">
+                    <view>{{ item.week }}</view>
+                    <view v-for="(course, c) in item.list" :key="c">
+                      <view class="cu-bar solid-bottom">
+                        <view>
+                          <label @tap="classChange(course.class_attend_id, i)">
+                            <view class="flex justify-between align-center">
+                              <view
+                                ><text>{{ course.attend_name }}</text></view
+                              >
+                              <view>
+                                <checkbox :value="course.class_attend_id" :checked="checked.includes(course.class_attend_id)" class="round cyan" style="transform: scale(0.7);" />
+                              </view>
+                            </view>
+                          </label>
+                        </view>
+                      </view>
+                      <view v-if="course.prop.length > 0">
+                        <checkbox-group class="checkbox-group margin-top-xs" :data-id="course.class_attend_id" @change="e => propChange(e, i)">
+                          <label v-for="prop in course.prop" :key="prop.id">
                             <view>
-                              <radio :value="item.class_attend_id" :checked="checked.includes(item.class_attend_id)" class="cyan" style="transform: scale(0.7);" />
+                              <checkbox
+                                :value="prop.id"
+                                class="cyan"
+                                style="transform: scale(0.7);"
+                                :checked="checked_props[i].class_attend_id === course.class_attend_id && checked_props[i].prop.includes(prop.id)"
+                              />{{ prop.name }}<text>￥{{ prop.money }}</text>
                             </view>
-                          </view>
-                        </label>
+                          </label>
+                        </checkbox-group>
                       </view>
                     </view>
-                    <view v-if="item.prop.length > 0">
-                      <checkbox-group class="checkbox-group margin-top-xs" :data-id="item.class_attend_id" @change="propChange">
-                        <label v-for="prop in item.prop" :key="prop.id">
-                          <view>
-                            <checkbox
-                              :value="prop.id"
-                              class="cyan"
-                              :checked="checked_props[mainCur].class_attend_id === item.class_attend_id && checked_props[mainCur].prop.includes(prop.id + '')"
-                              style="transform: scale(0.7);"
-                            />{{ prop.name }}<text>￥{{ prop.money }}</text>
-                          </view>
-                        </label>
-                      </checkbox-group>
-                    </view>
                   </view>
-                </radio-group>
+                </checkbox-group>
               </scroll-view>
             </view>
             <view class="static shadow">
@@ -129,7 +148,7 @@
 </template>
 
 <script>
-import { _intelligentDates, _intelligentInterests, _intelligentCourses, _joinShops } from '@/api/course'
+import { _intelligentDates, _intelligentInterests, _intelligentCourses, _intelligentGetKeys, _joinShops } from '@/api/course'
 import shopCart from '@/components/shop-cart.vue'
 import { mapGetters } from 'vuex'
 export default {
@@ -151,15 +170,18 @@ export default {
         }
       ],
       cur: 0,
+      serachKey: '', //关键字搜素
+      keys: [], //兴趣选项
       days: [], //周期
       interests: [], //兴趣
       attends: [], //课程
-      weekList: [], //日期
+      week: [], //记录日期
+      tuoguan: [], //记录托管
       params: {
         week: [],
         hobby: [],
         student_id: '',
-        hobbyOther: ''
+        hobbyOther: []
       },
       tabCur: 0,
       mainCur: 0,
@@ -196,31 +218,76 @@ export default {
     },
     getHobbyConfig() {
       _intelligentInterests().then(res => {
-        this.interests = res.data
+        // this.interests = res.data
+        const choose = res.data[res.data.length - 1]
+        this.params.hobby = [choose.id]
+        this.keys = [...new Set(choose.names)].filter(e => e)
+        if (this.interests.length < 1) this.interests = this.keys.slice(0, 5)
+      })
+    },
+    search() {
+      if (!this.serachKey) {
+        uni.showToast({
+          title: '请输入关键字',
+          icon: 'none'
+        })
+        return false
+      }
+      this.interests = this.keys.filter(item => item.includes(this.serachKey))
+    },
+    check_key(key) {
+      const params = { week: this.params.week.join(','), student_id: this.kid, keywords: key }
+      _intelligentGetKeys(params).then(res => {
+        if (res.data.length < 1) {
+          uni.showToast({
+            title: '未找到相关课程',
+            icon: 'none',
+            duration: 2000
+          })
+        }
       })
     },
     get_options() {
       const params = Object.assign({}, this.params)
       params.week = params.week.join(',')
       params.hobby = params.hobby.join(',')
+      params.hobbyOther = params.hobbyOther.join(',')
       _intelligentCourses(params).then(res => {
-        this.attends = res.data
+        this.attends = res.data.filter(t => t.list.length > 0)
         this.checked = [] //初始化选项
-        Object.keys(this.attends).forEach(item => {
-          const class_attend_id = this.attends[item].list[0].class_attend_id
-          const prop = this.attends[item].list[0].prop.length > 0 ? [this.attends[item].list[0].prop[0].id + ''] : []
-          this.$set(this.checked, item, class_attend_id)
-          this.$set(this.checked_props, item, { class_attend_id: class_attend_id, prop: prop })
-        })
-        this.weekList = this.attends.map(item => item.week)
+        if (this.attends.length > 0) {
+          this.attends.map((course, index) => {
+            const item = course.list[0]
+            const class_attend_id = item.class_attend_id
+            this.$set(this.checked, index, class_attend_id)
+            const prop = item.prop.length > 0 ? [item.prop[0].id] : []
+            this.$set(this.checked_props, index, { class_attend_id: class_attend_id, prop: prop })
+          })
+        }
       })
     },
+    delHobby(key) {
+      this.params.hobbyOther = this.params.hobbyOther.filter(item => item != key)
+    },
+    chooseInterest(key) {
+      if (this.params.hobbyOther.includes(key)) {
+        this.params.hobbyOther = this.params.hobbyOther.filter(item => item != key)
+      } else {
+        this.params.hobbyOther.push(key)
+        this.check_key(key)
+      }
+    },
     checkboxChange(e) {
       const type = e.target.id
       const values = e.detail.value
       switch (type) {
         case 'week':
-          this.params.week = values
+          this.week = values
+          this.params.week = this.tuoguan.concat(this.week)
+          break
+        case 'tuoguan':
+          this.tuoguan = values
+          this.params.week = this.week.concat(this.tuoguan)
           break
         case 'hobby':
           this.params.hobby = values
@@ -234,7 +301,7 @@ export default {
         uni.showToast({ title: '请先选择周期', icon: 'none' })
         return false
       }
-      if (index === 2 && this.params.hobby.length < 1) {
+      if (index === 2 && this.params.hobbyOther.length < 1) {
         uni.showToast({ title: '请先选择兴趣', icon: 'none' })
         return false
       }
@@ -251,21 +318,23 @@ export default {
     changeDisableBtn() {
       this.disableBtn = true
     },
-    changeClass(e) {
-      const value = Number(e.detail.value)
-      this.checked[this.mainCur] = value
-      this.$set(this.checked, this.mainCur, value)
-      this.$set(this.checked_props, this.mainCur, { class_attend_id: value, prop: [] })
-      console.log(this.checked_props)
+    classChange(class_attend_id, i) {
+      if (this.checked.includes(class_attend_id)) {
+        this.$set(this.checked, i, null)
+        this.$set(this.checked_props, i, { class_attend_id: null, prop: [] })
+      } else {
+        this.$set(this.checked, i, class_attend_id)
+        this.$set(this.checked_props, i, { class_attend_id: class_attend_id, prop: [] })
+      }
     },
-    propChange(e) {
+    propChange(e, i) {
       const parentId = e.target.dataset.id
-      const values = e.detail.value
-      if (!this.checked.includes(parentId)) {
-        this.$set(this.checked, this.mainCur, parentId)
+      const values = e.detail.value.map(item => Number(item))
+      if (values.length > 0 && !this.checked.includes(parentId)) {
+        this.$set(this.checked, i, parentId)
       }
       const item = { class_attend_id: parentId, prop: values }
-      this.$set(this.checked_props, this.mainCur, item)
+      this.$set(this.checked_props, i, item)
     },
     TabSelect(e) {
       this.tabCur = e.currentTarget.dataset.id
@@ -327,6 +396,30 @@ export default {
     }
   }
 }
+.hobby {
+  position: relative;
+  display: inline-block;
+  margin-left: 20rpx;
+  padding: 10rpx 40rpx;
+  border-radius: 100rpx;
+  border: 1px solid #eee;
+  color: #fff;
+  background-color: #09e294;
+  .del-hobby {
+    position: absolute;
+    top: -6rpx;
+    right: -20rpx;
+  }
+}
+.week-card {
+  width: 160rpx;
+  height: 100rpx;
+  text-align: center;
+  line-height: 100rpx;
+  border-radius: 20rpx;
+  color: #333;
+  background-color: #fff;
+}
 .interests {
   position: relative;
   .interest {
@@ -356,6 +449,7 @@ export default {
   }
 }
 .input-border {
+  width: 80%;
   height: 80rpx;
   border-radius: 4px;
   border: 1px solid #eee;

src/pages/class/gift1.vue

@@ -1,229 +0,0 @@
-<template>
-  <view>
-    <cu-custom :isBack="true" title="一键报课"></cu-custom>
-    <view class="VerticalBox">
-      <scroll-view class="VerticalNav nav" scroll-y scroll-with-animation :scroll-top="verticalNavTop" :style="'height:calc(100vh - 70px - ' + topHeader + 'px)'">
-        <view class="cu-item" :class="index == tabCur ? 'text-green cur' : ''" v-for="(item, index) in attends" :key="index" @tap="TabSelect" :data-id="index">
-          {{ weekList[index] }}
-        </view>
-      </scroll-view>
-      <scroll-view
-        class="VerticalMain padding-sm"
-        scroll-y
-        scroll-with-animation
-        :style="'height:calc(100vh - 70px - ' + topHeader + 'px)'"
-        :scroll-into-view="'main-' + mainCur"
-        @scroll="VerticalMain"
-      >
-        <radio-group @change="changeClass" style="width: 100%;" v-for="(attend, i) in attends" :key="i">
-          <view class="cu-item bg-white padding margin-bottom-sm" v-for="(item, index) in attend" v-show="i == mainCur" :key="index" :id="'main-' + index">
-            <view class="cu-bar solid-bottom">
-              <view>
-                <label>
-                  <view class="flex justify-between align-center">
-                    <view
-                      ><text>{{ item.attend_name }}</text></view
-                    >
-                    <view>
-                      <radio
-                        :value="item.class_attend_id"
-                        :disabled="!item.enable"
-                        :class="{ disabled: !item.enable }"
-                        :checked="checked.includes(item.class_attend_id)"
-                        class="cyan"
-                        style="transform: scale(0.7);"
-                      />
-                    </view>
-                  </view>
-                </label>
-              </view>
-            </view>
-            <view v-if="item.prop.length > 0">
-              <checkbox-group class="checkbox-group margin-top-xs" :data-id="item.class_attend_id" @change="propChange">
-                <label v-for="prop in item.prop" :key="prop.id">
-                  <view>
-                    <checkbox
-                      :value="prop.id"
-                      :disabled="!item.enable"
-                      :class="{ disabled: !item.enable }"
-                      :checked="checked_props[mainCur].class_attend_id === item.class_attend_id && checked_props[mainCur].prop.includes(prop.id + '')"
-                      class="cyan"
-                      style="transform: scale(0.7);"
-                    />{{ prop.name }}<text>￥{{ prop.money }}</text>
-                  </view>
-                </label>
-              </checkbox-group>
-            </view>
-          </view>
-        </radio-group>
-      </scroll-view>
-    </view>
-    <view class="static shadow">
-      <view class="static-order flex">
-        <shop-cart :class_attend_id="attend_id" @changeDisableBtn="changeDisableBtn"></shop-cart>
-        <button class="cu-btn round bg-student text-white margin-left-xs" @tap="addCart">报课</button>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import { _gift, _joinShops } from '@/api/course'
-import { mapGetters } from 'vuex'
-import shopCart from '@/components/shop-cart.vue'
-export default {
-  components: {
-    shopCart
-  },
-  data() {
-    return {
-      topHeader: this.globalCustomBarHeight,
-      package_id: 0,
-      attends: [],
-      weekList: [],
-      attend_id: 0, // 添加成功课程
-      checked: [], // 选中
-      checked_props: [], // 选中工具
-      tabCur: 1,
-      mainCur: 1,
-      verticalNavTop: 0,
-      disableBtn: false // 避免多次重复点击
-    }
-  },
-  computed: {
-    ...mapGetters(['kid'])
-  },
-  onLoad(options) {
-    const id = decodeURIComponent(options.package_id)
-    this.package_id = id
-    this.init()
-  },
-  onShow() {
-    this.disableBtn = false
-  },
-  methods: {
-    init() {
-      _gift({ class_package_id: this.package_id }).then(res => {
-        this.attends = res.data.attends
-        Object.keys(this.attends).forEach(item => {
-          this.$set(this.checked_props, item, { prop: [] })
-        })
-        this.weekList = res.data.week_list
-      })
-    },
-    changeDisableBtn() {
-      this.disableBtn = true
-    },
-    addCart() {
-      if (this.disableBtn) return false
-      this.disableBtn = true
-      const _self = this
-      const list = this.checked_props
-        .filter(item => item.class_attend_id)
-        .map(item => {
-          return {
-            class_attend_id: item.class_attend_id,
-            prop: item.prop.join(','),
-            student_id: this.kid
-          }
-        })
-      if (list.length < 1) {
-        uni.showToast({ title: '请先选择课程', icon: 'none' })
-        this.disableBtn = false
-        return false
-      }
-      _joinShops({ list }).then(res => {
-        if (res.code === 1) {
-          _self.globalNavigateTo('classCart')
-        } else {
-          this.disableBtn = false
-        }
-      })
-    },
-    TabSelect(e) {
-      this.tabCur = e.currentTarget.dataset.id
-      this.mainCur = e.currentTarget.dataset.id
-      this.verticalNavTop = (e.currentTarget.dataset.id - 1) * 50
-    },
-    changeClass(e) {
-      const value = Number(e.detail.value)
-      this.checked[this.mainCur] = value
-      this.$set(this.checked, this.mainCur, value)
-      this.$set(this.checked_props, this.mainCur, { class_attend_id: value, prop: [] })
-    },
-    propChange(e) {
-      const parentId = e.target.dataset.id
-      const values = e.detail.value
-      if (!this.checked.includes(parentId)) {
-        this.$set(this.checked, this.mainCur, parentId)
-      }
-      const item = { class_attend_id: parentId, prop: values }
-      this.$set(this.checked_props, this.mainCur, item)
-    },
-    VerticalMain(e) {}
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-::v-deep radio.disabled::before,
-::v-deep checkbox.disabled::before {
-  color: #e1e1e1 !important;
-}
-.static {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  display: flex;
-  background: #fff;
-  height: 70px;
-  align-items: center;
-  padding: 0 0.8rem;
-  justify-content: flex-end;
-}
-.fixed {
-  position: fixed;
-  z-index: 99;
-}
-.VerticalNav.nav {
-  width: 200upx;
-  white-space: initial;
-}
-
-.VerticalNav.nav .cu-item {
-  width: 100%;
-  text-align: center;
-  background-color: #fff;
-  margin: 0;
-  border: none;
-  height: 50px;
-  position: relative;
-}
-
-.VerticalNav.nav .cu-item.cur {
-  background-color: #f1f1f1;
-}
-
-.VerticalNav.nav .cu-item.cur::after {
-  content: '';
-  width: 8upx;
-  height: 30upx;
-  border-radius: 10upx 0 0 10upx;
-  position: absolute;
-  background-color: currentColor;
-  top: 0;
-  right: 0upx;
-  bottom: 0;
-  margin: auto;
-}
-
-.VerticalBox {
-  display: flex;
-}
-
-.VerticalMain {
-  background-color: #f1f1f1;
-  flex: 1;
-}
-</style>

src/pages/index/index.vue

@@ -206,6 +206,7 @@ export default {
         }
       ],
       price: [],
+      page_size: 10,
       params: {
         page_num: 1,
         course_name: '',

src/pages/mine/courseFiles.vue

@@ -40,12 +40,18 @@ export default {
       })
     },
     goto(page, file) {
-      const ability = this.ability.filter(item => {
-        if (file.ability_total[item.id]) {
-          this.$set(item, 'score', file.ability_total[item.id])
-          return true
-        }
-      })
+      let ability = file.ability
+        .split(',')
+        .filter(s => s)
+        .map(item => {
+          const ab = this.ability.find(e => Number(e.id) === Number(item))
+          const score = file.ability_total[item] || 0
+          return {
+            id: item,
+            name: ab.name,
+            score: score
+          }
+        })
       this.$set(file, 'ability', ability)
       this.globalNavigateTo(page, { file: JSON.stringify(file) })
     }

src/pages/myStudents/myStudents.vue

@@ -148,7 +148,7 @@ export default {
         school_name: ''
       },
       info: {
-        id: '',
+        student_id: '',
         name: '',
         school_id: '',
         grade_id: '',
@@ -232,7 +232,7 @@ export default {
       })
     },
     fixStudent(item) {
-      this.info.id = item.id
+      this.info.student_id = item.id
       this.info.name = item.name
       this.info.school_id = item.school
       this.gradeIndex = this.grades.findIndex(e => e.name === item.grade_name)

src/pages/studentcenter/classVideo.vue

@@ -1,12 +1,11 @@
 <template>
   <view class="page">
     <cu-custom :isBack="true" title="课堂视频"></cu-custom>
-    <scroll-view scroll-y="true" :style="[{height:'calc(100vh - '+ topHeader+'px)'}]">
+    <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">
+          <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>
@@ -14,16 +13,14 @@
           </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="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>
+                  <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>
@@ -37,7 +34,7 @@
 <script>
 import { checkTypes } from '@/common/utils/index'
 export default {
-  data () {
+  data() {
     return {
       topHeader: this.globalCustomBarHeight,
       detail: {},
@@ -49,12 +46,27 @@ export default {
       }
     }
   },
-  onLoad () {
-    this.init()
+  // 配置分享
+  onShareAppMessage(res) {
+    if (res.from === 'button') {
+      // 来自页面内分享按钮
+      console.log(res.target)
+    }
+    return {
+      title: '课程视频',
+      path: `/pages/studentcenter/classVideo?detail=${JSON.stringify(this.detail)}`
+    }
+  },
+  onLoad(options) {
+    if (options.detail) {
+      this.detail = JSON.parse(options.detail)
+    } else {
+      this.init()
+    }
   },
   methods: {
     checkTypes,
-    init () {
+    init() {
       this.detail = JSON.parse(uni.getStorageSync('daily_class'))
     }
   }

src/pages/studentcenter/index.vue

@@ -1,98 +1,85 @@
 <template>
   <view class="page">
     <cu-custom :isBack="false"></cu-custom>
-    <view class="header" :style="[{top:topHeader + 'px'}]">
+    <view class="header" :style="[{ top: topHeader + 'px' }]">
       <view class="header-title header-switch">
-        <view class="header-title-main" @tap="changeTab('schedule')" :class="{'cur':type==='schedule'}">
+        <view class="header-title-main" @tap="changeTab('schedule')" :class="{ cur: type === 'schedule' }">
           <view class="margin-bottom-xs">日程表</view>
           <view class="point"></view>
         </view>
-        <view class="header-title-main margin-left-lg" @tap="changeTab('mine')" :class="{'cur':type==='mine'}">
+        <view class="header-title-main margin-left-lg" @tap="changeTab('mine')" :class="{ cur: type === 'mine' }">
           <view class="margin-bottom-xs">我的</view>
           <view class="point"></view>
         </view>
       </view>
-      <view style="width:120px;" v-if="type==='mine'">
+      <view style="width: 120px;" v-if="type === 'mine'">
         <swiper-tab :menuList="menuList" @changeTab="swipe" :activeTab="currentIndex"></swiper-tab>
       </view>
     </view>
     <!-- 日程表 -->
-    <view v-if="type==='schedule'">
-      <scroll-view scroll-y="true" :style="[{marginTop:'56px',height:'calc(100vh - 114px - '+ topHeader+'px)'}]">
+    <view v-if="type === 'schedule'">
+      <scroll-view scroll-y="true" :style="[{ marginTop: '56px', height: 'calc(100vh - 114px - ' + topHeader + 'px)' }]">
         <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">
+              <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}}
+                  {{ info.chooseDate }}
                   <text class="cuIcon-right lg"></text>
                 </view>
               </picker>
             </view>
-            <view>
-              共{{present.attendance_data.length}}天
-            </view>
+            <view> 共{{ present.attendance_data.length }}天 </view>
           </view>
           <view class="calendar-main">
-            <calendar :year="year" :month="month" :showBusiness="true" @changeDate="chooseDay" ref="calendar">
-            </calendar>
+            <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 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">
-              <view>应到上课节数：{{present.be_section_num}}节</view>
-              <view>实际上课节数: {{present.actual_section_num}}节</view>
+              <view>应到上课节数：{{ present.be_section_num }}节</view>
+              <view>实际上课节数: {{ present.actual_section_num }}节</view>
             </view>
             <view class="day-chart flex justify-between padding">
-              <view v-for="(chart,key) in attendance" :key="key" class="flex-sub">
-                <canvas :canvas-id="key" style="margin:0 auto;width:100%;height:80px;"></canvas>
-                <view style="margin-left:18px;">{{chart.title}}</view>
+              <view v-for="(chart, key) in attendance" :key="key" class="flex-sub">
+                <canvas :canvas-id="key" style="margin: 0 auto; width: 100%; height: 80px;"></canvas>
+                <view style="margin-left: 18px;">{{ chart.title }}</view>
               </view>
             </view>
           </view>
         </view>
         <view class="list margin-top-xs">
-          <view class="cu-card margin-top margin-bottom shadow" v-for="(item,index) in classList" :key="index">
-            <view class="cu-item" v-for="(mark,i) in item.mark" :key="i">
+          <view class="cu-card margin-top margin-bottom shadow" v-for="(item, index) in classList" :key="index">
+            <view class="cu-item" v-for="(mark, i) in item.mark" :key="i">
               <view class="card-header flex justify-end solid-bottom">
                 <view class="text-student course-status">
-                  {{mark.status_desc}}
+                  {{ mark.status_desc }}
                 </view>
               </view>
               <view class="card flex">
                 <view class="card-left">
-                  <img mode="scaleToFill" :src="mark.avatar" alt="" class="card-image">
+                  <img mode="scaleToFill" :src="mark.avatar" alt="" class="card-image" />
                 </view>
                 <view class="card-right margin-left-sm">
-                  <view class="card-title">{{mark.course_name}}</view>
+                  <view class="card-title">{{ mark.course_name }}</view>
                   <view class="card-item margin-top-xs">
-                    <text class="card-text">{{mark.start_at}}</text>
+                    <text class="card-text">{{ mark.start_at }}</text>
                   </view>
                   <view class="card-item margin-top-xs">
-                    <text class="card-text">{{mark.end_at}}</text>
+                    <text class="card-text">{{ mark.end_at }}</text>
                   </view>
                   <view class="card-item margin-top-xs">
                     <button class="cu-btn round line-cyan button-hover" @tap="classOperation(mark.class_plan_id)">
-                      {{mark.status==-1?'查看':'去上课'}}
+                      {{ mark.status == -1 ? '查看' : '去上课' }}
                     </button>
-                    <button class="cu-btn round line-red button-hover margin-left" @tap="askLeave(mark.class_plan_id)"
-                      v-if="mark.status!==-1">去请假</button>
+                    <button class="cu-btn round line-red button-hover margin-left" @tap="askLeave(mark.class_plan_id)" v-if="mark.status !== -1">去请假</button>
                   </view>
                 </view>
               </view>
@@ -102,34 +89,33 @@
       </scroll-view>
     </view>
     <!-- 我的 -->
-    <view v-if="type==='mine'">
-      <scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-main"
-        :style="[{height:'calc(100vh - 114px - '+ topHeader+'px)'}]">
+    <view v-if="type === 'mine'">
+      <scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-main" :style="[{ height: 'calc(100vh - 114px - ' + topHeader + 'px)' }]">
         <view class="list">
-          <view class="cu-card margin-top margin-bottom shadow" v-for="(item,index) in list" :key="index">
+          <view class="cu-card margin-top margin-bottom shadow" v-for="(item, index) in list" :key="index">
             <view class="cu-item">
               <view class="card-header flex justify-between solid-bottom">
-                <view v-if="item.day">{{item.day}}</view>
+                <view v-if="item.day">{{ item.day }}</view>
                 <view class="text-student course-status" v-if="item.status">
-                  {{item.status}}
+                  {{ item.status }}
                 </view>
-                <view class="text-student course-status" v-if="currentIndex===1">
+                <view class="text-student course-status" v-if="currentIndex === 1">
                   已完结
                 </view>
               </view>
               <view class="card flex">
                 <view class="card-left">
-                  <img mode="scaleToFill" :src="item.image" alt="" class="card-image">
+                  <img mode="scaleToFill" :src="item.image" alt="" class="card-image" />
                 </view>
                 <view class="card-right margin-left-sm">
-                  <view class="card-title">{{item.attend_name}}</view>
+                  <view class="card-title">{{ item.attend_name }}</view>
                   <view class="card-item margin-top-xs">
                     <text class="card-label">机构：</text>
-                    <text class="card-text">{{item.agency_name||'-'}}</text>
+                    <text class="card-text">{{ item.agency_name || '-' }}</text>
                   </view>
                   <view class="card-item margin-top-xs">
                     <text class="card-label">老师：</text>
-                    <text class="card-text">{{item.teacher||'-'}}</text>
+                    <text class="card-text">{{ item.teacher || '-' }}</text>
                   </view>
                 </view>
               </view>
@@ -150,9 +136,10 @@ import { getDate, deepClone } from '@/common/utils'
 import swiperTab from '@/components/swiper-tab.vue'
 export default {
   components: {
-    swiperTab, calendar
+    swiperTab,
+    calendar
   },
-  data () {
+  data() {
     return {
       topHeader: this.globalCustomBarHeight,
       type: 'schedule',
@@ -163,7 +150,8 @@ export default {
       list: [],
       classList: [], // 日程表当天
       courses: [], // 日程表全部
-      info: { // 日历数据
+      info: {
+        // 日历数据
         chooseDate: '', // 选中日期
         year: '',
         month: '',
@@ -181,57 +169,68 @@ export default {
         leave_num: 0,
         normal_num: 0
       }, // 实际出席情况
-      attendance: { // 出席统计数据
+      attendance: {
+        // 出席统计数据
         leave_num: {
-          title: '请假', times: 2, color: '#3390F5'
+          title: '请假',
+          times: 2,
+          color: '#3390F5'
         },
         late_num: {
-          title: '迟到', times: 1, color: '#fbbd08'
+          title: '迟到',
+          times: 1,
+          color: '#fbbd08'
         },
         normal_num: {
-          title: '正常', times: 3, color: '#4DB8E4'
+          title: '正常',
+          times: 3,
+          color: '#39b54a'
         },
         absenteeism_num: {
-          title: '旷课', times: 0, color: '#e54d42'
+          title: '旷课',
+          times: 0,
+          color: '#e54d42'
         }
       }
     }
   },
-  onShow () {
+  onShow() {
     const today = getDate(new Date(), 0)
     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.start = this.info.year - 1 + '-' + '01-01'
     this.info.end = this.info.year + '-' + (Number(this.info.month) + 1) + '-' + this.info.day
     this.init()
   },
   methods: {
-    init () {
+    init() {
       if (this.type === 'mine') {
         this.get_list()
       } else {
         this.getSehedule()
       }
     },
-    getSehedule () {
+    getSehedule() {
       this.setCalendar()
       this.get_attend().then(res => {
         this.present = res.data
-        this.fix_attend(res.data)// 出席统计
-        this.setAttendance(res.data.attendance_data)// 日历显示出席日期
+        this.fix_attend(res.data) // 出席统计
+        this.setAttendance(res.data.attendance_data) // 日历显示出席日期
         this.drawChart()
-        this.get_dateCourse()// 获取日期课程列表
+        this.get_dateCourse() // 获取日期课程列表
       })
     },
-    classOperation (id) { // 上课
+    classOperation(id) {
+      // 上课
       this.globalNavigateTo('studentOperation', { id })
     },
-    askLeave (id) { // 请假
+    askLeave(id) {
+      // 请假
       this.globalNavigateTo('studentAbsent', { id })
     },
-    loadMore () {
+    loadMore() {
       if (this.noMore) {
         uni.showToast({ title: '没有更多了', icon: 'none' })
         return false
@@ -239,18 +238,18 @@ export default {
       this.page_num++
       this.get_list()
     },
-    get_list () {
+    get_list() {
       if (this.currentIndex === 0) {
         this.get_course()
       } else {
         this.get_history()
       }
     },
-    chooseDay (day) {
-      this.classList = this.courses.filter(item => item.date.replace(/-/g, '') === day)// 匹配当天数据
+    chooseDay(day) {
+      this.classList = this.courses.filter(item => item.date.replace(/-/g, '') === day) // 匹配当天数据
       this.classList = this.classList.length > 0 ? this.classList : deepClone(this.courses)
     },
-    get_course () {
+    get_course() {
       _nowCourse({ page_num: this.page_num }).then(res => {
         if (this.page_num > 1) {
           if (res.data.length < this.page_size) this.noMore = true
@@ -261,7 +260,7 @@ export default {
         }
       })
     },
-    get_history () {
+    get_history() {
       _courseHistory({ page_num: this.page_num }).then(res => {
         if (this.page_num > 1) {
           if (res.data.length < this.page_size) this.noMore = true
@@ -272,23 +271,23 @@ export default {
         }
       })
     },
-    drawChart () {
+    drawChart() {
       for (var key in this.attendance) {
         this.draw(this.attendance[key], key)
       }
     },
-    changeTab (type) {
+    changeTab(type) {
       this.type = type
       this.$nextTick(() => {
         this.init()
       })
     },
-    swipe (index) {
+    swipe(index) {
       this.currentIndex = index
       this.page_num = 1
       this.get_list()
     },
-    bindDateChange (e) {
+    bindDateChange(e) {
       const value = e.detail.value
       const [year, month] = value.split('-')
       this.info.year = year
@@ -296,36 +295,42 @@ export default {
       this.info.chooseDate = value
       this.getSehedule()
     },
-    setCalendar () {
+    setCalendar() {
       this.$refs.calendar.selCalendar(this.info.year, this.info.month)
     },
-    setAttendance (attendance) { // 补充出席情况
+    setAttendance(attendance) {
+      // 补充出席情况
       if (!attendance) return
       this.$refs.calendar.setAttendance(attendance)
     },
-    get_attend () { // 获取出席情况
+    get_attend() {
+      // 获取出席情况
       const date = this.info.year + '-' + this.info.month
       return new Promise((resolve, reject) => {
         const info = _attendance({ date })
         resolve(info)
       })
     },
-    fix_attend (info) { // 补充出席实际数据
+    fix_attend(info) {
+      // 补充出席实际数据
       Object.keys(this.attendance).forEach(key => {
         this.attendance[key].times = info[key]
       })
     },
-    get_dateCourse () { // 获取对应日期数据
+    get_dateCourse() {
+      // 获取对应日期数据
       _dateCourse({ year: this.info.year, month: this.info.month }).then(res => {
         this.classList = res.data
         this.courses = res.data
+        const days = this.courses.map(item => parseInt(item.day))
+        this.$refs.calendar.setClass(days)
       })
     },
-    draw (ele, key) {
+    draw(ele, key) {
       const ctx = uni.createCanvasContext(key)
-      const value = NP.divide(ele.times, this.present.be_section_num) * 100// 次数转化对应百分比值
+      const value = NP.divide(ele.times, this.present.be_section_num) * 100 // 次数转化对应百分比值
       const startAngle = 1.5
-      const endAngle = 1.5 + value * 2 / 100
+      const endAngle = 1.5 + (value * 2) / 100
       // 画圆环
       ctx.beginPath()
       ctx.arc(34, 40, 28, 0, 2 * Math.PI)