Ver código fonte

提交一下

1
mo 3 anos atrás
pai
commit
d9c2aae830

Diferenças do arquivo suprimidas por serem muito extensas
+ 4 - 0
dist/static/js/chunk-1eb12df0.13deb144.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-7cd2b71c.393cdc53.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/chunk-a8a483c2.67159a7d.js


+ 1 - 1
src/views/couponManager/couponGiveList.vue

@@ -100,7 +100,7 @@
     </div>
     <!--  -->
     <el-dialog
-      title="激活会员"
+      title="激活团练保"
       :visible.sync="couponDetailVisible"
       width="1000px"
       append-to-body

+ 3 - 3
src/views/resetTeaming/components/giveMemberList.vue

@@ -33,7 +33,7 @@
     <!-- <div class="newBand"
          @click="resetPays"
          v-permission="'musicGroupStudentFee/batchUpdateCourseFee'">修改缴费金额</div> -->
-    <el-button @click="addMember" v-if="$helpers.permission('cloudTeacherOrder/pay')" type="primary" style="margin-bottom: 20px">激活会员</el-button>
+    <el-button @click="addMember" v-if="$helpers.permission('cloudTeacherOrder/pay')" type="primary" style="margin-bottom: 20px">激活团练保</el-button>
 
     <div class="tableWrap">
       <el-table
@@ -102,7 +102,7 @@
     </div>
 
     <el-dialog
-      title="激活会员"
+      title="激活团练保"
       :visible.sync="giveMemberVisible"
       width="1000px"
       v-if="giveMemberVisible"
@@ -186,4 +186,4 @@ export default {
     }
   },
 };
-</script>
+</script>

+ 1 - 1
src/views/resetTeaming/modals/giveMemberModel.vue

@@ -54,7 +54,7 @@
     </span>
 
     <el-dialog
-      title="激活会员"
+      title="激活团练保"
       :visible.sync="payMentVisible"
       :before-close="onClose"
       v-if="payMentVisible"

+ 1 - 1
src/views/resetTeaming/modals/giveMemberPayment.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="chioseWrap">
-    <p>您将为<span>{{tableList.length}}</span>位学员激活会员<br />共需支付<span>{{ selectStudentMoney | moneyFormat }}</span>元</p>
+    <p>您将为<span>{{tableList.length}}</span>位学员激活团练保<br />共需支付<span>{{ selectStudentMoney | moneyFormat }}</span>元</p>
     <p>请扫描二维码支付,支付功能后学员团练宝即刻激活</p>
 
     <vue-qr :text="codeUrl" style="width: 250px" :margin="0"></vue-qr>

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

@@ -209,12 +209,14 @@
             >新增缴费周期</el-button
           >
         </template>
+
         <paymentCycle
           ref="cycle"
           :form.sync="cycle"
           :isCommon="isCommon"
           :hidePaymentPattern="true"
           :isUserType="isUserType"
+          :hideMoney='paymentTypeString=="SPAN_GROUP_CLASS_ADJUST"?true:false'
           :isDisabled="
             form.leixing === '1' ||
             form.leixing === '2' ||
@@ -542,10 +544,7 @@ export default {
               "originalMemberPaymentAmount",
               this.viewDetail.member.originalAmount || null
             );
-            console.log(
-              this.viewDetail.member.originalAmount,
-              this.viewDetail.member.actualAmount
-            );
+
             this.$set(this.memberForm, "memberValidDate", [
               this.viewDetail.calender.startPaymentDate,
               this.viewDetail.calender.deadlinePaymentDate,
@@ -567,6 +566,7 @@ export default {
               batchNo: this.rowDetail.batchNo,
             });
             this.viewDetail = res.data;
+              // this.$set(this.other, "memo", this.viewDetail.auditDto.memo);
             const firstPayment = res.data.musicGroupPaymentCalenders[0] || {};
             this.eclass = (
               res.data.musicGroupPaymentCalenderCourseSettings || []

+ 3 - 3
src/views/studentManager/studentGroupPractice.vue

@@ -22,7 +22,7 @@
       <!-- <div class="newBand"
           @click="resetPays"
           v-permission="'musicGroupStudentFee/batchUpdateCourseFee'">修改缴费金额</div> -->
-      <el-button @click="addMember" v-if="$helpers.permission('cloudTeacherOrder/pay/student')" type="primary" style="margin-bottom: 20px">激活会员</el-button>
+      <el-button @click="addMember" v-if="$helpers.permission('cloudTeacherOrder/pay/student')" type="primary" style="margin-bottom: 20px">激活团练保</el-button>
 
       <div class="tableWrap">
         <el-table
@@ -92,7 +92,7 @@
     </div>
 
     <el-dialog
-      title="激活会员"
+      title="激活团练保"
       :visible.sync="giveMemberVisible"
       width="1000px"
       v-if="giveMemberVisible"
@@ -165,4 +165,4 @@ export default {
     }
   },
 };
-</script>
+</script>

+ 2 - 2
src/views/studentManager/studentGroupRecord.vue

@@ -111,7 +111,7 @@
     </div>
 
     <el-dialog
-      title="激活会员"
+      title="激活团练保"
       :visible.sync="recordVisible"
       width="1000px"
       v-if="recordVisible"
@@ -181,4 +181,4 @@ export default {
     }
   },
 };
-</script>
+</script>

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff