Browse Source

测试修BUG

moshaorui 4 months ago
parent
commit
ab1aca0c5b

+ 0 - 26
app/Admin/Actions/Grid/AppearanceImport.php

@@ -47,32 +47,6 @@ class AppearanceImport extends RowAction
         ];
     }
 
-    /*
-     * 处理请求
-     */
-    /*
-    public function handle(Request $request)
-    {
-        $appearanceId = $this->getKey();
-        $folder = $request->get('folder');
-        //导入模板
-        $path = resource_path().'/appearance/'.$folder;
-        if (!is_dir($path)) {
-            return $this->response()->error("The directory does not exist")->refresh();
-        }
-        $this->sourcePath = $path;
-        $this->appearanceId = $appearanceId;
-        // 清空旧的
-        DistAppearanceTemplate::deleteTemplates($appearanceId, config('dictionary.base_dist_id'));
-        // 导入模板
-        $this->readDirectory($path);
-        // 更新状态
-        DistAppearance::setStatusToImported($appearanceId);
-        // 返回响应结果并刷新页面
-        return $this->response()->success("Successfully imported")->refresh();
-    }
-    */
-
     /**
      * 设置要POST到接口的数据
      *

+ 4 - 0
app/Admin/Forms/AppearanceImPortForm.php

@@ -3,7 +3,9 @@
 namespace App\Admin\Forms;
 
 use App\Admin\Renderable\DistDistributorTable;
+use App\Admin\Repositories\DistAdminDistributor;
 use App\Admin\Repositories\DistAppearance;
+use App\Admin\Repositories\DistAppearancePublishList;
 use App\Admin\Repositories\DistAppearanceTemplate;
 use App\Admin\Repositories\DistInquiry;
 use Dcat\Admin\Models\DistAdminUser;
@@ -44,6 +46,8 @@ class AppearanceImPortForm extends Form implements LazyRenderable
             DistAppearanceTemplate::deleteTemplates($appearanceId, config('dictionary.base_dist_id'));
             // 导入模板
             $this->readDirectory($path);
+            //发报到正式环境
+            DistAppearancePublishList::publish($appearanceId,config('dictionary.base_dist_id'));
             // 更新状态
             DistAppearance::setStatusToImported($appearanceId);
             return $this->response()->success('allocation successful')->refresh();

+ 1 - 0
app/Admin/Repositories/DistAppearance.php

@@ -56,6 +56,7 @@ class DistAppearance extends EloquentRepository
      * (如果原本就有模板与变量,不会重复生成)
      */
     public static function switchTheme($appearanceId,$distId) {
+        //复制原始模版到指定分销商
         DistAppearanceTemplate::copyTemplateToDist($appearanceId, $distId);
         DistAppearanceVariable::copyAppearanceVariable($appearanceId, $distId);
         //发报到正式环境