03/28 11:29

月报评价bug修改

dist/css/HelpCenter.c87cfe00.css

@@ -0,0 +1 @@
+.help[data-v-444735df]{min-height:100vh}[data-v-444735df] .van-collapse{margin:.15rem 0}[data-v-444735df] .van-collapse /deep/ .van-cell{color:#1a1a1a;font-size:.17rem;padding:.15rem .16rem}[data-v-444735df] .van-collapse /deep/ .van-collapse-item__content{font-size:.14rem;color:grey}

dist/css/HelpCenter.dcfb14bc.css → dist/css/HelpCenter~PeriodExchange.5d0ce117.css

@@ -1 +1 @@
-.mheader[data-v-61d0e2e4]{height:.44rem;overflow:hidden}.m-nav-header[data-v-61d0e2e4]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;background-color:#14928a;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#fff}.m-nav-header.fixed[data-v-61d0e2e4]{position:fixed;z-index:99}.m-nav-header .m-nav-bar__title[data-v-61d0e2e4]{max-width:60%;margin:0 auto;color:#fff;font-weight:500;font-size:.16rem}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4],.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-61d0e2e4]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{right:.12rem}.icon[data-v-67669af7]{width:2rem;height:2rem;margin:.5rem auto .05rem}.icon_nodata[data-v-67669af7]{background:url(../img/icon_nodata.81c87d57.png) no-repeat 50%;background-size:contain}.msg[data-v-67669af7]{color:#aaa;font-size:.16rem;text-align:center;line-height:.22rem}.help[data-v-444735df]{min-height:100vh}[data-v-444735df] .van-collapse{margin:.15rem 0}[data-v-444735df] .van-collapse /deep/ .van-cell{color:#1a1a1a;font-size:.17rem;padding:.15rem .16rem}[data-v-444735df] .van-collapse /deep/ .van-collapse-item__content{font-size:.14rem;color:grey}
+.mheader[data-v-61d0e2e4]{height:.44rem;overflow:hidden}.m-nav-header[data-v-61d0e2e4]{position:absolute;left:0;top:0;width:100%;height:.44rem;line-height:.44rem;background-color:#14928a;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#fff}.m-nav-header.fixed[data-v-61d0e2e4]{position:fixed;z-index:99}.m-nav-header .m-nav-bar__title[data-v-61d0e2e4]{max-width:60%;margin:0 auto;color:#fff;font-weight:500;font-size:.16rem}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4],.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{position:absolute;bottom:0}.m-nav-header .m-nav-bar__left[data-v-61d0e2e4]{left:.12rem}.m-nav-header .m-nav-bar__left .arrow-left[data-v-61d0e2e4]{font-size:.21rem;vertical-align:middle}.m-nav-header .m-nav-bar__right[data-v-61d0e2e4]{right:.12rem}.icon[data-v-67669af7]{width:2rem;height:2rem;margin:.5rem auto .05rem}.icon_nodata[data-v-67669af7]{background:url(../img/icon_nodata.81c87d57.png) no-repeat 50%;background-size:contain}.msg[data-v-67669af7]{color:#aaa;font-size:.16rem;text-align:center;line-height:.22rem}

dist/css/PeriodExchange.31881128.css

@@ -0,0 +1 @@
+.periodExchange[data-v-6b14e996]{min-height:100vh;position:relative;background:#fff}.periodExchange .logo[data-v-6b14e996]{width:.5rem;height:.5rem;border-radius:50%;overflow:hidden;margin-right:.13rem}.periodExchange[data-v-6b14e996] .van-cell{margin-top:-1px;padding:.26rem .16rem .15rem;background:#14928a}.periodExchange .exchangeText[data-v-6b14e996]{font-size:.18rem;color:#fff}.periodExchange .info[data-v-6b14e996]{font-size:.14rem;color:#ccc}.activeList[data-v-6b14e996]{padding:.15rem .16rem 0;position:relative;z-index:49}.activeList h2[data-v-6b14e996]{font-size:.16rem;color:#444;padding-left:.15rem;padding-bottom:.15rem;position:relative}.activeList h2[data-v-6b14e996]:before{content:" ";width:.04rem;height:.15rem;background:#14928a;border-radius:.02rem;position:absolute;left:.02rem;top:.05rem}.activeList h2 span[data-v-6b14e996]{float:right}.activeList .active[data-v-6b14e996]{position:relative;margin-bottom:.15rem;line-height:0}.activeList img[data-v-6b14e996]{width:100%}.activeList .icon_question[data-v-6b14e996]{position:absolute;z-index:10;bottom:.06rem;right:.12rem;color:#e94a47;font-size:.18rem}.popupContent[data-v-6b14e996]{padding:.4rem .16rem .1rem}.van-image[data-v-6b14e996]{display:block;width:100%;min-width:1rem}.pay_btn[data-v-6b14e996]{background:#14928a;line-height:.45rem;color:#fff;font-size:.18rem;border-radius:.5rem;text-align:center;position:absolute;width:90%;margin-left:5%;bottom:.2rem}

src/common/axios.js

@@ -43,7 +43,7 @@ _axios.interceptors.request.use(
         config.headers['Authorization'] = auth
       }
     }
-    // config.headers['Authorization'] ='bearer 107ccab8-4a36-407a-b28e-91a904577c7e'
+    // config.headers['Authorization'] ='bearer a8ecd31d-ed2d-4caa-9038-e85b8135af53'
     return config;
   },
   function(error) {

src/views/teacher/reportDetailNew.vue

@@ -14,7 +14,7 @@
     </div>
     <div class="studyWrap">
       <div class="border">
-        <img :src="imgList.boxtitle1" width="100%" alt style="" />
+        <img :src="imgList.boxtitle1" width="100%" alt style />
         <div class="borderContainer">
           <img :src="imgList.logo" class="logo1" alt style="z-index:11;" />
           <div class="theoryBox">
@@ -100,7 +100,7 @@
           </div>
           <div class="cell">
             <img :src="subjectJson['1'].icon" class="icons" alt />
-            <p>  {{ subjectJson['1'][item.one] }}</p>
+            <p>{{ subjectJson['1'][item.one] }}</p>
           </div>
           <div style="width:100%">
             <p class="title">
@@ -110,8 +110,7 @@
           </div>
           <div class="cell">
             <img :src="subjectJson['2'].icon" class="icons" alt />
-            <p>  {{ subjectJson['2'][item.two] }}</p>
-          
+            <p>{{ subjectJson['2'][item.two] }}</p>
           </div>
           <div style="width:100%">
             <p class="title">
@@ -121,8 +120,7 @@
           </div>
           <div class="cell">
             <img :src="subjectJson['3'].icon" class="icons" alt />
-             <p> {{ subjectJson['3'][item.three] }}</p>
-           
+            <p>{{ subjectJson['3'][item.three] }}</p>
           </div>
           <div style="width:100%">
             <p class="title">
@@ -133,20 +131,17 @@
           <div class="cell">
             <img :src="subjectJson['4'].icon" class="icons" alt />
             <p>{{ subjectJson['4'][item.four] }}</p>
-            
           </div>
 
           <div style="width:100%" v-if="subjectJson['5']">
             <p class="title">
               <img :src="imgList.squrt" class="squrt" alt />
-              
               {{ subjectJson['5'].title}}
             </p>
           </div>
           <div class="cell" v-if="subjectJson['5']">
             <img :src="subjectJson['5'].icon" class="icons" alt />
             <p>{{ subjectJson['5'][item.five] }}</p>
-            
           </div>
 
           <div style="width:100%" v-if="item.six">
@@ -158,7 +153,6 @@
           <div class="cell" v-if="item.six">
             <img :src="subjectJson['6'].icon" class="icons" alt />
             <p>{{ subjectJson['6'][item.six] }}</p>
-            
           </div>
 
           <div style="width:100%" v-if="item.seven">
@@ -169,8 +163,7 @@
           </div>
           <div class="cell" v-if="item.seven">
             <img :src="subjectJson['7'].icon" class="icons" alt />
-            <p>    {{ subjectJson['7'][item.seven] }}</p>
-        
+            <p>{{ subjectJson['7'][item.seven] }}</p>
           </div>
 
           <div style="width:100%" v-if="item.eight">
@@ -182,7 +175,6 @@
           <div class="cell" v-if="item.eight">
             <img :src="subjectJson['8'].icon" class="icons" alt />
             <p>{{ subjectJson['8'][item.eight] }}</p>
-            
           </div>
         </div>
       </div>
@@ -315,7 +307,6 @@ export default {
       }
     },
     setIcon(object, str, index) {
-
       let some = {
         one: 1,
         two: 2,
@@ -326,30 +317,29 @@ export default {
         seven: 7,
         eight: 8
       };
-      if(object[some[index]]){
+      if (object[some[index]]) {
         switch (str) {
-        case 1: {
-          object[some[index]].icon = this.imgList.excellent;
-          break;
-        }
-        case 2: {
-          //  console.log( object[some[index]].icon)
-          object[some[index]].icon = this.imgList.good;
-          break;
+          case 1: {
+            object[some[index]].icon = this.imgList.excellent;
+            break;
+          }
+          case 2: {
+            //  console.log( object[some[index]].icon)
+            object[some[index]].icon = this.imgList.good;
+            break;
+          }
+          case 3: {
+            // console.log( object[some[index]].icon)
+            object[some[index]].icon = this.imgList.normal;
+            break;
+          }
         }
-        case 3: {
-          // console.log( object[some[index]].icon)
-          object[some[index]].icon = this.imgList.normal;
-          break;
+        if (index == "seven" || index == "six") {
+          object[some[index]].icon == this.imgList.good
+            ? (object[some[index]].icon = this.imgList.normal)
+            : object[some[index]].icon;
         }
       }
-      if (index == "seven" || index == "six") {
-        object[some[index]].icon == this.imgList.good
-          ? (object[some[index]].icon = this.imgList.normal)
-          : object[some[index]].icon;
-      }
-      }
-      
     }
   }
 };
@@ -453,7 +443,6 @@ div {
         height: 0.17rem;
         position: relative;
         top: -0.02rem;
- 
       }
       .muiscIcon {
         width: 0.17rem;
@@ -640,7 +629,9 @@ div {
           font-size: 0.12rem;
 
           border: 1px solid transparent;
-          p {width: 1.98rem;}
+          p {
+            width: 1.98rem;
+          }
           .icons {
             width: 0.22rem;
             height: 0.22rem;
@@ -758,5 +749,16 @@ div {
     );
     border-radius: 0.25rem;
   }
+  /deep/.van-cell {
+    &:not {
+      &:last-child {
+        &::after {
+          border: none !important;
+        }
+      }
+    }
+  }
+  //
 }
-</style>
+</style>
+  

src/views/teacher/studyReportNew.vue

@@ -356,10 +356,18 @@ export default {
     submietInfo() {
       // console.log(this.one)
       // console.log(this.json.one[this.one])
-      if (!this.one || !this.two || !this.three || !this.four || !this.five) {
+      if(this.subjectName == '打击乐'){
+          if (!this.one || !this.two || !this.three || !this.four) {
         this.$toast("请认真选择必选项");
         return;
       }
+      }else {
+          if (!this.one || !this.two || !this.three || !this.four || !this.five) {
+        this.$toast("请认真选择必选项");
+        return;
+      }
+      }
+    
       if (!this.hasTheory[0].str || !this.teaching[0].str) {
         this.$toast("必须选择乐理和教材");
         return;