Merge branch 'zcwy0417-out' into dev0515

src/views/lecturer/FinalDraft.vue

@@ -76,6 +76,10 @@ export default {
         this.form.orgName=res.data[0].orgName
         this.form.positionName=res.data[0].positionName
         this.form.bandCode=res.data[0].bandCode
+        //获取初始值
+        this.form.courseNameOne=res.data[0].courseName
+        this.form.courseIntroductionOne=res.data[0].courseIntroduction
+        this.form.courseContent_2=res.data[0].courseContent
       })
     },
     onSubmit(formName){
@@ -91,9 +95,9 @@ export default {
             this.form.courseContent = this.form.courseContent_1.join('/');
             setOfflineTutoring(
               {teacherId:this.teacherId,
-                courseName:this.form.courseName,
+                courseName:this.form.courseNameOne==this.form.courseName?null:this.form.courseName,
-                courseContent:this.form.courseContent,
+                courseContent:this.form.courseContent_2==this.form.courseContent?null:this.form.courseContent,
-                courseIntroduction:this.form.courseIntroduction,
+                courseIntroduction:this.form.courseIntroductionOne==this.form.courseIntroduction?null:this.form.courseIntroduction,
                 coursewareUrl:this.form.coursewareUrl,
                 coursewareName:this.form.coursewareName,
                 version:1

src/views/lecturer/FinalSuccess.vue

@@ -25,6 +25,7 @@ export default {
       statusInfo:'',
       result:'',
       newTeacherId:'',
+      isFalse: true,
     }
   },
   created() {
@@ -41,10 +42,14 @@ export default {
       secondExamine({teacherId:this.teacherId,second,}).then(res=>{
         this.newTeacherId=res.data.replace(/[^0-9]/ig,'')
         if (res.code==200){
-          this.$router.push({
+          if(second==1){
-            path:'/need/twoathentication',
+            this.$router.push({
-            query:{teacherId:this.newTeacherId}
+              path:'/need/twoathentication',
-          })
+              query:{teacherId:this.newTeacherId}
+            })
+          }else{
+            this.isFalse = false
+          }
         }
       })
     },
@@ -196,7 +201,7 @@ export default {
       <div v-if="statusInfo.reviewResult==0" class="score" style="color: #4b7900;">恭喜您，您的认证分数为{{ result.avgScore }}分，已经通过认证！</div>
       <div v-if="statusInfo.reviewResult==1" class="score" style="color: #ff0000">很遗憾，您的认证分数为{{ result.avgScore }}分，没有通过认证！</div>
     </div>
-    <div class="twoFactorAuthentication" v-if="statusInfo.reviewResult==1">
+    <div class="twoFactorAuthentication" v-if="statusInfo.reviewResult==1&&isFalse&&statusInfo.second!=2">
       <div class="remind">是否进行二次认证？</div>
       <div style="display: flex;justify-content: center;align-items: center">
         <el-button type="primary" @click="getoFactor(1)">是</el-button>