11

src/components/pages/course.vue

@@ -236,7 +236,7 @@
                 " @click="goToCourse3(item.courseId)">
                 修改
               </div>
-              <div v-if="groupA == '0'" @click="
+              <!-- <div v-if="groupA == '0'" @click="
                 goTo(
                   '/works?cid=' +
                   item.courseId +
@@ -251,7 +251,7 @@
                 )
                 ">
                 评价
-              </div>
+              </div> -->
               <div @click="copyCourse(item.courseId)">
                 复制
               </div>

src/components/pages/synergyCourse/addCourse.vue

@@ -1799,7 +1799,11 @@
           @current-change="handleCurrentChange"></el-pagination>
       </div>
       <span slot="footer" class="dialog-footer">
+<<<<<<< HEAD
         <el-button @click="dialogVisibleMember = false;">取 消</el-button>
+=======
+        <el-button @click="dialogVisibleMember = false">取 消</el-button>
+>>>>>>> 8c46a58ae3ab9d21e5cba63afb0429906a3f0988
         <el-button type="primary" @click="isAddPPTeacher">确定</el-button>
       </span>
     </el-dialog>

src/components/pages/synergyCourse/course.vue

@@ -31,7 +31,11 @@
               <div class="search">
                 <img src="../../../assets/icon/search.png" alt="" />
               </div>
+<<<<<<< HEAD
               <input class="sInput" type="text" placeholder="请输入关键字" v-model="courseName" @change="getCourse()" @input="getCourse()" />
+=======
+              <input class="sInput" type="text" placeholder="请输入关键字" v-model="courseName" @input="getCourse()" />
+>>>>>>> 8c46a58ae3ab9d21e5cba63afb0429906a3f0988
             </div>
             <el-button type="primary" class="bgColor" style="margin-left: 10px;" @click="reset">重置</el-button>
           </div>