pansl 1 年之前
父節點
當前提交
31d3703447

+ 4 - 4
src/api/dataStatistics/rechargeStatistics/index.ts

@@ -14,24 +14,24 @@ export function statisticChargeListTotalCharge(params: object) {
 /**
  * 充值统计-今日充值
  */
-export function statisticChargeTodayCharge(params?: object) {
+export function statisticChargeTodayCharge(params: object) {
   return http.get('/statistic/charge/todayCharge', params);
 }
 /**
  * 充值统计-本月充值
  */
-export function statisticChargeCurrentMonthCharge(params?: object) {
+export function statisticChargeCurrentMonthCharge(params: object) {
   return http.get('/statistic/charge/currentMonthCharge', params);
 }
 /**
  * 充值统计-上月充值
  */
-export function statisticChargeLastMonthCharge(params?: object) {
+export function statisticChargeLastMonthCharge(params: object) {
   return http.get('/statistic/charge/lastMonthCharge', params);
 }
 /**
  * 充值统计-累计充值
  */
-export function statisticChargeTotalCharge(params?: object) {
+export function statisticChargeTotalCharge(params: object) {
   return http.get('/statistic/charge/totalCharge', params);
 }

+ 2 - 2
src/layout/components/header/index.vue

@@ -12,8 +12,8 @@
             value-key="id" remote @change="adverChange" reserve-keyword placeholder="请选择投手" :remote-method="remoteMethod">
             <el-option v-for="item in navDataArr" :key="item.id" :label="item.username" :value="item" />
           </el-select>
-          <el-select v-model="navData.app" style="width:260px;" class="m-2" @change="appChange" value-key="id" clearable
-            filterable placeholder="请选择" size="default">
+          <el-select v-model="navData.app" style="width:260px;" class="m-2" @change="appChange" value-key="id" filterable
+            placeholder="请选择" size="default">
             <el-option v-for="item in miniPrograms" :key="item.id" :label="item.name" :value="item">
               <div class="flex items-center">
                 <el-image :src="item.type_logo" style="width: 20px; height: 20px" class="mr-5" fit="contain"></el-image>

+ 35 - 130
src/views/dataStatistics/rechargeStatistics/excelTitle.ts

@@ -1,133 +1,38 @@
 // 导出中文/字段
-export const titleObj = {
-  时间: 'day_at',
-  优化师: 'username',
-  小程序名称: 'miniprogram_name',
-  充值金额: 'pay_money',
-  充值笔数: 'pay_count',
-  新增普通用户充值总额: 'new_user_common_pay_money',
-  新增会员用户充值总额: 'new_user_vip_pay_money',
-  普通充值总额: 'common_pay_money',
-  普通充值人均: 'common_pay_money_per',
-  普通充值已支付订单数: 'common_pay_count',
-  普通充值未支付订单数: 'common_unpay_count',
-  普通充值支付率: 'common_pay_rate',
-  会员充值总额: 'vip_pay_money',
-  会员充值人均: 'vip_pay_money_per',
-  会员充值已支付订单数: 'vip_pay_count',
-  会员充值未支付订单数: 'vip_unpay_count',
-  会员充值支付率: 'vip_pay_rate',
-};
+import { ref, onMounted, onUnmounted, Ref } from 'vue';
+export const useExcelTitle = (callback?: () => void): any => {
+  const rolesIdentify = inject('rolesIdentify');
+  const title = {
+    时间: 'day_at',
+    优化师: 'username',
+    小程序名称: 'miniprogram_name',
+    充值金额: 'pay_money',
+    充值笔数: 'pay_count',
+    新增普通用户充值总额: 'new_user_common_pay_money',
+    新增会员用户充值总额: 'new_user_vip_pay_money',
+    普通充值总额: 'common_pay_money',
+    普通充值人均: 'common_pay_money_per',
+    普通充值已支付订单数: 'common_pay_count',
+    普通充值未支付订单数: 'common_unpay_count',
+    普通充值支付率: 'common_pay_rate',
+    会员充值总额: 'vip_pay_money',
+    会员充值人均: 'vip_pay_money_per',
+    会员充值已支付订单数: 'vip_pay_count',
+    会员充值未支付订单数: 'vip_unpay_count',
+    会员充值支付率: 'vip_pay_rate'
+  };
+
+  if (rolesIdentify.value.includes('optimizer')) {
+    delete title['优化师'];
+  }
+
+  callback && callback();
 
+  onMounted(() => {});
 
-/**
- * <el-table :data="tableData" class="mt-3" v-loading="loading">
-        <el-table-column prop="day_at" label="时间" />
-        <el-table-column prop="username" label="优化师" min-width="160px" />
-        <el-table-column prop="miniprogram_name" label="小程序名称" min-width="160px" />
-        <el-table-column label="充值金额" prop="pay_money">
-          <template #header>
-            <div class="flex items-center">
-              <span>充值金额</span>
-              <el-tooltip placement="top">
-                <template #content>
-                  当日累计充值金额<br />
-                </template>
-                <el-icon>
-                  <InfoFilled />
-                </el-icon>
-              </el-tooltip>
-            </div>
-          </template>
-          <template #default="scope">
-            <div class="wrapper">
-              <div>{{ scope.row.pay_money }}</div>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="充值笔数" prop="pay_count">
-          <template #header>
-            <div class="flex items-center">
-              <span>充值笔数</span>
-              <el-tooltip placement="top">
-                <template #content>
-                  当日累计充值笔数<br />
-                </template>
-                <el-icon>
-                  <InfoFilled />
-                </el-icon>
-              </el-tooltip>
-            </div>
-          </template>
-          <template #default="scope">
-            <div class="wrapper">
-              <div>{{ scope.row.pay_count }}</div>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="新增用户充值总额" prop="new_user_pay_money">
-          <template #header>
-            <div class="flex items-center">
-              <span>新增用户充值总额</span>
-              <el-tooltip placement="top">
-                <template #content>
-                  当日新用户充值总额<br />
-                </template>
-                <el-icon>
-                  <InfoFilled />
-                </el-icon>
-              </el-tooltip>
-            </div>
-          </template>
-          <template #default="scope">
-            <div class="wrapper">
-              <div>{{ scope.row.new_user_pay_money }}</div>
-              <div>普通:{{ scope.row.new_user_common_pay_money }}</div>
-              <div>会员:{{ scope.row.new_user_vip_pay_money }}</div>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="普通充值" min-width="250">
-          <el-table-column prop="common_pay_money" label="金额">
-            <template #default="scope">
-              <div class="wrapper">
-                <div>总额:{{ scope.row.common_pay_money }}</div>
-                <div>人均:{{ scope.row.common_pay_money }}</div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="支付订单数" prop="common_pay_count">
-            <template #default="scope">
-              <div class="wrapper">
-                <div class="mb-2">
-                  <span class="mr-2">已:{{ scope.row.common_pay_count }}</span>
-                  <span>未:{{ scope.row.common_unpay_count }}</span>
-                </div>
-                <div>支付率:{{ scope.row.common_pay_rate }}</div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="会员充值" min-width="250">
-          <el-table-column prop="vip_pay_money" label="金额">
-            <template #default="scope">
-              <div class="wrapper">
-                <div>总额:{{ scope.row.vip_pay_money }}</div>
-                <div>人均:{{ scope.row.vip_pay_money_per }}</div>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="支付订单数" prop="vip_pay_count">
-            <template #default="scope">
-              <div class="wrapper">
-                <div class="mb-2">
-                  <span class="mr-2">已:{{ scope.row.vip_pay_count }}</span>
-                  <span>未:{{ scope.row.vip_unpay_count }}</span>
-                </div>
-                <div>支付率:{{ scope.row.vip_pay_rate }}</div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table-column>
-      </el-table>
- */
+  onUnmounted(() => {});
+
+  return {
+    title
+  };
+};

+ 4 - 3
src/views/dataStatistics/rechargeStatistics/index.vue

@@ -24,7 +24,7 @@
         </el-form-item>
       </template>
       <template v-slot:extra_button>
-        <exportExcel api="statistic/charge/list" sheet_name="充值统计" :title_obj="titleObj"
+        <exportExcel api="statistic/charge/list" sheet_name="充值统计" :title_obj="titleObj.title"
           :extro_params="{ is_export: true, ...query }">
         </exportExcel>
       </template>
@@ -44,7 +44,7 @@
         <div class="table-default" v-action="'statistic.chargeTJ.list'">
           <el-table :data="tableData" class="mt-3" v-loading="loading">
             <el-table-column prop="day_at" label="时间" />
-            <el-table-column prop="username" label="优化师" min-width="160px" />
+            <el-table-column prop="username" label="优化师" v-if="!rolesIdentify.includes('optimizer')" min-width="160px" />
             <el-table-column prop="miniprogram_name" label="小程序名称" min-width="160px" />
             <el-table-column label="充值金额" prop="pay_money" min-width="160px">
               <template #header>
@@ -165,7 +165,8 @@ import { useRouter, useRoute } from 'vue-router'
 import { InfoFilled } from '@element-plus/icons-vue';
 import { useGetList } from '@/hook/curd/useGetList';
 import { statisticChargeListTotalCharge } from '@/api/dataStatistics/rechargeStatistics/index'
-import { titleObj } from "./excelTitle";
+import { useExcelTitle } from "./excelTitle";
+const titleObj = useExcelTitle()
 import moment from 'moment';
 const start_date = moment().subtract(7, 'days').format('YYYY-MM-DD');
 const end_date = moment().format('YYYY-MM-DD');

+ 41 - 32
src/views/dataStatistics/rechargeStatistics/summaryStatistics.vue

@@ -17,36 +17,36 @@
           <p class="text-red-300">{{ timer.seconds }}s后刷新</p>
         </div>
       </template>
-      <div class="money-wrapper">¥{{ todayChargeData.pay_money || '-' }}</div>
+      <div class="money-wrapper">¥{{ todayChargeData.pay_money ?? '-' }}</div>
       <div class="flex items-center justify-between">
         <div>
           <p class="text-lg font-bold">普通充值</p>
           <div>
             <span class="text-sm">已支付:</span>
-            <span class="text-base">{{ todayChargeData.common_pay_count || '-' }}单</span>
+            <span class="text-base">{{ todayChargeData.common_pay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">未支付:</span>
-            <span class="text-base">{{ todayChargeData.common_unpay_count || '-' }}单</span>
+            <span class="text-base">{{ todayChargeData.common_unpay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">支付率:</span>
-            <span class="text-base">{{ todayChargeData.company_pay_rate || '-' }}</span>
+            <span class="text-base">{{ todayChargeData.company_pay_rate ?? '-' }}</span>
           </div>
         </div>
         <div>
           <p class="text-lg font-bold">会员充值</p>
           <div>
             <span class="text-sm">已支付:</span>
-            <span class="text-base">{{ todayChargeData.vip_pay_count || '-' }}单</span>
+            <span class="text-base">{{ todayChargeData.vip_pay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">未支付:</span>
-            <span class="text-base">{{ todayChargeData.vip_unpay_count || '-' }}单</span>
+            <span class="text-base">{{ todayChargeData.vip_unpay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">支付率:</span>
-            <span class="text-base">{{ todayChargeData.vip_pay_rate || '-' }}</span>
+            <span class="text-base">{{ todayChargeData.vip_pay_rate ?? '-' }}</span>
           </div>
         </div>
       </div>
@@ -68,36 +68,36 @@
           </div>
         </div>
       </template>
-      <div class="money-wrapper">¥{{ currentMonthChargeData.pay_money || '-' }}</div>
+      <div class="money-wrapper">¥{{ currentMonthChargeData.pay_money ?? '-' }}</div>
       <div class="flex items-center justify-between">
         <div>
           <p class="text-lg font-bold">普通充值</p>
           <div>
             <span class="text-sm">已支付:</span>
-            <span class="text-base">{{ currentMonthChargeData.common_pay_count || '-' }}单</span>
+            <span class="text-base">{{ currentMonthChargeData.common_pay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">未支付:</span>
-            <span class="text-base">{{ currentMonthChargeData.common_unpay_count || '-' }}单</span>
+            <span class="text-base">{{ currentMonthChargeData.common_unpay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">支付率:</span>
-            <span class="text-base">{{ currentMonthChargeData.company_pay_rate || '-' }}</span>
+            <span class="text-base">{{ currentMonthChargeData.company_pay_rate ?? '-' }}</span>
           </div>
         </div>
         <div>
           <p class="text-lg font-bold">会员充值</p>
           <div>
             <span class="text-sm">已支付:</span>
-            <span class="text-base">{{ currentMonthChargeData.vip_pay_count || '-' }}单</span>
+            <span class="text-base">{{ currentMonthChargeData.vip_pay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">未支付:</span>
-            <span class="text-base">{{ currentMonthChargeData.vip_unpay_count || '-' }}单</span>
+            <span class="text-base">{{ currentMonthChargeData.vip_unpay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">支付率:</span>
-            <span class="text-base">{{ currentMonthChargeData.vip_pay_rate || '-' }}</span>
+            <span class="text-base">{{ currentMonthChargeData.vip_pay_rate ?? '-' }}</span>
           </div>
         </div>
       </div>
@@ -118,36 +118,36 @@
           </div>
         </div>
       </template>
-      <div class="money-wrapper">¥{{ lastMonthChargeData.pay_money || '-' }}</div>
+      <div class="money-wrapper">¥{{ lastMonthChargeData.pay_money ?? '-' }}</div>
       <div class="flex items-center justify-between">
         <div>
           <p class="text-lg font-bold">普通充值</p>
           <div>
             <span class="text-sm">已支付:</span>
-            <span class="text-base">{{ lastMonthChargeData.common_pay_count || '-' }}单</span>
+            <span class="text-base">{{ lastMonthChargeData.common_pay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">未支付:</span>
-            <span class="text-base">{{ lastMonthChargeData.common_unpay_count || '-' }}单</span>
+            <span class="text-base">{{ lastMonthChargeData.common_unpay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">支付率:</span>
-            <span class="text-base">{{ lastMonthChargeData.company_pay_rate || '-' }}</span>
+            <span class="text-base">{{ lastMonthChargeData.company_pay_rate ?? '-' }}</span>
           </div>
         </div>
         <div>
           <p class="text-lg font-bold">会员充值</p>
           <div>
             <span class="text-sm">已支付:</span>
-            <span class="text-base">{{ lastMonthChargeData.vip_pay_count || '-' }}单</span>
+            <span class="text-base">{{ lastMonthChargeData.vip_pay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">未支付:</span>
-            <span class="text-base">{{ lastMonthChargeData.vip_unpay_count || '-' }}单</span>
+            <span class="text-base">{{ lastMonthChargeData.vip_unpay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">支付率:</span>
-            <span class="text-base">{{ lastMonthChargeData.vip_pay_rate || '-' }}</span>
+            <span class="text-base">{{ lastMonthChargeData.vip_pay_rate ?? '-' }}</span>
           </div>
         </div>
       </div>
@@ -169,36 +169,36 @@
           </div>
         </div>
       </template>
-      <div class="money-wrapper">¥{{ totalChargeData.pay_money || '-' }}</div>
+      <div class="money-wrapper">¥{{ totalChargeData.pay_money ?? '-' }}</div>
       <div class="flex items-center justify-between">
         <div>
           <p class="text-lg font-bold">普通充值</p>
           <div>
             <span class="text-sm">已支付:</span>
-            <span class="text-base">{{ totalChargeData.common_pay_count || '-' }}单</span>
+            <span class="text-base">{{ totalChargeData.common_pay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">未支付:</span>
-            <span class="text-base">{{ totalChargeData.common_unpay_count || '-' }}单</span>
+            <span class="text-base">{{ totalChargeData.common_unpay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">支付率:</span>
-            <span class="text-base">{{ totalChargeData.company_pay_rate || '-' }}</span>
+            <span class="text-base">{{ totalChargeData.company_pay_rate ?? '-' }}</span>
           </div>
         </div>
         <div>
           <p class="text-lg font-bold">会员充值</p>
           <div>
             <span class="text-sm">已支付:</span>
-            <span class="text-base">{{ totalChargeData.vip_pay_count || '-' }}单</span>
+            <span class="text-base">{{ totalChargeData.vip_pay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">未支付:</span>
-            <span class="text-base">{{ totalChargeData.vip_unpay_count || '-' }}单</span>
+            <span class="text-base">{{ totalChargeData.vip_unpay_count ?? '-' }}单</span>
           </div>
           <div>
             <span class="text-sm">支付率:</span>
-            <span class="text-base">{{ totalChargeData.vip_pay_rate || '-' }}</span>
+            <span class="text-base">{{ totalChargeData.vip_pay_rate ?? '-' }}</span>
           </div>
         </div>
       </div>
@@ -210,6 +210,7 @@
 import { checkPermission } from '@/directives/permission';
 import { InfoFilled } from '@element-plus/icons-vue';
 import { useCountdownTimer } from '@/utils/timerUtils';
+import Cache from '@/support/cache'
 import {
   statisticChargeTodayCharge,
   statisticChargeCurrentMonthCharge,
@@ -222,6 +223,7 @@ const currentMonthChargeData = ref({})
 const lastMonthChargeData = ref({})
 const totalChargeData = ref({})
 const rolesIdentify = inject('rolesIdentify')
+const miniprogram_idJ = ref('')
 const refreshInterface = (): void => {
   initTodayCharge()
 };
@@ -229,31 +231,38 @@ const timer = useCountdownTimer(60, refreshInterface);
 
 const initTodayCharge = () => {
   if (!checkPermission('statistic.chargeTJ.todayCharge')) return;
-  statisticChargeTodayCharge().then(res => {
+  statisticChargeTodayCharge({ miniprogram_id: miniprogram_idJ.value }).then(res => {
     todayChargeData.value = res.data
   })
 }
 const init = () => {
+  const miniprogram_id = miniprogram_idJ.value
   if (checkPermission('statistic.chargeTJ.currentMonthCharge')) {
-    statisticChargeCurrentMonthCharge().then(res => {
+    statisticChargeCurrentMonthCharge({ miniprogram_id }).then(res => {
       currentMonthChargeData.value = res.data;
     })
   }
   if (checkPermission('statistic.chargeTJ.lastMonthCharge')) {
-    statisticChargeLastMonthCharge().then(res => {
+    statisticChargeLastMonthCharge({ miniprogram_id }).then(res => {
       lastMonthChargeData.value = res.data;
     })
   }
   if (checkPermission('statistic.chargeTJ.totalCharge')) {
-    statisticChargeTotalCharge().then(res => {
+    statisticChargeTotalCharge({ miniprogram_id }).then(res => {
       totalChargeData.value = res.data;
     })
   }
 }
 
 onMounted(() => {
+  if (JSON.parse(Cache.get('nav_data'))?.app.id) {
+    miniprogram_idJ.value = JSON.parse(Cache.get('nav_data'))?.app.id
+    console.log(miniprogram_idJ.value, 'miniprogram_idJ.value');
+  }
   init()
   initTodayCharge()
+  console.log(JSON.parse(Cache.get('nav_data'))?.app.id, 'Cache.getCache.getCache.get');
+
 });
 
 </script>

+ 44 - 22
src/views/dataStatistics/roiStatistical/excelTitle.ts

@@ -1,24 +1,46 @@
 // 导出中文/字段
-export const titleObj = {
-  时间: 'day_at',
-  商户名称: 'company_username',
-  优化师: 'optimizer_name',
-  小程序名称: 'miniprogram_name',
-  推广链接: 'promotion_name',
-  当日新增用户数: 'new_user_num',
-  累计充值人数: 'new_user_pay_uv',
-  投放成本: 'cost_money',
-  回本率金额: 'new_user_pay_money',
-  回本: 'huiben',
-  新增用户成本: 'new_user_cost_money',
-  新用户人均充值: 'new_user_pay_money_per',
-  会员成本金额: 'new_user_vip_pay_money',
-  会员成本人数: 'new_user_vip_pay_uv',
-  会员成本累计: 'vip_money_per',
-  充值成本金额: 'new_user_pay_money',
-  充值成本人数: 'new_user_common_pay_uv',
-  充值成本累计: 'common_money_per',
-  会员转化率: 'zhuanhua_vip',
-  充值转化率: 'zhuanhua_common',
-  总计转化率: 'zhuanhua_all'
+import { ref, onMounted, onUnmounted, Ref } from 'vue';
+export const useExcelTitle = (callback?: () => void): any => {
+  const rolesIdentify = inject('rolesIdentify');
+  const title = {
+    时间: 'day_at',
+    商户名称: 'company_username',
+    优化师: 'optimizer_name',
+    小程序名称: 'miniprogram_name',
+    推广链接: 'promotion_name',
+    当日新增用户数: 'new_user_num',
+    累计充值人数: 'new_user_pay_uv',
+    投放成本: 'cost_money',
+    回本率金额: 'new_user_pay_money',
+    回本: 'huiben',
+    新增用户成本: 'new_user_cost_money',
+    新用户人均充值: 'new_user_pay_money_per',
+    会员成本金额: 'new_user_vip_pay_money',
+    会员成本人数: 'new_user_vip_pay_uv',
+    会员成本累计: 'vip_money_per',
+    充值成本金额: 'new_user_pay_money',
+    充值成本人数: 'new_user_common_pay_uv',
+    充值成本累计: 'common_money_per',
+    会员转化率: 'zhuanhua_vip',
+    充值转化率: 'zhuanhua_common',
+    总计转化率: 'zhuanhua_all'
+  };
+  if (!rolesIdentify.value.includes('administrator')) {
+    delete title['商户名称'];
+  }
+
+  if (rolesIdentify.value.includes('optimizer')) {
+    delete title['商户名称'];
+    delete title['优化师'];
+  }
+
+  callback && callback();
+
+  onMounted(() => {});
+
+  onUnmounted(() => {});
+
+  return {
+    title
+  };
 };

+ 9 - 5
src/views/dataStatistics/roiStatistical/index.vue

@@ -23,7 +23,7 @@
         </el-form-item>
       </template>
       <template v-slot:extra_button>
-        <exportExcel api="statistic/roi/list" sheet_name="投入产出" :title_obj="titleObj"
+        <exportExcel api="statistic/roi/list" sheet_name="投入产出" :title_obj="titleObj.title"
           :extro_params="{ is_export: 1, ...query }">
         </exportExcel>
       </template>
@@ -41,10 +41,12 @@
     <div class="table-default" v-action="'statistic.ROITJ.list'">
       <el-table :data="tableData" class="mt-3" v-loading="loading">
         <el-table-column prop="day_at" label="时间" min-width="150px" />
-        <el-table-column prop="company_username" label="商户名称" min-width="100px" />
-        <el-table-column prop="optimizer_name" label="优化师" min-width="150px" />
+        <el-table-column prop="company_username" label="商户名称" v-if="rolesIdentify.includes('administrator')"
+          min-width="100px" />
+        <el-table-column prop="optimizer_name" label="优化师" v-if="!rolesIdentify.includes('optimizer')"
+          min-width="150px" />
         <el-table-column prop="miniprogram_name" label="小程序名称" min-width="150px" />
-        <el-table-column prop="promotion_name" label="推广链接" min-width="100px" />
+        <el-table-column prop="promotion_name" label="推广名称" min-width="100px" />
         <el-table-column label="新增人数" prop="" min-width="180px">
           <template #header>
             <span>新增人数</span>
@@ -238,7 +240,9 @@ import { useRouter, useRoute } from 'vue-router';
 import { InfoFilled } from '@element-plus/icons-vue';
 import { useGetList } from '@/hook/curd/useGetList';
 import { statisticRoiListTotal, statisticRoiUpdateCostmoney } from '@/api/dataStatistics/roiStatistical/index';
-import { titleObj } from "./excelTitle";
+import { useExcelTitle } from "./excelTitle";
+const titleObj = useExcelTitle()
+console.log(titleObj, 'titleObjtitleObjtitleObj');
 import { checkPermission } from '@/directives/permission';
 import {
   channelMiniprogramUseList,

+ 14 - 8
src/views/user/caster/index.vue

@@ -37,10 +37,16 @@
                 <el-image style="width: 20px; height: 20px" class="mt-1 mr-5" :src="applet.type_logo" fit="contain" />
                 <span class="mr-3 text-sm font-medium">{{ applet.name }}</span>
               </div>
-              <el-icon>
-                <Pointer @click="test(scope.row)" />
-              </el-icon>
-
+            </template>
+          </el-table-column>
+          <el-table-column prop="miniProgramIds" label="已绑定公众号">
+            <template #default="scope">
+              <div class="flex items-center justify-center h-8">
+                <span class="flex-1 text-sm font-medium">{{ scope.row.gzh_names || '-' }}</span>
+                <el-icon color="#409EFC" class="justify-start flex-1 cursor-pointer">
+                  <Edit @click="authorizedPublic(scope.row)" />
+                </el-icon>
+              </div>
             </template>
           </el-table-column>
           <el-table-column prop="status" label="状态" v-action="'User.user.enable'">
@@ -60,17 +66,17 @@
       <Dialog v-model="visible" :title="title" destroy-on-close>
         <Create @close="close(search)" :primary="id" />
       </Dialog>
-      <el-dialog draggable v-model="visibleIframe" align-center width="80%" append-to-body center :show-close="false"
+      <!-- <el-dialog draggable v-model="visibleIframe" align-center width="80%" append-to-body center :show-close="false"
         style="background: none;box-shadow: none;height:80%" destroy-on-close>
         <iframe class="iframe" :src="iframeSrc"></iframe>
-      </el-dialog>
+      </el-dialog> -->
     </div>
   </div>
 </template>
 
 <script lang="ts" setup>
 import { computed, onMounted, ref } from 'vue';
-import { Pointer } from '@element-plus/icons-vue'
+import { Edit } from '@element-plus/icons-vue'
 import Create from './create.vue';
 import { useGetList } from '@/hook/curd/useGetList';
 import { useOpen } from '@/hook/curd/useOpen';
@@ -78,7 +84,7 @@ import { channelMiniprogramList, channelOpenPlatformPreauth } from '@/api/applet
 const visibleIframe = ref(false)
 const iframeSrc = ref()
 
-const test = (row: object) => {
+const authorizedPublic = (row: object) => {
   channelOpenPlatformPreauth({ user_id: row.id }).then(res => {
     console.log(res, 'user_id=10');
     visibleIframe.value = true