Merge branch 'master' into dev_seam_intelligent

src/api/course.js

@@ -112,7 +112,7 @@ export function _commentDetail (params) {
 export function _leaveType (params) {
 	return fetch('/teacher/leave/get_leave_type', params)
 }
-// 申请请假 parents/schedule/student_leave
+// 申请请假
 export function _askLeave (params) {
 	return fetch('/parents/schedule/student_leave', params)
 }
@@ -120,3 +120,15 @@ export function _askLeave (params) {
 export function _getStudentFiles (params) {
 	return fetch('/parents/courseFiles/get_list', 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

@@ -2,52 +2,56 @@ import store from '@/store/index'
 
 // 统一请求方法
 export default function fetch (url, params = {}, method = 'POST', showFail = true) {
-  let showLoading = true
-  if (params && params.notShowLoading) {
-    showLoading = false
-  }
-  if (showLoading) {
-    uni.showLoading({
-      mask: true,
-      title: '加载中...'
-    })
-  }
-  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,
-      data: params,
-      method,
-      header: {},
-      success: (res) => {
-        uni.hideLoading()
-        // 0:错误; 1:正确; 10000:没有token -2: 需要绑定手机
-        const rs = res.data
-        if (rs && rs.code === 1) {
-          resolve(rs)
-        } else if (rs.code === 10000) {
-          // // 跳转至登录页
-          uni.showModal({
-            title: '请先登录',
-            content: '您还没有登录,请先去登录',
-            success: res => {
-              if (res.confirm) {
-                uni.navigateTo({ url: '/pages/login/index' })
-              }
-            }
-          })
-        } else {
-          if (showFail) uni.showToast({ title: rs.msg, icon: 'none', duration: 2000 })// 直接提示错误
-          resolve(rs)
-        }
-      },
-      fail: (err) => {
-        uni.hideLoading()
-        uni.showToast({ title: err, icon: 'none', duration: 2000 })
-        reject(err)
-      }
-    })
-  })
+	let showLoading = true
+	//不需要token请求
+	const noTokenUrls = ['/parents/login/wx_login', '/parents/login/wx_auth']
+	if (params && params.notShowLoading) {
+		showLoading = false
+	}
+	if (showLoading) {
+		uni.showLoading({
+			mask: true,
+			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
+	return new Promise((resolve, reject) => {
+		uni.request({
+			url,
+			data: params,
+			method,
+			header: {},
+			success: (res) => {
+				uni.hideLoading()
+				// 0:错误; 1:正确; 10000:没有token -2: 需要绑定手机
+				const rs = res.data
+				if (rs && rs.code === 1) {
+					resolve(rs)
+				} else if (rs.code === 10000) {
+					// // 跳转至登录页
+					uni.showModal({
+						title: '请先登录',
+						content: '您还没有登录,请先去登录',
+						success: res => {
+							if (res.confirm) {
+								uni.navigateTo({ url: '/pages/login/index' })
+							}
+						}
+					})
+				} else {
+					if (showFail) uni.showToast({ title: rs.msg, icon: 'none', duration: 2000 })// 直接提示错误
+					resolve(rs)
+				}
+			},
+			fail: (err) => {
+				uni.hideLoading()
+				uni.showToast({ title: err, icon: 'none', duration: 2000 })
+				reject(err)
+			}
+		})
+	})
 }

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,6 +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)">修改</view>
                   <view class="bg-red" @tap.stop="unbind(item.id)">删除</view>
                 </view>
               </view>
@@ -95,13 +96,46 @@
         </view>
       </view>
     </view>
+    <!-- 修改学生 -->
+    <view class="cu-modal" :class="modalName == 'FixModal' ? '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>{{ info.name }}</view>
+          <view class="margin-top">
+            <picker class="student-input" @change="gradeChange" :value="gradeIndex" :range="grades" range-key="name">
+              <view class="picker text-lg text-black">
+                {{ gradeIndex > -1 ? grades[gradeIndex].name : '请选择年级' }}
+              </view>
+            </picker>
+          </view>
+          <view class="margin-top">
+            <picker class="student-input" @change="classChange" :value="classIndex" :range="classes" range-key="name">
+              <view class="picker text-lg text-black">
+                {{ classIndex > -1 ? classes[classIndex].name : '请选择班级' }}
+              </view>
+            </picker>
+            <!-- <input type="text" v-model.trim="info.class_name" placeholder="修改班级" class="student-input text-black text-lg" /> -->
+          </view>
+        </view>
+        <view class="cu-bar modal-footer justify-center">
+          <view class="action">
+            <button class="cu-btn btn-lg round bg-cyan margin-right-sm" @tap="confirmFix">确定</button>
+            <button class="cu-btn btn-lg round bg-grey" @tap="hideModal">取消</button>
+          </view>
+        </view>
+      </view>
+    </view>
   </view>
 </template>
 
 <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 {
@@ -113,6 +147,21 @@ export default {
         student_name: '',
         school_name: ''
       },
+      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: [], //年级列表
+      classes: [], //班级列表
       result: null,
       chooseList: [],
       moveModel: null,
@@ -124,7 +173,7 @@ export default {
   computed: {
     ...mapGetters(['kid', 'phone'])
   },
-  onLoad() {},
+  onLoad(options) {},
   onShow() {
     this.get_list()
     const kid = this.kid
@@ -138,6 +187,7 @@ export default {
         success: res => {}
       })
     }
+    this.get_grades()
   },
   methods: {
     showModal(e) {
@@ -181,6 +231,66 @@ export default {
         }
       })
     },
+    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.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() {
+      _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.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.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()
+            })
+          }
+        }
+      })
+    },
     unbind(id) {
       const _self = this
       uni.showModal({
@@ -267,6 +377,7 @@ export default {
   font-size: 22px;
 }
 .student-input {
+  padding-left: 20rpx;
   height: 40px;
   line-height: 40px;
   border-radius: 20px;
@@ -297,11 +408,11 @@ export default {
 .font-check {
   font-size: 22px;
 }
-.cu-list > .cu-item .move.student-move {
-  width: 130rpx;
-  text-align: center;
-}
-.cu-list > .cu-item.move-cur {
-  transform: translateX(-130rpx);
-}
+// .cu-list > .cu-item .move.student-move {
+//   width: 130rpx;
+//   text-align: center;
+// }
+// .cu-list > .cu-item.move-cur {
+//   transform: translateX(-130rpx);
+// }
 </style>