浏览代码

提交一下

1
mo 3 年之前
父节点
当前提交
334c32f8f6

+ 2 - 2
src/views/categroyManager/modals/baseInfo.vue

@@ -62,8 +62,8 @@
             :disabled="isDisabled || status != 'DRAFT'"
             @change="changeActivityChannel"
           >
-            <el-option label="乐团渠道" :value="1"></el-option>
-            <el-option label="常规活动" :value="2"></el-option>
+            <el-option label="乐团小课" :value="1"></el-option>
+            <el-option label="常规小课" :value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item

+ 9 - 9
src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      会员收费标准
+      团练宝收费标准
     </h2>
     <div class="m-core"  v-if="(tableList.length>0 || rules.page>1)&&contextFlag">
       <save-form
@@ -19,7 +19,7 @@
           <el-input
             v-model.trim="searchForm.search"
             clearable
-            placeholder="会员名称"
+            placeholder="团练宝名称"
           ></el-input>
         </el-form-item>
         <el-form-item prop="organId">
@@ -63,7 +63,7 @@
         <el-table-column
           align="left"
           prop="rankName"
-          label="会员名称"
+          label="团练宝名称"
         ></el-table-column>
         <!-- <el-table-column align="center" prop="type" label="1天收费现价(元)">
         <template slot-scope="scope">
@@ -219,7 +219,7 @@
         @pagination="getList"
       />
     </div>
-    <emptyPage @submit="addFee" title='会员收费标准' btnTitle='新建会员收费标准' :context='context' v-if="!(tableList.length>0 || rules.page>1)&&contextFlag" />
+    <emptyPage @submit="addFee" title='团练宝收费标准' btnTitle='新建团练宝收费标准' :context='context' v-if="!(tableList.length>0 || rules.page>1)&&contextFlag" />
     <el-dialog
       :title="title"
       :close-on-click-modal="false"
@@ -254,9 +254,9 @@
           </el-select>
         </el-form-item>
         <el-form-item
-          label="会员名称"
+          label="团练宝名称"
           prop="memberRankSettingId"
-          :rules="[{ required: true, message: '请选择会员' }]"
+          :rules="[{ required: true, message: '请选择团练宝' }]"
           :label-width="formLabelWidth"
         >
             <!-- :disabled="addDisabled" -->
@@ -267,7 +267,7 @@
             style="width: 545px !important"
             v-model.trim="form.memberRankSettingId"
             clearable
-            placeholder="请选择会员"
+            placeholder="请选择团练宝"
           >
             <el-option
               v-for="(item, index) in remberList"
@@ -678,7 +678,7 @@ export default {
         minYearFee: null,
         maxYearFee: null,
       },
-      context:'会员收费标准即为团练宝收费标准,可根据各分部的实际情况为分部制定不同的团练宝标准售价,设置完成后,各分部为学员创建团练宝缴费时默认以此处设置的价格向学员收费。',
+      context:'团练宝收费标准即为团练宝收费标准,可根据各分部的实际情况为分部制定不同的团练宝标准售价,设置完成后,各分部为学员创建团练宝缴费时默认以此处设置的价格向学员收费。',
       contextFlag:false
     };
   },
@@ -816,7 +816,7 @@ export default {
                 organId: this.form.organId,
                 memberRankSettingId: this.form.memberRankSettingId,
               });
-              this.$message.success("新建会员成功");
+              this.$message.success("新建成功");
               this.branchStatus = false;
               this.getList();
             } catch {}

+ 4 - 4
src/views/categroyManager/vipActiveList.vue

@@ -60,8 +60,8 @@
             clearable
             placeholder="活动渠道"
           >
-            <el-option label="乐团渠道" :value="'1'"></el-option>
-            <el-option label="常规活动" :value="'2'"></el-option>
+            <el-option label="乐团小课" :value="'1'"></el-option>
+            <el-option label="常规小课" :value="'2'"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="status">
@@ -140,10 +140,10 @@
               <copy-text>{{ scope.row.name }}</copy-text>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="activityType" label="活动类型">
+          <el-table-column align="center" prop="activityType" label="活动渠道">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.activityChannel ==1 ? "乐团渠道" : "常规活动" }}
+                {{ scope.row.activityChannel ==1 ? "乐团小课" : "常规小课" }}
               </div>
             </template>
           </el-table-column>

+ 3 - 3
src/views/vipClass/vipDetail/components/vipStudentList.vue

@@ -22,7 +22,7 @@
       <el-popover placement="left" width="500" trigger="click">
         <div class="popoverWrap">
           <p>VIP退费规则:</p>
-          <p>预计课程单价*课时数-课程标准单价*已完成课时数*0.8</p>
+          <p>(预计课程单价*课时数-课程标准单价*已完成课时数)*0.8</p>
         </div>
         <el-button
           type="text"
@@ -176,7 +176,7 @@
           <!--    v-if="activeStudent == scope.row.id" 202109/10跟辜经理确认过所有乐理课也不能改钱-->
           <template slot-scope="scope">
             <el-input-number
-              
+
               style="width: 90% !important"
               class="number-input"
               v-model="scope.row.onlineClassesUnitPrice"
@@ -191,7 +191,7 @@
           <!--    v-if="activeStudent == scope.row.id" -->
           <template slot-scope="scope">
             <el-input-number
-              
+
               style="width: 90% !important"
               class="number-input"
               v-model="scope.row.offlineClassesUnitPrice"