提交一下

1

src/views/main/cloudDate/organMemberList.vue

@@ -27,7 +27,7 @@
           <el-table-column
             align="center"
             prop="totalStudentNum"
-            label="学员总数"
+            label="会员总人数"
           >
             <!-- <template slot="header" slot-scope="slot">
               <div class="titleCell">
@@ -54,12 +54,12 @@
                 <el-table-column
             align="center"
             prop="waitActivateVipStudentNum"
-            label="待激活的会员人数"
+            label="待激活会员人数"
           ></el-table-column>
                 <el-table-column
             align="center"
             prop="effectiveVipStudentNum"
-            label="生效中的会员人数"
+            label="生效中会员人数"
           ></el-table-column>
           <el-table-column
             align="center"
@@ -70,7 +70,7 @@
               <div class="titleCell">
                 <span>活跃人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">每周训练时长超过60分钟，每个月有三个周以上达标的为活跃学员</div>
+                  <div slot="content">过去四周内有三周及以上每周训练时长超过60分钟为活跃学员</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="

src/views/main/constant.js

@@ -56,23 +56,23 @@ export const descs = {
   OTHER_AMOUNT: "其他收入金额总和",
   RENEW_AMOUNT: "乐团续费、临时加课、合班缴费金额总和",
   VIP_AMOUNT: "VIP课购买、续费、复学、课程组新增学员收入金额总和",
-  "vipStudentNum":'会员生效中或待生效总人数',
+  "vipStudentNum":'待激活及生效中的会员人数(去重)',
   "eVipStudentNum":'如果是试用会员又是付费会员，则不算试用会员数',
-  "cloudStudyLivelyStudentNum":'每周训练时长超过60分钟，每个月有三个周以上达标的为活跃学员',
+  "cloudStudyLivelyStudentNum":'过去四周内有三周及以上每周训练时长超过60分钟为活跃学员',
   "newCloudStudyStudentNum":'第一次使用团练宝的人数',
   "cloudStudyTodayUseStudentNum":'今日使用的总人数',
   "cloudStudyUseStudentNum":'累计使用的总人数',
-  "totalStudentNum":"分部学员总数",
-  "waitActivateVipStudentNum":'待激活的会员人数',
-  "effectiveVipStudentNum":"生效中的会员人数"
+  "totalStudentNum":"分部注册学员总人数",
+  "waitActivateVipStudentNum":'待激活会员人数',
+  "effectiveVipStudentNum":"生效中会员人数"
 }
 export const titles = {
-  "waitActivateVipStudentNum":'待激活的会员人数',
-  "effectiveVipStudentNum":"生效中的会员人数",
-  "vipStudentNum":'付费会员人数',
+  "waitActivateVipStudentNum":'待激活会员人数',
+  "effectiveVipStudentNum":"生效中会员人数",
+  "vipStudentNum":'会员总人数',
   "eVipStudentNum":'试用会员人数',
   "totalStudentNum":"分部学员总数",
-  "cloudStudyLivelyStudentNum":'活跃用户 ',
+  "cloudStudyLivelyStudentNum":'活跃学员人数 ',
   "newCloudStudyStudentNum":'今日新增使用人数',
   "cloudStudyTodayUseStudentNum":'今日使用人数',
   "cloudStudyUseStudentNum":'累计使用人数',