From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 pages/personalCenter/feedBackSubmit/index.js |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pages/personalCenter/feedBackSubmit/index.js b/pages/personalCenter/feedBackSubmit/index.js
index 462762c..33c79f8 100644
--- a/pages/personalCenter/feedBackSubmit/index.js
+++ b/pages/personalCenter/feedBackSubmit/index.js
@@ -110,15 +110,6 @@
         })
         return
       }
-      if (this.data.phoneError) {
-        this.data.lock = true;
-        wx.showToast({
-          title: "鑱旂郴鏂瑰紡鏍煎紡涓嶆纭�",
-          icon: 'none',
-          duration: 1000
-        })
-        return
-      }
       if (this.data.content.replace(/^\s*|\s*$/g, "") == '') {
         this.data.lock = true;
         wx.showToast({
@@ -128,6 +119,10 @@
         })
         return
       }
+      if (this.data.phoneError) {
+        this.data.lock = true;
+        return
+      }
 
       let submitData = {
         content: this.data.content.replace(/^\s*|\s*$/g, ""),

--
Gitblit v1.9.1