11.20前端

fuintAdmin/src/router/index.js

@@ -83,7 +83,6 @@ export const constantRoutes = [
       }
     ]
   },
-
   {
     path: '/oilPurchase',
     component: Layout,

fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue

@@ -30,7 +30,6 @@
                   <span v-if="scope.row.groupOriented == 1">普通群体</span>
                   <span v-if="scope.row.groupOriented == 2">等级会员</span>
                 </template>
-
               </el-table-column>
               <el-table-column label="活动信息">
                 <el-table-column
@@ -53,8 +52,6 @@
                   label="赠送成长值"
                   width="120">
                 </el-table-column>
-
-
               </el-table-column>
               <el-table-column
                 prop="activeTime"
@@ -327,9 +324,6 @@
           </div>
         </div>
       </el-drawer>
-
-
-
     </div>
 </template>
 

fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="">
+  <div class="app-container">
     <el-card style="margin-bottom: 20px">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
 
@@ -143,7 +143,6 @@
         <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="form.tableDatas"
                 border

fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="">
+  <div class="app-container">
     <el-card style="margin-bottom: 20px">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="活动名称" prop="name">

fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="">
+  <div class="app-container">
     <el-card style="margin-bottom: 20px">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="活动名称" prop="name">

fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="">
+  <div class="app-container">
     <el-card style="margin-bottom: 20px">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="活动名称" prop="name">

fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="">
+  <div class="app-container">
 
     <el-card class="box-card">
       <div slot="header" class="clearfix">

fuintAdmin/src/views/EventMarketing/center/index.vue

@@ -1,20 +1,55 @@
 <template>
 <!--  活动中心-->
   <div class="app-container">
-    <el-card style="margin-bottom: 20px">
+<!--    <el-card style="margin-bottom: 20px">-->
-      <el-radio-group v-model="value">
+<!--      <el-radio-group v-model="value">-->
-        <el-radio-button label="1">消费有礼</el-radio-button>
+<!--        <el-radio-button label="1">消费有礼</el-radio-button>-->
-        <el-radio-button label="2">折扣营销</el-radio-button>
+<!--        <el-radio-button label="2">折扣营销</el-radio-button>-->
-        <el-radio-button label="3">满减营销</el-radio-button>
+<!--        <el-radio-button label="3">满减营销</el-radio-button>-->
-        <el-radio-button label="4">新人有礼</el-radio-button>
+<!--        <el-radio-button label="4">新人有礼</el-radio-button>-->
-        <el-radio-button label="5">推荐有礼</el-radio-button>
+<!--        <el-radio-button label="5">推荐有礼</el-radio-button>-->
-      </el-radio-group>
+<!--      </el-radio-group>-->
-    </el-card>
+<!--    </el-card>-->
-    <activeConsumption v-if="value == 1"></activeConsumption>
+    <div class="fji" >
-    <activeDiscount v-if="value == 2"></activeDiscount>
+      <div class="wrap-box" @click="gobox(1)" >
-    <activeFullminus v-if="value == 3"></activeFullminus>
+        <img src="../../../assets/images/xfyl.png" style="width: 260px;height: 260px;margin: 0 auto " >
-    <activeNewlyweds v-if="value == 4" ></activeNewlyweds>
+        <div class="bottom-box">
-    <activeRecommend v-if="value == 5"></activeRecommend>
+          <div>消费有礼</div>
+        </div>
+      </div>
+      <div class="wrap-box" @click="gobox(2)" >
+        <img src="../../../assets/images/zkyx.png" style="width: 260px;height: 260px;margin: 0 auto " >
+        <div class="bottom-box">
+          <div>折扣营销</div>
+        </div>
+      </div>
+      <div class="wrap-box" @click="gobox(3)" >
+        <img src="../../../assets/images/mjyx.png" style="width: 260px;height: 260px;margin: 0 auto " >
+        <div class="bottom-box">
+          <div>满减营销</div>
+        </div>
+      </div>
+      <div class="wrap-box" @click="gobox(4)" >
+        <img src="../../../assets/images/xryl.png" style="width: 260px;height: 260px;margin: 0 auto " >
+        <div class="bottom-box">
+          <div>新人有礼</div>
+        </div>
+      </div>
+      <div class="wrap-box" @click="gobox(5)" >
+        <img src="../../../assets/images/tjyl.png" style="width: 260px;height: 260px;margin: 0 auto " >
+        <div class="bottom-box">
+          <div>推荐有礼</div>
+        </div>
+      </div>
+    </div>
+
+
+
+<!--    <activeConsumption v-if="value == 1"></activeConsumption>-->
+<!--    <activeDiscount v-if="value == 2"></activeDiscount>-->
+<!--    <activeFullminus v-if="value == 3"></activeFullminus>-->
+<!--    <activeNewlyweds v-if="value == 4" ></activeNewlyweds>-->
+<!--    <activeRecommend v-if="value == 5"></activeRecommend>-->
     <!-- 添加或修改兑换券对话框 -->
   </div>
 </template>
@@ -41,7 +76,23 @@ export default {
   },
 
   methods: {
-
+    gobox(id){
+      if(id == 1){
+        this.$router.push('/EventMarketing/activeConsumption/index')
+      }
+      if(id == 2){
+        this.$router.push('/EventMarketing/activeDiscount/index')
+      }
+      if(id == 3){
+        this.$router.push('/EventMarketing/activeFullminus/index')
+      }
+      if(id == 4){
+        this.$router.push('/EventMarketing/activeNewlyweds/index')
+      }
+      if(id == 5){
+        this.$router.push('/EventMarketing/activeRecommend/index')
+      }
+    },
 
   }
 }
@@ -49,9 +100,30 @@ export default {
 <style scoped lang="scss">
 .app-container{
   width: 100%;
-  height: 100%;
+  height: 100vh;
 }
 .qr-code{
   margin: 0px auto;
 }
+.wrap-box{
+  width: 260px;
+  text-align: center;
+  background: #FFFFFF;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0px 2px 4px rgb(31 30 47 / 10%);
+  margin-right: 15px;
+  cursor: pointer;
+}
+.fji{
+  display: flex;
+  flex-wrap: wrap;
+}
+.bottom-box{
+  box-sizing: border-box;
+  padding: 0px 15px;
+  font-size: 18px;
+  font-weight: bold;
+  padding-bottom: 15px;
+}
 </style>

fuintAdmin/src/views/EventMarketing/coupon/index.vue

@@ -10,7 +10,6 @@
     name: 'index',
     data(){
       return{
-
         queryParams:{
           name:""
         },