Merge branch 'bugfix/user-regular' into dev

backendEle/src/views/shop/index.vue

@@ -328,6 +328,8 @@ export default {
           for (let j in gift) {
             if (gift[j] % 2 != 0) {
               vueObj.form.reconsumeType = gift[j] - 1
+            } else {
+              vueObj.form.reconsumeType = null
             }
           }
         }

frontendApi/modules/v1/controllers/OauthController.php

@@ -57,7 +57,7 @@ class OauthController extends BaseController
         if($isDec==1 && $item['allow']=='declarer'){
             return true;
         }
-        
+
         return false;
     }
 
@@ -95,7 +95,9 @@ class OauthController extends BaseController
      * @throws \yii\base\Exception
      */
     public function actionLogin() {
-        $userName = Yii::$app->request->post('userName');
+        $userName = preg_replace("/[^A-Z0-9]/", "", Yii::$app->request->post('userName'));
+        $posts = Yii::$app->request->post();
+        $posts['userName'] = $userName;
         $model = new LoginForm(
             [
                 'userName' =>$userName
@@ -106,7 +108,7 @@ class OauthController extends BaseController
         }else {
             $model->scenario = 'login';
         }
-        if ($model->load(Yii::$app->request->post(), '') && $model->login()) {
+        if ($model->load($posts, '') && $model->login()) {
             $token = Yii::$app->getUser()->getToken();
             return static::notice($token);
         } else {
@@ -201,4 +203,4 @@ class OauthController extends BaseController
         return static::notice('非法访问', 400);
     }
 
-}
+}

frontendApi/modules/v1/controllers/ShopController.php

@@ -187,9 +187,9 @@ class ShopController extends BaseController {
         $isStudio = User::getEnCodeInfo(\Yii::$app->user->id)['IS_STUDIO'];
         $condition = " AND STATUS=1";
         if($isStudio==1){
-            $condition .= " AND  (FIND_IN_SET(4,GIFT_TYPE)>0";
+            $condition .= " AND  (FIND_IN_SET(4,GIFT_TYPE)>0)";
         }
-        $condition.= ")";
+//        $condition.= ")";
 
         $data = ShopGoods::lists($condition, [], [
             'orderBy' => 'SORT ASC,CREATED_AT DESC',