From 7846af9763d6898a5c122c934b671a20bbc183e2 Mon Sep 17 00:00:00 2001
From: anyv <anyu@bronet.cn>
Date: Wed, 3 Jul 2019 16:44:14 +0800
Subject: [PATCH] 5

---
 public/themes/simpleboot3/portal/personalcenter/my_wallet.html | 20 ++++++++++----------
 simplewind/cmf/controller/WeChatBaseController.php             |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/themes/simpleboot3/portal/personalcenter/my_wallet.html b/public/themes/simpleboot3/portal/personalcenter/my_wallet.html
index d36baa2..4f16dbd 100755
--- a/public/themes/simpleboot3/portal/personalcenter/my_wallet.html
+++ b/public/themes/simpleboot3/portal/personalcenter/my_wallet.html
@@ -57,7 +57,7 @@
         </div>
         <div class="tx_maskCon2">
             <!-- 输入手机号 -->
-            <input  class="tx_maskInput" style="margin-bottom: 0.25rem;" type="text" placeholder="请输入手机号" maxlength="11" id="phone" onblur="checkPhone()" />
+            <input  class="tx_maskInput" style="margin-bottom: 0.25rem;" type="text" placeholder="请输入手机号" maxlength="11" id="phone"/>
             <input class="tx_maskInput" style="margin-bottom: 0.25rem;" id="Ver_code" type="text" placeholder="请输入验证码" />
             <input type="button" class="btn" id="code" value="获取验证码" onclick="codeButton()">
             <!-- 确定 -->
@@ -209,10 +209,16 @@
      *手机号验证点击确定时
      */
     function Message_validation(){
+//        function checkPhone() {
+//            if(!(/^1[34578]\d{9}$/.test(phone))) {
+//                alert("手机号码有误,请重填");
+//                return false;
+//            }
+//        }
         yzm = $('#Ver_code').val();
         phone = $('#phone').val();
-        if(phone == ''){
-            alert('请输入手机号');
+        if(phone == '' || !(/^1[34578]\d{9}$/.test(phone))){
+            alert('手机号有误,请重新输入');
         }else if(yzm == ''){
             alert('请输入验证码');
         }else{
@@ -292,13 +298,7 @@
 //
 //
 //    });
-    function checkPhone() {
-        var phone = document.getElementById('phone').value;
-        if(!(/^1[34578]\d{9}$/.test(phone))) {
-            alert("手机号码有误,请重填");
-            return false;
-        }
-    }
+
     //短信验证码
     function codeButton() {
         var code = $("#code");
diff --git a/simplewind/cmf/controller/WeChatBaseController.php b/simplewind/cmf/controller/WeChatBaseController.php
index 447cf3a..fd14663 100644
--- a/simplewind/cmf/controller/WeChatBaseController.php
+++ b/simplewind/cmf/controller/WeChatBaseController.php
@@ -204,7 +204,7 @@ class WeChatBaseController extends BaseController
      */
     public function checkWeChatUserLogin()
     {
-        /*$user = Db::name('user')->where('id',28)->find();
+        /*$user = Db::name('user')->where('id',27)->find();
         cmf_update_current_user($user);*/
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
--
libgit2 0.24.0