bug

src/layout/index/mainData.vue

@@ -69,11 +69,11 @@ export default {
     getLocaltion(data) {
       if (data.subid) {
         return _.get(this.classInfo, 'jslocation', '');
-      } else if (data.subname.includes('报到') || data.subname.includes('开班')) {
+      } else if (data && data.subname && (data.subname.includes('报到') || data.subname.includes('开班'))) {
         return _.get(this.classInfo, 'kbyslocation', '');
-      } else if (data.subname.includes('拓展')) {
+      } else if (data && data.subname && data.subname.includes('拓展')) {
         return _.get(this.classInfo, 'kzjhlocation', '');
-      } else if (data.subname.includes('午餐+休息') || data.subname.includes('晚餐')) {
+      } else if (data && data.subname && (data.subname.includes('午餐+休息') || data.subname.includes('晚餐'))) {
         return _.get(this.classInfo, 'yclocation', '');
       }
     },

src/views/class/info/headStuList.vue

@@ -10,7 +10,7 @@
           <el-col v-if="item.students.length > 0">
             <van-divider content-position="left">
               <span style="padding:0 10px;">{{ item.name }}</span>
-              <van-button type="primary" size="small" round style="margin:0 10px 0 0;" v-if="item.status == '0'" @click="affirm(item)">确认小组</van-button>
+              <van-button type="primary" size="small" round style="margin:0 10px 0 0;" v-if="item.status == '0' && user.type === '1'" @click="affirm(item)">确认小组</van-button>
               <van-button type="danger" size="small" round v-if="item.status == '1' && user.type === '1'" @click="cancel(item)">取消小组</van-button>
             </van-divider>
             <el-col :span="11" class="list" v-for="i in item.students" :key="i.stuid" @click.native="clickAssign({ id: i.stuid })">
@@ -127,7 +127,7 @@ export default {
       }
     },
     changedisabled() {
-      if (this.user.type === '3') {
+      if (this.user && this.user.type === '3') {
         this.disabled = true;
         console.log(this.disabled);
       }