fix: 一些调整

src/api/card-package.js

@@ -15,7 +15,6 @@ let packages = {
   editPackages: '/coupon-package/edit-package', // 编辑卡券包
   pageCouponPackage: '/coupon-package/page-package', // 获取卡券包列表
   pagePackageLog: '/coupon-package/page-package-log', // 卡券包发放记录
-  packageCouponReceiveLog: '/coupon-package/package-coupon-receive-log', // 卡券领取记录详情 TODO:
   getPackageDetail: '/coupon-package/package-detail', // 获取卡券包详情
   deletePackage: '/coupon-package/batch-del-package', // 删除某个卡券包
   updatePackageStock: '/coupon-package/update-package-stock', // 调整卡券包库存

src/api/common.js

@@ -12,6 +12,7 @@ let common = {
 
 let o2 = {
   getSubappList: '/area/member-cards', // 获取域列表
+  getAppList: '/stock/application-list', // 获取应用列表
 };
 
 // other

src/components/layout/aside-menu.vue

@@ -146,7 +146,7 @@ export default {
     },
     '$route.path': {
       handler() {
-        // this.getActiveIndex();
+        this.getActiveIndex();
       }
     }
   }

src/views/card-package/list.vue

@@ -87,7 +87,7 @@
       <el-table-column label="操作" align="left" width="210px" fixed="right">
         <template slot-scope="scope">
           <dm-perm-button type="text" @click="$router.push(`/card-package/edit?id=${scope.row.couponPackageId}`)">编辑</dm-perm-button>
-          <dm-perm-button type="text" @click="$router.push(`/card-package/edit?id=${scope.row.couponPackageId}`)">发放记录</dm-perm-button>
+          <dm-perm-button type="text" @click="$router.push(`/card-package/send-list?id=${scope.row.couponPackageId}`)">发放记录</dm-perm-button>
           <el-popover popper-class="option-dropdown" trigger="hover">
             <ul>
               <li v-if="scope.row._status == 2">

src/views/card-package/send-list.vue

 <template>
   <div class="p20" v-loading="loading">
     <div class="pb20 clearfix flex-center">
-      <el-select v-model="listParams.sendStatus" class="w250 mr10" placeholder="全部发放状态" clearable @change="refresh">
-        <el-option label="成功" :value="1"></el-option>
-        <el-option label="失败" :value="0"></el-option>
+      <el-select v-model="listParams.appCode" class="w250 mr10" placeholder="全部来源" clearable @change="refresh">
+        <el-option v-for="item in appList" :key="item.appCode" :label="item.appCode" :value="item.appName"></el-option>
       </el-select>
       <el-input placeholder="请输入关键字搜索" class="w400 mr10" v-model="listParams.search" clearable @change="refresh">
         <el-select v-model="listParams.searchType" slot="prepend" style="width:120px;" placeholder="请选择" @change="refresh">
           <el-option label="福利ID" :value="1"></el-option>
           <el-option label="卡券包名称" :value="2"></el-option>
           <el-option label="备注名" :value="3"></el-option>
-          <el-option label="副标题" :value="4"></el-option>
-          <el-option label="会员称呼" :value="5"></el-option>
-          <el-option label="会员手机号" :value="6"></el-option>
+          <el-option label="会员称呼" :value="4"></el-option>
+          <el-option label="会员手机号" :value="5"></el-option>
+          <el-option label="会员卡号" :value="6"></el-option>
         </el-select>
       </el-input>
       <el-select v-model="listParams.appCode" class="w250 mr10" placeholder="全部来源" clearable @change="refresh">
@@ -68,25 +67,29 @@
 import { page, formate } from '@/mixins/table.js';
 import { listTime } from '@/utils/index.js';
 import api from '@/api/card-package.js';
+import commonApi from '@/api/common.js';
 const { pagePackageLog } = api;
+const { getAppList } = commonApi;
+
 export default {
   name: 'MergeRecordList',
   mixins: [ page, formate  ],
   data() {
     return {
       loading: false,
+      appList: [], // 应用列表
       dateTime: [],
       listParams: {
         appCode: '',
         activityName: '',
-        sendStatus: '',
         beginTime: '',
         endTime: '',
         packageName: '',
         search: '',
-        searchType: 2,
+        searchType: 1, // 1、福利id 2、卡券包名称、3、备注名、、4会员称呼、5会员手机号、6会员卡号
         currentPage: 1,
-        pageSize: 20
+        pageSize: 20,
+        couponPackageId: this.$route.query.id // 卡券包id
       },
       tableList: [],
       total: 0,
@@ -101,9 +104,15 @@ export default {
   },
   mounted() {
     this.getTableList();
+    this.getAppList();
   },
   methods: {
     listTime,
+    getAppList() {
+      getAppList().then(res => {
+        this.appList = res.result || [];
+      });
+    },
     showDetail({ packageLogId }) {
       return;
     },
@@ -117,7 +126,6 @@ export default {
       pagePackageLog(params).then(res => {
         this.loading = false;
         const data = res.result;
-        console.log(data.result);
         this.tableList = data.result || [];
         this.total = data.totalCount;
         // 删除至最后一页没数据的情况，页码-1