no message

src/api/course.js

@@ -20,23 +20,23 @@ export function _intelligentGetKeys (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)
 }
@@ -44,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)
 }
@@ -68,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)
 }
@@ -126,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/pages/class/gift.vue

@@ -38,7 +38,7 @@
                 <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="flex margin-top-sm">
+              <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>
@@ -59,7 +59,7 @@
                     class="btn-check-label margin"
                     :style="{
                       color: params.hobbyOther.includes(item) ? '#fff' : '#000',
-                      backgroundColor: params.hobbyOther.includes(item) ? colors[index % 4] : '#f0f0f0'
+                      backgroundColor: params.hobbyOther.includes(item) ? colors[3] : '#f0f0f0'
                     }"
                   >
                     <checkbox :value="item" />
@@ -91,34 +91,37 @@
               >
                 <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 class="cu-bar solid-bottom">
-                      <view>
-                        <label @tap="classChange(item.class_attend_id, i)">
-                          <view class="flex justify-between align-center">
-                            <view
-                              ><text>{{ item.attend_name }}</text></view
-                            >
+                    <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>
-                              <checkbox :value="item.class_attend_id" :checked="checked.includes(item.class_attend_id)" class="round 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"
-                              style="transform: scale(0.7);"
-                              :checked="checked_props[i].class_attend_id === item.class_attend_id && checked_props[i].prop.includes(prop.id)"
-                            />{{ prop.name }}<text>￥{{ prop.money }}</text>
-                          </view>
-                        </label>
-                      </checkbox-group>
-                    </view>
                   </view>
                 </checkbox-group>
               </scroll-view>
@@ -218,7 +221,8 @@ export default {
         // this.interests = res.data
         const choose = res.data[res.data.length - 1]
         this.params.hobby = [choose.id]
-        this.keys = choose.names
+        this.keys = [...new Set(choose.names)].filter(e => e)
+        if (this.interests.length < 1) this.interests = this.keys.slice(0, 5)
       })
     },
     search() {
@@ -249,10 +253,11 @@ export default {
       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 = [] //初始化选项
         if (this.attends.length > 0) {
-          this.attends.map((item, index) => {
+          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] : []
@@ -322,15 +327,14 @@ export default {
         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.map(item => Number(item))
       if (values.length > 0 && !this.checked.includes(parentId)) {
-        this.$set(this.checked, this.checked.length, parentId)
+        this.$set(this.checked, i, parentId)
       }
-      let index = this.checked.findIndex(e => e == parentId)
       const item = { class_attend_id: parentId, prop: values }
-      this.$set(this.checked_props, index, item)
+      this.$set(this.checked_props, i, item)
     },
     TabSelect(e) {
       this.tabCur = e.currentTarget.dataset.id
@@ -394,13 +398,28 @@ 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 {

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)