@@ -65,7 +65,13 @@ getMarketingList()
const toLink = (item: any) => {
if (item.url) {
- router.push(item.url)
+ // 判断如果携带is_target=true就通过新窗口打开
+ if (item.url.indexOf('is_target=true') != -1) {
+ const url = router.resolve(item.url)
+ window.open(url.href)
+ } else {
+ router.push(item.url)
+ }
} else {
addonIndexRoute[item.key] && router.push({ name: addonIndexRoute[item.key] })
}
diff --git a/admin/src/app/views/diy/components/edit-active-cube.vue b/admin/src/app/views/diy/components/edit-active-cube.vue
index 0c2fafa02..01be8224c 100644
--- a/admin/src/app/views/diy/components/edit-active-cube.vue
+++ b/admin/src/app/views/diy/components/edit-active-cube.vue
@@ -7,7 +7,7 @@
@@ -152,8 +152,4 @@ defineExpose({
setFormData
})
-
+
diff --git a/admin/src/app/views/home/index.vue b/admin/src/app/views/home/index.vue
index 97134ef8e..9328798d1 100644
--- a/admin/src/app/views/home/index.vue
+++ b/admin/src/app/views/home/index.vue
@@ -3,11 +3,16 @@
-
-
- ![]()
- 
- {{webConfig.site_name}}
+
- {{webConfig.site_name}}
+
+
+
+
+
+ 
+
+
+
+ {{webConfig.site_name}}
diff --git a/admin/src/app/views/index/index.vue b/admin/src/app/views/index/index.vue
index 618ec3432..f8ae60f2d 100644
--- a/admin/src/app/views/index/index.vue
+++ b/admin/src/app/views/index/index.vue
@@ -12,7 +12,7 @@
-
+
+
+
+
+
@@ -248,7 +255,7 @@
import { ref, watch ,onMounted} from 'vue'
import { t } from '@/lang'
import { getStatInfo } from '@/app/api/stat'
-import { getAppIndex } from '@/app/api/addon'
+import { getAppIndex ,getAdvList} from '@/app/api/addon'
import * as echarts from 'echarts'
import { getFrameworkNewVersion } from '@/app/api/module'
import { getWebCopyright } from '@/app/api/sys'
@@ -302,12 +309,20 @@ const appList = ref([])
const getAppIndexFn = () => {
loading.value = true
getAppIndex().then((res) => {
- appList.value = res.data.data
+ console.log(res)
+ appList.value = res.data
loading.value = false
})
}
getAppIndexFn()
-
+const bannerlistr = ref([])
+const getAdvListFn = () => {
+ getAdvList().then((res) => {
+ console.log(res.data)
+ bannerlistr.value = res.data
+ })
+}
+getAdvListFn()
const getInfoFn = () => {
if (copyright.value.copyright_desc) {
dialogVisible.value = true
@@ -442,6 +457,9 @@ const toTypeLink = (url: any,type: any) => {
const toApplication = () => {
window.open('https://www.niucloud.com/app')
}
+const toApplicationurl = (item: any) => {
+ window.open(item.url)
+}
const toApplicationDetail = (item: any) => {
window.open(`https://www.niucloud.com/app/detail?id=${item.app_id}`)
}
diff --git a/admin/src/app/views/index/store.vue b/admin/src/app/views/index/store.vue
index a8d5de13f..c04336429 100644
--- a/admin/src/app/views/index/store.vue
+++ b/admin/src/app/views/index/store.vue
@@ -56,7 +56,7 @@
diff --git a/admin/src/app/views/marketing/components/verify-detail.vue b/admin/src/app/views/marketing/components/verify-detail.vue
index 6cef719f5..eb083192c 100644
--- a/admin/src/app/views/marketing/components/verify-detail.vue
+++ b/admin/src/app/views/marketing/components/verify-detail.vue
@@ -1,5 +1,5 @@
-
+
+
{{ row.create_time || '' }}
-
+
+
+ {{ row.is_admin == 1 ? '后台核销' : row.member?.nickname }}
+
@@ -89,7 +91,7 @@ const recordTable = reactive({
data: [],
searchParam: {
code: '',
- type: '',
+ type: route.query.type || '',
verifier_member_id: '',
create_time: []
}
diff --git a/admin/src/app/views/marketing/verify_index.vue b/admin/src/app/views/marketing/verify_index.vue
new file mode 100644
index 000000000..f34cf61d2
--- /dev/null
+++ b/admin/src/app/views/marketing/verify_index.vue
@@ -0,0 +1,130 @@
+
+
+
@@ -103,7 +109,7 @@ import { reactive, ref, computed } from 'vue'
import { t } from '@/lang'
import { ElMessageBox, FormInstance } from 'element-plus'
import { useRoute, useRouter } from 'vue-router'
-import { getPosterPageList, getPosterType, modifyPosterStatus, modifyPosterDefault, deletePoster, getPreviewPoster } from '@/app/api/poster'
+import { getPosterPageList, getPosterType, modifyPosterStatus, modifyPosterDefault, deletePoster, getPreviewPoster ,checkImagick} from '@/app/api/poster'
import { img, setTablePageStorage, getTablePageStorage } from '@/utils/common'
const router = useRouter()
@@ -281,6 +287,16 @@ const resetForm = (formEl: FormInstance | undefined) => {
formEl.resetFields()
loadPosterPageList()
}
+const isImagick = ref(false)
+// 判断是否安装imagemagick扩展
+const checkImagickFn = () => {
+ checkImagick().then((res:any) => {
+ console.log(res)
+ isImagick.value = res.data
+
+ })
+}
+checkImagickFn()
diff --git a/admin/src/app/views/setting/components/sms-records-info.vue b/admin/src/app/views/setting/components/sms-records-info.vue
index a724e95d7..9152f17ed 100644
--- a/admin/src/app/views/setting/components/sms-records-info.vue
+++ b/admin/src/app/views/setting/components/sms-records-info.vue
@@ -25,7 +25,11 @@
-
+
+
@@ -55,7 +59,9 @@ const initialFormData = {
name: '',
nickname: '',
mobile: '',
- sms_type_name: ''
+ sms_type_name: '',
+ status:'',
+ result:''
}
const formData: Record = reactive({ ...initialFormData })
diff --git a/admin/src/app/views/setting/layout.vue b/admin/src/app/views/setting/layout.vue
index 2c78ec1db..f4e9a4be9 100644
--- a/admin/src/app/views/setting/layout.vue
+++ b/admin/src/app/views/setting/layout.vue
@@ -18,7 +18,7 @@
diff --git a/admin/src/app/views/setting/pay.vue b/admin/src/app/views/setting/pay.vue
index 722512aa0..ee7825cf2 100644
--- a/admin/src/app/views/setting/pay.vue
+++ b/admin/src/app/views/setting/pay.vue
@@ -13,7 +13,7 @@
-
+
diff --git a/admin/src/components/spread-popup/index.vue b/admin/src/components/spread-popup/index.vue
index 9f9f42fd6..e9b82cda8 100644
--- a/admin/src/components/spread-popup/index.vue
+++ b/admin/src/components/spread-popup/index.vue
@@ -50,15 +50,19 @@ import { img } from '@/utils/common'
const showDialog = ref(false)
const channel = ref('h5')
+
+// H5相关变量
const wapUrl = ref('')
const wapDomain = ref('')
const wapImage = ref('')
const wapPreview = ref('')
-const pageName = ref('')
+
+// 小程序相关变量
const weappData = reactive({
path: ''
})
+// 基础配置获取
getUrl().then((res: any) => {
wapUrl.value = res.data.wap_url
@@ -66,42 +70,53 @@ getUrl().then((res: any) => {
if (import.meta.env.MODE == 'production') return
wapDomain.value = res.data.wap_domain
-
// env文件配置过wap域名
if (wapDomain.value) {
wapUrl.value = wapDomain.value + '/wap'
}
-
const wapDomainStorage = storage.get('wap_domain')
if (wapDomainStorage) {
wapUrl.value = wapDomainStorage
}
})
-// **生成H5二维码**
+// 生成H5二维码（支持多参数）
const generateH5QRCode = () => {
- wapPreview.value = `${ wapUrl.value }${ pageName.value }`
- QRCode.toDataURL(wapPreview.value, { errorCorrectionLevel: 'L', margin: 0, width: 120 }).then(url => {
+ // 处理参数为URL格式
+ const queryStr = params.value
+ .map(item => `${encodeURIComponent(item.name)}=${encodeURIComponent(item.value)}`)
+ .join('&')
+
+ // 拼接完整H5链接
+ wapPreview.value = `${wapUrl.value}${pagePath.value}${queryStr ? '?' + queryStr : ''}`
+
+ // 生成二维码
+ QRCode.toDataURL(wapPreview.value, {
+ errorCorrectionLevel: 'L',
+ margin: 0,
+ width: 120
+ }).then(url => {
wapImage.value = url
})
}
-// **获取小程序二维码**
+// 获取小程序二维码（支持多参数）
const fetchWeAppQRCode = () => {
- // 去掉 page 参数前面的 '/'
- if (pagePath.value.startsWith('/')) {
- pagePath.value = pagePath.value.slice(1);
+ // 处理页面路径（去掉前缀的 '/'）
+ let page = pagePath.value
+ if (page.startsWith('/')) {
+ page = page.slice(1)
}
+ // 调用接口获取小程序二维码
getQrcode({
- page: pagePath.value, // 传递页面路径
- folder: folder.value, // 传递模块目录
- params: [
- {
- column_name: columnName.value,
- column_value: columnValue.value
- }
- ]
+ page: page,
+ folder: folder.value,
+ // 转换参数格式为接口要求的 { column_name, column_value }
+ params: params.value.map(item => ({
+ column_name: item.name,
+ column_value: item.value
+ }))
}).then((res: any) => {
if (res.data) {
weappData.path = res.data.weapp_path
@@ -109,24 +124,30 @@ const fetchWeAppQRCode = () => {
})
}
-// 定义变量存储传入的数据
-const pagePath = ref("")
-const columnName = ref("")
-const columnValue = ref("")
-const titleName = ref("")
-const folder: any = ref("")
+// 核心参数存储
+const pagePath = ref("") // 页面路径（如 "/addon/pintuan/pages/goods/detail"）
+const params = ref>([]) // 多参数数组
+const titleName = ref("") // 弹窗标题
+const folder: any = ref("") // 模块目录
-// **显示对话框**
-const show = (page: string, column: string, value: string, title: string, dir: string) => {
+// 显示弹窗（对外暴露的方法）
+const show = (
+ page: string,
+ paramsArr: Array<{name: string; value: string | number}>,
+ title: string,
+ dir: string
+) => {
+ // 重置参数
pagePath.value = page
- columnName.value = column
- columnValue.value = value
+ params.value = paramsArr
titleName.value = title
folder.value = dir
- pageName.value = `${ pagePath.value }?${ columnName.value }=${ columnValue.value }`
-
+
+ // 生成二维码
generateH5QRCode()
fetchWeAppQRCode()
+
+ // 显示弹窗
showDialog.value = true
}
@@ -156,3 +177,4 @@ defineExpose({
show
})
+
\ No newline at end of file
diff --git a/admin/src/components/upload-attachment/attachment.vue b/admin/src/components/upload-attachment/attachment.vue
index cad4b276a..bed7edf6c 100644
--- a/admin/src/components/upload-attachment/attachment.vue
+++ b/admin/src/components/upload-attachment/attachment.vue
@@ -1,5 +1,5 @@
-
+ ![]()
+
-
+ 
+
{{ t('核销人员') }}
- {{ verifyData.member ? verifyData.member.nickname : '--' }}
+ {{ (verifyData.is_admin == 1 ? '后台核销' : verifyData.member?.nickname) || '--' }}
@@ -156,8 +156,4 @@ defineExpose({
})
-
+
diff --git a/admin/src/app/views/marketing/verify.vue b/admin/src/app/views/marketing/verify.vue
index fba962b8b..4114f28d6 100644
--- a/admin/src/app/views/marketing/verify.vue
+++ b/admin/src/app/views/marketing/verify.vue
@@ -39,15 +39,17 @@
{{ !recordTable.loading ? t('emptyData') : '' }}
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/src/app/views/member/components/detail-member.vue b/admin/src/app/views/member/components/detail-member.vue
index 0ea8153cf..316875d12 100644
--- a/admin/src/app/views/member/components/detail-member.vue
+++ b/admin/src/app/views/member/components/detail-member.vue
@@ -1,5 +1,5 @@
-
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+ {{ t("核销") }}
+
+
+ {{ t("核销记录") }}
+
+
+
+
+
+
+ {{ t('核销信息') }}
+
+ {{ t('核销码') }}
+
+ {{verifycode}}
+
+
+
+ {{ t('核销类型') }}
+
+ {{ verifyInfo.type_name }}
+
+
+
+ {{ item.title }}
+
+ {{ item.value }}
+
+
+
+
+ {{ item.title }}
+ +
+ {{ subItem.title }}
+
+ {{ subItem.value }}
+
+
+
+
+
+
+
+
+
+ {{ t('商品信息') }}
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+ {{ row.name }}
+
@@ -375,17 +375,20 @@ const getMemberInfoFn = async (bool=false) => {
Object.keys(data).forEach((item) => {
formData[item] = data[item]
})
-
+ if(!data.member_label_array){
+ formData.member_label_array =[]
+ formData.member_label_name=''
+ }
if (formData?.member_label_array && Object.keys(formData.member_label_array)?.length) {
formData.member_label = Object.values(formData.member_label_array).map((item: any, index) => {
return item.label_id
})
-
+
formData.member_label_name = Object.values(formData.member_label_array).map((item: any, index) => {
return item.label_name
})
}
- loading.value = false
+ loading.value = false
} else {
loading.value = false
}
@@ -406,8 +409,4 @@ defineExpose({
})
-
+
diff --git a/admin/src/app/views/poster/components/preview-friendspay-message.vue b/admin/src/app/views/poster/components/preview-friendspay-message.vue
index af9df5035..026c55a21 100644
--- a/admin/src/app/views/poster/components/preview-friendspay-message.vue
+++ b/admin/src/app/views/poster/components/preview-friendspay-message.vue
@@ -28,7 +28,7 @@ const componentStyle = computed(() => {
if (prop.value.weight) {
style += 'font-weight: bold;'
}
- if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf') {
+ if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/PingFang-Medium.ttf') {
style += 'font-family: poster_default_font;'
}
const box: any = document.getElementById(prop.value.id)
diff --git a/admin/src/app/views/poster/components/preview-friendspay-money.vue b/admin/src/app/views/poster/components/preview-friendspay-money.vue
index af9df5035..026c55a21 100644
--- a/admin/src/app/views/poster/components/preview-friendspay-money.vue
+++ b/admin/src/app/views/poster/components/preview-friendspay-money.vue
@@ -28,7 +28,7 @@ const componentStyle = computed(() => {
if (prop.value.weight) {
style += 'font-weight: bold;'
}
- if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf') {
+ if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/PingFang-Medium.ttf') {
style += 'font-family: poster_default_font;'
}
const box: any = document.getElementById(prop.value.id)
diff --git a/admin/src/app/views/poster/components/preview-nickname.vue b/admin/src/app/views/poster/components/preview-nickname.vue
index 8f09b182a..9666528cb 100644
--- a/admin/src/app/views/poster/components/preview-nickname.vue
+++ b/admin/src/app/views/poster/components/preview-nickname.vue
@@ -28,7 +28,7 @@ const componentStyle = computed(() => {
if (prop.value.weight) {
style += 'font-weight: bold;'
}
- if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf') {
+ if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/PingFang-Medium.ttf') {
style += 'font-family: poster_default_font;'
}
const box: any = document.getElementById(prop.value.id)
diff --git a/admin/src/app/views/poster/components/preview-text.vue b/admin/src/app/views/poster/components/preview-text.vue
index 2332fc876..d737c47fa 100644
--- a/admin/src/app/views/poster/components/preview-text.vue
+++ b/admin/src/app/views/poster/components/preview-text.vue
@@ -28,7 +28,7 @@ const componentStyle = computed(() => {
if (prop.value.weight) {
style += `font-weight: bold;`;
}
- if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/SourceHanSansCN-Regular.ttf') {
+ if (!prop.value.fontFamily || prop.value.fontFamily == 'static/font/PingFang-Medium.ttf') {
style += `font-family: poster_default_font;`;
}
let box: any = document.getElementById(prop.value.id)
diff --git a/admin/src/app/views/poster/list.vue b/admin/src/app/views/poster/list.vue
index 28691a0ca..c49961a57 100644
--- a/admin/src/app/views/poster/list.vue
+++ b/admin/src/app/views/poster/list.vue
@@ -6,7 +6,13 @@
{{ pageName }}
{{ t('添加海报') }}
-
+
+
+
+ 检测到PHP未安装ImageMagick扩展，需安装后才能使用海报功能
+
+
+
{{ formData.create_time }}
发送失败
+ 发送成功
+ {{ formData.result }}
+
-
+
+
{{ payItems.name }}
-
+
-
{{ t('payType') }}
{{ t('onState') }}
{{ t('templateName') }}
@@ -52,7 +52,6 @@
{{ t('save') }}
+
+
+ {{ !siteTableData.loading ? t('emptyData') : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.status_name }}
+
+ {{ row.status_name }}
+
+
+ {{ row.status_name }}
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+ 
+
+
+
+
+ {{ row.site_name || '' }}
+
+
+
+
+
+ {{ row.admin.username || '' }}
+
+ 永久
+ {{ row.expire_time }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ data.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -82,7 +82,7 @@
{{ item.real_name }}
-
diff --git a/admin/src/layout/profession/components/aside/side.vue b/admin/src/layout/profession/components/aside/side.vue
index 7f395f5b6..abac660ce 100644
--- a/admin/src/layout/profession/components/aside/side.vue
+++ b/admin/src/layout/profession/components/aside/side.vue
@@ -1,13 +1,13 @@
-
{{ item.real_name }}
+ {{ item.real_name }}
+
@@ -38,8 +38,8 @@
-
-
-
+
+
+
+
{{ route.matched[1].meta.title }}
@@ -161,6 +161,18 @@ onMounted(async () => {
await getMarketingList()
})
+// 让二级菜单默认展开
+const menuOption = ref([])
+const secondMenuShowWayFn = () => {
+ menuOption.value = []
+ if (oneMenuActive.value !== 'active' && oneMenuActive.value !== 'addon' && twoMenuData.value && Object.values(twoMenuData.value).length) {
+ const data = cloneDeep(twoMenuData.value)
+ for (const key in data) {
+ menuOption.value.push(data[key].name)
+ }
+ }
+}
+
watchEffect(() => {
// if (!appList.value || loading.value) return; // 确保数据加载完毕
const addonKeys = appList.value?.addon?.list?.map(item => item.key) ?? []
@@ -199,10 +211,10 @@ watchEffect(() => {
}
}
}
+ secondMenuShowWayFn()
})
// watch(route, () => {
-// console.log(route.matched);
// if (route.meta.attr != '') {
// oneMenuActive.value = route.matched[2].name
@@ -230,18 +242,6 @@ watchEffect(() => {
// }
// }
// }, { immediate: true })
-
-// 让二级菜单默认展开
-const menuOption = ref([])
-watch(twoMenuData.value, () => {
- menuOption.value = []
- if (twoMenuData.value && Object.values(twoMenuData.value).length) {
- const data = cloneDeep(twoMenuData.value)
- for (const key in data) {
- menuOption.value.push(data[key].name)
- }
- }
-}, { immediate: true })