github/niucloud-admin
1
0
Fork 0
mirror of https://gitee.com/niucloud-team/niucloud-admin.git synced 2026-02-03 16:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

up admin

Browse Source
This commit is contained in:
全栈小学生 2025-06-26 15:03:06 +08:00
parent 43645fa23c
commit 58ad1f489b
68 changed files with 1123 additions and 594 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/src/app/api/addon.ts
View File

@ -99,6 +99,15 @@ export function getShowApp() {
return request.get('addon/list/showapp') return request.get('addon/list/showapp')
} }
/**
* 获取营销列表
* @returns
*/
export function getShowMarketing() {
return request.get('showMarketing')
}
export function getAddonInit() { export function getAddonInit() {
return request.get('addon/init') return request.get('addon/init')
} }

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

@ -125,6 +125,14 @@ export function editMemberDetail(params: Record<string, any>) {
return request.put(`member/member/modify/${params.member_id}/${params.field}`, params, { showSuccessMessage: true }) return request.put(`member/member/modify/${params.member_id}/${params.field}`, params, { showSuccessMessage: true })
} }
/**
* 会员批量操作
* @param params
*/
export function memberBatchModify(params: Record<string, any>) {
return request.post(`member/member/batch_modify`, params, { showSuccessMessage: true })
}
/***************************************************** 会员零钱 ****************************************************/ /***************************************************** 会员零钱 ****************************************************/

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

@ -61,6 +61,14 @@ export function deleteRole(roleId: number) {
return request.delete(`sys/role/${ roleId }`, { showSuccessMessage: true }) return request.delete(`sys/role/${ roleId }`, { showSuccessMessage: true })
} }
/**
* 修改角色状态
* @param params
*/
export function modifyRoleStatus(params: Record<string, any>) {
return request.put(`sys/role/status`, params, { showSuccessMessage: true })
}
/** /**
* 全部分组 * 全部分组
* @returns * @returns

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

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

8
admin/src/app/lang/zh-cn/diy.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": "页面名称用于后台显示",

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

@ -362,7 +362,7 @@
"imageLimitErrorTips":"限制数量格式输入错误", "imageLimitErrorTips":"限制数量格式输入错误",
"imageLimitErrorTipsTwo":"限制数量不能小于0", "imageLimitErrorTipsTwo":"限制数量不能小于0",
"imageLimitErrorTipsThree":"限制数量必须大于0", "imageLimitErrorTipsThree":"限制数量必须大于0",
"imafeLimitErrorTipsFour":"限制数量最大不能超过9", "imageLimitErrorTipsFour":"限制数量最大不能超过9",
"defaultValueTips":"设置后，默认值会自动填充到输入框，填表人可在此基础上进行修改。", "defaultValueTips":"设置后，默认值会自动填充到输入框，填表人可在此基础上进行修改。",
"defaultErrorTips":"默认值格式输入错误", "defaultErrorTips":"默认值格式输入错误",

164
admin/src/app/lang/zh-cn/member.member.json
View File

@ -1,82 +1,86 @@
{ {
"registerChannel":"注册来源", "registerChannel": "注册来源",
"nickname":"会员昵称", "nickname": "会员昵称",
"memberNo":"会员编号", "memberNo": "会员编号",
"mobile":"手机号", "mobile": "手机号",
"createTime":"注册时间", "createTime": "注册时间",
"lastVisitTime":"最后访问时间", "lastVisitTime": "最后访问时间",
"addMember":"添加会员", "addMember": "添加会员",
"nickNamePlaceholder":"请输入会员昵称", "nickNamePlaceholder": "请输入会员昵称",
"mobilePlaceholder":"请输入手机号", "mobilePlaceholder": "请输入手机号",
"channelPlaceholder":"请选择注册类型", "channelPlaceholder": "请选择注册类型",
"memberNoPlaceholder":"请选择会员编号", "memberNoPlaceholder": "请选择会员编号",
"memberDeleteTips" : "确定要删除该会员吗？", "memberDeleteTips": "确定要删除该会员吗？",
"edit": "编辑", "edit": "编辑",
"memberDelete":"删除", "memberDelete": "删除",
"adjust":"调整", "adjust": "调整",
"startDate": "开始时间", "startDate": "开始时间",
"endDate": "结束时间", "endDate": "结束时间",
"essentialInfo": "基本信息", "essentialInfo": "基本信息",
"accountInfo": "账户信息", "accountInfo": "账户信息",
"registeredSource": "注册来源", "registeredSource": "注册来源",
"memberLabel": "会员标签", "memberLabel": "会员标签",
"urserName": "用户名", "urserName": "用户名",
"point": "积分", "point": "积分",
"balance": "余额", "balance": "余额",
"growth": "成长值", "growth": "成长值",
"memo":"备注", "memo": "备注",
"adjustPoint":"调整积分", "adjustPoint": "调整积分",
"detaBirth": "出生日期", "detaBirth": "出生日期",
"sex": "性别", "sex": "性别",
"wxUnionid": "微信unionid", "wxUnionid": "微信unionid",
"weappOpenid": "微信小程序openid", "weappOpenid": "微信小程序openid",
"wxOpenid": "微信用户openid", "wxOpenid": "微信用户openid",
"head": "会员头像", "head": "会员头像",
"username": "用户名", "username": "用户名",
"usernamePlaceholder": "请输入用户名", "usernamePlaceholder": "请输入用户名",
"password": "密码", "password": "密码",
"passwordCopy": "确认密码", "passwordCopy": "确认密码",
"passwordPlaceholder": "请输入密码", "passwordPlaceholder": "请输入密码",
"doubleCipherHint": "输入的两次密码不一致", "doubleCipherHint": "输入的两次密码不一致",
"memberNoHint":"会员编号只能输入字母和数字", "memberNoHint": "会员编号只能输入字母和数字",
"mobileHint": "请输入正确的手机号!", "mobileHint": "请输入正确的手机号!",
"memberLabelTag": "标签", "memberLabelTag": "标签",
"setLabel": "标签", "setLabel": "标签",
"memberLabelPlaceholder": "请选择会员标签", "memberLabelPlaceholder": "请选择会员标签",
"memberInfo":"会员信息", "memberInfo": "会员信息",
"memberInfoPlaceholder":"请输入会员编号/昵称/手机号", "memberInfoPlaceholder": "请输入会员编号/昵称/手机号",
"lock": "锁定", "lock": "锁定",
"normal": "正常", "normal": "正常",
"memberLevel": "会员等级", "memberLevel": "会员等级",
"memberLevelPlaceholder": "请选择会员等级", "memberLevelPlaceholder": "请选择会员等级",
"adjustType":"调整类型", "adjustType": "调整类型",
"adjustReduceBalance":"减少余额", "adjustReduceBalance": "减少余额",
"adjustAddBalance":"增加余额", "adjustAddBalance": "增加余额",
"adjustReducePoint":"减少积分", "adjustReducePoint": "减少积分",
"adjustAddPoint":"增加积分", "adjustAddPoint": "增加积分",
"adjustBalance":"调整余额", "adjustBalance": "调整余额",
"currBalance":"当前余额", "currBalance": "当前余额",
"currPoint":"当前积分", "currPoint": "当前积分",
"adjustPlaceholder":"请输入调整数量", "adjustPlaceholder": "请输入调整数量",
"memoPlaceholder":"请输入备注", "memoPlaceholder": "请输入备注",
"adjustBalancePlaceholder":"请输入调整余额", "adjustBalancePlaceholder": "请输入调整余额",
"adjustPointPlaceholder":"请输入调整积分", "adjustPointPlaceholder": "请输入调整积分",
"adjustBalanceMaxAccountMessage":"调整后余额需大于0", "adjustBalanceMaxAccountMessage": "调整后余额需大于0",
"adjustPointMaxAccountMessage":"调整后积分需大于0", "adjustPointMaxAccountMessage": "调整后积分需大于0",
"birthday": "出生日期", "birthday": "出生日期",
"birthdayTip": "请输入出生日期", "birthdayTip": "请输入出生日期",
"headimg": "会员头像", "headimg": "会员头像",
"updateMember": "编辑会员信息", "updateMember": "编辑会员信息",
"notAvailable":"暂无", "notAvailable": "暂无",
"girlSex":"女", "girlSex": "女",
"manSex":"男", "manSex": "男",
"secrecySex":"保密", "secrecySex": "保密",
"detail":"详情", "detail": "详情",
"accumulative":"累计", "accumulative": "累计",
"money":"可提现余额", "money": "可提现余额",
"commission":"佣金", "commission": "佣金",
"memberNull":"未读取到会员详情信息", "memberNull": "未读取到会员详情信息",
"memberLevelUpdate": "修改等级至", "memberLevelUpdate": "修改等级至",
"memberLevelUpdateTips": "该操作只会修改会员等级不会发放等级礼包" "memberLevelUpdateTips": "该操作只会修改会员等级不会发放等级礼包",
"idCard": "身份证",
"idCardPlaceholder": "请输入身份证号",
"remark": "备注",
"remarkPlaceholder": "请输入备注",
"batchEmptySelectedTips": "请选择要操作的数据"
} }

110
admin/src/app/lang/zh-cn/member.member_detail.json
View File

@ -1,55 +1,59 @@
{ {
"adjustType":"调整类型", "adjustType": "调整类型",
"adjustReduceBalance":"减少余额", "adjustReduceBalance": "减少余额",
"adjustAddBalance":"增加余额", "adjustAddBalance": "增加余额",
"adjustReducePoint":"减少积分", "adjustReducePoint": "减少积分",
"adjustAddPoint":"增加积分", "adjustAddPoint": "增加积分",
"adjustBalance":"调整余额", "adjustBalance": "调整余额",
"memberNo":"会员编号", "memberNo": "会员编号",
"currBalance":"当前余额", "currBalance": "当前余额",
"currPoint":"当前积分", "currPoint": "当前积分",
"memo":"备注", "memo": "备注",
"adjustPlaceholder":"请输入调整数量", "adjustPlaceholder": "请输入调整数量",
"memoPlaceholder":"请输入备注", "memoPlaceholder": "请输入备注",
"adjustBalancePlaceholder":"请输入调整余额", "adjustBalancePlaceholder": "请输入调整余额",
"adjustPointPlaceholder":"请输入调整积分", "adjustPointPlaceholder": "请输入调整积分",
"adjustBalanceMaxAccountMessage":"调整后余额需大于0", "adjustBalanceMaxAccountMessage": "调整后余额需大于0",
"adjustPointMaxAccountMessage":"调整后积分需大于0", "adjustPointMaxAccountMessage": "调整后积分需大于0",
"birthday": "出生日期", "birthday": "出生日期",
"birthdayTip": "请输入出生日期", "birthdayTip": "请输入出生日期",
"sex": "性别", "sex": "性别",
"sexPlaceholder": "请选择性别", "sexPlaceholder": "请选择性别",
"headimg": "会员头像", "headimg": "会员头像",
"wxUnionid": "微信unionid", "wxUnionid": "微信unionid",
"weappOpenid": "微信小程序openid", "weappOpenid": "微信小程序openid",
"wxOpenid": "微信公众号openid", "wxOpenid": "微信公众号openid",
"memberLabel": "会员标签", "memberLabel": "会员标签",
"memberLabelPlaceholder": "请选择会员标签", "memberLabelPlaceholder": "请选择会员标签",
"nickNamePlaceholder": "请输入会员名称", "nickNamePlaceholder": "请输入会员名称",
"updateMember": "编辑会员信息", "updateMember": "编辑会员信息",
"notAvailable":"暂无", "notAvailable": "暂无",
"girlSex":"女", "girlSex": "女",
"manSex":"男", "manSex": "男",
"secrecySex":"保密", "secrecySex": "保密",
"essentialInfo": "基本信息", "essentialInfo": "基本信息",
"accountInfo": "账户信息", "accountInfo": "账户信息",
"urserName": "用户名", "urserName": "用户名",
"nickname":"会员昵称", "nickname": "会员昵称",
"registeredSource": "注册来源", "registeredSource": "注册来源",
"lastVisitTime":"最后登录时间", "lastVisitTime": "最后登录时间",
"point": "积分", "point": "积分",
"balance": "余额", "balance": "余额",
"growth": "成长值", "growth": "成长值",
"adjust":"调整", "adjust": "调整",
"mobile":"手机号", "mobile": "手机号",
"detail":"详情", "detail": "详情",
"accumulative":"累计", "accumulative": "累计",
"money":"可提现余额", "money": "可提现余额",
"adjustPoint":"调整积分", "adjustPoint": "调整积分",
"commission":"佣金", "commission": "佣金",
"memberNull":"未读取到会员详情信息", "memberNull": "未读取到会员详情信息",
"memberLevel": "会员等级", "memberLevel": "会员等级",
"memberLevelUpdate": "修改等级至", "memberLevelUpdate": "修改等级至",
"memberLevelUpdateTips": "该操作只会修改会员等级不会发放等级礼包", "memberLevelUpdateTips": "该操作只会修改会员等级不会发放等级礼包",
"memberLevelPlaceholder": "请选择会员等级" "memberLevelPlaceholder": "请选择会员等级",
"idCard": "身份证",
"idCardPlaceholder": "请输入身份证号",
"remark": "备注",
"remarkPlaceholder": "请输入备注"
} }

6
admin/src/app/lang/zh-cn/setting.member.json
View File

@ -7,5 +7,9 @@
"prefixTips": "编码格式如：", "prefixTips": "编码格式如：",
"length": "编码长度", "length": "编码长度",
"lengthPlaceholder": "请输入编码长度", "lengthPlaceholder": "请输入编码长度",
"lengthTips": "编码长度包含前缀，去除前缀最少不能低于4位,最多不能超过30位" "lengthTips": "编码长度包含前缀，去除前缀最少不能低于4位,最多不能超过30位",
"diyForm": "万能表单",
"diyFormPlaceholder": "请选择万能表单",
"addDiyForm": "添加表单",
"personalForm": "个人资料"
} }

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

@ -6,35 +6,33 @@
<template v-if="Object.keys(appList).length"> <template v-if="Object.keys(appList).length">
<template v-for="(item, index) in appList" :key="index + 'b'"> <template v-for="(item, index) in appList" :key="index + 'b'">
<template v-if="item.list.length"> <div class="flex justify-between items-center" v-if="item.list.length">
<div class="flex justify-between items-center"> <span class="text-page-title">{{ item.title }}</span>
<span class="text-page-title">{{ item.title }}</span> </div>
</div>
<div class="flex flex-wrap plug-list pb-10 plug-large"> <div class="flex flex-wrap plug-list pb-10 plug-large" v-if="item.list.length">
<div class="cursor-pointer mt-[20px] mr-4 bg-[#f7f7f7]" v-for="(childItem,childIndex) in item.list" :key="childIndex" @click="toLink(childItem)"> <div class="cursor-pointer mt-[20px] mr-4 bg-[#f7f7f7]" v-for="(childItem,childIndex) in item.list" :key="childIndex" @click="toLink(childItem)">
<div class="w-[264px] flex py-[20px] px-[17px] app-item relative"> <div class="w-[264px] flex py-[20px] px-[17px] app-item relative">
<el-image class="w-[40px] h-[40px] mr-[10px]" :src="img(childItem.icon)" fit="contain"> <el-image class="w-[40px] h-[40px] mr-[10px]" :src="img(childItem.icon)" fit="contain">
<template #error> <template #error>
<div class="image-slot"> <div class="image-slot">
<img class="w-[40px] h-[40px]" src="@/app/assets/images/index/app_default.png" /> <img class="w-[40px] h-[40px]" src="@/app/assets/images/index/app_default.png" />
</div>
</template>
</el-image>
<div class="flex flex-col justify-between w-[180px]">
<div class="text-[14px] flex items-center">
<span class="app-text max-w-[170px]">{{ childItem.title }}</span>
<span class="iconfont iconxiaochengxu2 text-[#00b240] ml-[4px] !text-[14px]"></span>
</div> </div>
<!-- <el-icon color="#666"> </template>
<QuestionFilled /> </el-image>
</el-icon> --> <div class="flex flex-col justify-between w-[180px]">
<p class="app-text text-[12px] text-[#999]">{{childItem.desc}}</p> <div class="text-[14px] flex items-center">
<span class="app-text max-w-[170px]">{{ childItem.title }}</span>
<!-- <span class="iconfont iconxiaochengxu2 text-[#00b240] ml-[4px] !text-[14px]"></span>-->
</div> </div>
<!-- <el-icon color="#666">
<QuestionFilled />
</el-icon> -->
<p class="app-text text-[12px] text-[#999]">{{childItem.desc}}</p>
</div> </div>
</div> </div>
</div> </div>
</template> </div>
</template> </template>
</template> </template>

88
admin/src/app/views/app/marketing.vue Normal file
View File

@ -0,0 +1,88 @@
<template>
<!--营销管理-->
<div class="main-container" v-loading="loading">
<el-card class="box-card !border-none" shadow="never">
<template v-if="Object.keys(marketingList).length">
<template v-for="(item, index) in marketingList" :key="index + 'b'">
<div class="flex justify-between items-center">
<span class="text-page-title">{{ item.title }}</span>
</div>
<div class="flex flex-wrap plug-list pb-10 plug-large">
<div class="cursor-pointer mt-[20px] mr-4 bg-[#f7f7f7]" v-for="(childItem,childIndex) in item.list" :key="childIndex" @click="toLink(childItem)">
<div class="w-[264px] flex py-[20px] px-[17px] app-item relative">
<el-image class="w-[40px] h-[40px] mr-[10px]" :src="img(childItem.icon)" fit="contain">
<template #error>
<div class="image-slot">
<img class="w-[40px] h-[40px]" src="@/app/assets/images/index/app_default.png" />
</div>
</template>
</el-image>
<div class="flex flex-col justify-between w-[180px]">
<div class="text-[14px] flex items-center">
<span class="app-text max-w-[170px]">{{ childItem.title }}</span>
<!-- <span class="iconfont iconxiaochengxu2 text-[#00b240] ml-[4px] !text-[14px]"></span>-->
</div>
<!-- <el-icon color="#666">
<QuestionFilled />
</el-icon> -->
<p class="app-text text-[12px] text-[#999]">{{childItem.desc}}</p>
</div>
</div>
</div>
</div>
</template>
</template>
<div class="empty flex items-center justify-center" v-if="!loading && !Object.keys(marketingList).length">
<el-empty :description="t('emptyAppData')" />
</div>
</el-card>
</div>
</template>
<script lang="ts" setup>
import { ref } from 'vue'
import { getShowMarketing } from '@/app/api/addon'
import { img } from '@/utils/common'
import useUserStore from '@/stores/modules/user'
import { useRouter } from 'vue-router'
import { t } from '@/lang'
const addonIndexRoute = useUserStore().addonIndexRoute
const router = useRouter()
const marketingList = ref<Record<string, any>[]>([])
const loading = ref(true)
const getMarketingList = async () => {
const res = await getShowMarketing()
marketingList.value = res.data
loading.value = false
}
getMarketingList()
const toLink = (item: any) => {
if (item.url) {
router.push(item.url)
} else {
addonIndexRoute[item.key] && router.push({ name: addonIndexRoute[item.key] })
}
}
</script>
<style lang="scss" scoped>
.app-text {
overflow: hidden;
/* 超出部分隐藏 */
white-space: nowrap;
/* 禁止文本换行 */
text-overflow: ellipsis;
/* 显示省略号 */
}
.app-item:hover{
transition: 0.5s;
box-shadow: 0px 2px 8px 0px rgba(0,0,0,0.1);
}
</style>

1
admin/src/app/views/auth/components/user-log-detail.vue
View File

@ -4,6 +4,7 @@
<el-descriptions :column="1"> <el-descriptions :column="1">
<el-descriptions-item :label="t('username')" label-align="right">{{logData.username}}</el-descriptions-item> <el-descriptions-item :label="t('username')" label-align="right">{{logData.username}}</el-descriptions-item>
<el-descriptions-item :label="t('ip')" label-align="right">{{logData.ip}}</el-descriptions-item> <el-descriptions-item :label="t('ip')" label-align="right">{{logData.ip}}</el-descriptions-item>
<el-descriptions-item :label="t('operation')" label-align="right">{{logData.operation}}</el-descriptions-item>
<el-descriptions-item :label="t('url')" label-align="right"><span class="break-all">{{logData.url}}</span></el-descriptions-item> <el-descriptions-item :label="t('url')" label-align="right"><span class="break-all">{{logData.url}}</span></el-descriptions-item>
<el-descriptions-item :label="t('type')" label-align="right">{{logData.type}}</el-descriptions-item> <el-descriptions-item :label="t('type')" label-align="right">{{logData.type}}</el-descriptions-item>
<el-descriptions-item :label="t('params')" label-align="right"> <el-descriptions-item :label="t('params')" label-align="right">

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

@ -39,6 +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('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">

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

@ -3,9 +3,9 @@
<div class="main-container"> <div class="main-container">
<el-card class="box-card !border-none" 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>
</div> </div> -->
<div class="flex justify-between items-center mt-[20px]"> <div class="flex justify-between items-center mt-[20px]">
<el-form :inline="true" :model="roleTableData.searchParam" ref="searchFormRef"> <el-form :inline="true" :model="roleTableData.searchParam" ref="searchFormRef">
@ -28,8 +28,8 @@
<el-table-column prop="role_name" :label="t('roleName')" /> <el-table-column prop="role_name" :label="t('roleName')" />
<el-table-column :label="t('status')"> <el-table-column :label="t('status')">
<template #default="{ row }"> <template #default="{ row }">
<el-tag type="success" v-if="row.status == 1">{{ row.status_name }}</el-tag> <el-tag type="success" v-if="row.status == 1" @click="modifyRoleStatusEvent(row.role_id, 0)" class="cursor-pointer">{{ row.status_name }}</el-tag>
<el-tag type="error" v-if="row.status == 0">{{ row.status_name }}</el-tag> <el-tag type="error" v-else @click="modifyRoleStatusEvent(row.role_id, 1)" class="cursor-pointer">{{ row.status_name }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="create_time" :label="t('createTime')"></el-table-column> <el-table-column prop="create_time" :label="t('createTime')"></el-table-column>
@ -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 } 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'
@ -136,6 +136,25 @@ const deleteEvent = (id: number) => {
}) })
}) })
} }
const isRepeat = ref(false)
// 修改状态
const modifyRoleStatusEvent = (role_id: any, status: any) => {
if (isRepeat.value) return
isRepeat.value = true
modifyRoleStatus({
role_id,
status
}).then((res) => {
loadRoleList()
isRepeat.value = false
}).catch(() => {
isRepeat.value = false
})
}
</script> </script>
<style lang="scss" scoped></style> <style lang="scss" scoped>
</style>

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

@ -3,31 +3,6 @@
<div class="content-wrap float-btn" v-show="diyStore.editTab == 'content'"> <div class="content-wrap float-btn" v-show="diyStore.editTab == 'content'">
<div class="edit-attr-item-wrap"> <div class="edit-attr-item-wrap">
<!-- <h3 class="mb-[10px]">{{ t('selectStyle') }}</h3>
<el-form label-width="80px" class="px-[10px]">
<el-form-item :label="t('selectStyle')" class="flex">
<span class="text-primary flex-1 cursor-pointer" @click="showCouponStyle">{{ diyStore.editComponent.styleName }}</span>
<el-icon>
<ArrowRight />
</el-icon>
</el-form-item>
</el-form>
<el-dialog v-model="showCouponDialog" :title="t('selectStyle')" width="500px">
<div class="flex flex-wrap">
<template v-for="(item,index) in couponStyleList" :key="index">
<div :class="{ 'border-primary': selectCouponStyle.value == item.value }" @click="changeCouponStyle(item)" class="flex items-center justify-center overflow-hidden w-[200px] h-[100px] mr-[12px] cursor-pointer border bg-gray-50">
<img :src="img(item.url)" />
</div>
</template>
</div>
<template #footer>
<span class="dialog-footer">
<el-button @click="showCouponDialog = false">{{ t('cancel') }}</el-button>
<el-button type="primary" @click="confirmCouponStyle">{{ t('confirm') }}</el-button>
</span>
</template>
</el-dialog> -->
<h3 class="mb-[10px]">{{ t('floatBtnButton') }}</h3> <h3 class="mb-[10px]">{{ t('floatBtnButton') }}</h3>
<el-form label-width="80px" class="px-[10px]"> <el-form label-width="80px" class="px-[10px]">
<el-form-item :label="t('floatBtnButton')"> <el-form-item :label="t('floatBtnButton')">
@ -98,7 +73,6 @@ import { ref, reactive, onMounted, nextTick } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import Sortable from 'sortablejs' import Sortable from 'sortablejs'
import useDiyStore from '@/stores/modules/diy' import useDiyStore from '@/stores/modules/diy'
import { img } from '@/utils/common'
import { range } from 'lodash-es' import { range } from 'lodash-es'
const diyStore = useDiyStore() const diyStore = useDiyStore()
@ -117,48 +91,6 @@ diyStore.editComponent.verify = (index: number) => {
return res return res
} }
/*********** 风格样式 **********/
const showCouponDialog = ref(false)
const selectCouponStyle = reactive({
title: diyStore.editComponent.styleName,
value: diyStore.editComponent.style
})
const showCouponStyle = () => {
showCouponDialog.value = true
selectCouponStyle.title = diyStore.editComponent.styleName;
selectCouponStyle.value = diyStore.editComponent.style;
}
// const couponStyleList = reactive([
// {
// url: 'addon/shop/diy/goods_coupon/style-1.png',
// title: '风格1',
// value: 'style-1'
// },
// {
// url: 'addon/shop/diy/goods_coupon/style-2.png',
// title: '风格2',
// value: 'style-2'
// }
// ])
//风格点击
const changeCouponStyle = (item: any) => {
selectCouponStyle.title = item.title;
selectCouponStyle.value = item.value;
}
//确认风格
const confirmCouponStyle = () => {
diyStore.editComponent.styleName = selectCouponStyle.title;
diyStore.editComponent.style = selectCouponStyle.value;
showCouponDialog.value = false
selectTemplate.value = {
name: '右下',
src: 'iconyouxiajiao',
className: 'lowerRight'
};
diyStore.editComponent.bottomPosition = 'lowerRight'
}
/******** end *******/
const templateList = ref([ const templateList = ref([
{ {
name: '左上', name: '左上',

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

@ -65,6 +65,29 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="edit-attr-item-wrap">
<h3 class="mb-[10px]">{{ t('popWindowAds') }}</h3>
<el-form label-width="80px" class="px-[10px]">
<el-form-item :label="t('popAdsIsEnabled')" class="display-block">
<el-switch v-model="diyStore.global.popWindow.show" />
</el-form-item>
<div v-show="diyStore.global.popWindow.show">
<el-form-item :label="t('popAdsType')">
<el-radio-group v-model="diyStore.global.popWindow.count">
<el-radio label="once">{{ t('firstPop') }}</el-radio>
<el-radio label="always">{{ t('everyTimePops') }}</el-radio>
</el-radio-group>
<div class="text-sm text-gray-400">{{ t('popWindowCountTips') }}</div>
</el-form-item>
<el-form-item :label="t('popAdsImage')">
<upload-image v-model="diyStore.global.popWindow.imgUrl" :limit="1" @change="selectImg" />
</el-form-item>
<el-form-item :label="t('popAdsLink')">
<diy-link v-model="diyStore.global.popWindow.link" />
</el-form-item>
</div>
</el-form>
</div>
<el-dialog v-model="showDialog" :title="t('selectStyle')" width="800px"> <el-dialog v-model="showDialog" :title="t('selectStyle')" width="800px">
@ -180,7 +203,6 @@ const inputBoth = (value: any) => {
diyStore.value.forEach((item, index) => { diyStore.value.forEach((item, index) => {
item.margin.both = value; item.margin.both = value;
}) })
} }
watch( watch(
@ -215,6 +237,15 @@ const changeStyle = () => {
showDialog.value = false showDialog.value = false
} }
const selectImg = (url: any) => {
const image = new Image()
image.src = img(url)
image.onload = async() => {
diyStore.global.popWindow.imgWidth = image.width
diyStore.global.popWindow.imgHeight = image.height
}
}
defineExpose({}) defineExpose({})
</script> </script>

2
admin/src/app/views/diy_form/components/edit-form-image.vue
View File

@ -67,7 +67,7 @@ diyStore.editComponent.verify = (index: number) => {
} }
if (diyStore.value[index].limit > 9) { if (diyStore.value[index].limit > 9) {
res.code = false res.code = false
res.message = t('imafeLimitErrorTipsFour') res.message = t('imageLimitErrorTipsFour')
return res return res
} }
return res return res

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

@ -177,7 +177,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="right" fixed="right" width="120"> <el-table-column align="right" fixed="right" width="120">
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" link @click="successfulAuditFn(row)" v-if="row.status == 1"> {{ t('successfulAudit') }}</el-button> <el-button type="primary" link @click="successfulAuditFn(row)" v-if="row.status == 1"> {{ t('successfulAudit') }}</el-button>
<el-button type="primary" link @click="auditFailureFn(row)" v-if="row.status == 1"> {{ t('auditFailure') }}</el-button> <el-button type="primary" link @click="auditFailureFn(row)" v-if="row.status == 1"> {{ t('auditFailure') }}</el-button>

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

@ -52,7 +52,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, computed,defineEmits } from 'vue' import { reactive, ref, computed,defineEmits } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getPayRefundInfo, getRefundType, getRefundTransfer } from '@/app/api/pay' import { getPayRefundInfo, getRefundType, getRefundTransfer } from '@/app/api/pay'
import { FormInstance } from 'element-plus' import { FormInstance } from 'element-plus'

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

@ -10,8 +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="payRefundTable.searchParam" ref="searchFormRef"> <el-form :inline="true" :model="payRefundTable.searchParam" ref="searchFormRef">
<el-form-item :label="t('refundNo')" prop="refund_no"> <el-form-item :label="t('refundNo')" prop="refund_no">
<el-input v-model.trim="payRefundTable.searchParam.refund_no" <el-input v-model.trim="payRefundTable.searchParam.refund_no" :placeholder="t('refundNoPlaceholder')" />
:placeholder="t('refundNoPlaceholder')" />
</el-form-item> </el-form-item>
<el-form-item :label="t('status')" prop="status"> <el-form-item :label="t('status')" prop="status">
<el-select v-model="payRefundTable.searchParam.status" clearable class="input-width"> <el-select v-model="payRefundTable.searchParam.status" clearable class="input-width">

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

@ -332,10 +332,20 @@
</div> </div>
<!-- </el-scrollbar> --> <!-- </el-scrollbar> -->
<div class="flex justify-end"> <div class="flex justify-end">
<el-tooltip effect="dark" :content="t('installTips')" placement="top"> <el-tooltip effect="dark" placement="top">
<template #content>
<div class="w-[400px]">
{{t("installTips")}}
</div>
</template>
<el-button :disabled="!installCheckResult.is_pass || cloudInstalling" :loading="localInstalling" @click="handleInstall">{{ t("localInstall") }}</el-button> <el-button :disabled="!installCheckResult.is_pass || cloudInstalling" :loading="localInstalling" @click="handleInstall">{{ t("localInstall") }}</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="t('cloudInstallTips')" placement="top"> <el-tooltip effect="dark" placement="top">
<template #content>
<div class="w-[400px]">
{{t("cloudInstallTips")}}
</div>
</template>
<el-button type="primary" :disabled="!installCheckResult.is_pass || localInstalling" :loading="cloudInstalling" @click="handleCloudInstall">{{ t("cloudInstall") }}</el-button> <el-button type="primary" :disabled="!installCheckResult.is_pass || localInstalling" :loading="cloudInstalling" @click="handleCloudInstall">{{ t("cloudInstall") }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
@ -503,11 +513,6 @@ const frameworkVersion = ref('')
const upgradeLogRef = ref<any>(null) const upgradeLogRef = ref<any>(null)
getVersions().then((res) => { getVersions().then((res) => {
frameworkVersion.value = res.data.version.version frameworkVersion.value = res.data.version.version
})
const treeProps = reactive({
checkStrictly: false
}) })
const typeList = ref({}) const typeList = ref({})
@ -896,17 +901,15 @@ const handleCloudInstall = () => {
cloudInstalling.value = true cloudInstalling.value = true
installType.value = 'cloud' installType.value = 'cloud'
cloudInstallAddon({ addon: currAddon.value }) cloudInstallAddon({ addon: currAddon.value }).then((res) => {
.then((res) => { installStep.value = 1
installStep.value = 1 terminalRef.value.execute('clear')
terminalRef.value.execute('clear') terminalRef.value.execute('开始安装插件')
terminalRef.value.execute('开始安装插件') getInstallTask()
getInstallTask() cloudInstalling.value = false
cloudInstalling.value = false }).catch((res) => {
}) cloudInstalling.value = false
.catch((res) => { })
cloudInstalling.value = false
})
} }
const authElMessageBox = () => { const authElMessageBox = () => {
@ -1163,7 +1166,7 @@ const batchUpgrade = () => {
} }
const visibleRowKeys = computed(() => { const visibleRowKeys = computed(() => {
return new Set((info.value[activeName.value] || []).map(row => row.key)); return new Set((info.value[activeName.value] || []).map(row => row.key));
}); });
</script> </script>
@ -1443,6 +1446,7 @@ html.dark .table-head-bg {
color: #333; color: #333;
} }
} }
</style> </style>
<style> <style>

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

@ -94,13 +94,13 @@ const formRules = reactive<FormRules>({
{ required: true, message: t('continueSignPlaceholder'), trigger: 'blur' }, { required: true, message: t('continueSignPlaceholder'), trigger: 'blur' },
{ {
validator: (rule: any, value: any, callback: any) => { validator: (rule: any, value: any, callback: any) => {
if (isNaN(value) || !regExp.number.test(value)) { if (isNaN(value) || !regExp.number.test(value)) {
callback(t('continueSignFormatError')) callback(t('continueSignFormatError'))
} else if (value < 2 || value > 365) { } else if (value < 2 || value > 365) {
callback(t('continueSignBerweenDays')) callback(t('continueSignBerweenDays'))
} 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();
} }
}, },

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

@ -98,22 +98,18 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, computed } from 'vue' import { reactive, ref } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getVerifyDetail } from '@/app/api/verify' import { getVerifyDetail } from '@/app/api/verify'
import { FormInstance, ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { ArrowLeft } from '@element-plus/icons-vue' import { useRouter } from 'vue-router'
import { useRouter, useRoute } from 'vue-router' import { img } from '@/utils/common'
import { img, filterNumber } from '@/utils/common'
import useAppStore from '@/stores/modules/app'
const showDialog = ref(false) const showDialog = ref(false)
const loading = ref(true) const loading = ref(true)
const router = useRouter() const router = useRouter()
const appStore = useAppStore()
const activeName = ref('verifyInfo') const activeName = ref('verifyInfo')
const formData:Record<string, any> = ref({})
const handleClick = (data:string) => { const handleClick = (data:string) => {
activeName.value = data activeName.value = data

6
admin/src/app/views/marketing/sign_config.vue
View File

@ -157,15 +157,15 @@ const formRules = reactive<FormRules>({
} }
} }
], ],
sign_period:[{ sign_period: [{
required: true, required: true,
trigger: 'blur', trigger: 'blur',
validator: (rule: any, value: any, callback: any) => { validator: (rule: any, value: any, callback: any) => {
if (value === null || value === '') { if (value === null || value === '') {
callback(t('signPeriodTip')) callback(t('signPeriodTip'))
}else if (isNaN(value) || !regExp.number.test(value)) { } else if (isNaN(value) || !regExp.number.test(value)) {
callback(t('signPeriodLimitTips')) callback(t('signPeriodLimitTips'))
}else if (value < 2 || value > 365) { } else if (value < 2 || value > 365) {
callback(t('signPeriodMustZeroTips')) callback(t('signPeriodMustZeroTips'))
} else { } else {
callback() callback()

5
admin/src/app/views/marketing/verify_detail.vue
View File

@ -93,10 +93,6 @@ import { getVerifyDetail } from '@/app/api/verify'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { ArrowLeft } from '@element-plus/icons-vue' import { ArrowLeft } from '@element-plus/icons-vue'
import { img } from '@/utils/common' import { img } from '@/utils/common'
import PointEdit from '@/app/views/member/components/member-point-edit.vue'
import BalanceEdit from '@/app/views/member/components/member-balance-edit.vue'
import EditMember from '@/app/views/member/components/edit-member.vue'
import useAppStore from '@/stores/modules/app'
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
@ -105,7 +101,6 @@ const back = () => {
router.push('/marketing/verify') router.push('/marketing/verify')
} }
const appStore = useAppStore()
const loading = ref(true) const loading = ref(true)
// 获取核销信息 // 获取核销信息

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

@ -166,7 +166,7 @@ const memberAccountLogTableData = reactive({
from_type: '', from_type: '',
create_time: '', create_time: '',
mobile: '', mobile: '',
member_id: member_id, member_id,
balance_type: '' balance_type: ''
} }
}) })

8
admin/src/app/views/member/components/benefits-discount.vue
View File

@ -49,11 +49,11 @@ const formRules = reactive<FormRules>({
if (!Test.decimal(formData.value.discount, 1)) { if (!Test.decimal(formData.value.discount, 1)) {
callback('折扣格式错误') callback('折扣格式错误')
} }
if (parseFloat(formData.value.discount) < 0.1 || parseFloat(formData.value.discount) > 9.9) { if (parseFloat(formData.value.discount) < 0 || parseFloat(formData.value.discount) > 9.9) {
callback('折扣只能输入0.1~9.9之间的值') callback('折扣只能输入0~9.9之间的值')
} }
if (formData.value.discount <= 0) { if (formData.value.discount < 0) {
callback('折扣不能小于等于0') callback('折扣不能小于0')
} }
callback() callback()
} else { } else {

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

@ -164,7 +164,9 @@
<div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]"> <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
<span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('mobile') }}</span> <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('mobile') }}</span>
<span class="text-[14px] text-[#666666]"> <span class="text-[14px] text-[#666666]">
{{ formData.mobile || t('notAvailable') }} {{ formData.mobile || t('notAvailable') }}<el-icon @click="editMemberInfo('mobile')" class="-bottom-[2px] -right-[4px] cursor-pointer">
<EditPen color="#273CE2" />
</el-icon>
</span> </span>
</div> </div>
<div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]"> <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
@ -199,6 +201,22 @@
</el-icon> </el-icon>
</span> </span>
</div> </div>
<div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
<span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('身份证') }}</span>
<span class="text-[14px] text-[#666666]">
{{ formData.id_card || t('notAvailable') }}<el-icon @click="editMemberInfo('id_card')" class="-bottom-[2px] -right-[4px] cursor-pointer">
<EditPen color="#273CE2" />
</el-icon>
</span>
</div>
<div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
<span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('备注') }}</span>
<span class="text-[14px] text-[#666666]">
{{ formData.remark || t('notAvailable') }}<el-icon @click="editMemberInfo('remark')" class="-bottom-[2px] -right-[4px] cursor-pointer">
<EditPen color="#273CE2" />
</el-icon>
</span>
</div>
<div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]"> <div class="flex mt-[15px] w-[33.3%] break-all leading-[21px]">
<span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('wxUnionid') }}</span> <span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('wxUnionid') }}</span>
<span class="text-[14px] text-[#666666]"> <span class="text-[14px] text-[#666666]">
@ -248,7 +266,7 @@
import { reactive, ref } from 'vue' import { reactive, ref } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { getMemberInfo } from '@/app/api/member' import { getMemberInfo } from '@/app/api/member'
import { FormInstance, ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { img } from '@/utils/common' import { img } from '@/utils/common'
import PointEdit from '@/app/views/member/components/member-point-edit.vue' import PointEdit from '@/app/views/member/components/member-point-edit.vue'

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

@ -8,6 +8,15 @@
<el-form-item :label="t('nickname')" v-if="type == 'nickname'"> <el-form-item :label="t('nickname')" v-if="type == 'nickname'">
<el-input v-model.trim="saveData.nickname" clearable :placeholder="t('nickNamePlaceholder')" class="input-width" /> <el-input v-model.trim="saveData.nickname" clearable :placeholder="t('nickNamePlaceholder')" class="input-width" />
</el-form-item> </el-form-item>
<el-form-item :label="t('mobile')" v-if="type == 'mobile'" prop="mobile">
<el-input v-model.trim="saveData.mobile" clearable :placeholder="t('mobilePlaceholder')" maxlength="11" class="input-width" />
</el-form-item>
<el-form-item :label="t('idCard')" v-if="type == 'id_card'" prop="id_card">
<el-input v-model.trim="saveData.id_card" clearable :placeholder="t('idCardPlaceholder')" maxlength="18" class="input-width" />
</el-form-item>
<el-form-item :label="t('remark')" v-if="type == 'remark'" prop="remark">
<el-input v-model.trim="saveData.remark" type="textarea" clearable :placeholder="t('remarkPlaceholder')" maxlength="100" :rows="5" class="input-width" />
</el-form-item>
<el-form-item :label="t('birthday')" v-if="type == 'birthday'"> <el-form-item :label="t('birthday')" v-if="type == 'birthday'">
<el-date-picker v-model="saveData.birthday" value-format="YYYY-MM-DD" type="date" :placeholder="t('birthdayTip')" /> <el-date-picker v-model="saveData.birthday" value-format="YYYY-MM-DD" type="date" :placeholder="t('birthdayTip')" />
</el-form-item> </el-form-item>
@ -23,7 +32,7 @@
</el-form-item> </el-form-item>
<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')" 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>
@ -35,7 +44,8 @@
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="showDialog = false">{{ t('cancel') }}</el-button> <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
<el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button> <el-button type="primary" :loading="loading" v-if="method=='batchSet'" @click="batchSetConfirm(formRef)">{{t('confirm')}}</el-button>
<el-button type="primary" :loading="loading" v-else @click="confirm(formRef)">{{t('confirm')}}</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
@ -46,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 } from '@/app/api/member' import { editMemberDetail, getMemberLabelAll, getMemberLevelAll,memberBatchModify } from '@/app/api/member'
import Test from '@/utils/test' import Test from '@/utils/test'
// 修改类型 // 修改类型
@ -87,16 +97,50 @@ getMemberLevelAll().then(({ data }) => {
const formRules = computed(() => { const formRules = computed(() => {
return { return {
member_level: [ mobile: [
{ {
validator: (rule: any, value: any, callback: Function) => { validator(rule, value, callback) {
if (Test.empty(saveData.member_level)) { // 允许为空，直接通过验证
callback(t('memberLevelPlaceholder')) if (!value) return callback();
}
callback() // 非空值时，验证手机号格式
const reg = /^1[3-9]\d{9}$/;
if (!reg.test(value)) {
callback(new Error('请输入正确的手机号'));
} else {
callback();
} }
},
trigger: 'blur'
}
],
id_card:[
{
validator(rule, value, callback) {
// 允许为空，直接通过验证
if (!value) return callback();
// 非空值时，验证身份证号格式
const reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
if (!reg.test(value)) {
callback(new Error('请输入正确的身份证号'));
} else {
callback();
}
},
trigger: 'blur'
} }
] ]
// member_level: [
// {
// validator: (rule: any, value: any, callback: Function) => {
// if (Test.empty(saveData.member_level)) {
// callback(t('memberLevelPlaceholder'))
// }
// callback()
// }
// }
// ]
} }
}) })
@ -151,7 +195,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
} }
}) })
} }
// 修改
const setDialogType = async (row: any = null) => { const setDialogType = async (row: any = null) => {
loading.value = true loading.value = true
type.value = row.type type.value = row.type
@ -178,9 +222,63 @@ const setDialogType = async (row: any = null) => {
loading.value = false loading.value = false
} }
// 批量设置
const method = ref(null)
const batchInfo = ref({
is_all: 0,
ids: [],
where: {}
})
const batchSetDialogType = (data)=>{
loading.value = true
type.value =data.type
method.value = data.method
batchInfo.value.is_all = data.data.is_all
batchInfo.value.ids = data.data.ids
batchInfo.value.where = data.data.where
title.value = data.title
saveData[type.value] = null
loading.value = false
}
const batchSetConfirm = async (formEl: FormInstance | undefined) => {
await formRef.value?.validate((valid) => {
if (valid) {
loading.value = true
if (repeat.value) return
repeat.value = true
let val = saveData[type.value];
if(type.value == 'member_label'){
val = saveData[type.value] && saveData[type.value].length ? deepClone(saveData[type.value]).join(',').split(',') : '';
}
const data = ref({
is_all: batchInfo.value.is_all,
member_ids:batchInfo.value.ids,
where: batchInfo.value.where,
field: type.value,
value: val
})
console.log(data.value)
memberBatchModify(data.value).then(res => {
loading.value = false
repeat.value = false
showDialog.value = false
emit('complete')
}).catch(() => {
loading.value = false
repeat.value = false
})
}
})
}
defineExpose({ defineExpose({
showDialog, showDialog,
setDialogType setDialogType,
batchSetDialogType
}) })
</script> </script>

1
admin/src/app/views/member/components/gift-point.vue
View File

@ -14,7 +14,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import { computed, reactive, ref, watch } from 'vue' import { computed, reactive, ref, watch } from 'vue'
import { FormRules } from 'element-plus' import { FormRules } from 'element-plus'
import Test from '@/utils/test'
const props = defineProps({ const props = defineProps({
modelValue: { modelValue: {

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

@ -107,7 +107,6 @@ const confirm = async (formEl: FormInstance | undefined) => {
}).catch(() => { }).catch(() => {
loading.value = false loading.value = false
repeat.value = false repeat.value = false
// showDialog.value = false
}) })
} }
}) })

16
admin/src/app/views/member/components/member-balance-info.vue
View File

@ -2,38 +2,38 @@
<el-dialog v-model="showDialog" :title="t('balanceInfo')" width="550px" :destroy-on-close="true"> <el-dialog v-model="showDialog" :title="t('balanceInfo')" width="550px" :destroy-on-close="true">
<el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading"> <el-form :model="formData" label-width="110px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
<el-form-item :label="t('headimg')" > <el-form-item :label="t('headimg')">
<div class="flex items-center"> <div class="flex items-center">
<img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.member.headimg" :src="img(formData.member.headimg)" alt="" > <img class="w-[50px] h-[50px] mr-[10px]" v-if="formData.member.headimg" :src="img(formData.member.headimg)" alt="" >
<img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt=""> <img class="w-[50px] h-[50px] mr-[10px] rounded-full" v-else src="@/app/assets/images/member_head.png" alt="">
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label="t('memberId')" > <el-form-item :label="t('memberId')">
<div class="input-width"> {{ formData.member.member_no }} </div> <div class="input-width"> {{ formData.member.member_no }} </div>
</el-form-item> </el-form-item>
<el-form-item :label="t('nickName')" > <el-form-item :label="t('nickName')">
<div class="input-width"> {{ formData.member.nickname }} </div> <div class="input-width"> {{ formData.member.nickname }} </div>
</el-form-item> </el-form-item>
<el-form-item :label="t('mobile')" > <el-form-item :label="t('mobile')">
<div class="input-width"> {{ formData.member.mobile }} </div> <div class="input-width"> {{ formData.member.mobile }} </div>
</el-form-item> </el-form-item>
<el-form-item :label="t('accountData')" > <el-form-item :label="t('accountData')">
<div class="input-width"> {{ formData.account_data }} </div> <div class="input-width"> {{ formData.account_data }} </div>
</el-form-item> </el-form-item>
<el-form-item :label="t('fromType')" > <el-form-item :label="t('fromType')">
<div class="input-width"> {{ formData.from_type_name }} </div> <div class="input-width"> {{ formData.from_type_name }} </div>
</el-form-item> </el-form-item>
<el-form-item :label="t('memo')" > <el-form-item :label="t('memo')">
<div class="input-width"> {{ formData.memo }} </div> <div class="input-width"> {{ formData.memo }} </div>
</el-form-item> </el-form-item>
<el-form-item :label="t('createTime')" > <el-form-item :label="t('createTime')">
<div class="input-width"> {{ formData.create_time }} </div> <div class="input-width"> {{ formData.create_time }} </div>
</el-form-item> </el-form-item>

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

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="t('adjustPoint')" prop="adjust"> <el-form-item :label="t('adjustPoint')" prop="adjust">
<el-input-number v-model="formData.adjust" clearable :min="0" :max="999999" :placeholder="t('adjustPlaceholder')"/> <el-input-number v-model="formData.adjust" clearable :min="0" :max="999999" :placeholder="t('adjustPlaceholder')" @focus="formData.adjust = ''" class="!w-[200px]"/>
</el-form-item> </el-form-item>
<el-form-item :label="t('memo')" prop="memo"> <el-form-item :label="t('memo')" prop="memo">

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

@ -11,7 +11,7 @@
<el-card class="box-card !border-none my-[20px] table-search-wrap" shadow="never"> <el-card class="box-card !border-none my-[20px] table-search-wrap" shadow="never">
<el-form :inline="true" :model="memberTableData.searchParam" ref="searchFormRef"> <el-form :inline="true" :model="memberTableData.searchParam" ref="searchFormRef">
<el-form-item :label="t('memberInfo')" prop="keyword"> <el-form-item :label="t('memberInfo')" prop="keyword">
<el-input v-model.trim="memberTableData.searchParam.keyword" class="w-[240px]" :placeholder="t('memberInfoPlaceholder')" /> <el-input v-model.trim="memberTableData.searchParam.keyword" class="!w-[200px]" :placeholder="t('memberInfoPlaceholder')" />
</el-form-item> </el-form-item>
<el-form-item :label="t('registerChannel')" prop="register_channel"> <el-form-item :label="t('registerChannel')" prop="register_channel">
@ -47,11 +47,29 @@
</el-card> </el-card>
<div class="mt-[10px]"> <div class="mt-[10px]">
<el-table :data="memberTableData.data" size="large" v-loading="memberTableData.loading"> <div class="mb-[10px] flex items-center">
<el-dropdown class="mr-[20px] !text-primary">
<span class="el-dropdown-link">
<span>{{ currentSelectMode === 'all' ? t('全选所有页') : t('全选当前页')}}</span>({{ selectedCount }})
<el-icon>
<arrow-down />
</el-icon>
</span>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item class="select-wrap" :class="{ active: currentSelectMode === 'all' }" @click="selectAllPages">全选所有页</el-dropdown-item>
<el-dropdown-item class="select-wrap" :class="{ active: currentSelectMode === 'page' }" @click="toggleChange">全选当前页</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<el-button @click="batchSetLabel" size="small">{{ t('标签') }}</el-button>
<el-button @click="batchSetLevel" size="small">{{ t('等级') }}</el-button>
</div>
<el-table :data="memberTableData.data" size="large" ref="memberListTableRef" v-loading="memberTableData.loading" :row-key="row => row.member_id" :default-selection="defaultSelection" @selection-change="handleSelectionChange">
<template #empty> <template #empty>
<span>{{ !memberTableData.loading ? t('emptyData') : '' }}</span> <span>{{ !memberTableData.loading ? t('emptyData') : '' }}</span>
</template> </template>
<el-table-column type="selection" width="55" />
<el-table-column prop="member_no" :label="t('memberNo')" min-width="120" /> <el-table-column prop="member_no" :label="t('memberNo')" min-width="120" />
<el-table-column prop="nickname" :show-overflow-tooltip="true" :label="t('memberInfo')" min-width="170"> <el-table-column prop="nickname" :show-overflow-tooltip="true" :label="t('memberInfo')" min-width="170">
<template #default="{ row }"> <template #default="{ row }">
@ -120,9 +138,8 @@
@size-change="loadMemberList()" @current-change="loadMemberList" /> @size-change="loadMemberList()" @current-change="loadMemberList" />
</div> </div>
</div> </div>
<add-member ref="addMemberDialog" @complete="loadMemberList()" /> <add-member ref="addMemberDialog" @complete="loadMemberList()" />
<edit-member ref="editMemberDialog" @complete="loadMemberList()" /> <edit-member ref="editMemberDialog" @complete="loadMemberListReset()" />
<export-sure ref="exportSureDialog" :show="flag" type="member" :searchParam="memberTableData.searchParam" @close="handleClose" /> <export-sure ref="exportSureDialog" :show="flag" type="member" :searchParam="memberTableData.searchParam" @close="handleClose" />
<detail-member ref="detailMemberDialog" @load="loadMemberList()"></detail-member> <detail-member ref="detailMemberDialog" @load="loadMemberList()"></detail-member>
</el-card> </el-card>
@ -130,7 +147,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref } from 'vue' import { reactive, ref,nextTick ,computed } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { img } from '@/utils/common' import { img } from '@/utils/common'
import { getRegisterChannelType, getMemberList, getMemberLabelAll, editMemberStatus, deleteMember, getMemberLevelAll } from '@/app/api/member' import { getRegisterChannelType, getMemberList, getMemberLabelAll, editMemberStatus, deleteMember, getMemberLevelAll } from '@/app/api/member'
@ -183,9 +200,11 @@ getMemberLevelAll().then(({ data }) => {
const resetForm = (formEl: FormInstance | undefined) => { const resetForm = (formEl: FormInstance | undefined) => {
if (!formEl) return if (!formEl) return
formEl.resetFields() formEl.resetFields()
isReset.value = true
loadMemberList() loadMemberList()
} }
const isReset = ref(false)
// 获取会员列表 // 获取会员列表
const loadMemberList = (page: number = 1) => { const loadMemberList = (page: number = 1) => {
memberTableData.loading = true memberTableData.loading = true
@ -199,12 +218,195 @@ const loadMemberList = (page: number = 1) => {
memberTableData.loading = false memberTableData.loading = false
memberTableData.data = res.data.data memberTableData.data = res.data.data
memberTableData.total = res.data.total memberTableData.total = res.data.total
if (isReset.value) {
isSelectAllPages.value = false
excludedIds.value = []
currentSelectMode.value = null
multipleSelection.value = []
}
if (isSelectAllPages.value && !isReset.value) {
restoringSelection.value = true
nextTick(() => {
memberTableData.data.forEach(item => {
if (!excludedIds.value.includes(item.member_id)) {
memberListTableRef.value?.toggleRowSelection(item, true)
} else {
memberListTableRef.value?.toggleRowSelection(item, false)
}
})
restoringSelection.value = false
})
}
isReset.value = false
}).catch(() => { }).catch(() => {
isReset.value = false
memberTableData.loading = false memberTableData.loading = false
}) })
} }
loadMemberList() loadMemberList()
// 全选所有页时排除的 ID
const excludedIds = ref<number[]>([])
// 是否全选所有页
const isSelectAllPages = ref(false)
const currentSelectMode = ref<'all' | 'page' | null>(null)
// 全选当前页
const toggleChange = () => {
restoringSelection.value = true // 加锁
if (currentSelectMode.value === 'page') {
isSelectAllPages.value = false
currentSelectMode.value = null
excludedIds.value = []
multipleSelection.value = []
memberListTableRef.value.clearSelection()
} else {
isSelectAllPages.value = false
currentSelectMode.value = 'page'
excludedIds.value = []
multipleSelection.value = []
memberTableData.data.forEach(row => {
memberListTableRef.value.toggleRowSelection(row, true)
})
multipleSelection.value = [...memberTableData.data]
}
nextTick(() => {
restoringSelection.value = false // 解锁
})
}
// 全选所有页
const selectAllPages = () => {
restoringSelection.value = true // 加锁
if (currentSelectMode.value === 'all') {
isSelectAllPages.value = false
currentSelectMode.value = null
excludedIds.value = []
multipleSelection.value = []
memberListTableRef.value.clearSelection()
} else {
// memberListTableRef.value.clearSelection()
excludedIds.value = []
multipleSelection.value = []
isSelectAllPages.value = true
currentSelectMode.value = 'all'
memberTableData.data.forEach(row => {
memberListTableRef.value.toggleRowSelection(row, true)
})
}
nextTick(() => {
restoringSelection.value = false // 解锁
})
}
const defaultSelection = computed(() => {
if (isSelectAllPages.value) {
return memberTableData.data.filter(item => !excludedIds.value.includes(item.member_id))
} else {
return multipleSelection.value
}
})
const memberListTableRef = ref()
// 选中数据
const multipleSelection: any = ref([])
const restoringSelection = ref(false)
const handleSelectionChange = (val: any[]) => {
if (restoringSelection.value) return // 阻止自动恢复触发逻辑
if (isSelectAllPages.value) {
const currentPageIds = memberTableData.data.map(item => item.member_id)
const selectedIds = val.map(item => item.member_id)
const unselected = currentPageIds.filter(id => !selectedIds.includes(id))
excludedIds.value = Array.from(new Set([...excludedIds.value, ...unselected]))
excludedIds.value = excludedIds.value.filter(id => !selectedIds.includes(id))
} else {
multipleSelection.value = val
}
}
const selectedCount = computed(() => {
if (isSelectAllPages.value) {
return memberTableData.total - excludedIds.value.length
} else {
return multipleSelection.value.length
}
})
const getBatchPayload = () => {
if (isSelectAllPages.value) {
return {
is_all: 1,
ids: excludedIds.value,
where: {
...memberTableData.searchParam
}
}
} else {
return {
is_all: 0,
ids: multipleSelection.value.map(item => item.member_id),
where: {
...memberTableData.searchParam
}
}
}
}
/** ***************** 批量设置-start *************************/
const batchSetLabel = () => {
const isNoneSelected =
(!isSelectAllPages.value && multipleSelection.value.length === 0) ||
(isSelectAllPages.value && excludedIds.value.length === memberTableData.total)
if (isNoneSelected) {
ElMessage({
type: 'warning',
message: `${ t('batchEmptySelectedTips') }`
})
return
}
const info = getBatchPayload()
const data = ref({
method: 'batchSet',
type: 'member_label',
title: t('批量设置会员标签'),
data: info
})
editMemberDialog.value.batchSetDialogType(data.value)
editMemberDialog.value.showDialog = true
}
// 等级
const batchSetLevel = () => {
const isNoneSelected =
(!isSelectAllPages.value && multipleSelection.value.length === 0) ||
(isSelectAllPages.value && excludedIds.value.length === memberTableData.total)
if (isNoneSelected) {
ElMessage({
type: 'warning',
message: `${t('batchEmptySelectedTips')}`
})
return
}
const info = getBatchPayload()
const data = ref({
method: 'batchSet',
type: 'member_level',
title: t('批量设置会员等级'),
data: info
})
editMemberDialog.value.batchSetDialogType(data.value)
editMemberDialog.value.showDialog = true
}
const loadMemberListReset = () => {
isReset.value = true
loadMemberList()
}
/** ***************** 批量设置-end *************************/
const addMemberDialog: Record<string, any> | null = ref(null) const addMemberDialog: Record<string, any> | null = ref(null)
const editMemberDialog: Record<string, any> | null = ref(null) const editMemberDialog: Record<string, any> | null = ref(null)
const detailMemberDialog: Record<string, any> | null = ref(null) const detailMemberDialog: Record<string, any> | null = ref(null)
@ -249,12 +451,6 @@ const addEvent = () => {
addMemberDialog.value.showDialog = true addMemberDialog.value.showDialog = true
} }
/**
* 编辑会员
* @param data
*/
const editEvent = (data: any) => { }
/** /**
* 会员详情 * 会员详情
*/ */
@ -280,10 +476,11 @@ const exportEvent = () => {
*/ */
const lockMember = (res: any, status: any) => { const lockMember = (res: any, status: any) => {
editMemberStatus({ editMemberStatus({
status: status, status,
member_ids: [res.member_id] member_ids: [res.member_id]
}).then(res => { }).then(res => {
if (res.code >= 0) { if (res.code >= 0) {
isReset.value = true
loadMemberList() loadMemberList()
} }
}) })

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

@ -199,6 +199,22 @@
</el-icon> </el-icon>
</span> </span>
</div> </div>
<div class="flex items-center mt-[15px]">
<span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('身份证') }}</span>
<span class="text-[14px] text-[#666666]">
{{ formData.id_card || t('notAvailable') }}<el-icon @click="editMemberInfo('id_card')" class="-bottom-[2px] -right-[4px] cursor-pointer">
<EditPen color="#273CE2" />
</el-icon>
</span>
</div>
<div class="flex items-center mt-[15px]">
<span class="text-[14px] w-[130px] text-right flex-shrink-0 mr-[20px]">{{ t('备注') }}</span>
<span class="text-[14px] text-[#666666]">
{{ formData.remark || t('notAvailable') }}<el-icon @click="editMemberInfo('remark')" class="-bottom-[2px] -right-[4px] cursor-pointer">
<EditPen color="#273CE2" />
</el-icon>
</span>
</div>
<div class="flex items-center mt-[15px]"> <div class="flex items-center mt-[15px]">
<span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('wxUnionid') }}</span> <span class="text-[14px] w-[130px] text-right mr-[20px]">{{ t('wxUnionid') }}</span>
<span class="text-[14px] text-[#666666]"> <span class="text-[14px] text-[#666666]">
@ -360,12 +376,12 @@ const infoCommission = () => {
} }
const back = () => { const back = () => {
if (window.history.length > 1){ if (window.history.length > 1) {
router.go(-1) router.go(-1)
}else{ } else {
router.push(`/member/member`) router.push(`/member/member`)
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

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

@ -142,7 +142,7 @@ const memberAccountLogTableData = reactive({
from_type: '', from_type: '',
create_time: '', create_time: '',
mobile: '', mobile: '',
member_id: member_id member_id
} }
}) })

26
admin/src/app/views/setting/agreement_edit.vue
View File

@ -75,21 +75,21 @@ const formRules = computed(() => {
{ required: true, message: t('titlePlaceholder'), trigger: 'blur' } { required: true, message: t('titlePlaceholder'), trigger: 'blur' }
], ],
content: [ content: [
{ {
required: true, required: true,
trigger: ['blur', 'change'], trigger: ['blur', 'change'],
validator: (rule: any, value: any, callback: any) => { validator: (rule: any, value: any, callback: any) => {
if (value === '') { if (value === '') {
callback(new Error(t('contentPlaceholder'))) callback(new Error(t('contentPlaceholder')))
} else if (value.length < 5 || value.length > 100000) { } else if (value.length < 5 || value.length > 100000) {
callback(new Error(t('contentMaxTips'))) callback(new Error(t('contentMaxTips')))
return false return false
} else { } else {
callback() callback()
}
} }
} }
] }
]
} }
}) })

1
admin/src/app/views/setting/components/notice-weapp.vue
View File

@ -89,7 +89,6 @@ const confirm = async (formEl: FormInstance | undefined) => {
emit('complete') emit('complete')
}).catch(() => { }).catch(() => {
loading.value = false loading.value = false
// showDialog.value = false
}) })
} }
}) })

1
admin/src/app/views/setting/components/notice-wechat.vue
View File

@ -104,7 +104,6 @@ const confirm = async (formEl: FormInstance | undefined) => {
emit('complete') emit('complete')
}).catch(() => { }).catch(() => {
loading.value = false loading.value = false
// showDialog.value = false
}) })
} }
}) })

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

@ -17,7 +17,6 @@
<el-button @click="editPass()">忘记密码</el-button> <el-button @click="editPass()">忘记密码</el-button>
<el-button @click="back()" v-if="props.isLogin">返回</el-button> <el-button @click="back()" v-if="props.isLogin">返回</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div v-if="type=='register'" > <div v-if="type=='register'" >
@ -63,7 +62,6 @@
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input placeholder="请输入备注" class="input-width" type="textarea" maxlength="50" show-word-limit v-model="registerFormData.remark" clearable /> <el-input placeholder="请输入备注" class="input-width" type="textarea" maxlength="50" show-word-limit v-model="registerFormData.remark" clearable />
</el-form-item> </el-form-item>
<h3 class="panel-title !text-[14px">{{ t('实名信息') }}</h3> <h3 class="panel-title !text-[14px">{{ t('实名信息') }}</h3>
<el-form-item :label="t('短信示例内容')" prop="contentExample"> <el-form-item :label="t('短信示例内容')" prop="contentExample">
<el-input v-model="registerFormData.contentExample" placeholder="请输入短信示例内容" clearable maxlength="50" show-word-limit class="input-width" /> <el-input v-model="registerFormData.contentExample" placeholder="请输入短信示例内容" clearable maxlength="50" show-word-limit class="input-width" />
@ -88,12 +86,12 @@
</el-form-item> </el-form-item>
<el-form-item :label="t('签名来源')"> <el-form-item :label="t('签名来源')">
<el-radio-group v-model="registerFormData.signSource" > <el-radio-group v-model="registerFormData.signSource" >
<el-radio v-for="item in signCofig.signsourceList" :key="item.type" :label="item.type" >{{item.name}}</el-radio> <el-radio v-for="item in signConfig.signSourceList" :key="item.type" :label="item.type" >{{item.name}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item :label="t('签名类型')"> <el-form-item :label="t('签名类型')">
<el-radio-group v-model="registerFormData.signType"> <el-radio-group v-model="registerFormData.signType">
<el-radio v-for="item in signCofig.signTypeList" :key="item.type" :label="item.type" >{{item.name}}</el-radio> <el-radio v-for="item in signConfig.signTypeList" :key="item.type" :label="item.type" >{{item.name}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item :label="t('上传图片')" prop="imgUrl"> <el-form-item :label="t('上传图片')" prop="imgUrl">
@ -138,13 +136,13 @@
</el-form> </el-form>
</div> </div>
</el-card> </el-card>
</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,
@ -166,7 +164,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,14 +192,14 @@ const back = () => {
} }
// 注册 // 注册
const signCofig = reactive({ const signConfig = reactive({
signTypeList: [], signTypeList: [],
signsourceList:[] signSourceList:[]
}) })
const getSmsSignConfigFn = ()=> { const getSmsSignConfigFn = ()=> {
getSmsSignConfig().then(res => { getSmsSignConfig().then(res => {
signCofig.signTypeList = res.data.sign_type_list signConfig.signTypeList = res.data.sign_type_list
signCofig.signsourceList = res.data.sign_source_list signConfig.signSourceList = res.data.sign_source_list
registerFormData.value.signSource = res.data.sign_source_list[0].type registerFormData.value.signSource = res.data.sign_source_list[0].type
registerFormData.value.signType = res.data.sign_type_list[0].type registerFormData.value.signType = res.data.sign_type_list[0].type
}) })
@ -216,7 +214,7 @@ const registerFormData = ref({
password: '', password: '',
company: '', company: '',
mobile: '', mobile: '',
captcha_key : '', captcha_key: '',
captcha_code: '', captcha_code: '',
captcha_img: '', captcha_img: '',
imgUrl: '', imgUrl: '',
@ -240,10 +238,8 @@ const toRegister = async () => {
registerFormData.value.username = '' registerFormData.value.username = ''
registerFormData.value.password = '' registerFormData.value.password = ''
type.value = 'register' type.value = 'register'
loading.value = false
}else {
loading.value = false
} }
loading.value = false
} }
const registerFormRef = ref() const registerFormRef = ref()
@ -275,36 +271,36 @@ const registerFormRules = computed(() => {
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'
} }
], ],
principalMobile:[ principalMobile: [
{ required: true, message: '请输入经办人手机号', trigger: 'blur' }, { required: true, message: '请输入经办人手机号', trigger: 'blur' },
{ validator: phoneVerify, trigger: 'blur' } { validator: phoneVerify, trigger: 'blur' }
], ],
@ -389,11 +385,11 @@ const getSmsCaptchaFn = async () => {
try { try {
const res = await getSmsCaptcha() const res = await getSmsCaptcha()
if (captchaType.value === 'register') { if (captchaType.value === 'register') {
registerFormData.value.captcha_key = res.data.captcha_key registerFormData.value.captcha_key = res.data.captcha_key
registerFormData.value.captcha_img = res.data.img registerFormData.value.captcha_img = res.data.img
} else if (captchaType.value === 'password') { } else if (captchaType.value === 'password') {
changeFormData.value.captcha_key = res.data.captcha_key changeFormData.value.captcha_key = res.data.captcha_key
changeFormData.value.captcha_img = res.data.img changeFormData.value.captcha_img = res.data.img
} }
return true // 表示成功 return true // 表示成功
} catch (error) { } catch (error) {
@ -409,8 +405,8 @@ 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
sending.value = true; // 标记为发送中 sending.value = true // 标记为发送中
const params = { const params = {
mobile: registerFormData.value.mobile, mobile: registerFormData.value.mobile,
captcha_key: registerFormData.value.captcha_key, captcha_key: registerFormData.value.captcha_key,
@ -424,13 +420,12 @@ const getSmsSendFn = () => {
sending.value = false; sending.value = false;
}).finally(() => { }).finally(() => {
sending.value = false; // 无论成功失败都重置发送状态 sending.value = false; // 无论成功失败都重置发送状态
}); })
}); })
} else if (type.value === 'password') { } else if (type.value === 'password') {
changeFormRef.value.validateField(['mobile', 'captcha_code'], (valid) => { changeFormRef.value.validateField(['mobile', 'captcha_code'], (valid) => {
if (!valid) return; if (!valid) return
sending.value = true; // 标记为发送中 sending.value = true // 标记为发送中
const params = { const params = {
mobile: changeFormData.value.mobile, mobile: changeFormData.value.mobile,
@ -456,11 +451,12 @@ const startCountdown = (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(() => {
return { return {
mobile: [ mobile: [
@ -484,12 +480,11 @@ const editPass = async () => {
captchaType.value = 'password' captchaType.value = 'password'
const success = await getSmsCaptchaFn() const success = await getSmsCaptchaFn()
if (success) { if (success) {
loading.value = false
type.value = 'password' type.value = 'password'
}else{
loading.value = false
} }
loading.value = false
} }
const reset = async () => { const reset = async () => {
await changeFormRef.value?.validate(async (valid) => { await changeFormRef.value?.validate(async (valid) => {
if (valid) { if (valid) {
@ -498,25 +493,24 @@ const reset = async () => {
code: changeFormData.value.code, code: changeFormData.value.code,
mobile: changeFormData.value.mobile mobile: changeFormData.value.mobile
} }
resetPassword(props.info.username,{...params}).then((res) => { resetPassword(props.info.username, { ...params }).then((res) => {
let newPassword = res.data.password let 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')
}).catch(() => { }).catch(() => {
type.value='login' type.value = 'login'
emit('complete') emit('complete')
}) })
}) })
} }
}); })
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>

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

@ -40,11 +40,12 @@ const props = defineProps({
type: String, type: String,
default: '' default: ''
}, },
isRecharge:{ isRecharge: {
type: Boolean, type: Boolean,
default: false default: false
} }
}) })
const emit = defineEmits(['back', 'complete']) const emit = defineEmits(['back', 'complete'])
const smsPackages = ref<any[]>([]) const smsPackages = ref<any[]>([])

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

@ -111,12 +111,12 @@
</el-form-item> </el-form-item>
<el-form-item :label="t('签名来源')"> <el-form-item :label="t('签名来源')">
<el-radio-group v-model="formData.signSource" > <el-radio-group v-model="formData.signSource" >
<el-radio v-for="item in signCofig.signsourceList" :key="item.type" :label="item.type" >{{item.name}}</el-radio> <el-radio v-for="item in signConfig.signSourceList" :key="item.type" :label="item.type" >{{item.name}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item :label="t('签名类型')"> <el-form-item :label="t('签名类型')">
<el-radio-group v-model="formData.signType"> <el-radio-group v-model="formData.signType">
<el-radio v-for="item in signCofig.signTypeList" :key="item.type" :label="item.type" >{{item.name}}</el-radio> <el-radio v-for="item in signConfig.signTypeList" :key="item.type" :label="item.type" >{{item.name}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item :label="t('上传图片')" prop="imgUrl"> <el-form-item :label="t('上传图片')" prop="imgUrl">
@ -169,15 +169,14 @@ const initialFormData = {
} }
const formData = reactive({ ...initialFormData }) const formData = reactive({ ...initialFormData })
const signConfig = reactive({
const signCofig = reactive({
signTypeList: [], signTypeList: [],
signsourceList:[] signSourceList:[]
}) })
const getSmsSignConfigFn = ()=> { const getSmsSignConfigFn = ()=> {
getSmsSignConfig().then(res => { getSmsSignConfig().then(res => {
signCofig.signTypeList = res.data.sign_type_list signConfig.signTypeList = res.data.sign_type_list
signCofig.signsourceList = res.data.sign_source_list signConfig.signSourceList = res.data.sign_source_list
formData.signSource = res.data.sign_source_list[0].type formData.signSource = res.data.sign_source_list[0].type
formData.signType = res.data.sign_type_list[0].type formData.signType = res.data.sign_type_list[0].type
}) })
@ -192,29 +191,29 @@ 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'
} }
], ],
principalMobile:[ principalMobile: [
{ required: true, message: '请输入经办人手机号', trigger: 'blur' }, { required: true, message: '请输入经办人手机号', trigger: 'blur' },
{ validator: phoneVerify, trigger: 'blur' } { validator: phoneVerify, trigger: 'blur' }
], ],
@ -320,8 +319,8 @@ const loadSignList = () => {
const addEvent = () => { const addEvent = () => {
Object.assign(formData, initialFormData) Object.assign(formData, initialFormData)
formData.signSource = signCofig.signsourceList[0].type formData.signSource = signConfig.signSourceList[0].type
formData.signType = signCofig.signTypeList[0].type formData.signType = signConfig.signTypeList[0].type
visibleAdd.value = true visibleAdd.value = true
} }
@ -397,14 +396,13 @@ const batchDeleteEvent = () => {
signatures.push(item.sign) signatures.push(item.sign)
}) })
deleteSign(props.username,{ deleteSign(props.username, {
signatures: signatures signatures
}).then(() => { }).then(() => {
tableData.loading = true; tableData.loading = true;
setTimeout(() => { setTimeout(() => {
loadSignList() loadSignList()
},1000) }, 1000)
// loadSignList()
}).catch(() => { }).catch(() => {
}) })
}) })

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

@ -11,7 +11,7 @@
<el-form-item :label="t('状态')" prop="status"> <el-form-item :label="t('状态')" prop="status">
<el-select v-model="tableData.searchParam.status" :placeholder="t('请选择状态')"> <el-select v-model="tableData.searchParam.status" :placeholder="t('请选择状态')">
<el-option :label="t('全部')" :value="''"></el-option> <el-option :label="t('全部')" :value="''"></el-option>
<el-option v-for="(statusText, statusValue) in template_status_list" :key="statusValue" :label="statusText" :value="statusValue"></el-option> <el-option v-for="(statusText, statusValue) in template_status_list" :key="statusValue" :label="statusText" :value="statusValue"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -46,7 +46,6 @@
<template #default="{ row }"> <template #default="{ row }">
<el-button type="primary" v-if="row.audit_info.audit_status!=2" link @click="reportEvent(row)">{{ row.audit_info.audit_status!=1 && row.audit_info.audit_status!=2? t("报备") : t("修改") }}</el-button> <el-button type="primary" v-if="row.audit_info.audit_status!=2" link @click="reportEvent(row)">{{ row.audit_info.audit_status!=1 && row.audit_info.audit_status!=2? t("报备") : t("修改") }}</el-button>
<el-button type="primary" v-if="row.audit_info.audit_status==2" link @click="clearEvent(row)">{{ t('清除报备信息') }}</el-button> <el-button type="primary" v-if="row.audit_info.audit_status==2" link @click="clearEvent(row)">{{ t('清除报备信息') }}</el-button>
<el-button type="primary" link @click="editEvent(row)">{{ t("详情") }}</el-button> <el-button type="primary" link @click="editEvent(row)">{{ t("详情") }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -173,20 +172,19 @@ const tableData = reactive({
} }
}); });
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], () => {
pagedDataChange() pagedDataChange()
}) })
// 获取列表 // 获取列表
const loadSmsTemplateList = () => { const loadSmsTemplateList = () => {
tableData.loading = true; tableData.loading = true;
@ -306,11 +304,11 @@ const reportLoading = ref(false)
const reportEvent = (row:any) => { const reportEvent = (row:any) => {
reportLoading.value = true reportLoading.value = true
let signature = props.signature let signature = props.signature
if(!signature){ if (!signature) {
ElMessage.error('请先配置签名') ElMessage.error('请先配置签名')
return 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) => {
@ -325,7 +323,7 @@ const reportEvent = (row:any) => {
} }
reportLoading.value = false; reportLoading.value = false;
}); });
}else{ } else {
visibleReport.value = true visibleReport.value = true
reportLoading.value = false reportLoading.value = false
detail.value = row detail.value = row
@ -336,6 +334,7 @@ const reportEvent = (row:any) => {
} }
} }
const reportTemplateFn = () => { const reportTemplateFn = () => {
if (!detail.value.sms) { if (!detail.value.sms) {
ElMessage.error('请先配置模版内容') ElMessage.error('请先配置模版内容')

1
admin/src/app/views/setting/components/storage-ali.vue
View File

@ -108,7 +108,6 @@ const confirm = async (formEl: FormInstance | undefined) => {
emit('complete') emit('complete')
}).catch(() => { }).catch(() => {
loading.value = false loading.value = false
// showDialog.value = false
}) })
} }
}) })

1
admin/src/app/views/setting/components/storage-local.vue
View File

@ -68,7 +68,6 @@ const confirm = async (formEl: FormInstance | undefined) => {
emit('complete') emit('complete')
}).catch(() => { }).catch(() => {
loading.value = false loading.value = false
// showDialog.value = false
}) })
} }
}) })

1
admin/src/app/views/setting/components/storage-tencent.vue
View File

@ -107,7 +107,6 @@ const confirm = async (formEl: FormInstance | undefined) => {
emit('complete') emit('complete')
}).catch(() => { }).catch(() => {
loading.value = false loading.value = false
// showDialog.value = false
}) })
} }
}) })

50
admin/src/app/views/setting/member.vue
View File

@ -15,6 +15,17 @@
<el-form-item > <el-form-item >
<div class="text-lg">{{ memberNo }}</div> <div class="text-lg">{{ memberNo }}</div>
</el-form-item> </el-form-item>
<h3 class="panel-title">{{ t('diyForm') }}</h3>
<el-form-item :label="t('personalForm')">
<el-select v-model="formData.form_id" :placeholder="t('diyFormPlaceholder')" clearable>
<el-option v-for="item in diyFormOptions" :key="item.form_id" :label="item.page_title" :value="item.form_id" />
</el-select>
<div class="ml-[10px]">
<span class="cursor-pointer text-primary mr-[10px]" @click="refreshDiyForm(true)">{{ t('refresh') }}</span>
<span class="cursor-pointer text-primary" @click="toDiyFormEvent">{{ t('addDiyForm') }}</span>
</div>
</el-form-item>
</el-form> </el-form>
</el-card> </el-card>
@ -32,7 +43,10 @@ import { t } from '@/lang'
import { getMemberConfig, setMemberConfig } from '@/app/api/member' import { getMemberConfig, setMemberConfig } from '@/app/api/member'
import { FormInstance, FormRules } from 'element-plus' import { FormInstance, FormRules } from 'element-plus'
import { filterNumber } from '@/utils/common' import { filterNumber } from '@/utils/common'
import { useRouter } from 'vue-router'
import { getDiyFormList } from '@/app/api/diy_form'
const router = useRouter()
const loading = ref(true) const loading = ref(true)
const ruleFormRef = ref<FormInstance>({}) const ruleFormRef = ref<FormInstance>({})
const memberNo = ref('') const memberNo = ref('')
@ -68,7 +82,8 @@ const formRules = reactive<FormRules>({
const formData = reactive<Record<string, number | string>>({ const formData = reactive<Record<string, number | string>>({
prefix: '', prefix: '',
length: 10 length: 10,
form_id: ''
}) })
const setFormData = async () => { const setFormData = async () => {
@ -92,6 +107,39 @@ const getMemberNo = async (formEl: FormInstance | undefined) => {
}) })
} }
/** ***************** 万能表单-start *************************/
// 万能表单列表下拉框
const diyFormOptions = reactive([])
// 跳转到万能表单列表，添加表单
const toDiyFormEvent = () => {
const url = router.resolve({
path: '/diy_form/list'
})
window.open(url.href)
}
// 刷新万能表单
const refreshDiyForm = (bool = false) => {
getDiyFormList({
type: 'DIY_FORM_MEMBER_INFO',
status: 1
}).then((res) => {
const data = res.data
if (data) {
diyFormOptions.splice(0, diyFormOptions.length, ...data)
if (bool) {
ElMessage({
message: t('refreshSuccess'),
type: 'success'
})
}
}
})
}
refreshDiyForm()
/** *****************万能表单-end *************************/
const onSave = async (formEl: FormInstance | undefined) => { const onSave = async (formEl: FormInstance | undefined) => {
if (loading.value || !formEl) return if (loading.value || !formEl) return
await formEl.validate((valid) => { await formEl.validate((valid) => {

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

@ -74,13 +74,11 @@ const setSmsTypeRefs = (el, index) => {
} }
loadSmsList() loadSmsList()
const isLogin = ref(false)
const editEvent = (data: any, index: number) => { const editEvent = (data: any, index: number) => {
if (data.sms_type == 'niuyun') { if (data.sms_type == 'niuyun') {
getAccountIsLogin().then((res: any) => { getAccountIsLogin().then((res: any) => {
router.push('/setting/niusms/setting') router.push('/setting/niusms/setting')
}) })
} else { } else {
smsTypeRefs.value[index].setFormData(data) smsTypeRefs.value[index].setFormData(data)
smsTypeRefs.value[index].showDialog = true smsTypeRefs.value[index].showDialog = true

9
admin/src/app/views/tools/backup_records.vue
View File

@ -23,8 +23,6 @@
</el-form> </el-form>
</el-card> </el-card>
<el-table :data="tableData.data" size="large" v-loading="tableData.loading" ref="tableRef" @selection-change="handleSelectionChange"> <el-table :data="tableData.data" size="large" v-loading="tableData.loading" ref="tableRef" @selection-change="handleSelectionChange">
<template #empty> <template #empty>
@ -176,7 +174,6 @@
<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 == 'error'"> <div class="mt-[50px]" v-show="active == 'error'">
@ -189,9 +186,7 @@
<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> </div>
<template #footer> <template #footer>
@ -261,8 +256,8 @@ const isPass: any = ref(false)
const uploading: any = ref(false) const uploading: any = ref(false)
const numberOfSteps = ref(0) const numberOfSteps = ref(0)
const currentId: any = ref(0) const currentId: any = ref(0)
let backupContents = [] let backupContents: any = []
let restoreContents = [] let restoreContents: any = []
const resetForm = (formEl: FormInstance | undefined) => { const resetForm = (formEl: FormInstance | undefined) => {
if (!formEl) return if (!formEl) return

8
admin/src/app/views/tools/schedule.vue
View File

@ -11,12 +11,8 @@
<template #default> <template #default>
<div class="flex items-center"> <div class="flex items-center">
<div> <div>
<p> <p>{{ t('cronTipsOne') }}</p>
{{ t('cronTipsOne') }} <p class="mt-2">{{ t('cronTipsTwo') }}</p>
</p>
<p class="mt-2">
{{ t('cronTipsTwo') }}
</p>
</div> </div>
</div> </div>
</template> </template>

13
admin/src/app/views/tools/schedule_log.vue
View File

@ -33,6 +33,7 @@
<el-form-item> <el-form-item>
<el-button type="primary" @click="loadCronLogList()">{{ t('search') }}</el-button> <el-button type="primary" @click="loadCronLogList()">{{ t('search') }}</el-button>
<el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button> <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
<el-button @click="clearAll" :loading="clearLoading">{{ t('clearAll') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -42,7 +43,6 @@
<div class="mb-[10px] flex items-center"> <div class="mb-[10px] flex items-center">
<el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" /> <el-checkbox v-model="toggleCheckbox" size="large" class="px-[14px]" @change="toggleChange" :indeterminate="isIndeterminate" />
<el-button @click="batchDelete" size="small" :loading="deleteLoading">{{ t('batchDelete') }}</el-button> <el-button @click="batchDelete" size="small" :loading="deleteLoading">{{ t('batchDelete') }}</el-button>
<el-button @click="clearAll" size="small" :loading="clearLoading">{{ t('clearAll') }}</el-button>
</div> </div>
<el-table :data="cronTableData.data" size="large" v-loading="cronTableData.loading" ref="cronLogListTableRef" @selection-change="handleSelectionChange"> <el-table :data="cronTableData.data" size="large" v-loading="cronTableData.loading" ref="cronLogListTableRef" @selection-change="handleSelectionChange">
@ -115,7 +115,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { reactive, ref, computed } from 'vue' import { reactive, ref } 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 { getCronLogList, getCronTemplate, deleteCronLog, clearCronLog } from '@/app/api/sys' import { getCronLogList, getCronTemplate, deleteCronLog, clearCronLog } from '@/app/api/sys'
@ -186,7 +186,7 @@ const clearLoading = ref(false)
/** /**
* 表单数据 * 表单数据
*/ */
const initialFormData = { const initialFormData = {
id: '', id: '',
name: '', name: '',
key: '', key: '',
@ -301,7 +301,7 @@ const batchDelete = () => {
}) })
deleteCronLog({ deleteCronLog({
ids: ids ids
}).then(() => { }).then(() => {
loadCronLogList() loadCronLogList()
toggleCheckbox.value = false toggleCheckbox.value = false
@ -316,7 +316,6 @@ const batchDelete = () => {
// 清空日志 // 清空日志
const clearAll = () => { const clearAll = () => {
ElMessageBox.confirm(t('clearAllTips'), t('warning'), ElMessageBox.confirm(t('clearAllTips'), t('warning'),
{ {
confirmButtonText: t('confirm'), confirmButtonText: t('confirm'),
@ -328,10 +327,10 @@ const clearAll = () => {
repeat.value = true repeat.value = true
clearLoading.value = true clearLoading.value = true
const schedule_id = route.query.id ?? '' let schedule_id: any = route.query.id ?? ''
clearCronLog({ clearCronLog({
schedule_id: schedule_id schedule_id
}).then(() => { }).then(() => {
loadCronLogList() loadCronLogList()
toggleCheckbox.value = false toggleCheckbox.value = false

3
admin/src/app/views/tools/updatecache.vue
View File

@ -22,7 +22,8 @@ import { ref } from 'vue'
import { t } from '@/lang' import { t } from '@/lang'
import { clearCache } from '@/app/api/sys' import { clearCache } from '@/app/api/sys'
import { ElMessageBox } from 'element-plus' import { ElMessageBox } from 'element-plus'
import { useRouter, useRoute } from 'vue-router' import { useRoute } from 'vue-router'
const loading = ref<Boolean>(false) const loading = ref<Boolean>(false)
const route = useRoute() const route = useRoute()
const pageName = route.meta.title const pageName = route.meta.title

3
admin/src/app/views/tools/upgrade_records.vue
View File

@ -72,7 +72,6 @@ import { t } from '@/lang'
import {ElMessage, ElMessageBox, FormInstance} from 'element-plus' import {ElMessage, ElMessageBox, FormInstance} from 'element-plus'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import { getUpgradeRecords, delUpgradeRecords } from '@/app/api/upgrade' import { getUpgradeRecords, delUpgradeRecords } from '@/app/api/upgrade'
import 'vue-web-terminal/lib/theme/dark.css'
const route = useRoute() const route = useRoute()
const pageName = route.meta.title const pageName = route.meta.title
@ -146,7 +145,7 @@ const deleteEvent = (ids: any) => {
} }
).then(() => { ).then(() => {
delUpgradeRecords({ delUpgradeRecords({
ids: ids ids
}).then(() => { }).then(() => {
loadList() loadList()
}).catch(() => { }).catch(() => {

10
admin/src/components/editor/index.vue
View File

@ -92,11 +92,11 @@ const handleEditorReady = (editor) => {
// 方案二：原型链扩展（如果编辑器版本支持） // 方案二：原型链扩展（如果编辑器版本支持）
const originalCount = editor.getContentLength; // 原生统计方法 const originalCount = editor.getContentLength; // 原生统计方法
// 覆盖方法：去除空格后统计 // 覆盖方法：去除空格后统计
editor.getContentLength = function () { editor.getContentLength = function () {
const rawContent = editor.getContent(); const rawContent = editor.getContent();
return rawContent.replace(/[\s\u3000]+/g, '').length; return rawContent.replace(/[\s\u3000]+/g, '').length;
}; };
} }
const imageSelect = (data: Record<string, any>) => { const imageSelect = (data: Record<string, any>) => {

1
admin/src/components/heat-map/index.vue
View File

@ -80,7 +80,6 @@ const value: any = computed({
} }
}) })
/** /**
* 公式： * 公式：
* 宽度：400 * 宽度：400

11
admin/src/components/upload-attachment/attachment.vue
View File

@ -455,17 +455,16 @@ const upload = computed(() => {
getAttachmentList() getAttachmentList()
uploadRef.value?.handleRemove(uploadFile) uploadRef.value?.handleRemove(uploadFile)
} else { } else {
if(time.value==null) { if (time.value == null) {
time.value = setTimeout(() => { time.value = setTimeout(() => {
uploadFile.status = 'fail' uploadFile.status = 'fail'
showElMessage({ message: response.msg, type: 'error' }) showElMessage({ message: response.msg, type: 'error' })
clearTimeout(time.value) clearTimeout(time.value)
time.value=null time.value = null
},500) }, 500)
} else {
}else{
clearTimeout(time.value) clearTimeout(time.value)
time.value=null time.value = null
} }
} }
} }

8
admin/src/components/upload-attachment/index.vue
View File

@ -47,19 +47,17 @@ const emit = defineEmits(['confirm'])
*/ */
const confirm = () => { const confirm = () => {
showDialog.value = false showDialog.value = false
let filesObj = attachmentRef?.value.selectedFile || {}; let filesObj = attachmentRef?.value.selectedFile || {};
let filesIndexObj = attachmentRef?.value.selectedFileIndex || {}; let filesIndexObj = attachmentRef?.value.selectedFileIndex || {};
// 整理图片顺序 // 整理图片顺序
let arr = []; let arr = [];
Object.values(filesIndexObj).forEach((item,index)=>{ Object.values(filesIndexObj).forEach((item, index) => {
for(let key in filesObj){ for (let key in filesObj) {
if(item == key){ if (item == key) {
arr.push(deepClone(filesObj[key])) arr.push(deepClone(filesObj[key]))
} }
} }
}) })
emit('confirm', prop.limit == 1 ? arr[0] ?? null : arr) emit('confirm', prop.limit == 1 ? arr[0] ?? null : arr)
} }

10
admin/src/components/upload-image/index.vue
View File

@ -58,7 +58,7 @@ const prop = defineProps({
type: String, type: String,
default: 'image' default: 'image'
}, },
imageFit : { imageFit: {
type: String, type: String,
default: 'contain' default: 'contain'
}, },
@ -106,9 +106,9 @@ const setValue = () => {
} }
watch(() => value.value, () => { watch(() => value.value, () => {
if(value.value.indexOf('data:image') != -1){ if (value.value.indexOf('data:image') != -1) {
images.data = [value.value] images.data = [value.value]
}else { } else {
images.data = [ images.data = [
...value.value.split(',').filter((item: string) => { ...value.value.split(',').filter((item: string) => {
return item return item
@ -172,14 +172,12 @@ const previewImage = (index: number = 0) => {
* 拖拽 * 拖拽
*/ */
const imgListRef:any = ref(null) const imgListRef:any = ref(null)
onMounted(()=>{ onMounted(()=> {
nextTick(() => { nextTick(() => {
rowDrop() rowDrop()
}) })
}) })
const activeRows = ref<any[]>([])
// 拖拽排序 // 拖拽排序
const rowDrop = () => { const rowDrop = () => {
if (prop.limit == 1) return; if (prop.limit == 1) return;

6
admin/src/components/verifition/api/index.js
View File

@ -5,7 +5,7 @@
import request from "./../utils/axios" //组件内部封装的axios import request from "./../utils/axios" //组件内部封装的axios
// import request from "@/app/api/axios.js" //调用项目封装的axios // import request from "@/app/api/axios.js" //调用项目封装的axios
//获取验证图片 以及token // 获取验证图片 以及token
export function reqGet(data) { export function reqGet(data) {
return request.get('/captcha/create', { params: { ...data } }); return request.get('/captcha/create', { params: { ...data } });
@ -16,7 +16,7 @@ export function reqGet(data) {
// }) // })
} }
//滑动或者点选验证 // 滑动或者点选验证
export function reqCheck(data) { export function reqCheck(data) {
return request.get('/captcha/check', { params: { ...data } }); return request.get('/captcha/check', { params: { ...data } });
@ -26,5 +26,3 @@ export function reqCheck(data) {
// data // data
// }) // })
} }

28
admin/src/layout/default/components/aside/menu-item.vue
View File

@ -8,7 +8,7 @@
<span class="ml-[10px]">{{ meta.title }}</span> <span class="ml-[10px]">{{ meta.title }}</span>
</template> </template>
<menu-item v-for="(route, index) in routes.children" :routes="route" :key="index" :level="props.level + 1" /> <menu-item v-for="(route, index) in routes.children" :routes="route" :key="index" :level="props.level + 1" />
<template v-if="routes.name == 'addon_list'"> <template v-if="routes.name == 'addon_list' || routes.name == 'marketing_list'">
<template v-if="addonsMenus"> <template v-if="addonsMenus">
<menu-item :routes="addonsMenus" :key="index" :level="props.level + 1"/> <menu-item :routes="addonsMenus" :key="index" :level="props.level + 1"/>
</template> </template>
@ -43,6 +43,7 @@ import { ref, computed, watch } from 'vue'
import menuItem from './menu-item.vue' import menuItem from './menu-item.vue'
import useSystemStore from '@/stores/modules/system' import useSystemStore from '@/stores/modules/system'
import useUserStore from '@/stores/modules/user' import useUserStore from '@/stores/modules/user'
import storage from '@/utils/storage'
const router = useRouter() const router = useRouter()
const route = useRoute() const route = useRoute()
@ -85,14 +86,25 @@ routers.forEach(item => {
const addonsMenus = ref(null) const addonsMenus = ref(null)
watch(route, () => { watch(route, () => {
if (props.routes.name != 'addon_list') return if (props.routes.name == 'addon_list') {
if (systemAddonKeys.value.includes(route.meta.addon) && addonRouters[route.meta.addon]) {
addonsMenus.value = addonRouters[route.meta.addon]
} else if (route.meta.attr && addonRouters[route.meta.attr]) {
addonsMenus.value = addonRouters[route.meta.attr]
} else {
addonsMenus.value = null
}
}
if (systemAddonKeys.value.includes(route.meta.addon) && addonRouters[route.meta.addon]) { const marketingKeys = storage.get('defaultMarketingKeys')
addonsMenus.value = addonRouters[route.meta.addon] const matchedName = route.matched[1]?.name
} else if (route.meta.attr && addonRouters[route.meta.attr]) { if (props.routes.name == 'marketing_list') {
addonsMenus.value = addonRouters[route.meta.attr] if (marketingKeys && marketingKeys.includes(matchedName)) {
} else { addonsMenus.value = route.matched[1] ?? []
addonsMenus.value = null addonsMenus.value.meta.show = 1
} else {
addonsMenus.value = null
}
} }
}, { immediate: true }) }, { immediate: true })
</script> </script>

53
admin/src/layout/default/components/aside/side.vue
View File

@ -23,7 +23,7 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue' import { ref, onMounted } from 'vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import useSystemStore from '@/stores/modules/system' import useSystemStore from '@/stores/modules/system'
import useUserStore from '@/stores/modules/user' import useUserStore from '@/stores/modules/user'
@ -31,6 +31,8 @@ import menuItem from './menu-item.vue'
import { img } from '@/utils/common' import { img } from '@/utils/common'
import { findFirstValidRoute } from '@/router/routers' import { findFirstValidRoute } from '@/router/routers'
import { getWebConfig } from "@/app/api/sys" import { getWebConfig } from "@/app/api/sys"
import { getShowMarketing } from '@/app/api/addon'
import storage from '@/utils/storage'
const systemStore = useSystemStore() const systemStore = useSystemStore()
const userStore = useUserStore() const userStore = useUserStore()
@ -41,20 +43,35 @@ const addonIndexRoute = userStore.addonIndexRoute
const menuData = ref<Record<string, any>[]>([]) const menuData = ref<Record<string, any>[]>([])
const addonRouters: Record<string, any> = {} const addonRouters: Record<string, any> = {}
getWebConfig().then(({ data }) => { const getMarketingList = async () => {
webSite.value = data const res = await getShowMarketing()
const marketingList = res.data
const marketingKeys = marketingList?.marketing?.list?.map(item => item.key) ?? []
// menuData.value.forEach((item, index, arr) => {
// if (marketingKeys.includes(item.name)) {
// arr.splice(index, 1)
// }
// })
storage.set({ key: 'defaultMarketingKeys', data: marketingKeys })
}
onMounted(() => {
getWebConfig().then(({ data }) => {
webSite.value = data
});
getMarketingList()
}) })
routers.forEach(item => { routers.forEach(item => {
item.original_name = item.name item.original_name = item.name
if (item.meta.addon == '') { if (item.meta.addon == '') {
if (item.meta.attr == '') { if (item.meta.attr == '' && item.name != 'sign' && item.name != 'verify') {
if (item.children && item.children.length) { if (item.children && item.children.length) {
item.name = findFirstValidRoute(item.children) item.name = findFirstValidRoute(item.children)
} }
menuData.value.push(item) menuData.value.push(item)
} }
} else if (item.meta.addon != '' && systemStore?.apps.length == 1 && systemStore?.apps[0].key == item.meta.addon) { } else if (item.meta.addon != '' && systemStore?.apps.length == 1 && systemStore?.apps[0].key == item.meta.addon && item.meta.show) {
if (item.children) { if (item.children) {
item.children.forEach((citem: Record<string, any>) => { item.children.forEach((citem: Record<string, any>) => {
citem.original_name = citem.name citem.original_name = citem.name
@ -69,6 +86,19 @@ routers.forEach(item => {
} else { } else {
addonRouters[item.meta.addon] = item addonRouters[item.meta.addon] = item
} }
// 排序, 功能正确，改了排序后需要把菜单排序的默认值重新调整一下【多应用一级菜单，单应用二级菜单】
// menuData.value.sort((a, b) => {
// if (a.meta.sort && b.meta.sort) {
// return b.meta.sort - a.meta.sort
// } else if (a.meta.sort) {
// return -1
// } else if (b.meta.sort) {
// return 1
// } else {
// return 0
// }
// })
}) })
// 多应用时将应用插入菜单 // 多应用时将应用插入菜单
@ -81,6 +111,19 @@ if (systemStore?.apps.length > 1) {
} }
}) })
menuData.value.unshift(...routers) menuData.value.unshift(...routers)
// 排序, 功能正确，改了排序后需要把菜单排序的默认值重新调整一下【多应用一级菜单，单应用二级菜单】
// menuData.value.sort((a, b) => {
// if (a.meta.sort && b.meta.sort) {
// return b.meta.sort - a.meta.sort
// } else if (a.meta.sort) {
// return -1
// } else if (b.meta.sort) {
// return 1
// } else {
// return 0
// }
// })
} }
</script> </script>

7
admin/src/layout/default/components/header/user-info.vue
View File

@ -38,21 +38,20 @@
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</div> </div>
</template> </template>
</el-dropdown> </el-dropdown>
<el-dialog v-model="changePasswordDialog" width="450px" title="修改密码"> <el-dialog v-model="changePasswordDialog" width="450px" title="修改密码">
<div> <div>
<el-form :model="saveInfo" label-width="90px" ref="formRef" :rules="formRules" class="page-form"> <el-form :model="saveInfo" label-width="90px" ref="formRef" :rules="formRules" class="page-form">
<el-form-item :label="t('originalPassword')" prop="original_password"> <el-form-item :label="t('originalPassword')" prop="original_password">
<el-input v-model="saveInfo.original_password" type="password" :placeholder="t('originalPasswordPlaceholder')" clearable class="input-width" /> <el-input v-model="saveInfo.original_password" type="password" :placeholder="t('originalPasswordPlaceholder')" clearable class="input-width" maxlength="40" />
</el-form-item> </el-form-item>
<el-form-item :label="t('newPassword')" prop="password"> <el-form-item :label="t('newPassword')" prop="password">
<el-input v-model="saveInfo.password" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" /> <el-input v-model="saveInfo.password" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" maxlength="40" />
<div class="form-tip">{{t('passwordTip')}}</div> <div class="form-tip">{{t('passwordTip')}}</div>
</el-form-item> </el-form-item>
<el-form-item :label="t('passwordCopy')" prop="password_copy"> <el-form-item :label="t('passwordCopy')" prop="password_copy">
<el-input v-model="saveInfo.password_copy" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" /> <el-input v-model="saveInfo.password_copy" type="password" :placeholder="t('passwordPlaceholder')" clearable class="input-width" maxlength="40" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

92
admin/src/layout/major/components/aside/side.vue
View File

@ -47,10 +47,11 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, watch } from 'vue' import { ref, watch, computed, onMounted, watchEffect } from 'vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import useSystemStore from '@/stores/modules/system' import useSystemStore from '@/stores/modules/system'
import useUserStore from '@/stores/modules/user' import useUserStore from '@/stores/modules/user'
import { getShowApp,getShowMarketing } from '@/app/api/addon'
import menuItem from './menu-item.vue' import menuItem from './menu-item.vue'
import { img, isUrl } from '@/utils/common' import { img, isUrl } from '@/utils/common'
import { findFirstValidRoute } from '@/router/routers' import { findFirstValidRoute } from '@/router/routers'
@ -105,35 +106,92 @@ if (systemStore?.apps.length > 1) {
oneMenuData.value.unshift(...routers) oneMenuData.value.unshift(...routers)
} }
const appList = ref(null);
const marketingList = ref(null);
const oneMenuActive = ref(route.matched[1].name) const oneMenuActive = ref(route.matched[1].name)
watch(route, () => { const getAppList = async () => {
if (route.meta.attr != '') { const res = await getShowApp();
if (route.matched[2]) oneMenuActive.value = route.matched[2].name appList.value = res.data;
twoMenuData.value = route.matched[1].children ?? [] // loading.value = false;
};
const getMarketingList = async () => {
const res = await getShowMarketing();
marketingList.value = res.data
}
onMounted(async () => {
await getAppList() // 确保数据先加载
await getMarketingList()
})
watchEffect(() => {
// if (!appList.value || loading.value) return; // 确保数据加载完毕
const addonKeys = appList.value?.addon?.list?.map(item => item.key) ?? [];
const toolKeys = appList.value?.tool?.list?.map(item => item.key) ?? [];
const allKeys = [...addonKeys, ...toolKeys];
const marketingKeys = marketingList.value?.marketing?.list?.map(item => item.key) ?? [];
const matchedName = route.matched[1]?.name;
if (allKeys.includes(matchedName)) {
oneMenuActive.value = "addon";
twoMenuData.value = route.matched[1]?.children ?? [];
} else if (marketingKeys.includes(matchedName)) {
oneMenuActive.value = "active";
twoMenuData.value = route.matched[1]?.children ?? [];
} else if (route.meta.attr !== "") {
oneMenuActive.value = route.matched[2]?.name;
twoMenuData.value = route.matched[1]?.children ?? [];
} else { } else {
// 多应用 // 多应用
if (systemStore?.apps.length > 1) { if (systemStore?.apps.length > 1) {
twoMenuData.value = route.matched[1].children twoMenuData.value = route.matched[1]?.children;
oneMenuActive.value = route.matched[1].name oneMenuActive.value = route.matched[1]?.name;
} else { } else {
// 单应用 // 单应用
const oneMenu = route.matched[1] const oneMenu = route.matched[1];
if (oneMenu.meta.addon == '') { if (oneMenu.meta.addon === "") {
oneMenuActive.value = route.matched[1].name oneMenuActive.value = route.matched[1]?.name;
twoMenuData.value = route.matched[1].children ?? [] twoMenuData.value = route.matched[1]?.children ?? [];
} else { } else {
if (oneMenu.meta.addon == systemStore?.apps[0].key) { if (oneMenu.meta.addon === systemStore?.apps[0]?.key) {
oneMenuActive.value = route.matched[2].name oneMenuActive.value = route.matched[2]?.name;
twoMenuData.value = route.matched[2].children ?? [] twoMenuData.value = route.matched[2]?.children ?? [];
} else { } else {
oneMenuActive.value = route.matched[1].name oneMenuActive.value = route.matched[1]?.name;
twoMenuData.value = route.matched[1].children ?? [] twoMenuData.value = route.matched[1]?.children ?? [];
} }
} }
} }
} }
}, { immediate: true }) })
// watch(route, () => {
// if (route.meta.attr != '') {
// if (route.matched[2]) oneMenuActive.value = route.matched[2].name
// twoMenuData.value = route.matched[1].children ?? []
// } else {
// // 多应用
// if (systemStore?.apps.length > 1) {
// twoMenuData.value = route.matched[1].children
// oneMenuActive.value = route.matched[1].name
// } else {
// // 单应用
// const oneMenu = route.matched[1]
// if (oneMenu.meta.addon == '') {
// oneMenuActive.value = route.matched[1].name
// twoMenuData.value = route.matched[1].children ?? []
// } else {
// if (oneMenu.meta.addon == systemStore?.apps[0].key) {
// oneMenuActive.value = route.matched[2].name
// twoMenuData.value = route.matched[2].children ?? []
// } else {
// oneMenuActive.value = route.matched[1].name
// twoMenuData.value = route.matched[1].children ?? []
// }
// }
// }
// }
// }, { immediate: true })
// 让二级菜单默认展开 // 让二级菜单默认展开
const menuOption = ref([]) const menuOption = ref([])

12
admin/src/stores/modules/diy.ts
View File

@ -79,7 +79,7 @@ const useDiyStore = defineStore('diy', {
imgUrl: "", imgUrl: "",
imgWidth: '', imgWidth: '',
imgHeight: '', imgHeight: '',
count: -1, count: 'once', // 'once'（仅一次） | 'always'（每次）
show: 0, show: 0,
link: { link: {
name: "" name: ""
@ -168,7 +168,7 @@ const useDiyStore = defineStore('diy', {
imgUrl: "", imgUrl: "",
imgWidth: '', imgWidth: '',
imgHeight: '', imgHeight: '',
count: -1, count: 'once', // 'once'（仅一次） | 'always'（每次）
show: 0, show: 0,
link: { link: {
name: "" name: ""
@ -511,6 +511,14 @@ const useDiyStore = defineStore('diy', {
// return false; // return false;
// } // }
if (this.global.popWindow.show && !this.global.popWindow.imgUrl) {
ElMessage({
message: '请上传弹窗图片',
type: 'warning'
})
return false;
}
for (var i = 0; i < this.value.length; i++) { for (var i = 0; i < this.value.length; i++) {
try { try {
if (this.value[i].verify) { if (this.value[i].verify) {

45
admin/src/utils/common.ts
View File

@ -247,7 +247,6 @@ export function moneyFormat(money: string): string {
return isNaN(parseFloat(money)) ? money : parseFloat(money).toFixed(2) return isNaN(parseFloat(money)) ? money : parseFloat(money).toFixed(2)
} }
/** /**
* 时间戳转日期格式 * 时间戳转日期格式
*/ */
@ -338,50 +337,6 @@ export function filterSpecial(event: any) {
export function filterBlank(event: any) { export function filterBlank(event: any) {
event.target.value = event.target.value.replace(/\s/g, ''); event.target.value = event.target.value.replace(/\s/g, '');
} }
export function importIconFontCss() {
// const modulesFiles = {}; // import.meta.glob('@/styles/icon/official-iconfont.css', { eager: true })
// const modulesFiles = import.meta.glob('@/addon/**/assets/icon/*.css', { eager: true })
// // console.log('modulesFiles',modulesFiles)
//
// const modules:any = {}
// for (const [key, value] of Object.entries(modulesFiles)) {
// const moduleName:any = key.split('/').pop()
// const name = moduleName.split('.')[0]
// modules[name] = value.default
// }
//
// // console.log('modules',modules)
//
// for(let key in modules) {
// // console.log('modules[key]',modules[key])
// import(modules[key]).then((module) => {
// // console.log('module', module.default);
// }).catch((e) => {
// // console.log('caca', e)
// });
// }
}
export function getIcon() {
// const modulesFiles = import.meta.glob('@/styles/icon/*.json', { eager: true })
// const addonModulesFiles = import.meta.glob('@/addon/**/assets/icon/*.json', { eager: true })
// addonModulesFiles && Object.assign(modulesFiles, addonModulesFiles)
//
// // const modulesFiles = {}; // import.meta.glob('@/styles/icon/official-iconfont.css', { eager: true })
// // const modulesFiles = import.meta.glob('@/styles/icon/*.json', { eager: true })
// console.log('modulesFiles', modulesFiles)
//
// const modules = {}
// for (const [key, value] of Object.entries(modulesFiles)) {
// const moduleName = key.split('/').pop()
// console.log('moduleName',moduleName)
// const name = moduleName.split('.')[0]
// modules[name] = value.default
// }
// console.log('modules', modules)
// // const addonModulesFiles = import.meta.glob('@/addon/**/assets/icon/*.json', { eager: true })
}
/** /**
* 设置表格分页数据的本地存储 * 设置表格分页数据的本地存储
* @param page * @param page