fix:修改学生信息和登录接口去token

src/api/course.js

@@ -116,3 +116,15 @@ export function _leaveType (params) {
 export function _askLeave (params) {
 	return fetch('/parents/schedule/student_leave', params)
 }
+//获取年级
+export function _getGrades () {
+	return fetch('/parents/init/get_grades')
+}
+//获取班级
+export function _getClasses (params) {
+	return fetch('/parents/init/get_classes', params)
+}
+//修改信息
+export function _fixStudent (params) {
+	return fetch('/parents/init/edit_student', params)
+}

src/common/utils/fetch.js

@@ -3,6 +3,8 @@ import store from '@/store/index'
 // 统一请求方法
 export default function fetch (url, params = {}, method = 'POST', showFail = true) {
 	let showLoading = true
+	//不需要token请求
+	const noTokenUrls = ['/parents/login/wx_login', '/parents/login/wx_auth']
 	if (params && params.notShowLoading) {
 		showLoading = false
 	}
@@ -12,9 +14,11 @@ export default function fetch (url, params = {}, method = 'POST', showFail = tru
 			title: '加载中...'
 		})
 	}
+	if (!noTokenUrls.includes(url)) {
+		params.token = store.getters.token
+		params.student_id = params.student_id || store.getters.kid
+	}
 	url = process.env.VUE_APP_BASE_URL + url
-	params.token = store.getters.token
-	params.student_id = params.student_id || store.getters.kid
 	return new Promise((resolve, reject) => {
 		uni.request({
 			url,

src/pages/myStudents/myStudents.vue

@@ -17,7 +17,7 @@
           <view class="students-title flex justify-between align-center">
             <view class="text-lg">学生列表</view>
             <view class="text-xs text-grey">
-              <text class="text-red">点击选择，左滑删除，右侧添加</text>
+              <text class="text-red">点击选择，左滑操作，右侧添加</text>
               <text class="cuIcon-roundaddfill text-cyan margin-left-xl add-icon" @tap="showModal" data-target="ChooseModal"></text>
             </view>
           </view>
@@ -47,7 +47,7 @@
                   <text class="cuIcon-check text-student font-check" v-if="item.id === kid"></text>
                 </view>
                 <view class="move student-move">
-                  <view class="bg-cyan" @tap.stop="fixStudent(item.id)">修改</view>
+                  <view class="bg-cyan" @tap.stop="fixStudent(item)">修改</view>
                   <view class="bg-red" @tap.stop="unbind(item.id)">删除</view>
                 </view>
               </view>
@@ -133,8 +133,9 @@
 
 <script>
 import { _getStudents, _bindStudent, _unbindStudent } from '@/api/auth'
-import { _shopList } from '@/api/course'
+import { _shopList, _getGrades, _getClasses, _fixStudent } from '@/api/course'
 import { mapGetters } from 'vuex'
+import validate from '@/common/utils/ys-validate'
 export default {
   data() {
     return {
@@ -149,23 +150,18 @@ export default {
       info: {
         id: '',
         name: '',
+        school_id: '',
         grade_id: '',
         class_id: ''
       },
+      rules: [
+        { name: 'grade_id', required: true, type: 'number', errmsg: '请选择相应年级' },
+        { name: 'class_id', required: true, type: 'number', errmsg: '请选择相应班级' }
+      ],
       gradeIndex: -1, //年级index
       classIndex: -1, //班级index
-      grades: [
-        { name: '一年级', id: 1 },
-        { name: '二年级', id: 2 },
-        { name: '三年级', id: 3 },
-        { name: '四年级', id: 4 },
-        { name: '五年级', id: 5 }
-      ], //年级列表
-      classes: [
-        { name: '一班', id: 1 },
-        { name: '二班', id: 2 },
-        { name: '三班', id: 3 }
-      ], //班级列表
+      grades: [], //年级列表
+      classes: [], //班级列表
       result: null,
       chooseList: [],
       moveModel: null,
@@ -191,6 +187,7 @@ export default {
         success: res => {}
       })
     }
+    this.get_grades()
   },
   methods: {
     showModal(e) {
@@ -234,29 +231,66 @@ export default {
         }
       })
     },
-    fixStudent(id) {
-      const item = this.result.student_data.find(item => item.id === id)
-      this.info.id = id
+    fixStudent(item) {
+      this.info.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)
       this.info.grade_id = this.grades[this.gradeIndex]['id']
-      this.classIndex = this.classes.findIndex(e => e.name === item.class_name)
-      this.info.class_id = this.classes[this.classIndex]['id']
+      this.get_classes().then(res => {
+        this.classIndex = res.findIndex(c => c.name === item.class_name)
+        this.info.class_id = this.classes[this.classIndex]['id']
+      })
       this.modalName = 'FixModal'
     },
-    get_grades() {},
-    get_classes() {},
+    get_grades() {
+      _getGrades().then(res => {
+        this.grades = res.data
+      })
+    },
+    get_classes() {
+      return new Promise((resolve, reject) => {
+        _getClasses({ school_id: this.info.school_id, grade_id: this.info.grade_id }).then(res => {
+          this.classes = res.data
+          resolve(res.data)
+        })
+      })
+    },
     gradeChange(e) {
       this.gradeIndex = e.detail.value
-      this.studentForm.grade_id = this.grades[this.gradeIndex].id
+      this.info.grade_id = this.grades[this.gradeIndex].id
       this.classIndex = -1
+      this.info.class_id = ''
       this.get_classes()
     },
     classChange(e) {
       this.classIndex = e.detail.value
-      this.studentForm.class_id = this.classes[this.classIndex].id
+      this.info.class_id = this.classes[this.classIndex].id
+    },
+    confirmFix() {
+      const validRes = validate.validate(this.info, this.rules)
+      if (!validRes.isOk) {
+        uni.showToast({
+          icon: 'none',
+          title: validRes.errmsg
+        })
+        return false
+      }
+      uni.showModal({
+        title: '确认',
+        content: '确定修改？',
+        confirmText: '确定',
+        cancelText: '取消',
+        success: res => {
+          if (res.confirm) {
+            _fixStudent(this.info).then(res => {
+              this.get_list()
+              this.hideModal()
+            })
+          }
+        }
+      })
     },
-    confirmFix() {},
     unbind(id) {
       const _self = this
       uni.showModal({

src/pages/studentcenter/works.vue

@@ -14,7 +14,7 @@
         </view>
         <view>
           <view class="title margin-top-sm">课堂作品</view>
-          <view class="list">
+          <view class="list" v-if="detail.student_comment_data">
             <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">