Merge branch '03/03GRADE' into test

src/views/activityScheduling/activeMarketing.vue

@@ -20,13 +20,13 @@
                         placeholder="活动名称/活动编号"
                     />
                 </el-form-item>
-                <el-form-item prop="search">
+                <!-- <el-form-item prop="search">
                     <el-input
                         v-model="searchForm.activityIds"
                         clearable
                         placeholder="关联活动方案"
                     />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <el-button native-type="submit" type="primary">搜索</el-button>
                     <el-button native-type="reset" type="danger">重置</el-button>
@@ -155,4 +155,4 @@ export default {
         }
     }
 }
-</script>
+</script>

src/views/categroyManager/vipActiveList.vue

@@ -52,31 +52,32 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="enable">
+        <el-form-item prop="status">
           <el-select
             filterable
             style="width: 180px !important"
-            v-model="searchForm.enable"
+            v-model="searchForm.status"
             clearable
-            @clear="resetEnable"
-            placeholder="是否启用"
+            placeholder="活动状态"
           >
-            <el-option label="是" :value="true"></el-option>
-            <el-option label="否" :value="false"></el-option>
+            <el-option label="草稿" :value="'DRAFT'"></el-option>
+            <el-option label="正式" :value="'PROGRESS'"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="status">
+        <el-form-item prop="enable">
           <el-select
             filterable
             style="width: 180px !important"
-            v-model="searchForm.status"
+            v-model="searchForm.enable"
             clearable
-            placeholder="活动状态"
+            @clear="resetEnable"
+            placeholder="是否启用"
           >
-            <el-option label="草稿" :value="true"></el-option>
-            <el-option label="正式" :value="false"></el-option>
+            <el-option label="是" :value="true"></el-option>
+            <el-option label="否" :value="false"></el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item prop="allowOnlineToOffline">
           <el-select
             v-model.trim="searchForm.allowOnlineToOffline"
@@ -236,20 +237,20 @@
                   style="margin-left: 0px"
                   type="text"
                   v-permission="'vipGroupActivity/update'"
-                  v-if="!scope.row.enable|| scope.row.status == 'DRAFT'"
+                  v-if="!scope.row.enable || scope.row.status == 'DRAFT'"
                   @click="reset(scope.row)"
                   >修改</el-button
                 >
                 <el-button
                   style="margin-left: 0px"
-                  v-if="!scope.row.enable&&scope.row.status == 'PROGRESS'"
+                  v-if="!scope.row.enable && scope.row.status == 'PROGRESS'"
                   type="text"
                   v-permission="'vipGroupActivity/enable'"
                   @click="resetStatus(scope.row)"
                   >启用</el-button
                 >
                 <el-button
-                  v-if="scope.row.enable&&scope.row.status == 'PROGRESS'"
+                  v-if="scope.row.enable && scope.row.status == 'PROGRESS'"
                   style="margin-left: 0px"
                   type="text"
                   v-permission="'vipGroupActivity/enable'"
@@ -263,7 +264,7 @@
                   width="160"
                   v-permission="'vipGroupActivity/delete'"
                   :ref="scope.$index"
-                  v-if="scope.row.status != 'PROGRESS'&&!scope.row.enable"
+                  v-if="scope.row.status != 'PROGRESS' && !scope.row.enable"
                 >
                   <p>确定删除?</p>
                   <div style="text-align: right; margin: 0">
@@ -303,7 +304,7 @@ import pagination from "@/components/Pagination/index";
 import {
   vipGroupActivity,
   removeVipActive,
-  enableVipGroupActivity
+  enableVipGroupActivity,
 } from "@/api/vipSeting";
 import qs from "qs";
 import { Export } from "@/utils/downLoadFile";
@@ -710,14 +711,12 @@ export default {
         type: "warning",
       })
         .then(() => {
-          enableVipGroupActivity({id: row.id }).then(
-            (res) => {
-              if(res.code == 200){
-                this.$message.success('操作成功')
-                this.getList()
-              }
+          enableVipGroupActivity({ id: row.id }).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("操作成功");
+              this.getList();
             }
-          );
+          });
         })
         .catch(() => {});
     },

src/views/categroyManager/vipNewActive.vue

@@ -185,6 +185,9 @@ export default {
       this.baseForm.id = this.$route.query.id;
       const rusult = await getVipGroupActivity({ id: this.$route.query.id });
       this.formatDetail(rusult.data);
+    }else{
+      this.payInfo = {...payBaseForm}
+      this.salaryForm = {...baseSalaryForm}
     }
   },
   methods: {