提交

1

src/layout/components/Navbar.vue

@@ -647,7 +647,12 @@ export default {
 .navbar_tag {
   margin: 0 5px 8px;
 }
-
+::v-deep .el-scrollbar__thumb{
+  background-color: rgba(255,255,255,.3);
+  &:hover{
+    background-color: rgba(255,255,255,.3);
+  }
+}
 .indexlayout-top-menu {
   padding-left: 57px;
   height: 76px;
@@ -946,4 +951,4 @@ export default {
 /deep/.el-badge__content.is-fixed.is-dot {
   top: 28px !important;
 }
-</style>
+</style>

src/views/courseCredentials/index.vue

@@ -71,47 +71,204 @@
             align="center"
             prop="one"
             label="1v1"
-          ></el-table-column>
+          >
+          <template slot="header">
+            <div class="titleCell">
+              <span>1v1</span>
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">已上课次/总课次</div>
+                <i
+                  class="el-icon-question micon el-tooltip"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    top: 2px;
+                    position: relative;
+                  "
+                ></i>
+              </el-tooltip>
+            </div>
+          </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="two"
             label="1v2"
-          ></el-table-column>
+          >
+          <template slot="header">
+            <div class="titleCell">
+              <span>1v2</span>
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">已上课次/总课次</div>
+                <i
+                  class="el-icon-question micon el-tooltip"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    top: 2px;
+                    position: relative;
+                  "
+                ></i>
+              </el-tooltip>
+            </div>
+          </template></el-table-column>
           <el-table-column
             align="center"
             prop="three"
             label="1v3"
-          ></el-table-column>
+          >
+          <template slot="header">
+            <div class="titleCell">
+              <span>1v3</span>
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">已上课次/总课次</div>
+                <i
+                  class="el-icon-question micon el-tooltip"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    top: 2px;
+                    position: relative;
+                  "
+                ></i>
+              </el-tooltip>
+            </div>
+          </template></el-table-column>
           <el-table-column
             align="center"
             prop="four"
             label="1v4"
-          ></el-table-column>
+          >
+          <template slot="header">
+            <div class="titleCell">
+              <span>1v4</span>
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">已上课次/总课次</div>
+                <i
+                  class="el-icon-question micon el-tooltip"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    top: 2px;
+                    position: relative;
+                  "
+                ></i>
+              </el-tooltip>
+            </div>
+          </template></el-table-column>
           <el-table-column
             align="center"
             prop="five"
             label="1v5"
-          ></el-table-column>
+          >
+          <template slot="header">
+            <div class="titleCell">
+              <span>1v5</span>
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">已上课次/总课次</div>
+                <i
+                  class="el-icon-question micon el-tooltip"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    top: 2px;
+                    position: relative;
+                  "
+                ></i>
+              </el-tooltip>
+            </div>
+          </template></el-table-column>
           <el-table-column
             align="center"
             prop="six"
             label="1v6"
-          ></el-table-column>
+          >
+          <template slot="header">
+            <div class="titleCell">
+              <span>1v6</span>
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">已上课次/总课次</div>
+                <i
+                  class="el-icon-question micon el-tooltip"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    top: 2px;
+                    position: relative;
+                  "
+                ></i>
+              </el-tooltip>
+            </div>
+          </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="seven"
             label="1v7"
-          ></el-table-column>
+          >
+          <template slot="header">
+            <div class="titleCell">
+              <span>1v7</span>
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">已上课次/总课次</div>
+                <i
+                  class="el-icon-question micon el-tooltip"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    top: 2px;
+                    position: relative;
+                  "
+                ></i>
+              </el-tooltip>
+            </div>
+          </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="theory"
             label="乐理课"
-          ></el-table-column>
+          >
+          <template slot="header">
+            <div class="titleCell">
+              <span>乐理课</span>
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">已上课次/总课次</div>
+                <i
+                  class="el-icon-question micon el-tooltip"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    top: 2px;
+                    position: relative;
+                  "
+                ></i>
+              </el-tooltip>
+            </div>
+          </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="practice"
             label="网管课"
-          ></el-table-column>
+          >
+          <template slot="header">
+            <div class="titleCell">
+              <span>网管课</span>
+              <el-tooltip placement="top" popper-class="mTooltip">
+                <div slot="content">已上课次/总课次</div>
+                <i
+                  class="el-icon-question micon el-tooltip"
+                  style="
+                    font-size: 18px;
+                    color: #f56c6c;
+                    top: 2px;
+                    position: relative;
+                  "
+                ></i>
+              </el-tooltip>
+            </div>
+          </template></el-table-column>
           <!-- <el-table-column
             align="center"
             prop="activityId"

src/views/resetTeaming/components/payInfoDetail.vue

@@ -1113,7 +1113,8 @@ export default {
             isShowMusicInsuranceForPay: this.form.isShowMusicInsuranceForPay,
             isShowVipCourseForPay: this.form.isShowVipCourseForPay,
             isShowMusicCourseForPay: this.form.isShowMusicCourseForPay
-          })
+          }),
+          isShowSalePrice:form.isShowSalePrice
         };
       } else {
         let calenderFeeJson = this.form.calenderFeeJson;