From bd09ddbe5eae5e780393d37b72b4da6d4e92fdb8 Mon Sep 17 00:00:00 2001
From: LiuWenHaoU <964324856@qq.com>
Date: Mon, 18 May 2020 00:15:17 +0800
Subject: [PATCH] 部分修改及新增功能

---
 SunshineLnsMinApp/pages/scanEvildoing/scanEvildoing.js |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/SunshineLnsMinApp/pages/scanEvildoing/scanEvildoing.js b/SunshineLnsMinApp/pages/scanEvildoing/scanEvildoing.js
index 2e4aba3..4eebda4 100644
--- a/SunshineLnsMinApp/pages/scanEvildoing/scanEvildoing.js
+++ b/SunshineLnsMinApp/pages/scanEvildoing/scanEvildoing.js
@@ -167,6 +167,7 @@
       if (!scanData.content) {
         return app.showModal("请填写举报事项!");
       }
+      
       const {
         evalList1017,
         evalList1001
@@ -174,6 +175,7 @@
       if (evalList1017.length == 0) {
         return app.showModal("请上传相关材料/照片!");
       }
+      debugger;
       if (that.data.switch) {
         scanData.isRealName = 1;
         var peopleInfo = that.data.peopleInfo;
@@ -186,20 +188,22 @@
           }
           if (!peopleInfo.mobile) {
             return app.showModal("请填写联系方式!");
+          } else {
+            if (!verify.phone(peopleInfo.mobile)) {
+              return app.showModal("手机号码格式不正确!")
+            }
           }
           if (!peopleInfo.address) {
             return app.showModal("请填写住所!");
           }
           if (!peopleInfo.cardNo) {
             return app.showModal("请填写身份证号码!");
+          } else {
+            if (!verify.carIdNumber(peopleInfo.cardNo)) {
+              return app.showModal("身份证格式不正确!")
+            }
           }
         } else {
-          if (!verify.phone(peopleInfo.mobile)) {
-            return app.showModal("手机号码格式不正确!")
-          }
-          if (!verify.carIdNumber(peopleInfo.cardNo)) {
-            return app.showModal("身份证格式不正确!")
-          }
           if (evalList1001.length < 2) {
             return app.showModal("请至少上传两张身份证附件!")
           }

--
Gitblit v1.8.0