diff --git a/application/index/view/default/safety/email_info.html b/application/index/view/default/safety/email_info.html index ca5fdf4a3f2f07dfcdc31731676985d3ed8dd473..dadac1630fd2fced17336d78e0ade3dcb67f9905 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 017a9cd891c6078ae8276d523e1cefd2f38f0f53..c7a696959a756dda174f449c8f2ea788d5b9cd30 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 0bd5a6ad226baea4cee03542cd28c4d02a619544..2daaf523eabec59abd8133e13dfc1ffea6356ff8 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 8d7cccfac802d4cff086d80de8e729a2afc547a5..1209bd346cc2f8e4a6b45fbd5e9c3aabae281ec5 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 2b0a628d4703b42a28cc484bd3d0a6a65303e1a2..144155f5d6d02cc44b943487f4eb9786b009b197 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 6c09e1707e17f6b7a22417a2f85f9b3a633d576e..5501be5a5b387e02083a5a90a4f48108cd565dcd 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 613b59aef2ab03916fd7e1c579888d634c38678b..25596f28855fde34df76d4f989a66716eb57d66f 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 eeb66b5e5da9f32aa52bb2fb4847ad96c90c8553..5214b750db9415145aedcee893afa84c8ee2b159 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 1bd24068b8f7c63c13f59365712ddb51f0d8cb40..ad7974b72fbabd115fc33a465e9da28e74330f3a 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 956f13134ed698a0cacfdaf773b76e6578adee66..eb382de2222de235f6bdf9f53e8e20e5744d4090 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 487224a39829f14c074deb0fbd7cf115e417af14..15dca883ea687543bfdc95cac6fe4273e6a65a18 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 d24176195a059586f7ddefb7642efd1d9d89b4c9..559aee8af7410a06b6ca46df8a9001d4825222e3 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 8cdbfd5ffdf3d3c3ae6e6b098d823e16a03548bc..6bb3bbe636bdff1924690a7162ce49e862acee63 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 30e2f5e738eca62c96266910eb2fd510eb877247..4318a2ba4acdcfacac9f9afcdc3bf9d034e478b3 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 0faf9f508775f478c7aecca73e5f4089a87b328d..989b0180a9ca02029510224e104a93c288784815 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 7e1b6537f6c3b057c7878547a42254095a731bf2..7a05fe49157463743f83d7f2e56f4eaf94306355 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 fc313fe5db22e396f8ba00879acd56fa651ec451..abb1e388388cbaf8677cfd9b850d45175d8c10ef 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 e7545aa27233acd7f014f8a0379b8ebf977cc656..81bea69fcb7652b376f3f3b081d8bd8b759604c7 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();