提交一下

1

src/views/categroyManager/modals/baseInfo.vue

@@ -4,7 +4,7 @@
       title="基础信息"
       type="info"
       :closable="false"
-      class="vipMsg"
+      class="baseMsg"
     ></el-alert>
 
     <div class="m-core">
@@ -38,6 +38,16 @@
           </select-all>
           <!-- <el-button @click="onCheckAllBranch">适用所有分部</el-button> -->
         </el-form-item>
+        <el-form-item label="活动描述" prop="desc">
+          <el-input
+            type="textarea"
+            v-model.trim="vipform.desc"
+            style="width: 400px"
+            :rows="5"
+            placeholder="请输入活动说明"
+          ></el-input>
+        </el-form-item>
+<!--
         <el-form-item label="课程形式" prop="stauts">
           <select-all
             v-model.trim="vipform.stauts"
@@ -67,28 +77,10 @@
               :key="item.value"
             ></el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="使用学员" prop="applyToStudentType">
-          <el-select
-            v-model.trim="vipform.applyToStudentType"
-            placeholder="请选择使用学员"
-            clearable
-          >
-            <el-option label="新学员" :value="1"></el-option>
-            <el-option label="老学员" :value="0"></el-option>
-            <el-option label="所有学员" :value="-1"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="活动描述" prop="desc">
-          <el-input
-            type="textarea"
-            v-model.trim="vipform.desc"
-            style="width: 400px"
-            :rows="5"
-            placeholder="请输入活动说明"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="活动时间" prop="activeTime">
+        </el-form-item> -->
+
+
+        <el-form-item label="活动生效时间" prop="activeTime">
           <el-date-picker
             v-model.trim="vipform.activeTime"
             type="datetimerange"
@@ -102,7 +94,7 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <el-form-item label="课程时间" prop="courseTime">
+        <el-form-item label="排课时间范围" prop="courseTime">
           <el-date-picker
             v-model.trim="vipform.courseTime"
             type="datetimerange"
@@ -116,18 +108,26 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
+            <el-form-item label="适用学员" prop="applyToStudentType">
+          <el-select
+            v-model.trim="vipform.applyToStudentType"
+            placeholder="请选择适用学员"
+            clearable
+          >
+            <el-option label="新学员" :value="1"></el-option>
+            <el-option label="老学员" :value="0"></el-option>
+            <el-option label="所有学员" :value="-1"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
-      <el-alert
+      <!-- <el-alert
         title="活动适用范围&结算标准："
         type="info"
         :closable="false"
         class="alert"
       >
-      </el-alert>
-      <div class="activeRange" style="padding-left: 120px">
-        <!-- <div class="left">
-          <p>活动适用范围&结算标准：</p>
-        </div> -->
+      </el-alert> -->
+      <!-- <div class="activeRange" style="padding-left: 120px">
         <div class="right">
           <div class="chioseWrap">
             <el-checkbox label="线上课" v-model.trim="online"></el-checkbox>
@@ -171,9 +171,6 @@
               style="width: 200px"
               v-if="onlineSalary == 'TEACHER_DEFAULT'"
             ></div>
-            <!-- <el-checkbox label="是否参加梯度"
-                         style="margin-left:20px;"
-                         v-model.trim="onlineClassJoinGradientRewards"></el-checkbox> -->
           </div>
           <div class="chioseWrap">
             <el-checkbox label="线下课" v-model.trim="unonline"></el-checkbox>
@@ -217,30 +214,21 @@
               style="width: 200px"
               v-if="unonlineSalary == 'TEACHER_DEFAULT'"
             ></div>
-            <!-- <el-checkbox label="是否参加梯度"
-                         style="margin-left:20px;"
-                         v-model.trim="offlineClassJoinGradientRewards"></el-checkbox> -->
+
           </div>
-          <!-- <div class="chioseWrap">
-            <el-checkbox v-model.trim="paymentReadonlyFlag"
-                         label="可自定义单价"></el-checkbox>
-            <el-checkbox v-model.trim="salaryReadonlyFlag"
-                         label="可自定义课酬"></el-checkbox>
-          </div> -->
+
         </div>
-      </div>
-      <el-alert
+      </div> -->
+      <!-- <el-alert
         title="活动类型："
         type="info"
         style="margin-bottom: 15px"
         :closable="false"
         class="alert"
       >
-      </el-alert>
-      <div class="activeType">
-        <!-- <div class="left">
-          <p>活动类型</p>
-        </div> -->
+      </el-alert> -->
+      <!-- <div class="activeType">
+
         <div class="right">
           <div>
             <div
@@ -364,11 +352,6 @@
               placeholder="学员购买次数"
             >
             </el-input>
-            <!-- <el-checkbox
-              v-if="activeType=='GIVE_CLASS'"
-              v-model.trim="giveClassPaySalaryFlag"
-              label="赠送课时结算课酬"
-            ></el-checkbox> -->
           </div>
         </div>
       </div>
@@ -379,9 +362,7 @@
     >
       <el-button type="primary" @click="submitFrom">确定</el-button>
       <el-button type="info" @click="onReSet">重置</el-button>
-      <!-- <div class="okBtn"
-           @click="submitFrom">确定</div> -->
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -483,8 +464,8 @@ export default {
     //   this.searchForm = this.$route.query.searchForm;
     // }
 
-    this.pageType = this.$route.query.type;
-    this.$refs.vipform.resetFields();
+    // this.pageType = this.$route.query.type;
+    // this.$refs.vipform.resetFields();
   },
 
   async mounted() {
@@ -504,7 +485,7 @@ export default {
     await this.$store.dispatch("setVipGroupCategory");
     // 获取分部
     await this.$store.dispatch("setBranchs");
-    this.onReSet();
+    // this.onReSet();
     // if (this.$route.query.rules) {
     //   this.rules = this.$route.query.rules;
     // }
@@ -691,7 +672,7 @@ export default {
               ).then((res) => {
                 if (res.code == 200) {
                   this.$message.success("恭喜你,活动创建成功");
-                  this.onReSet();
+                  // this.onReSet();
                   this.$store.dispatch("delVisitedViews", this.$route);
                   this.$router.push({
                     path: "/vipActiveManager/vipActiveList",
@@ -749,12 +730,15 @@ export default {
       this.attribute2 = "";
       this.courseNumForm.maxCourseNum = "";
       this.courseNumForm.minCourseNum = "";
-      this.$refs.vipform.resetFields();
+      // this.$refs.vipform.resetFields();
     },
   },
 };
 </script>
 <style lang="scss" scoped>
+.baseMsg {
+  margin: 30px 0;
+}
 .m-core {
   font-size: 14px;
   width: 100%;

src/views/categroyManager/vipNewActive.vue

@@ -8,15 +8,23 @@
       ></el-page-header>
     </h2>
 
-    <el-steps :active="active" finish-status="success" align-center>
+    <el-steps :active="active" finish-status="success" align-center class="steps">
       <el-step title="基础信息"></el-step>
       <el-step title="缴费信息"></el-step>
       <el-step title="课酬信息"></el-step>
     </el-steps>
+    <div class="wrap">
+      <baseInfo  v-if="active==1"/>
+    </div>
   </div>
 </template>
+
 <script>
+import baseInfo from './modals/baseInfo.vue'
 export default {
+  components:{
+    baseInfo
+  },
   data() {
     return {
       active: 1,
@@ -35,6 +43,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.steps {
+  margin-top: 30px;
+}
+/deep/.is-success{
+  color: #14928a!important;
+    border-color: #14928a!important;
+}
 </style>