Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

public/html/基本信息_1.html

@@ -99,7 +99,7 @@
         <div id="u278" class="ax_default _文本段落">
           <div id="u278_div" class=""></div>
           <div id="u278_text" class="text ">
-            <p><span>课程收费</span></p><p><span>课程收费模式下，乐团创建报名缴费时需选择收费标准，收费准表中包含学员报名缴费时会展示课程信息</span></p><p><span>AMR收费</span></p><p><span>AMR收费模式下，</span></p><p><span>会员收费</span></p><p><span>该模式下学员需购买【会员】才可使用【会员】提供 的系统功能，主要包括【器乐练习云教练】中的相关功能</span></p><p><span>该模式下的乐团每学期【3月1日~8月31日、9月1日~2月28/29日】，最多赠送3960分钟（即88节45分钟课程时长），其中声部课1980分钟（44节45分钟课程）、合奏课1980分钟（44节45分钟课程），该时长也可排【课堂课】【综合课】，若排【课堂课】【综合课】则声部课与合奏课时长平均减少</span></p><p><span>排课时系统根据第一节课的排课日期到本学期结束日期计算课排课周次，按周次*4课时*45分钟计算本学期可排课分钟数，最大不可超过赠送的3960分钟</span></p><p><span>该模式下【赠送课程】必须一次性全部排完，不可多次排课</span></p><p><span>乐团通过审核后，不可修改【收费模式】</span></p>
+            <p><span>课程收费</span></p><p><span>课程收费模式下，乐团创建报名缴费时需选择收费标准，收费准表中包含学员报名缴费时会展示课程信息</span></p><p><span>AMR收费</span></p><p><span>AMR收费模式下，</span></p><p><span>会员收费</span></p><p><span>该模式下学员需购买【会员】才可使用【会员】提供 的系统功能，主要包括【器乐练习团练宝】中的相关功能</span></p><p><span>该模式下的乐团每学期【3月1日~8月31日、9月1日~2月28/29日】，最多赠送3960分钟（即88节45分钟课程时长），其中声部课1980分钟（44节45分钟课程）、合奏课1980分钟（44节45分钟课程），该时长也可排【课堂课】【综合课】，若排【课堂课】【综合课】则声部课与合奏课时长平均减少</span></p><p><span>排课时系统根据第一节课的排课日期到本学期结束日期计算课排课周次，按周次*4课时*45分钟计算本学期可排课分钟数，最大不可超过赠送的3960分钟</span></p><p><span>该模式下【赠送课程】必须一次性全部排完，不可多次排课</span></p><p><span>乐团通过审核后，不可修改【收费模式】</span></p>
           </div>
         </div>
 

public/html/报名缴费.html

@@ -711,7 +711,7 @@
         <div id="u624" class="ax_default _文本段落">
           <div id="u624_div" class=""></div>
           <div id="u624_text" class="text ">
-            <p><span>该功能可对不购买【云教练】的学员解除限制，解除限制后该学员可以不购买【云教练】入团，且占用【计划招生人数】</span></p><p><span>已购买【乐器】，不购买【云教练】的学员解除限制后直接入团，且占用【计划招生人数】</span></p>
+            <p><span>该功能可对不购买【团练宝】的学员解除限制，解除限制后该学员可以不购买【团练宝】入团，且占用【计划招生人数】</span></p><p><span>已购买【乐器】，不购买【团练宝】的学员解除限制后直接入团，且占用【计划招生人数】</span></p>
           </div>
         </div>
 
@@ -851,7 +851,7 @@
         <div id="u642" class="ax_default _文本段落">
           <div id="u642_div" class=""></div>
           <div id="u642_text" class="text ">
-            <p><span>学员可通过二维码或链接进行正式报名</span></p><p><span>若乐团已开启缴费则报名后自动进入缴费页面</span></p><p><span>【会员收费】乐团若学员不购买【云教练】，仅购买【乐器】，可以正常缴费，缴费后统计为【审核中】</span></p><p><span>不购买【云教练】学员不占用【计划招生人数】，乐团【确认开团】后，该学员不会进入乐团</span></p><p><span>乐团报名缴费支持多次缴费，后续缴费不可重复购买已购买的产品或服务</span></p>
+            <p><span>学员可通过二维码或链接进行正式报名</span></p><p><span>若乐团已开启缴费则报名后自动进入缴费页面</span></p><p><span>【会员收费】乐团若学员不购买【团练宝】，仅购买【乐器】，可以正常缴费，缴费后统计为【审核中】</span></p><p><span>不购买【团练宝】学员不占用【计划招生人数】，乐团【确认开团】后，该学员不会进入乐团</span></p><p><span>乐团报名缴费支持多次缴费，后续缴费不可重复购买已购买的产品或服务</span></p>
           </div>
         </div>
 

src/App.vue

@@ -96,7 +96,8 @@ input[type="number"] {
 .el-dialog {
   margin-bottom: 10vh;
   .el-dialog__header {
-    background: #363d55;
+    // background: #363d55;
+    background: var(--color-primary);
     padding: 15px 20px 15px;
     .el-dialog__title {
       color: #fff;

src/components/serviceRemind/index.vue

@@ -83,7 +83,7 @@ export default {
       this.__init()
     },
     tenantInfo() {
-      console.log('showInfo ing', this.tenantInfo)
+      // console.log('showInfo ing', this.tenantInfo)
       this.__init()
     }
   },

src/router/index.js

@@ -304,7 +304,7 @@ export const asyncRoutes = {
   entryOperation: () => import('@/views/app/entryOperation'),
   // 意见反馈
   suggestion: () => import('@/views/app/suggestion'),
-  // 云教练意见反馈
+  // 团练宝意见反馈
   clouldSuggestion: () => import('@/views/app/clouldSuggestion'),
   // 帮助分类
   helpCategory: () => import('@/views/helpCenter/helpCategory'),
@@ -486,7 +486,7 @@ export const asyncRoutes = {
   serviceManager: () => import('@/views/courseListManager'),
   serviceList: () => import('@/views/platformManager/serviceManager/index'),
   serviceOperation: () => import('@/views/platformManager/serviceManager/form'),
-  // 云教练流量包
+  // 团练宝流量包
   cloudTrafficPackage: () => import('@/views/platformManager/cloudTrafficPackage'),
   accompanyBaseConfig: () => import('@/views/categroyManager/accompanyBaseConfig'),
   // 网管课价格配置

src/store/modules/permission.js

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

src/utils/searchArray.js

@@ -574,8 +574,8 @@ export const visitChiose1 = [{
     }]
   },
   {
-    value: '云教练',
-    label: '云教练',
+    value: '团练宝',
+    label: '团练宝',
     children: [{
       value: '体验回访',
       label: '体验回访'

src/views/app/clouldSuggestion.vue

@@ -1,7 +1,7 @@
 <template>
   <div class='m-container'>
   <h2>
-      <div class="squrt"></div>云教练反馈
+      <div class="squrt"></div>团练宝反馈
     </h2>
   <div class="m-core">
     <save-form

src/views/app/suggestionIndex.vue

@@ -13,7 +13,7 @@
         <el-tab-pane label="APP反馈" lazy name="1" v-if="permissionList.suggestion">
           <suggestion v-if="activeIndex === '1'" />
         </el-tab-pane>
-        <el-tab-pane label="云教练反馈" lazy name="2" v-if="permissionList.clouldSuggestion">
+        <el-tab-pane label="团练宝反馈" lazy name="2" v-if="permissionList.clouldSuggestion">
           <clouldSuggestion v-if="activeIndex === '2'"  />
         </el-tab-pane>
       </tab-router>

src/views/businessManager/shopManager/shopList.vue

@@ -12,7 +12,7 @@
         style="margin-bottom: 20px"
         >添加</el-button
       >
-      <el-upload
+      <!-- <el-upload
         v-permission="'import/goods'"
         style="display: inline-block; margin: 0 10px"
         action="/api-web/import/goods"
@@ -24,7 +24,7 @@
         :on-success="handleSuccess"
       >
         <el-button type="primary" style="margin-bottom: 20px">商品导入</el-button>
-      </el-upload>
+      </el-upload> -->
       <!-- <el-upload v-permission="'export/goods'"
                  style="display: inline-block; margin: 0 10px;"
                  action="/api-web/export/goods"
@@ -43,13 +43,13 @@
         @click="exportShopList"
         >商品导出</el-button
       >
-      <el-button
+      <!-- <el-button
         type="primary"
         style="margin-bottom: 20px"
         @click="onDownload"
         v-permission="'import/downloadTemplate'"
         >下载模板</el-button
-      >
+      > -->
       <el-button
         type="primary"
         style="margin-bottom: 20px"
@@ -243,7 +243,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>
           </el-select>
         </el-form-item> -->
         <!-- <el-form-item prop="replacementShow">
@@ -818,7 +818,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-select
             v-model="form.courseViewType"
@@ -828,7 +828,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>
           </el-select> -->
         <!-- </el-form-item> -->
         <!-- <el-form-item

src/views/businessManager/shopManager/shopOperation.vue

@@ -383,7 +383,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/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/insideSetting/adminOperation.vue

@@ -85,7 +85,8 @@ export default {
       silderList: [],
       allChildIds: [], // 所有子编号
       slideCount: 0,
-      seachRoleValue: '' //权限搜索字段
+      seachRoleValue: '', //权限搜索字段
+      filterIds: [4794, 4743, 3266, 3268, 3306, 3307, 3309, 3784, 4627]
     }
   },
   mounted () {
@@ -101,8 +102,8 @@ export default {
       this.pageType = this.$route.query.type
       this.id = this.$route.query.id
       this.page = this.$route.query.page
-      if (this.pageType == 'create') {
-
+      if(this.pageType == 'create') {
+        this.$refs.tree.setCheckedKeys([4229]);
       }
       this.lookSilder()
     },
@@ -209,24 +210,33 @@ export default {
     setTableData (result) {
       let list = []
       list = result.map(res => {
-        let tempList = {}
-        tempList = {
-          id: res.id,
-          name: res.name,
-          label: res.name,
-          type: res.type,
-          path: res.path,
-          permission: res.permission,
-          icon: res.icon,
-          parentId: res.parentId
+        if(!this.filterIds.includes(res.id)) {
+          let tempList = {}
+          tempList = {
+            id: res.id,
+            name: res.name,
+            label: res.name,
+            type: res.type,
+            path: res.path,
+            permission: res.permission,
+            icon: res.icon,
+            parentId: res.parentId
+          }
+          this.slideCount++
+          if (res.sysMenus && res.sysMenus.length > 0) {
+            tempList.children = this.setTableData(res.sysMenus)
+          }
+          return tempList
         }
-        this.slideCount++
-        if (res.sysMenus && res.sysMenus.length > 0) {
-          tempList.children = this.setTableData(res.sysMenus)
+        return null
+      })
+      let tempList = []
+      list.forEach(item => {
+        if(item) {
+          tempList.push(item)
         }
-        return tempList
       })
-      return list
+      return tempList
     },
     onReSet () {
       this.$refs.tree.setCheckedNodes([])
@@ -234,6 +244,7 @@ export default {
         roleName: null,
         roleDesc: null,
       }
+      this.isIndeterminate = false
       this.checkAll = false
     },
     onCancel () {

src/views/categroyManager/specialSetup/cloudTeacherFee.vue

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

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

@@ -140,7 +140,7 @@ export const getMusicGroupPerformance = (data) => request2({
   params: data
 })
 
-// 获取云教练首页数据汇总
+// 获取团练宝首页数据汇总
 export const getCloudStudyStudentOverView = (data) => request2({
   url: '/api-web/studentManage/getCloudStudyStudentOverView',
   method: 'get',

src/views/main/cloudDate/organDate.vue

@@ -119,7 +119,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="
@@ -176,7 +176,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="
@@ -398,11 +398,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"
@@ -320,11 +320,11 @@ export default {
         this,
         {
           url: "/api-web/export/organTeacherMemberStudentData",
-          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
@@ -131,7 +131,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="
@@ -190,7 +190,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="
@@ -434,11 +434,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

@@ -164,7 +164,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="
@@ -189,7 +189,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="
@@ -319,7 +319,7 @@
                 <span>活跃度</span>
                 <el-tooltip placement="top" popper-class="mTooltip">
                   <div slot="content">
-                    当日使用过云教练的会员占比（生效中会员，含试用）
+                    当日使用过团练宝的会员占比（生效中会员，含试用）
                   </div>
                   <i
                     class="el-icon-question micon el-tooltip"
@@ -432,11 +432,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

@@ -59,7 +59,7 @@ export const descs = {
   "vipStudentNum":'会员生效中或待生效总人数',
   "eVipStudentNum":'如果是试用会员又是付费会员，则不算试用会员数',
   "cloudStudyLivelyStudentNum":'近15天内使用达到5天及以上的用户总数',
-  "newCloudStudyStudentNum":'第一次使用云教练的人数',
+  "newCloudStudyStudentNum":'第一次使用团练宝的人数',
   "cloudStudyTodayUseStudentNum":'今日使用的总人数',
   "cloudStudyUseStudentNum":'累计使用的总人数',
 }

src/views/main/index.vue

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

src/views/organManager/components/memberSetting.vue

@@ -160,8 +160,8 @@ export default {
   methods: {
     async __init() {
       try {
-        // 如果有机构编号则传,没有则传平台编号
-        const tenantId = this.$route.query.id || -1
+        // 不管是添加、查看、修改都传-1
+        const tenantId = -1
         const res = await queryTree({ enable: 1, tenantId })
         const rows = res.data || []
         rows.forEach(item => {

src/views/organManager/components/roomRules.vue

@@ -35,7 +35,7 @@
               <el-input
                 :disabled="isDisabled"
                 placeholder="请输入合同价"
-                style="width: 180px !important;"
+                style="width: 220px !important;"
                 @keyup.native='keyupEvent($event)'
                 v-model="scope.row.price"
                 type="number"

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/platformManager/productManger/index.vue

@@ -10,7 +10,6 @@
       ref="searchForm"
       @submit="search"
       @reset="reset"
-      
       :saveKey="'platformProductManager'"
       :model.sync="searchForm"
     >
@@ -27,7 +26,6 @@
     <div class="tableWrap">
       <el-table
         :data="tableList"
-        
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
       >
         <el-table-column align="center" label="产品编号" prop="id">
@@ -48,14 +46,12 @@
               @click="resetProduct(scope.row)"
               v-permission="'platformProduct/update'"
               type="text"
-              
               >修改</el-button
             >
             <el-button
               @click="delProduct(scope.row)"
               v-permission="'platformProduct/delete'"
               type="text"
-              
               >删除</el-button
             >
           </template>

src/views/platformManager/productManger/operationModel.vue

@@ -92,7 +92,9 @@ export default {
       silderList: [],
       allChildIds: [], // 所有子编号
       slideCount: 0,
-      seachRoleValue: '' //权限搜索字段
+      seachRoleValue: '', //权限搜索字段
+      filterIds: [4794, 4743, 3266, 3268, 3306, 3307, 3309, 3784, 4627]
+      // 4229 公用权限
     };
   },
   mounted() {
@@ -105,6 +107,11 @@ export default {
       }
       this.menuId = activeRow.menuId ? activeRow.menuId.split(',').map(res => Number(res)) : []
     }
+
+    if(this.pageType == 'create') {
+      this.$refs.tree.setCheckedKeys([4229]);
+    }
+
     this.lookSilder()
   },
   methods: {
@@ -155,6 +162,7 @@ export default {
         this.silderList = silderItem
 
         tempData = this.setTableData(silderItem)
+        console.log(tempData)
         this.data = tempData
       }
       if (this.pageType == 'update') {
@@ -213,24 +221,33 @@ export default {
     setTableData (result) {
       let list = []
       list = result.map(res => {
-        let tempList = {}
-        tempList = {
-          id: res.id,
-          name: res.name,
-          label: res.name,
-          type: res.type,
-          path: res.path,
-          permission: res.permission,
-          icon: res.icon,
-          parentId: res.parentId
+        if(!this.filterIds.includes(res.id)) {
+          let tempList = {}
+          tempList = {
+            id: res.id,
+            name: res.name,
+            label: res.name,
+            type: res.type,
+            path: res.path,
+            permission: res.permission,
+            icon: res.icon,
+            parentId: res.parentId
+          }
+          this.slideCount++
+          if (res.sysMenus && res.sysMenus.length > 0) {
+            tempList.children = this.setTableData(res.sysMenus)
+          }
+          return tempList
         }
-        this.slideCount++
-        if (res.sysMenus && res.sysMenus.length > 0) {
-          tempList.children = this.setTableData(res.sysMenus)
+        return null
+      })
+      let tempList = []
+      list.forEach(item => {
+        if(item) {
+          tempList.push(item)
         }
-        return tempList
       })
-      return list
+      return tempList
     },
     onReSet () {
       this.$refs.tree.setCheckedNodes([])
@@ -238,6 +255,7 @@ export default {
         roleName: null,
         roleDesc: null,
       }
+      this.isIndeterminate = false
       this.checkAll = false
     },
     onCancel () {
@@ -253,9 +271,9 @@ export default {
        this.$refs.tree.filter(this.seachRoleValue);
     },
     filterNode(value, data) {
-        if (!value) return true;
-        return data.label.indexOf(value) !== -1;
-      },
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
     onReSetRole () {
       this.seachRoleValue = ''
       this.data = this.setTableData(this.silderList)

src/views/productService/components/cloudRecharge.vue

@@ -15,7 +15,7 @@
         <div class="descriptions">
           <div class="title">云教室扣费标准</div>
           <div class="tips">
-            <p style="padding-bottom: 10px">以1v1课程，既老师学员1对1教学，45分钟课程为例，每分钟收费标准0.2元，则该课程结束后将扣除云教室费用45分钟*0.2元/分钟=9元</p>
+            <p style="padding-bottom: 10px">以1v1课程，既老师学员1对1教学，45分钟课程为例，每分钟收费标准{{ stand }}元，则该课程结束后将扣除云教室费用45分钟*{{ stand }}元/分钟={{ 45 * stand }}元</p>
             <el-table
               :data="tableData"
               border
@@ -68,6 +68,7 @@
 <script>
 import rechargeModel from '@/views/productService/model/rechargeModel'
 export default {
+  props: ['tenant'],
   name: 'cloudRecharge',
   components: {
     rechargeModel
@@ -78,13 +79,24 @@ export default {
       form: {
         amount: null
       },
-      tableData: [{
-        num: 2,
-        minute: 0.5
-      }, {
-        num: 3,
-        minute: 0.5
-      }]
+      tableData: [],
+      stand: 0, //标准金额
+    }
+  },
+  mounted() {
+    if(this.tenant) {
+      let config = this.tenant?.config?.config
+      config = config ? JSON.parse(config) : {}
+      let cloud_room_rule = config?.cloud_room_rule?.cloud_room_config || {}
+      for (const i in cloud_room_rule) {
+        if(i == 2) {
+          this.stand = cloud_room_rule[i]
+        }
+        this.tableData.push({
+          num: i,
+          minute: cloud_room_rule[i]
+        })
+      }
     }
   },
   methods: {

src/views/productService/components/serviceRenew.vue

@@ -63,10 +63,9 @@
 <script>
 import serviceModel from '@/views/productService/model/serviceModel'
 import version from '@/views/productService/model/version'
-import { tenantInfoInfo } from '@/views/organManager/api'
-import { getTenantId } from '@/utils/auth'
 import { paymentMode } from '@/constant'
 export default {
+  props: ['tenant'],
   name: 'serviceRenew',
   components: {
     serviceModel,
@@ -96,22 +95,18 @@ export default {
     }
   },
   mounted() {
-    this.__init();
+    if(this.tenant) {
+      let data = this.tenant
+      this.tenantInfo = {
+        platformServeName: data.platformServeName,
+        studentUpLimit: data.studentUpLimit,
+        contractPrice: data.productInfo?.contractPrice || 0,
+        originalPrice: data.productInfo?.originalPrice || 0,
+        expiryUnit: data.productInfo?.expiryUnit
+      }
+    }
   },
   methods: {
-    async __init() {
-      try {
-        const res = await tenantInfoInfo({ id: getTenantId() })
-        const { data } = res
-        this.tenantInfo = {
-          platformServeName: data.platformServeName,
-          studentUpLimit: data.studentUpLimit,
-          contractPrice: data.productInfo?.contractPrice || 0,
-          originalPrice: data.productInfo?.originalPrice || 0,
-          expiryUnit: data.productInfo?.expiryUnit
-        }
-      } catch(e) {}
-    },
     onRecharge() {
       this.$refs.form.validate(async (_) => {
         if(_) {

src/views/productService/index.vue

@@ -67,7 +67,7 @@
           v-if="permission('/serviceRenew')"
           name="1"
         >
-          <service-renew v-if="activeIndex == 1" @getList="__init" />
+          <service-renew v-if="activeIndex == 1 && tenantInfo" @getList="__init" :tenant="tenantInfo" />
         </el-tab-pane>
         <el-tab-pane
           label="云教室充值"
@@ -75,7 +75,7 @@
           v-if="permission('/cloudRecharge')"
           name="2"
         >
-          <cloud-recharge v-if="activeIndex == 2" @getList="__init" />
+          <cloud-recharge v-if="activeIndex == 2 && tenantInfo" @getList="__init" :tenant="tenantInfo" />
         </el-tab-pane>
       </tab-router>
     </div>
@@ -84,6 +84,7 @@
 <script>
 import cloudRecharge from '@/views/productService/components/cloudRecharge'
 import serviceRenew from '@/views/productService/components/serviceRenew'
+import { tenantInfoInfo } from '@/views/organManager/api'
 import { permission } from "@/utils/directivePage";
 import { queryTenantInfoSumm } from "./api";
 import dayjs from 'dayjs'
@@ -107,7 +108,8 @@ export default {
         balance: 0,
         frozenAmount: 0,
         balance: 0
-      }
+      },
+      tenantInfo: null, // 机构信息
     };
   },
   mounted() {
@@ -122,6 +124,9 @@ export default {
         // this.dataInfo.expiryDate = res.data.expiryDate ? dayjs(res.data.expiryDate).format('YYYY-MM-DD') : null
         this.dataInfo.expiryDateEnd = res.data.expiryDateEnd ? dayjs(res.data.expiryDateEnd).format('YYYY-MM-DD') : null
         this.dataInfo.validRemaining = res.data.validRemaining || 0
+
+        const tenantInfo = await tenantInfoInfo({ id: this.$helpers.tenantId })
+        this.tenantInfo = tenantInfo.data
       } catch(e) { }
     },
     onDetail() {

src/views/reportForm/index.vue

@@ -370,7 +370,7 @@
       <el-divider></el-divider>
       <div class="m-core">
         <div class="m-wrap">
-          <div class="title">云教练学员统计：</div>
+          <div class="title">团练宝学员统计：</div>
           <el-select
             v-model.trim="trainOrganId"
             class="organSelect"
@@ -408,7 +408,7 @@
             clearable
           >
             <el-option
-              label="云教练用户反馈"
+              label="团练宝用户反馈"
               value="CLOUD_TEACHER_FEEDBACK"
             ></el-option>
           </el-select>
@@ -910,13 +910,13 @@ export default {
         this,
         {
           url: "/api-web/export/cloudStudyStudentTrainData",
-          fileName: "云教练学员统计.xls",
+          fileName: "团练宝学员统计.xls",
           method: "post",
           params: qs.stringify({
             organId: this.trainOrganId,
           }),
         },
-        "您确定导出云教练学员统计?"
+        "您确定导出团练宝学员统计?"
       );
     },
     exportQuestion() {

src/views/resetTeaming/modals/member.vue

@@ -97,7 +97,7 @@ export default {
   },
   methods: {
     onTrainChange(item) {
-      // 乐器练习云教练点击时
+      // 团练宝点击时
       this.$emit("onCheckItem", item);
     },
     onQuestions(item) {

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

@@ -127,8 +127,8 @@ export default {
       balance: 0, // 余额
       needPrice: 0, // 还需支付
       payType: false, // 是否余额支付
-      cloudTeacherFee: 0, // 云教练费用
-      cloudTeacherPlusFee: 0, // 云教练+
+      cloudTeacherFee: 0, // 团练宝费用
+      cloudTeacherPlusFee: 0, // 团练宝+
       orderInfo: {
         marketPrice: 0,
         amount: 0, // 现价总金额
@@ -169,9 +169,9 @@ export default {
       isClickStatus: false,
       accessStatus: false, // 是否有辅件乐保
       accessIsShowStatus: false, // 是否显示辅件 true 显示， false 不显示
-      memberCoursePrice: [], // 云教练，显示赠送的课程
+      memberCoursePrice: [], // 团练宝，显示赠送的课程
       memberCourseShowFlag: false, // 是否显示赠送课程
-      buyCloudTeacher: false, // 是否购买云教练
+      buyCloudTeacher: false, // 是否购买团练宝
       remissionCourseFeeStatus: false,
     };
   },

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

@@ -462,7 +462,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

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

src/views/studentManager/memberList.vue

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

src/views/studentManager/studentList.vue

@@ -157,7 +157,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,18 +174,13 @@
           >
         </el-form-item>
       </save-form>
-      <!-- <div
-        class="newBand"
-        v-permission="'studentManage/register'"
-        @click="addStudent"
-      >
-        新增学员
-      </div>
-      <div class="newBand" @click="onCreateQRCode">学员激活列表</div> -->
+      <el-button  style="margin-bottom: 20px;" type="primary"
+        @click="addStudentMember" icon="el-icon-plus">添加会员</el-button>
       <el-button
         v-permission="'studentManage/register'"
         @click="addStudent"
         type="primary"
+        icon="el-icon-plus"
         style="margin-bottom:20px"
       >
         新增学员
@@ -202,7 +197,12 @@
         <el-table
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+          @selection-change="handleSelectionChange"
         >
+          <el-table-column
+            type="selection"
+            width="55"
+          ></el-table-column>
           <el-table-column type="expand">
             <template slot-scope="props">
               <el-form label-position="left" class="demo-table-expand" :inline='true'>
@@ -382,7 +382,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>
@@ -883,6 +883,24 @@
         <el-button @click="protocolVisible = false">取 消</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog
+      title="添加会员"
+      width="500px"
+      :visible.sync="memberVisible" 
+    >
+      <createMember
+        ref="addMember"
+        v-if="memberVisible"
+        :multipleSelection="multipleSelection"
+        @close="memberVisible = false"
+        @submited="getList"
+      />
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="memberVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitAddMember">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -892,24 +910,21 @@ import {
   getStudentInfoByPhone,
   registerStudent,
   updateStudent,
-  studentHasCourse,
   getLatest,
 } from "@/api/studentManager";
 import { queryByOrganId } from "@/api/systemManage";
 import qrCode from "@/components/QrCode/index";
-import cleanDeep from "clean-deep";
 import { vaildStudentUrl } from "@/utils/validate";
-import { getEmployeeOrgan, resetPassword2, getTeacher } from "@/api/buildTeam";
+import { resetPassword2, getTeacher } from "@/api/buildTeam";
 import { subjectListTree } from "@/api/specialSetting";
 import axios from "axios";
 import qs from "qs";
-import { packageStatus } from "@/constant/index";
 import { getToken, getTenantId } from "@/utils/auth";
 import load from "@/utils/loading";
-import { permission } from "@/utils/directivePage";
+import createMember from "@/views/teamDetail/components/modals/createMember";
 export default {
   name: "studentManagerList",
-  components: { pagination, qrCode },
+  components: { pagination, qrCode, createMember },
   data() {
     return {
       studentVisible: false,
@@ -930,6 +945,8 @@ export default {
         hasTeacher: null,
         isRecord: null,
       },
+      memberVisible: false,
+      multipleSelection: [],
       searchList: [],
       tableList: [],
       organList: [],
@@ -1014,6 +1031,19 @@ export default {
         this.tenantId = this.$helpers.tenantId;
   },
   methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    submitAddMember() {
+      this.$refs.addMember.submit();
+    },
+    addStudentMember() {
+      if (this.multipleSelection.length > 0) {
+        this.memberVisible = true;
+      } else {
+        this.$message.error("请至少选择一名学员");
+      }
+    },
     onSearch() {
       this.pageInfo.page = 1;
       this.getList();
@@ -1028,9 +1058,9 @@ export default {
       if (version == 3) {
         str = "（含系统）";
       } else if (version == 4) {
-        str = "（含云教练）";
+        str = "（含团练宝）";
       } else if (version == 5) {
-        str = "（含云教练<sup>+</sup>）";
+        str = "（含团练宝<sup>+</sup>）";
       }
       return str;
     },
@@ -1064,25 +1094,6 @@ export default {
     downLoadStudent() {
       let url = "/api-web/export/studentHasCourse";
       let searchForm = this.searchForm;
-
-
-      /**
-       *         organId: null,
-        search: null,
-        studentName: null,
-        isActive: null,
-        hasCourse: null,
-        // isMake: null,
-        hasPracticeCourse: null,
-        operatingTag: null,
-        serviceTag: null,
-        teacherId: null,
-        carePackage: null,
-        comeOnPackage: null,
-        isNewUser: null,
-        hasTeacher: null,
-        isRecord: null,
-       */
       let data = {
         organId: searchForm.organId.join(','),
         search: searchForm.search+'' ? searchForm.search : null,

src/views/teamBuild/signupList.vue

@@ -215,7 +215,7 @@
                       审核中
                       <el-tooltip placement="top" popper-class="mTooltip">
                         <div slot="content">
-                          不购买云教练系统学员数量，不包含已缴费学员
+                          不购买团练宝系统学员数量，不包含已缴费学员
                         </div>
                         <i
                           class="el-icon-question"
@@ -233,16 +233,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"
@@ -262,16 +262,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"
@@ -470,7 +470,7 @@
             v-model.trim="searchFrom.hasCloudTeacher"
             clearable
             filterable
-            placeholder="是否购买云教练"
+            placeholder="是否购买团练宝"
           >
             <el-option label="是" :value="1"></el-option>
             <el-option label="否" :value="0"></el-option>
@@ -553,7 +553,7 @@
                   </el-form-item></el-col
                 >
                 <!-- <el-col :span="4">
-                  <el-form-item label="是否购买云教练:">
+                  <el-form-item label="是否购买团练宝:">
                     <span>{{
                       props.row.hasCloudTeacher == 1 ? "是" : "否"
                     }}</span>
@@ -574,7 +574,7 @@
                       解除限制
                       <el-tooltip placement="top" popper-class="mTooltip">
                         <div slot="content">
-                          学员是否受到不购买云教练的缴费限制
+                          学员是否受到不购买团练宝的缴费限制
                         </div>
                         <i
                           class="el-icon-question"
@@ -730,7 +730,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"
@@ -1019,7 +1019,7 @@
           <el-popover placement="right" width="500" trigger="click">
             <div class="popoverWrap">
               <p>乐团退团退费规则：</p>
-              <p>退还乐器练习云教练费用：报名缴费时缴费的乐器练习云教练费用</p>
+              <p>退还团练宝费用：报名缴费时缴费的团练宝费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
@@ -1175,7 +1175,7 @@ export default {
         currentGrade: null, // 入学年级
         paymentStatus: "",
         visited: "",
-        hasCloudTeacher: null, // 是否购买云教练
+        hasCloudTeacher: null, // 是否购买团练宝
         payingStatus: null,
         noneNeedCloudTeacher: null,
         studentStatus: null,
@@ -1246,9 +1246,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: "请选择是否退还课程费用" },
@@ -1792,7 +1792,7 @@ export default {
               item.type == "CLOUD_TEACHER" ||
               item.type == "CLOUD_TEACHER_PLUS"
             ) {
-              item.name = "乐器练习云教练";
+              item.name = "团练宝";
             } else if (item.type == "COURSE") {
               item.name = "课程";
             }
@@ -2035,7 +2035,7 @@ export default {
       return row.paymentStatus == 0;
     },
     relieve(row) {
-      this.$confirm("操作后该学员即可不购买云教练缴费入团", "提示", {
+      this.$confirm("操作后该学员即可不购买团练宝缴费入团", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

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

@@ -271,9 +271,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

@@ -20,8 +20,7 @@
         v-if="team_status == 'PROGRESS'"
         v-permission="'studentRegistration/insertStudent'"
         @click="createStudentFrom" icon="el-icon-plus">新增学员</el-button>
-      <el-button  style="margin-bottom: 20px;" type="primary"
-        @click="addStudentMember" icon="el-icon-plus">添加会员</el-button>
+      
     </div>
 
     <!-- 搜索类型 -->
@@ -781,7 +780,7 @@
           <el-popover placement="right" width="500" trigger="click">
             <div class="popoverWrap">
               <p>乐团退团退费规则：</p>
-              <p>退还乐器练习云教练费用：报名缴费时缴费的乐器练习云教练费用</p>
+              <p>退还团练宝费用：报名缴费时缴费的团练宝费用</p>
               <p>退还课程费用：缴费总额-已结束课时单价之和</p>
               <p>退还乐器费用：报名缴费时缴纳的乐器费用（团购、租金）</p>
               <p>退还教辅费用：报名缴费时缴费的教辅费用</p>
@@ -956,23 +955,6 @@
         <el-button type="primary" @click="submitAddTryTime">确 定</el-button>
       </div>
     </el-dialog> -->
-    <el-dialog
-      title="添加会员"
-      width="500px"
-      :visible.sync="memberVisible" 
-    >
-      <createMember
-        ref="addMember"
-        v-if="memberVisible"
-        :multipleSelection="multipleSelection"
-        @close="memberVisible = false"
-        @submited="getList"
-      />
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="memberVisible = false">取 消</el-button>
-        <el-button type="primary" @click="submitAddMember">确 定</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -1019,7 +1001,6 @@ import visit from "@/views/withdrawal-application/modals/visit";
 import mergeMusic from "@/views/teamBuild/components/merge-music";
 import quiteTeam from "@/views/teamDetail/components/modals/quite-team";
 import addTryList from "@/views/teamDetail/components/modals/addTryList";
-import createMember from "@/views/teamDetail/components/modals/createMember";
 export default {
   name: "tstudentList",
   data() {
@@ -1205,10 +1186,8 @@ export default {
         subject: "",
       },
       subjectVisible: false,
-      multipleSelection: [],
       isCanReg: false,
       organId: "",
-      memberVisible: false,
       // addTryVisible: false,
       // memberRankList: [],
       isManage: false,
@@ -1227,8 +1206,7 @@ export default {
     changeVoice,
     mergeMusic,
     quiteTeam,
-    addTryList,
-    createMember
+    addTryList
   },
   created() {},
   filters: {
@@ -1553,7 +1531,7 @@ export default {
               } else {
                 params.status = "PROCESSING";
               }
-              // 退还乐器练习云教练费用
+              // 退还团练宝费用
 
               // 发请求 退团
               applyMusicGroupQuit(params).then((res) => {
@@ -1986,16 +1964,6 @@ export default {
         params: { search: search },
       });
     },
-    addStudentMember() {
-      if (this.multipleSelection.length > 0) {
-        this.memberVisible = true;
-      } else {
-        this.$message.error("请至少选择一名学员");
-      }
-    },
-    submitAddMember() {
-      this.$refs.addMember.submit();
-    },
     // addTryTime() {
     //   if (this.multipleSelection.length > 0) {
     //     this.addTryVisible = true;

src/views/teamDetail/teamCourseList.vue

@@ -153,7 +153,7 @@
                     </el-form-item></el-col
                   >
                   <el-col :span="4">
-                    <el-form-item label="云教练课程:">
+                    <el-form-item label="团练宝课程:">
                       {{ props.row.memberFlag ? "是" : "否" }}
                     </el-form-item></el-col
                   >
@@ -304,7 +304,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="isCallNames" label="云教练课程">
+          <el-table-column align="center" prop="isCallNames" label="团练宝课程">
             <template slot-scope="scope">{{
               scope.row.memberFlag ? "是" : "否"
             }}</template>
@@ -742,13 +742,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

@@ -243,7 +243,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&&quitForm.isRefundMemberFee!='false' && quitForm.status == 'APPROVED'"
       >
@@ -157,8 +157,8 @@ export default {
     quitRules() {
       const required = this.quitForm.status === "APPROVED";
       return {
-        isCloudTeacherAmount: [{ required: true, message: "请输入云教练费用" }],
-        cloudTeacherAmount: [{ required: true, message: "请输入云教练金额", trigger: 'blur' }],
+        isCloudTeacherAmount: [{ required: true, message: "请输入团练宝费用" }],
+        cloudTeacherAmount: [{ required: true, message: "请输入团练宝金额", trigger: 'blur' }],
         status: [{ required: true, message: "请选择审核状态" }],
         isRefundCourseFee: [{ required, message: "请选择是否退还课程费用" }],
         isRefundInstrumentFee: [{ 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>