From d06f8005b06db40116ed95ff8f6d5a7769070045 Mon Sep 17 00:00:00 2001
From: Leo_Ding <2405260743@qq.com>
Date: Wed, 16 Jul 2025 18:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/lang/zh-CN/menu.js            |  2 +-
 src/views/activityOrder/index.vue         |  3 ++-
 src/views/regional/houseProduct/index.vue | 32 +++++++++++++++++++----
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/locales/lang/zh-CN/menu.js b/src/locales/lang/zh-CN/menu.js
index 4e446b0..8c31c2a 100644
--- a/src/locales/lang/zh-CN/menu.js
+++ b/src/locales/lang/zh-CN/menu.js
@@ -84,7 +84,7 @@ export default {
     fangchan: '南通景点年卡',
     birth: '生日礼遇',
     quanwu: '全屋纱窗',
-    aiya: '爱牙抵用卷',
+    aiya: '爱牙抵用券',
     yllvs: '医疗绿色',
 
     ycequite: '盐城权益兑换',
diff --git a/src/views/activityOrder/index.vue b/src/views/activityOrder/index.vue
index c78f4df..bf517c3 100644
--- a/src/views/activityOrder/index.vue
+++ b/src/views/activityOrder/index.vue
@@ -94,8 +94,9 @@ const imgList = ref([])
 const type = ref(1)
 
 const columns = [
-    { title: '客户名称', dataIndex: 'customerName' },
     { title: '活动名称', dataIndex: 'activityName' },
+    { title: '客户姓名', dataIndex: 'customerName' },
+    { title: '联系方式', dataIndex: 'customerPhone' },
     { title: '报名时间', dataIndex: 'createdAt', width: 150, align: 'center' },
 
     // { title: t('button.action'), key: 'action', fixed: 'right', width: 150, align: 'center' },
diff --git a/src/views/regional/houseProduct/index.vue b/src/views/regional/houseProduct/index.vue
index 4175464..ff7597e 100644
--- a/src/views/regional/houseProduct/index.vue
+++ b/src/views/regional/houseProduct/index.vue
@@ -51,7 +51,7 @@
                         <template v-if="column.dataIndex === 'startAt'">
                             <span>{{ dayjs(record.startAt).format('YYYY-MM-DD HH:mm:ss') }}</span>
                         </template>
-                         <template v-if="column.dataIndex === 'endAt'">
+                        <template v-if="column.dataIndex === 'endAt'">
                             <span>{{ dayjs(record.endAt).format('YYYY-MM-DD HH:mm:ss') }}</span>
                         </template>
                         <template v-if="'isDaily' === column.dataIndex">
@@ -63,6 +63,11 @@
                                 <a-tooltip>
                                     <template #title> {{ $t('pages.system.user.edit') }}</template>
                                     <edit-outlined /> </a-tooltip></x-action-button>
+                            <x-action-button @click="createQrcode(record)">
+                                <a-tooltip>
+                                    <template #title>二维码</template>
+                                    <QrcodeOutlined />
+                                </a-tooltip></x-action-button>
                             <x-action-button @click="handleDelete(record.id)">
                                 <a-tooltip>
                                     <template #title>{{ $t('pages.system.delete') }}</template>
@@ -73,6 +78,12 @@
             </a-card>
         </a-col>
     </a-row>
+        <a-modal v-model:open="qropen" :title="'生成二维码'" @ok="qropen = false" :footer="null">
+        <a-card class="mb-8-2"
+            style="display: flex;align-items: center;flex-direction: column;justify-content: center;">
+            <x-qrCode :value="qrValue" :icon="qrlogo" :iconBackgroundColor="'#ffffff'" :size="180"></x-qrCode>
+        </a-card>
+    </a-modal>
     <edit-dialog ref="editDialogRef" @ok="onOk"></edit-dialog>
 </template>
 
@@ -101,9 +112,9 @@ const columns = [
     { title: '案场名称', dataIndex: 'companyName' },
     { title: '礼品名称', dataIndex: 'name' },
     { title: '兑换数量', dataIndex: 'maxNum' },
-    { title: '开始时间', dataIndex: 'startAt',width:180,align:'center' },
-    { title: '结束时间', dataIndex: 'endAt',width:180,align:'center'  },
-    { title: '是否每天', dataIndex: 'isDaily',width:120,align:'center' },
+    { title: '开始时间', dataIndex: 'startAt', width: 180, align: 'center' },
+    { title: '结束时间', dataIndex: 'endAt', width: 180, align: 'center' },
+    { title: '是否每天', dataIndex: 'isDaily', width: 120, align: 'center' },
     // { title: '状态', dataIndex: 'status', key: 'introduce', width: 100, align: 'center' },
     { title: t('button.action'), key: 'action', fixed: 'right', width: 150, align: 'center' },
 ]
@@ -139,7 +150,18 @@ async function getPageList() {
         hideLoading()
     }
 }
-
+const createQrcode = (params) => {
+    const { name, id,img } = params
+    const item = {
+        title: name,
+        typer: 'product',
+        pathUrl: '/pages/product/index.vue',
+        relationId: id,
+        kvalue1: img,
+    }
+    qrValue.value = JSON.stringify(item)
+    qropen.value = true
+}
 /**
  * 删除
  */