前端

fuintAdmin/src/api/EventMarketing/yijian.js

@@ -16,6 +16,13 @@ export function getCardFavorableLists(status) {
     params: status
   })
 }
+export function getCardFavorable(id) {
+  return request({
+    url: 'business/marketingActivity/oneActiveOneCoupon/'+id,
+    method: 'get',
+
+  })
+}
 export function getAdaptUserList(data) {
 
   return request({

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

@@ -209,7 +209,7 @@
 
             <el-checkbox label="1" >赠送优惠券</el-checkbox>
             <el-checkbox label="2" >赠送兑换券</el-checkbox>
-            <el-checkbox label="4" >赠送实物</el-checkbox>
+
           </el-checkbox-group>
         </el-form-item>
 <!--        选择优惠券-->
@@ -784,9 +784,6 @@ export default {
         activeConsumptionChildList: [
           { required: true, message: '必填项不能为空', trigger: 'blur' },
         ],
-
-
-
       }
     };
   },

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

@@ -36,21 +36,56 @@
           label="排序"
         >
         </el-table-column>
-        <el-table-column label="会员名字" align="center" prop="name" />
-        <el-table-column label="手机号" align="center" prop="mobile" />
-        <el-table-column label="券名称" align="center" prop="cardFavorableName"/>
-        <el-table-column label="券的类型" align="center" prop="discountType" >
+        <el-table-column label="活动名称" align="center" prop="activeName" />
+        <el-table-column label="选择条件 " align="center" prop="gradeName" width="400px"  >
           <template slot-scope="scope">
-            <span v-if="scope.row.status == 0">满减券</span>
-            <span v-if="scope.row.status == 1">折扣券</span>
+          <div v-for="(item,index) in  scope.row.userVos">会员名称: {{item.gradeName}} 存量: {{item.countAll}} 不活跃用户: {{item.count}} 占比: {{item.rate}}</div>
           </template>
         </el-table-column>
-        <el-table-column label="状态" align="center" prop="status" >
+        <el-table-column label="不活跃天数" align="center" prop="conditions"/>
+        <el-table-column label="优惠券领取数量" align="center" prop="couponReceiveCount" >
           <template slot-scope="scope">
-            <span v-if="scope.row.status == 0"> <el-tag>未使用</el-tag>   </span>
-            <span v-if="scope.row.status == 1"><el-tag type="danger">已使用</el-tag>   </span>
+           <span>{{scope.row.couponReceiveCount}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="优惠券使用数量" align="center" prop="couponUseCount" >
+          <template slot-scope="scope">
+            <span>{{scope.row.couponUseCount}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="兑换券领取数量" align="center" prop="exchangeReceiveCount" >
+          <template slot-scope="scope">
+            <span>{{scope.row.exchangeReceiveCount}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="兑换券使用数量" align="center" prop="exchangeUseCount" >
+          <template slot-scope="scope">
+            <span>{{scope.row.exchangeUseCount}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="创建时间;" align="center" prop="createTime" >
+          <template slot-scope="scope">
+            <span> {{scope.row.createTime}}  </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" align="center" prop="createTime" >
+          <template slot-scope="scope">
+            <span> {{scope.row.createBy}}  </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="操作">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="updated(scope.row)"
+            >修改</el-button>
+          </template>
+        </el-table-column>
+
       </el-table>
       <pagination
         v-show="total>0"
@@ -173,7 +208,7 @@
         </div>
         <!--        选择兑换券-->
         <div class="xh-box"  >
-          <div class="box-bt"> <div >选择兑换券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistExchange()" >新增</el-button>  </div>
+          <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
@@ -375,13 +410,12 @@
       /></div>
     </el-dialog>
     <!--    实物列表-->
-
   </div>
 </template>
 
 <script>
 import { getoiltype,getoilName, listActiveConsumption,listExchange,listLJGoods, getActiveConsumption, delActiveConsumption, addActiveConsumption, updateActiveConsumption,listFavorable } from "@/api/EventMarketing/activeConsumption";
-import {issueCardFavorable,getCardFavorableLists,getAdaptUserList} from "@/api/EventMarketing/yijian";
+import {issueCardFavorable,getCardFavorableLists,getAdaptUserList,getCardFavorable} from "@/api/EventMarketing/yijian";
 import {listUserGrade} from "@/api/staff/user/usergrade";
 
 export default {
@@ -552,6 +586,11 @@ export default {
     this.listUserGrade()
   },
   methods: {
+    updated(row){
+      getCardFavorable(row.id).then(res=>{
+        console.log(res)
+      })
+    },
     change(e){
       let data = {
         gradeIds:e,