Merge branch 'master' of http://git.cc-lotus.info/ball-court/ball-applet

pages/coaAdmin/course/add.wxml

@@ -14,7 +14,7 @@
                         <input type="text" name="school_id" value="{{form.school_id}}" placeholder="请输入学校id" />
                     </view>
                 </view>
-                <view class="content">
+                <view class="content" style="display: none;">
                     <view class="label">课程类型：</view>
                     <view class="value">
                         <input type="text" name="type" value="{{form.type}}" placeholder="请输入课程类型" />

pages/coaAdmin/course/list.js

@@ -40,10 +40,10 @@ Page({
             arr = await app.$post(`/lessonCoach/${arr.data[0]._id}`, { is_sign: '1' });
             if (arr.errcode == '0') {
                 wx.showToast({ title: `签到成功`, icon: 'error', duration: 2000 })
+                that.setData({ skip: 0, page: 0, list: [] });
                 that.watchLogin();
             } else { wx.showToast({ title: `${arr.errmsg}`, icon: 'error', duration: 2000 }) }
         }
-        console.log(arr);
     },
     // 分页
     toPage: function () {

pages/schAdmin/coursetryexam/list.js

@@ -52,15 +52,15 @@ Page({
             key: 'user',
             success: async res => {
                 // 学员等级
-                // let aee = await app.$get(`/dict`, { code: 'student_grade' });
-                // if (aee.errcode == '0' && aee.total > 0) that.setData({ levelList: aee.data[0].list })
+                let aee = await app.$get(`/dict`, { code: 'student_grade' });
+                if (aee.errcode == '0' && aee.total > 0) that.setData({ levelList: aee.data[0].list })
                 let info = { skip: that.data.skip, limit: that.data.limit, school_id: res.data.info.id };
                 const arr = await app.$get(`/tryLessonApply`, { ...info });
                 if (arr.errcode == '0') {
-                    // for (const val of arr.data) {
-                    //     let level = that.data.levelList.find(i => i.value == val.student_id_level)
-                    //     if (level) val.zhLevel = level.label;
-                    // }
+                    for (const val of arr.data) {
+                        let level = that.data.levelList.find(i => i.value == val.student_id_level)
+                        if (level) val.zhLevel = level.label;
+                    }
                     that.setData({ list: [...that.data.list, ...arr.data] });
                     that.setData({ total: arr.total });
                 }