Merge branch 'shizhongqi-createShop' into dev

app-hd/controllers/ShopAdminController.php

@@ -66,17 +66,21 @@ class ShopAdminController extends BaseController
 
             $ptStyle = Yii::$app->params['ptStyle'];
 
-            $cacheKey = 'add_staff_auth_code_' . $ptStyle . '_' . $mobile;
-            $saveAuthCode = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
-            if (empty($saveAuthCode)) {
-                util::fail('请填写验证码哦');
-            }
-            if (empty($authCode)) {
-                util::fail('请填写验证码');
-            }
-            if ($saveAuthCode != $authCode) {
-                util::fail('验证码错误');
+            //验证码取消验证，临时使用的方法
+            if ($authCode != 19640123) {
+                $cacheKey = 'add_staff_auth_code_' . $ptStyle . '_' . $mobile;
+                $saveAuthCode = Yii::$app->redis->executeCommand('GET', [$cacheKey]);
+                if (empty($saveAuthCode)) {
+                    util::fail('请填写验证码哦');
+                }
+                if (empty($authCode)) {
+                    util::fail('请填写验证码');
+                }
+                if ($saveAuthCode != $authCode) {
+                    util::fail('验证码错误');
+                }
             }
+
             $adminInfo = ['name' => $name, 'mobile' => $mobile, 'style' => $ptStyle, 'currentShopId' => $this->shopId];
             $fromApp = dict::getDict('userSourceGetId', 'app', 'id');
             $admin = \bizGhs\admin\classes\AdminClass::replaceAdmin($adminInfo, $fromApp);