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

src/pages/home/SchoolManager.vue

@@ -408,7 +408,7 @@
 
     <!--可分配老师-->
     <div class="showModel" @click="allShowModel(1)" v-if="hiddenModel"></div>
-    <div class="model" style="width:30%; height:40%;top:5%" v-if="hiddenModel">
+    <div class="model" style="width:40%; height:40%;top:5%" v-if="hiddenModel">
       <div class="model-text">
         <div class="model-text-head">
           <div>可分配老师</div>
@@ -520,7 +520,7 @@
     </div>
     <!--所有未批改可分配老师列表弹框-->
     <div class="showModel" @click="allShowModel(5)" v-if="NoAllotManagerModel"></div>
-    <div class="model" style="width:40%" v-if="NoAllotManagerModel">
+    <div class="model" style="width:40%!important" v-if="NoAllotManagerModel">
       <div class="model-text" style="padding: 0 10px">
         <div class="model-manager">
           <div>作业可分配老师</div>

src/pages/home/TeacherPay.vue

@@ -53,18 +53,18 @@
             <div class="modal-cancel" @click="updateIsShowCarouselPictureModal()">X</div>
             <div class="detailinfo">
               <div class="detailImg">
-                <img  :src="BASE_URL + errorDetailList.pictureUrl"  alt="">
+                <img  :src="BASE_URL + errorDetailList[0].pictureUrl"  alt="">
               </div>
               <div class="detailword">
                 <div>
                   <h1 class="tipsesson">错误原因:</h1>
                   <span class="tipsessonWord">
-                       {{errorDetailList.errorReason}}
+                       {{errorDetailList[0].errorReason}}
                       </span>
                 </div>
                 <div class="timeAndteacher">
-                  <h2 class="managertip">{{errorDetailList.checker}}</h2>
-                  <div class="timeset">{{errorDetailList.checkDate}}</div>
+                  <h2 class="managertip">{{errorDetailList[0].checker}}</h2>
+                  <div class="timeset">{{errorDetailList[0].checkDate}}</div>
                   <div class="timesetImg">
                     <img src="../../assets/img/pen.png" alt="">
                   </div>

src/store/modules/user.js

@@ -450,7 +450,7 @@ const user = {
         GeterrorDetail({ commit, state }, data) {
           return new Promise((resolve, reject) => {
             axios.post(errorDetail, data).then(response => {
-              const data = response.data.dto || {}
+              const data = response.data.list || {}
               // debugger
               commit('SET_ERROR_DETAIL', data);
                commit('SET_ERROR_INDEX', 0);