Merge branch '0601Action' into test

src/views/childrensDay/index.vue

@@ -110,7 +110,9 @@
         </statistic-item>
         <statistic-item>
           <span>乐理课成交金额(元)</span>
-          <span><count-to :endVal="statInfo.buyMusicTheoryAmount" :decimals="2"/></span>
+          <span
+            ><count-to :endVal="statInfo.buyMusicTheoryAmount" :decimals="2"
+          /></span>
         </statistic-item>
         <statistic-item>
           <span>1v1VIP课购买人数</span>
@@ -118,7 +120,9 @@
         </statistic-item>
         <statistic-item>
           <span>1v1VIP课成交金额(元)</span>
-          <span><count-to :endVal="statInfo.buyVip1Amount" :decimals="2"/></span>
+          <span
+            ><count-to :endVal="statInfo.buyVip1Amount" :decimals="2"
+          /></span>
         </statistic-item>
         <statistic-item>
           <span>1v2VIP课购买人数</span>
@@ -126,7 +130,9 @@
         </statistic-item>
         <statistic-item>
           <span>1v2VIP课成交金额(元)</span>
-          <span><count-to :endVal="statInfo.buyVip2Amount" :decimals="2"/></span>
+          <span
+            ><count-to :endVal="statInfo.buyVip2Amount" :decimals="2"
+          /></span>
         </statistic-item>
       </statistic>
       <div class="tableWrap">
@@ -171,7 +177,27 @@
             align="center"
             prop="noReserveNum"
             label="未预约人数"
-          ></el-table-column>
+            width="120px"
+          >
+                 <template slot="header" slot-scope="scope">
+              <p style="position: relative">
+                未预约人数
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    未通过预报名链接直接报名考级的学员数量
+                  </div>
+                  <!-- <img :src="imageIcon"
+                       class="micon el-tooltip"
+                       style="width:8px height:8px"
+                       alt /> -->
+                  <i
+                    class="el-icon-question"
+                    style="font-size: 18px; color: #f56c6c"
+                  ></i>
+                </el-tooltip>
+              </p>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="instrumentalMusicNum"
@@ -415,17 +441,24 @@ export default {
         this.$message.error("请至少选择一个乐团");
         return;
       }
-      let arr = this.chioseList.map((item) => {
-        return {
-          musicGroupId: item.musicGroupId,
-          organId: item.organId,
-        };
+
+      this.$confirm("确定发送短信和推送", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(async () => {
+        let arr = this.chioseList.map((item) => {
+          return {
+            musicGroupId: item.musicGroupId,
+            organId: item.organId,
+          };
+        });
+        try {
+          const res = await sendMsgList(arr);
+          this.$message.success("发送成功");
+          this.getList();
+        } catch {}
       });
-      try {
-        const res = await sendMsgList(arr);
-        this.$message.success("发送成功");
-        this.getList()
-      } catch {}
     },
   },
   watch: {