diff --git a/src/components/MoneyManage/ProductSelect.vue b/src/components/MoneyManage/ProductSelect.vue
index b6b7491..af9e29b 100644
--- a/src/components/MoneyManage/ProductSelect.vue
+++ b/src/components/MoneyManage/ProductSelect.vue
@@ -135,7 +135,7 @@ watch(selectedValue, (newVal) => {
});
-const AIProduct = ['AI机构追踪', 'AI机构出击', 'AI机构资金', 'AI机活跃度','AI机构探测神器']
+const AIProduct = ['AI机构追踪', 'AI机构出击', 'AI机构资金', 'AI机构活跃度','AI机构探测神器']
const superProduct = ['超级机构透视', '超级机构伏击', '超级机构猎杀', '超级机构脉搏', '超级机构罗盘','超级机构探测神器']
const InfoFee = ['静态信息费', '博股会员']
const menuData = [
diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue
index d321029..1b7d217 100644
--- a/src/views/activityManage/activity.vue
+++ b/src/views/activityManage/activity.vue
@@ -71,7 +71,8 @@
+ layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" style="margin-top: 1vh;"
+ @size-change="handleSizeChange" @current-change="handleCurrentChange" />
@@ -156,7 +157,7 @@ const { adminData, menuTree } = storeToRefs(adminStore)
import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue'
import { add } from 'lodash';
// 活动名称正则表达式
-const activityNameReg = /^[a-zA-Z0-9\u4e00-\u9fa5\u0e00-\u0e7f\uff0c\uff0e\uff01\uff1f\uff0c\uff1b\uff1a\u201c\u201d\u2018\u2019\uff08\uff09\u300a\u300b\u3010\u3011\u2014\uff5e,.,!?:;'"()\[\]_\-&+=\s]{0,100}$/;
+const activityNameReg = /^[-a-zA-Z0-9\u4e00-\u9fa5,。!?、;:“”‘’()《》【】——~,.!?:;'"()\[\]_&+=]{0,100}$/;
const tableData = ref([])
const pagination = ref({
@@ -231,6 +232,9 @@ const handleAdd = async function () {
ElMessage.error('请选择结束时间')
return
}
+ if(addForm.value.businessBelong === '客户归属地'){
+ addForm.value.area = []
+ }
const params = {
activityName: addForm.value.activityName,
@@ -286,6 +290,9 @@ const handleEdit = async function () {
ElMessage.error('请选择结束时间')
return
}
+ if(editForm.value.businessBelong === '客户归属地'){
+ editForm.value.area = []
+ }
const params = {
id: editForm.value.id,
@@ -429,7 +436,14 @@ const validateActivityName = (name) => {
}
return true;
};
-
+const handleSizeChange = function(val){
+ pagination.pageSize = val
+ getActivity()
+}
+const handleCurrentChange = function(val){
+ pagination.pageNum = val
+ getActivity()
+}
onMounted(() => {
getActivity()
getmarkets()
diff --git a/src/views/moneyManage/receiveDetail/receiveDetail1.vue b/src/views/moneyManage/receiveDetail/receiveDetail1.vue
index f01443c..d3cb174 100644
--- a/src/views/moneyManage/receiveDetail/receiveDetail1.vue
+++ b/src/views/moneyManage/receiveDetail/receiveDetail1.vue
@@ -861,7 +861,7 @@ const selectItems = [
"AI机构追踪",
"AI机构出击",
"AI机构资金",
- "AI机活跃度",
+ "AI机构活跃度",
"超级机构透视",
"超级机构伏击",
"超级机构猎杀",
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index e94b7d8..b5422fe 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -529,7 +529,7 @@ const ifGold = () => {
addFormData.value.goodNum = 0
} else {
isGold.value = false
- const selectItems = ["AI机构追踪", "AI机构出击", "AI机构资金", "AI机活跃度", "超级机构透视", "超级机构伏击", "超级机构猎杀", "超级机构脉搏", "超级机构罗盘", 'HC信息费']
+ const selectItems = ["AI机构追踪", "AI机构出击", "AI机构资金", "AI机构活跃度", "超级机构透视", "超级机构伏击", "超级机构猎杀", "超级机构脉搏", "超级机构罗盘", 'HC信息费']
if (selectItems.includes(addFormData.value.goodsName)) {
addFormData.value.numUnit = ''
} else if (addFormData.value.goodsName == '静态信息费') {
diff --git a/src/views/moneyManage/receiveDetail/utils/staticData.js b/src/views/moneyManage/receiveDetail/utils/staticData.js
index 35dce6c..54fb915 100644
--- a/src/views/moneyManage/receiveDetail/utils/staticData.js
+++ b/src/views/moneyManage/receiveDetail/utils/staticData.js
@@ -146,8 +146,8 @@ export const productList = [
"label": "AI机构资金"
},
{
- "value": "AI机活跃度",
- "label": "AI机活跃度"
+ "value": "AI机构活跃度",
+ "label": "AI机构活跃度"
}
]
},