新增能字段

1

src/views/main/cloudDate/allDate.vue

@@ -11,7 +11,7 @@
       </div>
       <!--
           -->
-      <statistic :col="6" class="statistic" :cols="0">
+      <statistic :col="4" class="statistic" :cols="0">
         <statistic-item v-for="(item, key) in items" :key="key"  @click="active = key" :class="{ active: active === key }">
           <span>
             {{ item.title + "(人)" }}
@@ -65,6 +65,8 @@ export default {
       //        "eVipStudentNum",
       let arr = [
         "totalStudentNum",
+        "waitActivateVipStudentNum",
+        "effectiveVipStudentNum",
         "vipStudentNum",
         "cloudStudyLivelyStudentNum",
         "newCloudStudyStudentNum",

src/views/main/cloudDate/organMemberList.vue

@@ -50,26 +50,17 @@
             </template> -->
           </el-table-column>
           <el-table-column align="center" prop="vipStudentNum" label="会员总数" >
-            <!-- <template slot="header" slot-scope="slot">
-              <div class="titleCell">
-                <span>目标人数</span>
-                <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">
-                    进行中非会员乐团-已上乐团课小于等于4节学员-非本活动购买会员-弦乐声部学员
-                  </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="waitActivateVipStudentNum"
+            label="待激活的会员人数"
+          ></el-table-column>
+                <el-table-column
+            align="center"
+            prop="effectiveVipStudentNum"
+            label="生效中的会员人数"
+          ></el-table-column>
           <el-table-column
             align="center"
             prop="activeStudentNum"

src/views/main/constant.js

@@ -58,13 +58,17 @@ export const descs = {
   VIP_AMOUNT: "VIP课购买、续费、复学、课程组新增学员收入金额总和",
   "vipStudentNum":'会员生效中或待生效总人数',
   "eVipStudentNum":'如果是试用会员又是付费会员，则不算试用会员数',
-  "cloudStudyLivelyStudentNum":'近15天内使用达到5天及以上的用户总数',
+  "cloudStudyLivelyStudentNum":'每周训练时长超过60分钟，每个月有三个周以上达标的为活跃学员',
   "newCloudStudyStudentNum":'第一次使用团练宝的人数',
   "cloudStudyTodayUseStudentNum":'今日使用的总人数',
   "cloudStudyUseStudentNum":'累计使用的总人数',
-  "totalStudentNum":"分部学员总数"
+  "totalStudentNum":"分部学员总数",
+  "waitActivateVipStudentNum":'待激活的会员人数',
+  "effectiveVipStudentNum":"生效中的会员人数"
 }
 export const titles = {
+  "waitActivateVipStudentNum":'待激活的会员人数',
+  "effectiveVipStudentNum":"生效中的会员人数",
   "vipStudentNum":'付费会员人数',
   "eVipStudentNum":'试用会员人数',
   "totalStudentNum":"分部学员总数",