修复冲突

jianyan74 · Nov 15, 2019 · f7ada31 · f7ada31
1 parent b52b503
commit f7ada31
Show file tree

Hide file tree

Showing 33 changed files with 104 additions and 2,689 deletions.
diff --git a/addons/RfMerchants/common/components/Bootstrap.php b/addons/RfMerchants/common/components/Bootstrap.php
@@ -1,35 +1,24 @@
 <?php
 
-namespace addons\RfWechat\common\components;
+namespace addons\RfMerchants\common\components;
 
-use common\helpers\AddonHelper;
 use Yii;
-use common\enums\AppEnum;
 use common\interfaces\AddonWidget;
 
 /**
  * Bootstrap
  *
  * Class Bootstrap
- * @package addons\RfWechat\common\config
+ * @package addons\RfMerchants\common\config
  */
 class Bootstrap implements AddonWidget
 {
     /**
-     * @param $addon
-     * @return mixed|void
-     * @throws \yii\base\InvalidConfigException
-     */
+    * @param $addon
+    * @return mixed|void
+    */
     public function run($addon)
     {
-        // 动态注入服务
-        Yii::$app->set('wechatServices', [
-            'class' => 'addons\RfWechat\services\Application',
-        ]);
 
-        // 注册资源
-        if (in_array(Yii::$app->id, [AppEnum::MERCHANT, AppEnum::BACKEND])) {
-            AddonHelper::filePath();
-        }
     }
 }
diff --git a/addons/RfMerchants/common/config/api.php b/addons/RfMerchants/common/config/api.php
@@ -15,7 +15,7 @@
 
     // ----------------------- 菜单配置 ----------------------- //
     'menuConfig' => [
-         'location' => 'default', // default:系统顶部菜单;addons:应用中心菜单
+         'location' => 'addons', // default:系统顶部菜单;addons:应用中心菜单
          'icon' => 'fa fa-puzzle-piece',
     ],