github/niucloud
1
0
Fork 0
mirror of https://gitee.com/niucloud-team/niucloud.git synced 2026-03-17 11:13:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
CQ 2025-07-21 09:29:10 +08:00
parent 4e2c6f80b5
commit 34e68e2e70
151 changed files with 2772 additions and 1908 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/app/api/diy.ts
View File

@ -237,7 +237,7 @@ export function editTheme(params: Record<string, any>) {
/** /**
* 删除配色 * 删除配色
* @param params * @param id
*/ */
export function deleteTheme(id: number) { export function deleteTheme(id: number) {
return request.delete(`diy/theme/delete/${ id }`, { showSuccessMessage: true }) return request.delete(`diy/theme/delete/${ id }`, { showSuccessMessage: true })

2
admin/src/app/api/member.ts
View File

@ -393,7 +393,7 @@ export function memberRemark(params: Record<string, any>) {
} }
/** /**
* 检查打款进度 * 检查打款进度
* @param params * @param id
*/ */
export function memberCheck(id: number) { export function memberCheck(id: number) {
return request.put(`member/cash_out/check/${id}`, {}, { showSuccessMessage: true }) return request.put(`member/cash_out/check/${id}`, {}, { showSuccessMessage: true })

41
admin/src/app/api/notice.ts
View File

@ -81,7 +81,6 @@ export function getSmsLog(params: Record<string, any>) {
/** /**
* 获取当前登录子账号 * 获取当前登录子账号
* @param params
*/ */
export function getAccountIsLogin() { export function getAccountIsLogin() {
return request.get(`notice/niusms/config`) return request.get(`notice/niusms/config`)
@ -105,7 +104,7 @@ export function registerAccount(params: Record<string, any>) {
/** /**
* 获取当前登录子账号信息 * 获取当前登录子账号信息
* @param params * @param username
*/ */
export function getAccountInfo(username: string) { export function getAccountInfo(username: string) {
return request.get(`notice/niusms/account/info/${username}`) return request.get(`notice/niusms/account/info/${username}`)
@ -121,6 +120,7 @@ export function getTemplateList(params: Record<string, any>) {
/** /**
* 获取签名列表 * 获取签名列表
* @param username
* @param params * @param params
*/ */
export function getSignList(username: string, params: Record<string, any>) { export function getSignList(username: string, params: Record<string, any>) {
@ -129,6 +129,7 @@ export function getSignList(username: string, params: Record<string, any>) {
/** /**
* 添加签名 * 添加签名
* @param username
* @param params * @param params
*/ */
export function addSign(username: string, params: Record<string, any>) { export function addSign(username: string, params: Record<string, any>) {
@ -137,6 +138,7 @@ export function addSign(username: string, params: Record<string, any>) {
/** /**
* 删除签名 * 删除签名
* @param username
* @param params * @param params
*/ */
export function deleteSign(username: string, params: Record<string, any>) { export function deleteSign(username: string, params: Record<string, any>) {
@ -145,6 +147,7 @@ export function deleteSign(username: string, params: Record<string, any>) {
/** /**
* 更新子账号信息 * 更新子账号信息
* @param username
* @param params * @param params
*/ */
export function editAccount(username: string,params: Record<string, any>) { export function editAccount(username: string,params: Record<string, any>) {
@ -153,6 +156,7 @@ export function editAccount(username: string,params: Record<string, any>) {
/** /**
* 获取短信发送记录 * 获取短信发送记录
* @param username
* @param params * @param params
*/ */
export function getSmsSendList(username: string, params: Record<string, any>) { export function getSmsSendList(username: string, params: Record<string, any>) {
@ -161,6 +165,7 @@ export function getSmsSendList(username: string, params: Record<string, any>) {
/** /**
* 获取充值列表 * 获取充值列表
* @param username
* @param params * @param params
*/ */
export function getSmsOrdersList(username: string, params: Record<string, any>) { export function getSmsOrdersList(username: string, params: Record<string, any>) {
@ -169,7 +174,6 @@ export function getSmsOrdersList(username: string, params: Record<string, any>)
/** /**
* 获取套餐列表 * 获取套餐列表
* @param params
*/ */
export function getSmsPackagesList() { export function getSmsPackagesList() {
return request.get(`notice/niusms/packages`) return request.get(`notice/niusms/packages`)
@ -177,12 +181,17 @@ export function getSmsPackagesList() {
/** /**
* 获取图像验证码 * 获取图像验证码
* @param params
*/ */
export function getSmsCaptcha() { export function getSmsCaptcha() {
return request.get(`notice/niusms/captcha`) return request.get(`notice/niusms/captcha`)
} }
/**
* 获取图像验证码
*/
export function getsiteCaptcha() {
return request.get(`site/captcha/create`)
}
/** /**
* 发送验证码 * 发送验证码
* @param params * @param params
@ -193,7 +202,6 @@ export function getSmsSend(params: Record<string, any>) {
/** /**
* 添加签名配置项 * 添加签名配置项
* @param params
*/ */
export function getSmsSignConfig() { export function getSmsSignConfig() {
return request.get(`notice/niusms/sign/report/config`) return request.get(`notice/niusms/sign/report/config`)
@ -201,7 +209,6 @@ export function getSmsSignConfig() {
/** /**
* 模版报备配置项 * 模版报备配置项
* @param params
*/ */
export function getTemplateReportConfig() { export function getTemplateReportConfig() {
return request.get(`notice/niusms/template/report/config`) return request.get(`notice/niusms/template/report/config`)
@ -209,6 +216,10 @@ export function getTemplateReportConfig() {
/** /**
* 模版报备 * 模版报备
* @param sms_type
* @param username
* @param sms_type
* @param username
* @param params * @param params
*/ */
export function reportTemplate(sms_type: string, username: string, params: Record<string, any>) { export function reportTemplate(sms_type: string, username: string, params: Record<string, any>) {
@ -217,6 +228,10 @@ export function reportTemplate(sms_type: string, username: string, params: Recor
/** /**
* 模版详情 * 模版详情
* @param sms_type
* @param username
* @param sms_type
* @param username
* @param params * @param params
*/ */
export function getreportTemplateInfo(sms_type: string, username: string,params: Record<string, any>) { export function getreportTemplateInfo(sms_type: string, username: string,params: Record<string, any>) {
@ -226,6 +241,7 @@ export function getreportTemplateInfo(sms_type: string, username: string,params:
/** /**
* 充值下单 * 充值下单
* @param username
* @param params * @param params
*/ */
export function smsOrderCreate(username: string, params: Record<string, any>) { export function smsOrderCreate(username: string, params: Record<string, any>) {
@ -234,6 +250,7 @@ export function smsOrderCreate(username: string, params: Record<string, any>) {
/** /**
* 获取支付信息 * 获取支付信息
* @param username
* @param params * @param params
*/ */
export function getOrderPayInfo(username: string, params: Record<string, any>) { export function getOrderPayInfo(username: string, params: Record<string, any>) {
@ -242,6 +259,7 @@ export function getOrderPayInfo(username: string, params: Record<string, any>) {
/** /**
* 获取订单详情 * 获取订单详情
* @param username
* @param params * @param params
*/ */
export function getOrderInfo(username: string, params: Record<string, any>) { export function getOrderInfo(username: string, params: Record<string, any>) {
@ -250,6 +268,7 @@ export function getOrderInfo(username: string, params: Record<string, any>) {
/** /**
* 获取支付状态 * 获取支付状态
* @param username
* @param params * @param params
*/ */
export function getOrderPayStatus(username: string, params: Record<string, any>) { export function getOrderPayStatus(username: string, params: Record<string, any>) {
@ -258,6 +277,7 @@ export function getOrderPayStatus(username: string, params: Record<string, any>)
/** /**
* 计算金额 * 计算金额
* @param username
* @param params * @param params
*/ */
export function calculateOrderPay(username: string, params: Record<string, any>) { export function calculateOrderPay(username: string, params: Record<string, any>) {
@ -274,7 +294,9 @@ export function enableNiusms(params: Record<string, any>) {
/** /**
* 同步模版状态 * 同步模版状态
* @param params * @param username
* @param sms_type
* @param username
*/ */
export function templateSync(sms_type: string, username: string) { export function templateSync(sms_type: string, username: string) {
return request.get(`notice/niusms/template/sync/${sms_type}/${username}`) return request.get(`notice/niusms/template/sync/${sms_type}/${username}`)
@ -282,6 +304,7 @@ export function templateSync(sms_type: string, username: string) {
/** /**
* 重置密码 * 重置密码
* @param username
* @param params * @param params
*/ */
export function resetPassword(username: string,params: Record<string, any>) { export function resetPassword(username: string,params: Record<string, any>) {
@ -290,7 +313,9 @@ export function resetPassword(username: string,params: Record<string, any>) {
/** /**
* 清除模版报备 * 清除模版报备
* @param params * @param template_id
* @param username
* @param template_id
*/ */
export function clearTemplate(username: string,template_id: string) { export function clearTemplate(username: string,template_id: string) {
return request.delete(`notice/niusms/template/${username}/${template_id}`) return request.delete(`notice/niusms/template/${username}/${template_id}`)

1
admin/src/app/api/pay.ts
View File

@ -56,7 +56,6 @@ export function getPayRefundInfo(refund_no: string) {
/** /**
* 获取退款状态字典 * 获取退款状态字典
* @param refund_no
*/ */
export function getRefundStatus() { export function getRefundStatus() {
return request.get(`pay/refund/status`) return request.get(`pay/refund/status`)

18
admin/src/app/api/site.ts
View File

@ -42,8 +42,8 @@ export function editSite(params: Record<string, any>) {
* 删除站点 * 删除站点
* @param siteId * @param siteId
*/ */
export function deleteSite(siteId: number) { export function deleteSite(params: Record<string, any>) {
return request.delete(`site/site/${ siteId }`) return request.delete(`site/site/${ params.site_id }?captcha_code=${ params.captcha_code }&captcha_key=${ params.captcha_key }`)
} }
/** /**
@ -78,6 +78,20 @@ export function getStatusList() {
return request.get(`site/statuslist`) return request.get(`site/statuslist`)
} }
/**
* 获取是否显示切换站点
*/
export function getSiteAllowChange() {
return request.get(`site/allow_change`)
}
/**
* 修改是否显示切换站点
*/
export function putSiteAllowChange(params: Record<string, any>) {
return request.put(`site/allow_change`,params, { showSuccessMessage: true })
}
/***************************************************** 站点分组管理 ****************************************************/ /***************************************************** 站点分组管理 ****************************************************/
/** /**

8
admin/src/app/api/sys.ts
View File

@ -505,6 +505,14 @@ export function clearCronLog(params: Record<string, any>) {
return request.put(`sys/schedule/log/clear`, params, { showSuccessMessage: true }) return request.put(`sys/schedule/log/clear`, params, { showSuccessMessage: true })
} }
/**
* 重置计划任务
* @returns
*/
export function resetCron() {
return request.post(`sys/schedule/reset`, { showSuccessMessage: true })
}
/***************************************************** 协议管理 ****************************************************/ /***************************************************** 协议管理 ****************************************************/
/** /**

23
admin/src/app/api/upgrade.ts
View File

@ -19,6 +19,7 @@ export function getUpgradeTask() {
/** /**
* 升级 * 升级
* @param addon * @param addon
* @param params
*/ */
export function upgradeAddon(addon: string = '', params: Record<string, any> = {}) { export function upgradeAddon(addon: string = '', params: Record<string, any> = {}) {
return request.post(addon ? `upgrade/${ addon }` : 'upgrade', params) return request.post(addon ? `upgrade/${ addon }` : 'upgrade', params)
@ -137,3 +138,25 @@ export function performRecoveryTasks(params: Record<string, any>) {
export function performBackupTasks(params: Record<string, any>) { export function performBackupTasks(params: Record<string, any>) {
return request.get("backup/task", params) return request.get("backup/task", params)
} }
/**
* 连通测试
* @param params
*/
export function connectTest(params: Record<string, any>) {
return request.post("niucloud/build/connect_test", params)
}
/**
* 保存服务器地址
* @param params
*/
export function setLocalUrl(params: Record<string, any>) {
return request.post("niucloud/build/set_local_url", params)
}
/**
* 获取服务器地址
* @param params
*/
export function getLocalUrl(params: Record<string, any>) {
return request.get("niucloud/build/get_local_url", params)
}

2
admin/src/app/api/user.ts
View File

@ -41,7 +41,7 @@ export function deleteUser(uid: number) {
/** /**
* 修改用户 * 修改用户
* @param uid * @param params
*/ */
export function editUser(params: Record<string, any>) { export function editUser(params: Record<string, any>) {
return request.put(`user/user/${ params.uid }`, params, { showSuccessMessage: true }) return request.put(`user/user/${ params.uid }`, params, { showSuccessMessage: true })

1
admin/src/app/api/weapp.ts
View File

@ -151,7 +151,6 @@ export function setWeappPrivacySetting(params: Record<string, any>) {
/** /**
* 获取小程序隐私协议 * 获取小程序隐私协议
* @param params
*/ */
export function getWeappPrivacySetting() { export function getWeappPrivacySetting() {
return request.get('weapp/privacysetting') return request.get('weapp/privacysetting')

25
admin/src/app/components/cloud-build/index.vue
View File

@ -5,7 +5,7 @@
<div class="h-[50vh] flex flex-col" v-if="cloudBuildCheck && !cloudBuildTask"> <div class="h-[50vh] flex flex-col" v-if="cloudBuildCheck && !cloudBuildTask">
<!-- <el-scrollbar> --> <!-- <el-scrollbar> -->
<div class="bg-[#fff] my-3" v-if="cloudBuildCheck.dir"> <div class="bg-[#fff] my-3" v-if="cloudBuildCheck.dir">
<div class=""> <div>
<p class="pl-[20px] ">{{ t('cloudbuild.dirPermission') }}</p> <p class="pl-[20px] ">{{ t('cloudbuild.dirPermission') }}</p>
<div class="mt-[10px] mx-[20px] text-[14px] cursor-pointer text-primary flex items-center justify-between bg-[#EFF6FF] rounded-[4px] p-[10px]" @click="cloudBuildCheckDirFn"> <div class="mt-[10px] mx-[20px] text-[14px] cursor-pointer text-primary flex items-center justify-between bg-[#EFF6FF] rounded-[4px] p-[10px]" @click="cloudBuildCheckDirFn">
<div class="flex items-center"> <div class="flex items-center">
@ -66,7 +66,7 @@
<!-- </el-scrollbar> --> <!-- </el-scrollbar> -->
</div> </div>
<div class="h-[45vh]" v-show="cloudBuildTask"> <div class="h-[45vh]" v-show="cloudBuildTask">
<terminal ref="terminalRef" context="" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd"/> <terminal ref="terminalRef" :name="`cloud-build-${terminalId}`" context="" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd"/>
</div> </div>
<div class="flex justify-end mt-[20px]" v-show="cloudBuildTask"> <div class="flex justify-end mt-[20px]" v-show="cloudBuildTask">
<el-button @click="dialogCancel()" class="!w-[90px]">取消</el-button> <el-button @click="dialogCancel()" class="!w-[90px]">取消</el-button>
@ -81,7 +81,7 @@
<img src="@/app/assets/images/error_icon.png" alt=""> <img src="@/app/assets/images/error_icon.png" alt="">
</template> </template>
<template #extra> <template #extra>
<el-scrollbar class="max-h-[150px] overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]"> <el-scrollbar class="max-h-[150px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
{{errorInfo}} {{errorInfo}}
</el-scrollbar> </el-scrollbar>
<el-button @click="handleReturn" class="!w-[90px]">错误信息</el-button> <el-button @click="handleReturn" class="!w-[90px]">错误信息</el-button>
@ -110,15 +110,16 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, h, watch ,computed} from 'vue' import { ref, h, watch, computed } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getCloudBuildLog, getCloudBuildTask, cloudBuild, clearCloudBuildTask, preBuildCheck } from '@/app/api/cloud' import { getCloudBuildLog, getCloudBuildTask, cloudBuild, clearCloudBuildTask, preBuildCheck } from '@/app/api/cloud'
import { Terminal, TerminalFlash } from 'vue-web-terminal' import { Terminal, TerminalFlash } from 'vue-web-terminal'
import 'vue-web-terminal/lib/theme/dark.css' import 'vue-web-terminal/lib/theme/dark.css'
import { AnyObject } from "@/types/global" import { AnyObject } from '@/types/global'
import { ElNotification, ElMessageBox } from "element-plus" import { ElNotification, ElMessageBox } from 'element-plus'
const showDialog = ref<boolean>(false) const showDialog = ref<boolean>(false)
const terminalId = ref(Date.now());
const cloudBuildTask = ref<null | AnyObject>(null) const cloudBuildTask = ref<null | AnyObject>(null)
const active = ref('build') const active = ref('build')
const cloudBuildCheck = ref<null | AnyObject>(null) const cloudBuildCheck = ref<null | AnyObject>(null)
@ -174,7 +175,7 @@ const getCloudBuildLogFn = () => {
return return
} }
const data = res.data.data ?? []; const data = res.data.data ?? []
let error = '' let error = ''
if (data[0] && data[0].length && showDialog.value) { if (data[0] && data[0].length && showDialog.value) {
@ -243,8 +244,7 @@ const handleReturn = () => {
closeType.value = 'success' closeType.value = 'success'
} }
const notificationEl : any = null
let notificationEl : any = null
/** /**
* 升级中任务提示 * 升级中任务提示
*/ */
@ -315,9 +315,9 @@ const onExecCmd = (key, command, success, failed, name) => {
} }
const makeIterator = (array: string[]) => { const makeIterator = (array: string[]) => {
var nextIndex = 0 let nextIndex = 0
return { return {
next() { next () {
if ((nextIndex + 1) == array.length) { if ((nextIndex + 1) == array.length) {
nextIndex = 0 nextIndex = 0
} }
@ -397,7 +397,8 @@ defineExpose({
open, open,
cloudBuildTask, cloudBuildTask,
loading, loading,
elNotificationClick elNotificationClick,
getCloudBuildTaskFn
}) })
</script> </script>

5
admin/src/app/components/upgrade-log/index.vue
View File

@ -147,8 +147,7 @@ defineExpose({
left: 125px; left: 125px;
border-left-color: #dddddd; border-left-color: #dddddd;
border-left-style: dashed; border-left-style: dashed;
margin: 12px 0; margin: 24px 0 12px;
margin-top: 24px;
height: calc(100% - 24px - 12px); height: calc(100% - 24px - 12px);
} }
@ -201,7 +200,7 @@ defineExpose({
.time-dialog >>> .el-collapse-item__content { .time-dialog >>> .el-collapse-item__content {
margin-top: 15px; margin-top: 15px;
padding-bottom: 0px !important; padding-bottom: 0 !important;
} }
.time-dialog >>> .el-timeline-item__node--01 { .time-dialog >>> .el-timeline-item__node--01 {

142
admin/src/app/components/upgrade/index.vue
View File

@ -130,8 +130,9 @@
</el-scrollbar> </el-scrollbar>
</div> </div>
<div class="h-[370px] mt-[30px]" v-show="showTerminal && upgradeTask && !errorDialog"> <div class="h-[370px] mt-[30px]" v-show="showTerminal && upgradeTask && !errorDialog">
<terminal ref="terminalRef" :context="upgradeTask ? upgradeTask.upgrade.app_key : ''" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" /> <terminal ref="terminalRef" :name="`upgrade-${terminalId}`" :context="upgradeTask ? upgradeTask.upgrade.app_key : ''" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" />
</div> </div>
</div> </div>
<!-- 是否备份选择 --> <!-- 是否备份选择 -->
<div class="flex flex-col" v-show="active == 'backup'"> <div class="flex flex-col" v-show="active == 'backup'">
@ -155,18 +156,21 @@
</div> </div>
</el-scrollbar> </el-scrollbar>
</div> </div>
<div class="mt-[50px]" v-show="errorDialog"> <div class="mt-[20px] h-[370px]" v-show="errorDialog">
<el-result icon="error" :title="t('升级失败')" :sub-title="errorMsg"> <el-result icon="error" :title="t('升级失败')">
<template #icon> <template #icon>
<img src="@/app/assets/images/error_icon.png" alt="" /> <img src="@/app/assets/images/error_icon.png" alt="" />
</template> </template>
<template #extra> <template #extra>
<el-scrollbar class="max-h-[120px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
{{errorMsg}}
</el-scrollbar>
<el-button @click="handleBack()" class="!w-[90px]">错误信息</el-button> <el-button @click="handleBack()" class="!w-[90px]">错误信息</el-button>
<el-button @click="showDialog=false" type="primary" class="!w-[90px]">完成</el-button> <el-button @click="showDialog=false" type="primary" class="!w-[90px]">完成</el-button>
</template> </template>
</el-result> </el-result>
</div> </div>
<div class="mt-[50px]" v-show="active == 'complete'"> <div class="mt-[20px]" v-show="active == 'complete'">
<el-result icon="success" :title="t('upgrade.upgradeSuccess')"> <el-result icon="success" :title="t('upgrade.upgradeSuccess')">
<template #icon> <template #icon>
<img src="@/app/assets/images/success_icon.png" alt=""> <img src="@/app/assets/images/success_icon.png" alt="">
@ -189,7 +193,7 @@
<div class="dialog-footer"> <div class="dialog-footer">
<!-- 查看升级内容 --> <!-- 查看升级内容 -->
<el-button v-if="step == 1 && upgradeContent.content.length && isAllowUpgrade" @click="step = 2" type="primary">{{ t("upgrade.upgradeButton") }}</el-button> <el-button v-if="step == 1 && upgradeContent.content.length && isAllowUpgrade" @click="step = 2" type="primary">{{ t("upgrade.upgradeButton") }}</el-button>
<el-button type="primary" v-show="step == 2 && showTerminal && upgradeTask && !errorDialog" :loading="timeloading" class="!w-[140px]">已用时 {{ formatUpgradeDuration }}</el-button>
<template v-if="step == 2 && active != 'complete'"> <template v-if="step == 2 && active != 'complete'">
<!-- <el-button v-if="active == 'content'" @click="showDialog = false">{{ t("return") }}</el-button>--> <!-- <el-button v-if="active == 'content'" @click="showDialog = false">{{ t("return") }}</el-button>-->
<el-button type="primary" :disabled="!is_pass" v-if="active == 'upgrade' && !upgradeTask" @click="() => { active = 'backup'; numberOfSteps = 1 }">{{ t("nextStep") }}</el-button> <el-button type="primary" :disabled="!is_pass" v-if="active == 'upgrade' && !upgradeTask" @click="() => { active = 'backup'; numberOfSteps = 1 }">{{ t("nextStep") }}</el-button>
@ -225,10 +229,10 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, h, watch ,computed} from "vue" import { ref, h, watch, computed } from 'vue'
import { t } from "@/lang" import { t } from '@/lang'
import { getVersions } from "@/app/api/auth" import { getVersions } from '@/app/api/auth'
import { getFrameworkNewVersion } from "@/app/api/module" import { getFrameworkNewVersion } from '@/app/api/module'
import { import {
getUpgradeContent, getUpgradeContent,
getUpgradeTask, getUpgradeTask,
@ -236,15 +240,16 @@ import {
executeUpgrade, executeUpgrade,
preUpgradeCheck, preUpgradeCheck,
clearUpgradeTask, upgradeUserOperate clearUpgradeTask, upgradeUserOperate
} from "@/app/api/upgrade" } from '@/app/api/upgrade'
import { Terminal, TerminalFlash } from "vue-web-terminal" import { Terminal, TerminalFlash } from 'vue-web-terminal'
import "vue-web-terminal/lib/theme/dark.css" import 'vue-web-terminal/lib/theme/dark.css'
import { AnyObject } from "@/types/global" import { AnyObject } from '@/types/global'
import { ElNotification, ElMessage, ElMessageBox } from "element-plus" import { ElNotification, ElMessage, ElMessageBox } from 'element-plus'
import Storage from "@/utils/storage" import Storage from '@/utils/storage'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
const router = useRouter() const router = useRouter()
const terminalId = ref(Date.now());
const showDialog = ref<boolean>(false) const showDialog = ref<boolean>(false)
const upgradeContent = ref<null | AnyObject>(null) const upgradeContent = ref<null | AnyObject>(null)
const isAllowUpgrade = ref(true) // 是否允许升级 const isAllowUpgrade = ref(true) // 是否允许升级
@ -254,7 +259,7 @@ const step = ref(1)
const upgradeCheck = ref<null | AnyObject>(null) const upgradeCheck = ref<null | AnyObject>(null)
const loading = ref(false) const loading = ref(false)
const terminalRef: any = ref(null) const terminalRef: any = ref(null)
const emits = defineEmits(["complete", "cloudbuild"]) const emits = defineEmits(['complete', 'cloudbuild'])
const upgradeTipsShowDialog = ref<boolean>(false) const upgradeTipsShowDialog = ref<boolean>(false)
let upgradeLog: any = [] let upgradeLog: any = []
let errorLog: any = [] let errorLog: any = []
@ -269,17 +274,18 @@ const upgradeOption = ref({
// 升级步骤排除，backupCode 备份代码，backupSql 备份数据库 // 升级步骤排除，backupCode 备份代码，backupSql 备份数据库
const excludeSteps: any = ref([ const excludeSteps: any = ref([
{ {
name: "备份源码", name: '备份源码',
code: "backupCode" code: 'backupCode'
}, },
{ {
name: "备份数据库", name: '备份数据库',
code: "backupSql" code: 'backupSql'
} }
]) ])
/** /**
* 查询升级任务 * 查询升级任务
*/ */
const timeloading = ref(false)
const showTerminal = ref(false) const showTerminal = ref(false)
const upgradeStartTime = ref<number | null>(null) const upgradeStartTime = ref<number | null>(null)
const upgradeDuration = ref(0) // 单位：秒 const upgradeDuration = ref(0) // 单位：秒
@ -293,7 +299,7 @@ const getUpgradeTaskFn = () => {
if (!upgradeContent.value) { if (!upgradeContent.value) {
upgradeContent.value = data.upgrade_content upgradeContent.value = data.upgrade_content
if ( upgradeContent.value || !data.upgrade_content || !Array.isArray(data.upgrade_content.content)) { if (upgradeContent.value || !data.upgrade_content || !Array.isArray(data.upgrade_content.content)) {
return return
} }
@ -320,8 +326,9 @@ const getUpgradeTaskFn = () => {
} }
if (!upgradeTask.value) { if (!upgradeTask.value) {
showTerminal.value = true showTerminal.value = true
terminalRef.value.execute("clear") terminalRef.value.execute('clear')
terminalRef.value.execute("开始升级") terminalRef.value.execute('开始升级')
timeloading.value = true
upgradeStartTime.value = Date.now() upgradeStartTime.value = Date.now()
upgradeDuration.value = 0 upgradeDuration.value = 0
if (upgradeTimer) clearInterval(upgradeTimer) if (upgradeTimer) clearInterval(upgradeTimer)
@ -334,7 +341,7 @@ const getUpgradeTaskFn = () => {
data.log.forEach((item) => { data.log.forEach((item) => {
if (!upgradeLog.includes(item)) { if (!upgradeLog.includes(item)) {
terminalRef.value.pushMessage({ content: `${ item }` }) terminalRef.value.pushMessage({ content: `${item}` })
upgradeLog.push(item) upgradeLog.push(item)
} }
}) })
@ -342,7 +349,7 @@ const getUpgradeTaskFn = () => {
if (data.error) { if (data.error) {
data.error.forEach((item) => { data.error.forEach((item) => {
if (!errorLog.includes(item)) { if (!errorLog.includes(item)) {
terminalRef.value.pushMessage({ content: item, class: "error" }) terminalRef.value.pushMessage({ content: item, class: 'error' })
errorLog.push(item) errorLog.push(item)
errorMsg.value = item errorMsg.value = item
} }
@ -353,28 +360,30 @@ const getUpgradeTaskFn = () => {
clearInterval(upgradeTimer) clearInterval(upgradeTimer)
upgradeTimer = null upgradeTimer = null
} }
timeloading.value = false
} }
// 恢复完毕 // 恢复完毕
if (data.step == "restoreComplete") { if (data.step == 'restoreComplete') {
flashInterval && clearInterval(flashInterval) flashInterval && clearInterval(flashInterval)
return return
} }
// 升级完成 // 升级完成
if (data.step == "upgradeComplete") { if (data.step == 'upgradeComplete') {
active.value = "complete" active.value = 'complete'
showTerminal.value = false showTerminal.value = false
numberOfSteps.value = 4 numberOfSteps.value = 4
notificationEl && notificationEl.close() notificationEl && notificationEl.close()
emits("complete") emits('complete')
if (upgradeTimer) { if (upgradeTimer) {
clearInterval(upgradeTimer) clearInterval(upgradeTimer)
upgradeTimer = null upgradeTimer = null
} }
timeloading.value = false
clearUpgradeTask() clearUpgradeTask()
return return
} }
numberOfSteps.value = 2 numberOfSteps.value = 2
active.value = "upgrade" active.value = 'upgrade'
executeUpgradeFn() executeUpgradeFn()
}) })
} }
@ -382,13 +391,12 @@ const getUpgradeTaskFn = () => {
getUpgradeTaskFn() getUpgradeTaskFn()
const isBack = ref(false) const isBack = ref(false)
const handleBack = () => { const handleBack = () => {
active.value = "upgrade" active.value = 'upgrade'
isBack.value = true isBack.value = true
showTerminal.value = true showTerminal.value = true
errorDialog.value = false // 隐藏错误弹窗 errorDialog.value = false // 隐藏错误弹窗
} }
const formatUpgradeDuration = computed(() => { const formatUpgradeDuration = computed(() => {
const s = upgradeDuration.value const s = upgradeDuration.value
const h = Math.floor(s / 3600) const h = Math.floor(s / 3600)
@ -426,12 +434,12 @@ let notificationEl: any = null
*/ */
const showElNotification = () => { const showElNotification = () => {
notificationEl = ElNotification.success({ notificationEl = ElNotification.success({
title: t("warning"), title: t('warning'),
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
message: h("div", {}, [t("upgrade.upgradingTips"), h("span", { message: h('div', {}, [t('upgrade.upgradingTips'), h('span', {
class: "text-primary cursor-pointer", class: 'text-primary cursor-pointer',
onClick: elNotificationClick onClick: elNotificationClick
}, [t("upgrade.clickView")])]), }, [t('upgrade.clickView')])]),
duration: 0, duration: 0,
showClose: false showClose: false
}) })
@ -442,15 +450,15 @@ const elNotificationClick = () => {
getUpgradeTaskFn() getUpgradeTaskFn()
step.value = 2 step.value = 2
numberOfSteps.value = 3 numberOfSteps.value = 3
active.value = "upgrade" active.value = 'upgrade'
notificationEl && notificationEl.close() notificationEl && notificationEl.close()
} }
const frameworkVersion = ref("") const frameworkVersion = ref('')
getVersions().then((res) => { getVersions().then((res) => {
frameworkVersion.value = res.data.version.version frameworkVersion.value = res.data.version.version
}) })
const newFrameworkVersion = ref("") const newFrameworkVersion = ref('')
getFrameworkNewVersion().then(({ data }) => { getFrameworkNewVersion().then(({ data }) => {
newFrameworkVersion.value = data.last_version newFrameworkVersion.value = data.last_version
}) })
@ -462,7 +470,7 @@ const is_pass = ref(false)
const repeat = ref(false) const repeat = ref(false)
const readyLoading = ref(false) const readyLoading = ref(false)
const handleUpgrade = async() => { const handleUpgrade = async () => {
if (repeat.value) return if (repeat.value) return
repeat.value = true repeat.value = true
readyLoading.value = true readyLoading.value = true
@ -472,7 +480,7 @@ const handleUpgrade = async() => {
await preUpgradeCheck(appKey).then(async ({ data }) => { await preUpgradeCheck(appKey).then(async ({ data }) => {
upgradeCheck.value = data upgradeCheck.value = data
is_pass.value = data.is_pass is_pass.value = data.is_pass
active.value = "upgrade" active.value = 'upgrade'
!upgradeTask.value ? (numberOfSteps.value = 0) : numberOfSteps.value !upgradeTask.value ? (numberOfSteps.value = 0) : numberOfSteps.value
upgradeTipsShowDialog.value = false upgradeTipsShowDialog.value = false
showDialog.value = true showDialog.value = true
@ -498,18 +506,18 @@ const upgradeAddonFn = () => {
}) })
} }
const open = (addonKey: string = "", callback = null) => { const open = (addonKey: string = '', callback = null) => {
errorDialog.value = false // 隐藏错误弹窗 errorDialog.value = false // 隐藏错误弹窗
if (upgradeTask.value) { if (upgradeTask.value) {
ElMessage({ message: "已有正在执行中的升级任务", type: "error" }) ElMessage({ message: '已有正在执行中的升级任务', type: 'error' })
showDialog.value = true showDialog.value = true
step.value = 2 step.value = 2
numberOfSteps.value = 3 numberOfSteps.value = 3
active.value = "upgrade" active.value = 'upgrade'
if (callback) callback() if (callback) callback()
} else { } else {
if (addonKey && frameworkVersion.value != newFrameworkVersion.value) { if (addonKey && frameworkVersion.value != newFrameworkVersion.value) {
ElMessage({ message: "存在新版本框架，请先升级框架", type: "error" }) ElMessage({ message: '存在新版本框架，请先升级框架', type: 'error' })
if (callback) callback() if (callback) callback()
return return
} }
@ -532,7 +540,7 @@ const open = (addonKey: string = "", callback = null) => {
} else if (upgradeContent.value.content.length == failUpgradeCount) { } else if (upgradeContent.value.content.length == failUpgradeCount) {
isAllowUpgrade.value = false isAllowUpgrade.value = false
} }
if (Storage.get("upgradeTipsLock")) { if (Storage.get('upgradeTipsLock')) {
handleUpgrade() handleUpgrade()
} else { } else {
upgradeTipsShowDialog.value = true upgradeTipsShowDialog.value = true
@ -551,19 +559,19 @@ const open = (addonKey: string = "", callback = null) => {
let flashInterval: any = null let flashInterval: any = null
const terminalFlash = new TerminalFlash() const terminalFlash = new TerminalFlash()
const onExecCmd = (key, command, success, failed, name) => { const onExecCmd = (key, command, success, failed, name) => {
if (command == "开始升级") { if (command == '开始升级') {
success(terminalFlash) success(terminalFlash)
const frames = makeIterator(["/", "——", "\\", "|"]) const frames = makeIterator(['/', '——', '\\', '|'])
flashInterval = setInterval(() => { flashInterval = setInterval(() => {
terminalFlash.flush("> " + frames.next().value) terminalFlash.flush('> ' + frames.next().value)
}, 150) }, 150)
} }
} }
const makeIterator = (array: string[]) => { const makeIterator = (array: string[]) => {
var nextIndex = 0 let nextIndex = 0
return { return {
next() { next () {
if (nextIndex + 1 == array.length) { if (nextIndex + 1 == array.length) {
nextIndex = 0 nextIndex = 0
} }
@ -573,11 +581,11 @@ const makeIterator = (array: string[]) => {
} }
const dialogClose = (done: () => {}) => { const dialogClose = (done: () => {}) => {
if (active.value == "upgrade" && upgradeTask.value && ['upgradeComplete', 'restoreComplete'].includes(upgradeTask.value.step) === false && !isBack.value) { if (active.value == 'upgrade' && upgradeTask.value && ['upgradeComplete', 'restoreComplete'].includes(upgradeTask.value.step) === false && !isBack.value) {
ElMessageBox.confirm(t("upgrade.showDialogCloseTips"), t("warning"), { ElMessageBox.confirm(t('upgrade.showDialogCloseTips'), t('warning'), {
confirmButtonText: t("confirm"), confirmButtonText: t('confirm'),
cancelButtonText: t("cancel"), cancelButtonText: t('cancel'),
type: "warning" type: 'warning'
}).then(() => { }).then(() => {
done() done()
}) })
@ -591,13 +599,12 @@ watch(
() => { () => {
if (!showDialog.value) { if (!showDialog.value) {
clearUpgradeTaskFn() clearUpgradeTaskFn()
} }
} }
) )
const clearUpgradeTaskFn = () => { const clearUpgradeTaskFn = () => {
active.value = "upgrade" active.value = 'upgrade'
loading.value = false loading.value = false
upgradeTask.value = null upgradeTask.value = null
isBack.value = false isBack.value = false
@ -625,16 +632,16 @@ const clearUpgradeTaskFn = () => {
const cloudBuildError = (event: string) => { const cloudBuildError = (event: string) => {
cloudBuildErrorTipsShowDialog.value = false cloudBuildErrorTipsShowDialog.value = false
switch (event) { switch (event) {
case "local": case 'local':
upgradeUserOperate(event).then(() => { upgradeUserOperate(event).then(() => {
getUpgradeTaskFn() getUpgradeTaskFn()
}) })
break break
case "retry": case 'retry':
executeUpgradeFn() executeUpgradeFn()
retrySecondInterval && clearInterval(retrySecondInterval) retrySecondInterval && clearInterval(retrySecondInterval)
break break
case "rollback": case 'rollback':
upgradeUserOperate(event).then(() => { upgradeUserOperate(event).then(() => {
getUpgradeTaskFn() getUpgradeTaskFn()
}) })
@ -643,13 +650,13 @@ const cloudBuildError = (event: string) => {
} }
const timeSplit = (str: string) => { const timeSplit = (str: string) => {
const [date, time] = str.split(" ") const [date, time] = str.split(' ')
const [hours, minutes] = time.split(":") const [hours, minutes] = time.split(':')
return [date, `${ hours }:${ minutes }`] return [date, `${hours}:${minutes}`]
} }
const upgradeTipsConfirm = (isLock: boolean = false) => { const upgradeTipsConfirm = (isLock: boolean = false) => {
isLock && Storage.set({ key: "upgradeTipsLock", data: isLock }) isLock && Storage.set({ key: 'upgradeTipsLock', data: isLock })
upgradeTipsShowDialog.value = false upgradeTipsShowDialog.value = false
!isLock && (showDialog.value = true) !isLock && (showDialog.value = true)
} }
@ -810,8 +817,7 @@ defineExpose({
left: 125px; left: 125px;
border-left-color: #dddddd; border-left-color: #dddddd;
border-left-style: dashed; border-left-style: dashed;
margin: 12px 0; margin: 24px 0 12px;
margin-top: 24px;
height: calc(100% - 24px - 12px); height: calc(100% - 24px - 12px);
} }
@ -892,7 +898,7 @@ defineExpose({
position: absolute; position: absolute;
left: 0; left: 0;
top: 46px; top: 46px;
bottom: 0px; bottom: 0;
right: 0; right: 0;
z-index: 1; z-index: 1;
overflow: hidden; overflow: hidden;

5
admin/src/app/lang/zh-cn/auth.log.json
View File

@ -1,7 +1,7 @@
{ {
"ip":"登录IP", "ip":"登录IP",
"username":"管理员姓名", "username":"管理员姓名",
"operation": "操作日志", "operationLog": "操作日志",
"url":"链接", "url":"链接",
"detail": "详情", "detail": "详情",
"params":"参数", "params":"参数",
@ -15,6 +15,5 @@
"typePlaceholder":"请输入请求方式", "typePlaceholder":"请输入请求方式",
"createTimePlaceholder":"请输入操作时间", "createTimePlaceholder":"请输入操作时间",
"addSysUserLog":"添加管理员操作记录表", "addSysUserLog":"添加管理员操作记录表",
"updateSysUserLog":"编辑管理员操作记录表", "updateSysUserLog":"编辑管理员操作记录表"
"sys_user_logDeleteTips":"确定要删除该管理员操作记录表吗？"
} }

8
admin/src/app/lang/zh-cn/diy_form.edit.json
View File

@ -14,6 +14,14 @@
"statusBarStyle": "导航栏样式", "statusBarStyle": "导航栏样式",
"statusBarSwitchTips": "此处控制当前页面导航栏是否显示", "statusBarSwitchTips": "此处控制当前页面导航栏是否显示",
"bottomNavContent": "底部导航内容", "bottomNavContent": "底部导航内容",
"popWindowAds": "弹窗广告",
"popAdsLink": "广告链接",
"popAdsImage": "广告图",
"popAdsType": "显示类型",
"popAdsIsEnabled": "是否显示",
"firstPop": "首次弹出",
"popWindowCountTips": "建议上传图片大小：290px * 410px",
"everyTimePops": "每次弹出",
"diyPageTitle": "页面名称", "diyPageTitle": "页面名称",
"diyPageTitlePlaceholder": "请输入页面名称", "diyPageTitlePlaceholder": "请输入页面名称",
"pageTitleTips": "页面名称用于后台显示", "pageTitleTips": "页面名称用于后台显示",

8
admin/src/app/lang/zh-cn/setting.system.json
View File

@ -35,5 +35,11 @@
"siteLoginLogo": "站点登录Logo", "siteLoginLogo": "站点登录Logo",
"siteLoginLogoTips": "站点端登录Logo，建议图片尺寸：132*40像素；图片格式：jpg、png、jpeg。", "siteLoginLogoTips": "站点端登录Logo，建议图片尺寸：132*40像素；图片格式：jpg、png、jpeg。",
"siteLoginBgImg": "站点登录背景图", "siteLoginBgImg": "站点登录背景图",
"siteLoginBgImgTips": "站点端登录背景图，建议图片尺寸：1920*1280像素；图片格式：jpg、png、jpeg。" "siteLoginBgImgTips": "站点端登录背景图，建议图片尺寸：1920*1280像素；图片格式：jpg、png、jpeg。",
"metaTitle": "Meta 标题",
"MetaPlaceholder": "请输入Meta 标题",
"metaDescription": "Meta 描述",
"metaDescriptionPlaceholder": "请输入Meta描述",
"metaKeywords": "Meta 关键字",
"metaKeywordsPlaceholder": "请输入Meta关键字"
} }

1
admin/src/app/lang/zh-cn/wxoplatform.setting.json
View File

@ -26,7 +26,6 @@
"developerAppid": "开发小程序appid", "developerAppid": "开发小程序appid",
"uploadKey": "代码上传密钥", "uploadKey": "代码上传密钥",
"uploadKeyTips": "", "uploadKeyTips": "",
"uploadIpTips": "",
"developAppid": "开发小程序APPID", "developAppid": "开发小程序APPID",
"developAppidPlaceholder": "请输入开发小程序APPID", "developAppidPlaceholder": "请输入开发小程序APPID",
"uploadIpTips": "如果小程序代码上传开启了ip白名单设置，在ip白名单中添加ip：", "uploadIpTips": "如果小程序代码上传开启了ip白名单设置，在ip白名单中添加ip：",

2
admin/src/app/views/app/authorize.vue
View File

@ -4,7 +4,7 @@
<el-card class="box-card !border-none min-h-[300px]" shadow="never" v-loading="loading"> <el-card class="box-card !border-none min-h-[300px]" shadow="never" v-loading="loading">
<div v-if="!loading"> <div v-if="!loading">
<div class="title text-[16px] font-bold text-[#1D1F3A] mb-[30px]">授权信息</div> <div class="title text-[16px] font-bold text-[#1D1F3A] mb-[30px]">授权信息</div>
<div class=""> <div>
<div class="flex items-center"> <div class="flex items-center">
<div class="w-[92px] h-[92px] rounded-[10px] flex justify-center items-center mr-[20px]"> <div class="w-[92px] h-[92px] rounded-[10px] flex justify-center items-center mr-[20px]">
<img src="@/app/assets/images/tools/authorize.png" class="w-[92px] h-[92px]" /> <img src="@/app/assets/images/tools/authorize.png" class="w-[92px] h-[92px]" />

6
admin/src/app/views/app/index.vue
View File

@ -45,7 +45,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue' import { ref } from 'vue'
import { getSiteAddons,getShowApp } from '@/app/api/site' import { getSiteAddons, getShowApp } from '@/app/api/site'
import { img } from '@/utils/common' import { img } from '@/utils/common'
import useUserStore from '@/stores/modules/user' import useUserStore from '@/stores/modules/user'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
@ -61,7 +61,7 @@ const getAppList = async () => {
// appList.value = res.data // appList.value = res.data
// loading.value = false // loading.value = false
const res = await getShowApp(); const res = await getShowApp()
appList.value = res.data appList.value = res.data
loading.value = false loading.value = false
} }
@ -87,6 +87,6 @@ const toLink = (item: any) => {
} }
.app-item:hover{ .app-item:hover{
transition: 0.5s; transition: 0.5s;
box-shadow: 0px 2px 8px 0px rgba(0,0,0,0.1); box-shadow: 0 2px 8px 0 rgba(0,0,0,0.1);
} }
</style> </style>

2
admin/src/app/views/app/marketing.vue
View File

@ -83,6 +83,6 @@ const toLink = (item: any) => {
} }
.app-item:hover{ .app-item:hover{
transition: 0.5s; transition: 0.5s;
box-shadow: 0px 2px 8px 0px rgba(0,0,0,0.1); box-shadow: 0 2px 8px 0 rgba(0,0,0,0.1);
} }
</style> </style>

4
admin/src/app/views/auth/components/edit-role.vue
View File

@ -37,7 +37,7 @@
</template> </template>
<script lang="ts" setup async> <script lang="ts" setup async>
import { ref, reactive, computed, watch, toRaw } from 'vue' import { ref, reactive, computed, watch, toRaw, nextTick } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import { addRole, editRole, getRoleInfo, getSiteMenus } from '@/app/api/sys' import { addRole, editRole, getRoleInfo, getSiteMenus } from '@/app/api/sys'
@ -60,11 +60,13 @@ const selectAll = ref(false)
const checkStrictly = ref(false) const checkStrictly = ref(false)
const treeRef: Record<string, any> | null = ref(null) const treeRef: Record<string, any> | null = ref(null)
watch(selectAll, () => { watch(selectAll, () => {
nextTick(() => {
if (selectAll.value) { if (selectAll.value) {
treeRef.value.setCheckedNodes(toRaw(menus.value)) treeRef.value.setCheckedNodes(toRaw(menus.value))
} else { } else {
treeRef.value.setCheckedNodes([]) treeRef.value.setCheckedNodes([])
} }
})
}) })
const handleCheckChange = debounce((e) => { const handleCheckChange = debounce((e) => {

2
admin/src/app/views/auth/components/edit-user.vue
View File

@ -15,7 +15,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item :label="t('accountNumber')" prop="username" > <el-form-item :label="t('accountNumber')" prop="username" >
<el-input v-model.trim="formData.username" :placeholder="t('accountNumberPlaceholder')" clearable :disabled="formData.uid" class="input-width" maxlength="10" show-word-limit /> <el-input v-model.trim="formData.username" :placeholder="t('accountNumberPlaceholder')" clearable :disabled="formData.uid" class="input-width" maxlength="20" show-word-limit />
</el-form-item> </el-form-item>
<div v-if="needAddUserInfo"> <div v-if="needAddUserInfo">

4
admin/src/app/views/auth/log.vue
View File

@ -39,7 +39,7 @@
</template> </template>
<el-table-column prop="username" :label="t('username')" min-width="120" /> <el-table-column prop="username" :label="t('username')" min-width="120" />
<el-table-column prop="ip" :label="t('ip')" min-width="100" align="left"/> <el-table-column prop="ip" :label="t('ip')" min-width="100" align="left"/>
<el-table-column prop="operation" :label="t('operation')" min-width="200" align="left"/> <el-table-column prop="operation" :label="t('operationLog')" min-width="200" align="left"/>
<el-table-column prop="url" :label="t('url')" min-width="180" /> <el-table-column prop="url" :label="t('url')" min-width="180" />
<el-table-column prop="type" :label="t('type')" min-width="100" align="center"/> <el-table-column prop="type" :label="t('type')" min-width="100" align="center"/>
<el-table-column :label="t('createTime')" min-width="180" align="center"> <el-table-column :label="t('createTime')" min-width="180" align="center">
@ -67,7 +67,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref } from 'vue' import { reactive, ref } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getLogList ,logDestroy} from '@/app/api/site' import { getLogList, logDestroy } from '@/app/api/site'
import UserLogDetail from '@/app/views/auth/components/user-log-detail.vue' import UserLogDetail from '@/app/views/auth/components/user-log-detail.vue'
import { FormInstance } from 'element-plus' import { FormInstance } from 'element-plus'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'

9
admin/src/app/views/auth/role.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<!--角色管理--> <!--角色管理-->
<div class="main-container"> <div class="main-container">
<el-card class="box-card !border-none setting-card" shadow="never"> <el-card class="box-card !border-none" shadow="never">
<!-- <div class="flex justify-between items-center"> <!-- <div class="flex justify-between items-center">
<span class="text-page-title">{{ pageName }}</span> <span class="text-page-title">{{ pageName }}</span>
@ -54,7 +54,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref, reactive } from 'vue' import { ref, reactive } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getRoleList, deleteRole, modifyRoleStatus} from '@/app/api/sys' import { getRoleList, deleteRole, modifyRoleStatus } from '@/app/api/sys'
import { ElMessageBox, FormInstance } from 'element-plus' import { ElMessageBox, FormInstance } from 'element-plus'
import EditRole from '@/app/views/auth/components/edit-role.vue' import EditRole from '@/app/views/auth/components/edit-role.vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
@ -150,12 +150,11 @@ const modifyRoleStatusEvent = (role_id: any, status: any) => {
}).then((res) => { }).then((res) => {
loadRoleList() loadRoleList()
isRepeat.value = false isRepeat.value = false
}).catch(() => {
isRepeat.value = false
}) })
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep(.setting-card .el-card__body){
padding: 0 !important;
}
</style> </style>

8
admin/src/app/views/auth/site_menu.vue
View File

@ -93,8 +93,8 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref,h } from 'vue' import { reactive, ref, h } from 'vue'
import { getMenus, deleteMenu,menuRefresh } from '@/app/api/sys' import { getMenus, deleteMenu, menuRefresh } from '@/app/api/sys'
import { t } from '@/lang' import { t } from '@/lang'
import { ElMessageBox } from 'element-plus' import { ElMessageBox } from 'element-plus'
import EditMenu from '@/app/views/auth/components/edit-menu.vue' import EditMenu from '@/app/views/auth/components/edit-menu.vue'
@ -133,11 +133,11 @@ getMenuList()
const refreshMenu = () => { const refreshMenu = () => {
ElMessageBox.confirm(h('div', null, [ ElMessageBox.confirm(h('div', null, [
h('p', null, t('initializeMenuTipsOne')), h('p', null, t('initializeMenuTipsOne')),
h('p', null, t('initializeMenuTipsTwo')), h('p', null, t('initializeMenuTipsTwo'))
]), t('warning'), ]), t('warning'),
{ {
confirmButtonText: t('confirm'), confirmButtonText: t('confirm'),
cancelButtonText: t('cancel'), cancelButtonText: t('cancel')
// type: 'warning' // type: 'warning'
} }
).then(() => { ).then(() => {

2
admin/src/app/views/channel/weapp/access.vue
View File

@ -128,7 +128,7 @@ const onShowGetWeappConfig = async () => {
} }
onMounted(async () => { onMounted(async () => {
onShowGetWeappConfig() await onShowGetWeappConfig()
await getWxoplatform().then(({ data }) => { await getWxoplatform().then(({ data }) => {
oplatformConfig.value = data oplatformConfig.value = data

3
admin/src/app/views/channel/weapp/components/modify-domain.vue
View File

@ -37,7 +37,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import {computed, reactive, ref} from 'vue' import { computed, reactive, ref } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import { setWeappDomain } from '@/app/api/weapp' import { setWeappDomain } from '@/app/api/weapp'
@ -128,7 +128,6 @@ const confirm = async (formEl: FormInstance | undefined) => {
await formEl.validate(async (valid) => { await formEl.validate(async (valid) => {
if (valid) { if (valid) {
if (loading.value) return if (loading.value) return
loading.value = true loading.value = true

2
admin/src/app/views/channel/weapp/components/modify-privacy-agreement.vue
View File

@ -147,7 +147,7 @@ const initialFormData = {
store_expire_timestamp: '' store_expire_timestamp: ''
} }
const formData: Record<string, any> = reactive({...initialFormData}) const formData: Record<string, any> = reactive({ ...initialFormData })
const formRef = ref<FormInstance>() const formRef = ref<FormInstance>()

4
admin/src/app/views/channel/wechat/access.vue
View File

@ -109,14 +109,14 @@ const wechatConfig = ref({})
const oplatformConfig = ref({}) const oplatformConfig = ref({})
const onShowGetWechatConfig = async () => { const onShowGetWechatConfig = async () => {
await getWechatConfig().then(({data}) => { await getWechatConfig().then(({ data }) => {
wechatConfig.value = data wechatConfig.value = data
qrcode.value = data.qr_code qrcode.value = data.qr_code
}) })
} }
onMounted(async () => { onMounted(async () => {
onShowGetWechatConfig() await onShowGetWechatConfig()
await getWxoplatform().then(({ data }) => { await getWxoplatform().then(({ data }) => {
oplatformConfig.value = data oplatformConfig.value = data

12
admin/src/app/views/channel/wechat/components/select-wechat-media.vue
View File

@ -186,17 +186,17 @@ const waterfall = debounce(() => {
const position = {} const position = {}
position.top = '0px' position.top = '0px'
if (i % column == 0) { if (i % column == 0) {
position.left = item.clientWidth * i + "px" position.left = item.clientWidth * i + 'px'
} else { } else {
position.left = item.clientWidth * i + (i % column * 10) + "px" position.left = item.clientWidth * i + (i % column * 10) + 'px'
} }
positions[i] = position positions[i] = position
heights[i] = item.clientHeight + 10 heights[i] = item.clientHeight + 10
} else { } else {
let minHeight = Math.min(...heights) // 找到第一列的最小高度 const minHeight = Math.min(...heights) // 找到第一列的最小高度
let minIndex = heights.findIndex(item => item === minHeight) // 找到最小高度的索引 const minIndex = heights.findIndex(item => item === minHeight) // 找到最小高度的索引
let position = {} const position = {}
position.top = minHeight + 10 + "px" position.top = minHeight + 10 + 'px'
position.left = positions[minIndex].left position.left = positions[minIndex].left
positions[i] = position positions[i] = position
heights[minIndex] += item.clientHeight + 10 heights[minIndex] += item.clientHeight + 10

3
admin/src/app/views/channel/wechat/keyword_reply_edit.vue
View File

@ -139,7 +139,8 @@ const formRules = reactive<FormRules>({
validator: (rule: any, value: any, callback: any) => { validator: (rule: any, value: any, callback: any) => {
if (!formData.content.length) callback(new Error(t('contentPlaceholder'))) if (!formData.content.length) callback(new Error(t('contentPlaceholder')))
callback() callback()
}, trigger: 'blur' },
trigger: 'blur'
} }
] ]
}) })

34
admin/src/app/views/diy/components/add-theme.vue
View File

@ -46,21 +46,21 @@ const initialData = {
value: '', value: '',
tip: '' tip: ''
} }
let keyArr = []; // 存储现有颜色的key let keyArr = [] // 存储现有颜色的key
let type = ref('') // 区分编辑和添加 const type = ref('') // 区分编辑和添加
const formData: Record<string, any> = reactive({ ...initialData }) const formData: Record<string, any> = reactive({ ...initialData })
const open = (option:any) => { const open = (option:any) => {
keyArr = option.key; keyArr = option.key
type.value = ''; type.value = ''
// 恢复默认值 // 恢复默认值
for(let key in formData){ for (const key in formData) {
formData[key] = '' formData[key] = ''
} }
if(option.data && Object.keys(option.data).length){ if (option.data && Object.keys(option.data).length) {
type.value = 'edit'; type.value = 'edit'
Object.keys(formData).forEach((item,index)=>{ Object.keys(formData).forEach((item, index) => {
formData[item] = option.data[item] ? option.data[item] : ''; formData[item] = option.data[item] ? option.data[item] : ''
}) })
} }
dialogThemeVisible.value = true dialogThemeVisible.value = true
@ -72,7 +72,7 @@ const formRef = ref<FormInstance>()
const formRules = computed(() => { const formRules = computed(() => {
return { return {
title: [ title: [
{ required: true, message: "请输入颜色名称", trigger: 'blur' } { required: true, message: '请输入颜色名称', trigger: 'blur' }
], ],
value: [ value: [
{ {
@ -80,15 +80,15 @@ const formRules = computed(() => {
validator: (rule: any, value: any, callback: any) => { validator: (rule: any, value: any, callback: any) => {
if (!value) { if (!value) {
callback('请输入颜色value值') callback('请输入颜色value值')
} else{ } else {
callback(); callback()
} }
}, },
trigger: ['blur', 'change'] trigger: ['blur', 'change']
} }
], ],
label: [ label: [
{ required: true, message: "请输入颜色key值", trigger: 'blur' }, { required: true, message: '请输入颜色key值', trigger: 'blur' },
{ {
validator: (rule: any, value: any, callback: any) => { validator: (rule: any, value: any, callback: any) => {
const regex = /^[a-zA-Z0-9-]+$/ const regex = /^[a-zA-Z0-9-]+$/
@ -96,8 +96,8 @@ const formRules = computed(() => {
callback('新增颜色key值与已存在颜色key值命名重复，请修改命名') callback('新增颜色key值与已存在颜色key值命名重复，请修改命名')
} if (!regex.test(value)) { } if (!regex.test(value)) {
callback('颜色key值只能输入字母、数字和连字符') callback('颜色key值只能输入字母、数字和连字符')
} else{ } else {
callback(); callback()
} }
}, },
trigger: 'blur' trigger: 'blur'
@ -113,8 +113,8 @@ const confirmFn = async (formEl: FormInstance | undefined) => {
confirmRepeat.value = true confirmRepeat.value = true
if (valid) { if (valid) {
confirmRepeat.value = false confirmRepeat.value = false
emit('confirm', cloneDeep(formData)); emit('confirm', cloneDeep(formData))
dialogThemeVisible.value = false; dialogThemeVisible.value = false
} }
}) })
} }

349
admin/src/app/views/diy/components/edit-active-cube.vue
View File

@ -271,8 +271,8 @@ diyStore.editComponent.list.forEach((item: any) => {
const showTitleDialog = ref(false) const showTitleDialog = ref(false)
const showTitleStyle = () => { const showTitleStyle = () => {
selectTitleStyle.title = diyStore.editComponent.titleStyle.title; selectTitleStyle.title = diyStore.editComponent.titleStyle.title
selectTitleStyle.value = diyStore.editComponent.titleStyle.value; selectTitleStyle.value = diyStore.editComponent.titleStyle.value
showTitleDialog.value = true showTitleDialog.value = true
} }
@ -306,43 +306,43 @@ const selectTitleStyle = reactive({
}) })
const changeTitleStyle = (item: any) => { const changeTitleStyle = (item: any) => {
selectTitleStyle.title = item.title; selectTitleStyle.title = item.title
selectTitleStyle.value = item.value; selectTitleStyle.value = item.value
} }
const confirmTitleStyle = () => { const confirmTitleStyle = () => {
diyStore.editComponent.titleStyle.title = selectTitleStyle.title; diyStore.editComponent.titleStyle.title = selectTitleStyle.title
diyStore.editComponent.titleStyle.value = selectTitleStyle.value; diyStore.editComponent.titleStyle.value = selectTitleStyle.value
initTitleStyle(diyStore.editComponent.titleStyle.value); initTitleStyle(diyStore.editComponent.titleStyle.value)
showTitleDialog.value = false showTitleDialog.value = false
} }
const initTitleStyle = (style) => { const initTitleStyle = (style) => {
if (diyStore.editComponent.titleStyle.value == 'style-1') { if (diyStore.editComponent.titleStyle.value == 'style-1') {
diyStore.editComponent.titleColor = "#F91700"; diyStore.editComponent.titleColor = '#F91700'
diyStore.editComponent.subTitle.textColor = "#FFFFFF"; diyStore.editComponent.subTitle.textColor = '#FFFFFF'
diyStore.editComponent.subTitle.startColor = "#FB792F"; diyStore.editComponent.subTitle.startColor = '#FB792F'
diyStore.editComponent.subTitle.endColor = "#F91700"; diyStore.editComponent.subTitle.endColor = '#F91700'
} else if (diyStore.editComponent.titleStyle.value == 'style-2') { } else if (diyStore.editComponent.titleStyle.value == 'style-2') {
diyStore.editComponent.titleColor = "#F91700"; diyStore.editComponent.titleColor = '#F91700'
diyStore.editComponent.subTitle.textColor = "#FFFFFF"; diyStore.editComponent.subTitle.textColor = '#FFFFFF'
diyStore.editComponent.subTitle.startColor = "#FB792F"; diyStore.editComponent.subTitle.startColor = '#FB792F'
diyStore.editComponent.subTitle.endColor = "#F91700"; diyStore.editComponent.subTitle.endColor = '#F91700'
} else if (diyStore.editComponent.titleStyle.value == 'style-3') { } else if (diyStore.editComponent.titleStyle.value == 'style-3') {
diyStore.editComponent.titleColor = "#F91700"; diyStore.editComponent.titleColor = '#F91700'
diyStore.editComponent.subTitle.textColor = "#FFFFFF"; diyStore.editComponent.subTitle.textColor = '#FFFFFF'
diyStore.editComponent.subTitle.startColor = "#FB792F"; diyStore.editComponent.subTitle.startColor = '#FB792F'
diyStore.editComponent.subTitle.endColor = "#F91700"; diyStore.editComponent.subTitle.endColor = '#F91700'
} else if (diyStore.editComponent.titleStyle.value == 'style-4') { } else if (diyStore.editComponent.titleStyle.value == 'style-4') {
diyStore.editComponent.titleColor = "#FFFFFF"; diyStore.editComponent.titleColor = '#FFFFFF'
diyStore.editComponent.subTitle.textColor = "#333333"; diyStore.editComponent.subTitle.textColor = '#333333'
diyStore.editComponent.subTitle.startColor = "#FFFFFF"; diyStore.editComponent.subTitle.startColor = '#FFFFFF'
diyStore.editComponent.subTitle.endColor = "#FFFFFF"; diyStore.editComponent.subTitle.endColor = '#FFFFFF'
} else if (diyStore.editComponent.titleStyle.value == 'style-5') { } else if (diyStore.editComponent.titleStyle.value == 'style-5') {
diyStore.editComponent.titleColor = ""; diyStore.editComponent.titleColor = ''
diyStore.editComponent.subTitle.textColor = "#999999"; diyStore.editComponent.subTitle.textColor = '#999999'
diyStore.editComponent.subTitle.startColor = "#FFFFFF"; diyStore.editComponent.subTitle.startColor = '#FFFFFF'
diyStore.editComponent.subTitle.endColor = "#FFFFFF"; diyStore.editComponent.subTitle.endColor = '#FFFFFF'
} }
} }
@ -382,178 +382,177 @@ const selectBlockStyle = reactive({
}) })
const changeBlockStyle = (item: any) => { const changeBlockStyle = (item: any) => {
selectBlockStyle.title = item.title; selectBlockStyle.title = item.title
selectBlockStyle.value = item.value; selectBlockStyle.value = item.value
} }
const confirmBlockStyle = () => { const confirmBlockStyle = () => {
diyStore.editComponent.blockStyle.title = selectBlockStyle.title; diyStore.editComponent.blockStyle.title = selectBlockStyle.title
diyStore.editComponent.blockStyle.value = selectBlockStyle.value; diyStore.editComponent.blockStyle.value = selectBlockStyle.value
initBlockStyle(diyStore.editComponent.blockStyle.value); initBlockStyle(diyStore.editComponent.blockStyle.value)
showListDialog.value = false showListDialog.value = false
} }
const initBlockStyle = (style: any) => { const initBlockStyle = (style: any) => {
if (style == 'style-1') { if (style == 'style-1') {
diyStore.editComponent.blockStyle.fontWeight = "normal"; diyStore.editComponent.blockStyle.fontWeight = 'normal'
diyStore.editComponent.blockStyle.btnText = "normal"; diyStore.editComponent.blockStyle.btnText = 'normal'
diyStore.editComponent.list[0].title.textColor = "#303133"; diyStore.editComponent.list[0].title.textColor = '#303133'
diyStore.editComponent.list[0].subTitle.textColor = "#999999"; diyStore.editComponent.list[0].subTitle.textColor = '#999999'
diyStore.editComponent.list[0].subTitle.startColor = ""; diyStore.editComponent.list[0].subTitle.startColor = ''
diyStore.editComponent.list[0].subTitle.endColor = ""; diyStore.editComponent.list[0].subTitle.endColor = ''
diyStore.editComponent.list[0].moreTitle.startColor = "#FEA715"; diyStore.editComponent.list[0].moreTitle.startColor = '#FEA715'
diyStore.editComponent.list[0].moreTitle.endColor = "#FE1E00"; diyStore.editComponent.list[0].moreTitle.endColor = '#FE1E00'
diyStore.editComponent.list[0].listFrame.startColor = "#FFFAF5"; diyStore.editComponent.list[0].listFrame.startColor = '#FFFAF5'
diyStore.editComponent.list[0].listFrame.endColor = "#FFFFFF"; diyStore.editComponent.list[0].listFrame.endColor = '#FFFFFF'
diyStore.editComponent.list[1].title.textColor = "#303133"; diyStore.editComponent.list[1].title.textColor = '#303133'
diyStore.editComponent.list[1].subTitle.textColor = "#999999"; diyStore.editComponent.list[1].subTitle.textColor = '#999999'
diyStore.editComponent.list[1].subTitle.startColor = ""; diyStore.editComponent.list[1].subTitle.startColor = ''
diyStore.editComponent.list[1].subTitle.endColor = ""; diyStore.editComponent.list[1].subTitle.endColor = ''
diyStore.editComponent.list[1].moreTitle.startColor = "#FFBF50"; diyStore.editComponent.list[1].moreTitle.startColor = '#FFBF50'
diyStore.editComponent.list[1].moreTitle.endColor = "#FF9E03"; diyStore.editComponent.list[1].moreTitle.endColor = '#FF9E03'
diyStore.editComponent.list[1].listFrame.startColor = "#FFFAF5"; diyStore.editComponent.list[1].listFrame.startColor = '#FFFAF5'
diyStore.editComponent.list[1].listFrame.endColor = "#FFFFFF"; diyStore.editComponent.list[1].listFrame.endColor = '#FFFFFF'
diyStore.editComponent.list[2].title.textColor = "#303133"; diyStore.editComponent.list[2].title.textColor = '#303133'
diyStore.editComponent.list[2].subTitle.textColor = "#999999"; diyStore.editComponent.list[2].subTitle.textColor = '#999999'
diyStore.editComponent.list[2].subTitle.startColor = ""; diyStore.editComponent.list[2].subTitle.startColor = ''
diyStore.editComponent.list[2].subTitle.endColor = ""; diyStore.editComponent.list[2].subTitle.endColor = ''
diyStore.editComponent.list[2].moreTitle.startColor = "#A2E792"; diyStore.editComponent.list[2].moreTitle.startColor = '#A2E792'
diyStore.editComponent.list[2].moreTitle.endColor = "#49CD2D"; diyStore.editComponent.list[2].moreTitle.endColor = '#49CD2D'
diyStore.editComponent.list[2].listFrame.startColor = "#FFFAF5"; diyStore.editComponent.list[2].listFrame.startColor = '#FFFAF5'
diyStore.editComponent.list[2].listFrame.endColor = "#FFFFFF"; diyStore.editComponent.list[2].listFrame.endColor = '#FFFFFF'
diyStore.editComponent.list[3].title.textColor = "#303133";
diyStore.editComponent.list[3].subTitle.textColor = "#999999";
diyStore.editComponent.list[3].subTitle.startColor = "";
diyStore.editComponent.list[3].subTitle.endColor = "";
diyStore.editComponent.list[3].moreTitle.startColor = "#4AC1FF";
diyStore.editComponent.list[3].moreTitle.endColor = "#1D7CFF";
diyStore.editComponent.list[3].listFrame.startColor = "#FFFAF5";
diyStore.editComponent.list[3].listFrame.endColor = "#FFFFFF";
diyStore.editComponent.list[3].title.textColor = '#303133'
diyStore.editComponent.list[3].subTitle.textColor = '#999999'
diyStore.editComponent.list[3].subTitle.startColor = ''
diyStore.editComponent.list[3].subTitle.endColor = ''
diyStore.editComponent.list[3].moreTitle.startColor = '#4AC1FF'
diyStore.editComponent.list[3].moreTitle.endColor = '#1D7CFF'
diyStore.editComponent.list[3].listFrame.startColor = '#FFFAF5'
diyStore.editComponent.list[3].listFrame.endColor = '#FFFFFF'
} else if (style == 'style-2') { } else if (style == 'style-2') {
diyStore.editComponent.blockStyle.fontWeight = "normal"; diyStore.editComponent.blockStyle.fontWeight = 'normal'
diyStore.editComponent.blockStyle.btnText = "normal"; diyStore.editComponent.blockStyle.btnText = 'normal'
diyStore.editComponent.blockStyle.fontWeight = "bold"; diyStore.editComponent.blockStyle.fontWeight = 'bold'
diyStore.editComponent.blockStyle.btnText = "italics"; diyStore.editComponent.blockStyle.btnText = 'italics'
diyStore.editComponent.list[0].title.textColor = "#303133"; diyStore.editComponent.list[0].title.textColor = '#303133'
diyStore.editComponent.list[0].subTitle.textColor = "#999999"; diyStore.editComponent.list[0].subTitle.textColor = '#999999'
diyStore.editComponent.list[0].subTitle.startColor = ""; diyStore.editComponent.list[0].subTitle.startColor = ''
diyStore.editComponent.list[0].subTitle.endColor = ""; diyStore.editComponent.list[0].subTitle.endColor = ''
diyStore.editComponent.list[0].moreTitle.startColor = "#FFC051"; diyStore.editComponent.list[0].moreTitle.startColor = '#FFC051'
diyStore.editComponent.list[0].moreTitle.endColor = "#FF9C00"; diyStore.editComponent.list[0].moreTitle.endColor = '#FF9C00'
diyStore.editComponent.list[0].listFrame.startColor = "#FFF1DB"; diyStore.editComponent.list[0].listFrame.startColor = '#FFF1DB'
diyStore.editComponent.list[0].listFrame.endColor = "#FFFBF4"; diyStore.editComponent.list[0].listFrame.endColor = '#FFFBF4'
diyStore.editComponent.list[1].title.textColor = "#303133"; diyStore.editComponent.list[1].title.textColor = '#303133'
diyStore.editComponent.list[1].subTitle.textColor = "#999999"; diyStore.editComponent.list[1].subTitle.textColor = '#999999'
diyStore.editComponent.list[1].subTitle.startColor = ""; diyStore.editComponent.list[1].subTitle.startColor = ''
diyStore.editComponent.list[1].subTitle.endColor = ""; diyStore.editComponent.list[1].subTitle.endColor = ''
diyStore.editComponent.list[1].moreTitle.startColor = "#A4E894"; diyStore.editComponent.list[1].moreTitle.startColor = '#A4E894'
diyStore.editComponent.list[1].moreTitle.endColor = "#45CC2A"; diyStore.editComponent.list[1].moreTitle.endColor = '#45CC2A'
diyStore.editComponent.list[1].listFrame.startColor = "#E6F6E2"; diyStore.editComponent.list[1].listFrame.startColor = '#E6F6E2'
diyStore.editComponent.list[1].listFrame.endColor = "#F5FDF3"; diyStore.editComponent.list[1].listFrame.endColor = '#F5FDF3'
diyStore.editComponent.list[2].title.textColor = "#303133"; diyStore.editComponent.list[2].title.textColor = '#303133'
diyStore.editComponent.list[2].subTitle.textColor = "#999999"; diyStore.editComponent.list[2].subTitle.textColor = '#999999'
diyStore.editComponent.list[2].subTitle.startColor = ""; diyStore.editComponent.list[2].subTitle.startColor = ''
diyStore.editComponent.list[2].subTitle.endColor = ""; diyStore.editComponent.list[2].subTitle.endColor = ''
diyStore.editComponent.list[2].moreTitle.startColor = "#4BC2FF"; diyStore.editComponent.list[2].moreTitle.startColor = '#4BC2FF'
diyStore.editComponent.list[2].moreTitle.endColor = "#1F7DFF"; diyStore.editComponent.list[2].moreTitle.endColor = '#1F7DFF'
diyStore.editComponent.list[2].listFrame.startColor = "#E2F6FF"; diyStore.editComponent.list[2].listFrame.startColor = '#E2F6FF'
diyStore.editComponent.list[2].listFrame.endColor = "#F2FAFF"; diyStore.editComponent.list[2].listFrame.endColor = '#F2FAFF'
diyStore.editComponent.list[3].title.textColor = "#303133"; diyStore.editComponent.list[3].title.textColor = '#303133'
diyStore.editComponent.list[3].subTitle.textColor = "#999999"; diyStore.editComponent.list[3].subTitle.textColor = '#999999'
diyStore.editComponent.list[3].subTitle.startColor = ""; diyStore.editComponent.list[3].subTitle.startColor = ''
diyStore.editComponent.list[3].subTitle.endColor = ""; diyStore.editComponent.list[3].subTitle.endColor = ''
diyStore.editComponent.list[3].moreTitle.startColor = "#FB792F"; diyStore.editComponent.list[3].moreTitle.startColor = '#FB792F'
diyStore.editComponent.list[3].moreTitle.endColor = "#F91700"; diyStore.editComponent.list[3].moreTitle.endColor = '#F91700'
diyStore.editComponent.list[3].listFrame.startColor = "#FFEAEA"; diyStore.editComponent.list[3].listFrame.startColor = '#FFEAEA'
diyStore.editComponent.list[3].listFrame.endColor = "#FFFCFB"; diyStore.editComponent.list[3].listFrame.endColor = '#FFFCFB'
} else if (style == 'style-3') { } else if (style == 'style-3') {
diyStore.editComponent.blockStyle.fontWeight = "normal"; diyStore.editComponent.blockStyle.fontWeight = 'normal'
diyStore.editComponent.blockStyle.btnText = "normal"; diyStore.editComponent.blockStyle.btnText = 'normal'
diyStore.editComponent.list[0].title.textColor = "#FF1128"; diyStore.editComponent.list[0].title.textColor = '#FF1128'
diyStore.editComponent.list[0].subTitle.textColor = ""; diyStore.editComponent.list[0].subTitle.textColor = ''
diyStore.editComponent.list[0].subTitle.startColor = ""; diyStore.editComponent.list[0].subTitle.startColor = ''
diyStore.editComponent.list[0].subTitle.endColor = ""; diyStore.editComponent.list[0].subTitle.endColor = ''
diyStore.editComponent.list[0].moreTitle.startColor = ""; diyStore.editComponent.list[0].moreTitle.startColor = ''
diyStore.editComponent.list[0].moreTitle.endColor = ""; diyStore.editComponent.list[0].moreTitle.endColor = ''
diyStore.editComponent.list[0].listFrame.startColor = ""; diyStore.editComponent.list[0].listFrame.startColor = ''
diyStore.editComponent.list[0].listFrame.endColor = ""; diyStore.editComponent.list[0].listFrame.endColor = ''
diyStore.editComponent.list[1].title.textColor = "#303133"; diyStore.editComponent.list[1].title.textColor = '#303133'
diyStore.editComponent.list[1].subTitle.textColor = ""; diyStore.editComponent.list[1].subTitle.textColor = ''
diyStore.editComponent.list[1].subTitle.startColor = ""; diyStore.editComponent.list[1].subTitle.startColor = ''
diyStore.editComponent.list[1].subTitle.endColor = ""; diyStore.editComponent.list[1].subTitle.endColor = ''
diyStore.editComponent.list[1].moreTitle.startColor = ""; diyStore.editComponent.list[1].moreTitle.startColor = ''
diyStore.editComponent.list[1].moreTitle.endColor = ""; diyStore.editComponent.list[1].moreTitle.endColor = ''
diyStore.editComponent.list[1].listFrame.startColor = ""; diyStore.editComponent.list[1].listFrame.startColor = ''
diyStore.editComponent.list[1].listFrame.endColor = ""; diyStore.editComponent.list[1].listFrame.endColor = ''
diyStore.editComponent.list[2].title.textColor = "#303133"; diyStore.editComponent.list[2].title.textColor = '#303133'
diyStore.editComponent.list[2].subTitle.textColor = ""; diyStore.editComponent.list[2].subTitle.textColor = ''
diyStore.editComponent.list[2].subTitle.startColor = ""; diyStore.editComponent.list[2].subTitle.startColor = ''
diyStore.editComponent.list[2].subTitle.endColor = ""; diyStore.editComponent.list[2].subTitle.endColor = ''
diyStore.editComponent.list[2].moreTitle.startColor = ""; diyStore.editComponent.list[2].moreTitle.startColor = ''
diyStore.editComponent.list[2].moreTitle.endColor = ""; diyStore.editComponent.list[2].moreTitle.endColor = ''
diyStore.editComponent.list[2].listFrame.startColor = ""; diyStore.editComponent.list[2].listFrame.startColor = ''
diyStore.editComponent.list[2].listFrame.endColor = ""; diyStore.editComponent.list[2].listFrame.endColor = ''
diyStore.editComponent.list[3].title.textColor = "#303133"; diyStore.editComponent.list[3].title.textColor = '#303133'
diyStore.editComponent.list[3].subTitle.textColor = ""; diyStore.editComponent.list[3].subTitle.textColor = ''
diyStore.editComponent.list[3].subTitle.startColor = ""; diyStore.editComponent.list[3].subTitle.startColor = ''
diyStore.editComponent.list[3].subTitle.endColor = ""; diyStore.editComponent.list[3].subTitle.endColor = ''
diyStore.editComponent.list[3].moreTitle.startColor = ""; diyStore.editComponent.list[3].moreTitle.startColor = ''
diyStore.editComponent.list[3].moreTitle.endColor = ""; diyStore.editComponent.list[3].moreTitle.endColor = ''
diyStore.editComponent.list[3].listFrame.startColor = ""; diyStore.editComponent.list[3].listFrame.startColor = ''
diyStore.editComponent.list[3].listFrame.endColor = ""; diyStore.editComponent.list[3].listFrame.endColor = ''
} else if (style == 'style-4') { } else if (style == 'style-4') {
diyStore.editComponent.blockStyle.fontWeight = "bold"; diyStore.editComponent.blockStyle.fontWeight = 'bold'
diyStore.editComponent.blockStyle.btnText = "normal"; diyStore.editComponent.blockStyle.btnText = 'normal'
diyStore.editComponent.list[0].title.textColor = "#303133"; diyStore.editComponent.list[0].title.textColor = '#303133'
diyStore.editComponent.list[0].subTitle.textColor = "#ED6E00"; diyStore.editComponent.list[0].subTitle.textColor = '#ED6E00'
diyStore.editComponent.list[0].subTitle.startColor = "#FFE4D9"; diyStore.editComponent.list[0].subTitle.startColor = '#FFE4D9'
diyStore.editComponent.list[0].subTitle.endColor = "#FFE4D9"; diyStore.editComponent.list[0].subTitle.endColor = '#FFE4D9'
diyStore.editComponent.list[0].moreTitle.startColor = ""; diyStore.editComponent.list[0].moreTitle.startColor = ''
diyStore.editComponent.list[0].moreTitle.endColor = ""; diyStore.editComponent.list[0].moreTitle.endColor = ''
diyStore.editComponent.list[0].listFrame.startColor = "#FFAD4D"; diyStore.editComponent.list[0].listFrame.startColor = '#FFAD4D'
diyStore.editComponent.list[0].listFrame.endColor = "#F93D02"; diyStore.editComponent.list[0].listFrame.endColor = '#F93D02'
diyStore.editComponent.list[1].title.textColor = "#303133"; diyStore.editComponent.list[1].title.textColor = '#303133'
diyStore.editComponent.list[1].subTitle.textColor = "#2E59E9"; diyStore.editComponent.list[1].subTitle.textColor = '#2E59E9'
diyStore.editComponent.list[1].subTitle.startColor = "#CAD7F8"; diyStore.editComponent.list[1].subTitle.startColor = '#CAD7F8'
diyStore.editComponent.list[1].subTitle.endColor = "#CAD7F8"; diyStore.editComponent.list[1].subTitle.endColor = '#CAD7F8'
diyStore.editComponent.list[1].moreTitle.startColor = ""; diyStore.editComponent.list[1].moreTitle.startColor = ''
diyStore.editComponent.list[1].moreTitle.endColor = ""; diyStore.editComponent.list[1].moreTitle.endColor = ''
diyStore.editComponent.list[1].listFrame.startColor = "#7CA7F4"; diyStore.editComponent.list[1].listFrame.startColor = '#7CA7F4'
diyStore.editComponent.list[1].listFrame.endColor = "#2B56E9"; diyStore.editComponent.list[1].listFrame.endColor = '#2B56E9'
diyStore.editComponent.list[2].title.textColor = "#303133"; diyStore.editComponent.list[2].title.textColor = '#303133'
diyStore.editComponent.list[2].subTitle.textColor = "#F62F55"; diyStore.editComponent.list[2].subTitle.textColor = '#F62F55'
diyStore.editComponent.list[2].subTitle.startColor = "#FCD6D9"; diyStore.editComponent.list[2].subTitle.startColor = '#FCD6D9'
diyStore.editComponent.list[2].subTitle.endColor = "#FCD6D9"; diyStore.editComponent.list[2].subTitle.endColor = '#FCD6D9'
diyStore.editComponent.list[2].moreTitle.startColor = ""; diyStore.editComponent.list[2].moreTitle.startColor = ''
diyStore.editComponent.list[2].moreTitle.endColor = ""; diyStore.editComponent.list[2].moreTitle.endColor = ''
diyStore.editComponent.list[2].listFrame.startColor = "#FF7F48"; diyStore.editComponent.list[2].listFrame.startColor = '#FF7F48'
diyStore.editComponent.list[2].listFrame.endColor = "#EE335B"; diyStore.editComponent.list[2].listFrame.endColor = '#EE335B'
diyStore.editComponent.list[3].title.textColor = "#303133"; diyStore.editComponent.list[3].title.textColor = '#303133'
diyStore.editComponent.list[3].subTitle.textColor = "#139B3C"; diyStore.editComponent.list[3].subTitle.textColor = '#139B3C'
diyStore.editComponent.list[3].subTitle.startColor = "#D3F1DA"; diyStore.editComponent.list[3].subTitle.startColor = '#D3F1DA'
diyStore.editComponent.list[3].subTitle.endColor = "#D3F1DA"; diyStore.editComponent.list[3].subTitle.endColor = '#D3F1DA'
diyStore.editComponent.list[3].moreTitle.startColor = ""; diyStore.editComponent.list[3].moreTitle.startColor = ''
diyStore.editComponent.list[3].moreTitle.endColor = ""; diyStore.editComponent.list[3].moreTitle.endColor = ''
diyStore.editComponent.list[3].listFrame.startColor = "#90D48C"; diyStore.editComponent.list[3].listFrame.startColor = '#90D48C'
diyStore.editComponent.list[3].listFrame.endColor = "#299F4F"; diyStore.editComponent.list[3].listFrame.endColor = '#299F4F'
} }
} }
@ -562,17 +561,17 @@ const addItem = () => {
id: diyStore.generateRandom(), id: diyStore.generateRandom(),
title: { title: {
title: '标题', title: '标题',
textColor: "#000000" textColor: '#000000'
}, },
subTitle: { subTitle: {
text: '副标题', text: '副标题',
textColor: "#999999", textColor: '#999999',
startColor: '', startColor: '',
endColor: '' endColor: ''
}, },
listFrame: { listFrame: {
startColor: "#4AC1FF", startColor: '#4AC1FF',
endColor: "#1D7CFF" endColor: '#1D7CFF'
}, },
moreTitle: { moreTitle: {
text: '去看看', text: '去看看',

52
admin/src/app/views/diy/components/edit-carousel-search.vue
View File

@ -348,7 +348,7 @@ diyStore.editComponent.verify = (index: number) => {
res.message = t('carouselSearchHotWordTextPlaceholder') res.message = t('carouselSearchHotWordTextPlaceholder')
return res return res
} }
}); })
diyStore.value[index].tab.list.forEach((item: any) => { diyStore.value[index].tab.list.forEach((item: any) => {
if (item.text == '') { if (item.text == '') {
@ -361,7 +361,7 @@ diyStore.editComponent.verify = (index: number) => {
// res.message = t('selectDiyPagePlaceholder') // res.message = t('selectDiyPagePlaceholder')
// return res // return res
// } // }
}); })
if (diyStore.value[index].swiper.control) { if (diyStore.value[index].swiper.control) {
diyStore.value[index].swiper.list.forEach((item: any) => { diyStore.value[index].swiper.list.forEach((item: any) => {
@ -370,13 +370,13 @@ diyStore.editComponent.verify = (index: number) => {
res.message = t('imageUrlTip') res.message = t('imageUrlTip')
return res return res
} }
}); })
} }
return res return res
} }
/************** 搜索框样式选择-start ********************/ /** ************ 搜索框样式选择-start ********************/
const selectSearchStyle = reactive({ const selectSearchStyle = reactive({
title: diyStore.editComponent.search.styleName, title: diyStore.editComponent.search.styleName,
value: diyStore.editComponent.search.style value: diyStore.editComponent.search.style
@ -386,18 +386,18 @@ const showSearchDialog = ref(false)
const showSearchStyle = () => { const showSearchStyle = () => {
showSearchDialog.value = true showSearchDialog.value = true
selectSearchStyle.title = diyStore.editComponent.search.styleName; selectSearchStyle.title = diyStore.editComponent.search.styleName
selectSearchStyle.value = diyStore.editComponent.search.style; selectSearchStyle.value = diyStore.editComponent.search.style
} }
const changeSearchStyle = (item: any) => { const changeSearchStyle = (item: any) => {
selectSearchStyle.title = item.title; selectSearchStyle.title = item.title
selectSearchStyle.value = item.value; selectSearchStyle.value = item.value
} }
const confirmSearchStyle = () => { const confirmSearchStyle = () => {
diyStore.editComponent.search.styleName = selectSearchStyle.title; diyStore.editComponent.search.styleName = selectSearchStyle.title
diyStore.editComponent.search.style = selectSearchStyle.value; diyStore.editComponent.search.style = selectSearchStyle.value
showSearchDialog.value = false showSearchDialog.value = false
} }
@ -414,7 +414,7 @@ const searchStyleList = reactive([
} }
]) ])
/************** 搜索框样式选择-end ********************/ /** ************ 搜索框样式选择-end ********************/
diyStore.editComponent.search.hotWord.list.forEach((item: any) => { diyStore.editComponent.search.hotWord.list.forEach((item: any) => {
if (!item.id) item.id = diyStore.generateRandom() if (!item.id) item.id = diyStore.generateRandom()
@ -439,13 +439,13 @@ onMounted(() => {
const addHotWordItem = () => { const addHotWordItem = () => {
diyStore.editComponent.search.hotWord.list.push({ diyStore.editComponent.search.hotWord.list.push({
id: diyStore.generateRandom(), id: diyStore.generateRandom(),
text: '关键词', text: '关键词'
}) })
} }
const tabClear = (index: any) => { const tabClear = (index: any) => {
diyStore.editComponent.tab.list[index].diy_id = 0; diyStore.editComponent.tab.list[index].diy_id = 0
diyStore.editComponent.tab.list[index].diy_title = ''; diyStore.editComponent.tab.list[index].diy_title = ''
} }
const addTabItem = () => { const addTabItem = () => {
@ -539,24 +539,24 @@ const loadDiyPageList = (page: number = 1) => {
...diyPageTable.searchParam ...diyPageTable.searchParam
}).then(res => { }).then(res => {
diyPageTable.loading = false diyPageTable.loading = false
let data = res.data.data; const data = res.data.data
let newData: any = []; let newData: any = []
let isExistCount = 0; let isExistCount = 0
// 排除当前编辑的微页面以及存在 置顶组件的数据 // 排除当前编辑的微页面以及存在 置顶组件的数据
if (diyStore.id) { if (diyStore.id) {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
if (data[i].id == diyStore.id) { if (data[i].id == diyStore.id) {
isExistCount++; isExistCount++
} else { } else {
newData.push(data[i]); newData.push(data[i])
} }
} }
} else { } else {
newData = cloneDeep(data); // 添加 newData = cloneDeep(data) // 添加
} }
if (isExistCount) { if (isExistCount) {
res.data.total = res.data.total - isExistCount; res.data.total = res.data.total - isExistCount
} }
diyPageTable.data = newData diyPageTable.data = newData
diyPageTable.total = res.data.total diyPageTable.total = res.data.total
@ -567,20 +567,20 @@ const loadDiyPageList = (page: number = 1) => {
// 选择微页面 // 选择微页面
let currDiyPage: any = {} let currDiyPage: any = {}
let currTabIndexForDiyPage = 0; let currTabIndexForDiyPage = 0
const handleCurrentDiyPageChange = (val: string | any[]) => { const handleCurrentDiyPageChange = (val: string | any[]) => {
currDiyPage = val currDiyPage = val
} }
const saveDiyPageId = () => { const saveDiyPageId = () => {
diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_id = currDiyPage.id; diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_id = currDiyPage.id
diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_title = currDiyPage.title; diyStore.editComponent.tab.list[currTabIndexForDiyPage].diy_title = currDiyPage.title
diyPageShowDialog.value = false diyPageShowDialog.value = false
} }
const diyPageShowDialogOpen = (index: any) => { const diyPageShowDialogOpen = (index: any) => {
diyPageShowDialog.value = true diyPageShowDialog.value = true
currTabIndexForDiyPage = index; currTabIndexForDiyPage = index
if (currDiyPage) { if (currDiyPage) {
setTimeout(() => { setTimeout(() => {
diyPageTableRef.value!.setCurrentRow(currDiyPage) diyPageTableRef.value!.setCurrentRow(currDiyPage)
@ -620,7 +620,7 @@ const handleHeight = (isCalcHeight: boolean = false) => {
diyStore.editComponent.swiper.list.forEach((item: any, index: number) => { diyStore.editComponent.swiper.list.forEach((item: any, index: number) => {
const image = new Image() const image = new Image()
image.src = img(item.imageUrl) image.src = img(item.imageUrl)
image.onload = async() => { image.onload = async () => {
item.imgWidth = image.width item.imgWidth = image.width
item.imgHeight = image.height item.imgHeight = image.height
// 计算第一张图片高度 // 计算第一张图片高度

4
admin/src/app/views/diy/components/edit-float-btn.vue
View File

@ -122,7 +122,7 @@ templateList.value.forEach((item) => {
}) })
const changeTemplateList = (data: any) => { const changeTemplateList = (data: any) => {
selectTemplate.value = data; selectTemplate.value = data
diyStore.editComponent.bottomPosition = data.className diyStore.editComponent.bottomPosition = data.className
} }
@ -134,7 +134,7 @@ const addImageAd = () => {
}) })
} }
const imageBoxRef = ref(); const imageBoxRef = ref()
diyStore.editComponent.list.forEach((item: any) => { diyStore.editComponent.list.forEach((item: any) => {
if (!item.id) item.id = diyStore.generateRandom() if (!item.id) item.id = diyStore.generateRandom()
}) })

6
admin/src/app/views/diy/components/edit-graphic-nav.vue
View File

@ -189,7 +189,7 @@ watch(
diyStore.editComponent.list.forEach((item: any) => { diyStore.editComponent.list.forEach((item: any) => {
const image = new Image() const image = new Image()
image.src = img(item.imageUrl) image.src = img(item.imageUrl)
image.onload = async() => { image.onload = async () => {
item.imgWidth = image.width item.imgWidth = image.width
item.imgHeight = image.height item.imgHeight = image.height
} }
@ -239,9 +239,9 @@ onMounted(() => {
const changePageCount = (value: any) => { const changePageCount = (value: any) => {
if (value == '1') { if (value == '1') {
diyStore.editComponent.showStyle = 'singleSlide'; diyStore.editComponent.showStyle = 'singleSlide'
} else if (value == '2') { } else if (value == '2') {
diyStore.editComponent.showStyle = 'fixed'; diyStore.editComponent.showStyle = 'fixed'
} }
} }

36
admin/src/app/views/diy/components/edit-member-level.vue
View File

@ -65,8 +65,8 @@ const showDialog = ref(false)
const showStyle = () => { const showStyle = () => {
showDialog.value = true showDialog.value = true
selectStyle.title = diyStore.editComponent.styleName; selectStyle.title = diyStore.editComponent.styleName
selectStyle.value = diyStore.editComponent.style; selectStyle.value = diyStore.editComponent.style
} }
const styleList = reactive([ const styleList = reactive([
@ -98,36 +98,34 @@ const styleList = reactive([
]) ])
const changeStyle = (item: any) => { const changeStyle = (item: any) => {
selectStyle.title = item.title; selectStyle.title = item.title
selectStyle.value = item.value; selectStyle.value = item.value
} }
const confirmStyle = () => { const confirmStyle = () => {
diyStore.editComponent.styleName = selectStyle.title; diyStore.editComponent.styleName = selectStyle.title
diyStore.editComponent.style = selectStyle.value; diyStore.editComponent.style = selectStyle.value
initStyle(diyStore.editComponent.style); initStyle(diyStore.editComponent.style)
showDialog.value = false showDialog.value = false
} }
const initStyle = (style: any) => { const initStyle = (style: any) => {
if (style == 'style-1') { if (style == 'style-1') {
diyStore.editComponent.bottomRounded = 0; diyStore.editComponent.bottomRounded = 0
diyStore.editComponent.topRounded = 12; diyStore.editComponent.topRounded = 12
} else if (style == 'style-2') { } else if (style == 'style-2') {
diyStore.editComponent.bottomRounded = 0; diyStore.editComponent.bottomRounded = 0
diyStore.editComponent.topRounded = 12; diyStore.editComponent.topRounded = 12
} else if (style == 'style-3') { } else if (style == 'style-3') {
diyStore.editComponent.bottomRounded = 12; diyStore.editComponent.bottomRounded = 12
diyStore.editComponent.topRounded = 12; diyStore.editComponent.topRounded = 12
} else if (style == 'style-4') { } else if (style == 'style-4') {
diyStore.editComponent.bottomRounded = 12; diyStore.editComponent.bottomRounded = 12
diyStore.editComponent.topRounded = 12; diyStore.editComponent.topRounded = 12
} else if (style == 'style-5') { } else if (style == 'style-5') {
diyStore.editComponent.bottomRounded = 12; diyStore.editComponent.bottomRounded = 12
diyStore.editComponent.topRounded = 12; diyStore.editComponent.topRounded = 12
} }
} }
defineExpose({}) defineExpose({})

10
admin/src/app/views/diy/components/edit-notice.vue
View File

@ -139,17 +139,17 @@ diyStore.editComponent.list.forEach((item: any) => {
}) })
const changeStyle = (value: any) => { const changeStyle = (value: any) => {
diyStore.editComponent.systemUrl = value; diyStore.editComponent.systemUrl = value
diyStore.editComponent.imgType = 'system'; diyStore.editComponent.imgType = 'system'
} }
watch( watch(
() => diyStore.editComponent.imageUrl, () => diyStore.editComponent.imageUrl,
(newValue, oldValue) => { (newValue, oldValue) => {
if (newValue) { if (newValue) {
diyStore.editComponent.imgType = 'diy'; diyStore.editComponent.imgType = 'diy'
} else { } else {
changeStyle('style_1'); changeStyle('style_1')
} }
} }
) )
@ -158,7 +158,7 @@ const addNotice = () => {
diyStore.editComponent.list.push({ diyStore.editComponent.list.push({
id: diyStore.generateRandom(), id: diyStore.generateRandom(),
text: '公告', text: '公告',
link: { name: '' }, link: { name: '' }
}) })
} }

16
admin/src/app/views/diy/components/edit-page.vue
View File

@ -16,7 +16,7 @@
<!-- 表单布局 页面设置 --> <!-- 表单布局 页面设置 -->
<slot name="content"></slot> <slot name="content"></slot>
<div class="edit-attr-item-wrap"> <div class="edit-attr-item-wrap" v-if="diyStore.global.topStatusBar.control">
<h3 class="mb-[10px]">{{ t('statusBarContent') }}</h3> <h3 class="mb-[10px]">{{ t('statusBarContent') }}</h3>
<el-form label-width="80px" class="px-[10px]" @submit.prevent> <el-form label-width="80px" class="px-[10px]" @submit.prevent>
<el-form-item :label="t('topStatusBarNav')" class="display-block"> <el-form-item :label="t('topStatusBarNav')" class="display-block">
@ -56,11 +56,11 @@
</template> </template>
</el-form> </el-form>
</div> </div>
<div class="edit-attr-item-wrap"> <div class="edit-attr-item-wrap" v-if="diyStore.global.bottomTabBar.control">
<h3 class="mb-[10px]">{{ t('bottomNavContent') }}</h3> <h3 class="mb-[10px]">{{ t('bottomNavContent') }}</h3>
<el-form label-width="80px" class="px-[10px]"> <el-form label-width="80px" class="px-[10px]">
<el-form-item :label="t('tabbar')" class="display-block"> <el-form-item :label="t('tabbar')" class="display-block">
<el-switch v-model="diyStore.global.bottomTabBarSwitch" /> <el-switch v-model="diyStore.global.bottomTabBar.isShow" />
<div class="text-sm text-gray-400">{{ t('tabbarSwitchTips') }}</div> <div class="text-sm text-gray-400">{{ t('tabbarSwitchTips') }}</div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -145,7 +145,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="edit-attr-item-wrap"> <div class="edit-attr-item-wrap" v-if="diyStore.global.topStatusBar.control">
<h3 class="mb-[10px]">{{ t('statusBarStyle') }}</h3> <h3 class="mb-[10px]">{{ t('statusBarStyle') }}</h3>
<el-form label-width="115px" class="px-[10px]"> <el-form label-width="115px" class="px-[10px]">
<el-form-item :label="t('topStatusBarBgColor')" class="display-block"> <el-form-item :label="t('topStatusBarBgColor')" class="display-block">
@ -187,7 +187,7 @@ watch(
// 设置图片宽高 // 设置图片宽高
const image = new Image() const image = new Image()
image.src = img(diyStore.global.bgUrl) image.src = img(diyStore.global.bgUrl)
image.onload = async() => { image.onload = async () => {
diyStore.global.imgWidth = image.width diyStore.global.imgWidth = image.width
diyStore.global.imgHeight = image.height diyStore.global.imgHeight = image.height
} }
@ -201,7 +201,7 @@ watch(
// 改变页面的左右边距时，更新所有组件的数值 // 改变页面的左右边距时，更新所有组件的数值
const inputBoth = (value: any) => { const inputBoth = (value: any) => {
diyStore.value.forEach((item, index) => { diyStore.value.forEach((item, index) => {
item.margin.both = value; item.margin.both = value
}) })
} }
@ -217,7 +217,7 @@ const showStyle = () => {
showDialog.value = true showDialog.value = true
} }
const selectStyle = ref("style-1") const selectStyle = ref('style-1')
const changeStyle = () => { const changeStyle = () => {
switch (selectStyle.value) { switch (selectStyle.value) {
case 'style-1': case 'style-1':
@ -240,7 +240,7 @@ const changeStyle = () => {
const selectImg = (url: any) => { const selectImg = (url: any) => {
const image = new Image() const image = new Image()
image.src = img(url) image.src = img(url)
image.onload = async() => { image.onload = async () => {
diyStore.global.popWindow.imgWidth = image.width diyStore.global.popWindow.imgWidth = image.width
diyStore.global.popWindow.imgHeight = image.height diyStore.global.popWindow.imgHeight = image.height
} }

13
admin/src/app/views/diy/edit.vue
View File

@ -406,6 +406,17 @@ initPage({
template.value = data.template; template.value = data.template;
diyStore.isDefault = data.is_default diyStore.isDefault = data.is_default
diyStore.pageMode = data.mode diyStore.pageMode = data.mode
if (data.global) {
for (const key in data.global) {
if(data.global[key]) {
for (const childKey in data.global[key]) {
diyStore.global[key][childKey] = data.global[key][childKey]
}
}else{
diyStore.global[key] = data.global[key]
}
}
}
if (data.value) { if (data.value) {
const sources = JSON.parse(data.value) const sources = JSON.parse(data.value)
diyStore.global = sources.global diyStore.global = sources.global
@ -472,7 +483,7 @@ initPage({
} }
} }
if(repeat) { if (repeat) {
setDomain() setDomain()
} }

38
admin/src/app/views/diy/list.vue
View File

@ -127,10 +127,10 @@
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, computed } from 'vue' import { reactive, ref, computed } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getApps,getDiyPageList, deleteDiyPage, getDiyTemplate, editDiyPageShare, setUseDiyPage,copyDiy } from '@/app/api/diy' import { getApps, getDiyPageList, deleteDiyPage, getDiyTemplate, editDiyPageShare, setUseDiyPage, copyDiy } from '@/app/api/diy'
import { ElMessageBox, FormInstance } from 'element-plus' import { ElMessageBox, FormInstance } from 'element-plus'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { setTablePageStorage,getTablePageStorage } from "@/utils/common"; import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
@ -177,10 +177,10 @@ const addEvent = async (formEl: FormInstance | undefined) => {
} }
// 获取自定义页面类型 // 获取自定义页面类型
const loadDiyTemplate = (addon = '')=> { const loadDiyTemplate = (addon = '') => {
getDiyTemplate({mode: '', addon}).then(res => { getDiyTemplate({ mode: '', addon }).then(res => {
for (let key in pageType) { for (const key in pageType) {
delete pageType[key]; delete pageType[key]
} }
for (const key in res.data) { for (const key in res.data) {
@ -189,21 +189,21 @@ const loadDiyTemplate = (addon = '')=> {
}) })
} }
loadDiyTemplate(); loadDiyTemplate()
const apps: any = reactive({}) // 应用插件列表 const apps: any = reactive({}) // 应用插件列表
getApps({}).then(res=>{ getApps({}).then(res => {
if(res.data){ if (res.data) {
for (const key in res.data) { for (const key in res.data) {
apps[key] = res.data[key]; apps[key] = res.data[key]
} }
} }
}); })
// 根据所属插件，查询页面类型 // 根据所属插件，查询页面类型
const handleSelectAddonChange = (value: any) => { const handleSelectAddonChange = (value: any) => {
diyPageTableData.searchParam.type = ''; diyPageTableData.searchParam.type = ''
loadDiyTemplate(value) loadDiyTemplate(value)
} }
@ -236,13 +236,13 @@ const loadDiyPageList = (page: number = 1) => {
diyPageTableData.loading = false diyPageTableData.loading = false
diyPageTableData.data = res.data.data diyPageTableData.data = res.data.data
diyPageTableData.total = res.data.total diyPageTableData.total = res.data.total
setTablePageStorage(diyPageTableData.page, diyPageTableData.limit, diyPageTableData.searchParam); setTablePageStorage(diyPageTableData.page, diyPageTableData.limit, diyPageTableData.searchParam)
}).catch(() => { }).catch(() => {
diyPageTableData.loading = false diyPageTableData.loading = false
}) })
} }
loadDiyPageList(getTablePageStorage(diyPageTableData.searchParam).page); loadDiyPageList(getTablePageStorage(diyPageTableData.searchParam).page)
// 编辑自定义页面 // 编辑自定义页面
const editEvent = (data: any) => { const editEvent = (data: any) => {
@ -255,7 +255,7 @@ const editEvent = (data: any) => {
// 设为使用 // 设为使用
const setUse = (id: any) => { const setUse = (id: any) => {
setUseDiyPage({id}).then(() => { setUseDiyPage({ id }).then(() => {
loadDiyPageList() loadDiyPageList()
}) })
} }
@ -273,7 +273,7 @@ const copyEvent = (id: any) => {
if (repeat.value) return if (repeat.value) return
repeat.value = true repeat.value = true
copyDiy({id: id}).then((res: any) => { copyDiy({ id }).then((res: any) => {
if (res.code == 1) { if (res.code == 1) {
loadDiyPageList() loadDiyPageList()
} }
@ -307,7 +307,7 @@ const toPreview = (data: any) => {
query: { query: {
page: data.type_page + '?id=' + data.id page: data.type_page + '?id=' + data.id
} }
}); })
window.open(url.href) window.open(url.href)
} }
@ -335,7 +335,9 @@ const shareFormRef = ref<FormInstance>()
const openShare = async (row: any) => { const openShare = async (row: any) => {
shareFormId.value = row.id shareFormId.value = row.id
sharePage.value = row.title sharePage.value = row.title
const share = row.share ? JSON.parse(row.share) : { const share = row.share
? JSON.parse(row.share)
: {
wechat: { title: '', desc: '', url: '' }, wechat: { title: '', desc: '', url: '' },
weapp: { title: '', url: '' } weapp: { title: '', url: '' }
} }

28
admin/src/app/views/diy/route.vue
View File

@ -94,7 +94,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, watch, computed } from 'vue' import { reactive, ref, watch, computed } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getDiyRouteAppList,getDiyTemplate, getDiyRouteList, getDiyRouteInfo, editDiyRouteShare } from '@/app/api/diy' import { getDiyRouteAppList, getDiyTemplate, getDiyRouteList, getDiyRouteInfo, editDiyRouteShare } from '@/app/api/diy'
import { ElMessage, FormInstance } from 'element-plus' import { ElMessage, FormInstance } from 'element-plus'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { useClipboard } from '@vueuse/core' import { useClipboard } from '@vueuse/core'
@ -118,7 +118,7 @@ const diyRouteTableData = reactive({
data: [], data: [],
searchParam: { searchParam: {
title: '', title: '',
addon_name:'' addon_name: ''
} }
}) })
@ -133,13 +133,13 @@ getDomain()
const apps: any = reactive({}) // 应用插件列表 const apps: any = reactive({}) // 应用插件列表
getDiyRouteAppList().then(res=> { getDiyRouteAppList().then(res => {
if (res.data) { if (res.data) {
for (const key in res.data) { for (const key in res.data) {
apps[key] = res.data[key]; apps[key] = res.data[key]
} }
} }
}); })
const getDiyRouteListFn = () => { const getDiyRouteListFn = () => {
getDiyRouteList({}).then(res => { getDiyRouteList({}).then(res => {
@ -148,10 +148,10 @@ const getDiyRouteListFn = () => {
loadDiyRouteList(diyRouteTableData.page) loadDiyRouteList(diyRouteTableData.page)
}).catch(() => { }).catch(() => {
diyRouteTableData.loading = false diyRouteTableData.loading = false
}); })
} }
getDiyRouteListFn(); getDiyRouteListFn()
/** /**
* 获取自定义路由列表 * 获取自定义路由列表
@ -160,21 +160,21 @@ const loadDiyRouteList = (page: number = 1) => {
diyRouteTableData.page = page diyRouteTableData.page = page
const tempData = cloneDeep(diyRouteList.value) const tempData = cloneDeep(diyRouteList.value)
const data: any = []; const data: any = []
// 筛选条件 // 筛选条件
for (let i = 0; i < tempData.length; i++) { for (let i = 0; i < tempData.length; i++) {
let isAdd = true; let isAdd = true
if (diyRouteTableData.searchParam.title && tempData[i].title.indexOf(diyRouteTableData.searchParam.title) == -1) { if (diyRouteTableData.searchParam.title && tempData[i].title.indexOf(diyRouteTableData.searchParam.title) == -1) {
isAdd = false; isAdd = false
} }
if (diyRouteTableData.searchParam.addon_name && tempData[i].addon_info && tempData[i].addon_info.key != diyRouteTableData.searchParam.addon_name) { if (diyRouteTableData.searchParam.addon_name && tempData[i].addon_info && tempData[i].addon_info.key != diyRouteTableData.searchParam.addon_name) {
isAdd = false; isAdd = false
} }
if (isAdd) { if (isAdd) {
data.push(tempData[i]); data.push(tempData[i])
} }
} }
@ -271,7 +271,9 @@ const openShare = async (row: any) => {
shareFormId.value = row.id shareFormId.value = row.id
sharePage.value = row.title sharePage.value = row.title
const share = row.share ? JSON.parse(row.share) : { const share = row.share
? JSON.parse(row.share)
: {
wechat: { title: '', desc: '', url: '' }, wechat: { title: '', desc: '', url: '' },
weapp: { title: '', url: '' } weapp: { title: '', url: '' }
} }

52
admin/src/app/views/diy_form/components/edit-form-checkbox.vue
View File

@ -79,7 +79,7 @@ import { ref, onMounted, nextTick } from 'vue'
import useDiyStore from '@/stores/modules/diy' import useDiyStore from '@/stores/modules/diy'
import Sortable from 'sortablejs' import Sortable from 'sortablejs'
import { range } from 'lodash-es' import { range } from 'lodash-es'
import { ElMessage } from "element-plus"; import { ElMessage } from 'element-plus'
const diyStore = useDiyStore() const diyStore = useDiyStore()
diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
@ -87,21 +87,21 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
// 组件验证 // 组件验证
diyStore.editComponent.verify = (index: number) => { diyStore.editComponent.verify = (index: number) => {
const res = { code: true, message: '' } const res = { code: true, message: '' }
let pass = true; let pass = true
for (let i = 0; i < diyStore.value[index].options.length; i++) { for (let i = 0; i < diyStore.value[index].options.length; i++) {
if (!diyStore.value[index].options[i].text) { if (!diyStore.value[index].options[i].text) {
res.code = false; res.code = false
res.message = t('optionPlaceholder'); res.message = t('optionPlaceholder')
pass = false; pass = false
break; break
} }
} }
if (!pass) return res; if (!pass) return res
let uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text') const uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text')
if (uniqueOptions.length != diyStore.value[index].options.length) { if (uniqueOptions.length != diyStore.value[index].options.length) {
res.code = false; res.code = false
res.message = t('errorTipsOne') res.message = t('errorTipsOne')
} }
return res return res
@ -117,11 +117,11 @@ const addOption = () => {
diyStore.editComponent.options.push({ diyStore.editComponent.options.push({
id: diyStore.generateRandom(), id: diyStore.generateRandom(),
text: '选项' + (diyStore.editComponent.options.length + 1) text: '选项' + (diyStore.editComponent.options.length + 1)
}); })
}; }
const removeOption = (index: any) => { const removeOption = (index: any) => {
diyStore.editComponent.options.splice(index, 1); diyStore.editComponent.options.splice(index, 1)
} }
// 批量添加选项 // 批量添加选项
@ -131,39 +131,39 @@ const batchAddOptions = () => {
return { return {
id: diyStore.generateRandom(), id: diyStore.generateRandom(),
text: option.trim() text: option.trim()
}; }
}).filter((option: any) => option.text !== ''); }).filter((option: any) => option.text !== '')
// 去除重复的选项 // 去除重复的选项
const uniqueNewOptions = uniqueByKey(newOptions, 'text'); const uniqueNewOptions = uniqueByKey(newOptions, 'text')
// 过滤掉已存在的选项 // 过滤掉已存在的选项
const filteredNewOptions = uniqueNewOptions.filter((newOption: any) => const filteredNewOptions = uniqueNewOptions.filter((newOption: any) =>
!diyStore.editComponent.options.some((existingOption: any) => existingOption.text === newOption.text) !diyStore.editComponent.options.some((existingOption: any) => existingOption.text === newOption.text)
); )
// 如果有新的选项，添加到选项列表中 // 如果有新的选项，添加到选项列表中
if (filteredNewOptions.length > 0) { if (filteredNewOptions.length > 0) {
diyStore.editComponent.options.push(...filteredNewOptions); diyStore.editComponent.options.push(...filteredNewOptions)
} else { } else {
ElMessage({ ElMessage({
message: t('errorTipsTwo'), message: t('errorTipsTwo'),
type: "error", type: 'error'
}); })
} }
optionsValue.value = ''; optionsValue.value = ''
visible.value = false; visible.value = false
} }
}; }
// 数组去重 // 数组去重
const uniqueByKey = (arr: any, key: any) => { const uniqueByKey = (arr: any, key: any) => {
const seen = new Set(); const seen = new Set()
return arr.filter((item: any) => { return arr.filter((item: any) => {
const serializedKey = JSON.stringify(item[key]); const serializedKey = JSON.stringify(item[key])
return seen.has(serializedKey) ? false : seen.add(serializedKey); return seen.has(serializedKey) ? false : seen.add(serializedKey)
}); })
} }
const formCheckboxRef = ref() const formCheckboxRef = ref()

22
admin/src/app/views/diy_form/components/edit-form-date-scope.vue
View File

@ -110,7 +110,7 @@ diyStore.editComponent.verify = (index: number) => {
let starTime = diyStore.value[index].field.default.start.date let starTime = diyStore.value[index].field.default.start.date
let endTime = diyStore.value[index].field.default.end.date let endTime = diyStore.value[index].field.default.end.date
let today = new Date() const today = new Date()
const hours = String(today.getHours()).padStart(2, '0') const hours = String(today.getHours()).padStart(2, '0')
const minutes = String(today.getMinutes()).padStart(2, '0') const minutes = String(today.getMinutes()).padStart(2, '0')
@ -162,8 +162,8 @@ const disabledEndDate = (time: Date) => {
} }
onMounted(() => { onMounted(() => {
let today = new Date() const today = new Date()
let endDate = new Date() const endDate = new Date()
endDate.setDate(endDate.getDate() + 7) // 设置日期为7天后的日期 endDate.setDate(endDate.getDate() + 7) // 设置日期为7天后的日期
if (diyStore.editComponent.field.default.start.timestamp) { if (diyStore.editComponent.field.default.start.timestamp) {
@ -176,16 +176,16 @@ onMounted(() => {
diyStore.editComponent.field.default.end.timestamp = parseInt(endDate.getTime() / 1000) diyStore.editComponent.field.default.end.timestamp = parseInt(endDate.getTime() / 1000)
} }
let year = today.getFullYear() const year = today.getFullYear()
let month = String(today.getMonth() + 1).padStart(2, '0') const month = String(today.getMonth() + 1).padStart(2, '0')
let day = String(today.getDate()).padStart(2, '0') const day = String(today.getDate()).padStart(2, '0')
const hours = String(today.getHours()).padStart(2, '0') const hours = String(today.getHours()).padStart(2, '0')
const minutes = String(today.getMinutes()).padStart(2, '0') const minutes = String(today.getMinutes()).padStart(2, '0')
dateFormat.format1 = `${ year }年${ month }月${ day }日` dateFormat.format1 = `${year}年${month}月${day}日`
dateFormat.format2 = `${ year }-${ month }-${ day }` dateFormat.format2 = `${year}-${month}-${day}`
dateFormat.format3 = `${ year }/${ month }/${ day }` dateFormat.format3 = `${year}/${month}/${day}`
dateFormat.format4 = `${ year }-${ month }-${ day } ${ hours }:${ minutes }` dateFormat.format4 = `${year}-${month}-${day} ${hours}:${minutes}`
}) })
// 开始日期选择器 // 开始日期选择器
@ -193,7 +193,7 @@ const startDateChange = (date) => {
diyStore.editComponent.field.default.start.date = date diyStore.editComponent.field.default.start.date = date
diyStore.editComponent.field.default.start.timestamp = timeTurnTimeStamp(date) diyStore.editComponent.field.default.start.timestamp = timeTurnTimeStamp(date)
let endDate = new Date(date) const endDate = new Date(date)
endDate.setDate(endDate.getDate() + 7) endDate.setDate(endDate.getDate() + 7)
diyStore.editComponent.field.default.end.date = endDate.toISOString().split('T')[0] diyStore.editComponent.field.default.end.date = endDate.toISOString().split('T')[0]
diyStore.editComponent.field.default.end.timestamp = parseInt(endDate.getTime() / 1000) diyStore.editComponent.field.default.end.timestamp = parseInt(endDate.getTime() / 1000)

32
admin/src/app/views/diy_form/components/edit-form-date.vue
View File

@ -68,30 +68,30 @@ const dateFormat: any = reactive({
format2: '', format2: '',
format3: '', format3: '',
format4: '' format4: ''
}); })
onMounted(() => { onMounted(() => {
// 初始赋值当天日期 // 初始赋值当天日期
const today = new Date(); const today = new Date()
if (!diyStore.editComponent.field.default.date) { if (!diyStore.editComponent.field.default.date) {
diyStore.editComponent.field.default.date = today.toISOString().split('T')[0]; diyStore.editComponent.field.default.date = today.toISOString().split('T')[0]
diyStore.editComponent.field.default.timestamp = today.getTime() / 1000; diyStore.editComponent.field.default.timestamp = today.getTime() / 1000
} }
let year = today.getFullYear(); const year = today.getFullYear()
let month = String(today.getMonth() + 1).padStart(2, '0'); const month = String(today.getMonth() + 1).padStart(2, '0')
let day = String(today.getDate()).padStart(2, '0'); const day = String(today.getDate()).padStart(2, '0')
const hours = String(today.getHours()).padStart(2, '0'); const hours = String(today.getHours()).padStart(2, '0')
const minutes = String(today.getMinutes()).padStart(2, '0'); const minutes = String(today.getMinutes()).padStart(2, '0')
dateFormat.format1 = `${ year }年${ month }月${ day }日`; dateFormat.format1 = `${year}年${month}月${day}日`
dateFormat.format2 = `${ year }-${ month }-${ day }`; dateFormat.format2 = `${year}-${month}-${day}`
dateFormat.format3 = `${ year }/${ month }/${ day }`; dateFormat.format3 = `${year}/${month}/${day}`
dateFormat.format4 = `${ year }-${ month }-${ day } ${ hours }:${ minutes }`; dateFormat.format4 = `${year}-${month}-${day} ${hours}:${minutes}`
}); })
const dateChange = (date: any) => { const dateChange = (date: any) => {
diyStore.editComponent.field.default.date = date; diyStore.editComponent.field.default.date = date
diyStore.editComponent.field.default.timestamp = timeTurnTimeStamp(date); diyStore.editComponent.field.default.timestamp = timeTurnTimeStamp(date)
} }
defineExpose({}) defineExpose({})

6
admin/src/app/views/diy_form/components/edit-form-number.vue
View File

@ -94,10 +94,10 @@ diyStore.editComponent.verify = (index: number) => {
const res = { code: true, message: '' } const res = { code: true, message: '' }
if (diyStore.value[index].field.default) { if (diyStore.value[index].field.default) {
if (isNaN(diyStore.value[index].field.default) || !regExp.digit.test(diyStore.value[index].field.default)) { if (isNaN(diyStore.value[index].field.default) || !regExp.digit.test(diyStore.value[index].field.default)) {
res.code = false; res.code = false
res.message = t('defaultErrorTips'); res.message = t('defaultErrorTips')
} else if (diyStore.value[index].field.default < 0) { } else if (diyStore.value[index].field.default < 0) {
res.code = false; res.code = false
res.message = t('defaultMustZeroTips') res.message = t('defaultMustZeroTips')
} }
} }

52
admin/src/app/views/diy_form/components/edit-form-radio.vue
View File

@ -99,7 +99,7 @@ import { ref, onMounted, nextTick } from 'vue'
import useDiyStore from '@/stores/modules/diy' import useDiyStore from '@/stores/modules/diy'
import Sortable from 'sortablejs' import Sortable from 'sortablejs'
import { range } from 'lodash-es' import { range } from 'lodash-es'
import { ElMessage } from "element-plus"; import { ElMessage } from 'element-plus'
const diyStore = useDiyStore() const diyStore = useDiyStore()
diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性 diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
@ -107,22 +107,22 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
// 组件验证 // 组件验证
diyStore.editComponent.verify = (index: number) => { diyStore.editComponent.verify = (index: number) => {
const res = { code: true, message: '' } const res = { code: true, message: '' }
let pass = true; let pass = true
for (let i = 0; i < diyStore.value[index].options.length; i++) { for (let i = 0; i < diyStore.value[index].options.length; i++) {
if (!diyStore.value[index].options[i].text) { if (!diyStore.value[index].options[i].text) {
res.code = false; res.code = false
res.message = t('optionPlaceholder'); res.message = t('optionPlaceholder')
pass = false; pass = false
break; break
} }
} }
if (!pass) return res; if (!pass) return res
let uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text') const uniqueOptions = uniqueByKey(diyStore.value[index].options, 'text')
if (uniqueOptions.length != diyStore.value[index].options.length) { if (uniqueOptions.length != diyStore.value[index].options.length) {
res.code = false; res.code = false
res.message = t('errorTipsOne') res.message = t('errorTipsOne')
} }
return res return res
@ -138,11 +138,11 @@ const addOption = () => {
diyStore.editComponent.options.push({ diyStore.editComponent.options.push({
id: diyStore.generateRandom(), id: diyStore.generateRandom(),
text: '选项' + (diyStore.editComponent.options.length + 1) text: '选项' + (diyStore.editComponent.options.length + 1)
}); })
}; }
const removeOption = (index: any) => { const removeOption = (index: any) => {
diyStore.editComponent.options.splice(index, 1); diyStore.editComponent.options.splice(index, 1)
} }
const batchAddOptions = () => { const batchAddOptions = () => {
@ -151,39 +151,39 @@ const batchAddOptions = () => {
return { return {
id: diyStore.generateRandom(), id: diyStore.generateRandom(),
text: option.trim() text: option.trim()
}; }
}).filter((option: any) => option.text !== ''); }).filter((option: any) => option.text !== '')
// 去除重复的选项 // 去除重复的选项
const uniqueNewOptions = uniqueByKey(newOptions, 'text'); const uniqueNewOptions = uniqueByKey(newOptions, 'text')
// 过滤掉已存在的选项 // 过滤掉已存在的选项
const filteredNewOptions = uniqueNewOptions.filter(newOption => const filteredNewOptions = uniqueNewOptions.filter(newOption =>
!diyStore.editComponent.options.some(existingOption => existingOption.text === newOption.text) !diyStore.editComponent.options.some(existingOption => existingOption.text === newOption.text)
); )
// 如果有新的选项，添加到选项列表中 // 如果有新的选项，添加到选项列表中
if (filteredNewOptions.length > 0) { if (filteredNewOptions.length > 0) {
diyStore.editComponent.options.push(...filteredNewOptions); diyStore.editComponent.options.push(...filteredNewOptions)
} else { } else {
ElMessage({ ElMessage({
message: t('errorTipsTwo'), message: t('errorTipsTwo'),
type: "warning", type: 'warning'
}); })
} }
optionsValue.value = ''; optionsValue.value = ''
visible.value = false; visible.value = false
} }
}; }
// 数组去重 // 数组去重
const uniqueByKey = (arr: any, key: any) => { const uniqueByKey = (arr: any, key: any) => {
const seen = new Set(); const seen = new Set()
return arr.filter((item: any) => { return arr.filter((item: any) => {
const serializedKey = JSON.stringify(item[key]); const serializedKey = JSON.stringify(item[key])
return seen.has(serializedKey) ? false : seen.add(serializedKey); return seen.has(serializedKey) ? false : seen.add(serializedKey)
}); })
} }
const formRadioRef = ref() const formRadioRef = ref()

18
admin/src/app/views/diy_form/components/edit-form-submit.vue
View File

@ -87,9 +87,9 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
// 单选 // 单选
const btnPositionChangeFn = (e) => { const btnPositionChangeFn = (e) => {
if (e == 'hover_screen_bottom') { if (e == 'hover_screen_bottom') {
diyStore.editComponent.margin.bottom = 0; diyStore.editComponent.margin.bottom = 0
diyStore.editComponent.margin.both = 0; diyStore.editComponent.margin.both = 0
diyStore.editComponent.margin.top = 0; diyStore.editComponent.margin.top = 0
} }
} }
@ -97,14 +97,14 @@ const btnPositionChangeFn = (e) => {
diyStore.editComponent.verify = (index: number) => { diyStore.editComponent.verify = (index: number) => {
const res = { code: true, message: '' } const res = { code: true, message: '' }
if (diyStore.value[index].submitBtn.text == '') { if (diyStore.value[index].submitBtn.text == '') {
res.code = false; res.code = false
res.message = t('submitBtnNamePlaceholder'); res.message = t('submitBtnNamePlaceholder')
return res; return res
} }
if (diyStore.value[index].resetBtn.text == '') { if (diyStore.value[index].resetBtn.text == '') {
res.code = false; res.code = false
res.message = t('resetBtnNamePlaceholder'); res.message = t('resetBtnNamePlaceholder')
return res; return res
} }
return res return res

69
admin/src/app/views/diy_form/components/edit-form-table.vue
View File

@ -166,7 +166,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { t } from '@/lang' import { t } from '@/lang'
import Sortable from 'sortablejs' import Sortable from 'sortablejs'
import { ref, watch, onMounted, nextTick ,reactive, computed} from 'vue' import { ref, watch, onMounted, nextTick, reactive, computed } from 'vue'
import useDiyStore from '@/stores/modules/diy' import useDiyStore from '@/stores/modules/diy'
import { range } from 'lodash-es' import { range } from 'lodash-es'
const diyStore = useDiyStore() const diyStore = useDiyStore()
@ -247,7 +247,6 @@ const removeOption = (index: number) => {
diyStore.editComponent.columnList.splice(index, 1) diyStore.editComponent.columnList.splice(index, 1)
} }
onMounted(() => { onMounted(() => {
// nextTick(() => { // nextTick(() => {
// if (diyStore.editComponent.columnList.length < 2) return; // if (diyStore.editComponent.columnList.length < 2) return;
@ -266,8 +265,7 @@ onMounted(() => {
// } // }
// }) // })
// }) // })
console.log(diyStore.editComponent.columnList); console.log(diyStore.editComponent.columnList)
}) })
const activeColumn = ref<any>({}) // 真正数据（原始数据，不动它） const activeColumn = ref<any>({}) // 真正数据（原始数据，不动它）
@ -284,31 +282,31 @@ const dateFormat: any = reactive({
format2: '', format2: '',
format3: '', format3: '',
format4: '' format4: ''
}); })
const openRadioDialog = (item, index) => { const openRadioDialog = (item, index) => {
activeRadioIndex.value = index // 记录当前列的下标，方便确定时更新 activeRadioIndex.value = index // 记录当前列的下标，方便确定时更新
activeColumn.value = item activeColumn.value = item
activeColumnTemp.value = JSON.parse(JSON.stringify(item)) // 深拷贝，避免联动 activeColumnTemp.value = JSON.parse(JSON.stringify(item)) // 深拷贝，避免联动
if(item.type == 'radio'){ if (item.type == 'radio') {
if (!activeColumnTemp.value.options) activeColumnTemp.value.options = [] if (!activeColumnTemp.value.options) activeColumnTemp.value.options = []
radioDialogVisible.value = true radioDialogVisible.value = true
// nextTick(() => initRadioSortable()) // 拖拽初始化 // nextTick(() => initRadioSortable()) // 拖拽初始化
}else if(item.type == 'date'){ } else if (item.type == 'date') {
// 初始赋值当天日期 // 初始赋值当天日期
const today = new Date(); const today = new Date()
let year = today.getFullYear(); const year = today.getFullYear()
let month = String(today.getMonth() + 1).padStart(2, '0'); const month = String(today.getMonth() + 1).padStart(2, '0')
let day = String(today.getDate()).padStart(2, '0'); const day = String(today.getDate()).padStart(2, '0')
const hours = String(today.getHours()).padStart(2, '0'); const hours = String(today.getHours()).padStart(2, '0')
const minutes = String(today.getMinutes()).padStart(2, '0'); const minutes = String(today.getMinutes()).padStart(2, '0')
dateFormat.format1 = `${ year }年${ month }月${ day }日`; dateFormat.format1 = `${year}年${month}月${day}日`
dateFormat.format2 = `${ year }-${ month }-${ day }`; dateFormat.format2 = `${year}-${month}-${day}`
dateFormat.format3 = `${ year }/${ month }/${ day }`; dateFormat.format3 = `${year}/${month}/${day}`
dateFormat.format4 = `${ year }-${ month }-${ day } ${ hours }:${ minutes }`; dateFormat.format4 = `${year}-${month}-${day} ${hours}:${minutes}`
radioDialogVisible.value = true radioDialogVisible.value = true
} else if(item.type == 'address'){ } else if (item.type == 'address') {
radioDialogVisible.value = true radioDialogVisible.value = true
} }
} }
@ -329,7 +327,7 @@ const openRadioDialog = (item, index) => {
// } // }
const handleDialogConfirm = () => { const handleDialogConfirm = () => {
console.log(activeColumnTemp.value); console.log(activeColumnTemp.value)
diyStore.editComponent.columnList[activeRadioIndex.value] = JSON.parse(JSON.stringify(activeColumnTemp.value)) // 同步副本到原数据 diyStore.editComponent.columnList[activeRadioIndex.value] = JSON.parse(JSON.stringify(activeColumnTemp.value)) // 同步副本到原数据
radioDialogVisible.value = false // 关闭弹窗 radioDialogVisible.value = false // 关闭弹窗
@ -351,11 +349,11 @@ const removeOptionItem = (index: number) => {
// 数组去重 // 数组去重
const uniqueByKey = (arr: any, key: any) => { const uniqueByKey = (arr: any, key: any) => {
const seen = new Set(); const seen = new Set()
return arr.filter((item: any) => { return arr.filter((item: any) => {
const serializedKey = JSON.stringify(item[key]); const serializedKey = JSON.stringify(item[key])
return seen.has(serializedKey) ? false : seen.add(serializedKey); return seen.has(serializedKey) ? false : seen.add(serializedKey)
}); })
} }
// 批量添加 // 批量添加
const batchAddOptions = () => { const batchAddOptions = () => {
@ -364,36 +362,31 @@ const batchAddOptions = () => {
return { return {
id: diyStore.generateRandom(), id: diyStore.generateRandom(),
label: option.trim() label: option.trim()
}; }
}).filter((option: any) => option.label !== ''); }).filter((option: any) => option.label !== '')
// 去除重复的选项 // 去除重复的选项
const uniqueNewOptions = uniqueByKey(newOptions, 'label'); const uniqueNewOptions = uniqueByKey(newOptions, 'label')
// 过滤掉已存在的选项 // 过滤掉已存在的选项
const filteredNewOptions = uniqueNewOptions.filter(newOption => const filteredNewOptions = uniqueNewOptions.filter(newOption =>
!activeColumnTemp.value.options.some(existingOption => existingOption.label === newOption.label) !activeColumnTemp.value.options.some(existingOption => existingOption.label === newOption.label)
); )
// 如果有新的选项，添加到选项列表中 // 如果有新的选项，添加到选项列表中
if (filteredNewOptions.length > 0) { if (filteredNewOptions.length > 0) {
activeColumnTemp.value.options.push(...filteredNewOptions); activeColumnTemp.value.options.push(...filteredNewOptions)
} else { } else {
ElMessage({ ElMessage({
message: t('errorTipsTwo'), message: t('errorTipsTwo'),
type: "warning", type: 'warning'
}); })
} }
optionsValue.value = ''; optionsValue.value = ''
visible.value = false; visible.value = false
} }
}; }
defineExpose({}) defineExpose({})

76
admin/src/app/views/diy_form/components/edit-form-time-scope.vue
View File

@ -91,18 +91,18 @@ diyStore.editComponent.ignore = ['componentBgUrl'] // 忽略公共属性
// 组件验证 // 组件验证
diyStore.editComponent.verify = (index: number) => { diyStore.editComponent.verify = (index: number) => {
const res = { code: true, message: '' } const res = { code: true, message: '' }
let starTime = diyStore.value[index].field.default.start.date; let starTime = diyStore.value[index].field.default.start.date
let endTime = diyStore.value[index].field.default.end.date; let endTime = diyStore.value[index].field.default.end.date
const today = new Date(); const today = new Date()
const hours = String(today.getHours()).padStart(2, '0'); const hours = String(today.getHours()).padStart(2, '0')
const minutes = String(today.getMinutes()).padStart(2, '0'); const minutes = String(today.getMinutes()).padStart(2, '0')
if (diyStore.editComponent.start.timeWay == 'current') { if (diyStore.editComponent.start.timeWay == 'current') {
starTime = `${ hours }:${ minutes }`; starTime = `${hours}:${minutes}`
} }
if (diyStore.editComponent.end.timeWay == 'current') { if (diyStore.editComponent.end.timeWay == 'current') {
endTime = `${ hours }:${ minutes }`; endTime = `${hours}:${minutes}`
} }
if (diyStore.editComponent.start.defaultControl && starTime == '') { if (diyStore.editComponent.start.defaultControl && starTime == '') {
@ -125,51 +125,51 @@ diyStore.editComponent.verify = (index: number) => {
} }
onMounted(() => { onMounted(() => {
const today = new Date(); const today = new Date()
const hours = String(today.getHours()).padStart(2, '0'); const hours = String(today.getHours()).padStart(2, '0')
const minutes = String(today.getMinutes()).padStart(2, '0'); const minutes = String(today.getMinutes()).padStart(2, '0')
if (!diyStore.editComponent.field.default.start.date) { if (!diyStore.editComponent.field.default.start.date) {
diyStore.editComponent.field.default.start.date = `${ hours }:${ minutes }`; diyStore.editComponent.field.default.start.date = `${hours}:${minutes}`
diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(`${ hours }:${ minutes }`); diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(`${hours}:${minutes}`)
} }
if (!diyStore.editComponent.field.default.end.date) { if (!diyStore.editComponent.field.default.end.date) {
let endDate = new Date(); const endDate = new Date()
endDate.setHours(today.getHours(), today.getMinutes() + 10, 0, 0); // 在当前时间基础上加 10 分钟 endDate.setHours(today.getHours(), today.getMinutes() + 10, 0, 0) // 在当前时间基础上加 10 分钟
const endHours = String(endDate.getHours()).padStart(2, '0'); const endHours = String(endDate.getHours()).padStart(2, '0')
const endMinutes = String(endDate.getMinutes()).padStart(2, '0'); const endMinutes = String(endDate.getMinutes()).padStart(2, '0')
diyStore.editComponent.field.default.end.date = `${ endHours }:${ endMinutes }`; diyStore.editComponent.field.default.end.date = `${endHours}:${endMinutes}`
diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(`${ endHours }:${ endMinutes }`); diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(`${endHours}:${endMinutes}`)
} }
}); })
// 开始时间选择器 // 开始时间选择器
const startTimePickerChange = (e) => { const startTimePickerChange = (e) => {
diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(e); diyStore.editComponent.field.default.start.timestamp = timeInvertSecond(e)
const startTimeArr = e.split(":"); const startTimeArr = e.split(':')
const date = new Date(); const date = new Date()
date.setHours(parseInt(startTimeArr[0]), parseInt(startTimeArr[1]), 0, 0); date.setHours(parseInt(startTimeArr[0]), parseInt(startTimeArr[1]), 0, 0)
date.setMinutes(date.getMinutes() + 10); date.setMinutes(date.getMinutes() + 10)
const updatedEndTime = `${ String(date.getHours()).padStart(2, '0') }:${ String(date.getMinutes()).padStart(2, '0') }`; const updatedEndTime = `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`
diyStore.editComponent.field.default.end.date = updatedEndTime; diyStore.editComponent.field.default.end.date = updatedEndTime
diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(updatedEndTime); diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(updatedEndTime)
} }
// 结束时间选择器 // 结束时间选择器
const endTimePickerChange = (e) => { const endTimePickerChange = (e) => {
diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(e); diyStore.editComponent.field.default.end.timestamp = timeInvertSecond(e)
} }
const disabledHours = () => { const disabledHours = () => {
let timeArr = diyStore.editComponent.field.default.start.date.split(":") const timeArr = diyStore.editComponent.field.default.start.date.split(':')
return makeRange(0, timeArr[0]); return makeRange(0, timeArr[0])
} }
const disabledMinutes = (hour: number) => { const disabledMinutes = (hour: number) => {
let timeArr = diyStore.editComponent.field.default.start.date.split(":") const timeArr = diyStore.editComponent.field.default.start.date.split(':')
return makeRange(0, timeArr[1]); return makeRange(0, timeArr[1])
} }
const makeRange = (start: number, end: number) => { const makeRange = (start: number, end: number) => {
@ -181,18 +181,18 @@ const makeRange = (start: number, end: number) => {
} }
const timeInvertSecond = (time: any) => { const timeInvertSecond = (time: any) => {
let arr = time.split(":"); const arr = time.split(':')
let num = 0; let num = 0
if (arr[0]) { if (arr[0]) {
num += arr[0] * 60 * 60; num += arr[0] * 60 * 60
} }
if (arr[1]) { if (arr[1]) {
num += arr[1] * 60; num += arr[1] * 60
} }
if (arr[2]) { if (arr[2]) {
num += arr[2]; num += arr[2]
} }
return num; return num
} }
defineExpose({}) defineExpose({})

28
admin/src/app/views/diy_form/components/edit-form-time.vue
View File

@ -56,31 +56,31 @@ diyStore.editComponent.verify = (index: number) => {
onMounted(() => { onMounted(() => {
// 初始赋值当天时间 // 初始赋值当天时间
if (!diyStore.editComponent.field.default) { if (!diyStore.editComponent.field.default) {
const today = new Date(); const today = new Date()
const hours = String(today.getHours()).padStart(2, '0'); const hours = String(today.getHours()).padStart(2, '0')
const minutes = String(today.getMinutes()).padStart(2, '0'); const minutes = String(today.getMinutes()).padStart(2, '0')
diyStore.editComponent.field.default = `${ hours }:${ minutes }`; diyStore.editComponent.field.default = `${hours}:${minutes}`
} }
}); })
const changeDateDefaultControl = (val: any) => { const changeDateDefaultControl = (val: any) => {
if (val) { if (val) {
const today = new Date(); const today = new Date()
const hours = String(today.getHours()).padStart(2, '0'); const hours = String(today.getHours()).padStart(2, '0')
const minutes = String(today.getMinutes()).padStart(2, '0'); const minutes = String(today.getMinutes()).padStart(2, '0')
diyStore.editComponent.field.default = `${ hours }:${ minutes }`; diyStore.editComponent.field.default = `${hours}:${minutes}`
} }
} }
watch( watch(
() => diyStore.editComponent.timeWay, () => diyStore.editComponent.timeWay,
(newVal) => { (newVal) => {
const today = new Date(); const today = new Date()
const hours = String(today.getHours()).padStart(2, '0'); const hours = String(today.getHours()).padStart(2, '0')
const minutes = String(today.getMinutes()).padStart(2, '0'); const minutes = String(today.getMinutes()).padStart(2, '0')
diyStore.editComponent.field.default = `${ hours }:${ minutes }`; diyStore.editComponent.field.default = `${hours}:${minutes}`
} }
); )
defineExpose({}) defineExpose({})

16
admin/src/app/views/diy_form/components/form-select-content.vue
View File

@ -39,7 +39,7 @@
import { reactive, ref, nextTick } from 'vue' import { reactive, ref, nextTick } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getFormType, getDiyFormSelectPageList } from '@/app/api/diy_form' import { getFormType, getDiyFormSelectPageList } from '@/app/api/diy_form'
import { FormInstance, ElMessage } from "element-plus"; import { FormInstance, ElMessage } from 'element-plus'
const prop = defineProps({ const prop = defineProps({
formId: { formId: {
@ -52,7 +52,7 @@ const formType: any = reactive({}) // 表单类型
const searchFormRef = ref<FormInstance>() const searchFormRef = ref<FormInstance>()
const tableRef = ref(); const tableRef = ref()
const tableData: any = reactive({ const tableData: any = reactive({
page: 1, page: 1,
@ -102,8 +102,8 @@ const loadList = (page: number = 1) => {
// 获取万能表单类型 // 获取万能表单类型
const loadFormType = (addon = '') => { const loadFormType = (addon = '') => {
getFormType({}).then(res => { getFormType({}).then(res => {
for (let key in formType) { for (const key in formType) {
delete formType[key]; delete formType[key]
} }
for (const key in res.data) { for (const key in res.data) {
@ -112,7 +112,7 @@ const loadFormType = (addon = '') => {
}) })
} }
loadFormType(); loadFormType()
loadList() loadList()
const handleCheckChange = (isSelect: any, row: any) => { const handleCheckChange = (isSelect: any, row: any) => {
@ -147,14 +147,14 @@ const getData = () => {
if (selectData.form_id == 0) { if (selectData.form_id == 0) {
ElMessage({ ElMessage({
type: 'warning', type: 'warning',
message: `${ t('formSelectContentTips') }` message: `${t('formSelectContentTips')}`
}) })
return; return
} }
return { return {
name: 'DIY_FORM', name: 'DIY_FORM',
title: selectData.page_title, title: selectData.page_title,
url: `/app/pages/index/diy_form?form_id=${ selectData.form_id }`, url: `/app/pages/index/diy_form?form_id=${selectData.form_id}`,
action: '', action: '',
formId: selectData.form_id formId: selectData.form_id
} }

2
admin/src/app/views/diy_form/edit.vue
View File

@ -746,7 +746,7 @@ const initLoad = () => {
// 验证表单组件公共属性 // 验证表单组件公共属性
const verifyFormComponent = () => { const verifyFormComponent = () => {
for (var i = 0; i < diyStore.value.length; i++) { for (let i = 0; i < diyStore.value.length; i++) {
try { try {
if (diyStore.value[i].componentType == 'diy_form' && diyStore.value[i].componentName != 'FormSubmit' && diyStore.value[i].field.name == '') { if (diyStore.value[i].componentType == 'diy_form' && diyStore.value[i].componentName != 'FormSubmit' && diyStore.value[i].field.name == '') {
diyStore.changeCurrentIndex(i, diyStore.value[i]) diyStore.changeCurrentIndex(i, diyStore.value[i])

117
admin/src/app/views/diy_form/list.vue
View File

@ -176,10 +176,10 @@
import { reactive, ref, computed } from 'vue' import { reactive, ref, computed } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getFormType, getApps, getDiyFormPageList, deleteDiyForm, editDiyFormShare, editFormStatus, copyForm } from '@/app/api/diy_form' import { getFormType, getApps, getDiyFormPageList, deleteDiyForm, editDiyFormShare, editFormStatus, copyForm } from '@/app/api/diy_form'
import { FormInstance, ElMessage, ElMessageBox } from "element-plus"; import { FormInstance, ElMessage, ElMessageBox } from 'element-plus'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { setTablePageStorage,getTablePageStorage } from "@/utils/common"; import { setTablePageStorage, getTablePageStorage, img } from '@/utils/common'
import { img } from '@/utils/common'
import recordsDetail from '@/app/views/diy_form/records.vue' import recordsDetail from '@/app/views/diy_form/records.vue'
import formSubmitPopup from '@/app/views/diy_form/components/form-submit-popup.vue' import formSubmitPopup from '@/app/views/diy_form/components/form-submit-popup.vue'
import formWritePopup from '@/app/views/diy_form/components/form-write-popup.vue' import formWritePopup from '@/app/views/diy_form/components/form-write-popup.vue'
@ -198,12 +198,12 @@ const formData = reactive({
type: '' type: ''
}) })
//详情 // 详情
const recordsDetailDialog: Record<string, any> | null = ref(null) const recordsDetailDialog: Record<string, any> | null = ref(null)
const detailEvent=(row: any)=>{ const detailEvent = (row: any) => {
let data = {form_id: row.form_id}; const data = { form_id: row.form_id }
recordsDetailDialog.value.setFormData(data); recordsDetailDialog.value.setFormData(data)
recordsDetailDialog.value.showDialog = true; recordsDetailDialog.value.showDialog = true
} }
// 表单验证规则 // 表单验证规则
@ -223,7 +223,7 @@ const dialogVisible = ref(false)
const addEvent = async (formEl: FormInstance | undefined) => { const addEvent = async (formEl: FormInstance | undefined) => {
if (!formEl) return if (!formEl) return
await formEl.validate(async(valid) => { await formEl.validate(async (valid) => {
if (valid) { if (valid) {
const query = { type: formData.type } // , title: formData.title const query = { type: formData.type } // , title: formData.title
const url = router.resolve({ const url = router.resolve({
@ -250,10 +250,10 @@ const showClick = (row: any) => {
} }
// 获取万能表单类型 // 获取万能表单类型
const loadFormType = (addon = '')=> { const loadFormType = (addon = '') => {
getFormType({}).then(res => { getFormType({}).then(res => {
for (let key in formType) { for (const key in formType) {
delete formType[key]; delete formType[key]
} }
for (const key in res.data) { for (const key in res.data) {
@ -263,7 +263,7 @@ const loadFormType = (addon = '')=> {
}) })
} }
loadFormType(); loadFormType()
const apps: any = reactive({}) // 应用插件列表 const apps: any = reactive({}) // 应用插件列表
@ -278,7 +278,7 @@ const apps: any = reactive({}) // 应用插件列表
// 根据所属插件，查询表单类型 // 根据所属插件，查询表单类型
const handleSelectAddonChange = (value: any) => { const handleSelectAddonChange = (value: any) => {
diyFormTableData.searchParam.type = ''; diyFormTableData.searchParam.type = ''
loadFormType(value) loadFormType(value)
} }
@ -311,16 +311,16 @@ const loadDiyFormList = (page: number = 1) => {
diyFormTableData.loading = false diyFormTableData.loading = false
diyFormTableData.data = res.data.data diyFormTableData.data = res.data.data
diyFormTableData.total = res.data.total diyFormTableData.total = res.data.total
setTablePageStorage(diyFormTableData.page, diyFormTableData.limit, diyFormTableData.searchParam); setTablePageStorage(diyFormTableData.page, diyFormTableData.limit, diyFormTableData.searchParam)
}).catch(() => { }).catch(() => {
diyFormTableData.loading = false diyFormTableData.loading = false
}) })
} }
loadDiyFormList(getTablePageStorage(diyFormTableData.searchParam).page); loadDiyFormList(getTablePageStorage(diyFormTableData.searchParam).page)
const selectType = (index: number) => { const selectType = (index: number) => {
formData.type = index.toString(); formData.type = index.toString()
} }
const resetForm = (formEl: FormInstance | undefined) => { const resetForm = (formEl: FormInstance | undefined) => {
@ -350,7 +350,7 @@ const copyEvent = (id: any) => {
if (repeat.value) return if (repeat.value) return
repeat.value = true repeat.value = true
copyForm({form_id: id}).then((res: any) => { copyForm({ form_id: id }).then((res: any) => {
if (res.code == 1) { if (res.code == 1) {
loadDiyFormList() loadDiyFormList()
} }
@ -377,74 +377,74 @@ const deleteEvent = (form_id: number) => {
}) })
} }
// 批量复选框 // 批量复选框
const toggleCheckbox = ref(); const toggleCheckbox = ref()
// 复选框中间状态 // 复选框中间状态
const isIndeterminate = ref(false); const isIndeterminate = ref(false)
// 监听批量复选框事件 // 监听批量复选框事件
const toggleChange = (value: any) => { const toggleChange = (value: any) => {
isIndeterminate.value = false; isIndeterminate.value = false
diyFormListTableRef.value.toggleAllSelection(); diyFormListTableRef.value.toggleAllSelection()
}; }
const diyFormListTableRef = ref(); const diyFormListTableRef = ref()
// 选中数据 // 选中数据
const multipleSelection: any = ref([]); const multipleSelection: any = ref([])
// 监听表格单行选中 // 监听表格单行选中
const handleSelectionChange = (val: []) => { const handleSelectionChange = (val: []) => {
multipleSelection.value = val; multipleSelection.value = val
toggleCheckbox.value = false; toggleCheckbox.value = false
if ( if (
multipleSelection.value.length > 0 && multipleSelection.value.length > 0 &&
multipleSelection.value.length < diyFormTableData.data.length multipleSelection.value.length < diyFormTableData.data.length
) { ) {
isIndeterminate.value = true; isIndeterminate.value = true
} else { } else {
isIndeterminate.value = false; isIndeterminate.value = false
} }
if (multipleSelection.value.length == diyFormTableData.data.length) { if (multipleSelection.value.length == diyFormTableData.data.length) {
toggleCheckbox.value = true; toggleCheckbox.value = true
} }
}; }
// 批量删除 // 批量删除
const batchDeleteForms = () => { const batchDeleteForms = () => {
if (multipleSelection.value.length == 0) { if (multipleSelection.value.length == 0) {
ElMessage({ ElMessage({
type: "warning", type: 'warning',
message: `${t("batchEmptySelectedFormsTips")}`, message: `${t('batchEmptySelectedFormsTips')}`
}); })
return; return
} }
ElMessageBox.confirm(t("batchFormsDeleteTips"), t("warning"), { ElMessageBox.confirm(t('batchFormsDeleteTips'), t('warning'), {
confirmButtonText: t("confirm"), confirmButtonText: t('confirm'),
cancelButtonText: t("cancel"), cancelButtonText: t('cancel'),
type: "warning", type: 'warning'
}).then(() => { }).then(() => {
if (repeat.value) return; if (repeat.value) return
repeat.value = true; repeat.value = true
const form_ids: any = []; const form_ids: any = []
multipleSelection.value.forEach((item: any) => { multipleSelection.value.forEach((item: any) => {
form_ids.push(item.form_id); form_ids.push(item.form_id)
}); })
deleteDiyForm({ deleteDiyForm({
form_ids: form_ids, form_ids
}).then(() => { }).then(() => {
loadDiyFormList(); loadDiyFormList()
repeat.value = false; repeat.value = false
}).catch(() => { }).catch(() => {
repeat.value = false; repeat.value = false
}); })
}); })
}; }
// 跳转去预览 // 跳转去预览
const toPreview = (data: any) => { const toPreview = (data: any) => {
@ -453,7 +453,7 @@ const toPreview = (data: any) => {
query: { query: {
page: '/app/pages/index/diy_form?form_id=' + data.form_id page: '/app/pages/index/diy_form?form_id=' + data.form_id
} }
}); })
window.open(url.href) window.open(url.href)
} }
@ -509,16 +509,15 @@ const shareEvent = async (formEl: FormInstance | undefined) => {
const spreadPopupRef = ref(null) const spreadPopupRef = ref(null)
const spreadEvent = (data: any) => { const spreadEvent = (data: any) => {
const pagePath = "/app/pages/index/diy_form" const pagePath = '/app/pages/index/diy_form'
const columnName = "form_id" const columnName = 'form_id'
const columnValue = data.form_id const columnValue = data.form_id
const title = "表单推广" const title = '表单推广'
const folder = "diy_form" const folder = 'diy_form'
spreadPopupRef.value?.show(pagePath, columnName, columnValue, title,folder) spreadPopupRef.value?.show(pagePath, columnName, columnValue, title, folder)
} }
// 表单提交成功页弹出框 // 表单提交成功页弹出框
const formSubmitPopupRef: any = ref(null) const formSubmitPopupRef: any = ref(null)
@ -545,7 +544,7 @@ const handleExportClose = (val) => {
} }
const diyFormDetailData: any = reactive({ const diyFormDetailData: any = reactive({
form_id: 0, form_id: 0
}) })
const exportEvent = (data: any) => { const exportEvent = (data: any) => {
diyFormDetailData.form_id = data.form_id diyFormDetailData.form_id = data.form_id

44
admin/src/app/views/diy_form/records.vue
View File

@ -181,7 +181,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, defineAsyncComponent } from 'vue' import { reactive, ref, defineAsyncComponent } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getDiyFormFieldsList, getDiyFormFieldStat, getFormRecords,getFormRecordsInfo,deleteFormRecords,getFormRecordsMember} from '@/app/api/diy_form' import { getDiyFormFieldsList, getDiyFormFieldStat, getFormRecords, getFormRecordsInfo, deleteFormRecords, getFormRecordsMember } from '@/app/api/diy_form'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { img } from '@/utils/common' import { img } from '@/utils/common'
import { ElMessageBox, FormInstance } from 'element-plus' import { ElMessageBox, FormInstance } from 'element-plus'
@ -195,7 +195,7 @@ const searchFormDiyFormRef = ref<FormInstance>()
const searchFormDiyMemberRef = ref<FormInstance>() const searchFormDiyMemberRef = ref<FormInstance>()
const searchFormDiyFieldsRef = ref<FormInstance>() const searchFormDiyFieldsRef = ref<FormInstance>()
const handleClose = (done: () => void) => { const handleClose = (done: () => void) => {
showDialog.value = false; showDialog.value = false
} }
const formData = reactive({ const formData = reactive({
@ -220,7 +220,7 @@ const getDiyFormFieldsListFn = (form_id: any) => {
order: 'field_id', order: 'field_id',
sort: 'asc' sort: 'asc'
}).then((res: any) => { }).then((res: any) => {
formFieldsList.value = res.data; formFieldsList.value = res.data
}) })
} }
@ -230,7 +230,7 @@ const getDiyFormFieldStatFn = (form_id: any) => {
getDiyFormFieldStat({ getDiyFormFieldStat({
form_id form_id
}).then((res: any) => { }).then((res: any) => {
formFieldsStat.value = res.data; formFieldsStat.value = res.data
}) })
} }
@ -238,7 +238,7 @@ const modules: any = import.meta.glob('@/**/*.vue')
const formDetail = ref([]) const formDetail = ref([])
const formDetailEvent = (row: any) => { const formDetailEvent = (row: any) => {
getFormRecordsInfo(row.record_id).then((res:any)=>{ getFormRecordsInfo(row.record_id).then((res:any) => {
formDetail.value = res.data.value formDetail.value = res.data.value
dialogVisible.value = true dialogVisible.value = true
}) })
@ -257,7 +257,7 @@ const deleteEvent = (row: any) => {
record_id: row.record_id, record_id: row.record_id,
form_id: row.form_id form_id: row.form_id
}).then(() => { }).then(() => {
initData(); initData()
}) })
}) })
} }
@ -273,7 +273,7 @@ const resetFormMember = (formEl: FormInstance | undefined) => {
getFormRecordsMemberFn() getFormRecordsMemberFn()
} }
const loadFormRecordsListFn= (page: number = 1)=> { const loadFormRecordsListFn = (page: number = 1) => {
formData.loading = true formData.loading = true
formData.page = page formData.page = page
getFormRecords({ getFormRecords({
@ -284,7 +284,7 @@ const loadFormRecordsListFn= (page: number = 1)=> {
formData.loading = false formData.loading = false
formData.data = res.data.data formData.data = res.data.data
formData.data.forEach((item: any) => { formData.data.forEach((item: any) => {
for (let key: any in item.recordsFieldList) { for (const key: any in item.recordsFieldList) {
if (modules[item.recordsFieldList[key].detailComponent]) { if (modules[item.recordsFieldList[key].detailComponent]) {
item.recordsFieldList[key].detailComponent && (item.recordsFieldList[key].detailComponent = defineAsyncComponent(modules[item.recordsFieldList[key].detailComponent])) item.recordsFieldList[key].detailComponent && (item.recordsFieldList[key].detailComponent = defineAsyncComponent(modules[item.recordsFieldList[key].detailComponent]))
} }
@ -315,32 +315,32 @@ const getFormRecordsMemberFn = (page: number = 1) => {
limit: formMemberList.limit, limit: formMemberList.limit,
...formMemberList.searchParam ...formMemberList.searchParam
}).then((res: any) => { }).then((res: any) => {
formMemberList.data = res.data.data; formMemberList.data = res.data.data
formMemberList.total = res.total; formMemberList.total = res.total
formMemberList.loading = false; formMemberList.loading = false
}).catch((error) => { }).catch((error) => {
formMemberList.loading = false; formMemberList.loading = false
}) })
} }
//查看会员详情 // 查看会员详情
const detailEvent = (member_id:number) => { const detailEvent = (member_id:number) => {
let routeData = router.resolve(`/member/detail?id=${ member_id }`) const routeData = router.resolve(`/member/detail?id=${member_id}`)
window.open(routeData.href, ' blank'); window.open(routeData.href, ' blank')
} }
const setFormData = async (row: any = null) => { const setFormData = async (row: any = null) => {
formId.value = row.form_id; formId.value = row.form_id
formData.searchParam.form_id = row.form_id; formData.searchParam.form_id = row.form_id
formMemberList.searchParam.form_id = row.form_id; formMemberList.searchParam.form_id = row.form_id
getDiyFormFieldsListFn(row.form_id); getDiyFormFieldsListFn(row.form_id)
initData(); initData()
} }
const initData = () => { const initData = () => {
getFormRecordsMemberFn(); getFormRecordsMemberFn()
getDiyFormFieldStatFn(formId.value); getDiyFormFieldStatFn(formId.value)
loadFormRecordsListFn() loadFormRecordsListFn()
} }

2
admin/src/app/views/finance/account.vue
View File

@ -195,7 +195,7 @@ const searchFormRef = ref<FormInstance>()
// 去空操作 // 去空操作
watch(() => siteAccountLogTable.searchParam.trade_no, (nval) => { watch(() => siteAccountLogTable.searchParam.trade_no, (nval) => {
siteAccountLogTable.searchParam.trade_no = nval.trim(); siteAccountLogTable.searchParam.trade_no = nval.trim()
}) })
/** /**

2
admin/src/app/views/finance/cash_out.vue
View File

@ -45,7 +45,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="t('memberInfo')" prop="keywords"> <el-form-item :label="t('memberInfo')" prop="keywords">
<el-input v-model.trim="orderTableData.searchParam.keywords" class="w-[240px]" <el-input v-model.trim="orderTableData.searchParam.keywords" class="!w-[230px]"
:placeholder="t('memberInfoPlaceholder')" /> :placeholder="t('memberInfoPlaceholder')" />
</el-form-item> </el-form-item>

8
admin/src/app/views/finance/pay_refund.vue
View File

@ -62,7 +62,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref } from 'vue' import { reactive, ref } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getPayRefundPages ,getRefundStatus} from '@/app/api/pay' import { getPayRefundPages, getRefundStatus } from '@/app/api/pay'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import refundDetail from '@/app/views/finance/components/refund-detail.vue' import refundDetail from '@/app/views/finance/components/refund-detail.vue'
@ -114,9 +114,9 @@ const handleMessage = () => {
} }
const refundDetailDialog: Record<string, any> | null = ref(null) const refundDetailDialog: Record<string, any> | null = ref(null)
const infoEvent = (res:any) => { const infoEvent = (res:any) => {
let data = {no: res.refund_no}; const data = { no: res.refund_no }
refundDetailDialog.value.setFormData(data); refundDetailDialog.value.setFormData(data)
refundDetailDialog.value.showDialog = true; refundDetailDialog.value.showDialog = true
} }
const resetForm = (formEl: FormInstance | undefined) => { const resetForm = (formEl: FormInstance | undefined) => {

13
admin/src/app/views/home/index.vue
View File

@ -29,7 +29,7 @@
<el-scrollbar :always="true"> <el-scrollbar :always="true">
<div class="px-[20px] mt-[20px]"> <div class="px-[20px] mt-[20px]">
<div class="mt-3 text-[#9699B6] mb-1">应用</div> <div class="mt-3 text-[#9699B6] mb-1">应用</div>
<div class=""> <div>
<div :class="['px-[25px] cursor-pointer h-[40px] leading-[40px]', {'bg-[#EAEBF0] rounded-[4px]': params.app == ''}]" @click="cutAppFn('')"> <div :class="['px-[25px] cursor-pointer h-[40px] leading-[40px]', {'bg-[#EAEBF0] rounded-[4px]': params.app == ''}]" @click="cutAppFn('')">
<span class="iconfont iconsuoyouyingyongc !text-[17px] mr-[10px] "></span> <span class="iconfont iconsuoyouyingyongc !text-[17px] mr-[10px] "></span>
<span>所有应用</span> <span>所有应用</span>
@ -48,7 +48,7 @@
<div class="px-[20px] mt-[20px]"> <div class="px-[20px] mt-[20px]">
<div class="text-[#9699B6] mb-1">平台分类</div> <div class="text-[#9699B6] mb-1">平台分类</div>
<div class=""> <div>
<div :class="['px-[25px] cursor-pointer h-[40px] leading-[40px] flex items-center', {'bg-[#EAEBF0] rounded-[4px]': typeName == 'h5'}]" @click="cutAppTypeFn('h5')"> <div :class="['px-[25px] cursor-pointer h-[40px] leading-[40px] flex items-center', {'bg-[#EAEBF0] rounded-[4px]': typeName == 'h5'}]" @click="cutAppTypeFn('h5')">
<span class="iconfont iconH5c !text-[17px] mr-[10px] "></span> <span class="iconfont iconH5c !text-[17px] mr-[10px] "></span>
<span>H5</span> <span>H5</span>
@ -487,7 +487,7 @@ watch(() => createSiteDialog.value, () => {
display: none; display: none;
} }
.home-item:hover { .home-item:hover {
box-shadow: 0px 0px 18px rgba(0,0,0, 0.07); box-shadow: 0 0 18px rgba(0,0,0, 0.07);
// border-color: var(--el-color-primary); // border-color: var(--el-color-primary);
.title { .title {
color: var(--el-color-primary); color: var(--el-color-primary);
@ -507,14 +507,13 @@ watch(() => createSiteDialog.value, () => {
box-shadow: 0 4px 8px 0 rgba(28,31,55,0.04); box-shadow: 0 4px 8px 0 rgba(28,31,55,0.04);
} }
.img-shadow{ .img-shadow{
box-shadow: 0px 0px 4px rgba(0,0,0, 0.07); box-shadow: 0 0 4px rgba(0,0,0, 0.07);
} }
.creatBg{ .creatBg{
background: url('@/app/assets/images/creatBg.png'); background: url('@/app/assets/images/creatBg.png') no-repeat;
background-repeat: no-repeat;
} }
.create-site-item{ .create-site-item{
box-shadow: 0px 0px 9px 0px rgba(0,0,0,0.1); box-shadow: 0 0 9px 0 rgba(0,0,0,0.1);
} }
:deep(.el-button){ :deep(.el-button){
border-radius: 4px !important; border-radius: 4px !important;

2
admin/src/app/views/index/app_manage.vue
View File

@ -132,7 +132,7 @@ const toAppStore = () => {
} }
.app-item { .app-item {
box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.18); box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.18);
} }
.app-item:hover .app-item-head{ .app-item:hover .app-item-head{
background-color: #FDF4EF; background-color: #FDF4EF;

4
admin/src/app/views/index/index.vue
View File

@ -127,8 +127,8 @@
</div> </div>
<div class="flex items-center"> <div class="flex items-center">
<div class="mr-[10px]"> <div class="mr-[10px]">
<span class="iconfont iconshoucang11 !text-[12px] mr-[8px] !text-[#4F516D]"></span> <span class="iconfont iconchakan !text-[12px] mr-[8px] !text-[#4F516D]"></span>
<span class="text-[#4F516D] text-[12px]">{{ item.collect_num}}</span> <span class="text-[#4F516D] text-[12px]">{{ item.visit_num}}</span>
</div> </div>
<div> <div>
<span class="iconfont iconxiaoliang !text-[12px] mr-[8px] !text-[#4F516D]"></span> <span class="iconfont iconxiaoliang !text-[12px] mr-[8px] !text-[#4F516D]"></span>

28
admin/src/app/views/index/preview.vue
View File

@ -83,11 +83,10 @@ setLayout('decorate')
getUrl().then((res: any) => { getUrl().then((res: any) => {
wapUrl.value = res.data.wap_url wapUrl.value = res.data.wap_url
let repeat = true; // 防重复执行 let repeat = true // 防重复执行
// 开发模式下执行 // 开发模式下执行
if (import.meta.env.MODE == 'development') { if (import.meta.env.MODE == 'development') {
wapDomain.value = res.data.wap_domain wapDomain.value = res.data.wap_domain
// env文件配置过wap域名 // env文件配置过wap域名
@ -105,10 +104,9 @@ getUrl().then((res: any) => {
} }
} }
if(repeat) { if (repeat) {
setDomain() setDomain()
} }
}) })
const save = () => { const save = () => {
@ -134,7 +132,7 @@ const setDomain = () => {
wapImage.value = url wapImage.value = url
}) })
const send = ()=>{ const send = () => {
timeIframe.value = new Date().getTime() timeIframe.value = new Date().getTime()
postMessage() postMessage()
} }
@ -143,17 +141,17 @@ const setDomain = () => {
send() send()
// 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息 // 如果同步发送消息的 uni-app没有接收到回应，则定时发送消息
let sendCount = 0; let sendCount = 0
let timeInterVal = setInterval(()=>{ const timeInterVal = setInterval(() => {
// 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送 // 接收 uni-app 发送的消息 或者 发送50次后未响应，则停止发送
if(uniAppLoadStatus.value || sendCount >= 50){ if (uniAppLoadStatus.value || sendCount >= 50) {
clearInterval(timeInterVal) clearInterval(timeInterVal)
return return
} }
send() send()
sendCount++; sendCount++
},200) }, 200)
// 如果10秒内加载不出来，则需要配置域名 // 如果10秒内加载不出来，则需要配置域名
setTimeout(() => { setTimeout(() => {
@ -168,17 +166,17 @@ const uniAppLoadStatus = ref(false) // uni-app 加载状态，true：加载完
window.addEventListener('message', (event) => { window.addEventListener('message', (event) => {
try { try {
let data = { let data = {
type :'' type: ''
}; }
if(typeof event.data == 'string') { if (typeof event.data == 'string') {
data = JSON.parse(event.data) data = JSON.parse(event.data)
}else if(typeof event.data == 'object') { } else if (typeof event.data == 'object') {
data = event.data data = event.data
} }
if (data.type && ['appOnLaunch', 'appOnReady'].indexOf(data.type) != -1) { if (data.type && ['appOnLaunch', 'appOnReady'].indexOf(data.type) != -1) {
loadingDev.value = false loadingDev.value = false
loadingIframe.value = true loadingIframe.value = true
let loadTime = new Date().getTime() const loadTime = new Date().getTime()
uniAppLoadStatus.value = true // 加载完成 uniAppLoadStatus.value = true // 加载完成
difference.value = loadTime - timeIframe.value difference.value = loadTime - timeIframe.value
} }

10
admin/src/app/views/index/store.vue
View File

@ -351,7 +351,7 @@
</div> </div>
</div> </div>
<div v-show="installStep == 1 && !errorDialog" class="h-[50vh] mt-[20px]"> <div v-show="installStep == 1 && !errorDialog" class="h-[50vh] mt-[20px]">
<terminal ref="terminalRef" :context="currAddon" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" /> <terminal ref="terminalRef" :name="`install-${terminalId}`" :context="currAddon" :init-log="null" :show-header="false" :show-log-time="true" @exec-cmd="onExecCmd" />
</div> </div>
<div v-show="installStep == 2" class="h-[50vh] mt-[20px] flex flex-col"> <div v-show="installStep == 2" class="h-[50vh] mt-[20px] flex flex-col">
<!-- <el-result icon="success" :title="t('addonInstallSuccess')"></el-result> --> <!-- <el-result icon="success" :title="t('addonInstallSuccess')"></el-result> -->
@ -375,12 +375,15 @@
</template> </template>
</el-result> </el-result>
</div> </div>
<div class="mt-[50px]" v-show="errorDialog"> <div class="h-[50vh] mt-[20px] flex flex-col" v-show="errorDialog">
<el-result icon="error" :title="t('安装失败')" :sub-title="errorMsg"> <el-result icon="error" :title="t('安装失败')">
<template #icon> <template #icon>
<img src="@/app/assets/images/error_icon.png" alt=""> <img src="@/app/assets/images/error_icon.png" alt="">
</template> </template>
<template #extra> <template #extra>
<el-scrollbar class="max-h-[120px] !overflow-auto text-[15px] text-[#4F516D] mb-[15px] mt-[-15px]">
{{errorMsg}}
</el-scrollbar>
<el-button @click="handleBack()" v-if="installType=='cloud'" class="!w-[90px]">错误信息</el-button> <el-button @click="handleBack()" v-if="installType=='cloud'" class="!w-[90px]">错误信息</el-button>
<el-button @click="installShowDialog=false" type="primary" class="!w-[90px]">完成</el-button> <el-button @click="installShowDialog=false" type="primary" class="!w-[90px]">完成</el-button>
</template> </template>
@ -500,6 +503,7 @@ import UpgradeLog from '@/app/components/upgrade-log/index.vue'
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
const terminalId = ref(Date.now());
const activeName = ref(storage.get('storeActiveName') || 'installed') const activeName = ref(storage.get('storeActiveName') || 'installed')
const upgradeRef = ref(null) const upgradeRef = ref(null)
const cloudBuildRef = ref(null) const cloudBuildRef = ref(null)

2
admin/src/app/views/index/tools.vue
View File

@ -153,7 +153,7 @@ const goRouter = () => {
<style lang="scss" scoped> <style lang="scss" scoped>
.tools-item-shadow { .tools-item-shadow {
box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.2); box-shadow: 0 2px 4px 0 rgba(0,0,0,0.2);
} }
img { img {

4
admin/src/app/views/marketing/components/sign-continue.vue
View File

@ -49,7 +49,7 @@ const formData = ref({
continue_sign: 0, continue_sign: 0,
continue_tag: guid(), continue_tag: guid(),
receive_limit: 1, receive_limit: 1,
receive_num: 0, receive_num: 0
}) })
const value = computed({ const value = computed({
@ -101,7 +101,7 @@ const formRules = reactive<FormRules>({
} else if (Number(value) > Number(props.sign_period)) { } else if (Number(value) > Number(props.sign_period)) {
callback(t('continueSignMustLessThanSignPeriod')) // 添加这个校验 callback(t('continueSignMustLessThanSignPeriod')) // 添加这个校验
} else { } else {
callback(); callback()
} }
}, },
trigger: 'blur' trigger: 'blur'

2
admin/src/app/views/marketing/components/verify-detail.vue
View File

@ -147,7 +147,7 @@ const getVerifyDetailFn = async () => {
const setFormData = async (row: any = null) => { const setFormData = async (row: any = null) => {
code = row.code; code = row.code;
getVerifyDetailFn(); await getVerifyDetailFn();
} }
defineExpose({ defineExpose({

2
admin/src/app/views/marketing/sign_list.vue
View File

@ -10,7 +10,7 @@
<el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never"> <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
<el-form :inline="true" :model="memberSignListTableData.searchParam" ref="searchFormRef"> <el-form :inline="true" :model="memberSignListTableData.searchParam" ref="searchFormRef">
<el-form-item :label="t('memberInfo')" prop="keywords"> <el-form-item :label="t('memberInfo')" prop="keywords">
<el-input v-model.trim="memberSignListTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" /> <el-input v-model.trim="memberSignListTableData.searchParam.keywords" class="!w-[230px]" :placeholder="t('memberInfoPlaceholder')" />
</el-form-item> </el-form-item>
<el-form-item :label="t('createTime')" prop="create_time"> <el-form-item :label="t('createTime')" prop="create_time">
<el-date-picker v-model="memberSignListTableData.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" /> <el-date-picker v-model="memberSignListTableData.searchParam.create_time" type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />

6
admin/src/app/views/member/balance.vue
View File

@ -46,7 +46,7 @@
<el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef"> <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
<el-form-item :label="t('memberInfo')" prop="keywords"> <el-form-item :label="t('memberInfo')" prop="keywords">
<el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" /> <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="!w-[200px]" :placeholder="t('memberInfoPlaceholder')" />
</el-form-item> </el-form-item>
<el-form-item :label="t('balanceType')" prop="balance_type"> <el-form-item :label="t('balanceType')" prop="balance_type">
@ -257,9 +257,9 @@ checkBalanceInfo()
const balanceStatus = ref([]) const balanceStatus = ref([])
const checkBalanceStatus = () => { const checkBalanceStatus = () => {
getBalanceStatus().then(res => { getBalanceStatus().then(res => {
for (var i in res.data) { for (const i in res.data) {
if (i == 'balance' || i == 'money') { if (i == 'balance' || i == 'money') {
balanceStatus.value.push({ 'name': res.data[i], 'type': i }) balanceStatus.value.push({ name: res.data[i], type: i })
} }
} }
}) })

2
admin/src/app/views/member/commission.vue
View File

@ -55,7 +55,7 @@
<el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never"> <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
<el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef"> <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
<el-form-item :label="t('memberInfo')" prop="keywords"> <el-form-item :label="t('memberInfo')" prop="keywords">
<el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" /> <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="!w-[200px]" :placeholder="t('memberInfoPlaceholder')" />
</el-form-item> </el-form-item>
<el-form-item :label="t('fromType')" prop="from_type"> <el-form-item :label="t('fromType')" prop="from_type">
<el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width"> <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">

2
admin/src/app/views/member/components/add-member.vue
View File

@ -7,7 +7,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="t('mobile')" prop="mobile"> <el-form-item :label="t('mobile')" prop="mobile">
<el-input v-model.trim="formData.mobile" clearable :placeholder="t('mobilePlaceholder')" @keyup="filterNumber($event)" class="input-width" /> <el-input v-model.trim="formData.mobile" clearable :placeholder="t('mobilePlaceholder')" maxlength="11" @keyup="filterNumber($event)" class="input-width" />
</el-form-item> </el-form-item>
<el-form-item :label="t('nickname')"> <el-form-item :label="t('nickname')">

2
admin/src/app/views/member/components/detail-member.vue
View File

@ -397,7 +397,7 @@ const getMemberInfoFn = async (bool=false) => {
const setFormData = async (row: any = null) => { const setFormData = async (row: any = null) => {
id = row.id; id = row.id;
Object.assign(formData, initialFormData) Object.assign(formData, initialFormData)
getMemberInfoFn(true); await getMemberInfoFn(true);
} }
defineExpose({ defineExpose({

55
admin/src/app/views/member/components/edit-member.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<el-dialog v-model="showDialog" :title="title || t('updateMember')" width="500px" :destroy-on-close="true"> <el-dialog v-model="showDialog" :title="title || t('updateMember')" width="500px" :destroy-on-close="true">
<el-form :model="saveData" label-width="90px" :rules="formRules" ref="formRef" class="page-form" v-loading="loading"> <el-form :model="saveData" label-width="90px" :rules="formRules" ref="formRef" class="page-form" @submit.prevent v-loading="loading">
<el-form-item :label="t('headimg')" v-if="type == 'headimg'"> <el-form-item :label="t('headimg')" v-if="type == 'headimg'">
<upload-image v-model="saveData.headimg" /> <upload-image v-model="saveData.headimg" />
</el-form-item> </el-form-item>
@ -33,7 +33,7 @@
<div v-if="type == 'member_level'"> <div v-if="type == 'member_level'">
<el-form-item :label="t('memberLevelUpdate')" prop="member_level"> <el-form-item :label="t('memberLevelUpdate')" prop="member_level">
<el-select v-model="saveData.member_level" :placeholder="t('memberLevelPlaceholder')" clearable class="input-width"> <el-select v-model="saveData.member_level" :placeholder="t('memberLevelPlaceholder')" clearable class="input-width">
<el-option :label="t('memberLevelPlaceholder')" :value="0" /> <!-- <el-option :label="t('memberLevelPlaceholder')" :value="0" /> -->
<el-option :label="item['level_name']" :value="item['level_id']" v-for="(item,index) in levelSelectData" :key="index"/> <el-option :label="item['level_name']" :value="item['level_id']" v-for="(item,index) in levelSelectData" :key="index"/>
</el-select> </el-select>
<div class="text-sm text-gray-400">{{ t('memberLevelUpdateTips') }}</div> <div class="text-sm text-gray-400">{{ t('memberLevelUpdateTips') }}</div>
@ -56,7 +56,7 @@ import { ref, reactive, computed } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { deepClone } from '@/utils/common' import { deepClone } from '@/utils/common'
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import { editMemberDetail, getMemberLabelAll, getMemberLevelAll,memberBatchModify } from '@/app/api/member' import { editMemberDetail, getMemberLabelAll, getMemberLevelAll, memberBatchModify } from '@/app/api/member'
import Test from '@/utils/test' import Test from '@/utils/test'
// 修改类型 // 修改类型
@ -99,33 +99,33 @@ const formRules = computed(() => {
return { return {
mobile: [ mobile: [
{ {
validator(rule, value, callback) { validator (rule, value, callback) {
// 允许为空，直接通过验证 // 允许为空，直接通过验证
if (!value) return callback(); if (!value) return callback()
// 非空值时，验证手机号格式 // 非空值时，验证手机号格式
const reg = /^1[3-9]\d{9}$/; const reg = /^1[3-9]\d{9}$/
if (!reg.test(value)) { if (!reg.test(value)) {
callback(new Error('请输入正确的手机号')); callback(new Error('请输入正确的手机号'))
} else { } else {
callback(); callback()
} }
}, },
trigger: 'blur' trigger: 'blur'
} }
], ],
id_card:[ id_card: [
{ {
validator(rule, value, callback) { validator (rule, value, callback) {
// 允许为空，直接通过验证 // 允许为空，直接通过验证
if (!value) return callback(); if (!value) return callback()
// 非空值时，验证身份证号格式 // 非空值时，验证身份证号格式
const reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/; const reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
if (!reg.test(value)) { if (!reg.test(value)) {
callback(new Error('请输入正确的身份证号')); callback(new Error('请输入正确的身份证号'))
} else { } else {
callback(); callback()
} }
}, },
trigger: 'blur' trigger: 'blur'
@ -171,10 +171,10 @@ const confirm = async (formEl: FormInstance | undefined) => {
if (repeat.value) return if (repeat.value) return
repeat.value = true repeat.value = true
let val = saveData[type.value]; let val = saveData[type.value]
if(type.value == 'member_label'){ if (type.value == 'member_label') {
// 将saveData[type.value]中的值，转换为字符串 // 将saveData[type.value]中的值，转换为字符串
val = saveData[type.value] && saveData[type.value].length ? deepClone(saveData[type.value]).join(',').split(',') : ''; val = saveData[type.value] && saveData[type.value].length ? deepClone(saveData[type.value]).join(',').split(',') : ''
} }
const data = ref({ const data = ref({
@ -204,19 +204,18 @@ const setDialogType = async (row: any = null) => {
saveData[type.value] = row.data[type.value] saveData[type.value] = row.data[type.value]
if (type.value == 'member_label' && saveData[type.value]) { if (type.value == 'member_label' && saveData[type.value]) {
saveData[type.value].forEach((item: any, index: any) => { saveData[type.value].forEach((item: any, index: any) => {
let isExist = false; let isExist = false
for (let i = 0; i < labelSelectData.value.length; i++) { for (let i = 0; i < labelSelectData.value.length; i++) {
if (labelSelectData.value[i].label_id == item) { if (labelSelectData.value[i].label_id == item) {
isExist = true; isExist = true
break; break
} }
} }
if (isExist) { if (isExist) {
saveData[type.value][index] = Number.parseFloat(item) saveData[type.value][index] = Number.parseFloat(item)
} else { } else {
saveData[type.value].splice(index, 1); // 删除不存在的id saveData[type.value].splice(index, 1) // 删除不存在的id
} }
}) })
} }
loading.value = false loading.value = false
@ -229,9 +228,9 @@ const batchInfo = ref({
ids: [], ids: [],
where: {} where: {}
}) })
const batchSetDialogType = (data)=>{ const batchSetDialogType = (data) => {
loading.value = true loading.value = true
type.value =data.type type.value = data.type
method.value = data.method method.value = data.method
batchInfo.value.is_all = data.data.is_all batchInfo.value.is_all = data.data.is_all
batchInfo.value.ids = data.data.ids batchInfo.value.ids = data.data.ids
@ -249,14 +248,14 @@ const batchSetConfirm = async (formEl: FormInstance | undefined) => {
if (repeat.value) return if (repeat.value) return
repeat.value = true repeat.value = true
let val = saveData[type.value]; let val = saveData[type.value]
if(type.value == 'member_label'){ if (type.value == 'member_label') {
val = saveData[type.value] && saveData[type.value].length ? deepClone(saveData[type.value]).join(',').split(',') : ''; val = saveData[type.value] && saveData[type.value].length ? deepClone(saveData[type.value]).join(',').split(',') : ''
} }
const data = ref({ const data = ref({
is_all: batchInfo.value.is_all, is_all: batchInfo.value.is_all,
member_ids:batchInfo.value.ids, member_ids: batchInfo.value.ids,
where: batchInfo.value.where, where: batchInfo.value.where,
field: type.value, field: type.value,
value: val value: val

4
admin/src/app/views/member/member.vue
View File

@ -48,9 +48,9 @@
<div class="mt-[10px]"> <div class="mt-[10px]">
<div class="mb-[10px] flex items-center"> <div class="mb-[10px] flex items-center">
<el-dropdown class="mr-[20px] !text-primary"> <el-dropdown class="mr-[20px] !text-primary w-[125px]">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<span>{{ currentSelectMode === 'all' ? t('全选所有页') : t('全选当前页')}}</span>({{ selectedCount }}) <span>{{ currentSelectMode === 'all' ? t('全选所有页') : t('全选当前页')}}</span>(<span class="text-center inline-block">{{ selectedCount }}</span>)
<el-icon> <el-icon>
<arrow-down /> <arrow-down />
</el-icon> </el-icon>

2
admin/src/app/views/member/member_detail.vue
View File

@ -386,7 +386,7 @@ const back = () => {
<style lang="scss" scoped> <style lang="scss" scoped>
.member-info { .member-info {
left: 0px left: 0
} }
.member-info-item { .member-info-item {

2
admin/src/app/views/member/point.vue
View File

@ -35,7 +35,7 @@
<el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never"> <el-card class="box-card !border-none mb-[10px] table-search-wrap" shadow="never">
<el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef"> <el-form :inline="true" :model="memberAccountLogTableData.searchParam" ref="searchFormRef">
<el-form-item :label="t('memberInfo')" prop="keywords"> <el-form-item :label="t('memberInfo')" prop="keywords">
<el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" /> <el-input v-model.trim="memberAccountLogTableData.searchParam.keywords" class="!w-[200px]" :placeholder="t('memberInfoPlaceholder')" />
</el-form-item> </el-form-item>
<el-form-item :label="t('fromType')" prop="from_type"> <el-form-item :label="t('fromType')" prop="from_type">
<el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width"> <el-select v-model="memberAccountLogTableData.searchParam.from_type" clearable :placeholder="t('fromTypePlaceholder')" class="input-width">

14
admin/src/app/views/poster/components/preview-draw.vue
View File

@ -13,18 +13,18 @@ const prop = defineProps({
}) })
const data = computed(() => { const data = computed(() => {
return prop.value; return prop.value
}) })
const componentStyle = computed(() => { const componentStyle = computed(() => {
var style = ''; let style = ''
style += `background-color: ${ prop.value.bgColor };`; style += `background-color: ${prop.value.bgColor};`
style += `width: ${ prop.value.width }px;height: ${ prop.value.height }px;`; style += `width: ${prop.value.width}px;height: ${prop.value.height}px;`
let box: any = document.getElementById(prop.value.id) const box: any = document.getElementById(prop.value.id)
if (box) { if (box) {
style += `width:${ box.offsetWidth }px;height:${ box.offsetHeight }px;`; style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
} }
return style; return style
}) })
defineExpose({}) defineExpose({})

20
admin/src/app/views/poster/components/preview-friendspay-message.vue
View File

@ -16,28 +16,28 @@ const prop = defineProps({
}) })
const data = computed(() => { const data = computed(() => {
return prop.value; return prop.value
}) })
const componentStyle = computed(() => { const componentStyle = computed(() => {
var style = ''; let style = ''
style += `font-size: ${ prop.value.fontSize }px;color: ${ prop.value.fontColor };line-height: ${ prop.value.lineHeight + prop.value.fontSize }px;`; style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') { if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') {
style += `text-align: ${ prop.value.x };`; style += `text-align: ${prop.value.x};`
} }
if (prop.value.weight) { if (prop.value.weight) {
style += `font-weight: bold;`; 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/SourceHanSansCN-Regular.ttf') {
style += `font-family: poster_default_font;`; style += 'font-family: poster_default_font;'
} }
let box: any = document.getElementById(prop.value.id) const box: any = document.getElementById(prop.value.id)
if (box) { if (box) {
style += `width:${ box.offsetWidth }px;height:${ box.offsetHeight }px;`; style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
} else { } else {
style += `width:${ prop.value.width }px;height:${ prop.value.height }px;`; style += `width:${prop.value.width}px;height:${prop.value.height}px;`
} }
return style; return style
}) })
defineExpose({}) defineExpose({})

20
admin/src/app/views/poster/components/preview-friendspay-money.vue
View File

@ -16,28 +16,28 @@ const prop = defineProps({
}) })
const data = computed(() => { const data = computed(() => {
return prop.value; return prop.value
}) })
const componentStyle = computed(() => { const componentStyle = computed(() => {
var style = ''; let style = ''
style += `font-size: ${ prop.value.fontSize }px;color: ${ prop.value.fontColor };line-height: ${ prop.value.lineHeight + prop.value.fontSize }px;`; style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') { if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') {
style += `text-align: ${ prop.value.x };`; style += `text-align: ${prop.value.x};`
} }
if (prop.value.weight) { if (prop.value.weight) {
style += `font-weight: bold;`; 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/SourceHanSansCN-Regular.ttf') {
style += `font-family: poster_default_font;`; style += 'font-family: poster_default_font;'
} }
let box: any = document.getElementById(prop.value.id) const box: any = document.getElementById(prop.value.id)
if (box) { if (box) {
style += `width:${ box.offsetWidth }px;height:${ box.offsetHeight }px;`; style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
} else { } else {
style += `width:${ prop.value.width }px;height:${ prop.value.height }px;`; style += `width:${prop.value.width}px;height:${prop.value.height}px;`
} }
return style; return style
}) })
defineExpose({}) defineExpose({})

10
admin/src/app/views/poster/components/preview-headimg.vue
View File

@ -16,16 +16,16 @@ const prop = defineProps({
}) })
const data = computed(() => { const data = computed(() => {
return prop.value; return prop.value
}) })
const componentStyle = computed(() => { const componentStyle = computed(() => {
var style = ''; let style = ''
style += `width: ${ prop.value.width }px;`; style += `width: ${prop.value.width}px;`
if (prop.value.shape == 'circle') { if (prop.value.shape == 'circle') {
style += `border-radius: 50%; overflow: hidden;`; style += 'border-radius: 50%; overflow: hidden;'
} }
return style; return style
}) })
defineExpose({}) defineExpose({})

8
admin/src/app/views/poster/components/preview-image.vue
View File

@ -17,13 +17,13 @@ const prop = defineProps({
}) })
const data = computed(() => { const data = computed(() => {
return prop.value; return prop.value
}) })
const componentStyle = computed(() => { const componentStyle = computed(() => {
var style = ''; let style = ''
style += `width: ${ prop.value.width }px;`; style += `width: ${prop.value.width}px;`
return style; return style
}) })
defineExpose({}) defineExpose({})

20
admin/src/app/views/poster/components/preview-nickname.vue
View File

@ -16,28 +16,28 @@ const prop = defineProps({
}) })
const data = computed(() => { const data = computed(() => {
return prop.value; return prop.value
}) })
const componentStyle = computed(() => { const componentStyle = computed(() => {
var style = ''; let style = ''
style += `font-size: ${ prop.value.fontSize }px;color: ${ prop.value.fontColor };line-height: ${ prop.value.lineHeight + prop.value.fontSize }px;`; style += `font-size: ${prop.value.fontSize}px;color: ${prop.value.fontColor};line-height: ${prop.value.lineHeight + prop.value.fontSize}px;`
if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') { if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') {
style += `text-align: ${ prop.value.x };`; style += `text-align: ${prop.value.x};`
} }
if (prop.value.weight) { if (prop.value.weight) {
style += `font-weight: bold;`; 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/SourceHanSansCN-Regular.ttf') {
style += `font-family: poster_default_font;`; style += 'font-family: poster_default_font;'
} }
let box: any = document.getElementById(prop.value.id) const box: any = document.getElementById(prop.value.id)
if (box) { if (box) {
style += `width:${ box.offsetWidth }px;height:${ box.offsetHeight }px;`; style += `width:${box.offsetWidth}px;height:${box.offsetHeight}px;`
} else { } else {
style += `width:${ prop.value.width }px;height:${ prop.value.height }px;`; style += `width:${prop.value.width}px;height:${prop.value.height}px;`
} }
return style; return style
}) })
defineExpose({}) defineExpose({})

2
admin/src/app/views/poster/components/preview-qrcode.vue
View File

@ -20,7 +20,7 @@ const data = computed(() => {
}) })
const componentStyle = computed(() => { const componentStyle = computed(() => {
var style = ''; let style = '';
style += `width: ${ prop.value.width }px;`; style += `width: ${ prop.value.width }px;`;
return style; return style;
}) })

2
admin/src/app/views/poster/components/preview-text.vue
View File

@ -20,7 +20,7 @@ const data = computed(() => {
}) })
const componentStyle = computed(() => { const componentStyle = computed(() => {
var style = ''; let style = '';
style += `font-size: ${ prop.value.fontSize }px;color: ${ prop.value.fontColor };line-height: ${ prop.value.lineHeight + prop.value.fontSize }px;`; style += `font-size: ${ prop.value.fontSize }px;color: ${ prop.value.fontColor };line-height: ${ prop.value.lineHeight + prop.value.fontSize }px;`;
if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') { if (prop.value.x == 'left' || prop.value.x == 'center' || prop.value.x == 'right') {
style += `text-align: ${ prop.value.x };`; style += `text-align: ${ prop.value.x };`;

37
admin/src/app/views/poster/list.vue
View File

@ -103,8 +103,8 @@ import { reactive, ref, computed } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { ElMessageBox, FormInstance } from 'element-plus' import { ElMessageBox, FormInstance } from 'element-plus'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { getPosterPageList,getPosterType,modifyPosterStatus,modifyPosterDefault,deletePoster,getPreviewPoster } from '@/app/api/poster' import { getPosterPageList, getPosterType, modifyPosterStatus, modifyPosterDefault, deletePoster, getPreviewPoster } from '@/app/api/poster'
import { img,setTablePageStorage,getTablePageStorage } from '@/utils/common' import { img, setTablePageStorage, getTablePageStorage } from '@/utils/common'
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
@ -151,10 +151,10 @@ const addEvent = async (formEl: FormInstance | undefined) => {
} }
// 获取自定义海报类型 // 获取自定义海报类型
const loadPosterType = ()=> { const loadPosterType = () => {
getPosterType({}).then((res:any)=>{ getPosterType({}).then((res:any) => {
for (let key in posterType) { for (const key in posterType) {
delete posterType[key]; delete posterType[key]
} }
for (const key in res.data) { for (const key in res.data) {
@ -163,7 +163,7 @@ const loadPosterType = ()=> {
}) })
} }
loadPosterType(); loadPosterType()
const posterTableData: any = reactive({ const posterTableData: any = reactive({
page: 1, page: 1,
@ -192,13 +192,13 @@ const loadPosterPageList = (page: number = 1) => {
posterTableData.loading = false posterTableData.loading = false
posterTableData.data = res.data.data posterTableData.data = res.data.data
posterTableData.total = res.data.total posterTableData.total = res.data.total
setTablePageStorage(posterTableData.page, posterTableData.limit, posterTableData.searchParam); setTablePageStorage(posterTableData.page, posterTableData.limit, posterTableData.searchParam)
}).catch(() => { }).catch(() => {
posterTableData.loading = false posterTableData.loading = false
}) })
} }
loadPosterPageList(getTablePageStorage(posterTableData.searchParam).page); loadPosterPageList(getTablePageStorage(posterTableData.searchParam).page)
// 编辑自定义海报 // 编辑自定义海报
const editEvent = (data: any) => { const editEvent = (data: any) => {
@ -212,7 +212,7 @@ const editEvent = (data: any) => {
const isRepeat = ref(false) const isRepeat = ref(false)
// 修改海报启用状态 // 修改海报启用状态
const modifyPosterStatusFn = (id:any,status:any)=> { const modifyPosterStatusFn = (id:any, status:any) => {
if (isRepeat.value) return if (isRepeat.value) return
isRepeat.value = true isRepeat.value = true
@ -225,7 +225,7 @@ const modifyPosterStatusFn = (id:any,status:any)=> {
} }
// 将自定义海报修改为默认海报 // 将自定义海报修改为默认海报
const modifyPosterDefaultFn = (id:any)=> { const modifyPosterDefaultFn = (id:any) => {
if (isRepeat.value) return if (isRepeat.value) return
isRepeat.value = true isRepeat.value = true
modifyPosterDefault({ modifyPosterDefault({
@ -265,16 +265,15 @@ const previewPoster = (data: any) => {
isRepeat.value = true isRepeat.value = true
getPreviewPoster({ getPreviewPoster({
id:data.id, id: data.id,
type:data.type type: data.type
}).then(((res:any)=>{ }).then((res:any) => {
if(res.data) { if (res.data) {
previewPosterUrl.value = res.data; previewPosterUrl.value = res.data
previewDialogVisible.value = true; previewDialogVisible.value = true
} }
isRepeat.value = false isRepeat.value = false
})) })
} }
const resetForm = (formEl: FormInstance | undefined) => { const resetForm = (formEl: FormInstance | undefined) => {

18
admin/src/app/views/printer/list.vue
View File

@ -68,14 +68,14 @@
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref } from 'vue' import { reactive, ref } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getPrinterPageList, modifyPrinterStatus, deletePrinter,refreshPrinterToken,testPrint } from '@/app/api/printer' import { getPrinterPageList, modifyPrinterStatus, deletePrinter, refreshPrinterToken, testPrint } from '@/app/api/printer'
import { ElMessageBox,FormInstance } from 'element-plus' import { ElMessageBox, FormInstance } from 'element-plus'
import { useRoute,useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { setTablePageStorage,getTablePageStorage } from "@/utils/common"; import { setTablePageStorage, getTablePageStorage } from '@/utils/common'
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
const pageName = route.meta.title; const pageName = route.meta.title
const repeat = ref(false) const repeat = ref(false)
const handleClick = (path: string) => { const handleClick = (path: string) => {
@ -110,7 +110,7 @@ const loadPrinterList = (page: number = 1) => {
printerTable.loading = false printerTable.loading = false
printerTable.data = res.data.data printerTable.data = res.data.data
printerTable.total = res.data.total printerTable.total = res.data.total
setTablePageStorage(printerTable.page, printerTable.limit, printerTable.searchParam); setTablePageStorage(printerTable.page, printerTable.limit, printerTable.searchParam)
}).catch(() => { }).catch(() => {
printerTable.loading = false printerTable.loading = false
}) })
@ -157,7 +157,7 @@ const deleteEvent = (id: number) => {
{ {
confirmButtonText: t('confirm'), confirmButtonText: t('confirm'),
cancelButtonText: t('cancel'), cancelButtonText: t('cancel'),
type: 'warning', type: 'warning'
} }
).then(() => { ).then(() => {
if (repeat.value) return if (repeat.value) return
@ -186,7 +186,7 @@ const testPrintEvent = (printer_id: any) => {
{ {
confirmButtonText: t('confirm'), confirmButtonText: t('confirm'),
cancelButtonText: t('cancel'), cancelButtonText: t('cancel'),
type: 'warning', type: 'warning'
} }
).then(() => { ).then(() => {
if (repeat.value) return if (repeat.value) return
@ -208,7 +208,7 @@ const refreshTokenEvent = (printer_id: any) => {
{ {
confirmButtonText: t('confirm'), confirmButtonText: t('confirm'),
cancelButtonText: t('cancel'), cancelButtonText: t('cancel'),
type: 'warning', type: 'warning'
} }
).then(() => { ).then(() => {
if (repeat.value) return if (repeat.value) return

2
admin/src/app/views/setting/adminlogin.vue
View File

@ -13,7 +13,7 @@
<div class="form-tip">{{t('adminBgImgTip')}}</div> <div class="form-tip">{{t('adminBgImgTip')}}</div>
</el-form-item> </el-form-item>
<div class="box-card mt-[20px] !border-none" shadow="never"> <div class="box-card mt-[20px] !border-none">
<h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('site') }}</h3> <h3 class="panel-title !text-[14px] bg-[#F4F5F7] p-3 border-[#E6E6E6] border-solid border-b-[1px]">{{ t('site') }}</h3>
<el-form-item :label="t('isCaptcha')"> <el-form-item :label="t('isCaptcha')">

4
admin/src/app/views/setting/components/sms-tencent.vue
View File

@ -53,8 +53,8 @@ const initialFormData = {
access_key: '', access_key: '',
secret_key: '', secret_key: '',
is_use: '', is_use: '',
app_id:'', app_id: '',
secret_id:'', secret_id: ''
} }
const formData: Record<string, any> = reactive({ ...initialFormData }) const formData: Record<string, any> = reactive({ ...initialFormData })

137
admin/src/app/views/setting/components/sms_niu_login.vue
View File

@ -2,7 +2,7 @@
<el-card class="box-card !border-none" shadow="never" v-loading="loading"> <el-card class="box-card !border-none" shadow="never" v-loading="loading">
<div v-if="type=='login'" > <div v-if="type=='login'" >
<div class="bg-[var(--el-color-primary-light-9)] p-2 text-[14px] rounded-[6px]"> <div class="bg-[var(--el-color-primary-light-9)] p-2 text-[14px] rounded-[6px]">
<span class="">还未注册牛云短信?</span> <span>还未注册牛云短信?</span>
<span @click="toRegister" class="cursor-pointer text-primary">去注册</span> <span @click="toRegister" class="cursor-pointer text-primary">去注册</span>
</div> </div>
<el-form :model="formData" label-width="150px" ref="formRef" :rules="formRules" class="page-form mt-[20px]"> <el-form :model="formData" label-width="150px" ref="formRef" :rules="formRules" class="page-form mt-[20px]">
@ -21,7 +21,7 @@
</div> </div>
<div v-if="type=='register'" > <div v-if="type=='register'" >
<div class="bg-[var(--el-color-primary-light-9)] p-2 text-[14px] rounded-[6px]"> <div class="bg-[var(--el-color-primary-light-9)] p-2 text-[14px] rounded-[6px]">
<span class="">已有账号，</span> <span>已有账号，</span>
<span @click="type='login'" class="cursor-pointer text-primary">去登录</span> <span @click="type='login'" class="cursor-pointer text-primary">去登录</span>
</div> </div>
<el-form :model="registerFormData" label-width="150px" ref="registerFormRef" :rules="registerFormRules" class="page-form mt-[20px]"> <el-form :model="registerFormData" label-width="150px" ref="registerFormRef" :rules="registerFormRules" class="page-form mt-[20px]">
@ -111,6 +111,9 @@
<span class="text-primary">忘记密码，快去修改</span> <span class="text-primary">忘记密码，快去修改</span>
</div> </div>
<el-form :model="changeFormData" label-width="150px" ref="changeFormRef" :rules="changeFormRules" class="page-form mt-[20px]"> <el-form :model="changeFormData" label-width="150px" ref="changeFormRef" :rules="changeFormRules" class="page-form mt-[20px]">
<el-form-item label="用户名" prop="username">
<el-input placeholder="请输入用户名" class="input-width" maxlength="50" show-word-limit v-model="changeFormData.username" clearable />
</el-form-item>
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号" prop="mobile">
<el-input placeholder="请输入手机号" class="input-width" maxlength="11" show-word-limit v-model="changeFormData.mobile" clearable /> <el-input placeholder="请输入手机号" class="input-width" maxlength="11" show-word-limit v-model="changeFormData.mobile" clearable />
</el-form-item> </el-form-item>
@ -139,16 +142,16 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref ,computed,reactive} from 'vue' import { ref, computed, reactive } from 'vue'
import { loginAccount,getSmsCaptcha,getSmsSend,resetPassword,registerAccount ,getSmsSignConfig} from '@/app/api/notice' import { loginAccount, getSmsCaptcha, getSmsSend, resetPassword, registerAccount, getSmsSignConfig } from '@/app/api/notice'
import { t } from "@/lang"; import { t } from '@/lang'
const props = defineProps({ const props = defineProps({
info:{ info: {
type: Object, type: Object,
default: () => ({}) default: () => ({})
}, },
isLogin:{ isLogin: {
type: Boolean, type: Boolean,
default: false default: false
} }
@ -164,7 +167,7 @@ const formData = ref({
}) })
const isBack = computed(() => { const isBack = computed(() => {
return !!props.info && Object.keys(props.info).length > 0; return !!props.info && Object.keys(props.info).length > 0
}) })
const formRules = computed(() => { const formRules = computed(() => {
@ -194,9 +197,9 @@ const back = () => {
// 注册 // 注册
const signConfig = reactive({ const signConfig = reactive({
signTypeList: [], signTypeList: [],
signSourceList:[] signSourceList: []
}) })
const getSmsSignConfigFn = ()=> { const getSmsSignConfigFn = () => {
getSmsSignConfig().then(res => { getSmsSignConfig().then(res => {
signConfig.signTypeList = res.data.sign_type_list signConfig.signTypeList = res.data.sign_type_list
signConfig.signSourceList = res.data.sign_source_list signConfig.signSourceList = res.data.sign_source_list
@ -263,39 +266,39 @@ const registerFormRules = computed(() => {
} }
], ],
mobile: [ mobile: [
{ required: true, message: '请输入手机号', trigger: 'blur' }, { required: true, message: '请输入手机号', trigger: 'blur' }
], ],
captcha_code: [ captcha_code: [
{ required: true, message: '请输入验证码', trigger: 'blur' }, { required: true, message: '请输入验证码', trigger: 'blur' }
], ],
code: [ code: [
{ required: true, message: '请输入动态码', trigger: 'blur' }, { required: true, message: '请输入动态码', trigger: 'blur' }
], ],
company: [ company: [
{ required: true, message: '请输入公司名称', trigger: 'blur' }, { required: true, message: '请输入公司名称', trigger: 'blur' }
], ],
signature: [ signature: [
{ required: true, message: '请输入短信签名', trigger: 'blur' }, { required: true, message: '请输入短信签名', trigger: 'blur' },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
const singleBracketValid = /^【[^【】]*】$/.test(value); const singleBracketValid = /^【[^【】]*】$/.test(value)
if (!singleBracketValid) { if (!singleBracketValid) {
return callback(new Error('短信签名必须被【】包裹')); return callback(new Error('短信签名必须被【】包裹'))
} }
const content = value.slice(1, -1); const content = value.slice(1, -1)
const lengthValid = content.length >= 2 && content.length <= 20; const lengthValid = content.length >= 2 && content.length <= 20
if (!lengthValid) { if (!lengthValid) {
return callback(new Error('短信签名内容需在 2-20 个字符之间')); return callback(new Error('短信签名内容需在 2-20 个字符之间'))
} }
const invalidChars = /[\s\-+=*&%#@~;]/; const invalidChars = /[\s\-+=*&%#@~;]/
if (invalidChars.test(content)) { if (invalidChars.test(content)) {
return callback(new Error('短信签名不能包含空格或特殊字符 - + = * & % # @ ~ ;')); return callback(new Error('短信签名不能包含空格或特殊字符 - + = * & % # @ ~ ;'))
} }
callback(); callback()
}, },
trigger: 'blur' trigger: 'blur'
} }
@ -305,19 +308,19 @@ const registerFormRules = computed(() => {
{ validator: phoneVerify, trigger: 'blur' } { validator: phoneVerify, trigger: 'blur' }
], ],
companyName: [ companyName: [
{ required: true, message: '请输入企业名称', trigger: 'blur' }, { required: true, message: '请输入企业名称', trigger: 'blur' }
], ],
contentExample: [ contentExample: [
{ required: true, message: '请输入短信示例内容', trigger: 'blur' }, { required: true, message: '请输入短信示例内容', trigger: 'blur' }
], ],
creditCode: [ creditCode: [
{ required: true, message: '请输入社会统一信用代码', trigger: 'blur' }, { required: true, message: '请输入社会统一信用代码', trigger: 'blur' }
], ],
legalPerson: [ legalPerson: [
{ required: true, message: '请输入法人姓名', trigger: 'blur' }, { required: true, message: '请输入法人姓名', trigger: 'blur' }
], ],
principalName: [ principalName: [
{ required: true, message: '请输入经办人姓名', trigger: 'blur' }, { required: true, message: '请输入经办人姓名', trigger: 'blur' }
], ],
principalIdCard: [ principalIdCard: [
{ required: true, message: '请输入经办人身份证', trigger: 'blur' }, { required: true, message: '请输入经办人身份证', trigger: 'blur' },
@ -326,22 +329,22 @@ const registerFormRules = computed(() => {
imgUrl: [ imgUrl: [
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
const needImage = [3, 4, 5].includes(registerFormData.value.signSource) || registerFormData.value.signType == 1; const needImage = [3, 4, 5].includes(registerFormData.value.signSource) || registerFormData.value.signType == 1
if (needImage) { if (needImage) {
if (!value || value.length === 0) { if (!value || value.length === 0) {
callback(new Error('请上传图片')); callback(new Error('请上传图片'))
} else { } else {
callback(); callback()
} }
} else { } else {
callback(); // 不需要校验 callback() // 不需要校验
} }
}, },
trigger: 'blur' trigger: 'blur'
} }
] ]
}; }
}); })
const idCardVerify = (rule: any, value: any, callback: any) => { const idCardVerify = (rule: any, value: any, callback: any) => {
if (value && !/^[1-9]\d{5}(19|20)\d{2}((0\d)|(1[0-2]))(([0-2]\d)|3[0-1])\d{3}([0-9Xx])$/.test(value)) { if (value && !/^[1-9]\d{5}(19|20)\d{2}((0\d)|(1[0-2]))(([0-2]\d)|3[0-1])\d{3}([0-9Xx])$/.test(value)) {
callback(new Error(t('请输入正确的身份证号码'))) callback(new Error(t('请输入正确的身份证号码')))
@ -360,25 +363,26 @@ const phoneVerify = (rule: any, value: any, callback: any) => {
const register = async () => { const register = async () => {
await registerFormRef.value?.validate(async (valid) => { await registerFormRef.value?.validate(async (valid) => {
if (valid) { if (valid) {
const { captcha_key, captcha_code, captcha_img, ...params } = registerFormData.value; const { captcha_key, captcha_code, captcha_img, ...params } = registerFormData.value
registerAccount(params).then((res) => { registerAccount(params).then((res) => {
type.value='login' type.value = 'login'
}).catch((err) => { }).catch((err) => {
getSmsCaptchaFn() getSmsCaptchaFn()
}) })
} }
}); })
} }
// 重置密码 // 重置密码
const changeFormRef = ref() const changeFormRef = ref()
const changeFormData = ref({ const changeFormData = ref({
mobile: '', mobile: '',
captcha_key : '', captcha_key: '',
captcha_code: '', captcha_code: '',
captcha_img: '', captcha_img: '',
code: '', code: '',
key: '' key: '',
username: props.info.username || '',
}) })
const getSmsCaptchaFn = async () => { const getSmsCaptchaFn = async () => {
@ -398,11 +402,11 @@ const getSmsCaptchaFn = async () => {
} }
} }
const sending = ref(false); // 发送中状态 const sending = ref(false) // 发送中状态
const countdown = ref(0); // 倒计时秒数 const countdown = ref(0) // 倒计时秒数
const getSmsSendFn = () => { const getSmsSendFn = () => {
if (countdown.value > 0 || sending.value) return; // 正在倒计时或发送中，直接返回 if (countdown.value > 0 || sending.value) return // 正在倒计时或发送中，直接返回
if (type.value === 'register') { if (type.value === 'register') {
registerFormRef.value.validateField(['mobile', 'captcha_code'], (valid) => { registerFormRef.value.validateField(['mobile', 'captcha_code'], (valid) => {
if (!valid) return if (!valid) return
@ -413,13 +417,13 @@ const getSmsSendFn = () => {
captcha_code: registerFormData.value.captcha_code captcha_code: registerFormData.value.captcha_code
} }
getSmsSend(params).then((res) => { getSmsSend(params).then((res) => {
startCountdown(60); // 启动60秒倒计时 startCountdown(60) // 启动60秒倒计时
registerFormData.value.key = res.data.key; registerFormData.value.key = res.data.key
}).catch((err) => { }).catch((err) => {
getSmsCaptchaFn() getSmsCaptchaFn()
sending.value = false; sending.value = false
}).finally(() => { }).finally(() => {
sending.value = false; // 无论成功失败都重置发送状态 sending.value = false // 无论成功失败都重置发送状态
}) })
}) })
} else if (type.value === 'password') { } else if (type.value === 'password') {
@ -433,28 +437,28 @@ const getSmsSendFn = () => {
captcha_code: changeFormData.value.captcha_code captcha_code: changeFormData.value.captcha_code
} }
getSmsSend(params).then((res) => { getSmsSend(params).then((res) => {
startCountdown(60); // 启动60秒倒计时 startCountdown(60) // 启动60秒倒计时
changeFormData.value.key = res.data.key; changeFormData.value.key = res.data.key
}).catch((err) => { }).catch((err) => {
getSmsCaptchaFn() getSmsCaptchaFn()
sending.value = false; sending.value = false
}).finally(() => { }).finally(() => {
sending.value = false; // 无论成功失败都重置发送状态 sending.value = false // 无论成功失败都重置发送状态
}); })
}); })
} }
} }
// 启动倒计时 // 启动倒计时
const startCountdown = (seconds) => { const startCountdown = (seconds) => {
countdown.value = seconds; countdown.value = seconds
const timer = setInterval(() => { const timer = setInterval(() => {
countdown.value--; countdown.value--
if (countdown.value <= 0) { if (countdown.value <= 0) {
clearInterval(timer); clearInterval(timer)
sending.value = false; // 发送状态重置 sending.value = false // 发送状态重置
} }
}, 1000); }, 1000)
} }
const changeFormRules = computed(() => { const changeFormRules = computed(() => {
@ -468,13 +472,16 @@ const changeFormRules = computed(() => {
} }
], ],
captcha_code: [ captcha_code: [
{ required: true, message: '请输入验证码', trigger: 'blur' }, { required: true, message: '请输入验证码', trigger: 'blur' }
], ],
code: [ code: [
{ required: true, message: '请输入动态码', trigger: 'blur' }, { required: true, message: '请输入动态码', trigger: 'blur' }
],
username: [
{ required: true, message: '请输入用户名', trigger: 'blur' }
] ]
}; }
}); })
const editPass = async () => { const editPass = async () => {
loading.value = true loading.value = true
captchaType.value = 'password' captchaType.value = 'password'
@ -488,16 +495,16 @@ const editPass = async () => {
const reset = async () => { const reset = async () => {
await changeFormRef.value?.validate(async (valid) => { await changeFormRef.value?.validate(async (valid) => {
if (valid) { if (valid) {
let params = { const params = {
key: changeFormData.value.key, key: changeFormData.value.key,
code: changeFormData.value.code, code: changeFormData.value.code,
mobile: changeFormData.value.mobile mobile: changeFormData.value.mobile
} }
resetPassword(props.info.username, { ...params }).then((res) => { resetPassword(changeFormData.value.username, { ...params }).then((res) => {
let newPassword = res.data.password const newPassword = res.data.password
ElMessageBox.confirm(`新密码为：${ newPassword }`, '请保存好新密码', { ElMessageBox.confirm(`新密码为：${newPassword}`, '请保存好新密码', {
confirmButtonText: '确定', confirmButtonText: '确定',
showCancelButton: false, showCancelButton: false
}).then(() => { }).then(() => {
type.value = 'login' type.value = 'login'
emit('complete') emit('complete')

12
admin/src/app/views/setting/components/sms_recharge.vue
View File

@ -32,7 +32,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref ,watch} from 'vue' import { ref, watch } from 'vue'
import { getSmsPackagesList, smsOrderCreate, getOrderPayInfo, getOrderPayStatus, calculateOrderPay } from '@/app/api/notice' import { getSmsPackagesList, smsOrderCreate, getOrderPayInfo, getOrderPayStatus, calculateOrderPay } from '@/app/api/notice'
const props = defineProps({ const props = defineProps({
@ -100,7 +100,7 @@ const submitPayment = async () => {
await ElMessageBox.confirm('请确认支付是否完成', '支付提示', { await ElMessageBox.confirm('请确认支付是否完成', '支付提示', {
confirmButtonText: '已完成支付', confirmButtonText: '已完成支付',
cancelButtonText: '返回', cancelButtonText: '返回',
type: 'warning', type: 'warning'
}) })
emit('complete') emit('complete')
} }
@ -115,13 +115,13 @@ const goBack = () => {
emit('back') emit('back')
} }
const showRecharge = ref(false); const showRecharge = ref(false)
watch(() => props.isRecharge, (newVal) => { watch(() => props.isRecharge, (newVal) => {
showRecharge.value = newVal; showRecharge.value = newVal
if (newVal) { if (newVal) {
getSmsPackagesListFn(); getSmsPackagesListFn()
} }
}); })
</script> </script>

28
admin/src/app/views/setting/components/sms_recharge_record.vue
View File

@ -64,9 +64,9 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref , reactive,onMounted} from 'vue' import { ref, reactive, onMounted } from 'vue'
import { getSmsOrdersList ,getOrderInfo} from '@/app/api/notice' import { getSmsOrdersList, getOrderInfo } from '@/app/api/notice'
import { t } from "@/lang"; import { t } from '@/lang'
const props = defineProps({ const props = defineProps({
username: { username: {
@ -82,27 +82,27 @@ const tableData = reactive({
loading: false, loading: false,
data: [], data: [],
searchParam: { searchParam: {
name: "", name: '',
order: '', order: '',
sort: '' sort: ''
}, }
}); })
// 获取列表 // 获取列表
const loadRankList = () => { const loadRankList = () => {
tableData.loading = true; tableData.loading = true
let params = { const params = {
page: tableData.page, page: tableData.page,
limit: tableData.limit, limit: tableData.limit,
...tableData.searchParam ...tableData.searchParam
} }
getSmsOrdersList(props.username, params).then((res) => { getSmsOrdersList(props.username, params).then((res) => {
tableData.loading = false; tableData.loading = false
tableData.data = res.data.data; tableData.data = res.data.data
tableData.total = res.data.total; tableData.total = res.data.total
}).catch(() => { }).catch(() => {
tableData.loading = false; tableData.loading = false
}); })
} }
// 详情 // 详情
@ -112,7 +112,7 @@ const loading = ref(false)
const detailEvent = (row:any) => { const detailEvent = (row:any) => {
loading.value = true loading.value = true
visibleDetail.value = true visibleDetail.value = true
getOrderInfo(props.username,{out_trade_no:row.out_trade_no}).then(res=>{ getOrderInfo(props.username, { out_trade_no: row.out_trade_no }).then(res => {
detail.value = res.data detail.value = res.data
loading.value = false loading.value = false
}) })

22
admin/src/app/views/setting/components/sms_send.vue
View File

@ -47,10 +47,10 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref ,reactive,onMounted} from 'vue' import { ref, reactive, onMounted } from 'vue'
import { getSmsSendList } from '@/app/api/notice' import { getSmsSendList } from '@/app/api/notice'
import { timeStampTurnTime } from '@/utils/common' import { timeStampTurnTime } from '@/utils/common'
import { t } from "@/lang"; import { t } from '@/lang'
const props = defineProps({ const props = defineProps({
username: { username: {
@ -75,26 +75,26 @@ const tableData = reactive({
// 获取列表 // 获取列表
const loadRankList = () => { const loadRankList = () => {
tableData.loading = true; tableData.loading = true
let params = { const params = {
page: tableData.page, page: tableData.page,
limit: tableData.limit, limit: tableData.limit,
...tableData.searchParam ...tableData.searchParam
} }
getSmsSendList(props.username, params).then((res) => { getSmsSendList(props.username, params).then((res) => {
tableData.loading = false; tableData.loading = false
tableData.data = res.data.data; tableData.data = res.data.data
tableData.total = res.data.total; tableData.total = res.data.total
}).catch(() => { }).catch(() => {
tableData.loading = false; tableData.loading = false
}); })
} }
onMounted(() => { onMounted(() => {
if (props.username) { if (props.username) {
loadRankList(); loadRankList()
} }
}) })
const searchFormRef = ref<FormInstance>(); const searchFormRef = ref<FormInstance>()
const resetForm = (formEl: FormInstance | undefined) => { const resetForm = (formEl: FormInstance | undefined) => {
if (!formEl) return if (!formEl) return
formEl.resetFields() formEl.resetFields()

92
admin/src/app/views/setting/components/sms_signature.vue
View File

@ -3,7 +3,7 @@
<el-dialog v-model="visible" :title="t('选择签名')" width="1200px" destroy-on-close :close-on-click-modal="false"> <el-dialog v-model="visible" :title="t('选择签名')" width="1200px" destroy-on-close :close-on-click-modal="false">
<el-alert type="warning" :closable="false" class="!mb-[10px]"> <el-alert type="warning" :closable="false" class="!mb-[10px]">
<template #default> <template #default>
<p class="">签名数据的变更（新增 / 删除）需经过五分钟的生效周期，在此期间系统将完成数据同步与更新</p> <p>签名数据的变更（新增 / 删除）需经过五分钟的生效周期，在此期间系统将完成数据同步与更新</p>
</template> </template>
</el-alert> </el-alert>
<div class="flex justify-between items-center mb-[16px]"> <div class="flex justify-between items-center mb-[16px]">
@ -141,8 +141,8 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref, computed, reactive } from 'vue' import { ref, computed, reactive } from 'vue'
import { getSignList,addSign,getSmsSignConfig,deleteSign } from '@/app/api/notice' import { getSignList, addSign, getSmsSignConfig, deleteSign } from '@/app/api/notice'
import { t } from "@/lang"; import { t } from '@/lang'
const visible = ref(false) const visible = ref(false)
const visibleAdd = ref(false) const visibleAdd = ref(false)
@ -171,9 +171,9 @@ const formData = reactive({ ...initialFormData })
const signConfig = reactive({ const signConfig = reactive({
signTypeList: [], signTypeList: [],
signSourceList:[] signSourceList: []
}) })
const getSmsSignConfigFn = ()=> { const getSmsSignConfigFn = () => {
getSmsSignConfig().then(res => { getSmsSignConfig().then(res => {
signConfig.signTypeList = res.data.sign_type_list signConfig.signTypeList = res.data.sign_type_list
signConfig.signSourceList = res.data.sign_source_list signConfig.signSourceList = res.data.sign_source_list
@ -191,24 +191,24 @@ const formRules = computed(() => {
{ required: true, message: '请输入短信签名', trigger: 'blur' }, { required: true, message: '请输入短信签名', trigger: 'blur' },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
const singleBracketValid = /^【[^【】]*】$/.test(value); const singleBracketValid = /^【[^【】]*】$/.test(value)
if (!singleBracketValid) { if (!singleBracketValid) {
return callback(new Error('短信签名必须被【】包裹')); return callback(new Error('短信签名必须被【】包裹'))
} }
const content = value.slice(1, -1); const content = value.slice(1, -1)
const lengthValid = content.length >= 2 && content.length <= 20; const lengthValid = content.length >= 2 && content.length <= 20
if (!lengthValid) { if (!lengthValid) {
return callback(new Error('短信签名内容需在 2-20 个字符之间')); return callback(new Error('短信签名内容需在 2-20 个字符之间'))
} }
const invalidChars = /[\s\-+=*&%#@~;]/; const invalidChars = /[\s\-+=*&%#@~;]/
if (invalidChars.test(content)) { if (invalidChars.test(content)) {
return callback(new Error('短信签名不能包含空格或特殊字符 - + = * & % # @ ~ ;')); return callback(new Error('短信签名不能包含空格或特殊字符 - + = * & % # @ ~ ;'))
} }
callback(); callback()
}, },
trigger: 'blur' trigger: 'blur'
} }
@ -218,19 +218,19 @@ const formRules = computed(() => {
{ validator: phoneVerify, trigger: 'blur' } { validator: phoneVerify, trigger: 'blur' }
], ],
companyName: [ companyName: [
{ required: true, message: '请输入企业名称', trigger: 'blur' }, { required: true, message: '请输入企业名称', trigger: 'blur' }
], ],
contentExample: [ contentExample: [
{ required: true, message: '请输入短信示例内容', trigger: 'blur' }, { required: true, message: '请输入短信示例内容', trigger: 'blur' }
], ],
creditCode: [ creditCode: [
{ required: true, message: '请输入社会统一信用代码', trigger: 'blur' }, { required: true, message: '请输入社会统一信用代码', trigger: 'blur' }
], ],
legalPerson: [ legalPerson: [
{ required: true, message: '请输入法人姓名', trigger: 'blur' }, { required: true, message: '请输入法人姓名', trigger: 'blur' }
], ],
principalName: [ principalName: [
{ required: true, message: '请输入经办人姓名', trigger: 'blur' }, { required: true, message: '请输入经办人姓名', trigger: 'blur' }
], ],
principalIdCard: [ principalIdCard: [
{ required: true, message: '请输入经办人身份证', trigger: 'blur' }, { required: true, message: '请输入经办人身份证', trigger: 'blur' },
@ -239,22 +239,22 @@ const formRules = computed(() => {
imgUrl: [ imgUrl: [
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
const needImage = [3, 4, 5].includes(formData.signSource) || formData.signType === 1; const needImage = [3, 4, 5].includes(formData.signSource) || formData.signType === 1
if (needImage) { if (needImage) {
if (!value || value.length === 0) { if (!value || value.length === 0) {
callback(new Error('请上传图片')); callback(new Error('请上传图片'))
} else { } else {
callback(); callback()
} }
} else { } else {
callback(); // 不需要校验 callback() // 不需要校验
} }
}, },
trigger: 'blur' trigger: 'blur'
} }
] ]
}; }
}) })
const idCardVerify = (rule: any, value: any, callback: any) => { const idCardVerify = (rule: any, value: any, callback: any) => {
@ -276,14 +276,14 @@ const phoneVerify = (rule: any, value: any, callback: any) => {
const onSave = async () => { const onSave = async () => {
await formRef.value?.validate(async (valid) => { await formRef.value?.validate(async (valid) => {
if (valid) { if (valid) {
addSign(props.username,formData).then((res) => { addSign(props.username, formData).then((res) => {
setTimeout(() => { setTimeout(() => {
visibleAdd.value = false visibleAdd.value = false
loadSignList() loadSignList()
}, 500); }, 500)
}) })
} }
}); })
} }
// 表单内容 // 表单内容
@ -293,8 +293,8 @@ const tableData = reactive({
total: 0, total: 0,
loading: false, loading: false,
data: [], data: [],
searchParam: {}, searchParam: {}
}); })
const open = () => { const open = () => {
visible.value = true visible.value = true
@ -302,19 +302,19 @@ const open = () => {
} }
// 获取列表 // 获取列表
const loadSignList = () => { const loadSignList = () => {
tableData.loading = true; tableData.loading = true
let params = { const params = {
page: tableData.page, page: tableData.page,
limit: tableData.limit, limit: tableData.limit,
...tableData.searchParam, ...tableData.searchParam
} }
getSignList(props.username, params).then((res) => { getSignList(props.username, params).then((res) => {
tableData.loading = false; tableData.loading = false
tableData.data = res.data.data; tableData.data = res.data.data
tableData.total = res.data.total tableData.total = res.data.total
}).catch(() => { }).catch(() => {
tableData.loading = false; tableData.loading = false
}); })
} }
const addEvent = () => { const addEvent = () => {
@ -328,14 +328,14 @@ const deleteTemplate = (row:any) => {
ElMessageBox.confirm(t('确定删除该签名吗？'), t('提示'), { ElMessageBox.confirm(t('确定删除该签名吗？'), t('提示'), {
confirmButtonText: t('确定'), confirmButtonText: t('确定'),
cancelButtonText: t('取消'), cancelButtonText: t('取消'),
type: 'warning', type: 'warning'
}).then(() => { }).then(() => {
deleteSign(props.username, { signatures: [row.sign] }).then((res) => { deleteSign(props.username, { signatures: [row.sign] }).then((res) => {
// loadSignList() // loadSignList()
tableData.loading = true; tableData.loading = true
setTimeout(() => { setTimeout(() => {
loadSignList() loadSignList()
},1000) }, 1000)
}) })
}) })
} }
@ -373,23 +373,23 @@ const handleSelectionChange = (val: []) => {
} }
} }
const checkSelectable = (row: any, index: number) => { const checkSelectable = (row: any, index: number) => {
return !row.is_default; // 只有不是“使用中”的行可选 return !row.is_default // 只有不是“使用中”的行可选
} }
// 批量删除 // 批量删除
const batchDeleteEvent = () => { const batchDeleteEvent = () => {
if (multipleSelection.value.length == 0) { if (multipleSelection.value.length == 0) {
ElMessage({ ElMessage({
type: "warning", type: 'warning',
message: `${ t("请选择要删除的签名") }`, message: `${t('请选择要删除的签名')}`
}) })
return return
} }
ElMessageBox.confirm(t("确定删除选中的签名吗？"), t("warning"), { ElMessageBox.confirm(t('确定删除选中的签名吗？'), t('warning'), {
confirmButtonText: t("confirm"), confirmButtonText: t('confirm'),
cancelButtonText: t("cancel"), cancelButtonText: t('cancel'),
type: "warning" type: 'warning'
}).then(() => { }).then(() => {
const signatures: any = [] const signatures: any = []
multipleSelection.value.forEach((item: any) => { multipleSelection.value.forEach((item: any) => {
@ -399,7 +399,7 @@ const batchDeleteEvent = () => {
deleteSign(props.username, { deleteSign(props.username, {
signatures signatures
}).then(() => { }).then(() => {
tableData.loading = true; tableData.loading = true
setTimeout(() => { setTimeout(() => {
loadSignList() loadSignList()
}, 1000) }, 1000)

90
admin/src/app/views/setting/components/sms_template.vue
View File

@ -143,16 +143,16 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref ,computed,reactive,onMounted,watch} from 'vue' import { ref, computed, reactive, onMounted, watch } from 'vue'
import { getTemplateList,getTemplateReportConfig,reportTemplate,templateSync ,getreportTemplateInfo,clearTemplate} from '@/app/api/notice' import { getTemplateList, getTemplateReportConfig, reportTemplate, templateSync, getreportTemplateInfo, clearTemplate } from '@/app/api/notice'
import { t } from "@/lang"; import { t } from '@/lang'
const props = defineProps({ const props = defineProps({
username: { username: {
type: String, type: String,
default: '' default: ''
}, },
signature:{ signature: {
type: String, type: String,
default: '' default: ''
} }
@ -166,19 +166,19 @@ const tableData = reactive({
data: [], // 当前页展示的数据（通过 computed 生成） data: [], // 当前页展示的数据（通过 computed 生成）
allData: [], // 原始完整数据 allData: [], // 原始完整数据
searchParam: { searchParam: {
template_id: "", template_id: '',
name: '', name: '',
status: '' status: ''
} }
}); })
const filterData = () => { const filterData = () => {
const { template_id, name, status } = tableData.searchParam; const { template_id, name, status } = tableData.searchParam
return tableData.allData.filter(item => { return tableData.allData.filter(item => {
const matchId = !template_id || String(item.template_id || '').includes(template_id); const matchId = !template_id || String(item.template_id || '').includes(template_id)
const matchName = !name || String(item.name || '').includes(name); const matchName = !name || String(item.name || '').includes(name)
const matchStatus = !status || item.audit_info.audit_status == status; const matchStatus = !status || item.audit_info.audit_status == status
return matchId && matchName && matchStatus; return matchId && matchName && matchStatus
}); })
} }
watch(() => [tableData.limit, tableData.page], () => { watch(() => [tableData.limit, tableData.page], () => {
@ -187,33 +187,33 @@ watch(() => [tableData.limit, tableData.page], () => {
// 获取列表 // 获取列表
const loadSmsTemplateList = () => { const loadSmsTemplateList = () => {
tableData.loading = true; tableData.loading = true
getTemplateList({ sms_type: 'niuyun', username: props.username }).then((res) => { getTemplateList({ sms_type: 'niuyun', username: props.username }).then((res) => {
tableData.allData = res.data; tableData.allData = res.data
tableData.page = 1; // 搜索后回到第一页 tableData.page = 1 // 搜索后回到第一页
pagedDataChange() pagedDataChange()
}).catch(() => { }).catch(() => {
tableData.loading = false; tableData.loading = false
}); })
} }
const searchFormRef = ref(null) const searchFormRef = ref(null)
const resetForm = (formRef) => { const resetForm = (formRef) => {
if (!formRef) return; if (!formRef) return
tableData.searchParam = { tableData.searchParam = {
template_id: "", template_id: '',
name: '', name: '',
status: '' status: ''
} }
loadSmsTemplateList() loadSmsTemplateList()
}; }
const pagedData = ref([]) const pagedData = ref([])
const pagedDataChange = () => { const pagedDataChange = () => {
const filtered = filterData(); // 使用筛选后的数据 const filtered = filterData() // 使用筛选后的数据
tableData.total = filtered.length; tableData.total = filtered.length
const start = (tableData.page - 1) * tableData.limit; const start = (tableData.page - 1) * tableData.limit
const end = start + tableData.limit; const end = start + tableData.limit
pagedData.value = filtered.slice(start, end); pagedData.value = filtered.slice(start, end)
tableData.loading = false; tableData.loading = false
} }
onMounted(() => { onMounted(() => {
@ -226,7 +226,7 @@ const visibleAsync = ref(false)
const repeatList = ref({}) const repeatList = ref({})
const syncEvent = () => { const syncEvent = () => {
templateSync('niuyun', props.username).then((res) => { templateSync('niuyun', props.username).then((res) => {
repeatList.value = res.data.repeat_list; repeatList.value = res.data.repeat_list
if (repeatList.value && Object.keys(repeatList.value).length > 0) { if (repeatList.value && Object.keys(repeatList.value).length > 0) {
visibleAsync.value = true visibleAsync.value = true
} else { } else {
@ -255,7 +255,7 @@ const clearEvent = (row:any) => {
ElMessageBox.confirm(t('确定要清除报备信息吗'), t('提示'), { ElMessageBox.confirm(t('确定要清除报备信息吗'), t('提示'), {
confirmButtonText: t('确定'), confirmButtonText: t('确定'),
cancelButtonText: t('取消'), cancelButtonText: t('取消'),
type: 'warning', type: 'warning'
}).then(() => { }).then(() => {
clearTemplate(props.username, row.template_id).then(() => { clearTemplate(props.username, row.template_id).then(() => {
loadSmsTemplateList() loadSmsTemplateList()
@ -271,7 +271,7 @@ const visibleReport = ref(false)
const reportData = ref({ const reportData = ref({
template_type: 1, template_type: 1,
template_key: '', template_key: '',
params_json:{} params_json: {}
}) })
const getTemplateReportConfigFn = () => { const getTemplateReportConfigFn = () => {
getTemplateReportConfig().then((res) => { getTemplateReportConfig().then((res) => {
@ -296,33 +296,32 @@ const isMarketingWithVariable = computed(() => {
watch(isMarketingWithVariable, (val) => { watch(isMarketingWithVariable, (val) => {
if (val) { if (val) {
ElMessage.error('营销推广类型不支持变量'); ElMessage.error('营销推广类型不支持变量')
} }
}); })
const reportLoading = ref(false) const reportLoading = ref(false)
const reportEvent = (row:any) => { const reportEvent = (row:any) => {
reportLoading.value = true reportLoading.value = true
let signature = props.signature const signature = props.signature
if (!signature) { if (!signature) {
ElMessage.error('请先配置签名') ElMessage.error('请先配置签名')
return
} else { } else {
if (row.template_id) { if (row.template_id) {
visibleReport.value = true; visibleReport.value = true
detail.value = row; detail.value = row
getreportTemplateInfo('niuyun', props.username, { template_key: row.key }).then((res) => { getreportTemplateInfo('niuyun', props.username, { template_key: row.key }).then((res) => {
const paramJson = res.data?.param_json ?? {}; const paramJson = res.data?.param_json ?? {}
reportData.value.template_key = res.data.template_key; reportData.value.template_key = res.data.template_key
reportData.value.template_type = Number(res.data.template_type); reportData.value.template_type = Number(res.data.template_type)
reportData.value.params_json = {}; reportData.value.params_json = {}
if (detail.value.variable) { if (detail.value.variable) {
for (const key in detail.value.variable) { for (const key in detail.value.variable) {
reportData.value.params_json[key] = paramJson[key] ?? ''; reportData.value.params_json[key] = paramJson[key] ?? ''
} }
} }
reportLoading.value = false; reportLoading.value = false
}); })
} else { } else {
visibleReport.value = true visibleReport.value = true
reportLoading.value = false reportLoading.value = false
@ -331,7 +330,6 @@ const reportEvent = (row:any) => {
reportData.value.template_key = detail.value.key reportData.value.template_key = detail.value.key
reportData.value.params_json = {} reportData.value.params_json = {}
} }
} }
} }
@ -343,10 +341,10 @@ const reportTemplateFn = () => {
// 校验每个变量是否已选择类型 // 校验每个变量是否已选择类型
const missingParams = Object.entries(detail.value.variable).some( const missingParams = Object.entries(detail.value.variable).some(
([key]) => !reportData.value.params_json[key] ([key]) => !reportData.value.params_json[key]
); )
if (missingParams) { if (missingParams) {
ElMessage.error('请为每个变量选择类型'); ElMessage.error('请为每个变量选择类型')
return; return
} }
if (detail.value.template_id) { if (detail.value.template_id) {
reportData.value.template_id = Number(detail.value.template_id) reportData.value.template_id = Number(detail.value.template_id)

4
admin/src/app/views/setting/export.vue
View File

@ -145,8 +145,8 @@ loadExportList()
* 下载导出报表 * 下载导出报表
*/ */
const downloadEvent = (data: any) => { const downloadEvent = (data: any) => {
var url = img(data.file_path); const url = img(data.file_path);
var suffix = url.substring(url.lastIndexOf("."), url.length); const suffix = url.substring(url.lastIndexOf("."), url.length);
const a = document.createElement('a') const a = document.createElement('a')
a.setAttribute('download', url) a.setAttribute('download', url)
a.setAttribute('target', '_blank') a.setAttribute('target', '_blank')

2
admin/src/app/views/setting/notice.vue
View File

@ -107,7 +107,7 @@ const loadNoticeList = () => {
noticeTableData.seller = [] noticeTableData.seller = []
res.data.forEach(item => { res.data.forEach(item => {
if (item.notice.length) { if (item.notice.length) {
const buyer = [], seller = [] const buyer = []; const seller = []
Object.keys(item.notice).forEach((key, index) => { Object.keys(item.notice).forEach((key, index) => {
const notice = item.notice[key] const notice = item.notice[key]
notice.addon_name = item.title notice.addon_name = item.title

2
admin/src/app/views/setting/notice_records.vue
View File

@ -113,7 +113,7 @@ const setTemplateList = async () => {
templateList.seller.list = [] templateList.seller.list = []
res.data.forEach(item => { res.data.forEach(item => {
if (item.notice.length) { if (item.notice.length) {
const buyer = [], seller = [] const buyer = []; const seller = []
Object.keys(item.notice).forEach((key, index) => { Object.keys(item.notice).forEach((key, index) => {
const notice = item.notice[key] const notice = item.notice[key]
notice.addon_name = item.title notice.addon_name = item.title

5
admin/src/app/views/setting/point_rule.vue
View File

@ -84,7 +84,10 @@ getPointRuleDict().then(({ data }) => {
const ruleConfigFn = () => { const ruleConfigFn = () => {
getPointRuleConfig().then(({ data }) => { getPointRuleConfig().then(({ data }) => {
!Test.empty(data) && (formData.value = data) if (!Test.empty(data)) {
Object.assign(formData.value.grant, data.grant || {})
Object.assign(formData.value.consume, data.consume || {})
}
loading.value = false loading.value = false
}).catch(() => { }).catch(() => {
loading.value = false loading.value = false

2
admin/src/app/views/setting/sms.vue
View File

@ -39,7 +39,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { defineAsyncComponent, reactive, ref } from 'vue' import { defineAsyncComponent, reactive, ref } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getSmsList ,getAccountIsLogin} from '@/app/api/notice' import { getSmsList, getAccountIsLogin } from '@/app/api/notice'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
const router = useRouter() const router = useRouter()

61
admin/src/app/views/setting/sms_niu.vue
View File

@ -135,11 +135,11 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref ,computed, onMounted} from 'vue' import { reactive, ref, computed, onMounted } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { ArrowLeft } from "@element-plus/icons-vue" import { ArrowLeft } from '@element-plus/icons-vue'
import { getAccountIsLogin,getAccountInfo,editAccount ,editSms,getSmsCaptcha,getSmsSend,enableNiusms} from '@/app/api/notice' import { getAccountIsLogin, getAccountInfo, editAccount, editSms, getSmsCaptcha, getSmsSend, enableNiusms } from '@/app/api/notice'
import { useRoute, useRouter} from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import smsNiuLogin from '@/app/views/setting/components/sms_niu_login.vue' import smsNiuLogin from '@/app/views/setting/components/sms_niu_login.vue'
import smsTemplate from '@/app/views/setting/components/sms_template.vue' import smsTemplate from '@/app/views/setting/components/sms_template.vue'
import smsRechargeRecord from '@/app/views/setting/components/sms_recharge_record.vue' import smsRechargeRecord from '@/app/views/setting/components/sms_recharge_record.vue'
@ -173,7 +173,7 @@ const backRecharge = () => {
isRecharge.value = false isRecharge.value = false
getAccountIsLoginFn() getAccountIsLoginFn()
} }
const getAccountIsLoginFn =()=> { const getAccountIsLoginFn = () => {
loading.value = true loading.value = true
getAccountIsLogin().then(res => { getAccountIsLogin().then(res => {
isLoginStatus.value = res.data.is_login isLoginStatus.value = res.data.is_login
@ -190,7 +190,6 @@ const getAccountIsLoginFn =()=> {
loading.value = false loading.value = false
isInit.value = true isInit.value = true
} }
}).catch(err => { }).catch(err => {
loading.value = false loading.value = false
isInit.value = true isInit.value = true
@ -206,7 +205,7 @@ const openDialog = () => {
const beforeChangeIsEnable = (val) => { const beforeChangeIsEnable = (val) => {
if (!isInit.value) return false if (!isInit.value) return false
let enable = is_enable.value == 1 ? 0 : 1 const enable = is_enable.value == 1 ? 0 : 1
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
enableNiusms({ is_enable: enable }).then(() => { enableNiusms({ is_enable: enable }).then(() => {
resolve(true) resolve(true)
@ -218,7 +217,7 @@ const beforeChangeIsEnable = (val) => {
const handleSelectTemplate = (val) => { const handleSelectTemplate = (val) => {
loading.value = true loading.value = true
editAccount(username.value,{signature: val.sign}).then(res=>{ editAccount(username.value, { signature: val.sign }).then(res => {
getAccountIsLoginFn() getAccountIsLoginFn()
}) })
} }
@ -269,48 +268,48 @@ const changeFormRules = computed(() => {
} }
], ],
captcha_code: [ captcha_code: [
{ required: true, message: '请输入验证码', trigger: 'blur' }, { required: true, message: '请输入验证码', trigger: 'blur' }
], ],
code: [ code: [
{ required: true, message: '请输入动态码', trigger: 'blur' }, { required: true, message: '请输入动态码', trigger: 'blur' }
] ]
}; }
}); })
const sending = ref(false); // 发送中状态 const sending = ref(false) // 发送中状态
const countdown = ref(0); // 倒计时秒数 const countdown = ref(0) // 倒计时秒数
const getSmsSendFn = () => { const getSmsSendFn = () => {
if (countdown.value > 0 || sending.value) return; // 正在倒计时或发送中，直接返回 if (countdown.value > 0 || sending.value) return // 正在倒计时或发送中，直接返回
changeFormRef.value.validateField(['captcha_code'], (valid) => { changeFormRef.value.validateField(['captcha_code'], (valid) => {
if (!valid) return; if (!valid) return
sending.value = true; // 标记为发送中 sending.value = true // 标记为发送中
const params = { const params = {
mobile: formData.mobiles, mobile: formData.mobiles,
captcha_key: changeFormData.value.captcha_key, captcha_key: changeFormData.value.captcha_key,
captcha_code: changeFormData.value.captcha_code captcha_code: changeFormData.value.captcha_code
}; }
getSmsSend(params).then((res) => { getSmsSend(params).then((res) => {
changeFormData.value.key = res.data.key; changeFormData.value.key = res.data.key
startCountdown(60); // 启动60秒倒计时 startCountdown(60) // 启动60秒倒计时
}).catch((err) => { }).catch((err) => {
getSmsCaptchaFn() getSmsCaptchaFn()
sending.value = false; sending.value = false
}).finally(() => { }).finally(() => {
sending.value = false; // 无论成功失败都重置发送状态 sending.value = false // 无论成功失败都重置发送状态
}); })
}); })
}; }
// 启动倒计时 // 启动倒计时
const startCountdown = (seconds) => { const startCountdown = (seconds) => {
countdown.value = seconds; countdown.value = seconds
const timer = setInterval(() => { const timer = setInterval(() => {
countdown.value--; countdown.value--
if (countdown.value <= 0) { if (countdown.value <= 0) {
clearInterval(timer); clearInterval(timer)
} }
}, 1000); }, 1000)
} }
const onSave = async () => { const onSave = async () => {
@ -326,7 +325,7 @@ const onSave = async () => {
} }
} else { } else {
params = { params = {
new_mobile: changeFormData.value.new_mobile, new_mobile: changeFormData.value.new_mobile
} }
} }
@ -335,7 +334,7 @@ const onSave = async () => {
getAccountIsLoginFn() getAccountIsLoginFn()
}) })
} }
}); })
} }
const back = () => { const back = () => {

2
admin/src/app/views/setting/sms_niu_pay_result.vue
View File

@ -26,7 +26,7 @@
import { onMounted, onBeforeUnmount, ref } from 'vue' import { onMounted, onBeforeUnmount, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { t } from '@/lang' import { t } from '@/lang'
import { ArrowLeft } from "@element-plus/icons-vue" import { ArrowLeft } from '@element-plus/icons-vue'
import { getOrderPayStatus } from '@/app/api/notice' import { getOrderPayStatus } from '@/app/api/notice'
const router = useRouter() const router = useRouter()

2
admin/src/app/views/setting/sms_records.vue
View File

@ -106,7 +106,7 @@ const setTemplateList = async () => {
templateList.seller.list = [] templateList.seller.list = []
res.data.forEach(item => { res.data.forEach(item => {
if (item.notice.length) { if (item.notice.length) {
const buyer = [], seller = [] const buyer = []; const seller = []
Object.keys(item.notice).forEach((key, index) => { Object.keys(item.notice).forEach((key, index) => {
const notice = item.notice[key] const notice = item.notice[key]
notice.addon_name = item.title notice.addon_name = item.title

Some files were not shown because too many files have changed in this diff Show More