Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/config/urlmanager.php

@@ -289,6 +289,20 @@ return [
                         'POST,OPTIONS assign-authority-role' => 'assign-authority-role',
                     ],
                 ],
+                //权限节点
+                [
+                    'class' => 'yii\rest\UrlRule',
+                    'controller' => [
+                        'v1/authority/authority-node',
+                    ],
+                    'extraPatterns' => [
+                        'GET,OPTIONS node-list' => 'node-list',
+                        'GET,OPTIONS node-details' => 'node-details',
+                        'put,OPTIONS node-update' => 'node-update',
+                        'POST,OPTIONS node-add' => 'node-add',
+                        'DELETE,OPTIONS node-del' => 'node-del',
+                    ]
+                ],
             ],    
         ],
     ]

backend/controllers/v1/branch/BranchScoreController.php

@@ -365,7 +365,10 @@ class BranchScoreController extends BaseController
         $fileInfo = $upload_file->upload();
         if ($fileInfo['CODE'] != '200') {
             Yii::$app->response->statusCode = 422;
-            return $fileInfo;
+            if ($fileInfo['INFO']['uploadFiles'][0] == "类型不对") {
+                $fileInfo['INFO']['uploadFiles'][0] = '文件类型要求97-2003工作簿 xls格式！';
+            }
+            return $fileInfo['INFO'];
         }
 
         $arr = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(false, ['rowOffset' => 1, 'columns' => 10]);

backend/controllers/v1/shopuser/ShopUserController.php

@@ -129,7 +129,10 @@ class ShopUserController extends BaseController
         $fileInfo = $upload_file->upload();
         if ($fileInfo['CODE'] != '200') {
             Yii::$app->response->statusCode = 422;
-            return $fileInfo;
+            if ($fileInfo['INFO']['uploadFiles'][0] == "类型不对") {
+                $fileInfo['INFO']['uploadFiles'][0] = '文件类型要求97-2003工作簿 xls格式！';
+            }
+            return $fileInfo['INFO'];
         }
 
         $arr = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(true, ['rowOffset' => 2, 'columns' => 9]);