From 97448c526837ff8d7dc6ac99778d2d61660ef501 Mon Sep 17 00:00:00 2001
From: "zhaoxingchang.sd" <zhaoxingchang.sd@ele-cloud.com>
Date: Wed, 9 Oct 2024 09:28:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8F=91=E7=A5=A8=E6=8A=AC=E5=A4=B4?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8A=AC=E5=A4=B4?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=98=AF=E4=B8=AA=E4=BA=BA=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8A=AC=E5=A4=B4=E4=B8=8D=E8=83=BD=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=EF=BC=88=E4=B8=AA=E4=BA=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/wxscaninvoice/Followorder.html | 14 ++++++------
 html/wxscaninvoice/writing.html     |  3 +--
 js/wxscaninvoice/transferPage.js    |  2 +-
 js/wxscaninvoice/writing.js         | 33 ++---------------------------
 4 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/html/wxscaninvoice/Followorder.html b/html/wxscaninvoice/Followorder.html
index f661ce7..41d7cc7 100644
--- a/html/wxscaninvoice/Followorder.html
+++ b/html/wxscaninvoice/Followorder.html
@@ -73,17 +73,14 @@
   <div class="border_main">
     <div class="sl">
         <img alt="" src="../../image/wxscaninvoice/success.png" class="top_img" />
-        <p class="tip_name">发票开具申请已提交，请关注<span><br>
-            公众号或联系商家</span>，了解更多发票状态</p>
-        <img alt="" src="" class="EWMpng" />
-        <p class="name">温馨提示:长按识别二维码后关注公众号</p>
+        <p class="tip_name">发票开具申请已提交<br>请关注<span><br>
+            个人邮箱或微信卡包或联系商家</span><br>了解更多发票状态!</p>
+
     </div>
     <div class="gzh">
       <img alt="" src="../../image/wxscaninvoice/success.png" class="top_img" />
-      <p class="tip_name">发票开具申请已提交，请关注<span>【我的发票】<br>
-          公众号或联系商家</span>，了解更多发票状态</p>
-      <img alt="" src="" class="EWMpng" />
-      <p class="name">温馨提示:长按识别二维码后关注"我的发票"</p>
+      <p class="tip_name">请关注个人邮箱或微信卡包或联系商家<br>
+          了解更多发票状态!</p>
     </div>
   </div>
 </body>
@@ -94,6 +91,7 @@
 <script type="text/javascript">
     const subscribe = window.localStorage.getItem("subscribe");
     const ewm = window.localStorage.getItem("ewm");
+
   const prePath = '../../image/wxscaninvoice/';
   const defaultLogoPath = prePath + 'myfp_16.png';
   if (ewm === "" || ewm == null || ewm === undefined) {
diff --git a/html/wxscaninvoice/writing.html b/html/wxscaninvoice/writing.html
index 38a5a0e..8fd6e25 100644
--- a/html/wxscaninvoice/writing.html
+++ b/html/wxscaninvoice/writing.html
@@ -84,8 +84,7 @@
 <!--        </span>-->
 <!--      </li>-->
       <li class="list_li">
-<!--        <span class="list_name">邮箱<span class="stars">*</span></span>-->
-        <span class="list_name">邮箱<span class="stars"></span></span>
+        <span class="list_name">邮箱<span class="stars">*</span></span>
         <span class="list_val list_val_pr" onblur="resetCloseIcon(this)">
           <input id="email" name="email" value="" type="text" placeholder="用来接收电子发票邮件" maxlength="50"
             onfocus="otherTitleChange(this)" oninput="otherTitleChange(this)" />
diff --git a/js/wxscaninvoice/transferPage.js b/js/wxscaninvoice/transferPage.js
index 364c493..1f991ed 100644
--- a/js/wxscaninvoice/transferPage.js
+++ b/js/wxscaninvoice/transferPage.js
@@ -41,7 +41,7 @@ function getEWmGzhConfig() {
           if (data.data.secretKey !== "" && data.data.secretKey != null && data.data.secretKey !== undefined) {
             window.localStorage.setItem('secretKey', data.data.secretKey) //密钥
           }
-
+          console.log(data.data,'data.data.gzhSubcribeEwm')
           if (data.data.gzhSubcribeEwm !== "" && data.data.gzhSubcribeEwm != null && data.data.gzhSubcribeEwm !== undefined) {
             window.localStorage.setItem('ewm', data.data.gzhSubcribeEwm) //二维码图片
           }
diff --git a/js/wxscaninvoice/writing.js b/js/wxscaninvoice/writing.js
index 2cf04e8..150b868 100644
--- a/js/wxscaninvoice/writing.js
+++ b/js/wxscaninvoice/writing.js
@@ -1099,8 +1099,8 @@ function titleOnblur() {
   const fpzl = getFpzl();
   const ttlx = $.trim($ttType.val());
   if(fpzl==="02" &&  ttlx ==="个人"){
-    if(titleName ==='（个人）'){
-      alert_timing_open("抬头类型是个人时，发票抬头不能是（个人）");
+    if (titleName.includes('（个人）')) {
+      alert_timing_open("抬头类型是个人时，发票抬头不能包含（个人）");
       return false;
     }
   }
@@ -1176,35 +1176,6 @@ function taxNoOnblurItem(taxpayerId,text) {
 
 /*验证手机*/
 function telephoneOnblur() {
-  const telephone = $.trim($("#telephone").val());
-  const isDp = getFpzl() === "51" || getFpzl() === "52" || getFpzl() === "01" || getFpzl() === "02";
-  if (isDp) {
-    if (telephone === '') {
-      alert_timing_open("手机号码不能为空！");
-      return false;
-    }
-    const length = telephone.length;
-    if (length !== 11) {
-      alert_timing_open("手机号码只能为11个数字！");
-      return false;
-    }
-    const regexEl = /^1\d{10}$/;
-    if (length !== 0 && !regexEl.test(telephone)) {
-      alert_timing_open("手机号码格式非法！");
-      return false;
-
-    }
-    if (telephone.indexOf(" ") >= 0) {
-      alert_timing_open("手机号码不能包含空格！");
-      return false;
-    }
-    for (let i = 0; i < telephone.length; i++) {
-      if (telephone[i].charCodeAt() >= 55356 && telephone[i].charCodeAt() <= 59000) {
-        alert_timing_open("手机号码不能输入表情");
-        return false;
-      }
-    }
-  }
   return true;
 }