Auto Submit

index.html

@@ -27,7 +27,7 @@
               display: block !important;
           }
       </style><script>if(document.domain !== "www.educoder.net") document.title = '';</script>
-<script src="/react/build/umi.83ea5eda.js"></script>
+<script src="/react/build/umi.5031a3c4.js"></script>
 <script src="/react/build/js/public.js"></script>
 </body>
 </html>

p__Competitions__Edit__index.c6462a52.async.js

@@ -5055,9 +5055,9 @@ var StudentTeam_competitionsPage = function competitionsPage(_ref) {
           case 0:
             setApplyLoading(true);
             _context2.next = 3;
-            return (0,service_competitions/* getMergeList */.fH)({
+            return (0,service_competitions/* getMergeList */.fH)(objectSpread2_default()({
               identifier: identifier
-            });
+            }, params));
           case 3:
             res = _context2.sent;
             if ((res === null || res === void 0 ? void 0 : res.status) === 0) {
@@ -5100,7 +5100,7 @@ var StudentTeam_competitionsPage = function competitionsPage(_ref) {
   }
 
   // 校验身份证号的正则表达式（适用于18位）
-  var idCardRegex = /(^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^([A-Z]\d{6,10}(\(\w{1}\))?)$)/;
+  var idCardRegex = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])([0-2][1-9]|3[0-1])\d{3}[\dXx]$/;
 
   // 校验身份证的加权校验码
   function validateIdCard(idCard) {
@@ -5179,7 +5179,7 @@ var StudentTeam_competitionsPage = function competitionsPage(_ref) {
   }, (competitions === null || competitions === void 0 || (_competitions$competi6 = competitions.competition) === null || _competitions$competi6 === void 0 ? void 0 : _competitions$competi6.required_school) && {
     title: '学校名称',
     align: 'left',
-    dataIndex: 'new_school_name',
+    dataIndex: 'school_name',
     ellipsis: true,
     render: function render(text) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
@@ -6001,7 +6001,7 @@ var StudentTeam_competitionsPage = function competitionsPage(_ref) {
                 params.page = page;
                 params.per_page = pageSize;
                 setparams(objectSpread2_default()({}, params));
-                getTeams();
+                getApplyList();
               },
               pageSize: params.per_page,
               current: params.page
@@ -6615,32 +6615,27 @@ var StudentTeam_competitionsPage = function competitionsPage(_ref) {
             rules: [{
               required: true,
               message: "请输入身份证号"
-            }, {
-              pattern: /(^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^([A-Z]\d{6,10}(\(\w{1}\))?)$)/,
-              message: '请输入正确的身份证号'
-            }
+            },
             // { type: "string", max: 60, message: "输入超限，请缩减字符数" },
             // { type: "string", whitespace: true, message: "内容不能全为空格" }
-            // {
-            //   validator: (_, value) => {
-            //       if (!value) {
-            //           return Promise.resolve();
-            //       }
-
-            //       // 格式校验
-            //       if (!idCardRegex.test(value)) {
-            //           return Promise.reject(new Error('身份证号格式不正确'));
-            //       }
-
-            //       // 校验码校验
-            //       if (!validateIdCard(value)) {
-            //           return Promise.reject(new Error('身份证号不合法'));
-            //       }
-
-            //       return Promise.resolve();
-            //   }
-            // }
-            ],
+            {
+              validator: function validator(_, value) {
+                if (!value) {
+                  return Promise.resolve();
+                }
+
+                // 格式校验
+                if (!idCardRegex.test(value)) {
+                  return Promise.reject(new Error('身份证号格式不正确'));
+                }
+
+                // 校验码校验
+                if (!validateIdCard(value)) {
+                  return Promise.reject(new Error('身份证号不合法'));
+                }
+                return Promise.resolve();
+              }
+            }],
             children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {
               maxLength: 18,
               showCount: true,
@@ -17649,31 +17644,31 @@ var NewCompetitionsPage = function NewCompetitionsPage(_ref) {
               required: true,
               message: "请输入身份证号"
             }, {
-              pattern: /(^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^([A-Z]\d{6,10}(\(\w{1}\))?)$)/,
-              message: '请输入正确的身份证号'
-            }
-            // { type: "string", max: 18, message: "输入超限，请缩减字符数" },
-            // { type: "string", whitespace: true, message: "内容不能全为空格" },
-            // {
-            //     validator: (_, value) => {
-            //         if (!value) {
-            //             return Promise.resolve();
-            //         }
-
-            //         // 格式校验
-            //         if (!idCardRegex.test(value)) {
-            //             return Promise.reject(new Error('身份证号格式不正确'));
-            //         }
-
-            //         // 校验码校验
-            //         if (!validateIdCard(value)) {
-            //             return Promise.reject(new Error('身份证号不合法'));
-            //         }
-
-            //         return Promise.resolve();
-            //     }
-            // }
-            ],
+              type: "string",
+              max: 18,
+              message: "输入超限，请缩减字符数"
+            }, {
+              type: "string",
+              whitespace: true,
+              message: "内容不能全为空格"
+            }, {
+              validator: function validator(_, value) {
+                if (!value) {
+                  return Promise.resolve();
+                }
+
+                // 格式校验
+                if (!idCardRegex.test(value)) {
+                  return Promise.reject(new Error('身份证号格式不正确'));
+                }
+
+                // 校验码校验
+                if (!validateIdCard(value)) {
+                  return Promise.reject(new Error('身份证号不合法'));
+                }
+                return Promise.resolve();
+              }
+            }],
             children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {
               maxLength: 18,
               showCount: true,