Merge branch '03/03GRADE' into test

src/views/categroyManager/specialSetup/cloudTeacherFee.vue

@@ -34,12 +34,21 @@
           </el-table-column>
           <el-table-column align='center'
                            prop="price"
-                           label="价格（元）">
+                           label="云教练价格（元）">
             <template slot-scope="scope">
               {{ scope.row.price | moneyFormat }}
             </template>
           </el-table-column>
           <el-table-column align='center'
+                           prop="price">
+            <template #header>
+              云教练<sup>+</sup>价格（元）
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.plusPrice | moneyFormat }}
+            </template>
+          </el-table-column>
+          <el-table-column align='center'
                           v-if="$helpers.permission('organizationCloudTeacherFee/update')"
                            label="操作">
             <template slot-scope="scope">
@@ -80,11 +89,21 @@
             ></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"
-                    placeholder="请输入金额"
+                    placeholder="请输入价格"
+                    type="number"
+                    autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item prop="plusPrice"
+                      :label-width="formLabelWidth">
+          <template #label>
+            云教练<sup>+</sup>价格
+          </template>
+          <el-input v-model.number="form.plusPrice"
+                    placeholder="请输入价格"
                     type="number"
                     autocomplete="off"></el-input>
         </el-form-item>
@@ -116,14 +135,16 @@ export default {
         update: '修改分部云教练价格'
       },
       typeStatus: false, // 添加教学点
-      formLabelWidth: '100px',
+      formLabelWidth: '120px',
       form: {
         organId: null, //
         price: null,
+        plusPrice: null,
       },
       rules: {
         organId: [{ required: true, message: '请选择分部', trigger: 'change' }],
-        price: [{ required: true, message: '请输入金额', trigger: 'blur' }]
+        price: [{ required: true, message: '请输入价格', trigger: 'blur' }],
+        plusPrice: [{ required: true, message: '请输入价格', trigger: 'blur' }],
       },
       pageInfo: {
         // 分页规则
@@ -196,7 +217,8 @@ export default {
           this.form = {
             id: row.id,
             organId: row.organId,
-            price: row.price
+            price: row.price,
+            plusPrice: row.plusPrice
           }
         })
       }
@@ -204,7 +226,8 @@ export default {
     onFormClose (formName) { // 关闭弹窗重置验证
       this.form = {
         organId: null, // 作业模块名称
-        price: null
+        price: null,
+        plusPrice: null
       }
       this.$refs[formName].resetFields()
     },

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

@@ -6,12 +6,12 @@
 			2、为避免因部分已注册家长放弃名额导致乐团声部失衡，系统设定各声部限额放大20%比例开放注册，系统自动按照完全完成注册的先后顺序确认录取名单，因此，超员后有可能出现无法注册的情况，请您理解。如果其他声部仍有名额，在您孩子的身体条件适合该乐器的前提下，我们将优先予以调配。
 		</div>
 
-        <template v-if="courseViewType == 2">
+        <template v-if="courseViewType == 2 || courseViewType == 3">
 			<h2 class="title" >学习工具包</h2>
 			<div class="yunTrain">
 				<img :src="trainBg" />
 				<div class="toolText">
-					<p class="toolTitle">乐器练习云教练
+					<p class="toolTitle">乐器练习云教练<sup v-if="courseViewType == 3" style="top: -5px;font-size: 20px;">+</sup>
 						<i class="icon_video" @click="videoStatus = true"></i>
 					</p>
 					<p class="toolDate">有效期说明：自开课之日起6个月内有效</p>
@@ -50,7 +50,7 @@
 				</el-row>
 			</div>
 
-            <div class="section" v-if="courseViewType == 2">
+            <div class="section" v-if="courseViewType == 2 || courseViewType == 3">
 				<div v-for="(item, index) in toolsPackage" :key="index">
 					<el-row class="option-row" style="padding-top: 0;" @click.native="onTrainChange(item)">
 						<el-col :span="18">
@@ -60,14 +60,20 @@
 							</span>
 						</el-col>
 						<el-col :span="6">
-							<span style="color: #1A1A1A">￥{{ cloudTeacherFee | moneyFormat }}</span>
+							<span style="color: #1A1A1A" v-if="courseViewType == 2">￥{{ cloudTeacherFee | moneyFormat }}</span>
+							<span style="color: #1A1A1A" v-if="courseViewType == 3">￥{{ cloudTeacherPlusFee | moneyFormat }}</span>
 						</el-col>
 					</el-row>
-					<el-row style="padding-left: .24rem;" v-if="item.childGoodsList">
+					<el-row style="padding-left: .24rem;" v-if="item.childGoodsList && courseViewType == 2">
 						<el-col v-for="(child, index) in item.childGoodsList" :key="child.name">
 							<span style="font-size: 12px; color: #808080;">{{ child.name }} {{item.childGoodsList.length - 1 == index ? '' : '、'}}</span>
 						</el-col>
 					</el-row>
+                    <el-row style="padding-left: .24rem;" v-if="item.childGoodsListPlus && courseViewType == 3">
+						<el-col v-for="(child, index) in item.childGoodsListPlus" :key="child.name">
+							<span style="font-size: 12px; color: #808080;">{{ child.name }} {{item.childGoodsListPlus.length - 1 == index ? '' : '、'}}</span>
+						</el-col>
+					</el-row>
 				</div>
 			</div>
 
@@ -276,7 +282,7 @@
             :append-to-body="true"
             class="videoDialog"
             width="30%">
-            <video style="width: 100%;" v-if="videoStatus" controls="controls" class="ql-video" src="https://daya.ks3-cn-beijing.ksyun.com/202105/SWmqmvW.mp4" :poster="require('../../../assets/images/musicGroup/video_bg.png')" />
+            <video style="width: 100%;" v-if="videoStatus" controls="controls" class="ql-video" :src="courseViewType == 3 ? 'https://daya.ks3-cn-beijing.ksyun.com/202105/SWmqmvW.mp4' : 'https://daya.ks3-cn-beijing.ksyun.com/202105/SWmqmvW.mp4'" :poster="courseViewType == 3 ? require('../../../assets/images/musicGroup/video_bg.png') : require('../../../assets/images/musicGroup/video_bg.png')" />
         </el-dialog>
     </div>
 </template>
@@ -306,6 +312,7 @@ export default {
             needPrice: 0, // 还需支付
             payType: false, // 是否余额支付
             cloudTeacherFee: 0, // 云教练费用
+            cloudTeacherPlusFee: 0, // 云教练+
             orderInfo: {
                 marketPrice: 0,
                 amount: 0, // 现价总金额
@@ -324,7 +331,8 @@ export default {
             toolsPackage: [{
                 isStatus: true,
                 name: '练习系统（六个月）',
-                childGoodsList: [{ name: '同步乐团训练教程，五线谱跟播、演奏指法跟播、任选小节循环播放、演奏速度自定义、原音/伴奏一键切换等。' }]
+                childGoodsList: [{ name: '同步乐团训练教程，五线谱跟播、演奏指法跟播、任选小节循环播放、演奏速度自定义、原音/伴奏一键切换等。' }],
+                childGoodsListPlus: [{ name: '同步乐团训练教程，五线谱跟播、演奏指法跟播、任选小节循环播放、演奏速度自定义、原音/伴奏一键切换、智能评分等。' }]
             }], // 学习工具包
             courseInfo: null, // 课程信息
             musicGroupSubject: null, // 基本信息
@@ -374,6 +382,7 @@ export default {
                     let tempResult = result.data
                     this.courseViewType = tempResult.musicGroup.courseViewType || 0
                     this.cloudTeacherFee = tempResult.cloudTeacherFee || 0
+                    this.cloudTeacherPlusFee = tempResult.cloudTeacherPlusFee || 0
                     this.paymentPattern = 2
                     if(tempResult.musicGroupPaymentCalender) {
                         this.paymentPattern = tempResult.musicGroupPaymentCalender.paymentPattern
@@ -701,15 +710,13 @@ export default {
             let csi = this.courseInfo
             // 加上判断是否有课程信息
             // 如果为云教练系统则，没有课程费用
-            if(this.courseViewType == 2 && this.toolsPackage[0].isStatus) {
-                musicClassFee += parseFloat(this.cloudTeacherFee)
-                marketPrice += parseFloat(this.cloudTeacherFee)
-                // buyList.push({
-                //     name: '器乐练习云教练',
-                //     type: '6个月',
-                //     childGoodsName: ['有效期说明：自开课之日起6个月内有效'],
-                //     price: Number((this.cloudTeacherFee).toFixed(2))
-                // })
+            if((this.courseViewType == 2 || this.courseViewType == 3) && this.toolsPackage[0].isStatus) {
+                let tempFee = this.cloudTeacherFee
+                if(this.courseViewType == 3) {
+                    tempFee = this.cloudTeacherPlusFee
+                }
+                musicClassFee += parseFloat(tempFee)
+                marketPrice += parseFloat(tempFee)
             }
             if (mgs) {
                 let tempCourse = this.courseShowInfo

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

@@ -670,7 +670,7 @@ export default {
           }
         }
         // console.log(this.baseInfo?.musicGroup?.courseViewType, this.paymentType, hasCourseFee, this.type)
-        if (this.baseInfo?.musicGroup?.courseViewType == 2 && this.paymentType == 0 && hasCourseFee && this.type === 'user') {
+        if ((this.baseInfo?.musicGroup?.courseViewType == 2 || this.baseInfo?.musicGroup?.courseViewType == 3) && this.paymentType == 0 && hasCourseFee && this.type === 'user') {
           this.$message.error('报名缴费云教练收费模式课程费用不得大于0且不可选')
           return
         }

src/views/teamBuild/components/teamBaseInfo.vue

@@ -65,6 +65,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="3"></el-option>
           </el-select>
         </el-form-item>