dist/build/mp-weixin/components/shop-cart.wxml

@@ -1 +0,0 @@
-<view data-event-opts="{{[['tap',[['goCart',['$event']]]]]}}" class="shop data-v-46995986" bindtap="__e"><block wx:if="{{$root.g0}}"><view class="cu-tag badge data-v-46995986"></view></block><text class="cuIcon-cart text-student cart data-v-46995986"></text></view>

dist/build/mp-weixin/components/swiper-tab.wxml

@@ -1 +0,0 @@
-<view class="swipeTab data-v-aa709134"><block wx:for="{{menuList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['changeTab',[index]]]]]}}" class="{{['swipeTab-item data-v-aa709134',(currentIndex===index)?'tabTrue':'']}}" bindtap="__e">{{''+item+''}}</view></block></view>

dist/build/mp-weixin/pages/agreement/index.wxml

@@ -1 +0,0 @@
-<view class="data-v-691f7141"><cu-custom vue-id="1856aa3c-1" isBack="{{true}}" title="{{title}}" class="data-v-691f7141" bind:__l="__l"></cu-custom><rich-text space="emsp" nodes="{{text[type]}}" class="data-v-691f7141"></rich-text></view>

dist/build/mp-weixin/pages/index/components/course.wxml

@@ -1 +0,0 @@
-<view class="course data-v-afc04ca0" style="{{('background:'+course.background)}}"><view class="{{['course-tag data-v-afc04ca0',(!course.applying)?'un-catering':'']}}">{{course.applying?'报名中':'未开启'}}</view><image class="course-back data-v-afc04ca0" mode="widthFix" src="{{course.back}}"></image><view class="course-ch text-xl data-v-afc04ca0">{{course.ch}}</view><view class="course-en text-lg data-v-afc04ca0">{{course.en}}</view></view>

dist/build/mp-weixin/project.config.json

@@ -1,54 +0,0 @@
-{
-  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.24.5",
-  "appid": "wx971694d9384c1dfd",
-  "projectname": "parentNew",
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  },
-  "condition": {}
-}

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,30 +17,37 @@
           <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="cuIcon-roundaddfill text-cyan margin-left-xl add-icon" @tap="showModal"
-                data-target="ChooseModal"></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>
           <view class="padding-lr text-right" v-if="!phone">
             <text class="text-red text-xs">右侧点击绑定手机号，直接获取绑定学生列表</text>
             <text class="cuIcon-mobile text-cyan add-icon margin-left-xl" @tap="globalNavigateTo('bindPhone')"></text>
           </view>
-          <scroll-view scroll-y :style="[{height:'calc(100vh - 230px - '+ topHeader+'px)'}]">
+          <scroll-view scroll-y :style="[{ height: 'calc(100vh - 230px - ' + topHeader + 'px)' }]">
             <view class="cu-list menu-avatar">
-              <view class="cu-item" :class="moveModel=='move-box-'+ index?'move-cur':''"
-                v-for="(item,index) in result.student_data" :key="index" @touchstart="ListTouchStart"
-                @touchmove="ListTouchMove" @touchend="ListTouchEnd" :data-target="'move-box-' + index"
-                @tap="chooseKid(item.id)">
+              <view
+                class="cu-item"
+                :class="moveModel == 'move-box-' + index ? 'move-cur' : ''"
+                v-for="(item, index) in result.student_data"
+                :key="index"
+                @touchstart="ListTouchStart"
+                @touchmove="ListTouchMove"
+                @touchend="ListTouchEnd"
+                :data-target="'move-box-' + index"
+                @tap="chooseKid(item.id)"
+              >
                 <image mode="scaleToFill" :src="defaultAvatar" class="avatar md left"></image>
                 <view class="content">
-                  <view>{{item.name}}</view>
-                  <view class="text-gray">{{item.school_name}}-{{item.grade_name}}-{{item.class_name}}</view>
+                  <view>{{ item.name }}</view>
+                  <view class="text-gray">{{ item.school_name }}-{{ item.grade_name }}-{{ item.class_name }}</view>
                 </view>
                 <view class="action">
-                  <text class="cuIcon-check text-student font-check" v-if="item.id===kid"></text>
+                  <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>
@@ -50,16 +57,16 @@
       </view>
     </view>
     <!-- 选择学生列表 -->
-    <view class="cu-modal" :class="modalName=='showStudents'?'show':''" @tap="hideModal">
-      <view class="cu-dialog bg-student" @tap.stop=''>
+    <view class="cu-modal" :class="modalName == 'showStudents' ? 'show' : ''" @tap="hideModal">
+      <view class="cu-dialog bg-student" @tap.stop="">
         <view class="padding text-left modal-body radius-student">
           <view class="cu-list menu-avatar">
-            <view class="cu-item" v-for="(item,index) in chooseList" :key="index" @tap="save(item.id)">
-              <view class="cu-inner" :class="{'checked':item.id===selectKid}">
+            <view class="cu-item" v-for="(item, index) in chooseList" :key="index" @tap="save(item.id)">
+              <view class="cu-inner" :class="{ checked: item.id === selectKid }">
                 <image mode="scaleToFill" :src="defaultAvatar" class="avatar md left"></image>
                 <view class="content">
-                  <view>{{item.name}}</view>
-                  <view class="text-gray">{{item.school_name}}-{{item.grade_name}}-{{item.class_name}}</view>
+                  <view>{{ item.name }}</view>
+                  <view class="text-gray">{{ item.school_name }}-{{ item.grade_name }}-{{ item.class_name }}</view>
                 </view>
               </view>
             </view>
@@ -68,19 +75,17 @@
       </view>
     </view>
     <!--添加学生-->
-    <view class="cu-modal" :class="modalName=='ChooseModal'?'show':''" @tap="hideModal">
-      <view class="cu-dialog bg-student" @tap.stop=''>
+    <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="student.student_name" placeholder="请输入学生名字"
-              class="student-input text-black text-lg">
+            <input type="text" v-model.trim="student.student_name" placeholder="请输入学生名字" class="student-input text-black text-lg" />
           </view>
           <view class="margin-top" v-if="student.student_name">
-            <input type="text" v-model.trim="student.school_name" placeholder="请输入学校名称"
-              class="student-input text-black text-lg">
+            <input type="text" v-model.trim="student.school_name" placeholder="请输入学校名称" class="student-input text-black text-lg" />
           </view>
           <view class="margin-top">
             <button class="student-input text-student text-left" @tap="get_students">获取学生</button>
@@ -91,15 +96,48 @@
         </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 () {
+  data() {
     return {
       showAdd: false,
       topHeader: this.globalCustomBarHeight,
@@ -109,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,
@@ -118,13 +171,10 @@ export default {
     }
   },
   computed: {
-    ...mapGetters([
-      'kid', 'phone'
-    ])
+    ...mapGetters(['kid', 'phone'])
   },
-  onLoad () {
-  },
-  onShow () {
+  onLoad(options) {},
+  onShow() {
     this.get_list()
     const kid = this.kid
     if (kid) {
@@ -134,25 +184,24 @@ export default {
         title: '请选择学生',
         content: '请先选择一个学生',
         showCancel: false,
-        success: res => {
-
-        }
+        success: res => {}
       })
     }
+    this.get_grades()
   },
   methods: {
-    showModal (e) {
+    showModal(e) {
       this.modalName = e.currentTarget.dataset.target
     },
-    hideModal (e) {
+    hideModal(e) {
       this.modalName = null
     },
-    get_list () {
+    get_list() {
       _getStudents().then(res => {
         this.result = res.data
       })
     },
-    get_students () {
+    get_students() {
       if (!this.student.student_name) return uni.showToast({ title: '请输入学生姓名', icon: 'none' })
       if (!this.student.school_name) return uni.showToast({ title: '请输入学校名称', icon: 'none' })
       _getStudents(this.student).then(res => {
@@ -165,7 +214,7 @@ export default {
         }
       })
     },
-    save (id) {
+    save(id) {
       this.selectKid = id
       uni.showModal({
         title: '确定绑定？',
@@ -182,7 +231,67 @@ export default {
         }
       })
     },
-    unbind (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.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({
         title: '确定解绑？',
@@ -192,7 +301,9 @@ export default {
             _unbindStudent({ student: id }).then(res => {
               if (res.code === 1) {
                 uni.showToast({ title: '解绑成功！' })
-                if (_self.kid === id) { _self.$store.dispatch('setKid', 0) }// 解绑选中学生
+                if (_self.kid === id) {
+                  _self.$store.dispatch('setKid', 0)
+                } // 解绑选中学生
                 this.get_list()
               }
             })
@@ -200,7 +311,7 @@ export default {
         }
       })
     },
-    chooseKid (id) {
+    chooseKid(id) {
       uni.showModal({
         title: '确定选择学生',
         message: '确定选择该学生?',
@@ -214,19 +325,20 @@ export default {
         }
       })
     },
-    setCarts () { // 刷新购物车
+    setCarts() {
+      // 刷新购物车
       _shopList().then(res => {
         const carts = res.data.map(item => item.class_attend_id)
         this.$store.dispatch('setCarts', carts)
       })
     },
-    ListTouchStart (e) {
+    ListTouchStart(e) {
       this.listTouchStart = e.touches[0].pageX
     },
-    ListTouchMove (e) {
+    ListTouchMove(e) {
       this.listTouchDirection = e.touches[0].pageX - this.listTouchStart > 0 ? 'right' : 'left'
     },
-    ListTouchEnd (e) {
+    ListTouchEnd(e) {
       if (this.listTouchDirection === 'left') {
         this.moveModel = e.currentTarget.dataset.target
       } else {
@@ -265,6 +377,7 @@ export default {
   font-size: 22px;
 }
 .student-input {
+  padding-left: 20rpx;
   height: 40px;
   line-height: 40px;
   border-radius: 20px;
@@ -295,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>

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">