Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal into online

src/components/Editor/indexCourse.vue

@@ -14,7 +14,7 @@
                   <el-input maxlength="50" v-model="hasCWare.keyword" placeholder="名称"></el-input>
                 </div>
                 <div style="padding-left: 10px;">
-                  <el-button @click="findCWare()" type="primary">搜索</el-button>
+                  <el-button @click="getCoursewareList()" type="primary">搜索</el-button>
                   <el-button @click="closeCWareFind()" type="primary">重置</el-button>
                 </div>
               </div>

src/layout/components/TopNav/Index.vue

@@ -127,7 +127,7 @@ export default {
   mounted() {
     //控制弹出窗口的代码
     let now = new Date() //当前时间
-    let end = new Date('2022/08/07 00:00:00') //对比时间
+    let end = new Date('2022/08/14 00:00:00') //对比时间
     if(now.getTime() < end.getTime()){
         let times = localStorage.getItem(this.signLocalTimesKey);
         let isNewLogin=localStorage.getItem(this.$Constants.newLoginKey);

src/views/course/WaitAudit.vue

@@ -173,7 +173,7 @@
           </div>
         </div>
       </div>
-      <div style="border-top: 1px solid #eee; background-color: #eee; padding: 10px 20px;margin-top: 10px;">
+      <div v-if="audit.length > 0" style="border-top: 1px solid #eee; background-color: #eee; padding: 10px 20px;margin-top: 10px;">
         <div style="line-height: 36px;">
           <div style="display:flex;">
             <div style="flex:1;"><span class="audit-text">邀请人：</span>{{audit.sysCreateBy}}</div>
@@ -444,7 +444,9 @@ export default {
       this.dialogVisible = true;
       apiCourse.getAuditInfo({courseId:row.id}).then(res=>{
          if(res.status == 200) {
-           this.audit = res.result[0];
+           if(res.result.length > 0) {
+             this.audit = res.result[0];
+           }
          } else {
            this.$message.error(res.message);
          }