From e089755bbceaf07928dc8aa3019324a0c77d223d Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Mon, 5 Aug 2019 23:47:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index/view/default/safety/email_info.html | 4 +-- .../view/default/safety/mobile_info.html | 4 +-- .../view/default/safety/new_email_info.html | 4 +-- .../view/default/safety/new_mobile_info.html | 4 +-- .../view/default/user/forget_pwd_info.html | 4 +-- .../index/view/default/user/login_info.html | 2 +- .../view/default/user/modal_login_info.html | 2 +- .../index/view/default/user/reg_info.html | 8 +++--- application/service/SafetyService.php | 2 +- application/service/UserService.php | 6 ++-- application/tags.php | 28 +++++++++---------- extend/base/Verify.php | 2 +- .../appmini/old/alipay/pages/login/login.axml | 2 +- .../appmini/old/baidu/pages/login/login.swan | 2 +- public/appmini/old/baidu/project.swan.json | 2 +- .../appmini/old/weixin/pages/login/login.wxml | 2 +- public/static/index/default/js/safety.js | 4 +-- public/static/index/default/js/user.js | 2 +- 18 files changed, 42 insertions(+), 42 deletions(-) diff --git a/application/index/view/default/safety/email_info.html b/application/index/view/default/safety/email_info.html index ca5fdf4a3..dadac1630 100755 --- a/application/index/view/default/safety/email_info.html +++ b/application/index/view/default/safety/email_info.html @@ -34,7 +34,7 @@
- + @@ -54,7 +54,7 @@
- +
看不清换一张 diff --git a/application/index/view/default/safety/mobile_info.html b/application/index/view/default/safety/mobile_info.html index 017a9cd89..c7a696959 100755 --- a/application/index/view/default/safety/mobile_info.html +++ b/application/index/view/default/safety/mobile_info.html @@ -34,7 +34,7 @@
- + @@ -54,7 +54,7 @@
- +
看不清换一张 diff --git a/application/index/view/default/safety/new_email_info.html b/application/index/view/default/safety/new_email_info.html index 0bd5a6ad2..2daaf523e 100755 --- a/application/index/view/default/safety/new_email_info.html +++ b/application/index/view/default/safety/new_email_info.html @@ -34,7 +34,7 @@
- + @@ -54,7 +54,7 @@
- +
看不清换一张 diff --git a/application/index/view/default/safety/new_mobile_info.html b/application/index/view/default/safety/new_mobile_info.html index 8d7cccfac..1209bd346 100755 --- a/application/index/view/default/safety/new_mobile_info.html +++ b/application/index/view/default/safety/new_mobile_info.html @@ -34,7 +34,7 @@
- + @@ -54,7 +54,7 @@
- +
看不清换一张 diff --git a/application/index/view/default/user/forget_pwd_info.html b/application/index/view/default/user/forget_pwd_info.html index 2b0a628d4..144155f5d 100755 --- a/application/index/view/default/user/forget_pwd_info.html +++ b/application/index/view/default/user/forget_pwd_info.html @@ -39,7 +39,7 @@
- + @@ -71,7 +71,7 @@
- +
看不清换一张 diff --git a/application/index/view/default/user/login_info.html b/application/index/view/default/user/login_info.html index 6c09e1707..5501be5a5 100755 --- a/application/index/view/default/user/login_info.html +++ b/application/index/view/default/user/login_info.html @@ -60,7 +60,7 @@
- + diff --git a/application/index/view/default/user/modal_login_info.html b/application/index/view/default/user/modal_login_info.html index 613b59aef..25596f288 100755 --- a/application/index/view/default/user/modal_login_info.html +++ b/application/index/view/default/user/modal_login_info.html @@ -39,7 +39,7 @@
- + diff --git a/application/index/view/default/user/reg_info.html b/application/index/view/default/user/reg_info.html index eeb66b5e5..5214b750d 100755 --- a/application/index/view/default/user/reg_info.html +++ b/application/index/view/default/user/reg_info.html @@ -90,7 +90,7 @@
- + @@ -130,7 +130,7 @@
- + @@ -176,7 +176,7 @@
- + @@ -222,7 +222,7 @@
- +
看不清换一张 diff --git a/application/service/SafetyService.php b/application/service/SafetyService.php index 1bd24068b..ad7974b72 100755 --- a/application/service/SafetyService.php +++ b/application/service/SafetyService.php @@ -247,7 +247,7 @@ class SafetyService 'expire_time' => MyC('common_verify_expire_time'), 'time_interval' => MyC('common_verify_time_interval'), ); - $code = GetNumberCode(6); + $code = GetNumberCode(4); if($params['type'] == 'sms') { $obj = new \base\Sms($verify_params); diff --git a/application/service/UserService.php b/application/service/UserService.php index 956f13134..eb382de22 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -1332,7 +1332,7 @@ class UserService } // 发送验证码 - $code = GetNumberCode(6); + $code = GetNumberCode(4); if($params['type'] == 'sms') { $obj = new \base\Sms($verify_params); @@ -1403,7 +1403,7 @@ class UserService } // 验证码 - $code = GetNumberCode(6); + $code = GetNumberCode(4); // 手机 if($ret['data'] == 'mobile') @@ -1986,7 +1986,7 @@ class UserService // 发送验证码 $obj = new \base\Sms($verify_params); - $code = GetNumberCode(6); + $code = GetNumberCode(4); $status = $obj->SendCode($params['mobile'], $code, MyC('home_sms_user_mobile_binding')); // 状态 diff --git a/application/tags.php b/application/tags.php index 487224a39..15dca883e 100755 --- a/application/tags.php +++ b/application/tags.php @@ -35,8 +35,8 @@ return array ( 'plugins_css' => array ( 0 => 'app\\plugins\\limitedtimediscount\\Hook', - 1 => 'app\\plugins\\goodsphototag\\Hook', - 2 => 'app\\plugins\\membershiplevelvip\\Hook', + 1 => 'app\\plugins\\membershiplevelvip\\Hook', + 2 => 'app\\plugins\\goodsphototag\\Hook', ), 'plugins_js' => array ( @@ -64,18 +64,6 @@ return array ( array ( 0 => 'app\\plugins\\limitedtimediscount\\Hook', ), - 'plugins_view_goods_detail_photo_within' => - array ( - 0 => 'app\\plugins\\goodsphototag\\Hook', - ), - 'plugins_view_home_goods_inside_top' => - array ( - 0 => 'app\\plugins\\goodsphototag\\Hook', - ), - 'plugins_view_search_goods_inside_top' => - array ( - 0 => 'app\\plugins\\goodsphototag\\Hook', - ), 'plugins_service_buy_handle' => array ( 0 => 'app\\plugins\\membershiplevelvip\\Hook', @@ -116,5 +104,17 @@ return array ( array ( 0 => 'app\\plugins\\membershiplevelvip\\Hook', ), + 'plugins_view_goods_detail_photo_within' => + array ( + 0 => 'app\\plugins\\goodsphototag\\Hook', + ), + 'plugins_view_home_goods_inside_top' => + array ( + 0 => 'app\\plugins\\goodsphototag\\Hook', + ), + 'plugins_view_search_goods_inside_top' => + array ( + 0 => 'app\\plugins\\goodsphototag\\Hook', + ), ); ?> \ No newline at end of file diff --git a/extend/base/Verify.php b/extend/base/Verify.php index d24176195..559aee8af 100755 --- a/extend/base/Verify.php +++ b/extend/base/Verify.php @@ -55,7 +55,7 @@ class Verify // 参数处理 $this->width = isset($param['width']) ? intval($param['width']) : 65; $this->height = isset($param['height']) ? intval($param['height']) : 30; - $this->length = isset($param['length']) ? intval($param['length']) : 6; + $this->length = isset($param['length']) ? intval($param['length']) : 4; $this->use_point_back = isset($param['use_point_back']) ? $param['use_point_back'] : in_array('point', $rules); $this->use_line_back = isset($param['use_line_back']) ? $param['use_line_back'] : in_array('line', $rules); $this->use_bg_color_back = isset($param['use_bg_color_back']) ? $param['use_bg_color_back'] : in_array('bgcolor', $rules); diff --git a/public/appmini/old/alipay/pages/login/login.axml b/public/appmini/old/alipay/pages/login/login.axml index 8cdbfd5ff..6bb3bbe63 100644 --- a/public/appmini/old/alipay/pages/login/login.axml +++ b/public/appmini/old/alipay/pages/login/login.axml @@ -2,7 +2,7 @@
- + diff --git a/public/appmini/old/baidu/pages/login/login.swan b/public/appmini/old/baidu/pages/login/login.swan index 30e2f5e73..4318a2ba4 100755 --- a/public/appmini/old/baidu/pages/login/login.swan +++ b/public/appmini/old/baidu/pages/login/login.swan @@ -2,7 +2,7 @@ - + diff --git a/public/appmini/old/baidu/project.swan.json b/public/appmini/old/baidu/project.swan.json index 0faf9f508..989b0180a 100644 --- a/public/appmini/old/baidu/project.swan.json +++ b/public/appmini/old/baidu/project.swan.json @@ -1 +1 @@ -{"appid":"16634987","cloudTesting":{"forcePreview":false},"editor":{"curPath":"/data/www/project/shopxo/public/appmini/old/baidu/app.js","expands":[],"markdownUploadTimeMap":{},"paths":["/data/www/project/shopxo/public/appmini/old/baidu/app.js"],"recentlyFiles":["/data/www/project/shopxo/public/appmini/old/baidu/app.js"]},"host":"baiduboxapp","preview":{"packageId":222766},"publish":{"version":"1.0.1.0"},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"swanJsVersion":"3.30.43","extensionJsVersion":""}}} \ No newline at end of file +{"appid":"16634987","cloudTesting":{"forcePreview":false},"developType":"normal","editor":{"curPath":"","expands":[],"markdownUploadTimeMap":{},"paths":[],"recentlyFiles":["/data/www/project/shopxo/public/appmini/old/baidu/app.js","/data/www/project/shopxo/public/appmini/old/baidu/app.json"]},"host":"baiduboxapp","preview":{"packageId":222766},"publish":{"version":"1.0.1.0"},"setting":{"urlCheck":false},"swan":{"baiduboxapp":{"extensionJsVersion":"","swanJsVersion":"3.30.43"}}} \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/login/login.wxml b/public/appmini/old/weixin/pages/login/login.wxml index 7e1b6537f..7a05fe491 100755 --- a/public/appmini/old/weixin/pages/login/login.wxml +++ b/public/appmini/old/weixin/pages/login/login.wxml @@ -2,7 +2,7 @@ - + diff --git a/public/static/index/default/js/safety.js b/public/static/index/default/js/safety.js index fc313fe5d..abb1e3883 100755 --- a/public/static/index/default/js/safety.js +++ b/public/static/index/default/js/safety.js @@ -27,7 +27,7 @@ $(function() // 验证码参数处理 verify = $verify.val().replace(/\s+/g, ''); - if(verify.length < 6) + if(verify.length != 4) { Prompt($verify.data('validation-message')); $verify.focus(); @@ -121,7 +121,7 @@ $(function() // 验证码参数处理 verify = $verify.val().replace(/\s+/g, ''); - if(verify.length < 6) + if(verify.length != 4) { Prompt($verify.data('validation-message')); $verify.focus(); diff --git a/public/static/index/default/js/user.js b/public/static/index/default/js/user.js index e7545aa27..81bea69fc 100755 --- a/public/static/index/default/js/user.js +++ b/public/static/index/default/js/user.js @@ -58,7 +58,7 @@ $(function() // 验证码参数处理 verify = $verify.val().replace(/\s+/g, ''); - if(verify.length < 6) + if(verify.length != 4) { Prompt($verify.data('validation-message')); $verify.focus();