+
@@ -12,10 +11,7 @@
二维码已过期
-
+
@@ -25,6 +21,14 @@
+
+
+
+
+
+
+ 下载
+
@@ -32,7 +36,7 @@
import QRCode from 'qrcode'
import { onMounted, ref, toRefs, watch } from 'vue'
-import { ReloadOutlined } from '@ant-design/icons-vue'
+import { ReloadOutlined, DownloadOutlined } from '@ant-design/icons-vue'
defineOptions({
name: 'XQrCode',
@@ -49,6 +53,7 @@ defineOptions({
* @property {string} iconBackgroundColor icon 背景色
* @property {string} errorLevel 纠错等级。默认：M，【L=low, M=medium, Q=quartile, H=high】
* @property {string} status 状态，【active=有效，loading=加载中，expired=已过期】
+ * @property {string} downloadFileName 下载文件名（不带扩展名）。默认：qrcode
*/
const props = defineProps({
value: {
@@ -92,9 +97,13 @@ const props = defineProps({
type: String,
default: 'active',
},
+ downloadFileName: {
+ type: String,
+ default: 'qrcode'
+ }
})
-const emit = defineEmits(['refresh'])
+const emit = defineEmits(['refresh', 'download'])
const qrCodeRef = ref()
@@ -130,7 +139,7 @@ async function init() {
*/
async function renderQRCode() {
return new Promise((resolve) => {
- ;(async () => {
+ ; (async () => {
await QRCode.toCanvas(qrCodeRef.value, props.value, {
width: props.size,
color: {
@@ -175,6 +184,29 @@ function handleRefresh() {
emit('refresh')
}
+/**
+ * 下载二维码
+ */
+function handleDownload() {
+ if (!qrCodeRef.value) return;
+
+ try {
+ const canvas = qrCodeRef.value;
+ const dataUrl = canvas.toDataURL('image/png');
+ const link = document.createElement('a');
+ link.href = dataUrl;
+ link.download = `${props.downloadFileName || 'qrcode'}.png`;
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+
+ // 触发下载事件
+ emit('download', dataUrl);
+ } catch (error) {
+ console.error('下载二维码失败:', error);
+ }
+}
+
/**
* 转换成 data URI
* @returns {Promise<*>}
@@ -185,12 +217,14 @@ async function toDataURL() {
defineExpose({
toDataURL,
+ handleDownload
})
+
\ No newline at end of file
diff --git a/src/config/app.js b/src/config/app.js
index 76591c2..ad67281 100644
--- a/src/config/app.js
+++ b/src/config/app.js
@@ -2,7 +2,7 @@ import { env } from '@/utils/util'
export default {
title: env('title'),
- logo: `${import.meta.env.BASE_URL}images/logo.svg`,
+ logo: `${import.meta.env.BASE_URL}images/2.png`,
mock: env('mock'),
permission: env('permission'),
}
diff --git a/src/locales/lang/zh-CN/menu.js b/src/locales/lang/zh-CN/menu.js
index 58bbc58..c69cd56 100644
--- a/src/locales/lang/zh-CN/menu.js
+++ b/src/locales/lang/zh-CN/menu.js
@@ -1,3 +1,5 @@
+
+
export default {
welcome: '欢迎',
home: '首页',
@@ -62,5 +64,6 @@ export default {
paddOrder: '过期订单',
erCodeList: '二维码列表',
order:"权益订单",
- points:'积分列表'
+ points:'积分列表',
+ activity:'案场活动'
}
diff --git a/src/router/routes/activity.js b/src/router/routes/activity.js
new file mode 100644
index 0000000..61ca84b
--- /dev/null
+++ b/src/router/routes/activity.js
@@ -0,0 +1,17 @@
+import { CoffeeOutlined } from '@ant-design/icons-vue'
+
+export default [
+ {
+ path: 'activity/index',
+ name: 'activity',
+ component: 'activity/index.vue',
+ meta: {
+ icon: CoffeeOutlined,
+ title: '案场活动',
+ isMenu: true,
+ keepAlive: true,
+ permission: '*',
+ }
+
+ },
+]
diff --git a/src/router/routes/announcement.js b/src/router/routes/announcement.js
index cbd203c..d81ed1b 100644
--- a/src/router/routes/announcement.js
+++ b/src/router/routes/announcement.js
@@ -1,4 +1,4 @@
-import { TableOutlined } from '@ant-design/icons-vue'
+import {BellOutlined } from '@ant-design/icons-vue'
export default [
{
@@ -6,7 +6,7 @@ export default [
name: 'announcement',
component: 'RouteViewLayout',
meta: {
- icon: TableOutlined,
+ icon: BellOutlined,
title: '消息公告',
isMenu: true,
keepAlive: true,
diff --git a/src/router/routes/index.js b/src/router/routes/index.js
index e61e8e8..20e3224 100644
--- a/src/router/routes/index.js
+++ b/src/router/routes/index.js
@@ -14,6 +14,7 @@ import integral from './integral'
import regional from './regional'
import announcement from './announcement'
import order from './order'
+import activity from './activity'
export default [
...home,
@@ -31,5 +32,6 @@ export default [
...integral,
...regional,
...announcement,
- ...order
+ ...order,
+ ...activity
]
diff --git a/src/router/routes/integral.js b/src/router/routes/integral.js
index 49fa818..1840cda 100644
--- a/src/router/routes/integral.js
+++ b/src/router/routes/integral.js
@@ -1,4 +1,4 @@
-import { TableOutlined } from '@ant-design/icons-vue'
+import { DollarOutlined } from '@ant-design/icons-vue'
export default [
{
@@ -6,7 +6,7 @@ export default [
name: 'integral',
component: 'RouteViewLayout',
meta: {
- icon: TableOutlined,
+ icon: DollarOutlined,
title: '积分模块',
isMenu: true,
keepAlive: true,
diff --git a/src/router/routes/order.js b/src/router/routes/order.js
index 5629c1a..81013a3 100644
--- a/src/router/routes/order.js
+++ b/src/router/routes/order.js
@@ -1,4 +1,4 @@
-import { TableOutlined } from '@ant-design/icons-vue'
+import { SolutionOutlined } from '@ant-design/icons-vue'
export default [
{
@@ -6,7 +6,7 @@ export default [
name: 'order',
component: 'order/index.vue',
meta: {
- icon: TableOutlined,
+ icon: SolutionOutlined,
title: '订单列表',
isMenu: true,
keepAlive: true,
diff --git a/src/router/routes/regional.js b/src/router/routes/regional.js
index bb7c19c..a996a72 100644
--- a/src/router/routes/regional.js
+++ b/src/router/routes/regional.js
@@ -1,4 +1,4 @@
-import { TableOutlined } from '@ant-design/icons-vue'
+import { AimOutlined} from '@ant-design/icons-vue'
export default [
{
@@ -6,7 +6,7 @@ export default [
name: 'regional',
component: 'RouteViewLayout',
meta: {
- icon: TableOutlined,
+ icon: AimOutlined,
title: '区域模块',
isMenu: true,
keepAlive: true,
diff --git a/src/router/routes/userManagement.js b/src/router/routes/userManagement.js
index 9b51158..0954dbd 100644
--- a/src/router/routes/userManagement.js
+++ b/src/router/routes/userManagement.js
@@ -1,4 +1,4 @@
-import { TableOutlined } from '@ant-design/icons-vue'
+import { UserOutlined } from '@ant-design/icons-vue'
export default [
{
@@ -6,7 +6,7 @@ export default [
name: 'userManagement',
component: 'RouteViewLayout',
meta: {
- icon: TableOutlined,
+ icon: UserOutlined,
title: '客户管理',
isMenu: true,
keepAlive: true,
diff --git a/src/views/activity/components/EditDialog.vue b/src/views/activity/components/EditDialog.vue
new file mode 100644
index 0000000..be449f0
--- /dev/null
+++ b/src/views/activity/components/EditDialog.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/activity/index.vue b/src/views/activity/index.vue
new file mode 100644
index 0000000..50a800d
--- /dev/null
+++ b/src/views/activity/index.vue
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+
+
+
+
+
+ 新增活动
+
+
+
+
+
+ {{ record.startAt && dayjs(record.startAt).format('YYYY-MM-DD HH:mm') }}
+ {{ ' ~ ' }}
+ {{ record.endAt && dayjs(record.endAt).format('YYYY-MM-DD HH:mm') }}
+
+
+ {{ record.endSignupAt && dayjs(record.endSignupAt).format('YYYY-MM-DD HH:mm')
+ }}
+
+
+ 点击查看
+
+
+ 点击查看
+
+
+ 启用
+ 停用
+
+
+ {{ areaEnum.getName(record.areaId) }}
+
+
+
+
+ {{ $t('pages.system.user.edit') }}
+
+
+
+ 二维码
+
+
+
+
+ {{ $t('pages.system.delete') }}
+
+
+
+
+
+
+
+
+
+
+
+ 暂无图片
+
+
+
+ {{ content }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/regional/houseList/components/EditDialog.vue b/src/views/regional/houseList/components/EditDialog.vue
index e5480ac..0bb89c9 100644
--- a/src/views/regional/houseList/components/EditDialog.vue
+++ b/src/views/regional/houseList/components/EditDialog.vue
@@ -93,9 +93,7 @@ formRules.value = {
lat: { required: true, message: '请输入纬度' },
status: [{ required: true, message: '请选择状态', trigger: 'change' }],
}
-onBeforeMount(() => {
- formData.value.labels = ['']
-})
+
/**
* 新建
*/
@@ -105,6 +103,7 @@ function handleCreate() {
title: '新增区域',
})
// initData()
+ formData.value.labels=['']
formData.value.status = 'enabled'
}
@@ -185,6 +184,7 @@ const removeLabel = (index) => {
* 取消
*/
function handleCancel() {
+
hideModal()
}