Merge branch '03/03GRADE' into test

src/views/categroyManager/modals/payInfo.vue

@@ -225,14 +225,14 @@
         <el-row>
           <el-form-item
             label="会员周期"
-            prop="period"
+            prop="periodEnum"
             :rules="[
               { required: true, message: '请选择会员周期', trigger: 'change' },
             ]"
           >
             <el-select
               style="width: 400px !important"
-              v-model.trim="payForm.period"
+              v-model.trim="payForm.periodEnum"
               placeholder="请选择会员周期"
               clearable
               :disabled="isDisabled"

src/views/categroyManager/vipNewActive.vue

@@ -109,7 +109,7 @@ const payBaseForm = {
   minCourseNum: null,
   maxCourseNum: null,
   memberRankId: null,
-  period: null,
+  periodEnum: null,
   discount: 100,
   fullMinusCourseTimes: null,
   giveCourseType: null,
@@ -458,7 +458,7 @@ export default {
         minCourseNum: data.minCourseNum,
         maxCourseNum: data.maxCourseNum,
         memberRankId: data.memberRankId,
-        period: data.periodEnum,
+        periodEnum: data.periodEnum,
         discount: data.discount,
         fullMinusCourseTimes: data.fullMinusCourseTimes,
         giveCourseType: data.giveCourseType,