提交测试

1

src/views/resetTeaming/components/resetPayList.vue

@@ -539,7 +539,7 @@ export default {
   },
   data() {
     return {
-      paymentType:this.team_status == 'PRE_BUILD_FEE' ? 0 : undefined,
+      paymentType:this.team_status == 'PRE_BUILD_FEE' ? 0 : 1,
       musicGroupStu: [],
       payFormType: "user",
       userVisible: false,
@@ -600,6 +600,7 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   async mounted() {
+      this.paymentType=this.team_status == 'PRE_BUILD_FEE' ? 0 : 1
     // 获取分部
     try {
       const res = await getOrganizationCourseUnitPriceSettings({

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -555,13 +555,14 @@ export default {
       payOrderTypeLists: payOrderTypeList,
       getMoneyVisible: false,
       baseInfo: null,
-      paymentType:this.team_status == 'PRE_BUILD_FEE' ? 0 : undefined
+      paymentType:''
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   async mounted() {
+   this.paymentType=this.team_status == 'PRE_BUILD_FEE' ? 0 : 1
     // 获取分部
     try {
       const res = await getOrganizationCourseUnitPriceSettings({

src/views/resetTeaming/modals/user-baseinfo.vue

@@ -1,4 +1,5 @@
 <template>
+
   <el-form
     label-width="160px"
     :model="form"
@@ -9,7 +10,7 @@
       label="缴费类型"
       prop="leixing"
       :rules="[{required: true, message: '请选择缴费类型', trigger: 'change'}]"
-      v-if="typeof paymentType === 'undefined'&&(isUserType&&courseViewType == 2||courseViewType != 2)"
+      v-if="!rowDetail&&paymentType!=0&&((isUserType&&courseViewType == 2)||courseViewType != 2)"
     >
     <!-- &&courseViewType != 2 -->
       <el-radio-group style="width: 100%" v-model="form.leixing">
@@ -54,7 +55,6 @@ export default {
   },
   watch: {
     paymentType() {
-      console.log(this.paymentType)
     }
   },
   methods:{

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

@@ -10,12 +10,11 @@
       type="info"
     >
     </el-alert>
+    <!-- && courseViewType != 2 -->
     <userBaseinfo
       :form.sync="form"
       :isCommon="isCommon"
-      v-if="
-        paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST' && courseViewType != 2
-      "
+      v-if="paymentTypeString !== 'SPAN_GROUP_CLASS_ADJUST'"
       :isUserType="isUserType"
       @getCharges="getCharges"
       @changeActive="changeActive"
@@ -48,7 +47,7 @@
         @moneyChange="syncAllMoney"
       />
     </template>
-    <!-- isCommon不为报名 -->
+    <!-- isCommon不为报名 1.报名或3.加学生-->
     <template v-else-if="!isCommon">
       <el-alert
         title="加课信息设置"
@@ -73,6 +72,7 @@
       />
     </template>
     <!-- 续费或临时加课 -->
+
     <template v-else-if="(!isCommon && eclass.length) || isCommon">
       <!--    会员团的续费不显现 -->
       <div v-if="!(courseViewType == 2 && paymentType == 1)">
@@ -101,12 +101,12 @@
         class="alert"
         style="margin-top: 20px"
         type="info"
-        v-if="courseViewType == 2 && paymentType && paymentType != 2"
+        v-if="courseViewType == 2 && paymentType && paymentType != 2&&form.leixing !=2"
       >
       </el-alert>
       <memberSetting
         ref="memberSetting"
-        v-if="courseViewType == 2 && paymentType && paymentType != 2"
+        v-if="courseViewType == 2 && paymentType && paymentType != 2&&form.leixing !=2"
         :form="memberForm"
         :viewDetail="nowDetail"
         :isUserType="isUserType"
@@ -114,7 +114,7 @@
         :addStudent="showMember"
         :showTime="paymentType == 1"
       />
-      <div v-if="!(courseViewType == 2 && paymentType == 1)">
+      <div v-if="!(courseViewType == 2 && paymentType == 1&&form.leixing !=2)">
         <el-alert title="缴费设置" :closable="false" class="alert" type="info">
         </el-alert>
         <!-- 缴费设置的  不是会员团切不是续费 续费{{form.leixing}} -->
@@ -142,7 +142,7 @@
               style="width: 100% !important"
               v-model="payment.paymentPattern"
               placeholder="请选择缴费方式"
-              :disabled="courseViewType == 2 && paymentType !== undefined"
+              :disabled="courseViewType == 2 && paymentType !=0"
             >
               <el-option
                 v-for="item in paymentPatternTypeOptions"
@@ -205,7 +205,7 @@
           :hidePaymentPattern="true"
           :isUserType="isUserType"
           :isDisabled="
-            form.leixing === '1' || form.leixing === '2' || paymentType === '0'
+            form.leixing === '1' || form.leixing === '2' || paymentType === '0' || form.leixing === '3'
           "
           :courseViewType="courseViewType"
           v-else
@@ -335,7 +335,7 @@ export default {
       return this.viewDetail;
     },
     isCommon() {
-      return this.form.leixing === "1";
+      return this.form.leixing === "1" || this.form.leixing === "3" || (this.courseViewType !=2&&this.form.leixing === "0");
     },
     isDisabled() {
       return this.form.leixing === "1" || String(this.paymentType) === "0";
@@ -418,6 +418,7 @@ export default {
       if (val === "1") {
         this.eclass = [];
       } else if (val === "2") {
+        this.payment.paymentPattern = '1'
         this.eclass = [{}];
       }
     },
@@ -465,6 +466,7 @@ export default {
         this.$set(this.form, "leixing", "2");
         this.addExtraClass();
       }
+
       this.getCharges();
       if (this.rowDetail) {
         for (const key in paymentTypeFormat) {
@@ -472,6 +474,7 @@ export default {
             const item = paymentTypeFormat[key];
             if (item === this.rowDetail.paymentType) {
               this.$emit('changePaymentType',key)
+              this.$set(this.form, "leixing", key+'');
               // this.paymentType = key;
             }
           }

src/views/teamBuild/signupList.vue

@@ -1606,6 +1606,7 @@ export default {
     quitTeam(row) {
       this.activeRow = row;
       this.quitVisible = true;
+      this.activeRow.courseViewType = this.courseViewType
       this.quitForm.cloudTeacherAmount = row.cloudTeacherAmount;
     },
     quieTeams(row) {

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

@@ -20,7 +20,7 @@
       </el-form-item>
       <!-- v-if="activeRow.cloudTeacherAmount > 0" -->
 
-      <el-form-item label="退还云教练费用" prop="isRefundMemberFee">
+      <el-form-item label="退还云教练费用" prop="isRefundMemberFee" v-if="activeRow.courseViewType == 2">
         <el-radio v-model.trim="quitForm.isRefundMemberFee" label="true"
           >是</el-radio
         >
@@ -103,6 +103,9 @@
 <script>
 export default {
   props: ["quitForm", "activeRow"],
+  mounted(){
+    console.log('quitForm',this.quitForm,'activeRow',this.activeRow)
+  },
   data() {
     return {
       quitRules: {

src/views/teamDetail/components/studentList.vue

@@ -1467,6 +1467,7 @@ export default {
     },
     quieTeamMask(row) {
       this.activeRow = row;
+       this.activeRow.courseViewType =this.baseInfo.courseViewType
       this.quitVisible = true;
       this.quitForm.cloudTeacherAmount = row.cloudTeacherAmount;
     },

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

@@ -12,11 +12,10 @@
         >
         <el-radio v-model.trim="quitForm.status" label="DENIED">拒绝</el-radio>
       </el-form-item>
-
       <el-form-item
         label="退还云教练费用"
         prop="isRefundMemberFee"
-        v-if=" quitForm.status == 'APPROVED'"
+        v-if=" quitForm.status == 'APPROVED'&&courseViewType==2"
       >
         <el-radio v-model.trim="quitForm.isRefundMemberFee" label="true"
           >是</el-radio
@@ -25,6 +24,7 @@
           >否</el-radio
         >
       </el-form-item>
+
       <el-form-item
         label="退还云教练金额"
         prop="cloudTeacherAmount"
@@ -136,10 +136,13 @@ export default {
         isRefundMemberFee:null,
         reason: null,
       },
+      courseViewType:null
     };
   },
   mounted() {
     this.quitForm.cloudTeacherAmount = this.detail.cloudTeacherAmount
+    this.courseViewType =this.detail.musicGroup.courseViewType;
+    console.log(this.courseViewType)
   },
   watch:{
         "quitForm.isMaintenanceFee"(val) {

vue.config.js

@@ -19,8 +19,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.148:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
-// let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {