更新版本到2.4.27 具体更新内容看更新日志

Author: jianyan74

addons/RfMerchants/backend/controllers/AuthItemController.php

@@ -77,7 +77,7 @@ public function actionAjaxEdit()
 
         return $this->renderAjax($this->viewPrefix . 'auth-item/ajax-edit', [
             'model' => $model,
-            'dropDownList' => Yii::$app->services->authItem->getDropDownForEdit($id),
+            'dropDownList' => Yii::$app->services->authItem->getDropDownForEdit(AppEnum::MERCHANT, $id),
         ]);
     }
 }

api/config/main.php

@@ -80,6 +80,7 @@
                         'v1/common/provinces',
                         'v1/member/member',
                         'v1/member/address',
+                        'v1/member/invoice',
                         'v1/member/auth',
                         // 版本2
                         'v2/default', // 默认测试入口

api/controllers/ActiveController.php

@@ -87,7 +87,7 @@ public function behaviors()
                  * yii\filters\auth\HttpHeaderAuth::class,
                  */
                 // HttpBasicAuth::class,
-                // HttpBearerAuth::class,
+                HttpBearerAuth::class,
                 HttpHeaderAuth::class,
                 [
                     'class' => QueryParamAuth::class,
@@ -121,6 +121,20 @@ public function behaviors()
         return $behaviors;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function verbs()
+    {
+        return [
+            'index' => ['GET', 'HEAD', 'OPTIONS'],
+            'view' => ['GET', 'HEAD', 'OPTIONS'],
+            'create' => ['POST', 'OPTIONS'],
+            'update' => ['PUT', 'PATCH', 'OPTIONS'],
+            'delete' => ['DELETE', 'OPTIONS'],
+        ];
+    }
+
     /**
      * 前置操作验证token有效期和记录日志和检查curd权限
      *

api/modules/v1/controllers/SiteController.php

@@ -66,7 +66,7 @@ public function actionLogout()
             return ResultHelper::api(200, '退出成功');
         }
 
-        return ResultHelper::api(200, '退出失败');
+        return ResultHelper::api(422, '退出失败');
     }
 
     /**

api/modules/v1/controllers/member/InvoiceController.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace api\modules\v1\controllers\member;
+
+use api\controllers\UserAuthController;
+use common\models\member\Invoice;
+
+/**
+ * 发票管理
+ *
+ * Class InvoiceController
+ * @package api\modules\v1\controllers\member
+ * @author jianyan74 <751393839@qq.com>
+ */
+class InvoiceController extends UserAuthController
+{
+    /**
+     * @var Invoice
+     */
+    public $modelClass = Invoice::class;
+}

backend/modules/base/views/member/_form.php

@@ -3,6 +3,7 @@
 use yii\widgets\ActiveForm;
 use common\helpers\Url;
 use common\enums\GenderEnum;
+use common\helpers\Html;
 
 $actionLog = Yii::$app->services->actionLog->findByAppId(Yii::$app->id, $model['id'], 10);
 

backend/modules/common/views/action-log/index.php

@@ -40,6 +40,7 @@
                                 return Yii::$app->services->backend->getUserName($model);
                             },
                             'filter' => false, //不显示搜索框
+                            'format' => 'raw',
                         ],
                         'behavior',
                         'url',

backend/modules/common/views/addons/template/controllers/BaseController.php

@@ -1,5 +1,7 @@
 <?php
 
+use common\enums\AppEnum;
+
 echo "<?php\n";
 ?>
 
@@ -19,7 +21,7 @@ class BaseController extends AddonsController
     /**
     * @var string
     */
-<?php if ($appID == 'merchant'){ ?>
+<?php if ($appID == AppEnum::MERCHANT || $appID == AppEnum::BACKEND ){ ?>
     // public $layout = "@addons/<?= $model->name;?>/<?= $appID ?>/views/layouts/main";
 <?php } else { ?>
     public $layout = "@addons/<?= $model->name;?>/<?= $appID ?>/views/layouts/main";

backend/modules/common/views/log/index.php

@@ -50,6 +50,7 @@
                                 return Yii::$app->services->backend->getUserName($model);
                             },
                             'filter' => false, //不显示搜索框
+                            'format' => 'raw',
                         ],
                         'url',
                         [

backend/modules/common/views/menu-cate/index.php

@@ -31,10 +31,7 @@
                         //重新定义分页样式
                         'tableOptions' => ['class' => 'table table-hover'],
                         'columns' => [
-                            [
-                                'class' => 'yii\grid\SerialColumn',
-                                'visible' => true, // 不显示#
-                            ],
+                            'id',
                             [
                                 'attribute' => 'title',
                                 'value' => function ($model) {