yangg hace 2 días
padre
commit
2dad6f26c4

+ 25 - 25
pages/Personal/Personal.vue

@@ -1346,13 +1346,13 @@ import { apiBaseUrl } from '@/common/config.js';
 				// 	isValid = false;
 				// }
 				
-				if (this.shouldValidateField('phone', 'family') && !this.familyMemberForm.phone) {
-					this.familyMemberErrors.phone = '请输入联系电话';
-					isValid = false;
-				} else if (this.shouldValidateField('phone', 'family') && this.familyMemberForm.phone && !/^1[3-9]\d{9}$/.test(this.familyMemberForm.phone)) {
-					this.familyMemberErrors.phone = '请输入正确的手机号';
-					isValid = false;
-				}
+				// if (this.shouldValidateField('phone', 'family') && !this.familyMemberForm.phone) {
+				// 	this.familyMemberErrors.phone = '请输入联系电话';
+				// 	isValid = false;
+				// } else if (this.shouldValidateField('phone', 'family') && this.familyMemberForm.phone && !/^1[3-9]\d{9}$/.test(this.familyMemberForm.phone)) {
+				// 	this.familyMemberErrors.phone = '请输入正确的手机号';
+				// 	isValid = false;
+				// }
 				
 				if (!isValid) {
 					uni.showToast({
@@ -1654,30 +1654,30 @@ import { apiBaseUrl } from '@/common/config.js';
 					isValid = false;
 				}
 
-				if (this.shouldValidateField('department', 'work') && !this.workForm.department) {
-					this.workErrors.department = '请输入任职部门';
-					isValid = false;
-				}
+				// if (this.shouldValidateField('department', 'work') && !this.workForm.department) {
+				// 	this.workErrors.department = '请输入任职部门';
+				// 	isValid = false;
+				// }
 
-				if (this.shouldValidateField('position', 'work') && !this.workForm.position) {
-					this.workErrors.position = '请输入担任职务';
-					isValid = false;
-				}
+				// if (this.shouldValidateField('position', 'work') && !this.workForm.position) {
+				// 	this.workErrors.position = '请输入担任职务';
+				// 	isValid = false;
+				// }
 
 				if (this.shouldValidateField('employeeCount', 'work') && !this.workForm.employeeCount) {
 					this.workErrors.employeeCount = '请输入单位人数';
 					isValid = false;
 				}
 
-				if (this.shouldValidateField('monthlySalary', 'work') && !this.workForm.monthlySalary) {
-					this.workErrors.monthlySalary = '请输入月薪';
-					isValid = false;
-				}
+				// if (this.shouldValidateField('monthlySalary', 'work') && !this.workForm.monthlySalary) {
+				// 	this.workErrors.monthlySalary = '请输入月薪';
+				// 	isValid = false;
+				// }
 
-				if (this.shouldValidateField('supervisor', 'work') && !this.workForm.supervisor) {	
-					this.workErrors.supervisor = '请输入直属上级';
-					isValid = false;
-				}
+				// if (this.shouldValidateField('supervisor', 'work') && !this.workForm.supervisor) {	
+				// 	this.workErrors.supervisor = '请输入直属上级';
+				// 	isValid = false;
+				// }
 
 				// if (this.shouldValidateField('supervisorPhone', 'work') && !this.workForm.supervisorPhone) {
 				// 	this.workErrors.supervisorPhone = '请输入直属上级电话';
@@ -1974,9 +1974,9 @@ import { apiBaseUrl } from '@/common/config.js';
 					end_date: work.endTime,
 					company_name: work.companyName,
 					department: work.department,
-					company_size: work.employeeCount,
+					company_size: parseInt(work.employeeCount)||0,
 					position: work.position,
-					monthly_salary: work.monthlySalary,
+					monthly_salary: work.monthlySalary||0,
 					supervisor_name: work.supervisor,
 					supervisor_phone: work.supervisorPhone
 				}));

+ 6 - 3
pages/camera/camera.vue

@@ -1123,8 +1123,10 @@
 				const group2 = []; // 其他题目
 
 				// 对题目进行分类
+				console.log('处理题目分组...',questions);
 				questions.forEach(q => {
-					if (q.category === 5) {
+					console.log(q.questionType === 4)
+					if (q.questionType !== 4) {
 						group1.push(q);
 					} else {
 						group2.push(q);
@@ -1132,9 +1134,10 @@
 				});
 				
 				// 将填空题添加到适当的分组中
+				console.log('处理填空题...',this.blankQuestions);
 				if (this.blankQuestions && this.blankQuestions.length > 0) {
 					this.blankQuestions.forEach(q => {
-						if (q.category === 5) {
+						if (q.questionType === 6) {
 							group1.push(q);
 						} else {
 							group2.push(q);
@@ -1143,7 +1146,7 @@
 				}
 
 				// 按照要求的顺序组合题目组:先显示其他题目,再显示 category 为 5 的题目
-				this.questionGroups = [group2, group1].filter(group => group.length > 0);
+				this.questionGroups = [group1, group2].filter(group => group.length > 0);
 				
 				// 设置当前显示的题目
 				this.questions = this.questionGroups[0] || [];

+ 2 - 25
unpackage/dist/dev/mp-weixin/pages/Personal/Personal.js

@@ -690,13 +690,6 @@ const _sfc_main = {
         this.familyMemberErrors.name = "请输入姓名";
         isValid = false;
       }
-      if (this.shouldValidateField("phone", "family") && !this.familyMemberForm.phone) {
-        this.familyMemberErrors.phone = "请输入联系电话";
-        isValid = false;
-      } else if (this.shouldValidateField("phone", "family") && this.familyMemberForm.phone && !/^1[3-9]\d{9}$/.test(this.familyMemberForm.phone)) {
-        this.familyMemberErrors.phone = "请输入正确的手机号";
-        isValid = false;
-      }
       if (!isValid) {
         common_vendor.index.showToast({
           title: "请完善家庭成员信息",
@@ -953,26 +946,10 @@ const _sfc_main = {
         this.workErrors.companyName = "请输入单位名称";
         isValid = false;
       }
-      if (this.shouldValidateField("department", "work") && !this.workForm.department) {
-        this.workErrors.department = "请输入任职部门";
-        isValid = false;
-      }
-      if (this.shouldValidateField("position", "work") && !this.workForm.position) {
-        this.workErrors.position = "请输入担任职务";
-        isValid = false;
-      }
       if (this.shouldValidateField("employeeCount", "work") && !this.workForm.employeeCount) {
         this.workErrors.employeeCount = "请输入单位人数";
         isValid = false;
       }
-      if (this.shouldValidateField("monthlySalary", "work") && !this.workForm.monthlySalary) {
-        this.workErrors.monthlySalary = "请输入月薪";
-        isValid = false;
-      }
-      if (this.shouldValidateField("supervisor", "work") && !this.workForm.supervisor) {
-        this.workErrors.supervisor = "请输入直属上级";
-        isValid = false;
-      }
       if (!isValid) {
         common_vendor.index.showToast({
           title: "请完善工作经历信息",
@@ -1233,9 +1210,9 @@ const _sfc_main = {
         end_date: work.endTime,
         company_name: work.companyName,
         department: work.department,
-        company_size: work.employeeCount,
+        company_size: parseInt(work.employeeCount) || 0,
         position: work.position,
-        monthly_salary: work.monthlySalary,
+        monthly_salary: work.monthlySalary || 0,
         supervisor_name: work.supervisor,
         supervisor_phone: work.supervisorPhone
       }));

+ 6 - 3
unpackage/dist/dev/mp-weixin/pages/camera/camera.js

@@ -748,23 +748,26 @@ const _sfc_main = {
     processQuestionGroups(questions) {
       const group1 = [];
       const group2 = [];
+      console.log("处理题目分组...", questions);
       questions.forEach((q) => {
-        if (q.category === 5) {
+        console.log(q.questionType === 4);
+        if (q.questionType !== 4) {
           group1.push(q);
         } else {
           group2.push(q);
         }
       });
+      console.log("处理填空题...", this.blankQuestions);
       if (this.blankQuestions && this.blankQuestions.length > 0) {
         this.blankQuestions.forEach((q) => {
-          if (q.category === 5) {
+          if (q.questionType === 6) {
             group1.push(q);
           } else {
             group2.push(q);
           }
         });
       }
-      this.questionGroups = [group2, group1].filter((group) => group.length > 0);
+      this.questionGroups = [group1, group2].filter((group) => group.length > 0);
       this.questions = this.questionGroups[0] || [];
     },
     // 处理继续按钮点击

+ 1 - 1
unpackage/dist/dev/mp-weixin/project.config.json

@@ -8,7 +8,7 @@
     "urlCheck": false,
     "es6": true,
     "postcss": false,
-    "minified": true,
+    "minified": false,
     "newFeature": true,
     "bigPackageSizeSupport": true,
     "babelSetting": {