From 7ab789ba2a857dd343fb13fde5f0ae1cea25d21f Mon Sep 17 00:00:00 2001
From: "@QQNZX" <cccccc420590@163.com>
Date: Tue, 14 Nov 2023 16:08:33 +0800
Subject: [PATCH] 11.11

---
 .../api/EventMarketing/activeConsumption.js   |   2 +-
 .../activeConsumption/index.vue               | 186 +++---------------
 .../EventMarketing/activeDiscount/index.vue   |   2 +-
 .../EventMarketing/activeFullminus/index.vue  |   2 +-
 .../EventMarketing/activeNewlyweds/index.vue  |   2 +-
 .../EventMarketing/activeRecommend/index.vue  |   2 +-
 .../src/views/EventMarketing/center/index.vue |  55 ++++++
 7 files changed, 86 insertions(+), 165 deletions(-)
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/index.vue

diff --git a/fuintAdmin/src/api/EventMarketing/activeConsumption.js b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
index 1fb58105e..7435fa614 100644
--- a/fuintAdmin/src/api/EventMarketing/activeConsumption.js
+++ b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询消费有礼活动列表
 export function listActiveConsumption(query) {
   return request({
-    url: '/business/marketingActivity/activeConsumption/list',
+    url: '/business/marketingActivity/activeConsumption',
     method: 'get',
     params: query
   })
diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 5e7cb0b34..8bf3ee79b 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -1,22 +1,8 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="所属连锁店id" prop="chainStorId">
-        <el-input
-          v-model="queryParams.chainStorId"
-          placeholder="请输入所属连锁店id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属店铺id" prop="storeId">
-        <el-input
-          v-model="queryParams.storeId"
-          placeholder="请输入所属店铺id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+  <div class="">
+    <el-card style="margin-bottom: 20px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+
       <el-form-item label="活动名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -25,116 +11,25 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="满足金额" prop="participationConditionMoney">
-        <el-input
-          v-model="queryParams.participationConditionMoney"
-          placeholder="请输入满足金额"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="状态">
+        <el-select v-model="queryParams.status" clearable placeholder="请选择活动状态">
+          <el-option label="启用" value="0"></el-option>
+          <el-option label="禁用" value="1"></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="活动开始时间" prop="activeStartTime">
-        <el-date-picker clearable
-                        v-model="queryParams.activeStartTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择活动开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="活动结束时间" prop="activeEndTime">
-        <el-date-picker clearable
-                        v-model="queryParams.activeEndTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="请选择活动结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#" prop="adaptOil">
-        <el-input
-          v-model="queryParams.adaptOil"
-          placeholder="请输入适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="柴油会员等级 1：一级会员 2：二级会员。。。。。。。" prop="dieselUserLevel">
-        <el-input
-          v-model="queryParams.dieselUserLevel"
-          placeholder="请输入柴油会员等级 1：一级会员 2：二级会员。。。。。。。"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="汽油会员等级 1：一级会员 2：二级会员。。。。。。。" prop="gasolineUserLevel">
-        <el-input
-          v-model="queryParams.gasolineUserLevel"
-          placeholder="请输入汽油会员等级 1：一级会员 2：二级会员。。。。。。。"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="天然气会员等级 1：一级会员 2：二级会员。。。。。。。" prop="naturalUserLevel">
-        <el-input
-          v-model="queryParams.naturalUserLevel"
-          placeholder="请输入天然气会员等级 1：一级会员 2：二级会员。。。。。。。"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="参与条件 0：不限制 1：优惠订单不参与" prop="participationCondition">
-        <el-input
-          v-model="queryParams.participationCondition"
-          placeholder="请输入参与条件 0：不限制 1：优惠订单不参与"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="参与次数类别0：不限制 1：限制" prop="participationAcount">
-        <el-input
-          v-model="queryParams.participationAcount"
-          placeholder="请输入参与次数类别0：不限制 1：限制"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="限制次数" prop="limitAcount">
-        <el-input
-          v-model="queryParams.limitAcount"
-          placeholder="请输入限制次数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="活动奖品 0：赠送积分1：赠送优惠券 2. 赠送兑换券 3：赠送成长值 4. 赠送实物" prop="activeGift">
-        <el-input
-          v-model="queryParams.activeGift"
-          placeholder="请输入活动奖品 0：赠送积分1：赠送优惠券 2. 赠送兑换券 3：赠送成长值 4. 赠送实物"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="赠送积分" prop="points">
-        <el-input
-          v-model="queryParams.points"
-          placeholder="请输入赠送积分"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否在线 0：在线 1： 下线" prop="isonline">
-        <el-input
-          v-model="queryParams.isonline"
-          placeholder="请输入是否在线 0：在线 1： 下线"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="上线/下线">
+        <el-select v-model="queryParams.isonline" clearable placeholder="请选择是否上线">
+          <el-option label="上线" value="0"></el-option>
+          <el-option label="已下线" value="1"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+
       </el-form-item>
     </el-form>
-
+    </el-card>
+    <el-card style="margin-bottom: 20px">
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -143,42 +38,13 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['business/marketingActivity:activeConsumption:add']"
+
         >新增</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['business/marketingActivity:activeConsumption:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['business/marketingActivity:activeConsumption:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['business/marketingActivity:activeConsumption:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+
+
+
+
     </el-row>
 
     <el-table v-loading="loading" :data="activeConsumptionList" @selection-change="handleSelectionChange">
@@ -239,7 +105,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    </el-card>
     <!-- 添加或修改消费有礼活动对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -311,7 +177,7 @@
 </template>
 
 <script>
-import { listActiveConsumption, getActiveConsumption, delActiveConsumption, addActiveConsumption, updateActiveConsumption } from "@/api/marketingActivity/activeConsumption";
+import { listActiveConsumption, getActiveConsumption, delActiveConsumption, addActiveConsumption, updateActiveConsumption } from "@/api/EventMarketing/activeConsumption";
 
 export default {
   name: "ActiveConsumption",
@@ -375,8 +241,8 @@ export default {
     getList() {
       this.loading = true;
       listActiveConsumption(this.queryParams).then(response => {
-        this.activeConsumptionList = response.rows;
-        this.total = response.total;
+        this.activeConsumptionList = response.data.records;
+        this.total = response.data.total;
         this.loading = false;
       });
     },
diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
index 55ad619dd..404316e3e 100644
--- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
@@ -275,7 +275,7 @@
 </template>
 
 <script>
-import { listActiveDiscount, getActiveDiscount, delActiveDiscount, addActiveDiscount, updateActiveDiscount } from "@/api/marketingActivity/activeDiscount";
+import { listActiveDiscount, getActiveDiscount, delActiveDiscount, addActiveDiscount, updateActiveDiscount } from "@/api/EventMarketing/activeDiscount";
 
 export default {
   name: "ActiveDiscount",
diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
index 464b255b6..d8a9aafe1 100644
--- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
@@ -275,7 +275,7 @@
 </template>
 
 <script>
-import { listActiveFullminus, getActiveFullminus, delActiveFullminus, addActiveFullminus, updateActiveFullminus } from "@/api/business/marketingActivity/activeFullminus";
+import { listActiveFullminus, getActiveFullminus, delActiveFullminus, addActiveFullminus, updateActiveFullminus } from "@/api/EventMarketing/activeFullminus";
 
 export default {
   name: "ActiveFullminus",
diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index 198dcd038..a3f7886e0 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -240,7 +240,7 @@
 </template>
 
 <script>
-import { listActiveNewlyweds, getActiveNewlyweds, delActiveNewlyweds, addActiveNewlyweds, updateActiveNewlyweds } from "@/api/marketingActivity/activeNewlyweds";
+import { listActiveNewlyweds, getActiveNewlyweds, delActiveNewlyweds, addActiveNewlyweds, updateActiveNewlyweds } from "@/api/EventMarketing/activeNewlyweds";
 
 export default {
   name: "ActiveNewlyweds",
diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
index e15043994..593f3b705 100644
--- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
@@ -209,7 +209,7 @@
 </template>
 
 <script>
-import { listActiveRecommend, getActiveRecommend, delActiveRecommend, addActiveRecommend, updateActiveRecommend } from "@/api/marketingActivity/activeRecommend";
+import { listActiveRecommend, getActiveRecommend, delActiveRecommend, addActiveRecommend, updateActiveRecommend } from "@/api/EventMarketing/activeRecommend";
 
 export default {
   name: "ActiveRecommend",
diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue
new file mode 100644
index 000000000..ea60c57e2
--- /dev/null
+++ b/fuintAdmin/src/views/EventMarketing/center/index.vue
@@ -0,0 +1,55 @@
+<template>
+<!--  活动中心-->
+  <div class="app-container">
+    <el-card style="margin-bottom: 20px">
+      <el-radio-group v-model="value">
+        <el-radio-button label="1">消费有礼</el-radio-button>
+        <el-radio-button label="2">折扣营销</el-radio-button>
+        <el-radio-button label="3">满减营销</el-radio-button>
+        <el-radio-button label="4">新人有礼</el-radio-button>
+        <el-radio-button label="5">推荐有礼</el-radio-button>
+      </el-radio-group>
+    </el-card>
+    <activeConsumption v-if="value == 1"></activeConsumption>
+    <activeNewlyweds v-if="value == 4" ></activeNewlyweds>
+
+    <!-- 添加或修改兑换券对话框 -->
+
+
+  </div>
+</template>
+
+<script>
+
+import activeNewlyweds from '../activeNewlyweds/index'
+import activeConsumption from '../activeConsumption/index'
+export default {
+  name: 'Exchange',
+  data() {
+    return{
+      value:1
+    }
+  },
+  created() {
+
+
+  },
+  components:{
+    activeNewlyweds,activeConsumption
+  },
+
+  methods: {
+
+
+  }
+}
+</script>
+<style scoped lang="scss">
+.app-container{
+  width: 100%;
+  height: 100%;
+}
+.qr-code{
+  margin: 0px auto;
+}
+</style>