Merge branch 'master' of http://47.112.200.206:3000/aijia/kmt

# Conflicts:
#	src/components/MenuComponent.vue

src/pages/super/CheckTeacherAudit.vue

@@ -19,8 +19,9 @@
             header-align="center"
           >
             <template scope="scope">
-              <img :src="BASE_URL+scope.row.imgUrl" alt="" class="table-img">
-              <span class="scope-name">{{scope.row.name}}}</span>
+              <img :src='BASE_URL+scope.row.imgUrl' alt="" class="table-img" v-if="scope.row.imgUrl">
+              <img src="../../assets/img/user.jpg" alt="" v-if="!scope.row.imgUrl" class="table-img">
+              <span class="scope-name">{{scope.row.name}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -51,8 +52,8 @@
 
           <el-table-column prop="status" label="" header-align="center" width="250">
             <template scope="scope">
-              <el-button type="danger" @click="isShow(2,scope.row.id)">不通过</el-button>
-              <el-button type="primary" @click="isShow(1,scope.row.id)">通过</el-button>
+              <el-button type="danger" @click="isShow(2,scope.row.teacherId,scope.row.name)">不通过</el-button>
+              <el-button type="primary" @click="isShow(1,scope.row.teacherId,scope.row.name)">通过</el-button>
             </template>
           </el-table-column>
 
@@ -81,7 +82,7 @@
       <div class='model-text'>
         <div class="model-text-items">
           <div><img src="../../assets/img/del@2x.png" alt="" @click="allShowModel(1)" class="model-text-items-close"></div>
-          <div>是否要通过颜如玉老师的注册申请？</div>
+          <div>是否要通过{{userName}}老师的注册申请？</div>
         </div>
         <div class="model-btn">
           <div class="model-btn-items main-gay" @click="ApplyOperate()">是</div>
@@ -95,7 +96,7 @@
       <div class='model-text'>
         <div class="model-text-items">
           <div><img src="../../assets/img/del@2x.png" alt="" @click="allShowModel(2)" class="model-text-items-close"></div>
-          <div>是否要驳回颜如玉老师的注册申请？</div>
+          <div>是否要驳回{{userName}}老师的注册申请？</div>
         </div>
         <div class="model-btn">
           <div class="model-btn-items main-gay" @click="ApplyOperate()">是</div>
@@ -190,13 +191,13 @@
     },
     methods: {
       ...mapActions(["setUser"]),
-      selectTitle(k) {
-        console.log(k);
-        this.checkindex = k;
-      },
-      isShow(str,res){
+
+      isShow(str,res,ts){
         let _this = this;
         console.log(str)
+        _this.operate = str;
+        _this.applicantId = res;
+        _this.userName = ts
         if (str == 1){
           _this.hiddenModel = true;
           _this.isPigai = false;
@@ -207,10 +208,9 @@
 
       },
       //关闭弹框
-      allShowModel(str,res) {
+      allShowModel(str) {
         let _this = this;
-        _this.operate = str;
-        _this.applicantId = res;
+
         if (str == 1){
           _this.hiddenModel = false;
         } else if (str == 2){
@@ -231,6 +231,7 @@
           applicantId: this.applicantId,
           operate: this.operate,
         });
+        this.allShowModel(this.operate)
       },
       //时间封装
       formatDate: function () {
@@ -301,7 +302,16 @@
     },
     mounted() {
       this.SuperApplyTeacherList();
-      // console.log(applyTeacherList)
+      // for (let j in applyTeacherList) {
+      //   applyTeacherList[j] = (res => {
+      //     const d = []
+      //     console.log(res)
+      //     // for (let i in res) {
+      //     //   d.push({ gradeList: res[i].homeworkPictureUrl, isVague: res[i].isVague})
+      //     // }
+      //     return d
+      //   })(applyTeacherList)
+      // }
     }
   };
 </script>