Merge branch 'cheney' into dev

src/views/company-information/api.ts

@@ -0,0 +1,75 @@
+import { request } from '/@/utils/service';
+
+
+const apiPrefix = '/api/assets/company/';
+
+export function getCardData(query: any) {
+  return request({
+    url: apiPrefix + 'card/',
+    method: 'GET',
+    params: query,
+  });
+}
+
+export function getTableData(query: any) {
+  return request({
+    url: apiPrefix,
+    method: 'GET',
+    params: query,
+  });
+}
+
+export function getPlatformDetailOverview(query: any) {
+  return request({
+    url: apiPrefix + 'platform/',
+    method: 'GET',
+    params: query,
+  });
+}
+
+export function getShopDetailOverview(query: any) {
+  return request({
+    url: apiPrefix + 'detail/',
+    method: 'GET',
+    params: query,
+  });
+}
+
+export function getCurrentInfo(query: any) {
+  return request({
+    url: apiPrefix + 'current/',
+    method: 'GET',
+    params: query,
+  });
+}
+
+export function getHistoryInfo(query: any) {
+  return request({
+    url: apiPrefix + 'past/',
+    method: 'GET',
+    params: query,
+  });
+}
+
+export function getComputerInfo(query: any) {
+  return request({
+    url: apiPrefix + 'computer/',
+    method: 'GET',
+    params: query,
+  });
+}
+
+export function getShopSelect() {
+  return request({
+    url: apiPrefix + 'box/',
+    method: 'GET',
+  });
+}
+
+export function createCompany(body: any) {
+  return request({
+    url: apiPrefix + 'create/',
+    method: 'POST',
+    data: body,
+  });
+}

src/views/company-information/components/CompanyCreate.vue

@@ -0,0 +1,185 @@
+<script lang="ts" setup>
+/**
+ * @Name: CompanyCreate.vue
+ * @Description: 新增公司
+ * @Author: Cheney
+ */
+
+import { ElMessage, FormInstance, FormRules } from 'element-plus';
+import { useResponse } from '/@/utils/useResponse';
+import * as api from '../api';
+import { Delete, Finished, Plus, RefreshLeft } from '@element-plus/icons-vue';
+
+
+const isOpen = defineModel({ default: false });
+const emit = defineEmits([ 'refresh' ]);
+
+const createLoading = ref(false);
+
+interface ContactItem {
+  phone: string;
+  email: string;
+}
+
+interface RuleForm {
+  name: string;
+  address: string;
+  enName: string;
+  juridicalPerson: string;
+  vatNumber: string;
+  vatCompany: string;
+  contacts: ContactItem[];
+}
+
+const ruleFormRef = ref<FormInstance>();
+const form = reactive<RuleForm>({
+  name: '',
+  address: '',
+  enName: '',
+  juridicalPerson: '',
+  vatNumber: '',
+  vatCompany: '',
+  contacts: [
+    {
+      phone: '',
+      email: ''
+    }
+  ]
+});
+
+const rules = reactive<FormRules<RuleForm>>({
+  name: [ { required: true, message: '请输入公司名称', trigger: 'blur' } ],
+  enName: [ { required: true, message: '请输入公司英文名称', trigger: 'blur' } ],
+  address: [ { required: true, message: '请输入公司地址', trigger: 'blur' } ],
+  juridicalPerson: [ { required: true, message: '请输入公司法人', trigger: 'blur' } ],
+  vatNumber: [ { required: true, message: '请输入VAT税号', trigger: 'blur' } ],
+  vatCompany: [ { required: true, message: '请输入VAT税号公司', trigger: 'blur' } ],
+  contacts: {
+    phone: [ { required: true, message: '请输入电话号码', trigger: 'blur' } ],
+    email: [
+      { required: true, message: '请输入邮箱地址', trigger: 'blur' },
+      { type: 'email', message: '请输入有效的邮箱地址', trigger: 'blur' }
+    ]
+  }
+});
+
+const addContact = () => {
+  form.contacts.push({
+    phone: '',
+    email: ''
+  });
+};
+
+const removeContact = (item: ContactItem) => {
+  const index = form.contacts.indexOf(item);
+  if (index !== -1) {
+    form.contacts.splice(index, 1);
+  }
+};
+
+async function create() {
+  const body = {
+    company: form.name,
+    companyEnglishName: form.enName,
+    address: form.address,
+    juridicalPerson: form.juridicalPerson,
+    vatNumber: form.vatNumber,
+    vatCompany: form.vatCompany,
+    companyPhoneEmail: form.contacts
+  };
+  await useResponse(body, api.createCompany, createLoading);
+}
+
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  await formEl.validate(async (valid, fields) => {
+    if (valid) {
+      await create();
+      isOpen.value = false;
+      emit('refresh');
+    } else {
+      console.log('error submit!', fields);
+      ElMessage.error('请检查表单');
+    }
+  });
+};
+
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  formEl.resetFields();
+};
+</script>
+
+<template>
+  <el-dialog v-model="isOpen" :close-on-click-modal="false" title="新增公司" width="35%">
+    <el-form
+        ref="ruleFormRef"
+        :model="form"
+        :rules="rules"
+        label-width="auto"
+        status-icon
+    >
+      <el-form-item label="公司名称" prop="name">
+        <el-input v-model="form.name" placeholder="请输入公司名称"></el-input>
+      </el-form-item>
+      <el-form-item label="英文名称" prop="enName">
+        <el-input v-model="form.enName" placeholder="请输入公司英文名称"></el-input>
+      </el-form-item>
+      <el-form-item label="公司地址" prop="address">
+        <el-input v-model="form.address" placeholder="请输入公司地址"></el-input>
+      </el-form-item>
+      <el-form-item label="公司法人" prop="juridicalPerson">
+        <el-input v-model="form.juridicalPerson" placeholder="请输入公司法人"></el-input>
+      </el-form-item>
+      <el-form-item label="VAT税号" prop="vatNumber">
+        <el-input v-model="form.vatNumber" placeholder="请输入VAT税号"></el-input>
+      </el-form-item>
+      <el-form-item label="VAT税号公司" prop="vatCompany">
+        <el-input v-model="form.vatCompany" placeholder="请输入VAT税号公司"></el-input>
+      </el-form-item>
+
+      <el-form-item
+          v-for="(contact, index) in form.contacts"
+          :key="index"
+          :label="'联系方式' + (index + 1)"
+      >
+        <div class="flex gap-2.5 items-start">
+          <el-form-item
+              :prop="'contacts.' + index + '.phone'"
+              :rules="rules.contacts.phone"
+          >
+            <el-input
+                v-model="contact.phone"
+                placeholder="请输入电话"
+            />
+          </el-form-item>
+          <el-form-item
+              :prop="'contacts.' + index + '.email'"
+              :rules="rules.contacts.email"
+          >
+            <el-input
+                v-model="contact.email"
+                placeholder="请输入邮箱"
+            />
+          </el-form-item>
+          <el-button :icon="Delete" type="danger" @click.prevent="removeContact(contact)">
+            删 除
+          </el-button>
+        </div>
+      </el-form-item>
+
+      <el-form-item>
+        <div class="flex flex-1 justify-end">
+          <el-button :icon="Plus" type="warning" @click="addContact">新增联系方式</el-button>
+          <el-button :icon="Finished" :loading="createLoading" type="primary" @click="submitForm(ruleFormRef)">创 建
+          </el-button>
+          <el-button :icon="RefreshLeft" @click="resetForm(ruleFormRef)">重 置</el-button>
+        </div>
+      </el-form-item>
+    </el-form>
+  </el-dialog>
+</template>
+
+<style scoped>
+
+</style>

src/views/company-information/components/CompanyDetail.vue

@@ -0,0 +1,136 @@
+<script lang="ts" setup>
+/**
+ * @Name: CompanyDetail.vue
+ * @Description: 公司详情
+ * @Author: Cheney
+ */
+
+import { Link, Picture as IconPicture } from '@element-plus/icons-vue';
+import { platformColumns } from '/@/views/shop-information/useColumns';
+import { usePagination } from '/@/utils/usePagination';
+import { useTableData } from '/@/utils/useTableData';
+import * as api from '/@/views/shop-information/api';
+import router from '/@/router';
+
+
+const route = useRoute();
+const companyId = route.query.platform;
+const platformOverview: any = ref([]);
+const overviewLoading = ref();
+const { tableOptions, handlePageChange } = usePagination(fetchCompanyDetail);
+const platformTableData = ref([]);
+const gridOptions: any = reactive({
+  border: false,
+  round: true,
+  stripe: true,
+  currentRowHighLight: true,
+  height: 870,
+  toolbarConfig: {
+    custom: true
+  },
+  rowConfig: {
+    isHover: true
+  },
+  columnConfig: {
+    resizable: true
+  },
+  pagerConfig: {
+    total: tableOptions.value.total,
+    page: tableOptions.value.page,
+    limit: tableOptions.value.limit
+  },
+  loading: false,
+  loadingConfig: {
+    icon: 'vxe-icon-indicator roll',
+    text: '正在拼命加载中...'
+  },
+  columns: platformColumns,
+  data: platformTableData
+});
+
+async function fetchCompanyDetail() {
+  const query = {
+    companyId,
+    page: gridOptions.pagerConfig.page,
+    limit: gridOptions.pagerConfig.limit
+  };
+  await useTableData(api.getTableData, query, gridOptions);
+}
+
+function handleNavigate(item: any) {
+  router.push({
+    path: '/shop/detail',
+    query: { platformNumber: item.platformNumber }
+  });
+}
+</script>
+
+<template>
+  <div class="p-2.5">
+    <el-card v-loading="overviewLoading" body-class="flex items-center" shadow="hover" style="border: none">
+      <el-image :src="`/src/assets/platformImg/${ companyId }.png`" class="mr-7 rounded-2xl" fit="contain"
+                style="height: 120px; width: 120px;">
+        <template #error>
+          <div class="mr-3.5 flex items-center justify-center text-5xl"
+               style="height: 130px; width: 130px; background-color: #f5f5f5">
+            <el-icon>
+              <icon-picture/>
+            </el-icon>
+          </div>
+        </template>
+      </el-image>
+      <div class="text-lg">
+        <div class="font-semibold">
+          公司编号/名称:
+          <span class="font-medium italic ml-1.5" style="color: #64748b"> 
+            {{ platformOverview[0]?.platform ? platformOverview[0]?.platform : '--' }} 
+          </span>
+        </div>
+        <div class="font-semibold">
+          公司:
+          <span class="font-medium italic ml-1.5" style="color: #64748b">
+            {{ platformOverview[0]?.countCompany ? platformOverview[0]?.countCompany : '--' }} 
+          </span>
+        </div>
+        <div class="font-semibold">
+          平台:
+          <span class="font-medium italic ml-1.5" style="color: #64748b">
+            {{ platformOverview[0]?.countShop ? platformOverview[0]?.countShop : '--' }}
+          </span>
+        </div>
+        <div class="font-semibold">
+          电脑:
+          <span class="font-medium italic ml-1.5" style="color: #64748b"> 
+            {{ platformOverview[0]?.countComputer ? platformOverview[0]?.countComputer : '--' }}
+          </span>
+        </div>
+      </div>
+    </el-card>
+
+    <el-card body-style="padding-top: 10px" class="mt-2.5" shadow="hover" style="border: none">
+      <vxe-grid v-bind="gridOptions">
+        <template #platformNumber="{ row }">
+          <el-button link style="font-weight: 700" type="primary" @click="handleNavigate(row)">
+            <el-icon>
+              <Link/>
+            </el-icon>
+            {{ row.platformNumber ? row.platformNumber : '--' }}
+          </el-button>
+        </template>
+        <template #pager>
+          <vxe-pager
+              v-model:currentPage="gridOptions.pagerConfig.page"
+              v-model:pageSize="gridOptions.pagerConfig.limit"
+              :total="gridOptions.pagerConfig.total"
+              @page-change="handlePageChange"
+          >
+          </vxe-pager>
+        </template>
+      </vxe-grid>
+    </el-card>
+  </div>
+</template>
+
+<style scoped>
+
+</style>

src/views/company-information/components/InfoCard.vue

@@ -0,0 +1,91 @@
+<script lang="ts" setup>
+/**
+ * @Name: InfoCard.vue
+ * @Description: 电脑信息卡片
+ * @Author: Cheney
+ */
+
+import { useRouter } from 'vue-router';
+import { ElCard, ElCol, ElDescriptions, ElIcon, ElRow } from 'element-plus';
+import { Platform, Picture as IconPicture, Search, Shop } from '@element-plus/icons-vue';
+
+
+const router = useRouter();
+const cardData = inject<Ref>('cardData', ref({}));
+
+function handleNavigate(item: any) {
+  router.push({
+    path: '/company/detail',
+    query: { id: item.id }
+  });
+}
+
+function getImageSrc(platform: string) {
+  return new URL(`/src/assets/platformImg/${ platform }.png`, import.meta.url).href;
+}
+
+</script>
+
+<template>
+  <el-row :gutter="20">
+    <el-col v-for="(item, index) in cardData" :key="index" :lg="6" :md="8" :sm="8" :xl="4" :xs="12" class="my-2.5">
+      <el-card body-style="padding: 0px 10px 0px 10px" shadow="hover">
+        <el-descriptions>
+          <template #title>
+            <el-image :src="getImageSrc(item.platform)" class="my-2.5 rounded-2xl" fit="contain"
+                      style="width: 60px; height: 60px">
+              <template #error>
+                <div class="flex justify-center items-center" style="width: 60px; height: 60px; font-size: 4rem">
+                  <el-icon>
+                    <icon-picture/>
+                  </el-icon>
+                </div>
+              </template>
+            </el-image>
+            <div class="text-xl mb-2" style="color: #606266;">{{ item.company ? item.company : '暂无' }}</div>
+            <hr style="box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);">
+          </template>
+        </el-descriptions>
+        <div class="flex justify-evenly mb-2.5">
+          <div>
+            <el-icon style="top: 2px; margin-right: 6px; font-size: 1.2rem">
+              <Shop/>
+            </el-icon>
+            <span class="font-medium text-lg mr-2">店铺</span>
+            <span class="font-medium text-xl italic">
+              {{ item.countShop }}
+            </span>
+          </div>
+          <div>
+            <el-icon style="top: 2px; margin-right: 5px; font-size: 1.2rem">
+              <Platform />
+            </el-icon>
+            <span class="font-medium text-lg mr-2">电脑</span>
+            <span class="font-medium text-xl italic">
+              {{ item.countComputer }}
+            </span>
+          </div>
+        </div>
+        <template #footer>
+          <div style="text-align: center; padding: 0 10px">
+            <el-button :icon="Search" plain round style="width: 100%" type="primary" @click="handleNavigate(item)">
+              查看详情
+            </el-button>
+          </div>
+        </template>
+      </el-card>
+    </el-col>
+  </el-row>
+</template>
+
+<style scoped>
+:deep(.el-descriptions__header .el-descriptions__title) {
+  flex: 1;
+  text-align: center;
+}
+
+:deep(.el-card__footer) {
+  border-top: none;
+  padding: 0 0 10px 0;
+}
+</style>

src/views/company-information/index.vue

@@ -1,16 +1,63 @@
-<script setup lang="ts">
-/**
+<script lang="ts" setup>/**
  * @Name: index.vue
  * @Description: 公司信息页面
  * @Author: Cheney
  */
 
+import { useResponse } from '/@/utils/useResponse';
+import * as api from './api';
+import InfoCard from './components/InfoCard.vue';
+import { Plus } from '@element-plus/icons-vue';
+import CompanyCreate from '/@/views/company-information/components/CompanyCreate.vue';
+
+
+const cardData = ref();
+provide('cardData', cardData);
+
+const loading = ref(false);
+
+const isOpen = ref();
+
+onBeforeMount(() => {
+  initData();
+});
+
+async function initData() {
+  const res = await useResponse({}, api.getCardData, loading);
+  cardData.value = res.data;
+}
+
+async function addCompany() {
+  isOpen.value = true;
+}
+
+function handleRefresh() {
+  initData();
+}
 </script>
 
 <template>
-
+  <div class="px-2.5">
+    <el-card class="my-2.5" shadow="never" style="border: none;">
+      <div class="flex justify-between items-baseline">
+        <div>
+          <span class="font-bold text-xl">公司信息概览</span>
+          <el-divider class=" text-3xl" direction="vertical"/>
+        </div>
+        <span>
+           <el-button :icon="Plus" plain type="primary" @click="addCompany">添 加</el-button>
+        </span>
+      </div>
+    </el-card>
+    <el-card v-loading="loading" shadow="never" style="border: none; min-height: 692px;">
+      <InfoCard></InfoCard>
+    </el-card>
+    <CompanyCreate v-model="isOpen" @refresh="handleRefresh"/>
+  </div>
 </template>
 
 <style scoped>
-
+:deep(.el-divider__text.is-left) {
+  background-color: #F5F5F5;
+}
 </style>

src/views/shop-information/components/EditDrawer.vue

@@ -1,4 +1,5 @@
-<script lang="ts" setup>/**
+<script lang="ts" setup>
+/**
  * @Name: EditDrawer.vue
  * @Description:
  * @Author: Cheney
@@ -13,21 +14,14 @@ const loading = ref(false);
 const isOpen = defineModel({ default: false });
 const { gridOptions, platformNumber, formSelect } = defineProps<{
   gridOptions: any;
-  platformNumber: string;
+  platformNumber: any;
   formSelect: any;
 }>();
 
-const emit = defineEmits(['refresh'])
-
+const emit = defineEmits([ 'refresh' ]);
 
 onBeforeMount(() => {
-  const result = Object.keys(ruleForm).reduce((acc, key) => {
-    if (key in gridOptions.data[0]) {
-      acc[key] = gridOptions.data[0][key];
-    }
-    return acc;
-  }, {} as { [key: string]: any });
-  Object.assign(ruleForm, result);
+  replaceCol();
 });
 
 interface RuleForm {
@@ -174,6 +168,16 @@ const resetForm = (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   formEl.resetFields();
 };
+
+function replaceCol() {
+  const result = Object.keys(ruleForm).reduce((acc, key) => {
+    if (key in gridOptions.data[0]) {
+      acc[key] = gridOptions.data[0][key];
+    }
+    return acc;
+  }, {} as { [key: string]: any });
+  Object.assign(ruleForm, result);
+}
 </script>
 
 <template>
@@ -273,7 +277,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
       </el-form-item>
       <el-form-item>
         <div class="flex flex-1 justify-center">
-          <el-button type="primary" @click="submitForm(ruleFormRef)" :loading="loading">确 定</el-button>
+          <el-button :loading="loading" type="primary" @click="submitForm(ruleFormRef)">确 定</el-button>
           <el-button @click="resetForm(ruleFormRef)">重 置</el-button>
         </div>
       </el-form-item>

src/views/shop-information/components/ShopDetail.vue

@@ -218,7 +218,7 @@ function handleRefresh() {
         </template>
         <template #toolbar_tools>
           <div class="mr-2.5">
-            <el-button :icon="Edit" plain type="warning" @click="drawerOpen">编辑</el-button>
+            <el-button :icon="Edit" plain round type="warning" @click="drawerOpen" :disabled="selectedTab != '1'">编辑</el-button>
           </div>
         </template>
         <template #pager>
@@ -240,108 +240,6 @@ function handleRefresh() {
         :platformNumber
         @refresh="handleRefresh"
     />
-    <!--<el-drawer v-model="drawer" :title="`店铺编辑 - ${route.query.platformNumber}`" size="30%">
-      <el-form
-          ref="ruleFormRef"
-          :model="ruleForm"
-          :rules="rules"
-          class="mx-2.5 mt-2.5"
-          label-width="auto"
-          status-icon>
-        <el-form-item label="运营" prop="operatorName">
-          <el-input v-model="ruleForm.operatorName"/>
-        </el-form-item>
-        <el-form-item label="平台编号" prop="platformNumber">
-          <el-input v-model="ruleForm.platformNumber"/>
-        </el-form-item>
-        <el-form-item label="平台名称" prop="platformName">
-          <el-input v-model="ruleForm.platformName"/>
-        </el-form-item>
-        <el-form-item label="国家" prop="country">
-          <el-select v-model="ruleForm.country" placeholder="请选择线路">
-            <el-option
-                v-for="item in formSelect.country"
-                :key="item"
-                :label="item"
-                :value="item">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="品牌名称" prop="brandName">
-          <el-input v-model="ruleForm.brandName"/>
-        </el-form-item>
-        <el-form-item label="货币代码" prop="currencyCode">
-          <el-input v-model="ruleForm.currencyCode"/>
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-switch v-model="ruleForm.status" :active-value="1" :inactive-value="0"/>
-        </el-form-item>
-        <el-form-item label="平台" prop="platform">
-          <el-input v-model="ruleForm.platform"/>
-        </el-form-item>
-        <el-form-item label="线路" prop="line">
-          <el-select v-model="ruleForm.line" placeholder="请选择线路">
-            <el-option
-                v-for="item in formSelect.line"
-                :key="item"
-                :label="item"
-                :value="item">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="IP 地址" prop="ipaddress">
-          <el-input v-model="ruleForm.ipaddress"/>
-        </el-form-item>
-        <el-form-item label="公司" prop="company">
-          <el-input v-model="ruleForm.company"/>
-        </el-form-item>
-        <el-form-item label="公司英文名称" prop="companyEnglishName">
-          <el-input v-model="ruleForm.companyEnglishName"/>
-        </el-form-item>
-        <el-form-item label="地址" prop="address">
-          <el-input v-model="ruleForm.address"/>
-        </el-form-item>
-        <el-form-item label="法人代表" prop="juridicalPerson">
-          <el-input v-model="ruleForm.juridicalPerson"/>
-        </el-form-item>
-        <el-form-item label="法人信用卡" prop="juridicalPersonCreditCard">
-          <el-input v-model="ruleForm.juridicalPersonCreditCard"/>
-        </el-form-item>
-        <el-form-item label="法人信用卡地址" prop="juridicalPersonCreditCardAddress">
-          <el-input v-model="ruleForm.juridicalPersonCreditCardAddress"/>
-        </el-form-item>
-        <el-form-item label="应收账款账户" prop="receivablesAccount">
-          <el-input v-model="ruleForm.receivablesAccount"/>
-        </el-form-item>
-        <el-form-item label="应收账款公司" prop="receivablesAccountCompany">
-          <el-input v-model="ruleForm.receivablesAccountCompany"/>
-        </el-form-item>
-        <el-form-item label="VAT税号" prop="vatNumber">
-          <el-input v-model="ruleForm.vatNumber"/>
-        </el-form-item>
-        <el-form-item label="VAT公司" prop="vatCompany">
-          <el-input v-model="ruleForm.vatCompany"/>
-        </el-form-item>
-        <el-form-item label="主账户电话" prop="shopPhoneAndName">
-          <el-input :disabled="true" v-model="gridOptions.data[0].shopPhoneAndNameStr"/>
-        </el-form-item>
-        <el-form-item label="主账户邮箱" prop="shopEmail">
-          <el-input v-model="ruleForm.shopEmail"/>
-        </el-form-item>
-        <el-form-item label="子账户电话" prop="subShopPhoneAndName">
-          <el-input :disabled="true" v-model="gridOptions.data[0].subShopPhoneAndNameStr"/>
-        </el-form-item>
-        <el-form-item label="子账户邮箱" prop="subShopEmail">
-          <el-input v-model="ruleForm.subShopEmail"/>
-        </el-form-item>
-        <el-form-item>
-          <div class="flex flex-1 justify-center">
-            <el-button type="primary" @click="submitForm(ruleFormRef)">确 定</el-button>
-            <el-button @click="resetForm(ruleFormRef)">重 置</el-button>
-          </div>
-        </el-form-item>
-      </el-form>
-    </el-drawer>-->
   </div>
 </template>
 

src/views/shop-information/index.vue

@@ -13,7 +13,7 @@ import { useResponse } from '/@/utils/useResponse';
 const cardData = ref();
 provide('cardData', cardData);
 
-const loading = ref();
+const loading = ref(false);
 
 onBeforeMount(() => {
   initData();
@@ -28,13 +28,12 @@ async function initData() {
 <template>
   <div class="px-2.5">
     <el-divider content-position="left">
-      <div class="font-bold text-xl">信息概览</div>
+      <div class="font-bold text-xl">店铺信息概览</div>
     </el-divider>
     <el-card v-loading="loading" shadow="never" style="border: none; min-height: 692px;">
       <InfoCard></InfoCard>
     </el-card>
   </div>
-
 </template>
 
 <style scoped>

src/views/shop-information/useColumns.tsx

@@ -581,7 +581,6 @@ export const historyColumns: any = [
     field: 'shopPhoneAndName', title: '主账户电话', minWidth: 'auto', align: 'center',
     slots: {
       default({ row }: any) {
-        console.log('Row data:', row);
         return <span class={ 'font-medium' }>{ row.shopPhoneAndName !== null ? row.shopPhoneAndName : '--' }</span>;
       }
     }