Merge branch 'liuzj-permission-dev' into test

modules/Channel/Http/Controllers/AdvertiserController.php

@@ -96,6 +96,7 @@ class AdvertiserController extends CatchController
             $miniProgramIds = $miniProgramIds->merge(explode(',', $item));
         });
         $logos = config('common.common.logos');
+        $moduleMap = config('common.common.moduleMap');
         if($miniProgramIds->count()) {
             $miniPrograms = DB::table('miniprogram')->whereIn('id', $miniProgramIds->unique())
                 ->select('id', 'name', 'type')
@@ -106,6 +107,7 @@ class AdvertiserController extends CatchController
                     $miniProgram = $miniPrograms->get($miniProgramId);
                     if($miniProgram) {
                         $miniProgram->type_logo = $logos[$miniProgram->type ?? -1] ?? '';
+                        $miniProgram->app_name = $moduleMap[$miniProgram->type ?? -1] ?? '';
                         $item->miniPrograms[] = $miniProgram;
                     }
                 }

modules/Common/config/common.php

@@ -10,4 +10,11 @@ return [
      * 短剧管理后台的域名
      */
     'duanjuManageDomain' => env('COMMON_DUANJU_MANAGE_DOMAIN', 'http://m.test.duanju.dududus.com'),
+    /**
+     * 模块和小程序type值的映射
+     */
+    'moduleMap' => [
+        '1' => 'weixin',
+        '2' => 'douyin',
+    ]
 ];