11/25 16:35

src/views/teamDetail/componentCourse/addCompound.vue

@@ -4,9 +4,12 @@
       <div class="boxWrap">
         <p>临时合课列表<span style="color:red;"> {{compoundList.length}} </span></p>
         <el-popover placement="top"
+                    v-model='isLook'
                     trigger="click">
           <div>
-            <p>临时合课列表</p>
+            <p class="title">临时合课列表 <i class="el-icon-minus minus"
+                 @click="isLook=false"></i></p>
+
             <el-divider></el-divider>
           </div>
           <el-button type="text"
@@ -79,7 +82,8 @@ export default {
   data () {
     return {
       radio: '',
-      dataList: this.compoundList
+      dataList: this.compoundList,
+      isLook: false
     }
   },
   methods: {
@@ -116,6 +120,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.title {
+  line-height: 44px;
+}
 .fixedBox {
   position: fixed;
   bottom: 20px;
@@ -124,6 +131,7 @@ export default {
   width: 200px;
   background-color: #fff;
   font-size: 14px;
+
   .boxWrap {
     display: flex;
     flex-direction: row;
@@ -134,4 +142,14 @@ export default {
     }
   }
 }
+/deep/.el-divider--horizontal {
+  margin: 0 !important;
+}
+.minus {
+  float: right;
+  line-height: 44px;
+  padding-right: 20px;
+  font-size: 20px;
+  cursor: pointer;
+}
 </style>

src/views/teamDetail/teamCourseList.vue

@@ -238,8 +238,7 @@
                 <el-button type="text"
                            @click="addCompound(scope.row)"
                            v-if="(scope.row.groupType=='MUSIC'&&scope.row.type!='MUSIC_NETWORK'&&scope.row.type!='HIGH_ONLINE'&&scope.row.status=='NOT_START'&&!isAddCom(scope.row))">添加合班</el-button>
-                <el-button type="
-                           text"
+                <el-button type="text"
                            v-if="isAddCom(scope.row)"
                            @click="cancleCompound(scope.row)">取消合班</el-button>
                 <el-button type="text"