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

pages/stuAdmin/open/list.js

@@ -66,7 +66,6 @@ Page({
     watchLogin: async function () {
         const that = this;
         var list = [];
-        let typeList = that.data.typeList;
         let statusList = that.data.statusList;
         wx.getStorage({
             key: 'user',
@@ -78,7 +77,6 @@ Page({
                         if (val.student.length > 0) {
                             let student = val.student.find(i => i._id == res.data.info.id);
                             if (student) {
-                                let type = typeList.find(i => i.value == val.type); if (type) val.zhType = type.label;
                                 let status = statusList.find(i => i.value == val.status); if (status) val.zhStatus = status.label;
                                 list.push(val);
                             }

pages/stuAdmin/private/list.js

@@ -77,7 +77,6 @@ Page({
                         if (val.student.length > 0) {
                             let student = val.student.find(i => i._id == res.data.info.id);
                             if (student) {
-                                let type = typeList.find(i => i.value == val.type); if (type) val.zhType = type.label;
                                 let status = statusList.find(i => i.value == val.status); if (status) val.zhStatus = status.label;
                                 list.push(val);
                             }