监护人信息

src/common/validator.js

@@ -22,6 +22,19 @@ export default {
     } else {
       callback()
     }
+
+
+  },
+  validatePhone2: function (rule, value, callback) {
+    if (value.length > 0) {
+      if (!phoneReg.test(value) || value.length !== 11) {
+        callback(new Error('手机号格式错误！'))
+      } else {
+        callback()
+      }
+    } else {
+      callback()
+    }
   },
 
   validateid_card: function (rule, value, callback) {

src/components/index/SignUp/referInfo.vue

@@ -742,6 +742,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+      </div>
 
       <!-- 监护人信息 -->
       <div
@@ -815,7 +816,6 @@
           </el-col>
         </el-row>
       </div>
-      </div>
       <!-- 学校信息 -->
       <div
         v-show="
@@ -964,7 +964,14 @@
         </div>
       </div>
       <!-- 学习成绩证明材料 -->
-      <div>
+      <div
+        v-show="
+          configJson.achievementPath == 1 ||
+          configJson.transcripts == 1 ||
+          configJson.achievementCertificate == 1 ||
+          configJson.safetyNotices == 1
+        "
+      >
         <div class="cont_title">相关资料</div>
         <div class="bgPic">
           <div class="bgInfo">
@@ -1455,29 +1462,28 @@ export default {
           },
           { validator: validator.validatePhone, trigger: "blur" },
         ],
-        guardian_name: [
-          {
-            required: true,
-            message: "监护人姓名不能为空！",
-            trigger: "blur",
-          },
-        ],
+        // guardian_name: [
+        //   {
+        //     required: true,
+        //     message: "监护人姓名不能为空！",
+        //     trigger: "blur",
+        //   },
+        // ],
         guardian_phone: [
-          {
-            required: true,
-            message: "监护人联系电话不能为空！",
-            trigger: "blur",
-          },
-          { validator: validator.validatePhone, trigger: "blur" },
+          // {
+          //   required: true,
+          //   message: "监护人联系电话不能为空！",
+          //   trigger: "blur",
+          // },
+          { validator: validator.validatePhone2, trigger: "blur" },
         ],
         guardian_card: [
-          {
-            required: true,
-            message: "监护人身份证号不能为空！",
-            trigger: "blur",
-          },
+          // {
+          //   required: true,
+          //   message: "监护人身份证号不能为空！",
+          //   trigger: "blur",
+          // },
           { validator: validator.validateid_card, trigger: "blur" },
-
         ],
         clothesSize: [
           {

src/config/server.js

@@ -4,11 +4,11 @@
 // export const SERVER_WS_URL = "wss://tgwapi.campcenter.cn"; // websocket
 
 // 正式
-// export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
-// export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
-// export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
+export const SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; // 正式环境
+export const DEVELOPMENT_SERVER_URL = "https://gwapi.campcenter.cn/modules-campsite"; //开发环境
+export const SERVER_WS_URL = "wss://gwapi.campcenter.cn"; // websocket
 
 // 测试
-export const SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; // 正式环境
-export const DEVELOPMENT_SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; //开发环境
-export const SERVER_WS_URL = "wss://192.168.1.145:8088"; // websocket
+// export const SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; // 正式环境
+// export const DEVELOPMENT_SERVER_URL = "http://192.168.1.145:8088/modules-campsite"; //开发环境
+// export const SERVER_WS_URL = "wss://192.168.1.145:8088"; // websocket