修改文案和bug

src/assets/icon/iconfont.json

@@ -455,7 +455,7 @@
     },
     {
       "icon_id": "27122005",
-      "name": "云练习反馈",
+      "name": "学练宝反馈",
       "font_class": "yunjiaolianfankui",
       "unicode": "e65c",
       "unicode_decimal": 58972

src/constant/index.js

@@ -309,14 +309,14 @@ export const downListType = {
   17: "预计课耗导出",
   18: "预计课耗学员详情导出",
   19: "课耗统计导出",
-  20: "云练习统计导出",
+  20: "学练宝统计导出",
   21: "班级列表导出",
-  22: "云练习统计详情导出",
-  23: "老师云练习使用数据",
+  22: "学练宝统计详情导出",
+  23: "老师学练宝使用数据",
   24: "oa费用汇总",
   25: "oa费用明细",
   26: "经营报表收入汇总",
-  27: "云练习激活明细",
+  27: "学练宝激活明细",
   28: "课程收入明细导出",
   29: "乐团梯队数据导出",
   30: "平衡关系-乐团课",
@@ -339,7 +339,7 @@ export const withdrawalStatus = {
 
 export const clientStatus = {
   NETWORK_ROOM: "网络教室",
-  SMART_PRACTICE: "云练习"
+  SMART_PRACTICE: "学练宝"
 };
 
 export const conclusion = {
@@ -431,7 +431,7 @@ export const organPayState = {
 export const tenantStatus = {
   TENANT_OPEN: "机构开通缴费",
   TENANT_RENEW: "机构续费",
-  CLOUD_TEACHER: "激活云练习",
+  CLOUD_TEACHER: "激活学练宝",
   TENANT_RECHARGE: "机构充值"
 };
 //   "DAY": '天',
@@ -470,7 +470,7 @@ export const coupontypeDetail = {
   MUSIC: "乐团课",
   VIP: "VIP课",
   LIVE: "直播课",
-  MEMBER: "云练习"
+  MEMBER: "学练宝"
 };
 
 // 发券方式

src/router/index.js

@@ -351,7 +351,7 @@ export const asyncRoutes = {
   entryOperation: () => import("@/views/app/entryOperation"),
   // 意见反馈
   suggestion: () => import("@/views/app/suggestionIndex"),
-  // 云练习意见反馈
+  // 学练宝意见反馈
   clouldSuggestion: () => import("@/views/app/clouldSuggestion"),
   // 帮助分类
   helpCategory: () => import("@/views/helpCenter/helpCategory"),
@@ -554,7 +554,7 @@ export const asyncRoutes = {
   serviceOperation: () => import("@/views/platformManager/serviceManager/form"),
   // 机构申请
   tenantApply: () => import("@/views/platformManager/tenantApply"),
-  // 云练习流量包
+  // 学练宝流量包
   cloudTrafficPackage: () =>
     import("@/views/platformManager/cloudTrafficPackage"),
   accompanyBaseConfig: () =>
@@ -582,7 +582,7 @@ export const asyncRoutes = {
   // 机构交易管理
   tenantTradeManager: () =>
     import("@/views/tenantSetting/tenantTradeManager.vue"),
-  // 云练习激活记录
+  // 学练宝激活记录
   groupRecordManager: () =>
     import("@/views/tenantSetting/groupRecordManager.vue"),
   // 扣费记录
@@ -606,7 +606,7 @@ export const asyncRoutes = {
   //
   studentGroupPractice: () =>
     import("@/views/studentManager/studentGroupPractice"),
-  // 云练习缴费记录
+  // 学练宝缴费记录
   studentGroupRecord: () => import("@/views/studentManager/studentGroupRecord"),
   // 直播课管理
   liveClassManager: () => import("@/views/liveClassManager"),
@@ -622,7 +622,7 @@ export const asyncRoutes = {
   smallStudentManager: () => import("@/views/smallStudentManager"),
   // 代理商管理
   agentList: () => import("@/views/agentManager/agentList"),
-  // 云练习分润
+  // 学练宝分润
   memberShareList: () => import("@/views/agentManager/memberShareList"),
   // 群组管理
   groupChatManager: () => import("@/views/groupChatManager"),

src/store/modules/permission.js

@@ -270,7 +270,7 @@ function setDetailRoute(accessedRoutes) {
           hidden: true,
           meta: {
             noCache: "1",
-            title: "分部云练习数据详情",
+            title: "分部学练宝数据详情",
             belongTopMenu: "/main",
             activeMenu: "/workbench"
           }
@@ -282,7 +282,7 @@ function setDetailRoute(accessedRoutes) {
           hidden: true,
           meta: {
             noCache: "1",
-            title: "分部云练习排行",
+            title: "分部学练宝排行",
             belongTopMenu: "/main",
             activeMenu: "/workbench"
           }

src/utils/searchArray.js

@@ -688,8 +688,8 @@ export const visitChiose1 = [
     ]
   },
   {
-    value: "云练习",
-    label: "云练习",
+    value: "学练宝",
+    label: "学练宝",
     children: [
       {
         value: "体验回访",

src/views/accompaniment/modals/form.vue

@@ -116,7 +116,7 @@
           placeholder="请选择客户端类型"
         >
           <el-option value="NETWORK_ROOM" label="网络教室"></el-option>
-          <el-option value="SMART_PRACTICE" label="云练习"></el-option>
+          <el-option value="SMART_PRACTICE" label="学练宝"></el-option>
         </el-select>
       </el-form-item> -->
       <!-- <el-form-item
@@ -465,7 +465,7 @@ export default {
           midiUrl: "",
           order: 0,
           musicScoreCategoriesId: [],
-          // 兼容之前数据，默认选择云练习
+          // 兼容之前数据，默认选择学练宝
           clientType: "SMART_PRACTICE",
           renderFrom: "",
           playMode: "MP3",

src/views/afterSchoolManager/afterSchoolList.vue

@@ -69,7 +69,7 @@
             class="organSelect"
             filterable
             clearable
-            placeholder="是否云练习布置"
+            placeholder="是否学练宝布置"
           >
             <el-option label="是" :value="true"></el-option>
             <el-option label="否" :value="false"></el-option>

src/views/afterSchoolManager/afterWorkList.vue

@@ -62,7 +62,7 @@
             class="organSelect"
             filterable
             clearable
-            placeholder="是否云练习布置"
+            placeholder="是否学练宝布置"
           >
             <el-option label="是" :value="true"></el-option>
             <el-option label="否" :value="false"></el-option>
@@ -254,7 +254,7 @@
               <div>{{ scope.row.isRepliedTimely ? "是" : "否" }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="actualTeacherName" label="是否云练习布置">
+          <el-table-column align="center" prop="actualTeacherName" label="是否学练宝布置">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.musicScoreId ? "是" : "否" }}

src/views/afterSchoolManager/components/oldAfterWorkList.vue

@@ -50,7 +50,7 @@
             class="organSelect"
             filterable
             clearable
-            placeholder="是否云练习布置"
+            placeholder="是否学练宝布置"
           >
             <el-option label="是" :value="true"></el-option>
             <el-option label="否" :value="false"></el-option>
@@ -238,7 +238,7 @@
           <el-table-column
             align="center"
             prop="actualTeacherName"
-            label="是否云练习布置"
+            label="是否学练宝布置"
           >
             <template slot-scope="scope">
               <div>

src/views/afterSchoolManager/examination.vue

@@ -84,7 +84,7 @@
             class="organSelect"
             clearable
             filterable
-            placeholder="是否云练习布置"
+            placeholder="是否学练宝布置"
           >
             <el-option label="是" :value="true"></el-option>
             <el-option label="否" :value="false"></el-option>
@@ -154,7 +154,7 @@
             </template>
           </el-table-column>
 
-          <!-- <el-table-column align="center" prop="actualTeacherName" label="是否云练习布置">
+          <!-- <el-table-column align="center" prop="actualTeacherName" label="是否学练宝布置">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.musicScoreId ? "是" : "否" }}

src/views/agentManager/memberShareList.vue

@@ -3,7 +3,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      云练习分润
+      学练宝分润
     </h2>
     <div class="m-core">
       <el-card header="" style="width:460px" class="myCard">
@@ -22,7 +22,7 @@
           </statistic-item>
           <statistic-item>
             <span>
-              云练习销售数(个月)
+              学练宝销售数(个月)
             </span>
             <span> <count-to :endVal="detail.memberCount"/></span>
           </statistic-item>

src/views/app/clouldSuggestion.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      云练习反馈
+      学练宝反馈
     </h2>
     <div class="m-core">
       <save-form

src/views/app/suggestionIndex.vue

@@ -23,7 +23,7 @@
           <suggestionType v-if="activeIndex === '2'" />
         </el-tab-pane>
         <!-- <el-tab-pane
-          label="云练习反馈"
+          label="学练宝反馈"
           lazy
           name="3"
           v-if="permissionList.clouldSuggestion"

src/views/attendanceManager/attendanceList/index.vue

@@ -66,7 +66,7 @@
             class="organSelect"
             clearable
             filterable
-            placeholder="是否云练习布置"
+            placeholder="是否学练宝布置"
           >
             <el-option label="是" :value="true"></el-option>
             <el-option label="否" :value="false"></el-option>
@@ -131,7 +131,7 @@
             prop="actualTeacherName"
             label="布置老师"
           ></el-table-column>
-          <!-- <el-table-column align="center" prop="actualTeacherName" label="是否云练习布置">
+          <!-- <el-table-column align="center" prop="actualTeacherName" label="是否学练宝布置">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.musicScoreId ? "是" : "否" }}

src/views/baseRulesManager/components/otherRules.vue

@@ -60,7 +60,7 @@
         </el-alert>
         <!-- <el-row>
           <el-form-item prop="108">
-            云练习活动分部目标
+            学练宝活动分部目标
             <el-input
               class="marginLR5"
               style="width: 180px"
@@ -73,7 +73,7 @@
         </el-row>
         <el-row>
           <el-form-item prop="109">
-            云练习活动预约开始时间
+            学练宝活动预约开始时间
             <el-date-picker
               class="marginLR5"
               v-model="form['109']"
@@ -88,7 +88,7 @@
         </el-row>
         <el-row>
           <el-form-item prop="110">
-            云练习活动预约结束时间
+            学练宝活动预约结束时间
             <el-date-picker
               class="marginLR5"
               v-model="form['110']"
@@ -103,7 +103,7 @@
         </el-row>
         <el-row>
           <el-form-item prop="111">
-            云练习活动开屏广告编号
+            学练宝活动开屏广告编号
             <el-input
               class="marginLR5"
               v-model="form['111']"

src/views/businessManager/shopManager/shopOperation.vue

@@ -411,7 +411,7 @@
           >
             <el-option label="课程收费" value="0"></el-option>
             <el-option label="系统收费" value="1"></el-option>
-            <el-option label="云练习收费" value="2"></el-option>
+            <el-option label="学练宝收费" value="2"></el-option>
           </select-all>
         </el-form-item> -->
 

src/views/categroyManager/generalSettings/groupMarkPrice.vue

@@ -3,7 +3,7 @@
     <el-form :inline="true" :model="form" ref="form">
       <el-alert
         style="margin: 10px 0"
-        title="机构云练习定价范围设置"
+        title="机构学练宝定价范围设置"
         :closable="false"
         type="info"
       >
@@ -11,7 +11,7 @@
       <el-row>
         <el-form-item
           prop="minMonthFee"
-          label="月度云练习机构定价范围最低:"
+          label="月度学练宝机构定价范围最低:"
           :rules="[
             {
               required: false,
@@ -48,7 +48,7 @@
       <el-row>
         <el-form-item
           prop="minQuarterlyFee"
-          label="季度云练习机构定价范围最低:"
+          label="季度学练宝机构定价范围最低:"
           :rules="[
             {
               required: false,
@@ -85,7 +85,7 @@
       <el-row>
         <el-form-item
           prop="minHalfYearFee"
-          label="半年云练习机构定价范围最低:"
+          label="半年学练宝机构定价范围最低:"
           :rules="[
             {
               required: false,
@@ -122,7 +122,7 @@
       <el-row>
         <el-form-item
           prop="minYearFee"
-          label="年度云练习机构定价范围最低:"
+          label="年度学练宝机构定价范围最低:"
           :rules="[
             {
               required: false,

src/views/categroyManager/globalConfig.vue

@@ -20,7 +20,7 @@
           <loginRules v-if="activeIndex == 6" />
         </el-tab-pane>
         <el-tab-pane
-          label="云练习定价"
+          label="学练宝定价"
           lazy
           name="3"
           v-if="permissionList.groupMarkPrice"

src/views/categroyManager/globalMusicGroup.vue

@@ -20,7 +20,7 @@
           <typesManager v-if="activeIndex == 2" />
         </el-tab-pane>
         <!-- <el-tab-pane
-            label="分部云练习价格配置"
+            label="分部学练宝价格配置"
             lazy
             name="13"
           >

src/views/categroyManager/modals/baseInfo.vue

@@ -17,6 +17,7 @@
     >
       <el-form-item label="活动名称" prop="name">
         <el-input
+          placeholder="请输入活动名称"
           style="width: 400px"
           v-model.trim="baseForm.name"
           :disabled="isDisabled || status != 'DRAFT'"

src/views/categroyManager/modals/payInfo.vue

@@ -603,19 +603,20 @@
 <script>
 import { vipResetTypeList, memberEnumList } from "@/utils/searchArray";
 import { getOnlineMun } from "@/api/vipSeting";
-
+import { getAllMemberFindByOrganIds } from "@/views/categroyManager/productSystem/api";
 const MIN_NUMBER = 1;
 const MAX_NUMBER = 999;
 export default {
   props: [
+    "organ",
     "payForm",
     "activeType",
-    "remberList",
     "isDisabled",
     "activityChannel"
   ],
   data() {
     return {
+      remberList: [],
       coureTimerList: [],
       vipResetTypeList,
       memberEnumList,
@@ -625,6 +626,9 @@ export default {
     };
   },
   async mounted() {
+    const memberInfo = await getAllMemberFindByOrganIds(this.organ)
+    this.remberList = memberInfo.data || []
+
     const res1 = await getOnlineMun();
 
     let tempObj = JSON.parse(res1.data.config);

src/views/categroyManager/productSystem/api.js

@@ -13,6 +13,15 @@ export function getAllmemberRank(data) {
   })
 }
 
+// 获取所属分部会员列表
+export function getAllMemberFindByOrganIds(data) {
+  return request2({
+    url: api + '/memberRankSetting/findByOrganIds',
+    method: 'post',
+    data
+  })
+}
+
 // 获取所有会员列表
 export function api_getMemberRankSetting(data) {
   return request2({

src/views/categroyManager/specialSetup/cloudTeacherFee.vue

@@ -42,14 +42,14 @@
         >
           <el-table-column align="center" prop="organName" label="分部">
           </el-table-column>
-          <el-table-column align="center" prop="price" label="云练习价格（元）">
+          <el-table-column align="center" prop="price" label="学练宝价格（元）">
             <template slot-scope="scope">
               {{ scope.row.price | moneyFormat }}
             </template>
           </el-table-column>
           <el-table-column align="center" prop="price">
             <template #header>
-              云练习<sup>+</sup>价格（元）
+              学练宝<sup>+</sup>价格（元）
             </template>
             <template slot-scope="scope">
               {{ scope.row.plusPrice | moneyFormat }}
@@ -100,7 +100,7 @@
           </el-select>
         </el-form-item>
         <el-form-item
-          label="云练习价格"
+          label="学练宝价格"
           prop="price"
           :label-width="formLabelWidth"
         >
@@ -113,7 +113,7 @@
         </el-form-item>
         <el-form-item prop="plusPrice" :label-width="formLabelWidth">
           <template #label>
-            云练习<sup>+</sup>价格
+            学练宝<sup>+</sup>价格
           </template>
           <el-input
             v-model.number="form.plusPrice"
@@ -150,8 +150,8 @@ export default {
       },
       formActionTitle: "create",
       formTitle: {
-        create: "添加分部云练习价格",
-        update: "修改分部云练习价格"
+        create: "添加分部学练宝价格",
+        update: "修改分部学练宝价格"
       },
       typeStatus: false, // 添加教学点
       formLabelWidth: "120px",

src/views/categroyManager/vipNewActive.vue

@@ -30,6 +30,7 @@
         <payInfo
           :payForm="payForm"
           ref="payInfo"
+          :organ="baseForm.organ"
           :activeType="baseForm.activityType"
           :activityChannel="baseForm.activityChannel"
           @changeCourseType="changeCourseType"
@@ -37,7 +38,6 @@
           @chageSalary="chageSalary"
           @resetFixedCourseNumFlag="resetFixedCourseNumFlag"
           v-if="active == 2"
-          :remberList="remberList"
           :isDisabled="isDisabled || statuss != 'DRAFT'"
         />
         <salaryInfo
@@ -94,7 +94,6 @@
 import baseInfo from "./modals/baseInfo.vue";
 import payInfo from "./modals/payInfo.vue";
 import salaryInfo from "./modals/salaryInfo.vue";
-import { getAllmemberRank } from "@/views/categroyManager/productSystem/api";
 import merge from "webpack-merge";
 import {
   vipGroupCategory,
@@ -182,15 +181,10 @@ export default {
       },
       salaryForm: {
         ...baseSalaryForm
-      },
-      remberList: []
+      }
     };
   },
   async mounted() {
-    try {
-      const res = await getAllmemberRank({ isDefault: 0 });
-      this.remberList = res.data;
-    } catch {}
 
     if (this.$route.query.id) {
       this.baseForm.id = this.$route.query.id;

src/views/couponManager/couponGiveList.vue

@@ -100,7 +100,7 @@
     </div>
     <!--  -->
     <el-dialog
-      title="激活云练习"
+      title="激活学练宝"
       :visible.sync="couponDetailVisible"
       width="1000px"
       append-to-body
@@ -108,7 +108,7 @@
       <div class="chioseWrap">
         <p>
           您将为以下 <span>{{ tableList.length }}</span
-          >位学员激活云练习，激活金额<span></span>元
+          >位学员激活学练宝，激活金额<span></span>元
         </p>
         <couponGiveChiose :tableList="tableList" />
       </div>

src/views/courseCredentials/index.vue

@@ -268,7 +268,7 @@
               <span v-if="scope.row.practiceFlag">
                 网管课
               </span>
-              <span v-if="scope.row.memberFlag">云练习</span>
+              <span v-if="scope.row.memberFlag">学练宝</span>
 
               <span
                 v-if="
@@ -299,7 +299,7 @@
               <span v-if="scope.row.givePracticeFlag">
                 网管课
               </span>
-              <span v-if="scope.row.giveMemberFlag">云练习</span>
+              <span v-if="scope.row.giveMemberFlag">学练宝</span>
 
               <span
                 v-if="

src/views/courseRulersManager/components/studentAttRules.vue

@@ -82,7 +82,7 @@
               }
             ]"
           >
-            学员每周使用云练习时长小于
+            学员每周使用学练宝时长小于
             <el-input v-model="form['106']" placeholder="请输入分钟数">
               <template slot="append"
                 >分钟</template
@@ -101,7 +101,7 @@
               }
             ]"
           >
-            学员每周使用云练习练习次数小于
+            学员每周使用学练宝练习次数小于
             <el-input v-model="form['107']" placeholder="请输入次数">
               <template slot="append"
                 >次</template

src/views/courseRulersManager/components/teamRules.vue

@@ -191,7 +191,7 @@
               },
             ]"
           >
-            学员云练习有效期结束前
+            学员学练宝有效期结束前
             <el-input v-model="form[104]" >
               <template slot="append">天</template>
             </el-input>

src/views/dictionaryManager/index.vue

@@ -3,7 +3,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      云练习功能字典
+      学练宝功能字典
     </h2>
     <div class="m-core">
       <save-form

src/views/main/api.js

@@ -167,7 +167,7 @@ export const getMusicGroupPerformance = data =>
     params: data
   });
 
-// 获取云练习首页数据汇总
+// 获取学练宝首页数据汇总
 export const getCloudStudyStudentOverView = data =>
   request2({
     url: "/api-web/studentManage/getCloudStudyStudentOverView",

src/views/main/cloudDate/exerciseDuration.vue

@@ -215,7 +215,7 @@ export default {
         this,
         {
           url: "/api-web/export/managerDownload",
-          fileName: "云练习练习时长.xls",
+          fileName: "学练宝练习时长.xls",
           method: "post",
           params: {
             exportEnum: "EXPORT_CLOUD_TEACHER_SUM",
@@ -224,7 +224,7 @@ export default {
             }
           }
         },
-        "您确定导出云练习练习时长?"
+        "您确定导出学练宝练习时长?"
       );
     },
     onDetail(row) {

src/views/main/cloudDate/exerciseDurationDetail.vue

@@ -235,7 +235,7 @@ export default {
         this,
         {
           url: "/api-web/export/managerDownload",
-          fileName: "云练习练习时长.xls",
+          fileName: "学练宝练习时长.xls",
           method: "post",
           params: {
             exportEnum: "EXPORT_CLOUD_TEACHER_SUM_DETAIL",
@@ -245,7 +245,7 @@ export default {
             }
           }
         },
-        "您确定导出云练习练习时长?"
+        "您确定导出学练宝练习时长?"
       );
     },
     search() {

src/views/main/cloudDate/organDate.vue

@@ -123,7 +123,7 @@
               <div class="titleCell">
                 <span>使用人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">截止目前使用云练习的总人数</div>
+                  <div slot="content">截止目前使用学练宝的总人数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -180,7 +180,7 @@
               <div class="titleCell">
                 <span>新增使用人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">当日第一次使用云练习的人数</div>
+                  <div slot="content">当日第一次使用学练宝的人数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -409,11 +409,11 @@ export default {
         this,
         {
           url: "/api-web/export/organStudentOverView",
-          fileName: "分部云练习数据.xls",
+          fileName: "分部学练宝数据.xls",
           method: "post",
           params: qs.stringify(params)
         },
-        "您确定导出分部云练习数据列表?"
+        "您确定导出分部学练宝数据列表?"
       );
     },
 

src/views/main/cloudDate/organDateDetail.vue

@@ -4,7 +4,7 @@
     <el-page-header
       @back="goback"
       style="padding-bottom: 30px"
-      content="分部云练习数据详情"
+      content="分部学练宝数据详情"
     >
     </el-page-header>
 
@@ -93,7 +93,7 @@
                 <span>使用人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    指导老师关联的截止目前使用云练习的总人数
+                    指导老师关联的截止目前使用学练宝的总人数
                   </div>
                   <i
                     class="el-icon-question micon el-tooltip"
@@ -337,11 +337,11 @@ export default {
         this,
         {
           url: "/api-web/export/organTeacherMemberStudentData",
-          fileName: "分部云练习数据详情.xls",
+          fileName: "分部学练宝数据详情.xls",
           method: "post",
           params: qs.stringify(params)
         },
-        "您确定导出分部云练习数据详情列表?"
+        "您确定导出分部学练宝数据详情列表?"
       );
     }
   }

src/views/main/cloudDate/organMemberList.vue

@@ -291,11 +291,11 @@ export default {
         this,
         {
           url: "/api-web/export/now",
-          fileName: "云练习数据汇总.xls",
+          fileName: "学练宝数据汇总.xls",
           method: "post",
           params: { exportEnum: "CLOUD_STUDY_STUDENT_OVER_VIEW" }
         },
-        "您确定导出云练习数据汇总?"
+        "您确定导出学练宝数据汇总?"
       );
     },
     async getList() {
@@ -375,11 +375,11 @@ export default {
     //     this,
     //     {
     //       url: "/api-web/export/organStudentOverView",
-    //       fileName: "分部云练习数据.xls",
+    //       fileName: "分部学练宝数据.xls",
     //       method: "post",
     //       params: qs.stringify(params)
     //     },
-    //     "您确定导出分部云练习数据列表?"
+    //     "您确定导出分部学练宝数据列表?"
     //   );
     // },
 

src/views/main/cloudDate/organRankDetail.vue

@@ -3,7 +3,7 @@
     <el-page-header
       @back="goback"
       style="padding-bottom: 30px"
-      content="分部云练习数据"
+      content="分部学练宝数据"
     >
     </el-page-header>
     <save-form
@@ -134,7 +134,7 @@
             <div class="titleCell">
               <span>使用人数</span>
               <el-tooltip placement="top" popper-class="mTooltip">
-                <div slot="content">截止目前使用云练习的总人数</div>
+                <div slot="content">截止目前使用学练宝的总人数</div>
                 <i
                   class="el-icon-question micon el-tooltip"
                   style="
@@ -187,7 +187,7 @@
             <div class="titleCell">
               <span>新增使用人数</span>
               <el-tooltip placement="top" popper-class="mTooltip">
-                <div slot="content">当日第一次使用云练习的人数</div>
+                <div slot="content">当日第一次使用学练宝的人数</div>
                 <i
                   class="el-icon-question micon el-tooltip"
                   style="
@@ -444,11 +444,11 @@ export default {
         this,
         {
           url: "/api-web/export/cloudStudyStudentOverView",
-          fileName: "分部云练习数据排行.xls",
+          fileName: "分部学练宝数据排行.xls",
           method: "post",
           params: qs.stringify(params)
         },
-        "您确定导出分部云练习数据排行?"
+        "您确定导出分部学练宝数据排行?"
       );
     },
     goback() {

src/views/main/cloudDate/organRanking.vue

@@ -161,7 +161,7 @@
               <div class="titleCell">
                 <span>当日新增使用人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">当日第一次使用云练习的人数</div>
+                  <div slot="content">当日第一次使用学练宝的人数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -186,7 +186,7 @@
               <div class="titleCell">
                 <span>使用人数占比</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
-                  <div slot="content">云练习当日使用人数 / 学员总数</div>
+                  <div slot="content">学练宝当日使用人数 / 学员总数</div>
                   <i
                     class="el-icon-question micon el-tooltip"
                     style="
@@ -316,7 +316,7 @@
                 <span>活跃度</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    当日使用过云练习的会员占比（生效中会员，含试用）
+                    当日使用过学练宝的会员占比（生效中会员，含试用）
                   </div>
                   <i
                     class="el-icon-question micon el-tooltip"
@@ -429,11 +429,11 @@ export default {
         this,
         {
           url: "/api-web/export/cloudStudyStudentOverView",
-          fileName: "分部云练习数据排行.xls",
+          fileName: "分部学练宝数据排行.xls",
           method: "post",
           params: qs.stringify(params)
         },
-        "您确定导出分部云练习数据排行?"
+        "您确定导出分部学练宝数据排行?"
       );
     },
     gotoDetail() {

src/views/main/constant.js

@@ -79,12 +79,12 @@ export const descs = {
   eVipStudentNum: "如果是试用会员又是付费会员，则不算试用会员数",
   cloudStudyLivelyStudentNum:
     "过去四周内有三周及以上每周练习时长超过60分钟的学员人数",
-  newCloudStudyStudentNum: "第一次使用云练习的人数",
+  newCloudStudyStudentNum: "第一次使用学练宝的人数",
   cloudStudyTodayUseStudentNum: "今日有练习记录的学员人数",
   // "cloudStudyUseStudentNum":'累计使用的总人数',
   totalStudentNum: "进行中、暂停乐团的在读学员总数",
-  againBuyRate: "会员人数中，有多次云练习付费订单的学员数占比",
-  buyRate: "在读学员中云练习生效或待激活学员占比",
+  againBuyRate: "会员人数中，有多次学练宝付费订单的学员数占比",
+  buyRate: "在读学员中学练宝生效或待激活学员占比",
   waitActivateVipStudentNum: "待激活学员人数",
   effectiveVipStudentNum: "在读学员中会员生效人数",
   vipStudentRate: "会员人数/在读人数",

src/views/main/coursewareDate/organDateDetail.vue

@@ -4,7 +4,7 @@
     <el-page-header
       @back="goback"
       style="padding-bottom: 30px"
-      content="分部云练习数据详情"
+      content="分部学练宝数据详情"
     >
     </el-page-header>
 
@@ -93,7 +93,7 @@
                 <span>使用人数</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    指导老师关联的截止目前使用云练习的总人数
+                    指导老师关联的截止目前使用学练宝的总人数
                   </div>
                   <i
                     class="el-icon-question micon el-tooltip"
@@ -337,11 +337,11 @@ export default {
         this,
         {
           url: "/api-web/export/organTeacherMemberStudentData",
-          fileName: "分部云练习数据详情.xls",
+          fileName: "分部学练宝数据详情.xls",
           method: "post",
           params: qs.stringify(params)
         },
-        "您确定导出分部云练习数据详情列表?"
+        "您确定导出分部学练宝数据详情列表?"
       );
     }
   }

src/views/main/coursewareDate/organMemberList.vue

@@ -291,11 +291,11 @@ export default {
         this,
         {
           url: "/api-web/export/now",
-          fileName: "云练习数据汇总.xls",
+          fileName: "学练宝数据汇总.xls",
           method: "post",
           params: { exportEnum: "CLOUD_STUDY_STUDENT_OVER_VIEW" }
         },
-        "您确定导出云练习数据汇总?"
+        "您确定导出学练宝数据汇总?"
       );
     },
     async getList() {
@@ -375,11 +375,11 @@ export default {
     //     this,
     //     {
     //       url: "/api-web/export/organStudentOverView",
-    //       fileName: "分部云练习数据.xls",
+    //       fileName: "分部学练宝数据.xls",
     //       method: "post",
     //       params: qs.stringify(params)
     //     },
-    //     "您确定导出分部云练习数据列表?"
+    //     "您确定导出分部学练宝数据列表?"
     //   );
     // },
 

src/views/main/index.vue

@@ -26,7 +26,7 @@
         <!-- <el-tab-pane
           v-if="permission('/cloudDate')"
           lazy
-          label="云练习数据"
+          label="学练宝数据"
           name="cloudDate"
         >
           <cloudDate v-if="activeKey === 'cloudDate'" />

src/views/platformManager/cloudTrafficPackage/index.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      云练习流量包
+      学练宝流量包
     </h2>
     <save-form
       :inline="true"

src/views/reportForm/index.vue

@@ -160,7 +160,7 @@
             class="m-wrap"
             v-permission="'export/cloudStudyStudentTrainData'"
           >
-            <div class="title">云练习学员统计：</div>
+            <div class="title">学练宝学员统计：</div>
             <!-- <el-select
               v-model.trim="trainOrganId"
               class="organSelect"
@@ -214,16 +214,16 @@
               style="margin-left: 10px"
               ExportEnum="CLOUD_STUDY_STUDENT_TRAIN_DATA"
               :exportData="exportTrain"
-              fileName="云练习学员统计"
+              fileName="学练宝学员统计"
               errorMsg="请至少选择一个分部"
               :flag="this.trainOrganId.length < 1"
             />
           </div>
-          <!-- 老师使用云练习数据
+          <!-- 老师使用学练宝数据
  -->
 
           <div class="m-wrap" v-permission="'export/teacherCloudTrainingList'">
-            <div class="title">老师使用云练习数据：</div>
+            <div class="title">老师使用学练宝数据：</div>
             <select-all
               v-model.trim="trainTeacherOrganId"
               class="organSelect"
@@ -260,7 +260,7 @@
               style="margin-left: 10px"
               ExportEnum="EXPORT_TEACHER_CLOUD_COURSE_REPORT"
               :exportData="exportTeacherTrain"
-              fileName="老师使用云练习数据"
+              fileName="老师使用学练宝数据"
               errorMsg="请选择分部"
               :flag="!this.trainTeacherOrganId"
               :isDownList="true"
@@ -804,7 +804,7 @@
             />
           </div>
           <div class="m-wrap" v-permission="'export/EXPORT_CLOUD_TEACHER_SUM'">
-            <div class="title">云练习统计导出：</div>
+            <div class="title">学练宝统计导出：</div>
             <select-all
               v-model.trim="yunOrganId"
               class="organSelect"
@@ -839,7 +839,7 @@
               style="margin-left: 10px"
               ExportEnum="EXPORT_CLOUD_TEACHER_SUM"
               :exportData="exporyun"
-              fileName="云练习统计导出"
+              fileName="学练宝统计导出"
               errorMsg="请选择分部"
               :isDownList="true"
             />
@@ -849,7 +849,7 @@
             class="m-wrap"
             v-permission="'export/CLOUD_COACH_ACTIVATION_DETAILS'"
           >
-            <div class="title">云练习激活明细：</div>
+            <div class="title">学练宝激活明细：</div>
             <select-all
               v-model.trim="cloudAcivationOrganId"
               class="organSelect"
@@ -880,7 +880,7 @@
               style="margin-left: 10px"
               ExportEnum="CLOUD_COACH_ACTIVATION_DETAILS"
               :exportData="expotAcivationDetails"
-              fileName="云练习激活明细导出"
+              fileName="学练宝激活明细导出"
               errorMsg="请选择分部"
               :flag="this.cloudAcivationOrganId.length <= 0"
             />
@@ -1324,7 +1324,7 @@
               clearable
             >
               <el-option
-                label="云练习用户反馈"
+                label="学练宝用户反馈"
                 value="CLOUD_TEACHER_FEEDBACK"
               ></el-option>
             </el-select>
@@ -1729,7 +1729,7 @@ export default {
       //   this,
       //   {
       //     url: "/api-web/export/teacherCloudTrainingList",
-      //     fileName: "老师使用云练习数据.xls",
+      //     fileName: "老师使用学练宝数据.xls",
       //     method: "post",
       //     params: qs.stringify({
       //       organIdList: this.trainTeacherOrganId.join(","),
@@ -1737,7 +1737,7 @@ export default {
       //       endTime,
       //     }),
       //   },
-      //   "您确定导出老师使用云练习数据?"
+      //   "您确定导出老师使用学练宝数据?"
       // );
       let obj = {
         organId: this.trainTeacherOrganId.join(","),

src/views/resetTeaming/api.js

@@ -157,7 +157,7 @@ export const getAutoActivationFlag = data =>
     params: data
   });
 
-// 查询未激活云练习用户
+// 查询未激活学练宝用户
 export const queryInactive = data =>
   request2({
     url: "/api-web/cloudTeacherOrder/queryInactive",
@@ -165,7 +165,7 @@ export const queryInactive = data =>
     data
   });
 
-// 设置云练习会员时长
+// 设置学练宝会员时长
 export const cancelInactive = data =>
   request2({
     url: "/api-web/cloudTeacherOrder/cancelInactive",
@@ -173,7 +173,7 @@ export const cancelInactive = data =>
     data
   });
 
-// 激活云练习用户
+// 激活学练宝用户
 export const cloudPay = data =>
   request2({
     url: "/api-web/cloudTeacherOrder/pay",

src/views/resetTeaming/components/payInfoDetail.vue

@@ -1196,7 +1196,7 @@ export default {
           },
           activity: [...activeList], // 小班课
           course: courseList, // 课程
-          member: memberObj, // 云练习
+          member: memberObj, // 学练宝
           memberPrivilegesItemList: [], // 会员基本内容
           repair:
             form.leBaoList?.length > 0 &&

src/views/resetTeaming/components/strudentPayInfo.vue

@@ -258,7 +258,7 @@
                 <el-form-item label="乐团课金额">
                   <span>{{ props.row.courseAmount | moneyFormat }}元</span>
                 </el-form-item>
-                <el-form-item label="云练习金额">
+                <el-form-item label="学练宝金额">
                   <span>{{ props.row.cloudAmount | moneyFormat }}元</span>
                 </el-form-item>
                 <el-form-item label="乐保金额">

src/views/resetTeaming/modals/member.vue

@@ -69,7 +69,7 @@ export default {
   },
   methods: {
     onTrainChange(item) {
-      // 云练习点击时
+      // 学练宝点击时
       this.$emit("onCheckItem", item, "train");
     },
     onQuestions(item) {

src/views/resetTeaming/modals/subject-preview.vue

@@ -278,8 +278,8 @@ export default {
       balance: 0, // 余额
       needPrice: 0, // 还需支付
       payType: false, // 是否余额支付
-      cloudTeacherFee: 0, // 云练习费用
-      cloudTeacherPlusFee: 0, // 云练习+
+      cloudTeacherFee: 0, // 学练宝费用
+      cloudTeacherPlusFee: 0, // 学练宝+
       orderInfo: {
         marketPrice: 0,
         amount: 0, // 现价总金额
@@ -319,9 +319,9 @@ export default {
       isClickStatus: false,
       accessStatus: false, // 是否有辅件乐保
       accessIsShowStatus: false, // 是否显示辅件 true 显示， false 不显示
-      memberCoursePrice: [], // 云练习，显示赠送的课程
+      memberCoursePrice: [], // 学练宝，显示赠送的课程
       memberCourseShowFlag: false, // 是否显示赠送课程
-      buyCloudTeacher: false, // 是否购买云练习
+      buyCloudTeacher: false, // 是否购买学练宝
       remissionCourseFeeStatus: false,
       isGiveAccessories: false, // 是否赠送辅件
       giveAccessoriesStatus: false,
@@ -446,7 +446,7 @@ export default {
       let tempInfo =
         paymentCalender && paymentCalender.course ? paymentCalender.course : [];
 
-      // 云练习
+      // 学练宝
       const member =
         paymentCalender && paymentCalender.member ? paymentCalender.member : [];
 
@@ -652,7 +652,7 @@ export default {
       }
     },
     // onTrainChange(item) {
-    //   // 云练习点击时
+    //   // 学练宝点击时
     //   // this.$emit("onCheckItem", item, "train");
 
     // },
@@ -689,7 +689,7 @@ export default {
       this.$forceUpdate();
     },
     giveAccessoriesSetStatus() {
-      let status = false; // 是否有选中云练习
+      let status = false; // 是否有选中学练宝
       this.toolsPackage.forEach(item => {
         if (item.isStatus) {
           status = true;
@@ -782,7 +782,7 @@ export default {
         });
       }
 
-      // 云练习
+      // 学练宝
       const toolsPackage = this.toolsPackage;
       if (toolsPackage.length > 0) {
         toolsPackage.forEach(item => {

src/views/resetTeaming/modals/user-pay-form.vue

@@ -488,7 +488,7 @@ export default {
     async init() {
       let organId = this.baseInfo?.musicGroup?.organId;
       this.courseViewType = this.baseInfo?.musicGroup?.courseViewType;
-      // 如果为学员缴费且是乐团缴费则显示云练习的价格
+      // 如果为学员缴费且是乐团缴费则显示学练宝的价格
       //  进行中添加
       if (this.courseViewType == 2 && !this.rowDetail && !this.isUserType) {
         this.$set(this.form, "leixing", "2");

src/views/sporadicManager/sporadicList.vue

@@ -550,7 +550,7 @@ export default {
         { label: "账户充值", value: 9 },
         // { label: "乐保服务", value: 10 },
         // { label: "网基课活动", value: 13 },
-        // { label: "云练习购买", value: 15 },
+        // { label: "学练宝购买", value: 15 },
         { label: "其它", value: 11 }
       ],
       orderType1: [
@@ -564,7 +564,7 @@ export default {
         { label: "其它", value: 11 }
         // { label: "乐保服务", value: 10 },
         // { label: "网基课活动", value: 13 },
-        // { label: "云练习购买", value: 15 },
+        // { label: "学练宝购买", value: 15 },
       ],
       maskForm: {
         organId: [],
@@ -1045,7 +1045,7 @@ export default {
         11: "其它",
         12: "双十一活动",
         13: "网基课活动",
-        15: "云练习购买"
+        15: "学练宝购买"
       };
       return template[val];
     }

src/views/studentManager/api.js

@@ -40,7 +40,7 @@ export const cloudQueryPage = data =>
     params: data
   });
 
-// 设置云练习会员时长
+// 设置学练宝会员时长
 export const setStudentMembe = data =>
   request2({
     url: "/api-web/studentManage/updateStudentMember",

src/views/studentManager/memberList.vue

@@ -206,7 +206,7 @@
           <el-popover placement="right" width="500" trigger="click">
             <div class="popoverWrap">
               <p>乐团退团退费规则：</p>
-              <p>退还云练习费用：报名缴费时缴费的云练习费用</p>
+              <p>退还学练宝费用：报名缴费时缴费的学练宝费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
@@ -312,7 +312,7 @@
           <el-popover placement="right" width="500" trigger="click">
             <div class="popoverWrap">
               <p>乐团退团退费规则：</p>
-              <p>退还云练习费用：报名缴费时缴费的云练习费用</p>
+              <p>退还学练宝费用：报名缴费时缴费的学练宝费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
@@ -500,7 +500,7 @@ export default {
                 maintenanceFee: this.quitForm.maintenanceFee,
                 isRefundMemberFee: this.quitForm.isRefundMemberFee
               };
-              // 退还云练习费用
+              // 退还学练宝费用
               if (this.quitForm.isRefundMemberFee) {
                 params.cloudTeacherAmount = this.quitForm.cloudTeacherAmount;
               } else {

src/views/studentManager/modals/createMember.vue

@@ -3,14 +3,14 @@
     <!-- <p class="title">已选择{{ multipleSelection.length }}名学员</p> -->
     <el-form :model="memberForm" label-width="100px" ref="memberForm">
       <el-form-item
-        label="云练习单位"
+        label="学练宝单位"
         prop="period"
         :rules="[
-          { required: true, message: '请选择云练习单位', trigger: 'blur' }
+          { required: true, message: '请选择学练宝单位', trigger: 'blur' }
         ]"
       >
         <el-select
-          placeholder="云练习单位"
+          placeholder="学练宝单位"
           clearable
           v-model.trim="memberForm.period"
           @change="getMemberList"
@@ -24,10 +24,10 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        label="云练习周期"
+        label="学练宝周期"
         prop="memberNum"
         :rules="[
-          { required: true, message: '请输入云练习周期', trigger: 'blur' }
+          { required: true, message: '请输入学练宝周期', trigger: 'blur' }
         ]"
       >
         <el-input
@@ -35,7 +35,7 @@
           @input="getMemberList"
           onKeypress="return (/[\d]/.test(String.fromCharCode(event.keyCode)))"
           v-model="memberForm.memberNum"
-          placeholder="请输入云练习周期"
+          placeholder="请输入学练宝周期"
         >
         </el-input>
       </el-form-item>
@@ -200,14 +200,14 @@ export default {
                 ...this.memberForm,
                 organId: this.organId
               });
-              this.$message.success("创建云练习成功");
+              this.$message.success("创建学练宝成功");
             } else {
               await add({
                 ...this.memberForm,
                 userIds: this.userIds,
                 organId: this.organId
               });
-              this.$message.success("创建云练习成功");
+              this.$message.success("创建学练宝成功");
             }
             this.$emit("close");
             this.$emit("submited");

src/views/studentManager/modals/recordDetail.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- <el-alert title="基础信息" :closable="false" class="alert" type="info" /> -->
     <descriptions :column="3" style="margin-bottom: 20px;">
-      <descriptions-item label="云练习单位">{{
+      <descriptions-item label="学练宝单位">{{
         detail.period | memberEnumType
       }}</descriptions-item>
       <descriptions-item label="周期数">{{

src/views/studentManager/studentGroupPractice.vue

@@ -243,6 +243,7 @@ export default {
       },
       soundList: [],
       tableList: [],
+      memberRankList: [],
       rules: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -337,9 +338,15 @@ export default {
       this.reson.ids = ids.join(",");
     },
     exportList() {
-      let { operationDate, ...rest } = this.searchForm;
+      
+      let { operationDate, memberRankId, ...rest } = this.searchForm;
+      let rankId = null
+        if(memberRankId && memberRankId.length > 0) {
+          rankId = memberRankId[memberRankId.length - 1]
+        }
       let params = {
         ...rest,
+        memberRankId: rankId,
         ...getTimeFormat(
           operationDate,
           ["operateStartTime", "operateEndTime"],

src/views/studentManager/studentList.vue

@@ -152,7 +152,7 @@
             class="multiple"
             v-model.trim="searchForm.isRecord"
             clearable
-            placeholder="是否使用云练习"
+            placeholder="是否使用学练宝"
           >
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>
@@ -174,7 +174,7 @@
         type="primary"
         @click="addStudentMember"
         icon="el-icon-plus"
-        >创建云练习缴费</el-button
+        >创建学练宝缴费</el-button
       >
       <el-button
         v-if="$helpers.permission('studentManage/register')"
@@ -439,7 +439,7 @@
               scope.row.serviceTag ? "是" : "否"
             }}</template>
           </el-table-column>
-          <el-table-column align="center" label="是否使用云练习">
+          <el-table-column align="center" label="是否使用学练宝">
             <template slot-scope="scope">{{
               scope.row.recordUserId > 0 ? "是" : "否"
             }}</template>
@@ -658,7 +658,7 @@
                       @click.native="setClound(scope.row)"
                     >
                       <el-button type="text" style="padding-left: 10px"
-                        >云练习时长调整</el-button
+                        >学练宝时长调整</el-button
                       >
                     </el-dropdown-item>
                   </el-dropdown-menu>
@@ -1127,7 +1127,7 @@
     </el-dialog>
 
     <el-dialog
-      title="创建云练习缴费"
+      title="创建学练宝缴费"
       width="500px"
       :visible.sync="memberVisible"
     >
@@ -1144,7 +1144,7 @@
       </div>
     </el-dialog>
     <el-dialog
-      title="云练习时长调整"
+      title="学练宝时长调整"
       width="500px"
       :visible.sync="cloundDateVisible"
     >

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -94,7 +94,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="是否禁用云练习" :label-width="formLabelWidth">
+              <el-form-item label="是否禁用学练宝" :label-width="formLabelWidth">
                  <el-select
                     v-model.trim="topForm.coursewareLimit"
                     clearable

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -271,7 +271,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item
-                  label="是否禁用云练习"
+                  label="是否禁用学练宝"
                   :label-width="formLabelWidth"
                   class="course"
                 >
@@ -279,7 +279,7 @@
                     v-model.trim="topForm.coursewareLimit"
                     clearable
                     filterable
-                    placeholder="是否禁用云练习"
+                    placeholder="是否禁用学练宝"
                   >
                     <el-option label="是" :value="true"></el-option>
                     <el-option label="否" :value="false"></el-option>

src/views/teamBuild/signupList.vue

@@ -244,7 +244,7 @@
                       审核中
                       <el-tooltip placement="top" popper-class="mTooltip">
                         <div slot="content">
-                          不购买云练习系统学员数量，不包含已缴费学员
+                          不购买学练宝系统学员数量，不包含已缴费学员
                         </div>
                         <i
                           class="el-icon-question"
@@ -262,16 +262,16 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="购买云练习人数"
+                  label="购买学练宝人数"
                   prop="buyCloudTeacherNum"
                   align="center"
                 >
                   <template slot="header">
                     <p>
-                      购买云练习人数
+                      购买学练宝人数
                       <el-tooltip placement="top" popper-class="mTooltip">
                         <div slot="content">
-                          已缴费学员中购买了云练习系统的学员总数
+                          已缴费学员中购买了学练宝系统的学员总数
                         </div>
                         <i
                           class="el-icon-question"
@@ -292,16 +292,16 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="入团未购云练习"
+                  label="入团未购学练宝"
                   prop="noCloudTeacherStudentNumOfNormal"
                   align="center"
                 >
                   <template slot="header">
                     <p>
-                      入团未购云练习
+                      入团未购学练宝
                       <el-tooltip placement="top" popper-class="mTooltip">
                         <div slot="content">
-                          【在读】学员中，未购买【云练习系统】学员数量
+                          【在读】学员中，未购买【学练宝系统】学员数量
                         </div>
                         <i
                           class="el-icon-question"
@@ -542,7 +542,7 @@
             v-model.trim="searchFrom.hasCloudTeacher"
             clearable
             filterable
-            placeholder="是否购买云练习"
+            placeholder="是否购买学练宝"
           >
             <el-option label="是" :value="1" />
             <el-option label="否" :value="0" />
@@ -651,13 +651,7 @@
                     <span>{{ props.row.isAllowAdjust | isAllowAdjust }}</span>
                   </el-form-item>
                 </el-col>
-                <!-- <el-col :span="4">
-                  <el-form-item label="是否购买云练习:">
-                    <span>{{
-                      props.row.hasCloudTeacher == 1 ? "是" : "否"
-                    }}</span>
-                  </el-form-item></el-col
-                > -->
+
 
                 <el-col :span="4">
                   <!-- <el-form-item> -->
@@ -810,7 +804,7 @@
           </template>
         </el-table-column> -->
         <el-table-column
-          label="是否购买会员"
+          label="是否购买学练宝"
           prop="hasCloudTeacher"
           align="center"
         >
@@ -830,7 +824,7 @@
             <p style="position: relative; display: flex">
               解除限制
               <el-tooltip placement="top" popper-class="mTooltip">
-                <div slot="content">学员是否受到不购买云练习的缴费限制</div>
+                <div slot="content">学员是否受到不购买学练宝的缴费限制</div>
                 <i
                   class="el-icon-question"
                   style="font-size: 18px; color: #f56c6c"
@@ -1130,7 +1124,7 @@
           <el-popover placement="right" width="500" trigger="click">
             <div class="popoverWrap">
               <p>乐团退团退费规则：</p>
-              <p>退还云练习费用：报名缴费时缴费的云练习费用</p>
+              <p>退还学练宝费用：报名缴费时缴费的学练宝费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
@@ -1306,7 +1300,7 @@ export default {
         currentGrade: null, // 入学年级
         paymentStatus: "",
         visited: "",
-        hasCloudTeacher: null, // 是否购买云练习
+        hasCloudTeacher: null, // 是否购买学练宝
         payingStatus: null,
         noneNeedCloudTeacher: null,
         studentStatus: null
@@ -1377,9 +1371,9 @@ export default {
         ]
       },
       quitRules: {
-        isCloudTeacherAmount: [{ required: true, message: "请输入云练习费用" }],
+        isCloudTeacherAmount: [{ required: true, message: "请输入学练宝费用" }],
         cloudTeacherAmount: [
-          { required: true, message: "请输入云练习金额", trigger: "blur" }
+          { required: true, message: "请输入学练宝金额", trigger: "blur" }
         ],
         isRefundCourseFee: [
           { required: true, message: "请选择是否退还课程费用" }
@@ -2326,7 +2320,7 @@ export default {
       return row.paymentStatus == 0;
     },
     relieve(row) {
-      this.$confirm("操作后该学员即可不购买云练习缴费入团", "提示", {
+      this.$confirm("操作后该学员即可不购买学练宝缴费入团", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

src/views/teamDetail/components/modals/create-user-pay.vue

@@ -430,12 +430,12 @@ export default {
       if (forms.length === valided.length) {
         const { memberRankSettingId, memberPaymentAmount, originalMemberPaymentAmount, ...tempMember } = this.memberForm
         const data = {
-          calenderMember: {
+          calenderMemberList: [{
             ...tempMember,
             memberRankSettingId: memberRankSettingId && memberRankSettingId.length > 0 ? memberRankSettingId[memberRankSettingId.length - 1] : null,
             actualAmount: memberPaymentAmount,
             originalAmount: originalMemberPaymentAmount
-          },
+          }],
           calenderAddStudent: {
             classGroupIds: this.ids,
             studentIds: this.createdUserId

src/views/teamDetail/components/modals/quite-team.vue

@@ -309,9 +309,9 @@ export default {
   data() {
     return {
       quitRules: {
-        isCloudTeacherAmount: [{ required: true, message: "请输入云练习费用" }],
+        isCloudTeacherAmount: [{ required: true, message: "请输入学练宝费用" }],
         cloudTeacherAmount: [
-          { required: true, message: "请输入云练习金额", trigger: "blur" }
+          { required: true, message: "请输入学练宝金额", trigger: "blur" }
         ],
         isRefundCourseFee: [
           { required: true, message: "请选择是否退还课程费用" }

src/views/teamDetail/components/studentList.vue

@@ -692,7 +692,7 @@
           <el-popover placement="right" width="500" trigger="click">
             <div class="popoverWrap">
               <p>乐团退团退费规则：</p>
-              <p>退还云练习费用：报名缴费时缴费的云练习费用</p>
+              <p>退还学练宝费用：报名缴费时缴费的学练宝费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
@@ -1325,19 +1325,25 @@ export default {
     },
     onMusicGroupExport() {
       let url = "/api-web/export/musicGroupStudent";
+      const searchForm = this.searchForm
+      let rankId = null
+        if(searchForm.memberRankId && searchForm.memberRankId.length > 0) {
+          rankId = searchForm.memberRankId[searchForm.memberRankId.length - 1]
+        }
       let data = {
         musicGroupId: this.teamid,
-        studentStatus: this.searchForm.studentStatus || null,
-        paymentStatus: this.searchForm.isPay || null,
-        subjectId: this.searchForm.major || null,
-        search: this.searchForm.search || null,
-        isActive: this.searchForm.isActive || null,
-        classGroupId: this.searchForm.classGroupId || null,
-        currentGrade: this.searchForm.currentGrade || null,
-        createYear: this.searchForm.createYear || null,
-        hasCourse: this.searchForm.hasCourse || null,
-        comeOnPackage: this.searchForm.comeOnPackage,
-        carePackage: this.searchForm.carePackage
+        studentStatus: searchForm.studentStatus || null,
+        paymentStatus: searchForm.isPay || null,
+        subjectId: searchForm.major || null,
+        search: searchForm.search || null,
+        isActive: searchForm.isActive || null,
+        classGroupId: searchForm.classGroupId || null,
+        currentGrade: searchForm.currentGrade || null,
+        createYear: searchForm.createYear || null,
+        hasCourse: searchForm.hasCourse || null,
+        comeOnPackage: searchForm.comeOnPackage,
+        carePackage: searchForm.carePackage,
+        memberRankId: searchForm.memberRankId && searchForm.memberRankId.length > 0 ?searchForm.memberRankId[searchForm.memberRankId.length - 1] : null
       };
       const options = {
         method: "get",
@@ -1490,7 +1496,7 @@ export default {
               } else {
                 params.status = "PROCESSING";
               }
-              // 退还云练习费用
+              // 退还学练宝费用
 
               // 发请求 退团
               applyMusicGroupQuit(params).then(res => {

src/views/teamDetail/teamCourseList.vue

@@ -129,7 +129,7 @@
                   >
 
                   <el-col :span="4">
-                    <el-form-item label="云练习课程:">
+                    <el-form-item label="学练宝课程:">
                       {{ props.row.memberFlag ? "是" : "否" }}
                     </el-form-item></el-col
                   >
@@ -676,13 +676,13 @@
             <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="云练习课程" prop="memberFlag">
+        <el-form-item label="学练宝课程" prop="memberFlag">
           <el-select
             style="width: 180px !important"
             v-model.trim="searchForm.memberFlag"
             clearable
             filterable
-            placeholder="云练习课程"
+            placeholder="学练宝课程"
           >
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>

src/views/withdrawal-application/index.vue

@@ -264,7 +264,7 @@
           <el-popover placement="right" width="500" trigger="click">
             <div class="popoverWrap">
               <p>乐团退团退费规则：</p>
-              <p>退还云练习费用：报名缴费时缴费的云练习费用</p>
+              <p>退还学练宝费用：报名缴费时缴费的学练宝费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>

src/views/withdrawal-application/modals/quit.vue

@@ -13,7 +13,7 @@
         <el-radio v-model.trim="quitForm.status" label="DENIED">拒绝</el-radio>
       </el-form-item>
       <el-form-item
-        label="退还云练习费用"
+        label="退还学练宝费用"
         prop="isRefundMemberFee"
         v-if="quitForm.status == 'APPROVED' && courseViewType == 2"
       >
@@ -26,7 +26,7 @@
       </el-form-item>
 
       <el-form-item
-        label="退还云练习金额"
+        label="退还学练宝金额"
         prop="cloudTeacherAmount"
         v-if="
           quitForm.isRefundMemberFee &&
@@ -169,9 +169,9 @@ export default {
     quitRules() {
       const required = this.quitForm.status === "APPROVED";
       return {
-        isCloudTeacherAmount: [{ required: true, message: "请输入云练习费用" }],
+        isCloudTeacherAmount: [{ required: true, message: "请输入学练宝费用" }],
         cloudTeacherAmount: [
-          { required: true, message: "请输入云练习金额", trigger: "blur" }
+          { required: true, message: "请输入学练宝金额", trigger: "blur" }
         ],
         status: [{ required: true, message: "请选择审核状态" }],
         isRefundCourseFee: [{ required, message: "请选择是否退还课程费用" }],

src/views/workBenchManager/journal/model/musicGroup.vue

@@ -49,7 +49,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item
-        label="退还云练习费用"
+        label="退还学练宝费用"
         prop="isRefundMemberFee"
         v-if="musicForm.status == 'PROCESSING' && musicForm.courseViewType == 2"
       >
@@ -62,7 +62,7 @@
       </el-form-item> -->
 
     <!-- <el-form-item
-        label="退还云练习金额"
+        label="退还学练宝金额"
         prop="cloudTeacherAmount"
         v-if="
           quitForm.isRefundMemberFee &&
@@ -170,7 +170,7 @@
         <el-popover placement="right" width="500" trigger="click">
           <div class="popoverWrap">
             <p>乐团退团退费规则：</p>
-            <p>退还云练习费用：报名缴费时缴费的云练习费用</p>
+            <p>退还学练宝费用：报名缴费时缴费的学练宝费用</p>
             <p>退还课程费用：缴费总额-已结束课时单价之和</p>
             <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
             <p>退还教辅费用：报名缴费时缴费的教辅费用</p>