Merge branch 'milestone0718-2025周年庆后台' of http://39.101.133.168:8807/lihuilin/AnniversaryBackstage into milestone0718-2025周年庆后台

activitylink/src/views/zhongchou/activity/index.vue

@@ -106,12 +106,12 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="活动状态" prop="status">
+            <!-- <el-form-item label="活动状态" prop="status">
               <el-select v-model="activity.status" placeholder="请选择活动状态">
                 <el-option label="启用" value="1" />
                 <el-option label="禁用" value="0" />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
 
             <!-- 新增：开始时间 -->
             <el-form-item label="开始时间" prop="startTime">
@@ -276,7 +276,7 @@ const addActivity = async () => {
       activityName: activity.value.activityName,
       marketOne: activity.value.marketOne,
       marketTwo: activity.value.marketTwo,
-      status: Number(activity.value.status),
+      status: 0,
       startTime: activity.value.startTime,
       endTime: activity.value.endTime
     }

activitylink/src/views/zhongchou/gift/importFixedList/index.vue

@@ -49,7 +49,7 @@
   <el-dialog v-model="addVisible" title="添加用户" width="500" align-center>
     <el-form :model="addObj" label-width="80px">
       <el-form-item label="姓名" prop="username">
-        <el-input v-model="addObj.username" placeholder="请输入用户姓名" />
+        <el-input v-model="addObj.username" placeholder="请输入用户姓名" @input="trimUsername"/>
       </el-form-item>
       <el-form-item label="精网号" prop="jwcode">
         <el-input v-model="addObj.jwcode" placeholder="请输入精网号" @input="trimAddJwcode" />
@@ -168,6 +168,19 @@ const submitAdd = async () => {
     ElMessage.error('请填写完整信息')
     return
   }
+  
+  // 校验用户名长度
+  if (addObj.value.username.length > 30) {
+    ElMessage.error('姓名最长为30个字符')
+    return
+  }
+  
+  // 校验精网号长度是否在5-12位之间
+  if (addObj.value.jwcode.length < 5 || addObj.value.jwcode.length > 12) {
+    ElMessage.error('精网号必须为5-12位数字')
+    return
+  }
+  
   try {
     const response = await addFixUser(addObj.value)
     if (response.code === 200) {
@@ -245,7 +258,17 @@ const trimJwcode = (value) => {
   searchObj.value.jwcode = value.replace(/\D/g, '')
 }
 const trimAddJwcode = (value) => {
-  addObj.value.jwcode = value.replace(/\D/g, '')
+  // 限制只允许数字，并且长度在5-12位之间
+  const numericValue = value.replace(/\D/g, '');
+  addObj.value.jwcode = numericValue.slice(0, 12); // 最多保留12位
+}
+
+// 添加处理用户名输入的函数
+const trimUsername = (value) => {
+  // 只允许中文、英文字符
+  const filteredValue = value.replace(/[^\u4e00-\u9fa5a-zA-Z]/g, '');
+  // 限制最长30个字符
+  addObj.value.username = filteredValue.slice(0, 30);
 }
 const handleSizeChange = (val) => {
   pagination.value.pageSize = val

activitylink/src/views/zhongchou/gift/importuser/index.vue

@@ -50,7 +50,7 @@
   <el-dialog v-model="addVisible" title="添加用户" width="500" align-center>
     <el-form :model="addObj" label-width="80px">
       <el-form-item label="姓名" prop="username">
-        <el-input v-model="addObj.username" placeholder="请输入用户姓名" />
+        <el-input v-model="addObj.username" placeholder="请输入用户姓名" @input="trimUsername" />
       </el-form-item>
       <el-form-item label="精网号" prop="jwcode">
         <el-input v-model="addObj.jwcode" placeholder="请输入精网号" @input="trimAddJwcode" />
@@ -145,11 +145,25 @@ const getUsers = async () => {
   }
 }
 // 新增
+// 修改 submitAdd 函数，增加长度校验
 const submitAdd = async () => {
   if (!addObj.value.username || !addObj.value.jwcode) {
     ElMessage.error('请填写完整信息')
     return
   }
+  
+  // 校验用户名长度
+  if (addObj.value.username.length > 30) {
+    ElMessage.error('姓名最长为30个字符')
+    return
+  }
+  
+  // 校验精网号长度是否在5-12位之间
+  if (addObj.value.jwcode.length < 5 || addObj.value.jwcode.length > 12) {
+    ElMessage.error('精网号必须为5-12位数字')
+    return
+  }
+  
   try {
     const response = await addUser(addObj.value)
     if (response.code === 200) {
@@ -226,7 +240,17 @@ const trimJwcode = (value) => {
   searchObj.value.jwcode = value.replace(/\D/g, '')
 }
 const trimAddJwcode = (value) => {
-  addObj.value.jwcode = value.replace(/\D/g, '')
+  // 限制只允许数字，并且长度在5-12位之间
+  const numericValue = value.replace(/\D/g, '');
+  addObj.value.jwcode = numericValue.slice(0, 12); // 最多保留12位
+}
+
+// 添加处理用户名输入的函数
+const trimUsername = (value) => {
+  // 只允许中文、英文字符
+  const filteredValue = value.replace(/[^\u4e00-\u9fa5a-zA-Z]/g, '');
+  // 限制最长30个字符
+  addObj.value.username = filteredValue.slice(0, 30);
 }
 const handleSizeChange = (val) => {
   pagination.value.pageSize = val