From 1ed4dd8950cc1e3b79c3b568234a882278fcd92d Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Tue, 27 Aug 2024 14:45:58 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  18 ++
 .idea/encodings.xml                           |  19 ++
 .idea/jarRepositories.xml                     |  20 ++
 .idea/misc.xml                                |  10 +-
 fuintAdmin/src/api/staff/staff.js             |   9 +
 fuintAdmin/src/api/sys/messageCost.js         |   8 +-
 fuintAdmin/src/views/power/message.vue        | 302 ++++++++++++++----
 .../member/controller/LJStaffController.java  |  10 +
 .../member/service/ILJStaffService.java       |   7 +
 .../service/impl/LJStaffServiceImpl.java      | 141 ++++----
 .../business/setting/entity/MessageCost.java  |   4 +
 .../setting/service/MessageCostService.java   |   2 +
 .../service/impl/MessageCostServiceImpl.java  |  24 ++
 13 files changed, 443 insertions(+), 131 deletions(-)
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/jarRepositories.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 000000000..1cdd8c265
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="fuint-application" />
+        <module name="fuint-utils" />
+        <module name="fuint-repository" />
+        <module name="fuint-framework" />
+        <module name="fuint-payment" />
+        <module name="fuint-quartz" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 000000000..2ba608642
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-application/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-application/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-framework/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-framework/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-payment/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-payment/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-quartz/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-quartz/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-repository/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-repository/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-utils/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-utils/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 000000000..712ab9d98
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 639900d13..3215920dd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/fuintBackend/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/fuintAdmin/src/api/staff/staff.js b/fuintAdmin/src/api/staff/staff.js
index ffbb3a313..6b948b1a3 100644
--- a/fuintAdmin/src/api/staff/staff.js
+++ b/fuintAdmin/src/api/staff/staff.js
@@ -134,3 +134,12 @@ export function delOilTag(id) {
     method: 'delete'
   })
 }
+
+
+// 删除员工
+export function getStaffByDeptId(deptId) {
+  return request({
+    url: '/business/member/staff/getStaffByDeptId/' + deptId,
+    method: 'get'
+  })
+}
diff --git a/fuintAdmin/src/api/sys/messageCost.js b/fuintAdmin/src/api/sys/messageCost.js
index f6eb42254..61a9feb17 100644
--- a/fuintAdmin/src/api/sys/messageCost.js
+++ b/fuintAdmin/src/api/sys/messageCost.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 
 // 分页查询所有的订单信息
-export function getListApi(query) {
+export function getCostListApi(query) {
   return request({
     url: 'MessageCost',
     method: 'get',
@@ -18,14 +18,14 @@ export function getInfoApi(id) {
   })
 }
 //
-export function deleteApi(id) {
+export function deleteCostApi(id) {
   return request({
     url: 'MessageCost/' + id,
     method: 'delete'
   })
 }
 //
-export function saveApi(data) {
+export function saveCostApi(data) {
   return request({
     url: 'MessageCost',
     method: 'post',
@@ -34,7 +34,7 @@ export function saveApi(data) {
 }
 
 // 保存修改信息
-export function updateApi(data) {
+export function updateCostApi(data) {
   return request({
     url: 'MessageCost',
     method: 'put',
diff --git a/fuintAdmin/src/views/power/message.vue b/fuintAdmin/src/views/power/message.vue
index bd9011e62..96d161c05 100644
--- a/fuintAdmin/src/views/power/message.vue
+++ b/fuintAdmin/src/views/power/message.vue
@@ -2,12 +2,13 @@
   <div class="app-container">
 
     <div class="tab-box">
-      <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="getindex(index)"
-           :class="{ 'active' :activeindex==index}">{{ item.name }}
+      <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in  tabs"
+           :key="index">
+        {{ item.name }}
       </div>
     </div>
 
-    <div class="card-change" style="margin: 20px" v-if="activeindex == 0">
+    <div class="card-change" style="margin: 20px" v-if="tabindex == 0">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
         <el-form-item label="" prop="name">
           <el-input
@@ -57,16 +58,32 @@
       <div style="height: 70vh;overflow: auto">
         <el-table :data="tableData" border style="width: 100%">
           <el-table-column type="index" label="序号"></el-table-column>
-          <el-table-column prop="messageId" label="短信模板ID"></el-table-column>
-          <el-table-column prop="name" label="短信名称"></el-table-column>
-          <el-table-column prop="content" label="短信模板内容"></el-table-column>
+          <el-table-column prop="messageId" label="短信模板ID">
+            <template slot-scope="scope">
+              <span>{{scope.row.messageId}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" label="短信名称">
+            <template slot-scope="scope">
+              <span>{{scope.row.name}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="content" label="短信模板内容">
+            <template slot-scope="scope">
+              <span>{{scope.row.content}}</span>
+            </template>
+          </el-table-column>
           <!--        <el-table-column prop="image" label="短信图片">-->
           <!--          <template slot-scope="scope">-->
           <!--            <ImagePreview :src="scope.row.image"></ImagePreview>-->
           <!--          </template>-->
           <!--        </el-table-column>-->
           <!--          <el-table-column prop="deptNames" label="适用范围"></el-table-column>-->
-          <el-table-column prop="roleIds" label="接收角色"></el-table-column>
+          <el-table-column prop="roleIds" label="接收角色">
+            <template slot-scope="scope">
+              <span>{{scope.row.roleIds}}</span>
+            </template>
+          </el-table-column>
 
           <el-table-column prop="status" label="短信状态">
             <template slot-scope="scope">
@@ -78,8 +95,16 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="createName" label="创建人"></el-table-column>
-          <el-table-column prop="createTime" label="创建时间"></el-table-column>
+          <el-table-column prop="createName" label="创建人">
+            <template slot-scope="scope">
+              <span>{{scope.row.createName}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="createTime" label="创建时间">
+            <template slot-scope="scope">
+              <span>{{scope.row.createTime}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -111,7 +136,7 @@
       />
 
     </div>
-    <div class="card-change" style="margin: 20px" v-if="activeindex == 1">
+    <div class="card-change" style="margin: 20px" v-if="tabindex == 1">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
 
         <el-form-item label="" prop="status">
@@ -143,12 +168,28 @@
       </el-form>
 
       <div style="height: 70vh;overflow: auto">
-        <el-table :data="tableData" border style="width: 100%">
+        <el-table :data="messageRecordList" border style="width: 100%">
           <el-table-column type="index" label="序号"></el-table-column>
-          <el-table-column prop="name" label="短信名称"></el-table-column>
-          <el-table-column prop="content" label="短信内容"></el-table-column>
-          <el-table-column prop="roleIds" label="接收角色"></el-table-column>
-          <el-table-column prop="roleIds" label="短信发送记录"></el-table-column>
+          <el-table-column prop="name" label="短信名称">
+            <template slot-scope="scope">
+              <span>{{scope.row.name}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="content" label="短信内容">
+            <template slot-scope="scope">
+              <span>{{scope.row.content}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="roleIds" label="接收角色">
+            <template slot-scope="scope">
+              <span>{{scope.row.name}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="successNum" label="短信发送记录">
+            <template slot-scope="scope">
+              <span>{{scope.row.successNum || 0}}/{{scope.row.sendNum || 0}}</span>
+            </template>
+          </el-table-column>
 
           <el-table-column prop="status" label="发送状态">
             <template slot-scope="scope">
@@ -160,8 +201,16 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="createName" label="发送人"></el-table-column>
-          <el-table-column prop="createTime" label="发送时间"></el-table-column>
+          <el-table-column prop="createName" label="发送人">
+            <template slot-scope="scope">
+              <span>{{scope.row.createName}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="createTime" label="发送时间">
+            <template slot-scope="scope">
+              <span>{{scope.row.createTime}}</span>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <pagination
@@ -173,7 +222,7 @@
       />
 
     </div>
-    <div class="card-change" style="margin: 20px" v-if="activeindex == 2">
+    <div class="card-change" style="margin: 20px" v-if="tabindex == 2">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
 
         <el-form-item label="" prop="status">
@@ -213,15 +262,51 @@
       <div style="height: 70vh;overflow: auto">
         <el-table :data="messageCostList" border style="width: 100%">
           <el-table-column type="index" align="center" label="序号"></el-table-column>
-          <el-table-column prop="storeId" align="center" label="机构名称"></el-table-column>
-          <el-table-column prop="contacts" align="center" label="联系人"></el-table-column>
-          <el-table-column prop="mobile" align="center" label="联系方式"></el-table-column>
-          <el-table-column prop="balance" align="center" label="短信余额"></el-table-column>
-          <el-table-column prop="messageNum" align="center" label="累计已发短信条数"></el-table-column>
-          <el-table-column prop="residueNum" align="center" label="剩余短信条数"></el-table-column>
-          <el-table-column prop="rechargeRecord" align="center" label="短信充值记录"></el-table-column>
-          <el-table-column prop="createName" align="center" label="操作人"></el-table-column>
-          <el-table-column prop="createTime" align="center" label="操作时间"></el-table-column>
+          <el-table-column prop="storeId" align="center" label="机构名称">
+            <template slot-scope="scope">
+              <span>{{scope.row.storeId}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="contacts" align="center" label="联系人">
+            <template slot-scope="scope">
+              <span>{{scope.row.contacts}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="mobile" align="center" label="联系方式">
+            <template slot-scope="scope">
+              <span>{{scope.row.mobile}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="balance" align="center" label="短信余额">
+            <template slot-scope="scope">
+              <span>{{scope.row.balance}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="messageNum" align="center" label="累计已发短信条数">
+            <template slot-scope="scope">
+              <span>{{scope.row.messageNum}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="residueNum" align="center" label="剩余短信条数">
+            <template slot-scope="scope">
+              <span>{{scope.row.residueNum}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="rechargeRecord" align="center" label="短信充值记录">
+            <template slot-scope="scope">
+              <span>{{scope.row.rechargeRecord}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="createName" align="center" label="操作人">
+            <template slot-scope="scope">
+              <span>{{scope.row.name}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="createTime" align="center" label="操作时间">
+            <template slot-scope="scope">
+              <span>{{scope.row.createTime}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -288,16 +373,17 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitForm('form')">提交</el-button>
+          <el-button @click="open = false">取 消</el-button>
         </el-form-item>
       </el-form>
 
     </el-dialog>
 
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open2" width="35%" append-to-body>
-      <el-form ref="form" :rules="rules" :model="form2" label-width="120px">
+      <el-form ref="form2" :rules="rules" :model="form2" label-width="120px">
 
-        <el-form-item label="机构名称" prop="deptIdList">
-          <el-select v-model="form.deptIdList" multiple placeholder="请选择所属机构" style="width: 300px">
+        <el-form-item label="机构名称" prop="deptId">
+          <el-select v-model="form2.deptId" placeholder="请选择所属机构" @change="getStaff(form2.deptId)" style="width: 300px">
             <el-option
               v-for="item in deptListSelect"
               :key="item.deptId"
@@ -306,23 +392,24 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="联系人" prop="content">
-          <el-input type="textarea" v-model="form.content" style="width: 300px"></el-input>
+        <el-form-item label="联系人" prop="contacts">
+          <el-input v-model="form2.contacts" style="width: 300px"></el-input>
         </el-form-item>
-        <el-form-item label="联系方式" prop="content">
-          <el-input type="textarea" v-model="form.content" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="submitForm('form')">提交</el-button>
+        <el-form-item label="联系方式" prop="mobile">
+          <el-input v-model="form2.mobile" style="width: 300px"></el-input>
         </el-form-item>
       </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm2">确 定</el-button>
+        <el-button @click="open3 = false">取 消</el-button>
+      </div>
 
     </el-dialog>
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open3" width="35%" append-to-body>
       <el-form ref="form" :rules="rules" :model="form3" label-width="120px">
 
         <el-form-item label="机构名称" prop="deptIdList">
-          <el-select v-model="form.deptIdList" multiple placeholder="请选择所属机构" style="width: 300px">
+          <el-select v-model="form3.deptIdList" multiple placeholder="请选择所属机构" style="width: 300px">
             <el-option
               v-for="item in deptListSelect"
               :key="item.deptId"
@@ -332,17 +419,18 @@
           </el-select>
         </el-form-item>
         <el-form-item label="充值金额" prop="content">
-          <el-input type="textarea" v-model="form.content" style="width: 300px"></el-input>
+          <el-input type="textarea" v-model="form3.content" style="width: 300px"></el-input>
         </el-form-item>
         <el-form-item label="短信单价" prop="content">
-          <el-input type="textarea" v-model="form.content" style="width: 300px"></el-input>
+          <el-input type="textarea" v-model="form3.content" style="width: 300px"></el-input>
         </el-form-item>
         <el-form-item label="短信条数" prop="content">
-          <el-input type="textarea" v-model="form.content" style="width: 300px"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="submitForm('form')">提交</el-button>
+          <el-input type="textarea" v-model="form3.content" style="width: 300px"></el-input>
         </el-form-item>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm3">确 定</el-button>
+          <el-button @click="open3 = false">取 消</el-button>
+        </div>
       </el-form>
 
     </el-dialog>
@@ -356,6 +444,8 @@ import {deleteApi, getListApi, saveApi, updateApi} from "../../api/sys/message";
 import {getToken} from '../../utils/auth'
 import {selectChildByDeptId} from "../../api/system/Site/site";
 import NotifyMode from "./page/mode.vue";
+import {getCostListApi, saveCostApi, updateCostApi} from "@/api/sys/messageCost";
+import {getStaffByDeptId} from "@/api/staff/staff";
 
 export default {
   name: "printIndex",
@@ -363,8 +453,8 @@ export default {
   dicts: ['dept_ids', 'message_status'],
   data() {
     return {
-      activeindex: 0,
-      tablist: [
+      tabindex: 0,
+      tabs: [
         {
           name: '短信模板',
         },
@@ -404,7 +494,7 @@ export default {
         page: 1,
         pageSize: 10,
       },
-      messageRecordList:[],
+      messageRecordList: [],
 
       total2: 0,
       // 查询参数
@@ -412,11 +502,11 @@ export default {
         page: 1,
         pageSize: 10,
       },
-      messageCostList:[],
-      open2:false,
-      form2:{},
-      open3:false,
-      form3:{},
+      messageCostList: [],
+      open2: false,
+      form2: {},
+      open3: false,
+      form3: {},
 
       // 上传地址
       uploadAction: process.env.VUE_APP_BASE_API + 'backendApi/file/upload',
@@ -444,6 +534,15 @@ export default {
         ],
         content: [
           {required: true, message: "短信介绍不能为空", trigger: "blur"}
+        ],
+        deptId: [
+          {required: true, message: "机构名称不能为空", trigger: "blur"}
+        ],
+        contacts: [
+          {required: true, message: "联系人不能为空", trigger: "blur"}
+        ],
+        mobile: [
+          {required: true, message: "联系方式不能为空", trigger: "blur"}
         ]
       }
     };
@@ -453,12 +552,79 @@ export default {
     this.selectChildByDeptIdApi()
   },
   methods: {
-    handleAdd2(){
+    getStaff(deptId){
+      getStaffByDeptId(deptId).then(res => {
+        this.form2.contacts = res.data.realName
+        this.form2.mobile = res.data.mobile
+        this.$forceUpdate()
+      })
+    },
+    // 提交按钮
+    submitForm2: function () {
+      this.$refs["form2"].validate(valid => {
+        if (valid) {
+          if (!this.form2.id) {
+            saveCostApi(this.form2).then(res => {
+              if (res.data==1){
+                this.$message.success("添加成功")
+                this.open2 = false
+                this.queryParams2.page = 1;
+                this.getMessageCostList()
+              }else {
+                this.$message.error("添加失败，机构名称不可重复！")
+              }
+            })
+          } else {
+            updateCostApi(this.form).then(res => {
+              if (res.data==1) {
+                this.$message.success("修改成功")
+                this.open = false
+                this.queryParams.page = 1;
+                this.getList()
+              }else {
+                this.$message.error("添加失败，机构名称不可重复！")
+              }
+            })
+          }
+        }
+      });
+    },
+    // 提交按钮
+    submitForm3: function () {
+      this.$refs["form3"].validate(valid => {
+        if (valid) {
+          if (!this.form3.id) {
+            // saveLinkManageApi(this.form).then(res => {
+            //   if (res.data==1){
+            //     this.$message.success("添加成功")
+            //     this.open = false
+            //     this.queryParams.page = 1;
+            //     this.getList()
+            //   }else {
+            //     this.$message.error("添加失败，页面/功能名称不可重复")
+            //   }
+            // })
+          } else {
+            // updateLinkManageApi(this.form).then(res => {
+            //   if (res.data==1) {
+            //     this.$message.success("修改成功")
+            //     this.open = false
+            //     this.queryParams.page = 1;
+            //     this.getList()
+            //   }else {
+            //     this.$message.error("添加失败，页面/功能名称不可重复")
+            //   }
+            // })
+          }
+        }
+      });
+    },
+    handleAdd2() {
       this.open2 = true
     },
-    getMessageCostList(){
-      getListApi(this.queryParams2).then(res => {
-        this.messageCostList = res.data
+    getMessageCostList() {
+      getCostListApi(this.queryParams2).then(res => {
+        this.messageCostList = res.data.records
         this.total2 = res.data.total
       })
     },
@@ -636,24 +802,32 @@ export default {
 
 .tab-box {
   width: 100%;
+  height: 40px;
   background: #fff;
   display: flex;
   box-sizing: border-box;
-  padding: 0px 50px;
+  margin-bottom: 25px;
+
 }
 
-.f-box {
-  height: 40px;
-  color: #999999;
-  margin-right: 50px;
+.tab_ {
+  width: 85px;
+  height: 100%;
+  //border-bottom: 2px solid #FF770F;
   display: flex;
+  font-weight: 500;
+  font-size: 14px;
+  color: #999999;
   align-items: center;
-
+  justify-content: center;
+  margin-left: 50px;
+  cursor: pointer;
 }
 
 .active {
-  color: #FF9655 !important;
-  border-bottom: 2px solid #FF9655 !important;
+  border-bottom: 2px solid #FF770F !important;
+  color: #FF770F !important;
 }
+
 </style>
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
index 969ff8f44..eb125c568 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
@@ -198,4 +198,14 @@ public class LJStaffController extends BaseController {
     public ResponseObject queryStaffList(@PathVariable Integer storeId){
         return getSuccessResult(mtStaffService.queryStaffs(storeId));
     }
+
+    /**
+     * 根据机构id查询员工信息
+     * @param deptId
+     * @return
+     */
+    @GetMapping("/getStaffByDeptId/{deptId}")
+    public ResponseObject selectStaffByDeptId(@PathVariable Long deptId){
+        return getSuccessResult(mtStaffService.selectStaffByDeptId(deptId));
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
index 82ff0b1ae..faa076216 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
@@ -107,4 +107,11 @@ public interface ILJStaffService extends IService<LJStaff> {
      * @return
      */
     LJStaff selectStaffByStoreId(int storeId);
+
+    /**
+     * 根据机构id查询员工信息
+     * @param deptId
+     * @return
+     */
+    LJStaff selectStaffByDeptId(Long deptId);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
index 6d3841916..a26a00539 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
@@ -62,6 +62,7 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
 
     /**
      * 根据条件分页查询员工信息
+     *
      * @param page
      * @param staff
      * @return
@@ -76,14 +77,14 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
         staff.setStoreId(storeId);
         IPage<LJStaff> ljStaffIPage = baseMapper.selectLJStaffList(page, staff);
         List<LJStaff> records = ljStaffIPage.getRecords();
-        if (CollectionUtils.isNotEmpty(records)){
+        if (CollectionUtils.isNotEmpty(records)) {
             for (LJStaff record : records) {
                 LambdaQueryWrapper<TagCodeRecord> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(TagCodeRecord::getStaffId,record.getId());
+                queryWrapper.eq(TagCodeRecord::getStaffId, record.getId());
                 List<TagCodeRecord> list = tagCodeRecordService.list(queryWrapper);
-                if (ObjectUtils.isNotEmpty(list)){
+                if (ObjectUtils.isNotEmpty(list)) {
                     record.setTagStatus("1");
-                }else {
+                } else {
                     record.setTagStatus("0");
                 }
             }
@@ -93,6 +94,7 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
 
     /**
      * 查询所有员工信息
+     *
      * @return
      */
     @Override
@@ -100,25 +102,25 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Integer storeId = nowAccountInfo.getStoreId();
         QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("store_id",storeId);
-        queryWrapper.eq("status","qy");
-        queryWrapper.eq("if_delete","0");
+        queryWrapper.eq("store_id", storeId);
+        queryWrapper.eq("status", "qy");
+        queryWrapper.eq("if_delete", "0");
         List list = baseMapper.selectList(queryWrapper);
         return list;
     }
 
     @Override
     public List<LJStaff> queryStaffLists(Integer storeId) {
-        if (storeId==null){
+        if (storeId == null) {
             AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
             storeId = nowAccountInfo.getStoreId();
         }
         QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("store_id",storeId);
-        queryWrapper.eq("status","qy");
+        queryWrapper.eq("store_id", storeId);
+        queryWrapper.eq("status", "qy");
         /*queryWrapper.eq("role_id","15");*/
-        queryWrapper.eq("if_delete","0");
-        queryWrapper.eq("is_refuel","xs");
+        queryWrapper.eq("if_delete", "0");
+        queryWrapper.eq("is_refuel", "xs");
         List list = baseMapper.selectList(queryWrapper);
         return list;
     }
@@ -126,17 +128,18 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
     @Override
     public List<LJStaff> queryStaffLists1(Integer storeId) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("store_id",storeId);
-        queryWrapper.eq("status","qy");
-        queryWrapper.eq("role_id","15");
-        queryWrapper.eq("if_delete","0");
-        queryWrapper.eq("is_refuel","xs");
+        queryWrapper.eq("store_id", storeId);
+        queryWrapper.eq("status", "qy");
+        queryWrapper.eq("role_id", "15");
+        queryWrapper.eq("if_delete", "0");
+        queryWrapper.eq("is_refuel", "xs");
         List list = baseMapper.selectList(queryWrapper);
         return list;
     }
 
     /**
      * 根据id查询员工信息
+     *
      * @param id
      * @return
      */
@@ -151,19 +154,20 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
 
     /**
      * 根据手机号查询员工信息
+     *
      * @param mobile
      * @return
      */
     @Override
-    public LJStaff selectStaffByMobile(String mobile,Integer storeId) {
-        if (ObjectUtil.isEmpty(storeId)){
+    public LJStaff selectStaffByMobile(String mobile, Integer storeId) {
+        if (ObjectUtil.isEmpty(storeId)) {
             AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
             storeId = nowAccountInfo.getStoreId();
         }
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("mobile",mobile);
-        queryWrapper.eq("store_id",storeId);
-        queryWrapper.eq("if_delete","0");
+        queryWrapper.eq("mobile", mobile);
+        queryWrapper.eq("store_id", storeId);
+        queryWrapper.eq("if_delete", "0");
         LJStaff staff = baseMapper.selectOne(queryWrapper);
         return staff;
     }
@@ -172,26 +176,28 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
     @Override
     public LJStaff selectStaffByMobile2(String mobile) {
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("mobile",mobile);
-        queryWrapper.eq("status","qy");
-        queryWrapper.eq("if_delete","0");
+        queryWrapper.eq("mobile", mobile);
+        queryWrapper.eq("status", "qy");
+        queryWrapper.eq("if_delete", "0");
         LJStaff staff = baseMapper.selectOne(queryWrapper);
         return staff;
     }
 
     /**
      * 根据id批量删除员工信息
+     *
      * @param ids
      */
     @Override
     public void deleteStaffByIds(Integer[] ids) {
-        for (int id : ids){
+        for (int id : ids) {
             this.deleteStaffById(id);
         }
     }
 
     /**
      * 根据id删除员工信息
+     *
      * @param id
      */
     @Override
@@ -203,6 +209,7 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
 
     /**
      * 添加用户信息
+     *
      * @param staff
      * @return
      */
@@ -213,17 +220,17 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
         if (ObjectUtil.isNotEmpty(staff.getStoreId())) {
             storeId = staff.getStoreId();
         }
-        LJStaff staff2 = this.selectStaffByMobile(staff.getMobile(),storeId);
+        LJStaff staff2 = this.selectStaffByMobile(staff.getMobile(), storeId);
         if (ObjectUtil.isNotEmpty(staff2)) return 0;
         staff.setStoreId(storeId);
-        if (StringUtils.isNotEmpty(staff.getRefundPassword())){
+        if (StringUtils.isNotEmpty(staff.getRefundPassword())) {
             this.entryptPassword(staff);
         }
         int row = baseMapper.insert(staff);
-        LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(),storeId);
-        if (ObjectUtil.isNotEmpty(staff1)){
+        LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(), storeId);
+        if (ObjectUtil.isNotEmpty(staff1)) {
             //        添加员工码
-            staff1.setStaffCode("https://oilapi.youkerr.com/oilRefuel?storeId="+storeId+"&staffId="+staff1.getId());
+            staff1.setStaffCode("https://oilapi.youkerr.com/oilRefuel?storeId=" + storeId + "&staffId=" + staff1.getId());
             this.updateStaff(staff1);
         }
 
@@ -232,11 +239,11 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
         TAccount account = new TAccount();
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
         String timestamp = dateFormat.format(new Date());
-        String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6);
-        account.setAccountKey(timestamp+randomString);
-        if (ObjectUtil.isNotEmpty(staff.getAccountName())){
+        String randomString = UUID.randomUUID().toString().replace("-", "").substring(0, 6);
+        account.setAccountKey(timestamp + randomString);
+        if (ObjectUtil.isNotEmpty(staff.getAccountName())) {
             account.setAccountName(staff.getAccountName());
-        }else {
+        } else {
             account.setAccountName(staff.getMobile());
         }
         account.setAccountStatus(1);
@@ -249,27 +256,27 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
         LJStore store = storeService.selectStoreByStoreId(storeId);
         account.setDeptId(store.getContractDeptId());
 
-        if (StringUtils.isNotEmpty(staff.getRefundPassword())){
+        if (StringUtils.isNotEmpty(staff.getRefundPassword())) {
             account.setPassword(staff.getPassword());
-        }else {
+        } else {
             account.setPassword("123456");
         }
-        if (StringUtils.isNotEmpty(staff.getPassword())){
+        if (StringUtils.isNotEmpty(staff.getPassword())) {
             account.setPassword(staff.getPassword());
-        }else {
+        } else {
             account.setPassword("123456");
         }
         TDuty tDuty = new TDuty();
         tDuty.setDutyId(Integer.valueOf(staff1.getRoleId()));
-        accountService.createAccountInfo(account,tDutyService.getDutyList(tDuty));
+        accountService.createAccountInfo(account, tDutyService.getDutyList(tDuty));
         return row;
     }
 
     @Override
-    public int addStaff(LJStaff staff,TAccount tAccount) {
+    public int addStaff(LJStaff staff, TAccount tAccount) {
         int row = baseMapper.insert(staff);
-        LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(),null);
-        if (ObjectUtil.isNotEmpty(staff1)){
+        LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(), null);
+        if (ObjectUtil.isNotEmpty(staff1)) {
             tAccount.setStaffId(staff1.getId());
             accountService.updateAccount(tAccount);
         }
@@ -278,23 +285,24 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
 
     /**
      * 修改用户信息
+     *
      * @param staff
      * @return
      */
     @Override
     public int updateStaff(LJStaff staff) {
         int row = 0;
-        LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(),staff.getStoreId());
-        if (ObjectUtil.isNotEmpty(staff1) && !staff1.getId().equals(staff.getId())){
+        LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(), staff.getStoreId());
+        if (ObjectUtil.isNotEmpty(staff1) && !staff1.getId().equals(staff.getId())) {
             row = 0;
             return row;
         }
-        if (StringUtils.isEmpty(staff.getStaffCode())){
+        if (StringUtils.isEmpty(staff.getStaffCode())) {
             //        添加员工码
-            staff.setStaffCode("https://oilapi.youkerr.com/oilRefuel?storeId="+staff.getStoreId()+"&staffId="+staff.getId());
+            staff.setStaffCode("https://oilapi.youkerr.com/oilRefuel?storeId=" + staff.getStoreId() + "&staffId=" + staff.getId());
         }
         row = baseMapper.updateById(staff);
-        if (StringUtils.isNotEmpty(staff.getPassword())){
+        if (StringUtils.isNotEmpty(staff.getPassword())) {
             TAccount tAccount = accountService.selectAccountByStaffId(staff.getId());
             if (ObjectUtil.isNotEmpty(tAccount)) {
                 if (StringUtils.isNotEmpty(staff.getPassword())) {
@@ -311,7 +319,7 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
                     e.printStackTrace();
                 }
             }
-        }else {
+        } else {
             TAccount tAccount = accountService.selectAccountByStaffId(staff.getId());
             if (ObjectUtil.isNotEmpty(tAccount)) {
                 if (tAccount.getAccountName().matches("\\d+")) {
@@ -350,19 +358,19 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
 //        }
         String url = staff.getStaffCode();
         String area = store.getName();
-        String finalPath="/temp/qrCode/" + area + ".jpg";
+        String finalPath = "/temp/qrCode/" + area + ".jpg";
         InputStream backgroundStream = this.getClass().getClassLoader().getResourceAsStream(backgroundImage);
         InputStream logoStream = this.getClass().getClassLoader().getResourceAsStream(logoImage);
         //背景图片路径 loge图片 二维码 输出地址
-        qrCodeUtils.createLogoCodePicture(backgroundStream, logoStream, url, finalPath, staff.getId(),store.getId(),null);
+        qrCodeUtils.createLogoCodePicture(backgroundStream, logoStream, url, finalPath, staff.getId(), store.getId(), null);
         File file1 = new File("/temp/qrCode/");
         // 判断目录是否存在
         if (!file1.exists()) {
             file1.mkdir();
         }
 
-        File file =new File(finalPath);
-        FileInputStream fileInputStream =new FileInputStream(file);
+        File file = new File(finalPath);
+        FileInputStream fileInputStream = new FileInputStream(file);
         MultipartFile resFile = new MockMultipartFile("file", file.getName(), null, fileInputStream);
 //        返回图片路径
         String saveFile = backendFileController.saveFile(resFile);
@@ -379,16 +387,16 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
     @Override
     public int auditPrem(String auditPrem) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-        int row = baseMapper.auditPrem(nowAccountInfo.getStaffId(),auditPrem);
+        int row = baseMapper.auditPrem(nowAccountInfo.getStaffId(), auditPrem);
         return row;
     }
 
     @Override
     public List<LJStaff> queryStaffs(int storeId) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("store_id",storeId);
-        queryWrapper.eq("status","qy");
-        queryWrapper.eq("if_delete","0");
+        queryWrapper.eq("store_id", storeId);
+        queryWrapper.eq("status", "qy");
+        queryWrapper.eq("if_delete", "0");
         List<LJStaff> list = baseMapper.selectList(queryWrapper);
         return list;
     }
@@ -397,18 +405,27 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
     public LJStaff selectStaffByStoreId(int storeId) {
 
 
-
         QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("store_id",storeId);
-        queryWrapper.eq("status","qy");
-        queryWrapper.eq("if_delete","0");
+        queryWrapper.eq("store_id", storeId);
+        queryWrapper.eq("status", "qy");
+        queryWrapper.eq("if_delete", "0");
         //queryWrapper.eq("role_id","12");
         queryWrapper.orderByAsc("create_time");
         List<LJStaff> list = baseMapper.selectList(queryWrapper);
         LJStaff staff = null;
-        if (list.size()>0){
+        if (list.size() > 0) {
             staff = list.get(0);
         }
         return staff;
     }
+
+    @Override
+    public LJStaff selectStaffByDeptId(Long deptId) {
+        LJStaff ljStaff = null;
+        LJStore ljStore = storeService.selectStoreByDeptId(deptId);
+        if (ObjectUtil.isNotEmpty(ljStore)) {
+            ljStaff = this.selectStaffByStoreId(ljStore.getId());
+        }
+        return ljStaff;
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageCost.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageCost.java
index 1aab6917a..17e57f114 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageCost.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/entity/MessageCost.java
@@ -37,6 +37,10 @@ public class MessageCost extends BaseEntity implements Serializable {
      * 油站id
      */
     private Integer storeId;
+    /**
+     * 机构id
+     */
+    private Integer deptId;
     /**
      * 联系人
      */
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/MessageCostService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/MessageCostService.java
index 5eaba28c6..f0236133a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/MessageCostService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/MessageCostService.java
@@ -27,6 +27,8 @@ public interface MessageCostService {
      */
     MessageCost queryById(Integer id);
 
+    MessageCost selectByDeptId(Integer deptId);
+
     /**
      * 新增数据
      *
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/MessageCostServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/MessageCostServiceImpl.java
index 05978bc35..e9c5dfd26 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/MessageCostServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/setting/service/impl/MessageCostServiceImpl.java
@@ -1,13 +1,19 @@
 package com.fuint.business.setting.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.setting.entity.MessageCost;
 import com.fuint.business.setting.mapper.MessageCostMapper;
 import com.fuint.business.setting.service.MessageCostService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 
 /**
  * 短信费用信息表(MessageCost)表服务实现类
@@ -34,6 +40,13 @@ public class MessageCostServiceImpl extends ServiceImpl<MessageCostMapper,Messag
         return baseMapper.selectById(id);
     }
 
+    @Override
+    public MessageCost selectByDeptId(Integer deptId) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("dept_id",deptId);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
     /**
      * 新增数据
      *
@@ -42,6 +55,13 @@ public class MessageCostServiceImpl extends ServiceImpl<MessageCostMapper,Messag
      */
     @Override
     public int insert(MessageCost messageCost) {
+        MessageCost messageCost1 = selectByDeptId(messageCost.getDeptId());
+        if (ObjectUtil.isNotEmpty(messageCost1)){
+            return 0;
+        }
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        messageCost.setChainStoreId(nowAccountInfo.getChainStoreId());
+        messageCost.setStoreId(nowAccountInfo.getStoreId());
         return baseMapper.insert(messageCost);
     }
 
@@ -53,6 +73,10 @@ public class MessageCostServiceImpl extends ServiceImpl<MessageCostMapper,Messag
      */
     @Override
     public int update(MessageCost messageCost) {
+        MessageCost messageCost1 = selectByDeptId(messageCost.getDeptId());
+        if (ObjectUtil.isNotEmpty(messageCost1) && !Objects.equals(messageCost1.getId(), messageCost.getId())){
+            return 0;
+        }
         return baseMapper.updateById(messageCost);
     }
 

From 25f06fbe76e8bfc351cf83785ea9d36a198e726a Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Tue, 27 Aug 2024 16:54:55 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dataSources.xml                         |  12 ++
 .idea/easyCodeTableSetting.xml                | 145 ++++++++++++++++++
 .../src/api/EventMarketing/openCardGift.js    |  43 ++++++
 .../src/views/EventMarketing/center/index.vue |  13 ++
 .../EventMarketing/openCardGift/index.vue     | 127 +++++++++++++++
 .../controller/OpenCardGiftController.java    |  73 +++++++++
 .../openCardGift/entity/OpenCardGift.java     |  98 ++++++++++++
 .../mapper/OpenCardGiftMapper.java            |   7 +
 .../service/OpenCardGiftService.java          |  50 ++++++
 .../service/impl/OpenCardGiftServiceImpl.java |  74 +++++++++
 10 files changed, 642 insertions(+)
 create mode 100644 .idea/dataSources.xml
 create mode 100644 .idea/easyCodeTableSetting.xml
 create mode 100644 fuintAdmin/src/api/EventMarketing/openCardGift.js
 create mode 100644 fuintAdmin/src/views/EventMarketing/openCardGift/index.vue
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/controller/OpenCardGiftController.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/entity/OpenCardGift.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/mapper/OpenCardGiftMapper.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/OpenCardGiftService.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/impl/OpenCardGiftServiceImpl.java

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 000000000..9bded928e
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="oil" uuid="4255010b-d3cd-4300-989c-d9a8910e1e0e">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://47.94.122.58:3306</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/easyCodeTableSetting.xml b/.idea/easyCodeTableSetting.xml
new file mode 100644
index 000000000..4c91bab52
--- /dev/null
+++ b/.idea/easyCodeTableSetting.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EasyCodeTableSetting">
+    <option name="tableInfoMap">
+      <map>
+        <entry key="oilsystem.open_card_gift">
+          <value>
+            <TableInfoDTO>
+              <option name="comment" value="营销中心-开卡有礼" />
+              <option name="fullColumn">
+                <list>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="主键" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="id" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="连锁店id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="chainStoreId" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="油站id" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="storeId" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="活动名称" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="name" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="活动时间类型：0永久有效；1自定义" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="activityTimeType" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="活动时间前" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="activityTimeFront" />
+                    <option name="type" value="java.util.Date" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="活动时间后" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="activityTimeAfter" />
+                    <option name="type" value="java.util.Date" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="通知内容" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="noticeContent" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="活动详情" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="activityDetails" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="活动奖品（多选）：赠送积分、赠送成长值、赠送优惠券" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="activityPrize" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="赠送积分数量" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="givePoints" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="赠送成长值" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="giveGrowthValue" />
+                    <option name="type" value="java.lang.Integer" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="赠送优惠信息" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="giveCoupon" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="创建时间" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="createTime" />
+                    <option name="type" value="java.util.Date" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="创建人" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="createBy" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="更新时间" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="updateTime" />
+                    <option name="type" value="java.util.Date" />
+                  </ColumnInfoDTO>
+                  <ColumnInfoDTO>
+                    <option name="comment" value="更新人" />
+                    <option name="custom" value="false" />
+                    <option name="ext" value="{}" />
+                    <option name="name" value="updateBy" />
+                    <option name="type" value="java.lang.String" />
+                  </ColumnInfoDTO>
+                </list>
+              </option>
+              <option name="name" value="OpenCardGift" />
+              <option name="preName" value="" />
+              <option name="saveModelName" value="fuint-application" />
+              <option name="savePackageName" value="com.fuint.business.marketingActivity.openCardGift" />
+              <option name="savePath" value="./fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift" />
+              <option name="templateGroupName" value="Default" />
+            </TableInfoDTO>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/fuintAdmin/src/api/EventMarketing/openCardGift.js b/fuintAdmin/src/api/EventMarketing/openCardGift.js
new file mode 100644
index 000000000..91cbaab00
--- /dev/null
+++ b/fuintAdmin/src/api/EventMarketing/openCardGift.js
@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+// 查询开卡有礼信息
+export function getOpenCardInfo() {
+  return request({
+    url: 'openCardGift',
+    method: 'get',
+  })
+}
+
+// 根据id查询开卡有礼信息
+export function getOpenCardById(id) {
+  return request({
+    url: 'openCardGift/'+id,
+    method: 'get',
+  })
+}
+
+// 添加开卡有礼信息
+export function addOpenCardBy(data) {
+  return request({
+    url: 'openCardGift',
+    method: 'post',
+    data:data
+  })
+}
+
+// 添加开卡有礼信息
+export function editOpenCardBy(data) {
+  return request({
+    url: 'openCardGift',
+    method: 'put',
+    data:data
+  })
+}
+
+// 根据id删除开卡有礼信息
+export function deleteOpenCard(id) {
+  return request({
+    url: 'openCardGift/'+id,
+    method: 'delete',
+  })
+}
diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue
index a85bd715a..779d1cc7b 100644
--- a/fuintAdmin/src/views/EventMarketing/center/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/center/index.vue
@@ -71,6 +71,16 @@
           <div>一键发券</div>
         </div>
       </div>
+      <div class="wrap-box" @click="gobox(7)" >
+        <img src="./imgs/yjfq.png" style="width: 315px;height: 265px;margin: 0 auto " >
+        <div class="p-r-title">
+          <div style="font-size: 24px;font-weight: bold" >发卡有礼</div>
+          <div style="font-size: 12px">Card issuing gift</div>
+        </div>
+        <div class="bottom-box">
+          <div>发卡有礼</div>
+        </div>
+      </div>
     </div>
 
 
@@ -125,6 +135,9 @@ export default {
       if(id == 6){
         this.$router.push('/EventMarketing/yijiancoupon/index')
       }
+      if(id == 7){
+        this.$router.push('/EventMarketing/openCardGift/index')
+      }
     },
 
   }
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue
new file mode 100644
index 000000000..6b7ccef1b
--- /dev/null
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue
@@ -0,0 +1,127 @@
+<template>
+  <div class="app-container">
+    <div class="cot-box">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
+        <el-form-item label="活动名称" prop="name">
+          <el-input v-model="ruleForm.name"></el-input>
+        </el-form-item>
+        <el-form-item label="活动时间" prop="region">
+          <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="活动时间" required>
+          <el-col :span="11">
+            <el-form-item prop="date1">
+              <el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.date1" style="width: 100%;"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col class="line" :span="2">-</el-col>
+          <el-col :span="11">
+            <el-form-item prop="date2">
+              <el-time-picker placeholder="选择时间" v-model="ruleForm.date2" style="width: 100%;"></el-time-picker>
+            </el-form-item>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="通知内容" prop="delivery">
+          <el-switch v-model="ruleForm.delivery"></el-switch>
+        </el-form-item>
+        <el-form-item label="活动详情" prop="type">
+          <el-checkbox-group v-model="ruleForm.type">
+            <el-checkbox label="美食/餐厅线上活动" name="type"></el-checkbox>
+            <el-checkbox label="地推活动" name="type"></el-checkbox>
+            <el-checkbox label="线下主题活动" name="type"></el-checkbox>
+            <el-checkbox label="单纯品牌曝光" name="type"></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="活动奖品" prop="resource">
+          <el-radio-group v-model="ruleForm.resource">
+            <el-radio label="线上品牌商赞助"></el-radio>
+            <el-radio label="线下场地免费"></el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="resetForm('ruleForm')">取消</el-button>
+          <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      ruleForm: {
+        name: '',
+        region: '',
+        date1: '',
+        date2: '',
+        delivery: false,
+        type: [],
+        resource: '',
+        desc: ''
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        ],
+        region: [
+          { required: true, message: '请选择活动区域', trigger: 'change' }
+        ],
+        date1: [
+          { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        date2: [
+          { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+        ],
+        type: [
+          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+        ],
+        resource: [
+          { required: true, message: '请选择活动资源', trigger: 'change' }
+        ],
+        desc: [
+          { required: true, message: '请填写活动形式', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert('submit!');
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  width: 100%;
+  height: 100vh;
+  background: #f6f8f9;
+}
+.cot-box {
+  width: 100%;
+  border-radius: 8px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 20px;
+  margin: 0 auto;
+}
+</style>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/controller/OpenCardGiftController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/controller/OpenCardGiftController.java
new file mode 100644
index 000000000..dee6456e2
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/controller/OpenCardGiftController.java
@@ -0,0 +1,73 @@
+package com.fuint.business.marketingActivity.openCardGift.controller;
+
+import com.fuint.business.marketingActivity.openCardGift.entity.OpenCardGift;
+import com.fuint.business.marketingActivity.openCardGift.service.OpenCardGiftService;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 开卡有礼Controller层
+ */
+@RestController
+@RequestMapping("openCardGift")
+public class OpenCardGiftController extends BaseController {
+    @Autowired
+    private OpenCardGiftService openCardGiftService;
+
+    /**
+     * 通过店铺id查询单条数据
+     *
+     * @return 单条数据
+     */
+    @GetMapping
+    public ResponseObject getInfo() {
+        return getSuccessResult(openCardGiftService.queryByStoreId());
+    }
+
+    /**
+     * 通过主键查询单条数据
+     *
+     * @param id 主键
+     * @return 单条数据
+     */
+    @GetMapping("{id}")
+    public ResponseObject queryById(@PathVariable("id") Integer id) {
+        return getSuccessResult(openCardGiftService.queryById(id));
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param openCardGift 实体
+     * @return 新增结果
+     */
+    @PostMapping
+    public ResponseObject add(@RequestBody OpenCardGift openCardGift) {
+        return getSuccessResult(openCardGiftService.insert(openCardGift));
+    }
+
+    /**
+     * 编辑数据
+     *
+     * @param openCardGift 实体
+     * @return 编辑结果
+     */
+    @PutMapping
+    public ResponseObject edit(@RequestBody OpenCardGift openCardGift) {
+        return getSuccessResult(openCardGiftService.update(openCardGift));
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param id 主键
+     * @return 删除是否成功
+     */
+    @DeleteMapping("{id}")
+    public ResponseObject deleteById(@PathVariable Integer id) {
+        return getSuccessResult(openCardGiftService.deleteById(id));
+    }
+
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/entity/OpenCardGift.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/entity/OpenCardGift.java
new file mode 100644
index 000000000..109f1459a
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/entity/OpenCardGift.java
@@ -0,0 +1,98 @@
+package com.fuint.business.marketingActivity.openCardGift.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuint.framework.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 营销中心-开卡有礼(OpenCardGift)实体类
+ *
+ * @author makejava
+ * @since 2024-08-27 15:41:16
+ */
+@Data
+@TableName("open_card_gift")
+@ApiModel(value = "OpenCardGift对象", description = "营销中心-开卡有礼")
+public class OpenCardGift extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键
+     */
+    @ApiModelProperty("ID")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 连锁店id
+     */
+    private Integer chainStoreId;
+    /**
+     * 油站id
+     */
+    private Integer storeId;
+    /**
+     * 活动名称
+     */
+    private String name;
+    /**
+     * 活动时间类型：0永久有效；1自定义
+     */
+    private String activityTimeType;
+    /**
+     * 活动时间前
+     */
+    private Date activityTimeFront;
+    /**
+     * 活动时间后
+     */
+    private Date activityTimeAfter;
+    /**
+     * 通知内容
+     */
+    private String noticeContent;
+    /**
+     * 活动详情
+     */
+    private String activityDetails;
+    /**
+     * 活动奖品（多选）：赠送积分、赠送成长值、赠送优惠券
+     */
+    private String activityPrize;
+    /**
+     * 赠送积分数量
+     */
+    private Integer givePoints;
+    /**
+     * 赠送成长值
+     */
+    private Integer giveGrowthValue;
+    /**
+     * 赠送优惠信息
+     */
+    private String giveCoupon;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 创建人
+     */
+    private String createBy;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+}
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/mapper/OpenCardGiftMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/mapper/OpenCardGiftMapper.java
new file mode 100644
index 000000000..6d457c9e2
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/mapper/OpenCardGiftMapper.java
@@ -0,0 +1,7 @@
+package com.fuint.business.marketingActivity.openCardGift.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fuint.business.marketingActivity.openCardGift.entity.OpenCardGift;
+
+public interface OpenCardGiftMapper extends BaseMapper<OpenCardGift> {
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/OpenCardGiftService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/OpenCardGiftService.java
new file mode 100644
index 000000000..24a627ddb
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/OpenCardGiftService.java
@@ -0,0 +1,50 @@
+package com.fuint.business.marketingActivity.openCardGift.service;
+
+import com.fuint.business.marketingActivity.openCardGift.entity.OpenCardGift;
+
+/**
+ * 营销中心-开卡有礼(OpenCardGift)表服务接口
+ *
+ * @author makejava
+ * @since 2024-08-27 15:41:20
+ */
+public interface OpenCardGiftService {
+    /**
+     * 根据店铺id查询开卡有礼配置信息
+     * @return
+     */
+    OpenCardGift queryByStoreId();
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    OpenCardGift queryById(Integer id);
+
+    /**
+     * 新增数据
+     *
+     * @param openCardGift 实例对象
+     * @return 实例对象
+     */
+    int insert(OpenCardGift openCardGift);
+
+    /**
+     * 修改数据
+     *
+     * @param openCardGift 实例对象
+     * @return 实例对象
+     */
+    int update(OpenCardGift openCardGift);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    int deleteById(Integer id);
+
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/impl/OpenCardGiftServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/impl/OpenCardGiftServiceImpl.java
new file mode 100644
index 000000000..3b379071f
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/openCardGift/service/impl/OpenCardGiftServiceImpl.java
@@ -0,0 +1,74 @@
+package com.fuint.business.marketingActivity.openCardGift.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.marketingActivity.openCardGift.entity.OpenCardGift;
+import com.fuint.business.marketingActivity.openCardGift.mapper.OpenCardGiftMapper;
+import com.fuint.business.marketingActivity.openCardGift.service.OpenCardGiftService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
+import org.springframework.stereotype.Service;
+
+/**
+ * 营销中心-开卡有礼(OpenCardGift)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-08-27 15:41:23
+ */
+@Service("openCardGiftService")
+public class OpenCardGiftServiceImpl extends ServiceImpl<OpenCardGiftMapper,OpenCardGift> implements OpenCardGiftService {
+
+    @Override
+    public OpenCardGift queryByStoreId() {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+        return baseMapper.selectOne(queryWrapper);
+    }
+
+    /**
+     * 通过ID查询单条数据
+     * @param id 主键
+     * @return 实例对象
+     */
+    @Override
+    public OpenCardGift queryById(Integer id) {
+        return baseMapper.selectById(id);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param openCardGift 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public int insert(OpenCardGift openCardGift) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        openCardGift.setChainStoreId(nowAccountInfo.getChainStoreId());
+        openCardGift.setStoreId(nowAccountInfo.getStoreId());
+        return baseMapper.insert(openCardGift);
+    }
+
+    /**
+     * 修改数据
+     *
+     * @param openCardGift 实例对象
+     * @return 实例对象
+     */
+    @Override
+    public int update(OpenCardGift openCardGift) {
+        return baseMapper.updateById(openCardGift);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @Override
+    public int deleteById(Integer id) {
+        return baseMapper.deleteById(id);
+    }
+}

From bd0704bbf681d8618d4b23c25ebee58b07ef4630 Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Wed, 28 Aug 2024 14:47:43 +0800
Subject: [PATCH 3/8] 8.28

---
 .idea/compiler.xml        | 19 +++++++++++++++++++
 .idea/encodings.xml       | 19 +++++++++++++++++++
 .idea/jarRepositories.xml | 20 ++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/jarRepositories.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 000000000..a40d7df99
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="fuint-application" />
+        <module name="fuint-utils" />
+        <module name="fuint-repository" />
+        <module name="fuint-framework" />
+        <module name="fuint-payment" />
+        <module name="fuint-quartz" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 000000000..2ba608642
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-application/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-application/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-framework/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-framework/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-payment/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-payment/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-quartz/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-quartz/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-repository/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-repository/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-utils/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/fuint-utils/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/fuintBackend/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 000000000..712ab9d98
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file

From 5f4367cd6c3187a6bcf6c3316d480d6d1f01a740 Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Wed, 28 Aug 2024 14:49:35 +0800
Subject: [PATCH 4/8] 8.28

---
 .../src/views/EventMarketing/center/index.vue | 466 ++++++++++++++----
 1 file changed, 381 insertions(+), 85 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue
index 779d1cc7b..d23ea0794 100644
--- a/fuintAdmin/src/views/EventMarketing/center/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/center/index.vue
@@ -1,87 +1,262 @@
 <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>-->
-    <div class="fji" >
-      <div class="wrap-box" @click="gobox(1)" >
-        <img src="./imgs/xfyl.png" style="width: 315px;height: 265px;margin: 0 auto " >
-        <div class="p-r-title">
-          <div style="font-size: 24px;font-weight: bold" >消费有礼</div>
-          <div style="font-size: 12px">Consumption is polite</div>
-        </div>
-        <div class="bottom-box">
-          <div>消费有礼</div>
-        </div>
-      </div>
-      <div class="wrap-box" @click="gobox(2)" >
-        <img src="./imgs/zkyx.png" style="width: 315px;height: 265px;margin: 0 auto " >
-        <div class="p-r-title">
-          <div style="font-size: 24px;font-weight: bold" >折扣营销</div>
-          <div style="font-size: 12px">Discount marketing</div>
-        </div>
-        <div class="bottom-box">
-          <div>折扣营销</div>
-        </div>
-      </div>
-      <div class="wrap-box" @click="gobox(3)" >
-        <img src="./imgs/mjyx.png" style="width: 315px;height: 265px;margin: 0 auto " >
-        <div class="p-r-title">
-          <div style="font-size: 24px;font-weight: bold" >满减营销</div>
-          <div style="font-size: 12px">Consumption is polite</div>
-        </div>
-        <div class="bottom-box">
-          <div>满减营销</div>
-        </div>
-      </div>
-      <div class="wrap-box" @click="gobox(4)" >
-        <img src="./imgs/xryl.png" style="width: 315px;height: 265px;margin: 0 auto " >
-        <div class="p-r-title">
-          <div style="font-size: 24px;font-weight: bold" >新人有礼</div>
-          <div style="font-size: 12px">Full reduction marketing</div>
-        </div>
-        <div class="bottom-box">
-          <div>新人有礼</div>
-        </div>
-      </div>
-      <div class="wrap-box" @click="gobox(5)" >
-        <img src="./imgs/tjyl.png" style="width: 315px;height: 265px;margin: 0 auto " >
-        <div class="p-r-title">
-          <div style="font-size: 24px;font-weight: bold" >推荐有礼</div>
-          <div style="font-size: 12px">Newcomers are polite</div>
-        </div>
-        <div class="bottom-box">
-          <div>推荐有礼</div>
-        </div>
-      </div>
-      <div class="wrap-box" @click="gobox(6)" >
-        <img src="./imgs/yjfq.png" style="width: 315px;height: 265px;margin: 0 auto " >
-        <div class="p-r-title">
-          <div style="font-size: 24px;font-weight: bold" >一键发券</div>
-          <div style="font-size: 12px">One click coupon issuance</div>
-        </div>
-        <div class="bottom-box">
-          <div>一键发券</div>
-        </div>
-      </div>
-      <div class="wrap-box" @click="gobox(7)" >
-        <img src="./imgs/yjfq.png" style="width: 315px;height: 265px;margin: 0 auto " >
-        <div class="p-r-title">
-          <div style="font-size: 24px;font-weight: bold" >发卡有礼</div>
-          <div style="font-size: 12px">Card issuing gift</div>
-        </div>
-        <div class="bottom-box">
-          <div>发卡有礼</div>
-        </div>
+  <div class="app-containers">
+    <div class="tap-box">
+      <div class="t-box" :class="{'actve' : tabindex == index }" v-for="(item,index) in tablist" :key="index" @click="tabindex = index" >
+        {{item}}
       </div>
     </div>
+      <div class="rp-box">
+        <div class="bai-box">
+          <div class="d-s">
+            <div class="gang"></div>
+            <div style="font-weight: bold">会员营销</div>
+          </div>
+          <div class="wp-box">
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/礼物@2x.png">
+                <div>
+                  <div class="size_title">开卡有礼</div>
+                  <div class="size_text">激活会员卡，享受优惠</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/理财@2x.png">
+                <div>
+                  <div class="size_title">充值有礼</div>
+                  <div class="size_text">充值后赠送金额、积分、经验、 优惠券等</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/消费券@2x.png">
+                <div>
+                  <div class="size_title">消费有礼</div>
+                  <div class="size_text">支付后赠送积分、成长值、优惠券</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/邀请@2x.png">
+                <div>
+                  <div class="size_title">邀请有礼</div>
+                  <div class="size_text">邀请好友注册会员，获得奖励</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/生日专区@2x.png">
+                <div>
+                  <div class="size_title">生日有礼</div>
+                  <div class="size_text">会员生日关怀，激活用户复购</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/充值@2x.png">
+                <div>
+                  <div class="size_title">推荐会员充值有礼</div>
+                  <div class="size_text">会员充值后，推荐人获得积分、 成长值、优</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/消费卡@2x.png" style="width: 59px;height: 42px">
+                <div>
+                  <div class="size_title">推荐会员消费有礼</div>
+                  <div class="size_text">会员消费后，推荐人获得积分、 成长值、优</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/营销@2x.png" >
+                <div>
+                  <div class="size_title">开卡有礼</div>
+                  <div class="size_text">激活会员卡，享受优惠</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+
+          </div>
+          <div class="d-s" style="margin-top: 15px">
+            <div class="gang"></div>
+            <div style="font-weight: bold">价格营销</div>
+          </div>
+          <div class="wp-box">
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/券@2x.png">
+                <div>
+                  <div class="size_title">分时优惠</div>
+                  <div class="size_text">不同会员不同时间，指定油品享受 限时优惠</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/特价申请单@2x.png">
+                <div>
+                  <div class="size_title">限时特价</div>
+                  <div class="size_text">充值后赠送金额、积分、成长值、 优惠券、</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/会员营销@2x.png">
+                <div>
+                  <div class="size_title">立减营销</div>
+                  <div class="size_text">订单满立减营销活动</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+            <div class="nr-box">
+              <div class="nr-top">
+                <img src="./imgs/折扣@2x.png">
+                <div>
+                  <div class="size_title">折扣营销</div>
+                  <div class="size_text">会员折扣营销，限时订单折扣， 引爆店铺流</div>
+                </div>
+              </div>
+              <div class="nr-bottom">
+                <div class="left-bt">进行中1个</div>
+                |
+                <div class="right-bt">创建活动</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+<!--    <div class="fji" >-->
+<!--      <div class="wrap-box" @click="gobox(1)" >-->
+<!--        <img src="./imgs/xfyl.png" style="width: 315px;height: 265px;margin: 0 auto " >-->
+<!--        <div class="p-r-title">-->
+<!--          <div style="font-size: 24px;font-weight: bold" >消费有礼</div>-->
+<!--          <div style="font-size: 12px">Consumption is polite</div>-->
+<!--        </div>-->
+<!--        <div class="bottom-box">-->
+<!--          <div>消费有礼</div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="wrap-box" @click="gobox(2)" >-->
+<!--        <img src="./imgs/zkyx.png" style="width: 315px;height: 265px;margin: 0 auto " >-->
+<!--        <div class="p-r-title">-->
+<!--          <div style="font-size: 24px;font-weight: bold" >折扣营销</div>-->
+<!--          <div style="font-size: 12px">Discount marketing</div>-->
+<!--        </div>-->
+<!--        <div class="bottom-box">-->
+<!--          <div>折扣营销</div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="wrap-box" @click="gobox(3)" >-->
+<!--        <img src="./imgs/mjyx.png" style="width: 315px;height: 265px;margin: 0 auto " >-->
+<!--        <div class="p-r-title">-->
+<!--          <div style="font-size: 24px;font-weight: bold" >满减营销</div>-->
+<!--          <div style="font-size: 12px">Consumption is polite</div>-->
+<!--        </div>-->
+<!--        <div class="bottom-box">-->
+<!--          <div>满减营销</div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="wrap-box" @click="gobox(4)" >-->
+<!--        <img src="./imgs/xryl.png" style="width: 315px;height: 265px;margin: 0 auto " >-->
+<!--        <div class="p-r-title">-->
+<!--          <div style="font-size: 24px;font-weight: bold" >新人有礼</div>-->
+<!--          <div style="font-size: 12px">Full reduction marketing</div>-->
+<!--        </div>-->
+<!--        <div class="bottom-box">-->
+<!--          <div>新人有礼</div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="wrap-box" @click="gobox(5)" >-->
+<!--        <img src="./imgs/tjyl.png" style="width: 315px;height: 265px;margin: 0 auto " >-->
+<!--        <div class="p-r-title">-->
+<!--          <div style="font-size: 24px;font-weight: bold" >推荐有礼</div>-->
+<!--          <div style="font-size: 12px">Newcomers are polite</div>-->
+<!--        </div>-->
+<!--        <div class="bottom-box">-->
+<!--          <div>推荐有礼</div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="wrap-box" @click="gobox(6)" >-->
+<!--        <img src="./imgs/yjfq.png" style="width: 315px;height: 265px;margin: 0 auto " >-->
+<!--        <div class="p-r-title">-->
+<!--          <div style="font-size: 24px;font-weight: bold" >一键发券</div>-->
+<!--          <div style="font-size: 12px">One click coupon issuance</div>-->
+<!--        </div>-->
+<!--        <div class="bottom-box">-->
+<!--          <div>一键发券</div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
 
 
 
@@ -104,7 +279,13 @@ export default {
   name: 'Exchange',
   data() {
     return{
-      value:1
+      value:1,
+      tabindex:0,
+      tablist:[
+        "营销活动",
+        "当前活动列表",
+        "历史活动列表"
+      ]
     }
   },
   created() {
@@ -135,22 +316,26 @@ export default {
       if(id == 6){
         this.$router.push('/EventMarketing/yijiancoupon/index')
       }
-      if(id == 7){
-        this.$router.push('/EventMarketing/openCardGift/index')
-      }
     },
 
   }
 }
 </script>
 <style scoped lang="scss">
-.app-container{
+.app-containers{
   width: 100%;
   height: 100vh;
+  background: #f9f9f9;
 }
 .qr-code{
   margin: 0px auto;
 }
+.rp-box{
+  width: 100%;
+  box-sizing: border-box;
+  padding: 15px;
+
+}
 .wrap-box{
   text-align: center;
   width: 375px;
@@ -185,4 +370,115 @@ export default {
   font-weight: bold;
   padding-bottom: 15px;
 }
+.rp-box{
+  display: flex;
+  flex-wrap: wrap;
+}
+.d-s{
+  display: flex;
+  align-items: center;
+}
+.tap-box{
+  width: 100%;
+  height: 50px;
+  background: #fff;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+}
+.t-box{
+  height: 100%;
+  font-size: 14px;
+  color: #999999;
+  border-bottom: 2px solid transparent;
+  margin: 0px 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  //border-bottom: 2px solid #FF770F;
+}
+.actve{
+  color: #FF770F !important;
+  font-weight: bold;
+  border-bottom: 2px solid #FF770F !important;
+}
+.bai-box{
+  width: 100%;
+  height: 100%;
+  background: #fff;
+  border-radius: 10px;
+  box-sizing: border-box;
+  padding: 15px;
+}
+.gang{
+  width: 2px;
+  height: 14px;
+  background: #FF9655;
+  margin-right: 5px;
+}
+.wp-box{
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+
+}
+.nr-box{
+  border-radius: 10px;
+  border: 1px solid #EEEEEE;
+  margin-top: 15px;
+  margin-right: 15px;
+  width: 310px;
+}
+.nr-top{
+  box-sizing: border-box;
+  padding: 15px;
+  display: flex;
+  align-items: center;
+
+  img{
+    width: 55px;
+    height: 55px ;
+    margin-right: 10px;
+  }
+}
+.size_title{
+  font-weight: bold;
+  font-size: 16px;
+  color: #333333;
+  margin-bottom: 10px;
+}
+.size_text{
+  font-size: 12px;
+  color: #333333;
+}
+.nr-bottom{
+  border-top: 1px solid #EEEEEE;
+  box-sizing: border-box;
+  padding: 4px ;
+  display: flex;
+  align-items: center;
+  color:#EEEEEE;
+}
+.left-bt{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  color: #666666;
+  width: 50%;
+  box-sizing: border-box;
+  padding: 5px;
+
+}
+.right-bt{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  color: #FF9655;
+  width: 50%;
+  box-sizing: border-box;
+  padding: 5px;
+}
 </style>

From 7a7412d515bf1915ea663fdc8f87308d90eae611 Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Wed, 28 Aug 2024 14:51:14 +0800
Subject: [PATCH 5/8] 8.28

---
 .../EventMarketing/center/imgs/会员营销@2x.png   | Bin 0 -> 2274 bytes
 .../views/EventMarketing/center/imgs/充值@2x.png | Bin 0 -> 2648 bytes
 .../views/EventMarketing/center/imgs/券@2x.png   | Bin 0 -> 1970 bytes
 .../views/EventMarketing/center/imgs/折扣@2x.png | Bin 0 -> 925 bytes
 .../EventMarketing/center/imgs/消费券@2x.png     | Bin 0 -> 2189 bytes
 .../EventMarketing/center/imgs/消费卡@2x.png     | Bin 0 -> 1908 bytes
 .../EventMarketing/center/imgs/特价申请单@2x.png | Bin 0 -> 1548 bytes
 .../views/EventMarketing/center/imgs/理财@2x.png | Bin 0 -> 1302 bytes
 .../EventMarketing/center/imgs/生日专区@2x.png   | Bin 0 -> 1988 bytes
 .../views/EventMarketing/center/imgs/礼物@2x.png | Bin 0 -> 1240 bytes
 .../views/EventMarketing/center/imgs/营销@2x.png | Bin 0 -> 2207 bytes
 .../views/EventMarketing/center/imgs/邀请@2x.png | Bin 0 -> 2042 bytes
 12 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/会员营销@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/充值@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/券@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/折扣@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/消费券@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/消费卡@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/特价申请单@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/理财@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/生日专区@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/礼物@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/营销@2x.png
 create mode 100644 fuintAdmin/src/views/EventMarketing/center/imgs/邀请@2x.png

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/会员营销@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/会员营销@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a6f9c89cb264ac4f9de4634d9ffbd8b4e850304
GIT binary patch
literal 2274
zcmV<82p#u{P)<h;3K|Lk000e1NJLTq003?P003kN1^@s6XTSxW00001b5ch_0Itp)
z=>Px-oJmAMRCwC$U2AL=MHF5|c_=6<6)lgpd$+9$A}Sb-At;Ftl#r+i_=6vc8s85R
zB0)q^e8oqs32J;{lmucyMKtw+a*_7#%<j(KQm_aVQd5yADDn~nY3n(+7Xs;P=ic3!
zxwmtY2~9)qoju>qnRCvZ^NnE$mSWdE&+_cMVvM|PdBll%v<ZIR7h|*~=8;yFhv|_c
zF#dv{x0sB63;#ZE`t~HNp{kFOm(tpLvgMK~@St&gc+~;o9*q7CFX2Ly*%#*xX7E6h
zVMT4oJFq$iu-WwNrDdLH<}6@C9OoQ(ki|U$uyz2FeHL@?2TOBOPJve9dF3$qh8_vp
z3Bz7IqQ1U&PJm`6oiXVRyj73XST(q=?sT<5tEHu|(*Dq3oj5GdSz%OG_EHkGg8F!W
z*wZ#^pgIGOzOE#25Rbj10qSzJ#2jaWS}s4M*XKe2tw6Z2wUDvXlmHFACRlBoG%!I;
zCYh&7fc=C9gd=Un=zgn?4wW0PB@#tA5e*1$&XX>Z?T~z`fygX1R^r)L$T5+=bAtvU
ztC0{7T2)ma2()#~mi3^w3pSBtj#hdo$>?8-8yowIaY&Njka*-Dt@zN!95Jhnk<YZU
zLmhjI7&|{&(0unst>{Sdm<ywGNE*-~(MjZpYFU~sMlOrWL_VpN9O+mceq|OR#o8ee
zl2N%W<kdz$*NPPq*KNfZIjop%qE@KT@puRhNkbo9^do%L?T#f9=VrIsTzjroq!jSp
z$<iUA+98ot>R#g0QJFd<%e4}vj_>))>^yptR-6)L4wLyD63^bE6{o~rx9M`mP7P`z
zwL_xPs`H&0-GWx+I3@6(4`_v{R9r-MVFOKf!S)wgSt@#&_JYnG66V~jm89(W&!Y6A
z_Ay&L-WS_rwStr$Uu%aXcgMtIpbf9CJ}Z?U(@M#OvB8MPPdR!(`iNFYE)D0Qv{RCz
zeb5TYo$-5dW4te}xNS0;+aW%gg{6K&ZM$D-tvebDW<F5ARf{fxf3LQZYYHsa9RclS
z&&Y^-%_N<UvD+cx-721aX@}`Hm=G4uDA|+<TS~{J`1DHQ;6aHb0=Gw{0#I0a)3GT+
zp$3f>c-bCRDoqF#&}b@|$S(~--U3PPdsA<@3c$H^W_R<&XA%tDzxcLPi2PCv_Jef;
z(FbLNXSw$5;9a?5tDg<iamEM*j<E|k&IKQn=CFYI3p!8XE6%fjN-K!05O_HF66Z<$
zObMVp%Q;8Ud)#}+T7uyhI|Y65VQ{6#tJ-I7y7r4))dFr}taz`IUVEG??v96F9u)ND
zd(e&MQ;_{s^o|I5m8<2<aV`-~f92YCJ94)aMIjs^2%5xh({;!4l?#&j5x&J0e1*c^
zNP$-B=r~a7x}!Vu=B9~?qu_1b#oMKVdt?Mjfj7D40B2*EdJ+s;bId1GyLZLKd2@fF
z$>FO)Bd>*8e9FNqS?<-8gSWd~c;?0>_XK5C5J^0<BjzPWa(Z%agy7*W<N+<_+m?jf
zZVTi@AK)#DeMMx}yVNHa@^Offx3Y+ZK1QzSpx;$gmnx)c5}t1J$P6PBfj@p%V1L+l
zbFEVrcyh2>GMXPy4)gFwmL!wFphOxaRCvwGyz>LzO0ch=h;w(zHjA+s4|v!^&9SFd
z!r$}??#cc*4Exr^=Sc0jMz(_0wD4h70w>;tHJ&^#7nqbqfsR93(?|aSWLPp;2!Gcg
zA#*c7w64^lzuNua1J?*N6ODM#8hC<W`rz-DbP;;22wcu>v|VfgrhB7=!`hca?*%v6
z$}<5xUtltID;Gr|6w-hPwzPxKs^VcI$Hqc<&Uy(et-^>(tYoqPR>RK%6RMksC2I-;
zPY})eaXsr;Qxo(kDV6DGY!H0sI^jo1;2}p(!Un5Aq?d&z3r$yW*4oP6a3#!_0N@W;
z(-L?)u<f&9#nwt_WPD%P<q{?Zs(M#o+J}*Pp5ACA)ZyVjF0QQ|2tYFld)h}l@nkrJ
zY`#AVyGaB-=(<7{9~8O;q4W$eRgR3RF=_V^SV`w9Sn9&)eIaJ6MUxiR{L5=<27m%>
z3Eig4j#VYgl2VUehXpJGADk7}#s_9QZ@fAMKC4>7p2iiLM7!tt<W_-adHBXUXyP)R
zFYbS^r^RJ--Gs&-6do-ixkGSeRsu~OHx&r5vcg<f%3xARm5-|^SUf5?XkEi|TT~lc
z68%QPp0-+<TRyrt=zLnRV&XxRlB$1X^eYJ~ErFLt8Mz=aW>*MS&dM%{soOFt%O$L|
ztoCB@k~%9RABx`iJ6d_^N@MYtTQK5dU~lA{v{v?l`jusZ4<GBSB$-^kapQmyc&A+(
zZKEpzw7PC-E>sqL+hNc9u17T=a;E2$m2{w+=pn#u;z@`rFKFu_^S(CELEBQc)*fQy
zo0L#GIA8DN!DB9yvEfF(N?U^oZOSj;Xwz`7+BEWAQWv~?_KrMpM1I3-w2hu3*fW5Q
zAGuClQO41znKx4AIOB5oB8r`{I&Y-WQzacBAId351bX6-o5kqqV)^bAWd6<(;C7oy
zXN;lc=$_}?tqes*7i<Sus-e+pccLJnQ9rnO++X55<1|X0?|IKD2;6~~?@Z9>bbAnM
zFHi`ygLrkeMkU}`UZC!q=*J<`cP42-cm!$=C9|?0hSuR*G!U7bC?Lr<)c;Fi9fuG_
zBanp@)YtdNx($Ke;}OfH)3oM85G*-|WbS$arGCw&KD|?GJVe1u&Lh4X0SHCOeOl8|
zfQNVgM8PwHWIW7ySZg@S)L0Vfm}s~hS^-#KwS*C%19@9mT+&FXs5L5b<$2_qY<VK#
zGv;Yc%2;`j)kp=(nK9<QpfxB_(g(47d0c*o(`IYUsbDtY)(rq;RggPJ@#0>sF$MQM
wvyD-2eX0-%u7YWc{pey~h?pw9=Q>3B9|Jx(Ibyh<e*gdg07*qoM6N<$f=J;&TmS$7

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/充值@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/充值@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5392ad751702d94330363e860dddd1fc9cc97201
GIT binary patch
literal 2648
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
GLSTYU7y+&T

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/券@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/券@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf7e4ab22ee915432cadb4898c9a0105f0e7565c
GIT binary patch
literal 1970
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
Eg6QOtegFUf

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/折扣@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/折扣@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0aecb8af77da80411e3ed6367e18ffb0e9bda22c
GIT binary patch
literal 925
zcmeAS@N?(olHy`uVBq!ia0vp^1t8493?x6=u~Y&n#^NA%Cx&(BWL^R}9|C+rT!Hle
zhKB#4p;tpg|L5l3Pe}L=M6t22lal_YMFJULQX;=3Bz#SZ_?{f~BPQl&O6=$O_|HJ`
zxVW!Cl$iK2A>mVE%%_By?;w=$H9r1pay*dymKgUX5vTyjj{TYx`z;~vOML7%AUh!r
zBmz_hl8OU!LFAW&xNiyZAT0^;UlV}JfFw{2hzk@1%7Pd`k$4~*WC&O#NE|E$G67=9
z7mxxF`V13+h(pLb%uf=5e)ca3@(X5QVrFCK;Na#J5fhh?l2_5x*3mOGvaqtXwe|M)
z3yIIn&dx6`uC1$UoIG{f+yzTktXi{X{l-n(cJA7L_|%zm7q2{e^yK-g*Kgi_`u^w7
z-@or}Cj4h$U}EreaSX}0_x8s1pu+|NtQQ=d-tQG&b<p9(-tUvP{r_)nAnDa5lo`I-
z+UCajUBz*4?rJX&s`Ga_!~RzAmhu+&jQ$I93vHdMTfT9i3wYeFz7;9)R&q|vUX2wE
zX74L4{}z}0@L=3h8NT=G^39d;7oN>smVN&Gv%e0r%kRg|KT*|aw%+F649jl}Yu`WL
zr)Ux+(EROv{w<N+Q<}=&@4Y)ETDXbt^V2&Lb0#+Gea^W)Lq@34?{o2O3E2q^d7pn>
zm@!wNq3`#@YZ7r!n%DhaaVOvF`Hcm?|3w=vG1iZnurXiWTI%uZI~R}LdOy4O{R?T~
zCto`s)x_@kJZq=!j=xWn*QwnrJrr}`&%Tg5C;l8g{%(e-^Of^*(|&0^+_rMB(B{h?
zzY|_QOVBR=c4}Scy}y$=**>HBIPj5b92niR{}N<)gImXK*(9;%y$wlM-Y5w+?{!GJ
z@@kWG^InFel;4WN&9<o*4+e|QwQ;?8F<5x6t?I;wD?4=j9aF0ADc$}o!a8rd#wQz>
zh3aBQ=LLNE;Ie4Cx`3_iwij;=U0M58S5@!?o-7u-YU3Vwu~;b7mOb$1=B`)sTzMXB
z6=|-}J>n1-Y&he(3(pJ5qYLIa^1LzaIJnnJ@WIs%f%RT2mHU;>{1$7Bb8V@LU$p)^
Zr-pdYEq}2cF2H2Q;OXk;vd$@?2>@wx&uIVv

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/消费券@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/消费券@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f1c229cec53cd47cd2141f5db753a28c2b17fb
GIT binary patch
literal 2189
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

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/消费卡@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/消费卡@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef4aa5d789d0fecfdd03dece8648ac0229d32637
GIT binary patch
literal 1908
zcmYLJ3piBy8$JwEGfldu+$!y$Myb^HU(1H3h+NW4Y0Q~(W+r1;wW}s<dLn5jgo-Gv
zWEkrbM(MI8p(WdO=)WdHE)|X3X67I*`#Zz#&hyQ8zVm(W`+o25Jm)#F-kvUV$wp)d
zg68gWrTc(uDEKpG6F^2yZOy<%=ctd1GgR{2qz{60fArqX*a4bTAflqCn9M0hN4yXS
z@ES$CL1r@F3p{#Z81Dozl{_Ap4x;D?hoj;$)hMcAvo$<ljKjhF{4g#TgW*v=9{@&C
zbO?rrc&srzcw-1M%w~`A*~2J02IxHY2#SuQs0u+;Fg(tOfs~rVQS;bp9uJr0a5Ox4
z7=|$}2rkBDV?1~SWdqq!1R3RV)LcMeYfxB&AQ~<QFSs1w3PWKP3S%gWaX}4iaMTE*
z=5la-E{+5naSCsSr2;Sz2!e4DH418N)+%UFj)se<Kn8)pAmadS22!BLGq3?<af~+O
zX8xhzbU*<_M2&z#yK!a<-q*U)dc*w#SK3o(S@<o^#ryc8nV80C!8k=b)xxv@?G|kx
z>;mGzIp~Aafvgn=9q_oOiPPf$WCR8d@zKmuyg#D}3NZb53w{s~;Nj!ORA7YLzyrX5
z!hg5Z9UQDxn8u)-6<e*!z&rOs<m0&)($OX8>FE<^lSt$_6w2Ir^A{~yw%o|r#MErX
z%9X3k&COST^%a$BX=O#TwqCd1#%9CD&0Du_wX=6{_|D12)y;jkhu0n-CUd_p%MU@h
z2L%E_fG{}t@ZldsVd3GCr=p`zpAn1C#>SmXyl^q)Qflhu%jp@JnORq}ujNQ`rTM=W
z6c!a<mzCeRd9&hfWmR4MA5We>d;UV+*wpmu|9>hJik8+lZS5UzJ3G6&y1}pK-TM!{
zAC=1fPXmKPLnA7+T7zMuqhp^ZzWg;gIT^dSrxk(-&AaGM3}O4H^k!s{)BO5+h$nuu
zR2E+;L0u%iXJz{tIkHFViN;^Q^0r0?6<dt_c-tv)RH6rc^MuWK*{av~THOaE_dd9v
zOu7*^QQ7*-mFti%E4i(6j=2H(vq@<3QlXnHe8K*onsZ$XByDH!y^;L>D)V@5^v9$0
zsY3FSYsagnr1u@yHh5sA`UMv5F@>5!v1Vu2;}}NDnsXIJu@z#O!4_HK1}r1p7g=V^
zSY%A$Unq>@cPsw)b)tXNA*+TAn*58#;DI84^{>e+;e$(-x14?^L+?yv)N;nMx&;}Q
zNoTyil(|dL4ppsLN<P-9cs$u&u5hp?^a|1`$EY2mVgJ_R;8@C&=k-UAn9xc)re-M_
zI<4UqXmw9@!J)m!2vX|~C4Kf^na@lk4u`mKUyUM{uj-tTCAhdaiiWeZOv%}Hn93f~
z$eKUbL_W+4GAv;w2d*y~(bLUR=8a!5Dp6c~B#qPTGdwVKVtc?zMK|eM(6L)lcdWg$
zyJIR97K|eKcG}6bC;AiDXeG7<-UB2*-r|0n4;8(~zhtobcC-DJZsRsZLTY?lGgUej
zwvDb-ysX-{^ZN^N^yU3Q)R0-m)It5<IxoWVh?<@C?SER;SU4=My5rE}A+ukZ7FQ9q
z>Cn>BUw&-v4I;HB(ZZ*&3IA=KFYJs$FF5y;<q>&`;MKEoNasW6t?Dt;tF3Z*s=v9P
zbw=TlGb-(RLl?vbKrj2uj^q;_Qfo+dd&|NWrf9AUFTrUP2-??(9i>1byJQ215L>mw
zSeSKxpw#}ZNkC+$JTc&4)5pGV0z(6ZAraXwyM?8-YE5A3!(05|s+X$M*c|evf&**E
zM)rv+FCLzi1U~(?fxo$*2&geGfArMavRj^aZnJ~=CdVTQFO|#pRCTo!>DBR@<`UOA
zMx5r>k(`{C(E9hDyObDq0D8SpB3^<K>xd~_LUGw`q2lfL`L+Z!r|G~mQpDB9$J;Cx
z<VzFSMt2jtd<-AEMn3#KFM3^`j#{=orlr;^HDzOb>z+o@slxd9xZ}E%HEZq6MIp8~
zy7RwD>9JBaTzSinX-g36rY$UXuk9CZyy<;=Z8dATS+2lU{8P+)qj?)VGOg8=q=eh9
zmRrJ!O~t+kTN*~r-zSRCduFEo&|zqK(6ouB<G$F_H(^XyuZU*h#j;AzGAw^EAaiTr
z<!*}Ayi2`3KcbKMI{i+2&HJ2&(jI9;aqzc;ZoJ5lK2feSf8D23EJ--AaLa4cj>$FK
zCcG9B42~_TmJ%i#{q$FL-TLTc8d&aZOlSHF<V5)jWy_pASwor}e7&GuJ3Q$n&S>=C
D#}vrF

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/特价申请单@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/特价申请单@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..743ca63ba5a2eff919ea6b7b6605f63e854d3cb0
GIT binary patch
literal 1548
zcmeAS@N?(olHy`uVBq!ia0vp^5kQ>4!3-qVCAl60QjEnx?oJHr&dI!FU|`Y<@Ck7R
z3NkSKXK47(u<E}<!+(eU|BYw<*KYW)z3RWpr2m$E|MeFAx1Rgod=g09p#Q(Y{QtVs
z{#(ugaSiAFH=PP%n9l|=Oy_|Gr~EgZ^WR{`f3sQtO{V=fnF|s$n*HB=#(xvAE~9B6
zuGx(Lra%SLL9$SBpc<e#KtYHyAR9@I(e(djK#@6M1wf-_gEWE^%=vFJ3uG6N4HSej
zfQA6sK$9WLfLx#gI63pbF^~<E1u|y9%mHhGhyzuETm?oTU0`!SiXrO3BBnq=m?0oG
z7y-3|*g%)S)xe}c+JWLoCV-p-7J*8^OoM9&ibHLOG2pHO`5j_1+yo?xKpK&_2*p4_
zZ0h00f?NXEh^7+kyr&-+e*)9X&XOR%U<O7eW)>D!Ha2!nZeBiq0RcfF5m5<A8Ch95
zd3jYeb#)C*EgfAwJ$(a1BQtXg3oC0ITRVFPM<*v|7gtv|4-ZctU;n_M;E>SBsOZ>)
zq}23`?3~=Z{QQEV(#qQUhUS)**7ol1zKN42PnkAj=B(Ls=FDBNXz}tDE7z=Bw|>Ls
zE!%hO+I`^2k)y|spE`Z!?1f90uU@@=<HpTfckVuT_~hxc7cXDFdj00j+xPE3eER(5
z>-Qf&fBpXb=kLFN6_52E1C#%8PZ!6KjC*fq{0tWg6gjS+<s_Xew5>g@^{wZY2@*Gx
zGH<3;-<YS{<$W<vGjmF0WZ11$xe61dCRzNCO?Rjimn?dA_RLDZ&p%Io-+P?DIPKn@
zozEFJtT6UT>oiDRk;t+4@Ntih^9%bcbmQET_K01ZefO+~U%6Sss?LdxYNBgWQW9Bj
zJQcjX&`YjR)Z(e2wdh8rXZqjPoKmup4zo$?+4O6*!$)>rfo;dG-CHp0*W3%yg)E(+
z{mEWOSCmA2u>H1lVg2@pUeR2dJ|DU2E1r7rd=FeG@Kjv0%+-LK^NdQqr&3{>{MoYN
zhu&qbkI!nXU3~kv^u(mX41<~}FRpP5?Due;bnD;+w?$K)Z^^&ss50-qe4kX{mg&Ey
ze)Dmgwff-+pQg_FFRNW8h0dpyAFvgfBYd%iiA`ly;*7?nDVDF>XS^#D?@a$<RBka(
zE%o*mrK>;dlq1)O-t3Q_)ahM5^UvHbE;)<uH|t5heI2`Kzry@22M+Gw`#67@am=I3
zN&70V=T_=u?>M5CJ>$=HlSjM;My4i@Y~&tgx&A5d;;!h(ztFM&%5~S1>Uy=z4--A!
z1nl59t?^ubw%%DLL;a1yqnWxbWm+Ho<aRHLTUT4-D)>MB5%<g%&m*Q)f{B&0FKLTx
zR0=!NA*3`<dF2nsgVPkXrWBjIuIUi{IA5UpoL)rGyXi4^Vr<&p&b;+^ZBSSB+|wTR
z+wQ!X?D6MYM%0^*mG<`(<7A3*z53?IUA--Rw6iv~SlIU%xAwl^?)mTJe(zowUHw3{
z*P`Go(9!Fo>aAx4oT+{E;hvpnh2h&2_2mnsydEEJY|CBTU_Q&qynTmAQJedHy|c`X
z60(K-M(hhL)iQJ?`9*vzzG!`OO|4(2zKiEx6#JGHYqr`iUNrARWkFte%GF9GSr@~<
zSB`hA)HWAd68>xEgxwy@i!O@nbne+dDJEf+BfHQ-V;8@f^^A&d6wR)z3|0db<esj6
JF6*2Ung9n67K#7>

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/理财@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/理财@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..05b5dc73b39d096567694f43f0913369f6f5f930
GIT binary patch
literal 1302
zcmeAS@N?(olHy`uVBq!ia0vp^1t8493?x6=u~Y&n#^NA%Cx&(BWL^T<*8_Y)T!DiB
zA*g}jzXQX6V}}1}4F5yH>;#7YZVdnZ82)>LMFJT9dxIIi4F3bc;z3|8gair#bph1`
zgJprFKa34D0mud_gOEVIKsHb%kO4$M29OI>4-r8Y2MPkE;A$Z1AzUB{kphx%21Efw
z1V}<mhO38j;d<c=h!jK%!~qa9AqGN7xCq=FxCl@IL>IDpG+hubTrZFd*N#gsG2(DT
zP_2$y`al5~wR1{>{DK)6nV48uS=l%^xOw^b1q6je#Ka|~W#kkUl~vWWb@lX3%q^_!
z>>Zt5Jv_aA1A>A>BO)WCqGMv?5|ffs(=)Pi^9l-!iYu$?8ycHh+S=MXI(sKho-%dn
zw3&0}&R?*2$+A`JH*DOrY4eVqd-fkXbmZ9aGv_Z{yma}-&D*!{+`V`I!NW(7pFDl`
z{Kf0nZ{L6T`04YPuiw6Z|MBzJ@4x@Tz2t!jmdVxA#W5t~-rHM0<9h-{j(>bVLG`Kx
z&!+T~dTx^pJf&`?a;NgD_SSYgs(3G%CFyGXy#H&n;riP;mCsDS%jnNJpZ|RMcm4Cl
z^Q+&#W;F5r9X@N%w>!=Hi}T;d-Fi3i!LsXnm&Nza)qM7B*_)Tjo6BEEScYHa_Ii0c
z%q{=1vX}n0dEL>avyHx02yt)UqU;yBD(Qh(TxZ}lC)RD2?|;5G3EWz?bEdkINnvfP
z*iK1ywinyqZvQ^-daVL`?WQdcc5G`s5!t?`LRxOpWw!LE=cnFZC}TBMfBT-vMXz4(
z`7>|ot#i?q+q}PX{&#(MiFKNGY5LJF=7WMs87dMdcAWY7yK`+_y;S%Gr!`xb)J>e-
zx%1h_IMa>cxmB%u|0Jy6$-Y9du}mUiHp`8)21U*fI~n;r8=ToZlr&c?XyVdZ@j#yO
zu<Y-e>{FXlWqV|bt!;xMK31KYGe0q>V*N7*5gz?Uor)jNP5oS7pS{L4ok2p6sbP|y
zlF}=!hwST_8Ey#&TiZ)8G)z5N$Z8$I$<TXp<3!mzEDXLUH+IV2;bhp_r{D6K-Jhw!
zeAbLbab+Lm7#1iRntrffy74DN!>>dosddvMGKID;mb)J}-#sN$dTN~a%bPig6LyJn
zHj7wVgo~+k+3u|R_2XjBOS3>nR?(0EAn}Ctu~6I{27B)YX0{(8OmEB%Y!-Tu${eH1
z7&goLp~C*}X|p)>x;HhOJ~sayopk12>y^hxpE-uTe{^LF^Vvt)HS7Po*B>(uxjFIo
p`{QepCr&pn6Mq@6cPsu1f0_#CiuZY96M+ez!PC{xWt~$(698-8NxA?4

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/生日专区@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/生日专区@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..01575f4aa1f6f4705aa2f21d6594647566d00dfa
GIT binary patch
literal 1988
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
W4zx?9Jhkiq0000<MNUMnLSTX|O7_P9

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/礼物@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/礼物@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0b2f53a9dfd3658e92e1a3360169c4ec0d3256e
GIT binary patch
literal 1240
zcmeAS@N?(olHy`uVBq!ia0vp^1t8493?x6=u~Y&n#^NA%Cx&(BWL^T<M+1C9T!DfN
z4F7>3H1z+fRsS0r{->pZ$lP2ISy%`nJ3If^*Z(gs2eB(EKxAd*|F$*|0<v3Mp(IcZ
z1OWw+QBxC097sYCkPVatvKt#gjOJ#LERX@@0#RKZh(s2F7zL4qkPyXi5~vuDEJQn8
z4O|x<23#?m0W=?C4x9nu!VQ6lqsc<F!_`2v00rTC;R+xkK<yA&h&Y@LmxY@Ew+O=6
z9%4BQ7>(0Pg8YIR7#W$FSy<WFIXJm^`S=9{g@lDg#l$5frDWt3lvLDoboKNNO)aeK
z9i3d<JiLAV{ewb6!z1G26O%Kua`W=bDk`gM>zkU|+S<E&`zB18Hf`qId5f2>Sh;rH
z#!Z{H?bx;Fz`;XDj-EJu=Ipui7cO49dhPm+TeoiCxqI*agD1~lzIyfg&D(b$K7RW2
z<?FZaKYslD{pZi$fB)WWNcCZ0V3PNAaSX}0_x9%ZaA8LQ_7AK=4lGXWnhU=#TcF@u
zHCfNKO3-nZ!d^B{6~`=&)c<jx1)k_xmWj`JY&-As-@^2JHFZ0t@4h3W$fRkwZdz8Q
zuc7Vl`@)<aMJsIWFU_>AJG=bbGTC~8g0{G&_P@^Y<#xWz_h)SpcU_;Hdr7lAMfc8@
z9_NP2FY!IDQqQa2e8@e#(V8K`S#_p&@d~#3O`fj{84}E=E)CaTxmRQRiPi5J4g~)6
z_`USYZq2=SOIBQTVko#*sA2jnUet+guGSZ3h8=Hgrd_*rUU|C+*HMNC;jKHxHCuW#
z=3Ktc@W6fP!Q3ZLmmb<^%E8cMpzX6xX<atg@m_`P+m>u}{&~YYxm#WF;{55`>b;U@
zXk9*VXK!bByG~To!9V_-tKZC?5uf7z>CW}SsC4&e;~Derx%}kZ^Oj#E<9$(TgRF?$
z5>}o9XWkFo%r;@ncTyWdct8AE>DZ;v#Bq;(Pes;;?NSdI|G$+Ii%DoG&1yKyV~`*$
zXVS7!?&ra;lb;z|d^lrs_XF4e9f=Db3!m?PvNrf|?zcxxH#h7*%)%n*BH)Nl%;%iJ
z$^B|)f|AaQv#g694%+@JI)9djlaF(aFuTG*BgPN53K_iO3|n6pB<#M>_3f;sNCt;!
zG*>utqx#B4*)JX`b6l99v+qaW%Pn?dTTEK+WM7w?b^lZD+v#r=7o6Q<bZyG(?)%yX
d5<G5e|1j42IE%ROtw;bBN}jHMF6*2UngFKbiPZoA

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/营销@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/营销@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..34b006f5eb91f405c61d9a7af39cf5c0e1f16f5d
GIT binary patch
literal 2207
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

literal 0
HcmV?d00001

diff --git a/fuintAdmin/src/views/EventMarketing/center/imgs/邀请@2x.png b/fuintAdmin/src/views/EventMarketing/center/imgs/邀请@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b86d74ff195a46ff578989df85c6ea42064c4556
GIT binary patch
literal 2042
zcmV<W2L<?vP)<h;3K|Lk000e1NJLTq003kF003YJ1^@s6>vPva00001b5ch_0Itp)
z=>Px+v`IukRCwC$oqcQ+MHIkKMN#~~XcSFEBYt8~qeetD2BU~5#=p)0z1f}JE7c$n
zKv5zRN=OXE_=O>o7{F*Ci25%END)yeg<>iwiAF^!K?q;c+r3_o_Qv<N-`Bg&UVA&c
zd-o=JxdV1@cHeJi-kXp2h(xHAPdUf=9k!{zYIALk#kCsvtb@<`FiFQV<Fl_x8rrNT
zO}jI6Ae!U)Q}6=2Kr-+$qSPe8wOWhwiGc@^tf;uj;%sXvLdY%p*3-t+k->z)`8eni
z$I1srm;9U5v_}I4qsfSk2N=y|2*VM4_oQKr4+ISCve-(>6-KwP<7XJV*>@n8p=~D^
z9Rj-W7Y66g5{T^Ki#_Kb5MA3x5c=4YdS7597#l+Xa!X5`jZyFB>iTP>{Cu`Vf87sb
zzJZjV*SK#`4#YOJ-K6|Hb_8_eM-Mru>;>n|70DILMf0kUolkrIT=_lov+kKUS7i@5
z=m(HPp1zdHMQYtz(R$>F$Ye62XTd+WHXaeF&(;YmZgk%R-|_G8-*VmqzlFbvzwI%Q
zLnQ^oesh6nJK8ARl(wTsg}v|%NASD5dm5cO2#6aPix-KEWr;#c#<m?P=pLv8>mnfi
z$*h^8?bJ!3s$gAMCjrSL>8)FY>VkC=kX$nJ6_H7&l>@;#v2FsACC#fp5q=e{n}B4m
z|9rdIHy~Iy0m-%>wYz--f^`#+Y#=+n^A8BrO+d1TtZ%;dZ^(kW2}qVCmo4=T2-ZzN
z`tBi!R+md3#VlAS)=fZixxOnuQt$FYois7*&$w@|QD@9+YG^G>DzJope*b>YVPGA-
zmhK6N1WJ9qhcN2BgHe(|x}fYUJ`DIxPhpfSkWMK3_7)EY{Fdi1N*YMVR&ILl;Gv`u
zhSyuSWdWoUN?qN+VeG9_2cs;2bVAv)r*If`d(^`43rND$o`lMOQxB!qJq);3ISkMV
z>c*Gzy<+m@p>Vjk8Xh906pD+b`gE;Y7@&ugZLp<c_Uxg)$B3lN*j-BFL?lq0{SCD?
zV@C_;cSnL&;K6iDXD5|Gfn}DS2jcKM{+&V?r=Vw;A`-bE64U~5+}8q_wE#v*NOW?^
zVv*Xk(GmQvXn4vbx%PR&Fs@S<ZeXxSpz`Gql(Pi`=o7m3gN4EKoKF>;Un;vFV%48e
z?un_9-z|v4m)h5=s$md!$UuKzV9Y*z9t7ED8SH%s<#?=+FtvN_cIEdQ;0PHSs$^YN
zM5C8Lko{t-G$M3cY@IEWHAZ;ni;{*u$2RoilH>!sY$Nty|E?@&(L$65<bP~oY_!zq
zV~P!I9pOz7urpy)+#?Oq(6k326rqqXzh=<+)O<>t2ntRQ$lc@G66_5wjD8I6IT0cl
zry+=QhHNA_R`tR#=oKr#Zk``N9j%tBJ>BaE&qSlctwCpDV81rG7#q*Uqt`$y`V=6x
z1vqdM9g_8evFly*{)y1a{~TnUC(d$yb&qH${p}*XOdGt+s?!w}S4o`)lRXaC{}MnL
ze^|QyjMQkOHwm6ru@dayDANrDAELM+U5y|wy6{9UhPvMZ?;{xi7-<-C-hrX_GP&b}
z-c!-%TZh|Qs*}OTvsk;Y>{#qZX}8z)+u-^wKBimRm2eTtoHD16vORoG$d@v*bLjB$
zh0ofY&u}xF1;aQEU226O&O)PkS?az|m@ovcUjSlzI>`kV;Q6pgiWKmD6RdejhcPg2
z&<a;u-W&amFz32K>dNZ+L*O0$q-ITwO;QQONn->rxCm{BbO{DhKEXW)ivA3`_7~=8
zkv0s*E{E&igC2BV-6Ex8AU!5p2hQ<|ac+!03}Fk4G*qPFgyIUEGe~Vk+)1i)Sbf3)
z-+(y1r4?l5Nz=Six-Q1pt>Bt(9z<QWmZse&Z2+)Xi1QEsGC=qUq=&Npfni~as|8O}
zf2oi(f-qtG53Zjnsv{S=aAi3zr~8|dBLF~p8QIEdBjm$abU02vWk%oT`X;-|h07g}
z-HvHsgOMX8SU@_~jx@7??SY0IJ?=0#4$n)$R#y*6qJ0X+q%^QVx>Ds~%atm%dwyU!
z3wwt4?s4#rq%bvYEZp;R@ZLM9K-yb+5?e5~Wcg;;^jj=5cE1#0G<pSOr~c4cVGU$j
zrvL-#Aq_Coe|WGvps-gl1s#ZB=h+GekoG+Tu74n03`c#ur^?C^U?;u|N8+>a0O{Ow
z`P(+N$*#_f!TJ=q)0F_@On5TUg$_uUtQY;9_(;M3U;x+b2w!Tz@B(qpMBzEGKKm=M
z*%sQg=OG8u=^}4SndT@=h_5p3AOVrM$X0;&=*tdB>7<t>AOwVjfDjN80zyDY2nYco
zAs_^VfDjN80zyDY2uO(lY1Sd0oRkp=K^BpgN;aC55ez{VPH;a4#gjt(PfXAiS`No+
zc9KH;6*#HCv-_;8uFoN*_$$bu3kU|S`yLxn-g2r};sB?YaBV&*#;4u^y3d!cuYnY#
z{0LJ6>OTLm{%|FS3A>y?ox6!lA}9)AB;(pxS4a4f8Vz6G4pY*ek;|rZ7<%%)is((D
zPV?FfHwE1>^pO+olSi7-4`2q4x<eiIacu{kI2m&&LaIAwK@wMqN%9Kn2zBKq(_YW=
YKPM*Kl2B2%cmMzZ07*qoM6N<$f_hrY6951J

literal 0
HcmV?d00001


From 82724d8fcec51c5619ad510644151f977d820cec Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 28 Aug 2024 15:03:48 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/EventMarketing/activeConsumption.js   |   16 +
 .../activeConsumption/index.vue               | 1870 ++++++++++-------
 .../ActiveConsumptionController.java          |   29 +
 .../entity/ActiveConsumption.java             |   72 +-
 .../entity/ActiveConsumptionChild.java        |   16 +
 .../service/ActiveConsumptionService.java     |    8 +
 .../impl/ActiveConsumptionServiceImpl.java    |   32 +
 .../controller/ActiveNewlywedsController.java |    5 +
 .../entity/ActiveNewlyweds.java               |   28 +-
 .../entity/ActiveNewlywedsChild.java          |    2 +
 .../service/ActiveNewlywedsChildService.java  |    9 +-
 .../service/ActiveNewlywedsService.java       |    6 +
 .../impl/ActiveNewlywedsChildServiceImpl.java |    9 +
 .../impl/ActiveNewlywedsServiceImpl.java      |   17 +
 14 files changed, 1317 insertions(+), 802 deletions(-)

diff --git a/fuintAdmin/src/api/EventMarketing/activeConsumption.js b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
index 4d257ea8d..d3a17a9e0 100644
--- a/fuintAdmin/src/api/EventMarketing/activeConsumption.js
+++ b/fuintAdmin/src/api/EventMarketing/activeConsumption.js
@@ -106,3 +106,19 @@ export function looklooklook(id) {
 
   })
 }
+
+export function getInfoActivity() {
+  return request({
+    url: 'business/marketingActivity/activeConsumption/getInfo',
+    method: 'get',
+
+  })
+}
+
+export function addActivity(data) {
+  return request({
+    url: 'business/marketingActivity/activeConsumption/add',
+    method: 'post',
+    data:data
+  })
+}
diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index e761738c2..d3171ada7 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -1,646 +1,821 @@
 <template>
   <div class="app-container">
-    <el-card style="margin-bottom: 20px">
-      <el-breadcrumb separator="/" style="margin-bottom: 35px">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/EventMarketing/center/index' }" >活动中心</el-breadcrumb-item>
-        <el-breadcrumb-item>消费有礼</el-breadcrumb-item>
-      </el-breadcrumb>
-    <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"
-          placeholder="活动名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <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="">
-        <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 style="float: right">
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+    <div>
+      <!--      <el-card style="margin-bottom: 20px">-->
+      <!--        <el-breadcrumb separator="/" style="margin-bottom: 35px">-->
+      <!--          <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>-->
+      <!--          <el-breadcrumb-item :to="{ path: '/EventMarketing/center/index' }">活动中心</el-breadcrumb-item>-->
+      <!--          <el-breadcrumb-item>消费有礼</el-breadcrumb-item>-->
+      <!--        </el-breadcrumb>-->
+      <!--        <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"-->
+      <!--              placeholder="活动名称"-->
+      <!--              clearable-->
+      <!--              @keyup.enter.native="handleQuery"-->
+      <!--            />-->
+      <!--          </el-form-item>-->
+      <!--          <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 style="float: right">-->
+      <!--            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
+      <!--            <el-button icon="el-icon-refresh" @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
-          type="primary"
+      <!--          </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-->
+      <!--              type="primary"-->
 
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-    </el-row>
+      <!--              icon="el-icon-plus"-->
+      <!--              size="mini"-->
+      <!--              @click="handleAdd"-->
+      <!--            >新增-->
+      <!--            </el-button>-->
+      <!--          </el-col>-->
+      <!--        </el-row>-->
 
-    <el-table v-loading="loading" :data="activeConsumptionList" :label-position="labelPosition" @selection-change="handleSelectionChange">
+      <!--        <el-table v-loading="loading" :data="activeConsumptionList" :label-position="labelPosition"-->
+      <!--                  @selection-change="handleSelectionChange">-->
 
-      <el-table-column
-        type="index"
-        align="center"
-        label="序号"
-       >
-      </el-table-column>
+      <!--          <el-table-column-->
+      <!--            type="index"-->
+      <!--            align="center"-->
+      <!--            label="序号"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
 
-      <el-table-column label="活动名称" align="center" prop="name" />
-      <el-table-column label="适用油品" align="center" prop="adaptOil" >
-        <template slot-scope="scope">
-<!--          <span v-for="item in scope.row.adaptOils">{{ item }}, </span>-->
-          <span >{{ getName(oilNameList,scope.row.adaptOil) }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="满足金额" align="center" prop="participationConditionMoney" >
-                <template slot-scope="scope">
-                  <span>{{ scope.row.participationConditionMoney }} 元</span>
-                </template>
-      </el-table-column>
-      <el-table-column label="适用用户" align="center" prop="adaptUserType" >
-      <template slot-scope="scope">
-        <span v-if="scope.row.adaptUserType == 0">全部用户</span>
-        <span v-if="scope.row.adaptUserType == 1">全部会员</span>
-        <span v-if="scope.row.adaptUserType == 2">等级会员</span>
-      </template>
-      </el-table-column>
-      <el-table-column label="赠券数量" align="center" prop="adaptUserType" >
-        <template slot-scope="scope">
-          <div>优惠券：{{scope.row.youhuiTotal || 0}}</div>
-          <div>兑换券：{{scope.row.duihuanTotal || 0}}</div>
+      <!--          <el-table-column label="活动名称" align="center" prop="name"/>-->
+      <!--          <el-table-column label="适用油品" align="center" prop="adaptOil">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ getName(oilNameList, scope.row.adaptOil) }} </span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="满足金额" align="center" prop="participationConditionMoney">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.participationConditionMoney }} 元</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="适用用户" align="center" prop="adaptUserType">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span v-if="scope.row.adaptUserType == 0">全部用户</span>-->
+      <!--              <span v-if="scope.row.adaptUserType == 1">全部会员</span>-->
+      <!--              <span v-if="scope.row.adaptUserType == 2">等级会员</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="赠券数量" align="center" prop="adaptUserType">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <div>优惠券：{{ scope.row.youhuiTotal || 0 }}</div>-->
+      <!--              <div>兑换券：{{ scope.row.duihuanTotal || 0 }}</div>-->
 
-        </template>
-      </el-table-column>
-      <el-table-column label="核销统计" align="center" prop="adaptUserType" >
-        <template slot-scope="scope">
-          <div>优惠券：{{scope.row.youhuiTotaled || 0}}</div>
-          <div>兑换券：{{scope.row.duihuanTotaled || 0}}</div>
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="核销统计" align="center" prop="adaptUserType">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <div>优惠券：{{ scope.row.youhuiTotaled || 0 }}</div>-->
+      <!--              <div>兑换券：{{ scope.row.duihuanTotaled || 0 }}</div>-->
 
-        </template>
-      </el-table-column>
+      <!--            </template>-->
+      <!--          </el-table-column>-->
 
-      <el-table-column label="活动时间" width="150" align="center" prop="adaptUserType" >
-        <template slot-scope="scope">
-          <div>{{scope.row.activeStartTime || 0}}</div>
-          <div>{{scope.row.activeEndTime || 0}}</div>
+      <!--          <el-table-column label="活动时间" width="150" align="center" prop="adaptUserType">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <div>{{ scope.row.activeStartTime || 0 }}</div>-->
+      <!--              <div>{{ scope.row.activeEndTime || 0 }}</div>-->
 
-        </template>
-      </el-table-column>
-<!--      <el-table-column label="会员等级" align="center" prop="dieselUserLevel" >-->
-<!--      <template slot-scope="scope">-->
-<!--        <span v-for="(item,index) in scope.row.dieselUserLevel "> {{item}} </span>-->
-<!--      </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="活动状态" align="center" prop="status" >
-      <template slot-scope="scope">
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="活动状态" align="center" prop="status">-->
+      <!--            <template slot-scope="scope">-->
 
-        <span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>上线</el-tag > </span>
-        <span style="cursor: pointer;" @click="jinyong(scope.row)" v-if="scope.row.status == 1"> <el-tag type="danger">已下线</el-tag>  </span>
+      <!--              <span style="cursor: pointer;" @click="qiyong(scope.row)" v-if="scope.row.status == 0"> <el-tag>上线</el-tag> </span>-->
+      <!--              <span style="cursor: pointer;" @click="jinyong(scope.row)" v-if="scope.row.status == 1"> <el-tag-->
+      <!--                type="danger">已下线</el-tag>  </span>-->
 
-      </template>
-      </el-table-column>
-<!--      <el-table-column label="活动时间" align="center" prop="adaptUserType" >-->
-<!--        <template slot-scope="scope">-->
-<!--          <span >{{scope.row.activeStartTime || 0}}-{{scope.row.activeEndTime || 0}}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="活动更新时间" width="150" align="center" prop="updateTime" >
-        <template slot-scope="scope">
-          <span >{{scope.row.updateTime || '暂无更新'}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作员" align="center" prop="updateTime" >
-        <template slot-scope="scope">
-          <span >{{scope.row.createBy || ''}}</span>
-        </template>
-      </el-table-column>
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="活动更新时间" width="150" align="center" prop="updateTime">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.updateTime || '暂无更新' }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="操作员" align="center" prop="updateTime">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.createBy || '' }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
 
-      <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+      <!--          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">-->
+      <!--            <template slot-scope="scope">-->
 
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="lookDetail(scope.row)"
-          >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDeletexia(scope.row)"
-            v-if="scope.row.isonline == 0"
-          >下线</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="Deleteshan(scope.row)"
-            v-if="scope.row.isonline == 1"
-          >删除</el-button>
-        </template>
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                icon="el-icon-edit"-->
+      <!--                @click="handleUpdate(scope.row)"-->
+      <!--              >修改-->
+      <!--              </el-button>-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                icon="el-icon-view"-->
+      <!--                @click="lookDetail(scope.row)"-->
+      <!--              >详情-->
+      <!--              </el-button>-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                icon="el-icon-delete"-->
+      <!--                @click="handleDeletexia(scope.row)"-->
+      <!--                v-if="scope.row.isonline == 0"-->
+      <!--              >下线-->
+      <!--              </el-button>-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                icon="el-icon-delete"-->
+      <!--                @click="Deleteshan(scope.row)"-->
+      <!--                v-if="scope.row.isonline == 1"-->
+      <!--              >删除-->
+      <!--              </el-button>-->
+      <!--            </template>-->
 
-      </el-table-column>
-    </el-table>
+      <!--          </el-table-column>-->
+      <!--        </el-table>-->
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    </el-card>
-    <!-- 添加或修改消费有礼活动对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="45%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">
+      <!--        <pagination-->
+      <!--          v-show="total>0"-->
+      <!--          :total="total"-->
+      <!--          :page.sync="queryParams.pageNum"-->
+      <!--          :limit.sync="queryParams.pageSize"-->
+      <!--          @pagination="getList"-->
+      <!--        />-->
+      <!--      </el-card>-->
+      <!--      &lt;!&ndash; 添加或修改消费有礼活动对话框 &ndash;&gt;-->
+      <!--      <el-dialog :title="title" :visible.sync="open" width="45%" append-to-body>-->
+      <!--        <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">-->
 
-        <el-form-item label="活动名称" prop="name" >
-          <div style="width: 217px">
-            <el-input v-model="form.name" placeholder="请输入活动名称" />
-          </div>
+      <!--          <el-form-item label="活动名称" prop="name">-->
+      <!--            <div style="width: 217px">-->
+      <!--              <el-input v-model="form.name" placeholder="请输入活动名称"/>-->
+      <!--            </div>-->
 
-        </el-form-item>
-        <el-form-item label="满足金额" prop="moneyType">
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="满足金额" prop="moneyType">-->
 
-          <el-select v-model="form.moneyType" placeholder="请选择满足金额" >
-            <el-option
-              v-for="dict in moneyList"
-              :key="dict.id.toString()"
-              :label="dict.name"
-              :value="dict.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
+      <!--            <el-select v-model="form.moneyType" placeholder="请选择满足金额">-->
+      <!--              <el-option-->
+      <!--                v-for="dict in moneyList"-->
+      <!--                :key="dict.id.toString()"-->
+      <!--                :label="dict.name"-->
+      <!--                :value="dict.id">-->
+      <!--              </el-option>-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
 
-        <el-form-item label="满足金额" prop="participationConditionMoney">
-          <el-input-number   :min="0.01" v-model="form.participationConditionMoney" placeholder="请输入满足金额" />
-        </el-form-item>
+      <!--          <el-form-item label="满足金额" prop="participationConditionMoney">-->
+      <!--            <el-input-number :min="0.01" v-model="form.participationConditionMoney" placeholder="请输入满足金额"/>-->
+      <!--          </el-form-item>-->
 
-        <el-form-item label="可用油品" prop="adaptOil" >
-          <el-checkbox-group v-model="form.adaptOil">
-            <el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
-          </el-checkbox-group>
+      <!--          <el-form-item label="可用油品" prop="adaptOil">-->
+      <!--            <el-checkbox-group v-model="form.adaptOil">-->
+      <!--              <el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">-->
+      <!--                {{ item.oilType }}{{ item.oilName }}-->
+      <!--              </el-checkbox>-->
+      <!--            </el-checkbox-group>-->
 
-        </el-form-item>
-        <el-form-item label="适用用户" prop="adaptUserType">
-          <el-radio-group v-model="form.adaptUserType">
-<!--            <el-radio label="0">全部用户</el-radio>-->
-            <el-radio label="1">全部会员</el-radio>
-            <el-radio label="2">等级会员</el-radio>
-          </el-radio-group>
-        </el-form-item>
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="适用用户" prop="adaptUserType">-->
+      <!--            <el-radio-group v-model="form.adaptUserType">-->
+      <!--              <el-radio label="1">全部会员</el-radio>-->
+      <!--              <el-radio label="2">等级会员</el-radio>-->
+      <!--            </el-radio-group>-->
+      <!--          </el-form-item>-->
 
-        <el-form-item label="会员等级" prop="dieselUserLevel" v-if="form.adaptUserType == 2" >
-          <el-select v-model="form.dieselUserLevel"  multiple clearable placeholder="会员等级">
-            <el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" >  </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="赠送类型" prop="activeGift" >
-          <el-checkbox-group v-model="form.activeGift">
+      <!--          <el-form-item label="会员等级" prop="dieselUserLevel" v-if="form.adaptUserType == 2">-->
+      <!--            <el-select v-model="form.dieselUserLevel" multiple clearable placeholder="会员等级">-->
+      <!--              <el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList"-->
+      <!--                         :key="index"></el-option>-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="赠送类型" prop="activeGift">-->
+      <!--            <el-checkbox-group v-model="form.activeGift">-->
 
-            <el-checkbox label="1" >赠送优惠券</el-checkbox>
-            <el-checkbox label="2" >赠送兑换券</el-checkbox>
+      <!--              <el-checkbox label="1">赠送优惠券</el-checkbox>-->
+      <!--              <el-checkbox label="2">赠送兑换券</el-checkbox>-->
 
-          </el-checkbox-group>
-        </el-form-item>
-<!--        选择优惠券-->
-        <div class="xh-box" v-if="form.activeGift && form.activeGift.indexOf('1')>-1 "   >
-            <div class="box-bt"> <div >选择优惠券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistFavorable()" >新增</el-button>  </div>
-            <div style="margin: 10px 0px">
-              <el-table
-                :data="tableData1"
-                border
-                style="width: 100%">
-                <el-table-column
-                  prop="giftCardName"
-                  label="卡券名称"
-                  width="0">
-                </el-table-column>
-                <el-table-column
-                  prop="giftCardType"
-                  label="券类型"
-                  width="80">
-                  <template slot-scope="scope">
-                    <span v-if="scope.row.giftCardType == 0" >满减券</span>
-                    <span v-if="scope.row.giftCardType == 1"  >折扣券</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="date"
-                  label="券详情"
-                  width="80">
-                  <template slot-scope="scope">
-                    <span>{{scope.row.giftCardDetail}}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="instruction"
-                  label="使用说明"
-                  width="0">
-                </el-table-column>
-                <el-table-column
-                  prop="date"
-                  label="有效期（天）">
-                  <template slot-scope="scope">
-                    <span v-if="scope.row.timeType == 0" > {{ scope.row.validityZero }}天 </span>
-                    <span v-if="scope.row.timeType == 1" > {{ scope.row.validityOne }}天 </span>
-                    <span v-if="scope.row.timeType == 2" > {{ scope.row.validityTwo }}天 </span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="date"
-                  label="数量"
-                  width="240">
-                  <template slot-scope="scope">
-                    <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
-                  </template>
-                </el-table-column>
+      <!--            </el-checkbox-group>-->
+      <!--          </el-form-item>-->
+      <!--          &lt;!&ndash;        选择优惠券&ndash;&gt;-->
+      <!--          <div class="xh-box" v-if="form.activeGift && form.activeGift.indexOf('1')>-1 ">-->
+      <!--            <div class="box-bt">-->
+      <!--              <div>选择优惠券</div>-->
+      <!--              <el-button type="primary" icon="el-icon-plus" @click="getlistFavorable()">新增</el-button>-->
+      <!--            </div>-->
+      <!--            <div style="margin: 10px 0px">-->
+      <!--              <el-table-->
+      <!--                :data="tableData1"-->
+      <!--                border-->
+      <!--                style="width: 100%">-->
+      <!--                <el-table-column-->
+      <!--                  prop="giftCardName"-->
+      <!--                  label="卡券名称"-->
+      <!--                  width="0">-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="giftCardType"-->
+      <!--                  label="券类型"-->
+      <!--                  width="80">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span v-if="scope.row.giftCardType == 0">满减券</span>-->
+      <!--                    <span v-if="scope.row.giftCardType == 1">折扣券</span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="券详情"-->
+      <!--                  width="80">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span>{{ scope.row.giftCardDetail }}</span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="instruction"-->
+      <!--                  label="使用说明"-->
+      <!--                  width="0">-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="有效期（天）">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span v-if="scope.row.timeType == 0"> {{ scope.row.validityZero }}天 </span>-->
+      <!--                    <span v-if="scope.row.timeType == 1"> {{ scope.row.validityOne }}天 </span>-->
+      <!--                    <span v-if="scope.row.timeType == 2"> {{ scope.row.validityTwo }}天 </span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="数量"-->
+      <!--                  width="240">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <el-input-number v-model="scope.row.giftCardTotal" controls-position="right" :min="1"-->
+      <!--                                     :max="9999"></el-input-number>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
 
-                <el-table-column
-                  prop="address"
-                  label="操作">
-                  <template slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      @click="deletedata(scope.row)"
-                    >删除</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
+      <!--                <el-table-column-->
+      <!--                  prop="address"-->
+      <!--                  label="操作">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <el-button-->
+      <!--                      size="mini"-->
+      <!--                      type="text"-->
+      <!--                      @click="deletedata(scope.row)"-->
+      <!--                    >删除-->
+      <!--                    </el-button>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--              </el-table>-->
 
-            </div>
-        </div>
-<!--        选择兑换券-->
-        <div class="xh-box" v-if="form.activeGift && form.activeGift.indexOf('2')>-1  "   >
-          <div class="box-bt"> <div >选择兑换券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistExchange()" >新增</el-button>  </div>
-          <div style="margin: 10px 0px">
+      <!--            </div>-->
+      <!--          </div>-->
+      <!--          &lt;!&ndash;        选择兑换券&ndash;&gt;-->
+      <!--          <div class="xh-box" v-if="form.activeGift && form.activeGift.indexOf('2')>-1  ">-->
+      <!--            <div class="box-bt">-->
+      <!--              <div>选择兑换券</div>-->
+      <!--              <el-button type="primary" icon="el-icon-plus" @click="getlistExchange()">新增</el-button>-->
+      <!--            </div>-->
+      <!--            <div style="margin: 10px 0px">-->
 
-            <el-table
-              :data="tableDatas"
-              border
-              style="width: 100%">
-              <el-table-column
-                prop="giftCardName"
-                label="卡券名称"
-                width="80">
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="券类型"
-                width="80">
-                <template slot-scope="scope">
-                  <span v-if="scope.row.giftCardType == 0" >商品券</span>
-                  <span v-if="scope.row.giftCardType == 1"  >洗车券</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="券详情"
-                width="80">
-                <template slot-scope="scope">
-                  <span>{{scope.row.giftCardDetail}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="instruction"
-                label="使用说明"
-                width="80">
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="有效期（天）">
-                <template slot-scope="scope">
-                  <span> {{ scope.row.giftCardTime }}天 </span>
+      <!--              <el-table-->
+      <!--                :data="tableDatas"-->
+      <!--                border-->
+      <!--                style="width: 100%">-->
+      <!--                <el-table-column-->
+      <!--                  prop="giftCardName"-->
+      <!--                  label="卡券名称"-->
+      <!--                  width="80">-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="券类型"-->
+      <!--                  width="80">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span v-if="scope.row.giftCardType == 0">商品券</span>-->
+      <!--                    <span v-if="scope.row.giftCardType == 1">洗车券</span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="券详情"-->
+      <!--                  width="80">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span>{{ scope.row.giftCardDetail }}</span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="instruction"-->
+      <!--                  label="使用说明"-->
+      <!--                  width="80">-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="有效期（天）">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span> {{ scope.row.giftCardTime }}天 </span>-->
 
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="数量"
-                width="240">
-                <template slot-scope="scope">
-                  <el-input-number v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="address"
-                label="操作"
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="数量"-->
+      <!--                  width="240">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <el-input-number v-model="scope.row.giftCardTotal" controls-position="right" :min="1"-->
+      <!--                                     :max="9999"></el-input-number>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="address"-->
+      <!--                  label="操作"-->
 
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    @click="deletedhdata(scope.row)"
-                  >删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <el-button-->
+      <!--                      size="mini"-->
+      <!--                      type="text"-->
+      <!--                      @click="deletedhdata(scope.row)"-->
+      <!--                    >删除-->
+      <!--                    </el-button>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--              </el-table>-->
 
-          </div>
-        </div>
-<!--        选择实物-->
-        <div class="xh-box" v-if="form.activeGift && form.activeGift.indexOf('4')>-1    "   >
-          <div class="box-bt"> <div >选择实物</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistLJGoods()" >新增</el-button>  </div>
-          <div style="margin: 10px 0px">
+      <!--            </div>-->
+      <!--          </div>-->
+      <!--          &lt;!&ndash;        选择实物&ndash;&gt;-->
+      <!--          <div class="xh-box" v-if="form.activeGift && form.activeGift.indexOf('4')>-1    ">-->
+      <!--            <div class="box-bt">-->
+      <!--              <div>选择实物</div>-->
+      <!--              <el-button type="primary" icon="el-icon-plus" @click="getlistLJGoods()">新增</el-button>-->
+      <!--            </div>-->
+      <!--            <div style="margin: 10px 0px">-->
 
-            <el-table
-              :data="form.shiwudata"
-              border
-              style="width: 100%">
-              <el-table-column
-                prop="goodsId"
-                label="实物名称"
-                width="240">
-                <template slot-scope="scope">
-                <span>{{scope.row.goodsName}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="count"
-                label="数量"
-                width="240">
-                <template slot-scope="scope">
-                  <el-input-number v-model="scope.row.goodsTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="address"
-                label="操作"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    @click="deleteswdata(scope.row)"
-                  >删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </div>
+      <!--              <el-table-->
+      <!--                :data="form.shiwudata"-->
+      <!--                border-->
+      <!--                style="width: 100%">-->
+      <!--                <el-table-column-->
+      <!--                  prop="goodsId"-->
+      <!--                  label="实物名称"-->
+      <!--                  width="240">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span>{{ scope.row.goodsName }}</span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="count"-->
+      <!--                  label="数量"-->
+      <!--                  width="240">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <el-input-number v-model="scope.row.goodsTotal" controls-position="right" :min="1"-->
+      <!--                                     :max="9999"></el-input-number>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="address"-->
+      <!--                  label="操作"-->
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <el-button-->
+      <!--                      size="mini"-->
+      <!--                      type="text"-->
+      <!--                      @click="deleteswdata(scope.row)"-->
+      <!--                    >删除-->
+      <!--                    </el-button>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--              </el-table>-->
+      <!--            </div>-->
+      <!--          </div>-->
 
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="活动开始时间" prop="activeStartTime">
-              <el-date-picker clearable
-                              v-model="form.activeStartTime"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="请选择活动开始时间">
-              </el-date-picker>
+      <!--          <el-row :gutter="20">-->
+      <!--            <el-col :span="12">-->
+      <!--              <el-form-item label="活动开始时间" prop="activeStartTime">-->
+      <!--                <el-date-picker clearable-->
+      <!--                                v-model="form.activeStartTime"-->
+      <!--                                type="datetime"-->
+      <!--                                value-format="yyyy-MM-dd HH:mm:ss"-->
+      <!--                                placeholder="请选择活动开始时间">-->
+      <!--                </el-date-picker>-->
+      <!--              </el-form-item>-->
+      <!--            </el-col>-->
+      <!--            <el-col :span="12">-->
+      <!--              <el-form-item label="活动结束时间" prop="activeEndTime">-->
+      <!--                <el-date-picker clearable-->
+      <!--                                v-model="form.activeEndTime"-->
+      <!--                                type="datetime"-->
+      <!--                                value-format="yyyy-MM-dd HH:mm:ss"-->
+      <!--                                placeholder="请选择活动结束时间">-->
+      <!--                </el-date-picker>-->
+      <!--              </el-form-item>-->
+      <!--            </el-col>-->
+
+      <!--          </el-row>-->
+
+      <!--          <el-form-item label="参与次数类别" prop="participationAcount">-->
+      <!--            <el-select v-model="form.participationAcount" 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="limitAcount" v-if="form.participationAcount == 1">-->
+      <!--            <el-input v-model="form.limitAcount" placeholder="请输入限制次数"/>-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="赠送积分" prop="points">-->
+      <!--            <el-input-number v-model="form.points" controls-position="right" :min="1" :max="999999"></el-input-number>-->
+      <!--          </el-form-item>-->
+      <!--        </el-form>-->
+      <!--        <div slot="footer" class="dialog-footer">-->
+      <!--          <el-button type="primary" @click="submitForm">确 定</el-button>-->
+      <!--          &lt;!&ndash;        最终提交&ndash;&gt;-->
+      <!--          <el-button @click="cancel">取 消</el-button>-->
+      <!--        </div>-->
+      <!--      </el-dialog>-->
+      <!--      <el-dialog title="详情统计" :visible.sync="opendetails" width="45%" append-to-body>-->
+      <!--        <div style="display: flex;justify-content: space-between;width: 100%;">-->
+      <!--          <div class="x-box">-->
+      <!--            <div>优惠券数量统计</div>-->
+      <!--            <div>总数量: {{ statisticsyou.count || 0 }}</div>-->
+      <!--            <div>已使用数量: {{ statisticsyou.countEd || 0 }}</div>-->
+      <!--            <div>未使用数量: {{ statisticsyou.countLd || 0 }}</div>-->
+      <!--          </div>-->
+      <!--          <div class="x-box">-->
+      <!--            <div>兑换券数量统计</div>-->
+      <!--            <div>总数量: {{ statisticsyou.counts || 0 }}</div>-->
+      <!--            <div>已使用数量: {{ statisticsyou.countEds || 0 }}</div>-->
+      <!--            <div>未使用数量: {{ statisticsyou.countLds || 0 }}</div>-->
+      <!--          </div>-->
+      <!--        </div>-->
+      <!--        <el-table-->
+      <!--          :data="looklist"-->
+      <!--          style="width: 100%">-->
+      <!--          <el-table-column-->
+      <!--            prop="name"-->
+      <!--            label="昵称"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="mobile"-->
+      <!--            label="联系方式"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="createTime"-->
+      <!--            label="领取日期"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="exchangeFrom"-->
+      <!--            label="获取方式"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+
+
+      <!--        </el-table>-->
+
+
+      <!--      </el-dialog>-->
+      <!--      &lt;!&ndash;    详情列表&ndash;&gt;-->
+
+      <!--      <el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">-->
+      <!--        <div style="display: flex;align-items: center; margin-bottom: 20px ">-->
+      <!--          <el-input v-model="youhuiquan.name" placeholder="优惠券名称"></el-input>-->
+      <!--          <el-button type="primary" icon="el-icon-search" @click="getlistFavorable">搜索</el-button>-->
+      <!--        </div>-->
+      <!--        <el-table-->
+      <!--          :data="tableData"-->
+      <!--          border-->
+      <!--          style="width: 100%">-->
+      <!--          <el-table-column-->
+      <!--            prop="name"-->
+      <!--            label="卡券名称"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="券类型"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span v-if="scope.row.discountType == 0">满减券</span>-->
+      <!--              <span v-if="scope.row.discountType == 1">折扣券</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="券详情"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.cardDetail }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="有效期（天）"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span v-if="scope.row.timeType == 0">{{ scope.row.validityZero }}天 </span>-->
+      <!--              <span v-if="scope.row.timeType == 1">{{ scope.row.validityOne }}天 </span>-->
+      <!--              <span v-if="scope.row.timeType == 2">{{ scope.row.validityTwo }}天 </span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+      <!--          <el-table-column-->
+      <!--            prop="address"-->
+      <!--            label="操作">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                @click="chosedata(scope.row)"-->
+      <!--              >选择-->
+      <!--              </el-button>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--        </el-table>-->
+      <!--        <div>-->
+      <!--          <pagination-->
+      <!--            v-show="ytotal>0"-->
+      <!--            :total="ytotal"-->
+      <!--            :page.sync="youhuiquan.pageNum"-->
+      <!--            :limit.sync="youhuiquan.pageSize"-->
+      <!--            @pagination="getlistFavorable"-->
+      <!--          />-->
+      <!--        </div>-->
+
+      <!--      </el-dialog>-->
+      <!--      &lt;!&ndash;    兑换券列表&ndash;&gt;-->
+      <!--      <el-dialog title="兑换券列表" :visible.sync="dialogTableVisibledh">-->
+      <!--        <div style="display: flex;align-items: center; margin-bottom: 20px ">-->
+      <!--          <el-input v-model="duihuanquan.name" placeholder="兑换券名称"></el-input>-->
+      <!--          <el-button type="primary" icon="el-icon-search" @click="getlistExchange">搜索</el-button>-->
+      <!--        </div>-->
+
+      <!--        <el-table-->
+      <!--          :data="tableDatadh"-->
+      <!--          border-->
+      <!--          style="width: 100%">-->
+      <!--          <el-table-column-->
+      <!--            prop="name"-->
+      <!--            label="卡券名称"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="券类型"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span v-if="scope.row.type == 0">商品券</span>-->
+      <!--              <span v-if="scope.row.type == 1">洗车券</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="券详情"-->
+      <!--            width="80">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.cardDetail }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="使用说明"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.useInstructions }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="有效期（天）"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.validity }}天 </span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+      <!--          <el-table-column-->
+      <!--            prop="address"-->
+      <!--            label="操作">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                @click="Favorabledata(scope.row)"-->
+      <!--              >选择-->
+      <!--              </el-button>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--        </el-table>-->
+      <!--        <div>-->
+      <!--          <pagination-->
+      <!--            v-show="dtotal>0"-->
+      <!--            :total="dtotal"-->
+      <!--            :page.sync="duihuanquan.pageNum"-->
+      <!--            :limit.sync="duihuanquan.pageSize"-->
+      <!--            @pagination="getlistExchange"-->
+      <!--          />-->
+      <!--        </div>-->
+      <!--      </el-dialog>-->
+      <!--      &lt;!&ndash;    实物列表&ndash;&gt;-->
+      <!--      <el-dialog title="实物列表" :visible.sync="dialogTableVisiblesw">-->
+      <!--        <el-form ref="form" :model="form" :rules="rules" label-width="110px">-->
+      <!--          <el-form-item label="选择商品">-->
+      <!--            <el-select v-model="shopdata.goodsId" placeholder="请选择商品" @change="swchange">-->
+      <!--              <el-option :label="item.name" :value="item" v-for="(item,index) in tableDatasw"-->
+      <!--                         :key="item.id"></el-option>-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="商品数量" prop="nmb">-->
+      <!--            <el-input-number v-model="shopdata.count" controls-position="right" :min="1" :max="9999"></el-input-number>-->
+
+      <!--          </el-form-item>-->
+      <!--          <el-button-->
+      <!--            type="primary"-->
+      <!--            @click="shwdata()"-->
+      <!--          >确定-->
+      <!--          </el-button>-->
+
+      <!--        </el-form>-->
+
+      <!--      </el-dialog>-->
+    </div>
+
+    <div class="cot-box">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px">
+        <div style="display: flex">
+          <div style="width: 50%">
+            <el-form-item label="活动名称" prop="name">
+              <el-input v-model="ruleForm.name"></el-input>
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="活动结束时间" prop="activeEndTime">
-              <el-date-picker clearable
-                              v-model="form.activeEndTime"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="请选择活动结束时间">
-              </el-date-picker>
+            <el-form-item label="活动时间" prop="activityTimeType">
+              <div class="d-s">
+                <div class="icon-type" v-for="(item,index) in activityTimeTypeList" :key="index"
+                     :class="{ 'acvtive' : index === tindex1 }" @click="Typeindex1(index)">
+                  <img src="@/assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex1">
+                  <img src="@/assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex1">
+                  {{ item }}
+                </div>
+                <el-date-picker
+                  v-model="ruleForm.activityTimeFront"
+                  style="width: 160px"
+                  type="date"
+                  placeholder="开始日期">
+                </el-date-picker>
+                至
+                <el-date-picker
+                  v-model="ruleForm.activityTimeAfter"
+                  style="width: 160px"
+                  type="date"
+                  placeholder="结束日期">
+                </el-date-picker>
+              </div>
             </el-form-item>
-          </el-col>
-
-        </el-row>
-
-        <el-form-item label="参与次数类别" prop="participationAcount">
-          <el-select v-model="form.participationAcount" 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="limitAcount" v-if="form.participationAcount == 1">
-          <el-input v-model="form.limitAcount" placeholder="请输入限制次数" />
-        </el-form-item>
-        <el-form-item label="赠送积分" prop="points">
-          <el-input-number v-model="form.points" controls-position="right" :min="1" :max="999999"></el-input-number>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-<!--        最终提交-->
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="详情统计" :visible.sync="opendetails" width="45%" append-to-body>
-      <div style="display: flex;justify-content: space-between;width: 100%;">
-        <div class="x-box">
-          <div>优惠券数量统计</div>
-          <div>总数量: {{statisticsyou.count ||0}}</div>
-          <div>已使用数量: {{statisticsyou.countEd ||0}}</div>
-          <div>未使用数量: {{statisticsyou.countLd ||0}}</div>
-        </div>
-        <div class="x-box">
-          <div>兑换券数量统计</div>
-          <div>总数量: {{statisticsyou.counts ||0}}</div>
-          <div>已使用数量: {{statisticsyou.countEds ||0}}</div>
-          <div>未使用数量: {{statisticsyou.countLds ||0}}</div>
-        </div>
-      </div>
-      <el-table
-        :data="looklist"
-        style="width: 100%">
-        <el-table-column
-          prop="name"
-          label="昵称"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="mobile"
-          label="联系方式"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="领取日期"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="exchangeFrom"
-          label="获取方式"
-        >
-        </el-table-column>
-
-
-      </el-table>
-
-
-    </el-dialog>
-<!--    详情列表-->
-
-    <el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">
-        <div style="display: flex;align-items: center; margin-bottom: 20px ">
-          <el-input v-model="youhuiquan.name" placeholder="优惠券名称"></el-input>
-          <el-button type="primary" icon="el-icon-search" @click="getlistFavorable" >搜索</el-button>
-        </div>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%">
-        <el-table-column
-          prop="name"
-          label="卡券名称"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="券类型"
-          >
-          <template slot-scope="scope">
-            <span v-if="scope.row.discountType == 0" >满减券</span>
-            <span v-if="scope.row.discountType == 1"  >折扣券</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="券详情"
-         >
-          <template slot-scope="scope">
-            <span>{{scope.row.cardDetail}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="有效期（天）"
-          >
-          <template slot-scope="scope">
-            <span v-if="scope.row.timeType == 0" >{{scope.row.validityZero}}天 </span>
-            <span v-if="scope.row.timeType == 1" >{{scope.row.validityOne}}天 </span>
-            <span v-if="scope.row.timeType == 2" >{{scope.row.validityTwo}}天 </span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="address"
-          label="操作">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="chosedata(scope.row)"
-            >选择</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div><pagination
-        v-show="ytotal>0"
-        :total="ytotal"
-        :page.sync="youhuiquan.pageNum"
-        :limit.sync="youhuiquan.pageSize"
-        @pagination="getlistFavorable"
-      /></div>
-
-    </el-dialog>
-<!--    兑换券列表-->
-    <el-dialog title="兑换券列表" :visible.sync="dialogTableVisibledh">
-      <div style="display: flex;align-items: center; margin-bottom: 20px ">
-        <el-input v-model="duihuanquan.name" placeholder="兑换券名称"></el-input>
-        <el-button type="primary" icon="el-icon-search" @click="getlistExchange" >搜索</el-button>
-      </div>
-
-      <el-table
-        :data="tableDatadh"
-        border
-        style="width: 100%">
-        <el-table-column
-          prop="name"
-          label="卡券名称"
-         >
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="券类型"
-         >
-          <template slot-scope="scope">
-            <span v-if="scope.row.type == 0" >商品券</span>
-            <span v-if="scope.row.type == 1"  >洗车券</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="券详情"
-          width="80">
-          <template slot-scope="scope">
-            <span>{{scope.row.cardDetail}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="使用说明"
-          >
-          <template slot-scope="scope">
-            <span>{{scope.row.useInstructions}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="有效期（天）"
-          >
-          <template slot-scope="scope">
-            <span  >{{scope.row.validity}}天 </span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="address"
-          label="操作">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="Favorabledata(scope.row)"
-            >选择</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div><pagination
-        v-show="dtotal>0"
-        :total="dtotal"
-        :page.sync="duihuanquan.pageNum"
-        :limit.sync="duihuanquan.pageSize"
-        @pagination="getlistExchange"
-      /></div>
-    </el-dialog>
-<!--    实物列表-->
-    <el-dialog title="实物列表" :visible.sync="dialogTableVisiblesw">
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-            <el-form-item label="选择商品">
-              <el-select v-model="shopdata.goodsId" placeholder="请选择商品" @change="swchange">
-                <el-option :label="item.name" :value="item" v-for="(item,index) in tableDatasw" :key="item.id"></el-option>
+            <el-form-item label="适用时间段" prop="suitTimeSlotType">
+              <div>
+                <div class="icon-type" v-for="(item,index) in weekMonthTypeList" :key="index"
+                     :class="{ 'acvtive' : index === tindex3 }" @click="Typeindex3(index)">
+                  <img src="@/assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex3">
+                  <img src="@/assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex3">
+                  {{ item }}
+                  <el-checkbox-group v-model="weekDay" v-if="item=='每周'" style="margin-left: 20px"
+                                     :disabled="tindex3!=0">
+                    <el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
+                  </el-checkbox-group>
+                  <el-select v-model="monthDay" placeholder="请选择每月固定日期" multiple v-if="item=='每月'"
+                             :disabled="tindex3!=1"
+                             style="margin-left: 20px">
+                    <el-option
+                      v-for="item in 31"
+                      :key="item.value"
+                      :label="item+'日'"
+                      :value="item">
+                    </el-option>
+                  </el-select>
+                </div>
+              </div>
+              <div style="margin-top: 20px">
+                <el-form-item label="时间段" prop="suitTimeSlotFront">
+                  <el-time-picker
+                    v-model="ruleForm.suitTimeSlotFront"
+                    format="HH:mm"
+                    value-format="HH:mm"
+                    placeholder="请选择开始时间点">
+                  </el-time-picker>
+                  至
+                  <el-time-picker
+                    v-model="ruleForm.suitTimeSlotAfter"
+                    format="HH:mm"
+                    value-format="HH:mm"
+                    placeholder="请选择结束时间点">
+                  </el-time-picker>
+                </el-form-item>
+              </div>
+            </el-form-item>
+            <el-form-item label="适用会员等级" prop="region">
+              <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
               </el-select>
             </el-form-item>
-      <el-form-item label="商品数量" prop="nmb" >
-        <el-input-number v-model="shopdata.count" controls-position="right" :min="1" :max="9999"></el-input-number>
+            <el-form-item label="会员标签" prop="region">
+              <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="可使用支付方式" prop="type">
+              <el-checkbox-group v-model="ruleForm.type">
+                <el-checkbox label="美食/餐厅线上活动" name="type"></el-checkbox>
+                <el-checkbox label="地推活动" name="type"></el-checkbox>
+                <el-checkbox label="线下主题活动" name="type"></el-checkbox>
+                <el-checkbox label="单纯品牌曝光" name="type"></el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+            <el-form-item label="每人每天参与上限" prop="desc">
+              <el-input v-model="ruleForm.desc"></el-input>
+              <span style="color: grey;font-size: 12px">每个会员每天限制参与的次数，0标识不限</span>
+            </el-form-item>
+            <el-form-item label="每人每月参与上限" prop="desc">
+              <el-input v-model="ruleForm.desc"></el-input>
+              <span style="color: grey;font-size: 12px">每个会员每月限制参与的次数，0标识不限</span>
+            </el-form-item>
+            <el-form-item label="每人累计参与上限" prop="desc">
+              <el-input v-model="ruleForm.desc"></el-input>
+              <span style="color: grey;font-size: 12px">每个会员累计限制参与的次数，0标识不限</span>
+            </el-form-item>
+          </div>
+          <div style="width: 50%">
+            <el-form-item label="通知内容" prop="name">
+              <div>
+                <el-button type="text" @click="ifWrite = !ifWrite">编辑</el-button>
+              </div>
+              <el-input type="textarea" :disabled="ifWrite" v-model="ruleForm.name"
+                        placeholder="请输入通知内容"></el-input>
+            </el-form-item>
+            <el-form-item label="活动详情" prop="name">
+              <el-input type="textarea" v-model="ruleForm.name" placeholder="请输入活动详情"></el-input>
+            </el-form-item>
+            <el-form-item label="活动性质" prop="type">
+              <el-checkbox-group v-model="ruleForm.type">
+                <div style="display: flex;font-size: 14px">
+                  <el-checkbox value="0" name="type"><!--积分--></el-checkbox>
+                  <div style="margin-left: 10px">按</div>
+                  <el-select v-model="ruleForm.type" style="margin: 0 10px" placeholder="请选择">
+                    <el-option label="订单金额" value="0"></el-option>
+                    <el-option label="实收金额" value="1"></el-option>
+                    <el-option label="加油升数" value="2"></el-option>
+                  </el-select>
+                  <div>赠送积分</div>
+                  <img src="@/assets/images/tjb.png"
+                       style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
+                       @click="addPoints()">
+                </div>
 
-      </el-form-item>
-        <el-button
-          type="primary"
-          @click="shwdata()"
-        >确定</el-button>
+                <div v-for="(item,index) in pointList" :key="index" style="font-size: 14px">
+                  <span>消费满</span>
+                  <el-input placeholder="请输入消费金额" style="width: 30%" v-model="item.consumeAmount">
+                    <template slot="append">元</template>
+                  </el-input>
+                  <span>送</span>
+                  <el-input placeholder="请输入赠送积分" style="width: 30%" v-model="item.givePoints">
+                    <template slot="append">积分</template>
+                  </el-input>
+                  <img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;"
+                       @click="deletePoints(index)">
+                </div>
 
+                <el-checkbox label="成长值" name="type"></el-checkbox>
+                <el-checkbox label="优惠券" name="type"></el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </div>
+        </div>
+        <el-form-item style="text-align: center">
+          <el-button type="primary" @click="submitRuleForm('ruleForm')">立即创建</el-button>
+          <el-button @click="resetForm('ruleForm')">重置</el-button>
+        </el-form-item>
       </el-form>
-
-    </el-dialog>
+    </div>
   </div>
 </template>
 
@@ -662,61 +837,60 @@ import {
 } from "@/api/EventMarketing/activeConsumption";
 import {listUserGrade} from "@/api/staff/user/usergrade";
 import {getOilNameList} from "@/api/order/oilnumgun";
-import {updateExchange} from "@/api/EventMarketing/cardExchange";
 
 export default {
   name: "ActiveConsumption",
   data() {
     return {
-      opendetails:false,
-      looklist:[],
-      statisticsyou:{},
-      moneyList:[
-        {name:'订单金额',id:'1'},
-        {name:'实付金额',id:'2'}
+      opendetails: false,
+      looklist: [],
+      statisticsyou: {},
+      moneyList: [
+        {name: '订单金额', id: '1'},
+        {name: '实付金额', id: '2'}
       ],
-      labelPosition:'left',
-      userGradeList:[],
+      labelPosition: 'left',
+      userGradeList: [],
       // 油号列表
-      oilNameList:[],
-      pdidlist:[],//判断优惠券id
-      pddhidlist:[],//判断兑换券id
-      pdswidlist:[],//判断实物id
-      dialogTableVisible:false,//优惠券
-      dialogTableVisibledh:false,//兑换券
-      dialogTableVisiblesw:false,//实物
+      oilNameList: [],
+      pdidlist: [],//判断优惠券id
+      pddhidlist: [],//判断兑换券id
+      pdswidlist: [],//判断实物id
+      dialogTableVisible: false,//优惠券
+      dialogTableVisibledh: false,//兑换券
+      dialogTableVisiblesw: false,//实物
       tableData: [],//优惠券
-      tableDatadh:[],//兑换券
-      tableDatasw:[],//实物
-      tableDatas:[],//公共选择区域
-      tableData1:[],//公共选择区域
+      tableDatadh: [],//兑换券
+      tableDatasw: [],//实物
+      tableDatas: [],//公共选择区域
+      tableData1: [],//公共选择区域
       //请求优惠券列表时的参数
-      youhuiquan:{
-        name:'',
+      youhuiquan: {
+        name: '',
         pageNum: 1,
         pageSize: 10,
       },
-      ytotal:0,
+      ytotal: 0,
       //请求兑换券列表时的参数
-      duihuanquan:{
-        name:'',
+      duihuanquan: {
+        name: '',
         pageNum: 1,
         pageSize: 10,
-        total:0
+        total: 0
       },
-      dtotal:0,
+      dtotal: 0,
       //请求实物列表时的参数
-      shiwu:{
-        isRecovery:0,
+      shiwu: {
+        isRecovery: 0,
         page: 1,
         pageSize: 10,
       },
-      stotal:0,
-      shopdata:{
-        goodsId:'',
-        count:0,
+      stotal: 0,
+      shopdata: {
+        goodsId: '',
+        count: 0,
       },
-      oillist:['92#','95#','98#','0#','-10#','LNG','CNG','京92#','京95#','京0#',],
+      oillist: ['92#', '95#', '98#', '0#', '-10#', 'LNG', 'CNG', '京92#', '京95#', '京0#',],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -736,12 +910,12 @@ export default {
       // 是否显示弹出层
       open: false,
       // 查询参数
-      listFavorable:{
+      listFavorable: {
         pageNum: 1,
         pageSize: 10,
       },
-      listFavorablesw:{
-        isRecovery:0,
+      listFavorablesw: {
+        isRecovery: 0,
         page: 1,
         pageSize: 10,
       },
@@ -772,57 +946,82 @@ export default {
       },
       // 表单参数
       form: {
-        tableDatas:[],
-        shiwudata:[],
+        tableDatas: [],
+        shiwudata: [],
       },
+
+
+      ruleForm: {
+        name: '',
+        region: '',
+        date1: '',
+        date2: '',
+        delivery: false,
+        type: [],
+        resource: '',
+        desc: ''
+      },
+      ifWrite: true,
+      tindex1: 0,
+      activityTimeTypeList: [
+        "永久有效", "自定义"
+      ],
+      weekMonthTypeList: ["每周", "每月"],
+      tindex3: 0,
+      weekList: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+      weekDay: [],
+      monthDay: [],
+      pointList: [],
+      growthValueList: [],
+      couponList: [],
       // 表单校验
       rules: {
         adaptOil: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
-        moneyType:[
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+        moneyType: [
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         name: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         participationConditionMoney: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         activeStartTime: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         activeEndTime: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         adaptUserType: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ], dieselUserLevel: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ], gasolineUserLevel: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ], naturalUserLevel: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ], participationCondition: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ], participationAcount: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ], limitAcount: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ], activeGift: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         status: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         isonline: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         points: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         activeConsumptionChildList: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
       }
     };
@@ -834,6 +1033,63 @@ export default {
     this.listUserGrade()
   },
   methods: {
+    addPoints(orderType) {
+      let data = {
+        activeGift: 0,
+        orderType: orderType,
+        consumeAmount: "",
+        givePoints: "",
+      }
+      this.pointList.push(data)
+    },
+    deletePoints(index) {
+      this.pointList.splice(index, 1);
+    },
+    addGrowthValues(orderType) {
+      let data = {
+        activeGift: 3,
+        orderType: orderType,
+        consumeAmount: "",
+        giveGrowthValue: "",
+      }
+      this.growthValueList.push(data)
+    },
+    deleteGrowthValues(index) {
+      this.growthValueList.splice(index, 1);
+    },
+    addCoupons(orderType) {
+      let data = {
+        activeGift: 1,
+        orderType: orderType,
+        vouchersId: "",
+        giftCardTotal: "",
+      }
+      this.couponList.push(data)
+    },
+    deleteCoupons(index) {
+      this.couponList.splice(index, 1);
+    },
+    Typeindex1(index) {
+      this.tindex1 = index
+      this.ruleForm.activityTimeType = index
+    },
+    Typeindex3(index) {
+      this.tindex3 = index
+      this.ruleForm.suitTimeSlotType = index
+    },
+    submitRuleForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert('submit!');
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    },
     indexMethod(index) {
       return index * 2;
     },
@@ -847,43 +1103,43 @@ export default {
       });
     },
     //
-    lookDetail(row){
+    lookDetail(row) {
       this.opendetails = true
       let data = {
-        id:row.id,
-        exchangeFrom:"消费有礼"
+        id: row.id,
+        exchangeFrom: "消费有礼"
       }
-      looklook(data).then(res=>{
-        if(res.data){
+      looklook(data).then(res => {
+        if (res.data) {
           this.looklist = res.data
         }
 
 
-        console.log('详情',res)
+        console.log('详情', res)
       })
-      looklooklook(row.id).then(resp=>{
-        if( resp.data){
+      looklooklook(row.id).then(resp => {
+        if (resp.data) {
           this.statisticsyou = resp.data
         }
 
-        console.log('优惠券详情统计',resp)
+        console.log('优惠券详情统计', resp)
       })
     },
-    listUserGrade(){
-      listUserGrade().then(res=>{
-        if(res.code == 200){
+    listUserGrade() {
+      listUserGrade().then(res => {
+        if (res.code == 200) {
           this.userGradeList = res.data.records
         }
 
       })
     },
     // 获取油号名称
-    getName(oilNameList,ids){
+    getName(oilNameList, ids) {
       let name = ""
       let _this = this;
       ids.forEach(i => {
         oilNameList.forEach(item => {
-          if (item.id == i){
+          if (item.id == i) {
             name += item.oilName + ",";
           }
         })
@@ -891,34 +1147,34 @@ export default {
       return name;
     },
     // 查询油类
-    getoiltypeliet(){
-      getoiltype().then(res=>{
+    getoiltypeliet() {
+      getoiltype().then(res => {
         console.log(res)
       })
     },
     //
-    getoilName(){
-      getoilName().then(res=>{
+    getoilName() {
+      getoilName().then(res => {
         console.log(res)
         this.oillist = res.data
 
       })
 
-      getOilNameList().then( response => {
+      getOilNameList().then(response => {
         this.oilNameList = response.data;
       })
     },
-    swchange(e){
+    swchange(e) {
       console.log(this.shopdata)
     },
     // 请求实物
-    getlistLJGoods(){
+    getlistLJGoods() {
       this.tableDatasw = []
-      listLJGoods(this.shiwu).then(res=>{
-        if(res.code==200){
-          console.log( res)
+      listLJGoods(this.shiwu).then(res => {
+        if (res.code == 200) {
+          console.log(res)
           this.dialogTableVisiblesw = true
-          this.tableDatasw  = res.data.records
+          this.tableDatasw = res.data.records
           this.stotal = res.data.total
 
 
@@ -926,71 +1182,71 @@ export default {
       })
     },
     // 请求兑换券
-    getlistExchange(){
+    getlistExchange() {
       this.tableDatadh = []
-      listExchange(this.duihuanquan).then(res=>{
-        if(res.code==200){
+      listExchange(this.duihuanquan).then(res => {
+        if (res.code == 200) {
           this.dialogTableVisibledh = true
-          this.tableDatadh  = res.data.records
+          this.tableDatadh = res.data.records
           this.dtotal = res.data.total
         }
       })
 
     },
     // 请求优惠券
-    getlistFavorable(){
-          this.tableData = []
-      listFavorable(this.youhuiquan).then(res=>{
-        if(res.code == 200){
+    getlistFavorable() {
+      this.tableData = []
+      listFavorable(this.youhuiquan).then(res => {
+        if (res.code == 200) {
           this.dialogTableVisible = true
-          this.tableData  = res.data.records
+          this.tableData = res.data.records
           this.ytotal = res.data.total
         }
 
       })
     },
     // 实物选择处理
-    shwdata(){
+    shwdata() {
       this.dialogTableVisiblesw = false
-      if(this.pdswidlist.indexOf( this.shopdata.goodsId.id)>-1 ){
+      if (this.pdswidlist.indexOf(this.shopdata.goodsId.id) > -1) {
         this.$message.error("该商品已存在")
         return
       }
-      this.pdswidlist.push( this.shopdata.goodsId.id,)
+      this.pdswidlist.push(this.shopdata.goodsId.id,)
       let data = {
         activeGift: 4,
-        goodsIds : this.shopdata.goodsId.id,
+        goodsIds: this.shopdata.goodsId.id,
         goodsName: this.shopdata.goodsId.name,
 
-        goodsTotal:this.shopdata.count
+        goodsTotal: this.shopdata.count
       }
       this.form.shiwudata.push(data)
 
-      console.log( this.form.shiwudata)
+      console.log(this.form.shiwudata)
       this.shopdata = []
     },
     // 兑换券券列表选择
-    Favorabledata(row){
+    Favorabledata(row) {
       this.dialogTableVisibledh = false
-      if(this.pddhidlist.indexOf(row.id)>-1 ){
+      if (this.pddhidlist.indexOf(row.id) > -1) {
         this.$message.error("该兑换卡券已存在")
         return
       }
 
       this.pddhidlist.push(row.id)
       console.log(row)
-      let data ={
+      let data = {
         activeGift: 2, //活动奖品 0：赠送积分1：赠送优惠券 2. 赠送兑换券 3：赠送成长值 4. 赠送实物
         goodsIds: "", //商品id
-        goodsName:"" , //商品名称
+        goodsName: "", //商品名称
         goodsTotal: "", //商品数量
-        vouchersId:row.id, //券id
-        giftCardName:row.name, //赠送卡券名称
+        vouchersId: row.id, //券id
+        giftCardName: row.name, //赠送卡券名称
         giftCardType: row.type, //券类型
         validityZero: null,
         validityOne: null,
-        validityTwo:null,
-        validity:row.validity,
+        validityTwo: null,
+        validity: row.validity,
         giftCardDetail: row.cardDetail, //券详情
         giftCardTime: row.validity, //券有效期
         giftCardTotal: 1, //券数量
@@ -1001,27 +1257,27 @@ export default {
       this.$message.success("新增成功")
     },
     // 优惠券列表选择
-    chosedata(row){
+    chosedata(row) {
       this.dialogTableVisible = false
-      if(this.pdidlist.indexOf(row.id)>-1 ){
+      if (this.pdidlist.indexOf(row.id) > -1) {
         this.$message.error("该优惠卡券已存在")
         return
       }
 
       this.pdidlist.push(row.id)
 
-      let data ={
+      let data = {
         activeGift: 1, //活动奖品 0：赠送积分1：赠送优惠券 2. 赠送兑换券 3：赠送成长值 4. 赠送实物
         goodsIds: "", //商品id
-        goodsName:"" , //商品名称
+        goodsName: "", //商品名称
         goodsTotal: "", //商品数量
-        vouchersId:row.id, //券id
-        giftCardName:row.name, //赠送卡券名称
+        vouchersId: row.id, //券id
+        giftCardName: row.name, //赠送卡券名称
         giftCardType: row.discountType, //券类型
         timeType: row.timeType,
         validityZero: row.validityZero,
         validityOne: row.validityOne,
-        validityTwo:row.validityTwo,
+        validityTwo: row.validityTwo,
         giftCardDetail: row.cardDetail, //券详情
         giftCardTime: "", //券有效期
         giftCardTotal: 1,//券数量
@@ -1035,50 +1291,50 @@ export default {
 
     },
     // 优惠券删除
-    deletedata(row){
-      if(this.tableData1&&this.tableData1.length>0){
-        let delIdx=-1;
-        for ( let item of this.tableData1) {
-            delIdx++;
-          if (item.id===row.id){
+    deletedata(row) {
+      if (this.tableData1 && this.tableData1.length > 0) {
+        let delIdx = -1;
+        for (let item of this.tableData1) {
+          delIdx++;
+          if (item.id === row.id) {
             break
           }
         }
-        this.pdidlist.splice(delIdx,1);
-        this.tableData1.splice(delIdx,1);
+        this.pdidlist.splice(delIdx, 1);
+        this.tableData1.splice(delIdx, 1);
 
 
       }
     },
     // 兑换券删除
-    deletedhdata(row){
-      if(this.tableDatas&&this.tableDatas.length>0){
-        let delIdx=-1;
-        for ( let item of this.tableDatas) {
+    deletedhdata(row) {
+      if (this.tableDatas && this.tableDatas.length > 0) {
+        let delIdx = -1;
+        for (let item of this.tableDatas) {
           delIdx++;
-          if (item.id===row.id){
+          if (item.id === row.id) {
             break
           }
         }
-        this.pddhidlist.splice(delIdx,1);
-        this.tableDatas.splice(delIdx,1);
+        this.pddhidlist.splice(delIdx, 1);
+        this.tableDatas.splice(delIdx, 1);
 
 
       }
     },
     // 实物删除
-    deleteswdata(row){
+    deleteswdata(row) {
 
-      if( this.form.shiwudata&& this.form.shiwudata.length>0){
-        let delIdx=-1;
-        for ( let item of  this.form.shiwudata) {
+      if (this.form.shiwudata && this.form.shiwudata.length > 0) {
+        let delIdx = -1;
+        for (let item of this.form.shiwudata) {
           delIdx++;
-          if (item.id===row.id){
+          if (item.id === row.id) {
             break
           }
         }
-        this.pdswidlist.splice(delIdx,1);
-        this.form.shiwudata.splice(delIdx,1);
+        this.pdswidlist.splice(delIdx, 1);
+        this.form.shiwudata.splice(delIdx, 1);
 
 
       }
@@ -1086,11 +1342,11 @@ export default {
     // 取消按钮
     cancel() {
       this.pdswidlist = []
-      this.form.shiwudata= []
-      this.pddhidlist= []
-      this.tableDatas= []
-      this.pdidlist= []
-      this.form.tableDatas= []
+      this.form.shiwudata = []
+      this.pddhidlist = []
+      this.tableDatas = []
+      this.pdidlist = []
+      this.form.tableDatas = []
       this.open = false;
       this.reset();
     },
@@ -1121,17 +1377,17 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        tableDatas:[],
-        shiwudata:[],
+        tableDatas: [],
+        shiwudata: [],
         updateTime: null,
-        activeConsumptionChildList:[]
+        activeConsumptionChildList: []
       };
       this.pdswidlist = []
-      this.form.shiwudata= []
-      this.pddhidlist= []
-      this.tableDatas= []
-      this.pdidlist= []
-      this.form.tableDatas= []
+      this.form.shiwudata = []
+      this.pddhidlist = []
+      this.tableDatas = []
+      this.pdidlist = []
+      this.form.tableDatas = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -1143,27 +1399,27 @@ export default {
     resetQuery() {
       this.queryParams = {
         pageNum: 1,
-          pageSize: 10,
-          chainStorId: null,
-          storeId: null,
-          name: null,
-          participationConditionMoney: null,
-          activeStartTime: null,
-          activeEndTime: null,
-          adaptOil: [],
-          adaptUserType: null,
-          memberType: null,
-          dieselUserLevel: null,
-          gasolineUserLevel: null,
-          naturalUserLevel: null,
-          paymentType: null,
-          participationCondition: null,
-          participationAcount: null,
-          limitAcount: null,
-          activeGift: [],
-          points: null,
-          status: null,
-          isonline: null,
+        pageSize: 10,
+        chainStorId: null,
+        storeId: null,
+        name: null,
+        participationConditionMoney: null,
+        activeStartTime: null,
+        activeEndTime: null,
+        adaptOil: [],
+        adaptUserType: null,
+        memberType: null,
+        dieselUserLevel: null,
+        gasolineUserLevel: null,
+        naturalUserLevel: null,
+        paymentType: null,
+        participationCondition: null,
+        participationAcount: null,
+        limitAcount: null,
+        activeGift: [],
+        points: null,
+        status: null,
+        isonline: null,
       }
       this.resetForm("queryForm");
       this.handleQuery();
@@ -1171,7 +1427,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -1190,7 +1446,7 @@ export default {
       getActiveConsumption(id).then(response => {
         this.form = response.data;
         if (!response.data.activeGift) this.form.activeGift = ""
-        if(response.data.activeConsumptionChildList && response.data.activeConsumptionChildList.length >0){
+        if (response.data.activeConsumptionChildList && response.data.activeConsumptionChildList.length > 0) {
           this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
           this.tableData1 = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
           this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2')
@@ -1201,7 +1457,7 @@ export default {
         this.title = "修改消费有礼活动";
       });
     },
-    handleDeletexia(row){
+    handleDeletexia(row) {
       // getActiveConsumption(row.id).then(response => {
       //   // this.form = response.data;
       //   let data = response.data
@@ -1214,16 +1470,17 @@ export default {
       //
       // });
 
-      this.$modal.confirm('确定下线此条修改消费有礼活动信息？').then(function() {
-        return editActiveConsumption({id:row.id,isonline:1});
+      this.$modal.confirm('确定下线此条修改消费有礼活动信息？').then(function () {
+        return editActiveConsumption({id: row.id, isonline: 1});
       }).then(() => {
         this.$modal.msgSuccess("下线成功");
         this.open = false;
         this.getList();
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
-    qiyong(row){
-      if(row.isonline == 1){
+    qiyong(row) {
+      if (row.isonline == 1) {
         this.$message.error("下线不可进行操作")
         return
       }
@@ -1239,8 +1496,8 @@ export default {
 
       });
     },
-    jinyong(row){
-      if(row.isonline == 1){
+    jinyong(row) {
+      if (row.isonline == 1) {
         this.$message.error("下线不可进行操作")
         return
       }
@@ -1286,15 +1543,16 @@ export default {
         }
       });
     },
-    Deleteshan(row){
+    Deleteshan(row) {
 
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除此项消费有礼活动？').then(function() {
-          return delActiveConsumption(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除此项消费有礼活动？').then(function () {
+        return delActiveConsumption(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
 
     },
     /** 删除按钮操作 */
@@ -1309,18 +1567,48 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-.box-bt{
+.box-bt {
   width: 100%;
   display: flex;
   justify-content: space-between;
   align-items: center;
   font-size: 18px;
 }
-.x-box{
+
+.x-box {
   background: #f9f9f9;
   border-radius: 6px;
   box-sizing: border-box;
   padding: 15px;
   width: 45%;
 }
+
+.cot-box {
+  width: 100%;
+  border-radius: 8px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 20px;
+  margin: 0 auto;
+}
+
+.d-s {
+  display: flex;
+  align-items: center;
+}
+
+.icon-type {
+  display: flex;
+  align-items: center;
+  font-weight: 400;
+  font-size: 14px;
+  color: #999999;
+  margin-right: 20px;
+  cursor: pointer;
+}
+
+.acvtive {
+  color: #FF770F !important;
+}
+
 </style>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java
index 8edf9843f..4b60ef6fe 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java
@@ -110,6 +110,25 @@ public class ActiveConsumptionController extends BaseController {
         return getSuccessResult(this.activeConsumptionService.add(activeConsumptionDTO));
     }
 
+    /**
+     * 新增数据
+     *
+     * @param activeConsumption 实体对象
+     * @return 新增结果
+     */
+    @PostMapping("add")
+    public ResponseObject add(@RequestBody ActiveConsumption activeConsumption) {
+        try {
+            SysLog sysLog =new SysLog();
+            sysLog.setSystemName("2");
+            sysLog.setMoudle("营销中心");
+            sysLog.setContent("新增名称为"+activeConsumption.getName()+"消费有礼活动");
+            sysLogService.saveVo(sysLog);
+        }catch (Exception ignored){}
+
+        return getSuccessResult(this.activeConsumptionService.insertActiveConsumption(activeConsumption));
+    }
+
     /**
      * 修改数据
      *
@@ -219,5 +238,15 @@ public class ActiveConsumptionController extends BaseController {
         return getSuccessResult(this.activeConsumptionChildService.detailCount(id));
     }
 
+    /**
+     * 统计
+     *
+     * @return 单条数据
+     */
+    @GetMapping("/getInfo")
+    public ResponseObject selectByStoreId() {
+        return getSuccessResult(this.activeConsumptionService.selectByStoreId());
+    }
+
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java
index c39afdc2e..e56f749e5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java
@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 消费有礼活动(ActiveConsumption)表实体类
@@ -36,10 +37,10 @@ public class ActiveConsumption extends Model<ActiveConsumption> {
     //满足金额
     private Double participationConditionMoney;
     //活动开始时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date activeStartTime;
     //活动结束时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date activeEndTime;
     //适用油品0：92# 1: 95# 2：98# 3：0# 4：-10# 5： LNG 6；CNG 7：京92# 8：京95# 9：京0#
     private String adaptOil;
@@ -72,15 +73,76 @@ public class ActiveConsumption extends Model<ActiveConsumption> {
     //创建者
     private String createBy;
     //创建时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
     //更新者
     private String updateBy;
     //更新时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
     //描述信息
     @TableField(exist = false)
     private String exchangeFrom;
-    }
+    /**
+     *活动时间类型：0永久有效；1自定义
+     */
+    private String activityTimeType;
+    /**
+     *活动时间前
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date activityTimeFront;
+    /**
+     *活动时间后
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date activityTimeAfter;
+    /**
+     *适用时间段类型：0每周、1每月
+     */
+    private String suitTimeSlotType;
+    /**
+     *适用时间段：周/月
+     */
+    private String suitDate;
+    /**
+     *适用时间段前
+     */
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
+    private Date suitTimeSlotFront;
+    /**
+     *适用时间段后
+     */
+    @JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
+    private Date suitTimeSlotAfter;
+    /**
+     *会员标签id
+     */
+    private String userLabelIds;
+    /**
+     *每人每天参与上限
+     */
+    private String everyDayCeiling;
+    /**
+     *每人每月参与上限
+     */
+    private Integer monthlyCeiling;
+    /**
+     *每人累计参与上限
+     */
+    private Integer accumulateCeiling;
+    /**
+     *通知内容
+     */
+    private String noticeContent;
+    /**
+     *活动详情
+     */
+    private String activityDetails;
+    /**
+     * 活动奖品子表信息
+     */
+    @TableField(exist = false)
+    private List<ActiveConsumptionChild> activityPrize;
+}
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumptionChild.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumptionChild.java
index a3da2c07c..369f0370f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumptionChild.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumptionChild.java
@@ -86,4 +86,20 @@ public class    ActiveConsumptionChild {
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date updateTime;
+    /**
+     *订单类型：0订单金额、1实收金额、3加油升数
+     */
+    private String orderType;
+    /**
+     *消费金额
+     */
+    private String consumeAmount;
+    /**
+     *赠送积分
+     */
+    private String givePoints;
+    /**
+     *赠送成长值
+     */
+    private String giveGrowthValue;
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionService.java
index 4d35a1e1c..d2c049180 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionService.java
@@ -63,5 +63,13 @@ public interface ActiveConsumptionService extends IService<ActiveConsumption> {
      * @return
      */
     List<ActiveConsumptionAppletVO> selectAllApplet(ActiveConsumption activeConsumption);
+
+    /**
+     * 根据storeId查询消费有礼信息
+     * @return
+     */
+    ActiveConsumption selectByStoreId();
+
+    int insertActiveConsumption(ActiveConsumption activeConsumption);
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
index 427f4ab1c..38b921c4c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
@@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.activeConsumption.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -109,6 +110,9 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
     @Override
     @Transactional
     public Boolean add(ActiveConsumptionDTO activeConsumptionDTO) {
+        ActiveConsumption activeConsumption1 = selectByStoreId();
+        if (ObjectUtil.isNotEmpty(activeConsumption1)) return false;
+
         boolean save = false;
         ActiveApplet activeApplet = new ActiveApplet();
         activeApplet.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
@@ -560,6 +564,34 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
         return appletVOList;
     }
 
+    @Override
+    public ActiveConsumption selectByStoreId() {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+        ActiveConsumption activeConsumption = baseMapper.selectOne(queryWrapper);
+        List<ActiveConsumptionChild> activeConsumptionChildren = activeConsumptionChildService.selectList(activeConsumption.getId());
+        activeConsumption.setActivityPrize(activeConsumptionChildren);
+        return activeConsumption;
+    }
+
+    @Override
+    public int insertActiveConsumption(ActiveConsumption activeConsumption) {
+        ActiveConsumption activeConsumption1 = selectByStoreId();
+        if (ObjectUtil.isNotEmpty(activeConsumption1)){
+            return 0;
+        }
+        int row = baseMapper.insert(activeConsumption);
+        activeConsumption1 = selectByStoreId();
+        if (ObjectUtil.isNotEmpty(activeConsumption.getActivityPrize())){
+            for (ActiveConsumptionChild activeConsumptionChild : activeConsumption.getActivityPrize()) {
+                activeConsumptionChild.setActiveConsumptionId(activeConsumption1.getId());
+                activeConsumptionChildService.save(activeConsumptionChild);
+            }
+        }
+        return row;
+    }
+
     /**
      * 数组转字符串
      * @param array
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
index 1b6462744..de2ac2323 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
@@ -194,5 +194,10 @@ public class ActiveNewlywedsController extends BaseController {
         }catch (Exception ignored){}
         return getSuccessResult(activeNewlywedsChildService.removeByIds(idList));
     }
+
+    @GetMapping("getInfo")
+    public ResponseObject selectByStoreId(){
+        return getSuccessResult(activeNewlywedsService.selectByStoreId());
+    }
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlyweds.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlyweds.java
index 036fe30a2..b1aafcb19 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlyweds.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlyweds.java
@@ -3,11 +3,15 @@ package com.fuint.business.marketingActivity.activeNewlyweds.entity;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 新人有礼活动(ActiveNewlyweds)表实体类
@@ -16,6 +20,8 @@ import java.io.Serializable;
  * @since 2023-11-13 13:15:58
  */
 @SuppressWarnings("serial")
+@Data
+@TableName("active_newlyweds")
 public class ActiveNewlyweds extends Model<ActiveNewlyweds> {
     //主键id
     @TableId(type = IdType.AUTO)
@@ -26,11 +32,13 @@ public class ActiveNewlyweds extends Model<ActiveNewlyweds> {
     private Integer storeId;
     //活动名称
     private String name;
+    //活动时间类型：0永久有效；1自定义
+    private String activeTimeType;
     //活动开始时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date activeStartTime;
     //活动结束时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date activeEndTime;
     //有礼奖励 0：优惠券 1：兑换券 2：成长值 3：积分
     private String courtesyReward;
@@ -51,13 +59,23 @@ public class ActiveNewlyweds extends Model<ActiveNewlyweds> {
     //创建者
     private String createBy;
     //创建时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
     //更新者
     private String updateBy;
     //更新时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
+    //通知内容
+    private String noticeContent;
+    //活动详情
+    private String activityDetails;
+
+    /**
+     * 优惠券列表信息
+     */
+    @TableField(exist = false)
+    private List<ActiveNewlywedsChild> couponList;
 
     public String getActiveCode() {
         return activeCode;
@@ -212,5 +230,5 @@ public class ActiveNewlyweds extends Model<ActiveNewlyweds> {
     protected Serializable pkVal() {
         return this.id;
     }
-    }
+}
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlywedsChild.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlywedsChild.java
index 43495c3a5..f71b29383 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlywedsChild.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/entity/ActiveNewlywedsChild.java
@@ -4,6 +4,7 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -18,6 +19,7 @@ import java.io.Serializable;
  */
 @SuppressWarnings("serial")
 @Data
+@TableName("active_newlyweds_child")
 public class ActiveNewlywedsChild extends Model<ActiveNewlywedsChild> {
     //主键id
     @TableId(type = IdType.AUTO)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsChildService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsChildService.java
index 6ce345953..ac5111770 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsChildService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsChildService.java
@@ -3,6 +3,8 @@ package com.fuint.business.marketingActivity.activeNewlyweds.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.business.marketingActivity.activeNewlyweds.entity.ActiveNewlywedsChild;
 
+import java.util.List;
+
 /**
  * 新人有礼活动子表(ActiveNewlywedsChild)表服务接口
  *
@@ -10,6 +12,11 @@ import com.fuint.business.marketingActivity.activeNewlyweds.entity.ActiveNewlywe
  * @since 2023-11-13 13:17:14
  */
 public interface ActiveNewlywedsChildService extends IService<ActiveNewlywedsChild> {
-
+    /**
+     * 根据新人有礼id查询子表列表信息
+     * @param activeNewlywedsId
+     * @return
+     */
+    List<ActiveNewlywedsChild> selectByActiveId(Integer activeNewlywedsId);
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsService.java
index ab91bc2e0..a5094e2c2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsService.java
@@ -64,5 +64,11 @@ public interface ActiveNewlywedsService extends IService<ActiveNewlyweds> {
      * @return
      */
     List<ActiveNewlywedsAppletVO> selectApplet(ActiveConsumption activeConsumption);
+
+    /**
+     * 根据店铺id查询新人有礼信息
+     * @return
+     */
+    ActiveNewlyweds selectByStoreId();
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsChildServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsChildServiceImpl.java
index deac2b1cd..cb9f16c72 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsChildServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsChildServiceImpl.java
@@ -1,12 +1,15 @@
 package com.fuint.business.marketingActivity.activeNewlyweds.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.marketingActivity.activeNewlyweds.entity.ActiveNewlywedsChild;
 import com.fuint.business.marketingActivity.activeNewlyweds.mapper.ActiveNewlywedsChildMapper;
 import com.fuint.business.marketingActivity.activeNewlyweds.service.ActiveNewlywedsChildService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 新人有礼活动子表(ActiveNewlywedsChild)表服务实现类
  *
@@ -16,5 +19,11 @@ import org.springframework.stereotype.Service;
 @Service("activeNewlywedsChildService")
 public class ActiveNewlywedsChildServiceImpl extends ServiceImpl<ActiveNewlywedsChildMapper, ActiveNewlywedsChild> implements ActiveNewlywedsChildService {
 
+    @Override
+    public List<ActiveNewlywedsChild> selectByActiveId(Integer activeNewlywedsId) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("active_newlyweds_id",activeNewlywedsId);
+        return baseMapper.selectList(queryWrapper);
+    }
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java
index d8004d83e..d54c128a0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java
@@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.activeNewlyweds.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -81,6 +82,10 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl<ActiveNewlywedsMappe
     @Override
     @Transactional
     public Boolean add(ActiveNewlywedsDTO activeNewlywedsDTO) {
+//        查看是否存在活动，存在则返回
+        ActiveNewlyweds activeNewlyweds1 = selectByStoreId();
+        if (ObjectUtil.isNotEmpty(activeNewlyweds1)) return false;
+
         boolean save = false;
         ActiveApplet activeApplet = new ActiveApplet();
         activeApplet.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
@@ -640,6 +645,18 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl<ActiveNewlywedsMappe
         return arrayList;
     }
 
+    @Override
+    public ActiveNewlyweds selectByStoreId() {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("store_id",TokenUtil.getNowAccountInfo().getStoreId());
+        ActiveNewlyweds activeNewlyweds = baseMapper.selectOne(queryWrapper);
+        if (ObjectUtil.isNotEmpty(activeNewlyweds)) {
+            List<ActiveNewlywedsChild> activeNewlywedsChildren = activeNewlywedsChildService.selectByActiveId(activeNewlyweds.getId());
+            activeNewlyweds.setCouponList(activeNewlywedsChildren);
+        }
+        return activeNewlyweds;
+    }
+
     /**
      * 数组转字符串
      * @param array

From a306c1a55c6e14e06c1ce845e48256d6658eb4c1 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 28 Aug 2024 16:26:18 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activeConsumption/index.vue               | 83 ++++++++++++++++---
 .../src/views/EventMarketing/center/index.vue |  8 +-
 2 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index d3171ada7..1896be5a1 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -745,10 +745,12 @@
             </el-form-item>
             <el-form-item label="可使用支付方式" prop="type">
               <el-checkbox-group v-model="ruleForm.type">
-                <el-checkbox label="美食/餐厅线上活动" name="type"></el-checkbox>
-                <el-checkbox label="地推活动" name="type"></el-checkbox>
-                <el-checkbox label="线下主题活动" name="type"></el-checkbox>
-                <el-checkbox label="单纯品牌曝光" name="type"></el-checkbox>
+                <el-checkbox
+                  v-for="dict in dict.type.payment_type"
+                  v-if="dict.value!='APPLET_CODE'"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"></el-checkbox>
               </el-checkbox-group>
             </el-form-item>
             <el-form-item label="每人每天参与上限" prop="desc">
@@ -775,9 +777,9 @@
             <el-form-item label="活动详情" prop="name">
               <el-input type="textarea" v-model="ruleForm.name" placeholder="请输入活动详情"></el-input>
             </el-form-item>
-            <el-form-item label="活动性质" prop="type">
+            <el-form-item label="活动奖品" prop="type">
               <el-checkbox-group v-model="ruleForm.type">
-                <div style="display: flex;font-size: 14px">
+                <div style="display: flex;font-size: 14px;margin: 15px 0">
                   <el-checkbox value="0" name="type"><!--积分--></el-checkbox>
                   <div style="margin-left: 10px">按</div>
                   <el-select v-model="ruleForm.type" style="margin: 0 10px" placeholder="请选择">
@@ -791,28 +793,84 @@
                        @click="addPoints()">
                 </div>
 
-                <div v-for="(item,index) in pointList" :key="index" style="font-size: 14px">
+                <div v-for="(item,index) in pointList" :key="index" style="font-size: 14px;margin: 15px 0">
                   <span>消费满</span>
-                  <el-input placeholder="请输入消费金额" style="width: 30%" v-model="item.consumeAmount">
+                  <el-input placeholder="请输入消费金额" style="width: 30%;margin: 0 10px" v-model="item.consumeAmount">
                     <template slot="append">元</template>
                   </el-input>
                   <span>送</span>
-                  <el-input placeholder="请输入赠送积分" style="width: 30%" v-model="item.givePoints">
+                  <el-input placeholder="请输入赠送积分" style="width: 30%;margin: 0 10px" v-model="item.givePoints">
                     <template slot="append">积分</template>
                   </el-input>
                   <img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;"
                        @click="deletePoints(index)">
                 </div>
 
-                <el-checkbox label="成长值" name="type"></el-checkbox>
-                <el-checkbox label="优惠券" name="type"></el-checkbox>
+                <div style="display: flex;font-size: 14px;margin: 15px 0">
+                  <el-checkbox value="3" name="type"><!--成长值--></el-checkbox>
+                  <div style="margin-left: 10px">按</div>
+                  <el-select v-model="ruleForm.type" style="margin: 0 10px" placeholder="请选择">
+                    <el-option label="订单金额" value="0"></el-option>
+                    <el-option label="实收金额" value="1"></el-option>
+                    <el-option label="加油升数" value="2"></el-option>
+                  </el-select>
+                  <div>赠送成长值</div>
+                  <img src="@/assets/images/tjb.png"
+                       style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
+                       @click="addGrowthValues()">
+                </div>
+
+                <div v-for="(item,index) in growthValueList" :key="index" style="font-size: 14px;margin: 15px 0">
+                  <span>消费满</span>
+                  <el-input placeholder="请输入消费金额" style="width: 30%;margin: 0 10px" v-model="item.consumeAmount">
+                    <template slot="append">元</template>
+                  </el-input>
+                  <span>送</span>
+                  <el-input placeholder="请输入赠送成长值" style="width: 30%;margin: 0 10px" v-model="item.givePoints">
+                    <template slot="append">成长值</template>
+                  </el-input>
+                  <img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;"
+                       @click="deleteGrowthValues(index)">
+                </div>
+
+                <div style="display: flex;font-size: 14px;margin: 15px 0">
+                  <el-checkbox value="1" name="type"><!--优惠券--></el-checkbox>
+                  <div style="margin-left: 10px">按</div>
+                  <el-select v-model="ruleForm.type" style="margin: 0 10px" placeholder="请选择">
+                    <el-option label="订单金额" value="0"></el-option>
+                    <el-option label="实收金额" value="1"></el-option>
+                    <el-option label="加油升数" value="2"></el-option>
+                  </el-select>
+                  <div>赠送优惠券</div>
+                  <img src="@/assets/images/tjb.png"
+                       style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
+                       @click="addCoupons()">
+                </div>
+
+                <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0">
+                  <span>消费满</span>
+                  <el-input placeholder="请输入消费金额" style="width: 30%;margin: 0 10px" v-model="item.consumeAmount">
+                    <template slot="append">元</template>
+                  </el-input>
+                  <span>送</span>
+                  <el-select v-model="ruleForm.type" style="margin-left: 10px;width: 15%" placeholder="请选择">
+                    <el-option label="优惠券" value="0"></el-option>
+                    <el-option label="实收金额" value="1"></el-option>
+                    <el-option label="加油升数" value="2"></el-option>
+                  </el-select>
+                  <el-input placeholder="请输入赠送积分" style="width: 15%;margin: 0 10px" v-model="item.givePoints">
+                    <template slot="append">张</template>
+                  </el-input>
+                  <img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;"
+                       @click="deleteCoupons(index)">
+                </div>
               </el-checkbox-group>
             </el-form-item>
           </div>
         </div>
         <el-form-item style="text-align: center">
-          <el-button type="primary" @click="submitRuleForm('ruleForm')">立即创建</el-button>
           <el-button @click="resetForm('ruleForm')">重置</el-button>
+          <el-button type="primary" @click="submitRuleForm('ruleForm')">保存</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -840,6 +898,7 @@ import {getOilNameList} from "@/api/order/oilnumgun";
 
 export default {
   name: "ActiveConsumption",
+  dicts: ['payment_type'],
   data() {
     return {
       opendetails: false,
diff --git a/fuintAdmin/src/views/EventMarketing/center/index.vue b/fuintAdmin/src/views/EventMarketing/center/index.vue
index d23ea0794..cfc5675eb 100644
--- a/fuintAdmin/src/views/EventMarketing/center/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/center/index.vue
@@ -24,7 +24,7 @@
               <div class="nr-bottom">
                 <div class="left-bt">进行中1个</div>
                 |
-                <div class="right-bt">创建活动</div>
+                <div class="right-bt" @click="gobox(4)">创建活动</div>
               </div>
             </div>
 
@@ -53,7 +53,7 @@
               <div class="nr-bottom">
                 <div class="left-bt">进行中1个</div>
                 |
-                <div class="right-bt">创建活动</div>
+                <div class="right-bt" @click="gobox(1)">创建活动</div>
               </div>
             </div>
             <div class="nr-box">
@@ -117,8 +117,8 @@
               <div class="nr-top">
                 <img src="./imgs/营销@2x.png" >
                 <div>
-                  <div class="size_title">开卡有礼</div>
-                  <div class="size_text">激活会员卡，享受优惠</div>
+                  <div class="size_title">弹窗营销</div>
+                  <div class="size_text">支付前定向投放优惠</div>
                 </div>
               </div>
               <div class="nr-bottom">

From 182b95d5229cc97e5a67d3166d8936c33bab5778 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 29 Aug 2024 09:00:21 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/EventMarketing/activeNewlyweds.js |    8 +
 .../activeConsumption/index.vue               |    4 +-
 .../EventMarketing/activeNewlyweds/index.vue  | 1439 ++++++++++-------
 3 files changed, 837 insertions(+), 614 deletions(-)

diff --git a/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js b/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
index 3222b39d5..21e384389 100644
--- a/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
+++ b/fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
@@ -68,3 +68,11 @@ export function delActiveNewlyweds(id) {
     method: 'delete'
   })
 }
+
+// 删除新人有礼活动
+export function getInfoActiveNewlyweds() {
+  return request({
+    url: '/business/marketingActivity/activeNewlyweds/getInfo',
+    method: 'get'
+  })
+}
diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 1896be5a1..d9af066c9 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -681,7 +681,7 @@
                   type="date"
                   placeholder="开始日期">
                 </el-date-picker>
-                至
+                <span style="margin: 0 5px">至</span>
                 <el-date-picker
                   v-model="ruleForm.activityTimeAfter"
                   style="width: 160px"
@@ -858,7 +858,7 @@
                     <el-option label="实收金额" value="1"></el-option>
                     <el-option label="加油升数" value="2"></el-option>
                   </el-select>
-                  <el-input placeholder="请输入赠送积分" style="width: 15%;margin: 0 10px" v-model="item.givePoints">
+                  <el-input style="width: 15%;margin: 0 10px" v-model="item.givePoints">
                     <template slot="append">张</template>
                   </el-input>
                   <img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;"
diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index 21fde59ae..394a6956b 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -1,528 +1,639 @@
 <template>
   <div class="app-container">
-    <el-card style="margin-bottom: 20px">
-      <el-breadcrumb separator="/" style="margin-bottom: 35px">
-        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/EventMarketing/center/index' }" >活动中心</el-breadcrumb-item>
-        <el-breadcrumb-item>新人有礼</el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <div>
+      <!--      <el-card style="margin-bottom: 20px">-->
+      <!--        <el-breadcrumb separator="/" style="margin-bottom: 35px">-->
+      <!--          <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>-->
+      <!--          <el-breadcrumb-item :to="{ path: '/EventMarketing/center/index' }">活动中心</el-breadcrumb-item>-->
+      <!--          <el-breadcrumb-item>新人有礼</el-breadcrumb-item>-->
+      <!--        </el-breadcrumb>-->
+      <!--        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"-->
+      <!--                 label-width="100px">-->
 
-        <el-form-item label="" prop="name">
-          <div style="width: 220px">   <el-input
-            v-model="queryParams.name"
-            placeholder="活动名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          /></div>
+      <!--          <el-form-item label="" prop="name">-->
+      <!--            <div style="width: 220px">-->
+      <!--              <el-input-->
+      <!--                v-model="queryParams.name"-->
+      <!--                placeholder="活动名称"-->
+      <!--                clearable-->
+      <!--                @keyup.enter.native="handleQuery"-->
+      <!--              />-->
+      <!--            </div>-->
 
-        </el-form-item>
-<!--        <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="isonline">
-          <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 style="float: right">
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="" prop="isonline">-->
+      <!--            <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 style="float: right">-->
+      <!--            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
+      <!--            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>-->
 
-        </el-form-item>
-      </el-form>
+      <!--          </el-form-item>-->
+      <!--        </el-form>-->
 
-    </el-card>
+      <!--      </el-card>-->
 
-    <el-dialog :title="title" :visible.sync="open" width="55%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">
+      <!--      <el-dialog :title="title" :visible.sync="open" width="55%" append-to-body>-->
+      <!--        <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="110px">-->
+      <!--          <el-form-item label="活动名称" prop="name">-->
+      <!--            <div style="width: 220px">-->
+      <!--              <el-input v-model="form.name" placeholder="请输入活动名称"/>-->
+      <!--            </div>-->
+
+      <!--          </el-form-item>-->
+      <!--          <el-row :gutter="20">-->
+      <!--            <el-col :span="12">-->
+      <!--              <el-form-item label="活动开始时间" prop="activeStartTime">-->
+      <!--                <el-date-picker clearable-->
+      <!--                                v-model="form.activeStartTime"-->
+      <!--                                type="datetime"-->
+      <!--                                value-format="yyyy-MM-dd HH:mm:ss"-->
+      <!--                                placeholder="请选择活动开始时间">-->
+      <!--                </el-date-picker>-->
+      <!--              </el-form-item>-->
+      <!--            </el-col>-->
+      <!--            <el-col :span="12">-->
+      <!--              <el-form-item label="活动结束时间" prop="activeEndTime">-->
+      <!--                <el-date-picker clearable-->
+      <!--                                v-model="form.activeEndTime"-->
+      <!--                                type="datetime"-->
+      <!--                                value-format="yyyy-MM-dd HH:mm:ss"-->
+      <!--                                placeholder="请选择活动结束时间">-->
+      <!--                </el-date-picker>-->
+      <!--              </el-form-item>-->
+      <!--            </el-col>-->
+      <!--          </el-row>-->
+      <!--          <el-form-item label="有礼奖励" prop="courtesyReward">-->
+      <!--            <el-checkbox-group v-model="form.courtesyReward">-->
+      <!--              <el-checkbox label="1">赠送优惠券</el-checkbox>-->
+      <!--              <el-checkbox label="2">赠送兑换券</el-checkbox>-->
+      <!--            </el-checkbox-group>-->
+      <!--          </el-form-item>-->
+      <!--          &lt;!&ndash;        选择优惠券&ndash;&gt;-->
+      <!--          <div class="xh-box" v-if="form.courtesyReward && form.courtesyReward.indexOf('1')>-1  ">-->
+      <!--            <div class="box-bt">-->
+      <!--              <div>赠送卡券</div>-->
+      <!--              <el-button type="primary" icon="el-icon-plus" @click="getlistFavorable()">新增</el-button>-->
+      <!--            </div>-->
+      <!--            <div style="margin: 10px 0px">-->
+      <!--              <el-table-->
+      <!--                :data="form.tableDatas"-->
+      <!--                border-->
+      <!--                style="width: 100%">-->
+      <!--                <el-table-column-->
+      <!--                  prop="giftCardName"-->
+      <!--                  label="卡券名称"-->
+      <!--                >-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="giftCardType"-->
+      <!--                  label="券类型"-->
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span v-if="scope.row.giftCardType == 0">满减券</span>-->
+      <!--                    <span v-if="scope.row.giftCardType == 1">折扣券</span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="券详情"-->
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span>{{ scope.row.giftCardDetail }}</span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="instruction"-->
+      <!--                  label="使用说明"-->
+      <!--                >-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="有效期（天）"-->
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span v-if="scope.row.timeType == 0"> {{ scope.row.validityZero }}天 </span>-->
+      <!--                    <span v-if="scope.row.timeType == 1"> {{ scope.row.validityOne }}天 </span>-->
+      <!--                    <span v-if="scope.row.timeType == 2"> {{ scope.row.validityTwo }}天 </span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="数量" width="130"-->
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <el-input-number style="width: 110px" v-model="scope.row.giftCardTotal" controls-position="right"-->
+      <!--                                     :min="1" :max="9999"></el-input-number>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="address"-->
+      <!--                  label="操作">-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <el-button-->
+      <!--                      size="mini"-->
+      <!--                      type="text"-->
+      <!--                      @click="deletedata(scope.row)"-->
+      <!--                    >删除-->
+      <!--                    </el-button>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--              </el-table>-->
+      <!--            </div>-->
+      <!--          </div>-->
+      <!--          &lt;!&ndash;        选择兑换券&ndash;&gt;-->
+      <!--          <div class="xh-box" v-if="form.courtesyReward && form.courtesyReward.indexOf('2')>-1  ">-->
+      <!--            <div class="box-bt">-->
+      <!--              <div>选择兑换券</div>-->
+      <!--              <el-button type="primary" icon="el-icon-plus" @click="getlistExchange()">新增</el-button>-->
+      <!--            </div>-->
+      <!--            <div style="margin: 10px 0px">-->
+
+      <!--              <el-table-->
+      <!--                :data="tableDatas"-->
+      <!--                border-->
+      <!--                style="width: 100%">-->
+      <!--                <el-table-column-->
+      <!--                  prop="giftCardName"-->
+      <!--                  label="卡券名称"-->
+      <!--                >-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="券类型"-->
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span v-if="scope.row.giftCardType == 0">商品券</span>-->
+      <!--                    <span v-if="scope.row.giftCardType == 1">洗车券</span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="券详情"-->
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span>{{ scope.row.giftCardDetail }}</span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="instruction"-->
+      <!--                  label="使用说明"-->
+      <!--                >-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="有效期（天）"-->
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <span> {{ scope.row.giftCardTime }}天 </span>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="date"-->
+      <!--                  label="数量" width="130"-->
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <el-input-number style="width: 110px" v-model="scope.row.giftCardTotal" size="small"-->
+      <!--                                     controls-position="right" :min="1" :max="9999"></el-input-number>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--                <el-table-column-->
+      <!--                  prop="address"-->
+      <!--                  label="操作"-->
+      <!--                >-->
+      <!--                  <template slot-scope="scope">-->
+      <!--                    <el-button-->
+      <!--                      size="mini"-->
+      <!--                      type="text"-->
+      <!--                      @click="deletedhdata(scope.row)"-->
+      <!--                    >删除-->
+      <!--                    </el-button>-->
+      <!--                  </template>-->
+      <!--                </el-table-column>-->
+      <!--              </el-table>-->
+
+      <!--            </div>-->
+      <!--          </div>-->
+      <!--          <el-form-item label="赠送积分" prop="points">-->
+      <!--            <el-input-number v-model="form.points" controls-position="right" :min="1" :max="99999"></el-input-number>-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="赠送成长值" prop="growthValue">-->
+      <!--            <el-input-number v-model="form.growthValue" controls-position="right" :min="1"-->
+      <!--                             :max="9999999"></el-input-number>-->
+      <!--          </el-form-item>-->
+      <!--          <el-form-item label="自定义规则" prop="remark">-->
+      <!--            <div style="width: 200px">-->
+      <!--              <el-input v-model="form.remark" placeholder="请输入自定义规则"/>-->
+      <!--            </div>-->
+
+      <!--          </el-form-item>-->
+      <!--        </el-form>-->
+      <!--        <div>-->
+      <!--          <el-button type="primary" @click="submitForm">保存</el-button>-->
+
+      <!--        </div>-->
+      <!--      </el-dialog>-->
+
+      <!--      <el-card>-->
+      <!--        <el-row :gutter="10" class="mb8">-->
+      <!--          <el-col :span="1.5">-->
+      <!--            <el-button-->
+      <!--              type="primary"-->
+      <!--              icon="el-icon-plus"-->
+      <!--              size="mini"-->
+      <!--              @click="addDatas"-->
+      <!--            >新增-->
+      <!--            </el-button>-->
+      <!--          </el-col>-->
+      <!--        </el-row>-->
+      <!--        <el-table v-loading="loading" :data="activeFullminusList" @selection-change="handleSelectionChange">-->
+      <!--          <el-table-column-->
+      <!--            type="index"-->
+      <!--            align="center"-->
+      <!--            label="序号"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="活动名称" align="center" prop="name"/>-->
+      <!--          <el-table-column label="活动时间" align="center" prop="adaptUserType">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.activeStartTime || 0 }}-{{ scope.row.activeEndTime || 0 }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+
+      <!--          <el-table-column label="活动状态 " align="center" prop="status">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span style="cursor: pointer;" v-if="scope.row.status == 0"> <el-tag>进行中</el-tag> </span>-->
+      <!--              <span style="cursor: pointer;" v-if="scope.row.status == 1"> <el-tag-->
+      <!--                type="danger">待生效</el-tag>  </span>-->
+      <!--              <span style="cursor: pointer;" v-if="scope.row.status == 2"> <el-tag type="danger">下线</el-tag>  </span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="赠送积分" align="center" prop="adaptUserType">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.points || 0 }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="赠送成长值" align="center" prop="adaptUserType">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.growthValue || 0 }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column label="活动更新时间" align="center" prop="updateTime">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.updateTime || '暂无更新' }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+      <!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                icon="el-icon-edit"-->
+      <!--                @click="handleUpdate(scope.row)"-->
+
+      <!--              >修改-->
+      <!--              </el-button>-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                icon="el-icon-view"-->
+      <!--                @click="lookDetail(scope.row)"-->
+      <!--              >详情-->
+      <!--              </el-button>-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                icon="el-icon-sort-up"-->
+      <!--                @click="handleDeletexia(scope.row,0)"-->
+      <!--                v-if="scope.row.isonline == 1"-->
+      <!--              >上线-->
+      <!--              </el-button>-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                icon="el-icon-sort-up"-->
+      <!--                @click="handleDeletexia(scope.row,1)"-->
+      <!--                v-if="scope.row.isonline == 0"-->
+      <!--              >下线-->
+      <!--              </el-button>-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                icon="el-icon-delete"-->
+      <!--                @click="Deleteshan(scope.row)"-->
+      <!--                v-if="scope.row.isonline == 1"-->
+      <!--              >删除-->
+      <!--              </el-button>-->
+
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--        </el-table>-->
+      <!--        <pagination-->
+      <!--          v-show="ztotal>0"-->
+      <!--          :total="ztotal"-->
+      <!--          :page.sync="queryParams.pageNum"-->
+      <!--          :limit.sync="queryParams.pageSize"-->
+      <!--          @pagination="getList"-->
+      <!--        />-->
+
+      <!--      </el-card>-->
+
+
+      <!--      &lt;!&ndash;    优惠券列表&ndash;&gt;-->
+      <!--      <el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">-->
+      <!--        <div style="display: flex;align-items: center; margin-bottom: 20px ">-->
+      <!--          <el-input v-model="youhuiquan.name" placeholder="优惠券名称"></el-input>-->
+      <!--          <el-button type="primary" icon="el-icon-search" @click="getlistFavorable">搜索</el-button>-->
+      <!--        </div>-->
+      <!--        <el-table-->
+      <!--          :data="tableData"-->
+      <!--          border-->
+      <!--          style="width: 100%">-->
+      <!--          <el-table-column-->
+      <!--            prop="name"-->
+      <!--            label="卡券名称"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="券类型"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span v-if="scope.row.discountType == 0">满减券</span>-->
+      <!--              <span v-if="scope.row.discountType == 1">折扣券</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="券详情"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.cardDetail }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="有效期（天）"-->
+      <!--            width="180">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span v-if="scope.row.timeType == 0">{{ scope.row.validityZero }}天 </span>-->
+      <!--              <span v-if="scope.row.timeType == 1">{{ scope.row.validityOne }}天 </span>-->
+      <!--              <span v-if="scope.row.timeType == 2">{{ scope.row.validityTwo }}天 </span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+      <!--          <el-table-column-->
+      <!--            prop="address"-->
+      <!--            label="操作">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                @click="chosedata(scope.row)"-->
+      <!--              >选择-->
+      <!--              </el-button>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--        </el-table>-->
+      <!--        <div>-->
+      <!--          <pagination-->
+      <!--            v-show="ytotal>0"-->
+      <!--            :total="ytotal"-->
+      <!--            :page.sync="youhuiquan.pageNum"-->
+      <!--            :limit.sync="youhuiquan.pageSize"-->
+      <!--            @pagination="getlistFavorable"-->
+      <!--          />-->
+      <!--        </div>-->
+      <!--      </el-dialog>-->
+      <!--      &lt;!&ndash;    兑换券列表&ndash;&gt;-->
+      <!--      <el-dialog title="兑换券列表" :visible.sync="dialogTableVisibledh">-->
+      <!--        <div style="display: flex;align-items: center; margin-bottom: 20px ">-->
+      <!--          <el-input v-model="duihuanquan.name" placeholder="兑换券名称"></el-input>-->
+      <!--          <el-button type="primary" icon="el-icon-search" @click="getlistExchange">搜索</el-button>-->
+      <!--        </div>-->
+      <!--        <el-table-->
+      <!--          :data="tableDatadh"-->
+      <!--          border-->
+      <!--          style="width: 100%">-->
+      <!--          <el-table-column-->
+      <!--            prop="name"-->
+      <!--            label="卡券名称"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="券类型"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span v-if="scope.row.type == 0">洗车券</span>-->
+      <!--              <span v-if="scope.row.type == 1">商品券</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="券详情"-->
+      <!--            width="80">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.cardDetail }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="使用说明"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.useInstructions }}</span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="date"-->
+      <!--            label="有效期（天）"-->
+      <!--          >-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <span>{{ scope.row.validity }}天 </span>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+
+      <!--          <el-table-column-->
+      <!--            prop="address"-->
+      <!--            label="操作">-->
+      <!--            <template slot-scope="scope">-->
+      <!--              <el-button-->
+      <!--                size="mini"-->
+      <!--                type="text"-->
+      <!--                @click="Favorabledata(scope.row)"-->
+      <!--              >选择-->
+      <!--              </el-button>-->
+      <!--            </template>-->
+      <!--          </el-table-column>-->
+      <!--        </el-table>-->
+      <!--        <div>-->
+      <!--          <pagination-->
+      <!--            v-show="dtotal>0"-->
+      <!--            :total="dtotal"-->
+      <!--            :page.sync="duihuanquan.pageNum"-->
+      <!--            :limit.sync="duihuanquan.pageSize"-->
+      <!--            @pagination="getlistExchange"-->
+      <!--          />-->
+      <!--        </div>-->
+      <!--      </el-dialog>-->
+      <!--      <el-dialog title="详情统计" :visible.sync="opendetails" width="45%" append-to-body>-->
+      <!--        <div style="display: flex;justify-content: space-between;width: 100%;">-->
+      <!--          <div class="x-box">-->
+      <!--            <div>优惠券数量统计</div>-->
+      <!--            <div>总数量: {{ statisticsyou.count || 0 }}</div>-->
+      <!--            <div>已使用数量: {{ statisticsyou.countEd || 0 }}</div>-->
+      <!--            <div>未使用数量: {{ statisticsyou.countLd || 0 }}</div>-->
+      <!--          </div>-->
+      <!--          <div class="x-box">-->
+      <!--            <div>兑换券数量统计</div>-->
+      <!--            <div>总数量: {{ statisticsyou.counts || 0 }}</div>-->
+      <!--            <div>已使用数量: {{ statisticsyou.countEds || 0 }}</div>-->
+      <!--            <div>未使用数量: {{ statisticsyou.countLds || 0 }}</div>-->
+      <!--          </div>-->
+      <!--        </div>-->
+      <!--        <el-table-->
+      <!--          :data="looklist"-->
+      <!--          style="width: 100%">-->
+      <!--          <el-table-column-->
+      <!--            prop="name"-->
+      <!--            label="昵称"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="mobile"-->
+      <!--            label="联系方式"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="createTime"-->
+      <!--            label="领取日期"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--          <el-table-column-->
+      <!--            prop="exchangeFrom"-->
+      <!--            label="获取方式"-->
+      <!--          >-->
+      <!--          </el-table-column>-->
+      <!--        </el-table>-->
+      <!--      </el-dialog>-->
+      <!--      <el-dialog-->
+      <!--        title="二维码"-->
+      <!--        v-loading="loadingdialog"-->
+      <!--        :visible.sync="centerDialogVisible"-->
+      <!--        width="350px"-->
+      <!--        center>-->
+      <!--        <div style="display: flex;align-items: center">-->
+      <!--          <div class="qr-code" id="qrCode" ref="qrCodeUrl"></div>-->
+      <!--        </div>-->
+
+      <!--        <span slot="footer" class="dialog-footer">-->
+      <!--         <el-button @click="centerDialogVisible = false">取 消</el-button>-->
+      <!--          <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>-->
+      <!--      </span>-->
+      <!--      </el-dialog>-->
+    </div>
+
+    <div class="cot-box">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="90px" style="width: 70%;margin: 0 auto">
         <el-form-item label="活动名称" prop="name">
-          <div style="width: 220px">
-            <el-input v-model="form.name" placeholder="请输入活动名称" />
+          <el-input v-model="ruleForm.name"></el-input>
+        </el-form-item>
+        <el-form-item label="活动时间" prop="activityTimeType">
+          <div class="d-s">
+            <div class="icon-type" v-for="(item,index) in activityTimeTypeList" :key="index"
+                 :class="{ 'acvtive' : index === tindex1 }" @click="Typeindex1(index)">
+              <img src="@/assets/images/wx.png" style="width: 20px;height: 20px" v-if="index != tindex1">
+              <img src="@/assets/images/xz.png" style="width: 20px;height: 20px" v-if="index == tindex1">
+              {{ item }}
+            </div>
+            <el-date-picker
+              v-model="ruleForm.activeStartTime"
+              style="width: 160px"
+              type="date"
+              placeholder="开始日期">
+            </el-date-picker>
+            <span style="margin: 0 5px">至</span>
+            <el-date-picker
+              v-model="ruleForm.activeEndTime"
+              style="width: 160px"
+              type="date"
+              placeholder="结束日期">
+            </el-date-picker>
           </div>
-
         </el-form-item>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="活动开始时间" prop="activeStartTime">
-              <el-date-picker clearable
-                              v-model="form.activeStartTime"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="请选择活动开始时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="活动结束时间" prop="activeEndTime">
-              <el-date-picker clearable
-                              v-model="form.activeEndTime"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="请选择活动结束时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-form-item label="有礼奖励" prop="courtesyReward">
-          <el-checkbox-group v-model="form.courtesyReward">
-            <el-checkbox label="1" >赠送优惠券</el-checkbox>
-            <el-checkbox label="2" >赠送兑换券</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-        <!--        选择优惠券-->
-        <div class="xh-box" v-if="form.courtesyReward && form.courtesyReward.indexOf('1')>-1  "   >
-          <div class="box-bt"> <div >赠送卡券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistFavorable()" >新增</el-button>  </div>
-          <div style="margin: 10px 0px">
-            <el-table
-              :data="form.tableDatas"
-              border
-              style="width: 100%">
-              <el-table-column
-                prop="giftCardName"
-                label="卡券名称"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="giftCardType"
-                label="券类型"
-              >
-                <template slot-scope="scope">
-                  <span v-if="scope.row.giftCardType == 0" >满减券</span>
-                  <span v-if="scope.row.giftCardType == 1"  >折扣券</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="券详情"
-              >
-                <template slot-scope="scope">
-                  <span>{{scope.row.giftCardDetail}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="instruction"
-                label="使用说明"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="有效期（天）"
-              >
-                <template slot-scope="scope">
-                  <span v-if="scope.row.timeType == 0" > {{ scope.row.validityZero }}天 </span>
-                  <span v-if="scope.row.timeType == 1" > {{ scope.row.validityOne }}天 </span>
-                  <span v-if="scope.row.timeType == 2" > {{ scope.row.validityTwo }}天 </span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="数量" width="130"
-              >
-                <template slot-scope="scope">
-                  <el-input-number style="width: 110px" v-model="scope.row.giftCardTotal" controls-position="right"  :min="1" :max="9999"></el-input-number>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="address"
-                label="操作">
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    @click="deletedata(scope.row)"
-                  >删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
+        <el-form-item label="通知内容" prop="name">
+          <div>
+            <el-button type="text" @click="ifWrite = !ifWrite">编辑</el-button>
           </div>
-        </div>
-        <!--        选择兑换券-->
-        <div class="xh-box" v-if="form.courtesyReward && form.courtesyReward.indexOf('2')>-1  "   >
-          <div class="box-bt"> <div >选择兑换券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistExchange()" >新增</el-button>  </div>
-          <div style="margin: 10px 0px">
+          <el-input type="textarea" :disabled="ifWrite" v-model="ruleForm.noticeContent"
+                    placeholder="请输入通知内容"></el-input>
+        </el-form-item>
+        <el-form-item label="活动详情" prop="name">
+          <el-input type="textarea" v-model="ruleForm.activityDetails" placeholder="请输入活动详情"></el-input>
+        </el-form-item>
+        <el-form-item label="活动奖品" prop="type">
+          <div style="display: flex">
+            <div style="width: 17%">
+              <el-checkbox-group v-model="ruleForm.courtesyReward">
+                <div>
+                  <el-checkbox label="3" name="type">赠送积分</el-checkbox>
+                </div>
+                <div>
+                  <el-checkbox label="2" name="type">赠送成长值</el-checkbox>
+                </div>
+                <div style="display: flex;font-size: 14px;margin: 15px 0">
+                  <el-checkbox label="0" name="type">赠送优惠券</el-checkbox>
+                  <img src="@/assets/images/tjb.png"
+                       style="width: 20px;height: 20px;cursor: pointer;margin-top: 7px;margin-left: 10px"
+                       @click="addCoupons()">
+                </div>
+              </el-checkbox-group>
+            </div>
+            <div style="width: 70%">
+              <div style="display: flex;font-size: 14px;">
+                <div>赠送</div>
+                <el-input placeholder="请输入赠送的积分数量" style="width: 70%;margin: 0 10px"
+                          v-model="ruleForm.points">
+                  <template slot="append">积分</template>
+                </el-input>
+              </div>
 
-            <el-table
-              :data="tableDatas"
-              border
-              style="width: 100%">
-              <el-table-column
-                prop="giftCardName"
-                label="卡券名称"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="券类型"
-              >
-                <template slot-scope="scope">
-                  <span v-if="scope.row.giftCardType == 0" >商品券</span>
-                  <span v-if="scope.row.giftCardType == 1"  >洗车券</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="券详情"
-              >
-                <template slot-scope="scope">
-                  <span>{{scope.row.giftCardDetail}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="instruction"
-                label="使用说明"
-              >
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="有效期（天）"
-              >
-                <template slot-scope="scope">
-                  <span  > {{ scope.row.giftCardTime }}天 </span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="数量" width="130"
-              >
-                <template slot-scope="scope">
-                  <el-input-number style="width: 110px" v-model="scope.row.giftCardTotal" size="small" controls-position="right"  :min="1" :max="9999"></el-input-number>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="address"
-                label="操作"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    @click="deletedhdata(scope.row)"
-                  >删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
+              <div style="display: flex;font-size: 14px;margin: 15px 0">
+                <div>赠送</div>
+                <el-input placeholder="请输入赠送的成长值数量" style="width: 70%;margin: 0 10px"
+                          v-model="ruleForm.growthValue">
+                  <template slot="append">成长值</template>
+                </el-input>
+              </div>
 
+              <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0">
+                <span>赠送</span>
+                <el-select v-model="item.vouchersId" style="margin-left: 10px;width: 30%" placeholder="请选择">
+                  <el-option label="优惠券" value="0"></el-option>
+                  <el-option label="实收金额" value="1"></el-option>
+                  <el-option label="加油升数" value="2"></el-option>
+                </el-select>
+                <el-input style="width: 30%;margin-left: 10px" v-model="item.giftCardTotal">
+                  <template slot="append">张</template>
+                </el-input>
+                <img src="@/assets/images/ljt.png" style="width: 25px;height: 25px;margin-left: 10px"
+                     @click="deleteCoupons(index)">
+              </div>
+            </div>
           </div>
-        </div>
-        <el-form-item label="赠送积分" prop="points">
-          <el-input-number v-model="form.points" controls-position="right"  :min="1" :max="99999"></el-input-number>
         </el-form-item>
-        <el-form-item label="赠送成长值" prop="growthValue">
-          <el-input-number v-model="form.growthValue" controls-position="right"  :min="1" :max="9999999"></el-input-number>
+        <el-form-item style="text-align: center">
+          <el-button @click="resetForm('ruleForm')">重置</el-button>
+          <el-button type="primary" @click="submitRuleForm('ruleForm')">保存</el-button>
         </el-form-item>
-        <el-form-item label="自定义规则" prop="remark">
-          <div style="width: 200px">
-            <el-input v-model="form.remark" placeholder="请输入自定义规则" />
-          </div>
-
-        </el-form-item>
-        <!--        <div slot="footer" class="dialog-footer">-->
-        <!--          <el-button type="primary" @click="submitForm">确 定</el-button>-->
-        <!--          <el-button @click="cancel">取 消</el-button>-->
-        <!--        </div>-->
       </el-form>
-      <div>
-        <el-button type="primary" @click="submitForm">保存</el-button>
-
-      </div>
-    </el-dialog>
-
-    <el-card>
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="mini"
-            @click="addDatas"
-          >新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="loading" :data="activeFullminusList"  @selection-change="handleSelectionChange">
-        <el-table-column
-          type="index"
-          align="center"
-          label="序号"
-        >
-        </el-table-column>
-        <!--      <el-table-column label="活动编号" align="center" prop="id" />-->
-        <el-table-column label="活动名称" align="center" prop="name" />
-        <el-table-column label="活动时间" align="center" prop="adaptUserType" >
-          <template slot-scope="scope">
-            <span >{{scope.row.activeStartTime || 0}}-{{scope.row.activeEndTime || 0}}</span>
-          </template>
-        </el-table-column>
-
-
-
-
-        <el-table-column label="活动状态 " align="center" prop="status" >
-          <template slot-scope="scope">
-            <span style="cursor: pointer;"  v-if="scope.row.status == 0"> <el-tag>进行中</el-tag > </span>
-            <span style="cursor: pointer;"  v-if="scope.row.status == 1"> <el-tag type="danger">待生效</el-tag>  </span>
-            <span style="cursor: pointer;"  v-if="scope.row.status == 2"> <el-tag type="danger">下线</el-tag>  </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="赠送积分" align="center" prop="adaptUserType" >
-          <template slot-scope="scope">
-            <span >{{scope.row.points || 0}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="赠送成长值" align="center" prop="adaptUserType" >
-          <template slot-scope="scope">
-            <span >{{scope.row.growthValue || 0}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="活动更新时间" align="center" prop="updateTime" >
-          <template slot-scope="scope">
-            <span >{{scope.row.updateTime || '暂无更新'}}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-
-            >修改</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="lookDetail(scope.row)"
-            >详情</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-sort-up"
-              @click="handleDeletexia(scope.row,0)"
-              v-if="scope.row.isonline == 1"
-            >上线</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-sort-up"
-              @click="handleDeletexia(scope.row,1)"
-              v-if="scope.row.isonline == 0"
-            >下线</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="Deleteshan(scope.row)"
-              v-if="scope.row.isonline == 1"
-            >删除</el-button>
-
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="ztotal>0"
-        :total="ztotal"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-
-    </el-card>
-
-
-
-    <!--    优惠券列表-->
-    <el-dialog title="优惠券列表" :visible.sync="dialogTableVisible">
-      <div style="display: flex;align-items: center; margin-bottom: 20px ">
-        <el-input v-model="youhuiquan.name" placeholder="优惠券名称"></el-input>
-        <el-button type="primary" icon="el-icon-search" @click="getlistFavorable" >搜索</el-button>
-      </div>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%">
-        <el-table-column
-          prop="name"
-          label="卡券名称"
-          >
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="券类型"
-      >
-          <template slot-scope="scope">
-            <span v-if="scope.row.discountType == 0" >满减券</span>
-            <span v-if="scope.row.discountType == 1"  >折扣券</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="券详情"
-      >
-          <template slot-scope="scope">
-            <span>{{scope.row.cardDetail}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="有效期（天）"
-          width="180">
-          <template slot-scope="scope">
-            <span v-if="scope.row.timeType == 0" >{{scope.row.validityZero}}天 </span>
-            <span v-if="scope.row.timeType == 1" >{{scope.row.validityOne}}天 </span>
-            <span v-if="scope.row.timeType == 2" >{{scope.row.validityTwo}}天 </span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="address"
-          label="操作">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="chosedata(scope.row)"
-            >选择</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div><pagination
-        v-show="ytotal>0"
-        :total="ytotal"
-        :page.sync="youhuiquan.pageNum"
-        :limit.sync="youhuiquan.pageSize"
-        @pagination="getlistFavorable"
-      /></div>
-    </el-dialog>
-    <!--    兑换券列表-->
-    <el-dialog title="兑换券列表" :visible.sync="dialogTableVisibledh">
-      <div style="display: flex;align-items: center; margin-bottom: 20px ">
-        <el-input v-model="duihuanquan.name" placeholder="兑换券名称"></el-input>
-        <el-button type="primary" icon="el-icon-search" @click="getlistExchange" >搜索</el-button>
-      </div>
-      <el-table
-        :data="tableDatadh"
-        border
-        style="width: 100%">
-        <el-table-column
-          prop="name"
-          label="卡券名称"
-         >
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="券类型"
-          >
-          <template slot-scope="scope">
-            <span v-if="scope.row.type == 0" >洗车券</span>
-            <span v-if="scope.row.type == 1"  >商品券</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="券详情"
-          width="80">
-          <template slot-scope="scope">
-            <span>{{scope.row.cardDetail}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="使用说明"
-          >
-          <template slot-scope="scope">
-            <span>{{scope.row.useInstructions}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="date"
-          label="有效期（天）"
-          >
-          <template slot-scope="scope">
-            <span  >{{scope.row.validity}}天 </span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="address"
-          label="操作">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="Favorabledata(scope.row)"
-            >选择</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div><pagination
-        v-show="dtotal>0"
-        :total="dtotal"
-        :page.sync="duihuanquan.pageNum"
-        :limit.sync="duihuanquan.pageSize"
-        @pagination="getlistExchange"
-      /></div>
-    </el-dialog>
-    <el-dialog title="详情统计" :visible.sync="opendetails" width="45%" append-to-body>
-      <div style="display: flex;justify-content: space-between;width: 100%;">
-        <div class="x-box">
-          <div>优惠券数量统计</div>
-          <div>总数量: {{statisticsyou.count ||0}}</div>
-          <div>已使用数量: {{statisticsyou.countEd ||0}}</div>
-          <div>未使用数量: {{statisticsyou.countLd ||0}}</div>
-        </div>
-        <div class="x-box">
-          <div>兑换券数量统计</div>
-          <div>总数量: {{statisticsyou.counts ||0}}</div>
-          <div>已使用数量: {{statisticsyou.countEds ||0}}</div>
-          <div>未使用数量: {{statisticsyou.countLds ||0}}</div>
-        </div>
-      </div>
-      <el-table
-        :data="looklist"
-        style="width: 100%">
-        <el-table-column
-          prop="name"
-          label="昵称"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="mobile"
-          label="联系方式"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          label="领取日期"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="exchangeFrom"
-          label="获取方式"
-        >
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-    <el-dialog
-      title="二维码"
-      v-loading="loadingdialog"
-      :visible.sync="centerDialogVisible"
-      width="350px"
-      center>
-      <div style="display: flex;align-items: center">
-        <div class="qr-code" id="qrCode" ref="qrCodeUrl"></div>
-      </div>
-
-      <span slot="footer" class="dialog-footer">
-         <el-button @click="centerDialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
-      </span>
-    </el-dialog>
+    </div>
 
   </div>
 </template>
@@ -535,7 +646,7 @@ import {
   addActiveNewlyweds,
   updateActiveNewlyweds,
   huiActiveNewlyweds,
-  editActiveNewlyweds
+  editActiveNewlyweds, getInfoActiveNewlyweds
 } from "@/api/EventMarketing/activeNewlyweds";
 import {getoilName, listExchange, listFavorable, looklook, looklooklook} from "@/api/EventMarketing/activeConsumption";
 import QRCode from "qrcodejs2";
@@ -550,34 +661,34 @@ export default {
   name: "ActiveNewlyweds",
   data() {
     return {
-      opendetails:false,
-      looklist:[],
-      statisticsyou:{},
-      labelPosition:'left',
-      loadingdialog:false,
-      centerDialogVisible:false,
-      pdidlist:[],//判断优惠券id
-      pddhidlist:[],//判断兑换券id
+      opendetails: false,
+      looklist: [],
+      statisticsyou: {},
+      labelPosition: 'left',
+      loadingdialog: false,
+      centerDialogVisible: false,
+      pdidlist: [],//判断优惠券id
+      pddhidlist: [],//判断兑换券id
       tableData: [],//优惠券
-      tableDatadh:[],//兑换券
-      dialogTableVisible:false,//优惠券
-      dialogTableVisibledh:false,//兑换券
-      tableDatas:[],
+      tableDatadh: [],//兑换券
+      dialogTableVisible: false,//优惠券
+      dialogTableVisibledh: false,//兑换券
+      tableDatas: [],
       //请求优惠券列表时的参数
-      youhuiquan:{
-        name:'',
+      youhuiquan: {
+        name: '',
         pageNum: 1,
         pageSize: 10,
       },
-      ytotal:0,
+      ytotal: 0,
       //请求兑换券列表时的参数
-      duihuanquan:{
-        name:'',
+      duihuanquan: {
+        name: '',
         pageNum: 1,
         pageSize: 10,
-        total:0
+        total: 0
       },
-      dtotal:0,
+      dtotal: 0,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -616,49 +727,119 @@ export default {
       activeFullminusList: [],
       // 表单参数
       form: {
-        id:"",
-        tableDatas:[],
-        courtesyReward:[],
-        activeNewlywedsChildList:[],
+        id: "",
+        tableDatas: [],
+        courtesyReward: [],
+        activeNewlywedsChildList: [],
       },
+
+      ruleForm: {
+        name: '',
+        region: '',
+        date1: '',
+        date2: '',
+        delivery: false,
+        type: [],
+        resource: '',
+        desc: ''
+      },
+      ifWrite: true,
+      tindex1: 0,
+      activityTimeTypeList: [
+        "永久有效", "自定义"
+      ],
+      couponList: [],
       // 表单校验
       rules: {
         name: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         activeStartTime: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         activeEndTime: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         courtesyReward: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         points: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         growthValue: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
         remark: [
-          { required: true, message: '必填项不能为空', trigger: 'blur' },
+          {required: true, message: '必填项不能为空', trigger: 'blur'},
         ],
       }
     };
   },
   created() {
-    this.getList()
+    // this.getList()
+    this.getInfo()
 
   },
   methods: {
+    getInfo(){
+      getInfoActiveNewlyweds().then(res => {
+        if (res.data) {
+          this.ruleForm = res.data
+          if (res.data.courtesyReward) this.ruleForm.courtesyReward = res.data.courtesyReward.split(",")
+          if (res.data.activeTimeType) this.tindex1 = res.data.activeTimeType
+          if (res.data.couponList) this.couponList = res.data.couponList
+        }else {
+          this.ruleForm = {
+            courtesyReward:[]
+          }
+        }
+      })
+    },
+    addCoupons() {
+      let data = {
+        activeGift: 0,
+        vouchersId: "",
+        giftCardTotal: "",
+      }
+      this.couponList.push(data)
+    },
+    deleteCoupons(index) {
+      this.couponList.splice(index, 1);
+    },
+    Typeindex1(index) {
+      this.tindex1 = index
+      this.ruleForm.activeTimeType = index
+    },
+    submitRuleForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.ruleForm.courtesyReward) this.ruleForm.courtesyReward = this.ruleForm.courtesyReward.toString()
+          if (this.couponList) this.ruleForm.couponList = this.couponList
+          if (this.ruleForm.id) {
+            updateActiveNewlyweds(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.getInfo()
+            });
+          }else {
+            addActiveNewlyweds(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.getInfo()
+            });
+          }
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.getInfo()
+    },
     /** 查询新人有礼活动列表 */
     getList() {
       this.loading = true;
-      listActiveNewlyweds(this.queryParams).then(res=>{
+      listActiveNewlyweds(this.queryParams).then(res => {
         this.activeFullminusList = res.data.records
         this.ztotal = res.data.total;
-        console.log('wwwwwc',res)
+        console.log('wwwwwc', res)
         this.loading = false;
       })
       // this.loading = true;
@@ -668,21 +849,21 @@ export default {
       //   this.loading = false;
       // });
     },
-    getoilName(){
-      getoilName().then(res=>{
+    getoilName() {
+      getoilName().then(res => {
         console.log(res)
         this.oillist = res.data
 
       })
 
     },
-    addDatas(){
+    addDatas() {
       this.open = true
       this.form = {
-        id:"",
-        tableDatas:[],
-        courtesyReward:[],
-        activeNewlywedsChildList:[],
+        id: "",
+        tableDatas: [],
+        courtesyReward: [],
+        activeNewlywedsChildList: [],
       }
       this.form.tableDatas = []
       this.tableDatas = []
@@ -723,8 +904,8 @@ export default {
         activeStartTime: null,
         activeEndTime: null,
         courtesyReward: [],
-        tableDatas:[],
-        activeNewlywedsChildList:[],
+        tableDatas: [],
+        activeNewlywedsChildList: [],
         activeCode: null,
         isonline: null,
         status: null,
@@ -745,24 +926,24 @@ export default {
     },
 
     // 请求兑换券
-    getlistExchange(){
+    getlistExchange() {
       this.tableDatadh = []
-      listExchange(this.duihuanquan).then(res=>{
-        if(res.code==200){
+      listExchange(this.duihuanquan).then(res => {
+        if (res.code == 200) {
           this.dialogTableVisibledh = true
-          this.tableDatadh  = res.data.records
+          this.tableDatadh = res.data.records
           this.dtotal = res.data.total
         }
       })
 
     },
     // 请求优惠券
-    getlistFavorable(){
+    getlistFavorable() {
       this.tableData = []
-      listFavorable(this.youhuiquan).then(res=>{
-        if(res.code == 200){
+      listFavorable(this.youhuiquan).then(res => {
+        if (res.code == 200) {
           this.dialogTableVisible = true
-          this.tableData  = res.data.records
+          this.tableData = res.data.records
           this.ytotal = res.data.total
         }
 
@@ -770,28 +951,28 @@ export default {
     },
 
     // 兑换券券列表选择
-    Favorabledata(row){
+    Favorabledata(row) {
       this.dialogTableVisibledh = false
-      if(this.pddhidlist.indexOf(row.id)>-1 ){
+      if (this.pddhidlist.indexOf(row.id) > -1) {
         this.$message.error("该兑换卡券已存在")
         return
       }
 
       this.pddhidlist.push(row.id)
       console.log(row)
-      let data ={
+      let data = {
         activeGift: 2, //活动奖品 0：赠送积分1：赠送优惠券 2. 赠送兑换券 3：赠送成长值 4. 赠送实物
         goodsIds: "", //商品id
-        goodsName:"" , //商品名称
+        goodsName: "", //商品名称
         goodsTotal: "", //商品数量
-        vouchersId:row.id, //券id
-        giftCardName:row.name, //赠送卡券名称
+        vouchersId: row.id, //券id
+        giftCardName: row.name, //赠送卡券名称
         giftCardType: row.type, //券类型
         validityZero: null,
         validityOne: null,
-        validityTwo:null,
-        validity:row.validity,
-        giftCardDetail: row.cardDetail , //券详情
+        validityTwo: null,
+        validity: row.validity,
+        giftCardDetail: row.cardDetail, //券详情
         giftCardTime: row.validity, //券有效期
         giftCardTotal: 1, //券数量
         instruction: row.useInstructions, //使用说明
@@ -801,28 +982,28 @@ export default {
       this.$message.success("新增成功")
     },
     // 优惠券列表选择
-    chosedata(row){
+    chosedata(row) {
       this.dialogTableVisible = false
-      if(this.pdidlist.indexOf(row.id)>-1 ){
+      if (this.pdidlist.indexOf(row.id) > -1) {
         this.$message.error("该优惠卡券已存在")
         return
       }
 
       this.pdidlist.push(row.id)
 
-      let data ={
+      let data = {
         activeGift: 1, //活动奖品 0：赠送积分1：赠送优惠券 2. 赠送兑换券 3：赠送成长值 4. 赠送实物
         goodsIds: "", //商品id
-        goodsName:"" , //商品名称
+        goodsName: "", //商品名称
         goodsTotal: "", //商品数量
-        vouchersId:row.id, //券id
-        giftCardName:row.name, //赠送卡券名称
+        vouchersId: row.id, //券id
+        giftCardName: row.name, //赠送卡券名称
         giftCardType: row.discountType, //券类型
         timeType: row.timeType,
         validityZero: row.validityZero,
         validityOne: row.validityOne,
-        validityTwo:row.validityTwo,
-        giftCardDetail: row.cardDetail , //券详情
+        validityTwo: row.validityTwo,
+        giftCardDetail: row.cardDetail, //券详情
         giftCardTime: "", //券有效期
         giftCardTotal: 1,//券数量
         instruction: row.instruction,//使用说明
@@ -834,61 +1015,62 @@ export default {
 
     },
     // 优惠券删除
-    deletedata(row){
-      if(this.form.tableDatas&&this.form.tableDatas.length>0){
-        let delIdx=-1;
-        for ( let item of this.form.tableDatas) {
+    deletedata(row) {
+      if (this.form.tableDatas && this.form.tableDatas.length > 0) {
+        let delIdx = -1;
+        for (let item of this.form.tableDatas) {
           delIdx++;
-          if (item.id===row.id){
+          if (item.id === row.id) {
             break
           }
         }
-        this.pdidlist.splice(delIdx,1);
-        this.form.tableDatas.splice(delIdx,1);
+        this.pdidlist.splice(delIdx, 1);
+        this.form.tableDatas.splice(delIdx, 1);
 
 
       }
     },
     // 兑换券删除
-    deletedhdata(row){
-      if(this.tableDatas&&this.tableDatas.length>0){
-        let delIdx=-1;
-        for ( let item of this.tableDatas) {
+    deletedhdata(row) {
+      if (this.tableDatas && this.tableDatas.length > 0) {
+        let delIdx = -1;
+        for (let item of this.tableDatas) {
           delIdx++;
-          if (item.id===row.id){
+          if (item.id === row.id) {
             break
           }
         }
-        this.pddhidlist.splice(delIdx,1);
-        this.tableDatas.splice(delIdx,1);
+        this.pddhidlist.splice(delIdx, 1);
+        this.tableDatas.splice(delIdx, 1);
 
 
       }
     },
-    lookDetail(row){
+    lookDetail(row) {
       this.opendetails = true
       let data = {
-        id:row.id,
-        exchangeFrom:"新人有礼"
+        id: row.id,
+        exchangeFrom: "新人有礼"
       }
-      looklook(data).then(res=>{
+      looklook(data).then(res => {
         this.looklist = res.data
 
-        console.log('详情',res)
+        console.log('详情', res)
       })
-      looklooklook(row.id).then(resp=>{
+      looklooklook(row.id).then(resp => {
         this.statisticsyou = resp.data
-        console.log('优惠券详情统计',resp)
+        console.log('优惠券详情统计', resp)
       })
     },
-    Deleteshan(row){
+    Deleteshan(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除此条新人有礼活动的信息？').then(function() {
+      this.$modal.confirm('是否确认删除此条新人有礼活动的信息？').then(function () {
         return delActiveNewlyweds(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
 
     },
     /** 搜索按钮操作 */
@@ -904,7 +1086,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -914,11 +1096,11 @@ export default {
       this.title = "添加新人有礼活动";
     },
     /** 修改按钮操作 */
-    handleUpdate(row){
+    handleUpdate(row) {
       this.reset()
       getActiveNewlyweds(row.id).then(response => {
         this.form = response.data;
-        if(response.data.activeNewlywedsChildList){
+        if (response.data.activeNewlywedsChildList) {
           this.form.tableDatas = response.data.activeNewlywedsChildList.filter(item => item.activeGift == '1')
           this.tableDatas = response.data.activeNewlywedsChildList.filter(item => item.activeGift == '2')
         }
@@ -926,7 +1108,7 @@ export default {
         this.title = "编辑";
       });
     },
-    handleDeletexia(row,isonline){
+    handleDeletexia(row, isonline) {
       // getActiveNewlyweds(row.id).then(response => {
       //
       //   let data = response.data
@@ -938,13 +1120,14 @@ export default {
       //   });
       //
       // });
-      this.$modal.confirm('确定上线此条新人有礼活动信息？').then(function() {
-        return editActiveNewlyweds({id:row.id,isonline:isonline});
+      this.$modal.confirm('确定上线此条新人有礼活动信息？').then(function () {
+        return editActiveNewlyweds({id: row.id, isonline: isonline});
       }).then(() => {
         this.$modal.msgSuccess("上线成功");
         this.open = false;
         this.getList();
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     submitForm() {
       // this.form.activeNewlywedsChildList
@@ -959,7 +1142,7 @@ export default {
               this.open = false;
               this.getList();
             });
-          }else {
+          } else {
             addActiveNewlyweds(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -996,12 +1179,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除此条新人有礼活动信息？').then(function() {
+      this.$modal.confirm('是否确认删除此条新人有礼活动信息？').then(function () {
         return delActiveNewlyweds(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1013,18 +1197,49 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-.box-bt{
+.box-bt {
   width: 100%;
   display: flex;
   align-items: center;
   justify-content: space-between;
   font-size: 18px;
 }
-.x-box{
+
+.x-box {
   background: #f9f9f9;
   border-radius: 6px;
   box-sizing: border-box;
   padding: 15px;
   width: 45%;
 }
+
+.cot-box {
+  width: 100%;
+  height: 89vh;
+  border-radius: 8px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 20px;
+  margin: 0 auto;
+}
+
+.d-s {
+  display: flex;
+  align-items: center;
+}
+
+.icon-type {
+  display: flex;
+  align-items: center;
+  font-weight: 400;
+  font-size: 14px;
+  color: #999999;
+  margin-right: 20px;
+  cursor: pointer;
+}
+
+.acvtive {
+  color: #FF770F !important;
+}
+
 </style>