提交一下 VIP活动改版

1

src/views/categroyManager/vipActiveList.vue

@@ -260,9 +260,6 @@
               ></el-option>
             </select-all>
           </el-form-item>
-<<<<<<< Updated upstream
-          <el-form-item label="适用学员" label-width="120px" prop="applyToStudentType">
-=======
           <el-form-item
             label="课程调整方式"
             label-width="120px"
@@ -283,11 +280,10 @@
             label-width="120px"
             prop="applyToStudentType"
           >
->>>>>>> Stashed changes
             <el-select
               v-model.trim="resetForm.applyToStudentType"
               style="width: 100% !important"
-              placeholder="请选择适用学员"
+              placeholder="请选择使用学员"
               clearable
             >
               <el-option label="新学员" :value="1"></el-option>

src/views/categroyManager/vipNewActive.vue

@@ -56,9 +56,6 @@
             ></el-option>
           </select-all>
         </el-form-item>
-<<<<<<< Updated upstream
-        <el-form-item label="适用学员" prop="applyToStudentType">
-=======
         <el-form-item label="课程调整方式" prop="allowOnlineToOffline">
           <el-select
             v-model.trim="vipform.allowOnlineToOffline"
@@ -70,10 +67,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="使用学员" prop="applyToStudentType">
->>>>>>> Stashed changes
           <el-select
             v-model.trim="vipform.applyToStudentType"
-            placeholder="请选择适用学员"
+            placeholder="请选择使用学员"
             clearable
           >
             <el-option label="新学员" :value="1"></el-option>