Merge branch '03/03GRADE' into test

src/views/categroyManager/vipNewActive.vue

@@ -427,6 +427,7 @@ export default {
         studentMaxUsedTimes: data.studentMaxUsedTimes,
         isPayToBalance: Number(data.payToBalance),
         id: this.$route.query.id,
+
       });
       // this.baseForm = {
       //   name: data.name,
@@ -476,6 +477,7 @@ export default {
         giveMemberRankId: data.giveMemberRankId,
         givePeriod: data.givePeriodEnum,
         giveMemberTime: data.giveMemberTime ? data.giveMemberTime : null,
+         giveAllowOnlineToOffline:data.giveAllowOnlineToOffline+''
       };
       // 格式化缴费金额
       console.log(data.salarySettlementJson);