Merge remote-tracking branch 'origin/master'

app/api/controller/FirmController.php

@@ -43,7 +43,11 @@ class FirmController extends BaseApiController
     {
         return $this->dataLists(new FirmGoodLists());
     }
-
+    public function goodDetail(){
+        $params = (new GoodsValidate())->get()->goCheck('goods');
+        $result = GoodsLogic::detail($params['id'],'goods');
+        return $this->data($result);
+    }
     public function submitGood()
     {
 

app/api/lists/FirmGoodLists.php

@@ -41,7 +41,7 @@ class FirmGoodLists extends BaseApiDataLists implements ListsSearchInterface
     public function queryWhere()
     {
         $where = [];
-        //$where[] = ['user_id',];
+        $where[] = ['user_id','=',$this->userId];
         if (!empty($this->params['goods_category_id'])) {
             $goodsCategoryId = end($this->params['goods_category_id']);
             $goodsCategoryData = GoodsCategory::where(['status' => 1])->order(['pid' => 'asc', 'weigh' => 'desc', 'id' => 'desc'])

app/common/enum/notice/NoticeEnum.php

@@ -37,6 +37,7 @@ class NoticeEnum
     const CHANGE_MOBILE_CAPTCHA = 103;
     const FIND_LOGIN_PASSWORD_CAPTCHA = 104;
     const OTHER_CAPTCHA = 105;
+    const GCSSJHM_CAPTCHA =106;
 
 
     /**
@@ -92,6 +93,7 @@ class NoticeEnum
             self::CHANGE_MOBILE_CAPTCHA => '变更手机验证码',
             self::FIND_LOGIN_PASSWORD_CAPTCHA => '找回登录密码验证码',
             self::OTHER_CAPTCHA => '其它',
+            self::GCSSJHM_CAPTCHA => '工程师入驻',
         ];
 
         if ($flag) {
@@ -122,6 +124,8 @@ class NoticeEnum
             'ZHDLMM' => self::FIND_LOGIN_PASSWORD_CAPTCHA,
             //其它
             'OTHER' => self::OTHER_CAPTCHA,
+            //工程师入住
+            'GCSSJHM' => self::GCSSJHM_CAPTCHA
         ];
         return $scene[$tag] ?? '';
     }
@@ -143,6 +147,7 @@ class NoticeEnum
             self::CHANGE_MOBILE_CAPTCHA => '验证码:code',
             self::FIND_LOGIN_PASSWORD_CAPTCHA => '验证码:code',
             self::OTHER_CAPTCHA => '验证码:code',
+            self::GCSSJHM_CAPTCHA => '验证码:code',
         ];
 
         if ($flag) {
@@ -189,6 +194,7 @@ class NoticeEnum
             self::CHANGE_MOBILE_CAPTCHA => '您正在变更手机号，验证码${code}，切勿将验证码泄露于他人，本条验证码有效期5分钟。',
             self::FIND_LOGIN_PASSWORD_CAPTCHA => '您正在找回登录密码，验证码${code}，切勿将验证码泄露于他人，本条验证码有效期5分钟。',
             self::OTHER_CAPTCHA => '您的验证码${code}，切勿将验证码泄露于他人，本条验证码有效期5分钟。',
+            self::GCSSJHM_CAPTCHA => '工程师,您的验证码${code}，切勿将验证码泄露于他人，本条验证码有效期5分钟。',
         ];
 
         if ($flag) {

app/workerapi/logic/LoginLogic.php

@@ -28,12 +28,12 @@ class LoginLogic extends BaseLogic
     {
         try {
             // 验证码请求
-            $sceneId = NoticeEnum::OTHER_CAPTCHA;
+            $sceneId = NoticeEnum::GCSSJHM_CAPTCHA;
             // 校验短信
-//            $checkSmsCode = (new SmsDriver())->verify($params['mobile'], $params['code'], $sceneId);
-//            if (!$checkSmsCode) {
-//                throw new \Exception('验证码错误');
-//            }
+            $checkSmsCode = (new SmsDriver())->verify($params['mobile'], $params['code'], $sceneId);
+            if (!$checkSmsCode) {
+                throw new \Exception('验证码错误');
+            }
             return true;
         } catch (\Exception $e) {
             self::setError($e->getMessage());